wip

OPM · Feb 6, 2024 · aa09059 · aa09059
1 parent c28b753
commit aa09059
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 12 deletions.
diff --git a/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonInView.cpp b/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonInView.cpp
@@ -105,28 +105,41 @@ void RimPolygonInView::appendPartsToModel( cvf::ModelBasicList*        model,
 //--------------------------------------------------------------------------------------------------
 void RimPolygonInView::insertTarget( const RimPolylineTarget* targetToInsertBefore, RimPolylineTarget* targetToInsert )
 {
-    m_targets.push_back( targetToInsert );
+    size_t index = m_targets.indexOf( targetToInsertBefore );
+    if ( index < m_targets.size() )
+        m_targets.insert( index, targetToInsert );
+    else
+        m_targets.push_back( targetToInsert );
 }
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
 void RimPolygonInView::deleteTarget( RimPolylineTarget* targetToDelete )
 {
+    m_targets.removeChild( targetToDelete );
+    delete targetToDelete;
 }
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
 void RimPolygonInView::updateEditorsAndVisualization()
 {
+    updateConnectedEditors();
+    updateVisualization();
 }
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
 void RimPolygonInView::updateVisualization()
 {
+    auto view = firstAncestorOfType<Rim3dView>();
+    if ( view )
+    {
+        view->scheduleCreateDisplayModelAndRedraw();
+    }
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -189,6 +202,8 @@ void RimPolygonInView::defineUiOrdering( QString uiConfigName, caf::PdmUiOrderin
 //--------------------------------------------------------------------------------------------------
 void RimPolygonInView::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue )
 {
+    updateVisualization();
+    ;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -223,25 +238,64 @@ void RimPolygonInView::defineObjectEditorAttribute( QString uiConfigName, caf::P
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimPolygonInView::updateNameField()
+void RimPolygonInView::defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute )
 {
-    m_targets.deleteChildren();
-
-    QString name = "Undefined";
-    if ( m_polygon() )
+    if ( field == &m_enablePicking )
     {
-        name = m_polygon->name();
+        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";
+            }
+        }
+    }
 
-        for ( auto p : m_polygon->pointsInDomainCoords() )
+    if ( field == &m_targets )
+    {
+        auto tvAttribute = dynamic_cast<caf::PdmUiTableViewEditorAttribute*>( attribute );
+        if ( tvAttribute )
         {
-            auto target = new RimPolylineTarget();
-            target->setAsPointXYZ( p );
+            tvAttribute->resizePolicy = caf::PdmUiTableViewEditorAttribute::RESIZE_TO_FIT_CONTENT;
 
-            m_targets.push_back( target );
+            if ( m_enablePicking )
+            {
+                tvAttribute->baseColor.setRgb( 255, 220, 255 );
+                tvAttribute->alwaysEnforceResizePolicy = true;
+            }
         }
     }
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimPolygonInView::updateNameField()
+{
+    /*
+        m_targets.deleteChildren();
+
+        QString name = "Undefined";
+        if ( m_polygon() )
+        {
+            name = m_polygon->name();
+
+            for ( auto p : m_polygon->pointsInDomainCoords() )
+            {
+                auto target = new RimPolylineTarget();
+                target->setAsPointXYZ( p );
+
+                m_targets.push_back( target );
+            }
+        }
 
-    setName( name );
+        setName( name );
+    */
 }
 
 //--------------------------------------------------------------------------------------------------

diff --git a/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonInView.h b/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonInView.h
@@ -68,6 +68,7 @@ class RimPolygonInView : public RimCheckableNamedObject, public RimPolylinesData
     void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
     QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions ) override;
     void                          defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
+    void defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
 
 private:
     void                       updateNameField();