Skip to content

More dynamic buttons #13830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
magnesj merged 5 commits into from
Mar 31, 2026
Merged

More dynamic buttons #13830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
31088a8
Migrate test demo objects to dynamic buttons
magnesj Mar 31, 2026
353b3e4
Migrate RimSummaryCurve and RimSummaryPlotManager to dynamic buttons
magnesj Mar 31, 2026
d699044
Migrate RimSummaryCurveCollection m_editPlot to dynamic button
magnesj Mar 31, 2026
5dc0ebf
Migrate RimPolygonInView push buttons to dynamic buttons
magnesj Mar 31, 2026
4c22e45
Replace PdmUiPushButtonEditor fields with dynamic buttons in Histogra…
magnesj Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions ApplicationLibCode/ProjectDataModel/Histogram/RimHistogramMultiPlot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include "RiuQwtPlotWidget.h"

#include "cafPdmUiCheckBoxEditor.h"
#include "cafPdmUiPushButtonEditor.h"
#include "cafPdmUiTreeOrdering.h"

#include "qwt_scale_engine.h"
Expand All @@ -54,15 +53,10 @@ RimHistogramMultiPlot::RimHistogramMultiPlot()
CAF_PDM_InitField( &m_autoSubPlotTitle, "AutoSubPlotTitle", true, "Auto Sub Plot Title" );

CAF_PDM_InitField( &m_disableWheelZoom, "DisableWheelZoom", true, "", "", "Disable Mouse Wheel Zooming in Multi Histogram Plot" );
caf::PdmUiPushButtonEditor::configureEditorLabelHidden( &m_disableWheelZoom );
m_disableWheelZoom.uiCapability()->setUiIconFromResourceString( ":/DisableZoom.png" );

CAF_PDM_InitField( &m_autoAdjustAppearance, "AutoAdjustAppearance", true, "Auto Plot Settings" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_autoAdjustAppearance );

CAF_PDM_InitField( &m_hidePlotsWithValuesBelow, "HidePlotsWithValuesBelow", false, "" );
caf::PdmUiPushButtonEditor::configureEditorLabelHidden( &m_hidePlotsWithValuesBelow );

setBottomMargin( 40 );
}

Expand Down Expand Up @@ -179,11 +173,6 @@ void RimHistogramMultiPlot::fieldChangedByUi( const caf::PdmFieldHandle* changed
onLoadDataAndUpdate();
updateLayout();
}
else if ( changedField == &m_hidePlotsWithValuesBelow )
{
m_hidePlotsWithValuesBelow = false;
updatePlotVisibility();
}
else if ( changedField == &m_autoAdjustAppearance )
{
analyzePlotsAndAdjustAppearanceSettings();
Expand Down
1 change: 0 additions & 1 deletion ApplicationLibCode/ProjectDataModel/Histogram/RimHistogramMultiPlot.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ class RimHistogramMultiPlot : public RimMultiPlot
caf::PdmField<bool> m_autoSubPlotTitle;
caf::PdmField<bool> m_disableWheelZoom;
caf::PdmField<bool> m_autoAdjustAppearance;
caf::PdmField<bool> m_hidePlotsWithValuesBelow;

std::map<RimHistogramPlot*, std::pair<int, int>> m_gridLayoutInfo;
};
63 changes: 17 additions & 46 deletions ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonInView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

#include "cafCmdFeatureMenuBuilder.h"
#include "cafDisplayCoordTransform.h"
#include "cafPdmUiPushButtonEditor.h"
#include "cafPdmUiButton.h"
#include "cafPdmUiTableViewEditor.h"
#include "cafPdmUiTreeAttributes.h"

Expand All @@ -60,12 +60,6 @@ RimPolygonInView::RimPolygonInView()

nameField()->uiCapability()->setUiReadOnly( true );

CAF_PDM_InitField( &m_enablePicking, "EnablePicking", false, "" );
caf::PdmUiPushButtonEditor::configureEditorLabelHidden( &m_enablePicking );

CAF_PDM_InitField( &m_selectPolygon, "SelectPolygon", false, "" );
caf::PdmUiPushButtonEditor::configureEditorLabelHidden( &m_selectPolygon );

