Use cafPdmUiButton instead of bool PdmField in multiple classes

Replace PdmField<bool> push button pattern with addNewButton() lambdas
in RiaPreferences, RiaPreferencesSummary, RicUserDefinedCalculatorUi,
RimUserDefinedPolylinesAnnotation, RimPolygonFilter, RimFractureTemplate,
RimEllipseFractureTemplate, RimMeshFractureTemplate, and
RicSummaryPlotEditorWidgetCreator.

ApplicationLibCode/Commands/RicUserDefinedCalculatorUi.cpp

@@ -22,9 +22,9 @@
 #include "RimUserDefinedCalculationCollection.h"
 
 #include "cafAssert.h"
+#include "cafPdmUiButton.h"
 #include "cafPdmUiListEditor.h"
 #include "cafPdmUiObjectEditorHandle.h"
-#include "cafPdmUiPushButtonEditor.h"
 
 CAF_PDM_ABSTRACT_SOURCE_INIT( RicUserDefinedCalculatorUi, "RicUserDefinedCalculator" );
 
@@ -39,18 +39,6 @@ RicUserDefinedCalculatorUi::RicUserDefinedCalculatorUi()
     m_currentCalculation.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::LabelPosition::HIDDEN );
     m_currentCalculation.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() );
 
-    CAF_PDM_InitFieldNoDefault( &m_newCalculation, "NewCalculation", "New Calculation" );
-    RicUserDefinedCalculatorUi::assignPushButtonEditor( &m_newCalculation );
-
-    CAF_PDM_InitFieldNoDefault( &m_deleteCalculation, "DeleteCalculation", "Delete Calculation" );
-    RicUserDefinedCalculatorUi::assignPushButtonEditor( &m_deleteCalculation );
-
-    CAF_PDM_InitFieldNoDefault( &m_importCalculations, "ImportCalculations", "Import Calculations" );
-    RicUserDefinedCalculatorUi::assignPushButtonEditor( &m_importCalculations );
-
-    CAF_PDM_InitFieldNoDefault( &m_exportCalculations, "ExportCalculations", "Export Calculations" );
-    RicUserDefinedCalculatorUi::assignPushButtonEditor( &m_exportCalculations );
-
     m_calcContextMenuMgr = std::make_unique<RiuCalculationsContextMenuManager>();
 }
 
