Ui Brushup of Well property panels

ApplicationCode/ProjectDataModel/RimWell.cpp

@@ -246,11 +246,11 @@ bool RimWell::calculateWellPipeVisibility(size_t frameIndex)
 //--------------------------------------------------------------------------------------------------
 void RimWell::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
 {
-    caf::PdmUiGroup* pipeGroup = uiOrdering.addNewGroup("Well pipe");
+    caf::PdmUiGroup* pipeGroup = uiOrdering.addNewGroup("Appearance");
     pipeGroup->add(&showWellPipes);
-    pipeGroup->add(&pipeRadiusScaleFactor);
-    pipeGroup->add(&wellPipeColor);
     pipeGroup->add(&showWellLabel);
+    pipeGroup->add(&wellPipeColor);
+    pipeGroup->add(&pipeRadiusScaleFactor);
 
     caf::PdmUiGroup* filterGroup = uiOrdering.addNewGroup("Range filter");
     filterGroup->add(&showWellCells);

ApplicationCode/ProjectDataModel/RimWellPath.cpp

@@ -235,3 +235,27 @@ void RimWellPath::readAsciiWellPathFile()
 
     setWellPathGeometry(wpData.m_wellPathGeometry.p());
 }
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimWellPath::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
+{
+    caf::PdmUiGroup* appGroup =  uiOrdering.addNewGroup("Appearance");
+    appGroup->add(&showWellPathLabel);
+    appGroup->add(&wellPathColor);
+    appGroup->add(&wellPathRadiusScaleFactor); 
+
+    caf::PdmUiGroup* fileInfoGroup =   uiOrdering.addNewGroup("File");
+    fileInfoGroup->add(&filepath);
+    fileInfoGroup->add(&wellPathIndexInFile);
+
+    caf::PdmUiGroup* ssihubGroup =  uiOrdering.addNewGroup("Well Info");
+    ssihubGroup->add(&id);
+    ssihubGroup->add(&sourceSystem);
+    ssihubGroup->add(&utmZone);
+    ssihubGroup->add(&updateDate);
+    ssihubGroup->add(&updateUser);
+    ssihubGroup->add(&m_surveyType);
+
+}

ApplicationCode/ProjectDataModel/RimWellPath.h

@@ -74,6 +74,8 @@ private:
     QString                             surveyType() { return m_surveyType; }
     void                                setSurveyType(QString surveyType);
 
+    virtual void                        defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering );
+
 
     caf::PdmField<QString>              id;
     caf::PdmField<QString>              sourceSystem;

ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp

@@ -198,6 +198,24 @@ void RimWellPathCollection::addWellPaths( QStringList filePaths )
     readWellPathFiles();
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimWellPathCollection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
+{
+    caf::PdmUiGroup* wellHeadGroup = uiOrdering.addNewGroup("Well labels");
+    wellHeadGroup->add(&showWellPathLabel);
+    wellHeadGroup->add(&wellPathLabelColor);
+
+    caf::PdmUiGroup* wellPipe = uiOrdering.addNewGroup("Well pipe");
+    wellPipe->add(&wellPathVisibility);
+    wellPipe->add(&wellPathRadiusScaleFactor);
+
+    caf::PdmUiGroup* advancedGroup = uiOrdering.addNewGroup("Clipping");
+    advancedGroup->add(&wellPathClip);
+    advancedGroup->add(&wellPathClipZDistance);
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimWellPathCollection.h

@@ -71,7 +71,10 @@ public:
 
     virtual void                        fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue );
 
+ 
 private:
+    virtual void                        defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering );
+
     caf::PdmPointer<RimProject>         m_project;
     cvf::ref<RivWellPathCollectionPartMgr> m_wellPathCollectionPartManager;