CAF_PDM_InitField( &m_showLabel, "ShowLabel", false, "Show Label" );

CAF_PDM_InitField( &m_handleScalingFactor, "HandleScalingFactor", 2.0, "Handle Scaling Factor" );
Expand Down Expand Up @@ -193,7 +187,7 @@ std::vector<RimPolylineTarget*> RimPolygonInView::activeTargets() const
//--------------------------------------------------------------------------------------------------
bool RimPolygonInView::pickingEnabled() const
{
return m_enablePicking();
return m_enablePicking;
}

//--------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -303,7 +297,13 @@ void RimPolygonInView::defineUiOrdering( QString uiConfigName, caf::PdmUiOrderin

if ( enableEdit )
{
uiOrdering.add( &m_enablePicking );
uiOrdering.addNewButton( m_enablePicking ? "Stop Picking Points" : "Start Picking Points",
[this]()
{
m_enablePicking = !m_enablePicking;
updateConnectedEditors();
updateVisualization();
} );
uiOrdering.add( &m_targets );
uiOrdering.add( &m_handleScalingFactor );
}
Expand All @@ -312,7 +312,7 @@ void RimPolygonInView::defineUiOrdering( QString uiConfigName, caf::PdmUiOrderin

if ( m_polygon() )
{
uiOrdering.add( &m_selectPolygon );
uiOrdering.addNewButton( "Go to Polygon", [this]() { Riu3DMainWindowTools::selectAsCurrentItem( m_polygon() ); } );
}

uiOrdering.skipRemainingFields();
Expand All @@ -323,16 +323,6 @@ void RimPolygonInView::defineUiOrdering( QString uiConfigName, caf::PdmUiOrderin
//--------------------------------------------------------------------------------------------------
void RimPolygonInView::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue )
{
if ( changedField == &m_enablePicking )
{
updateConnectedEditors();
}

if ( changedField == &m_selectPolygon && m_polygon() )
{
Riu3DMainWindowTools::selectAsCurrentItem( m_polygon() );
}

updateVisualization();
}

Expand Down Expand Up @@ -388,7 +378,13 @@ void RimPolygonInView::defineObjectEditorAttribute( QString uiConfigName, caf::P
//--------------------------------------------------------------------------------------------------
void RimPolygonInView::uiOrderingForLocalPolygon( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
uiOrdering.add( &m_enablePicking );
uiOrdering.addNewButton( m_enablePicking ? "Stop Picking Points" : "Start Picking Points",
[this]()
{
m_enablePicking = !m_enablePicking;
updateConnectedEditors();
updateVisualization();
} );
uiOrdering.add( &m_targets );
uiOrdering.add( &m_handleScalingFactor );
}
Expand Down Expand Up @@ -463,31 +459,6 @@ double RimPolygonInView::scalingFactorForTarget() const
//--------------------------------------------------------------------------------------------------
void RimPolygonInView::defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute )
{
if ( field == &m_enablePicking )
{
auto* pbAttribute = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*>( attribute );
if ( pbAttribute )
{
if ( !m_enablePicking )
{
pbAttribute->m_buttonText = "Start Picking Points";
}
else
{
pbAttribute->m_buttonText = "Stop Picking Points";
}
}
}

if ( field == &m_selectPolygon )
{
auto* pbAttribute = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*>( attribute );
if ( pbAttribute )
{
pbAttribute->m_buttonText = "Go to Polygon";
}
}

if ( field == &m_targets )
{
if ( auto tvAttribute = dynamic_cast<caf::PdmUiTableViewEditorAttribute*>( attribute ) )
Expand Down
3 changes: 1 addition & 2 deletions ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonInView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ class RimPolygonInView : public RimCheckableNamedObject, public RimPolylinesData
private:
caf::PdmPtrField<RimPolygon*> m_polygon;

caf::PdmField<bool> m_selectPolygon;
caf::PdmField<bool> m_enablePicking;
bool m_enablePicking = false;
caf::PdmField<double> m_handleScalingFactor;
caf::PdmChildArrayField<RimPolylineTarget*> m_targets;

Expand Down
Loading
Loading