@@ -104,42 +92,10 @@ bool RicUserDefinedCalculatorUi::parseExpression() const
 //--------------------------------------------------------------------------------------------------
 void RicUserDefinedCalculatorUi::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue )
 {
-    if ( changedField == &m_newCalculation )
-    {
-        m_newCalculation = false;
-
-        m_currentCalculation = calculationCollection()->addCalculation();
-        connectSignals( m_currentCalculation );
-
-        updateConnectedEditors();
-    }
-    else if ( changedField == &m_deleteCalculation )
-    {
-        m_deleteCalculation = false;
-
-        if ( m_currentCalculation() )
-        {
-            calculationCollection()->deleteCalculation( m_currentCalculation() );
-            m_currentCalculation = nullptr;
-
-            updateConnectedEditors();
-            caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors();
-        }
-    }
-    else if ( changedField == &m_currentCalculation && m_currentCalculation() )
+    if ( changedField == &m_currentCalculation && m_currentCalculation() )
     {
         connectSignals( m_currentCalculation() );
     }
-    else if ( changedField == &m_importCalculations )
-    {
-        importCalculations();
-        m_importCalculations = false;
-    }
-    else if ( changedField == &m_exportCalculations )
-    {
-        exportCalculations();
-        m_exportCalculations = false;
-    }
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -155,8 +111,16 @@ void RicUserDefinedCalculatorUi::defineUiOrdering( QString uiConfigName, caf::Pd
     {
         caf::PdmUiGroup* group = uiOrdering.addNewGroupWithKeyword( "Calculations", calculationsGroupName() );
         group->add( &m_currentCalculation );
-        group->add( &m_newCalculation );
-        group->appendToRow( &m_deleteCalculation );
+        group
+            ->addNewButton( "New Calculation",
+                            [this]()
+                            {
+                                m_currentCalculation = calculationCollection()->addCalculation();
+                                connectSignals( m_currentCalculation );
+                                updateConnectedEditors();
+                            } )
+            ->setFillWidth( true );
+        group->addNewButton( "Delete Calculation", [this]() { onDeleteCalculationClicked(); }, { .newRow = false } )->setFillWidth( true );
     }
 
     {
@@ -170,8 +134,8 @@ void RicUserDefinedCalculatorUi::defineUiOrdering( QString uiConfigName, caf::Pd
     caf::PdmUiGroup* group = uiOrdering.findGroup( calculationsGroupName() );
     if ( group )
     {
-        group->add( &m_importCalculations );
-        group->appendToRow( &m_exportCalculations );
+        group->addNewButton( "Import Calculations", [this]() { importCalculations(); } )->setFillWidth( true );
+        group->addNewButton( "Export Calculations", [this]() { exportCalculations(); }, { .newRow = false } )->setFillWidth( true );
     }
 }
 
@@ -192,29 +156,6 @@ QList<caf::PdmOptionItemInfo> RicUserDefinedCalculatorUi::calculateValueOptions(
     return options;
 }
 
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-void RicUserDefinedCalculatorUi::assignPushButtonEditor( caf::PdmFieldHandle* fieldHandle )
-{
-    CAF_ASSERT( fieldHandle );
-    CAF_ASSERT( fieldHandle->uiCapability() );
-
-    caf::PdmUiPushButtonEditor::configureEditorLabelHidden( fieldHandle );
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-void RicUserDefinedCalculatorUi::assignPushButtonEditorText( caf::PdmUiEditorAttribute* attribute, const QString& text )
-{
-    auto* attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*>( attribute );
-    if ( attrib )
-    {
-        attrib->m_buttonText = text;
-    }
-}
-
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
@@ -241,29 +182,6 @@ bool RicUserDefinedCalculatorUi::calculate() const
     return true;
 }
 
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-void RicUserDefinedCalculatorUi::defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute )
-{
-    if ( &m_newCalculation == field )
-    {
-        RicUserDefinedCalculatorUi::assignPushButtonEditorText( attribute, "New Calculation" );
-    }
-    else if ( &m_deleteCalculation == field )
-    {
-        RicUserDefinedCalculatorUi::assignPushButtonEditorText( attribute, "Delete Calculation" );
-    }
-    else if ( &m_importCalculations == field )
-    {
-        RicUserDefinedCalculatorUi::assignPushButtonEditorText( attribute, "Import Calculations" );
-    }
-    else if ( &m_exportCalculations == field )
-    {
-        RicUserDefinedCalculatorUi::assignPushButtonEditorText( attribute, "Export Calculations" );
-    }
-}
-
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
@@ -294,6 +212,21 @@ void RicUserDefinedCalculatorUi::onVariableUpdated( const SignalEmitter* emitter
     updateConnectedEditors();
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RicUserDefinedCalculatorUi::onDeleteCalculationClicked()
+{
+    if ( m_currentCalculation() )
+    {
+        calculationCollection()->deleteCalculation( m_currentCalculation() );
+        m_currentCalculation = nullptr;
+
+        updateConnectedEditors();
+        caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors();
+    }
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/RicUserDefinedCalculatorUi.h

@@ -53,28 +53,19 @@ public:
 protected:
     void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
     void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
-    void defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
     QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions ) override;
     void                          onEditorWidgetsCreated() override;
 
     virtual void exportCalculations() = 0;
     virtual void importCalculations() = 0;
 
-    // TODO : Move to a common caf helper class
-    static void assignPushButtonEditor( caf::PdmFieldHandle* fieldHandle );
-    static void assignPushButtonEditorText( caf::PdmUiEditorAttribute* attribute, const QString& text );
-
 private:
     void onVariableUpdated( const SignalEmitter* emitter );
     void connectSignals( RimUserDefinedCalculation* calculation );
+    void onDeleteCalculationClicked();
 
 private:
     caf::PdmPtrField<RimUserDefinedCalculation*> m_currentCalculation;
 
-    caf::PdmField<bool> m_newCalculation;
-    caf::PdmField<bool> m_deleteCalculation;
-    caf::PdmField<bool> m_exportCalculations;
-    caf::PdmField<bool> m_importCalculations;
-
     std::unique_ptr<RiuCalculationsContextMenuManager> m_calcContextMenuMgr;
 };

ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorWidgetCreator.cpp

@@ -27,6 +27,7 @@
 #include "RiuSummaryVectorSelectionUi.h"
 #include "RiuSummaryVectorSelectionWidgetCreator.h"
 
+#include "cafPdmUiButton.h"
 #include "cafPdmUiFieldEditorHandle.h"
 #include "cafPdmUiFieldHandle.h"
 #include "cafPdmUiGroup.h"
@@ -36,6 +37,7 @@
 
 #include <QBoxLayout>
 #include <QFrame>
+#include <QPushButton>
 #include <QSplitter>
 #include <QTreeView>
 #include <memory>
@@ -251,6 +253,16 @@ void RicSummaryPlotEditorWidgetCreator::configureAndUpdateFields( int
         if ( uiItems[i]->isUiHidden( uiConfigName ) ) continue;
         if ( uiItems[i]->isUiGroup() ) continue;
 
+        if ( auto* button = dynamic_cast<caf::PdmUiButton*>( uiItems[i] ) )
+        {
+            if ( auto* qButton = createButton( widget(), *button, uiConfigName ) )
+            {
+                qButton->setParent( widget() );
+                layout->insertWidget( currentWidgetIndex++, qButton );
+            }
+            continue;
+        }
+
         {
             caf::PdmUiFieldHandle* field = dynamic_cast<caf::PdmUiFieldHandle*>( uiItems[i] );