#1399 QA and alignment of property panel of all curves and plots

ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp

@@ -722,6 +722,19 @@ QImage RimWellAllocationPlot::snapshotWindowContent()
 //--------------------------------------------------------------------------------------------------
 void RimWellAllocationPlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
 {
+    uiOrdering.add(&m_userName);
+    uiOrdering.add(&m_showPlotTitle);
+
+    caf::PdmUiGroup& dataGroup = *uiOrdering.addNewGroup("Plot Data");
+    dataGroup.add(&m_case);
+    dataGroup.add(&m_timeStep);
+    dataGroup.add(&m_wellName);
+
+    caf::PdmUiGroup& optionGroup = *uiOrdering.addNewGroup("Options");
+    optionGroup.add(&m_flowDiagSolution);
+    optionGroup.add(&m_flowType);
+    optionGroup.add(&m_groupSmallContributions);
+    optionGroup.add(&m_smallContributionsThreshold);
     m_smallContributionsThreshold.uiCapability()->setUiReadOnly(!m_groupSmallContributions());
 }
 

ApplicationCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp

@@ -149,6 +149,19 @@ void RimWellFlowRateCurve::updateCurveAppearance()
     m_qwtPlotCurve->setCurveAttribute(QwtPlotCurve::Inverted, true);
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimWellFlowRateCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
+{
+    uiOrdering.add(&m_curveName);
+    m_curveName.uiCapability()->setUiReadOnly(true);
+    uiOrdering.add(&m_curveColor);
+    m_curveColor.uiCapability()->setUiReadOnly(true);
+
+    uiOrdering.skipRemainingFields();
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/Flow/RimWellFlowRateCurve.h

@@ -49,6 +49,8 @@ protected:
     virtual void onLoadDataAndUpdate() override;
     virtual void updateCurveAppearance() override;
 
+    virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
+
 private:
     bool isUsingConnectionNumberDepthType() const;
     RimWellAllocationPlot* wellAllocationPlot() const;

ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp

@@ -428,6 +428,14 @@ void RimGridTimeHistoryCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiO
     }
 
     uiOrdering.add(&m_plotAxis);
+
+    caf::PdmUiGroup* appearanceGroup = uiOrdering.addNewGroup("Appearance");
+    RimPlotCurve::appearanceUiOrdering(*appearanceGroup);
+
+    caf::PdmUiGroup* nameGroup = uiOrdering.addNewGroup("Curve Name");
+    nameGroup->setCollapsedByDefault(true);
+    RimPlotCurve::curveNameUiOrdering(*nameGroup);
+
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimPlotCurve.cpp

@@ -79,14 +79,14 @@ RimPlotCurve::RimPlotCurve()
 
     CAF_PDM_InitField(&m_curveColor, "Color", cvf::Color3f(cvf::Color3::BLACK), "Color", "", "", "");
 
-    CAF_PDM_InitField(&m_curveThickness, "Thickness", 1, "Thickness", "", "", "");
+    CAF_PDM_InitField(&m_curveThickness, "Thickness", 1, "Line Thickness", "", "", "");
     m_curveThickness.uiCapability()->setUiEditorTypeName(caf::PdmUiComboBoxEditor::uiEditorTypeName());
 
     caf::AppEnum< RimPlotCurve::LineStyleEnum > lineStyle = STYLE_SOLID;
-    CAF_PDM_InitField(&m_lineStyle, "LineStyle", lineStyle, "Line style", "", "", "");
+    CAF_PDM_InitField(&m_lineStyle, "LineStyle", lineStyle, "Line Style", "", "", "");
 
     caf::AppEnum< RimPlotCurve::PointSymbolEnum > pointSymbol = SYMBOL_NONE;
-    CAF_PDM_InitField(&m_pointSymbol, "PointSymbol", pointSymbol, "Point style", "", "", "");
+    CAF_PDM_InitField(&m_pointSymbol, "PointSymbol", pointSymbol, "Symbol", "", "", "");
 
     CAF_PDM_InitField(&m_symbolSkipPixelDistance, "SymbolSkipPxDist", 0.0f, "Symbol Skip Distance", "", "Minimum pixel distance between symbols", "");
 
@@ -265,6 +265,28 @@ void RimPlotCurve::updateOptionSensitivity()
     m_curveName.uiCapability()->setUiReadOnly(m_isUsingAutoName);
 }
 
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimPlotCurve::appearanceUiOrdering(caf::PdmUiOrdering& uiOrdering)
+{
+    uiOrdering.add(&m_curveColor);
+    uiOrdering.add(&m_pointSymbol);
+    uiOrdering.add(&m_symbolSkipPixelDistance);
+    uiOrdering.add(&m_curveThickness);
+    uiOrdering.add(&m_lineStyle);
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimPlotCurve::curveNameUiOrdering(caf::PdmUiOrdering& uiOrdering)
+{
+    uiOrdering.add(&m_isUsingAutoName);
+    uiOrdering.add(&m_curveName);
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimPlotCurve.h

@@ -97,6 +97,8 @@ protected:
     virtual caf::PdmFieldHandle*    objectToggleField();
     virtual caf::PdmFieldHandle*    userDescriptionField();
     virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly);
+    void                            appearanceUiOrdering(caf::PdmUiOrdering& uiOrdering);
+    void                            curveNameUiOrdering(caf::PdmUiOrdering& uiOrdering);
 
 protected:
     QPointer<QwtPlot>               m_parentQwtPlot;

ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp

@@ -385,9 +385,7 @@ void RimWellLogExtractionCurve::defineUiOrdering(QString uiConfigName, caf::PdmU
 
     if (eclipseCase)
     {
-        curveDataGroup->add(&(m_eclipseResultDefinition->m_resultTypeUiField));
+        m_eclipseResultDefinition->uiOrdering(uiConfigName, *curveDataGroup);
-        curveDataGroup->add(&(m_eclipseResultDefinition->m_porosityModelUiField));
-        curveDataGroup->add(&(m_eclipseResultDefinition->m_resultVariableUiField));
 
         if (m_eclipseResultDefinition->hasDynamicResult())
         {
@@ -396,27 +394,25 @@ void RimWellLogExtractionCurve::defineUiOrdering(QString uiConfigName, caf::PdmU
     }
     else if (geomCase)
     {
-        curveDataGroup->add(&(m_geomResultDefinition->m_resultPositionTypeUiField));
+        m_geomResultDefinition->uiOrdering(uiConfigName, *curveDataGroup);
-        curveDataGroup->add(&(m_geomResultDefinition->m_resultVariableUiField));
         
         curveDataGroup->add(&m_timeStep);
     }
 
     caf::PdmUiGroup* appearanceGroup = uiOrdering.addNewGroup("Appearance");
-    appearanceGroup->add(&m_curveColor);
+    RimPlotCurve::appearanceUiOrdering(*appearanceGroup);
-    appearanceGroup->add(&m_curveThickness);
+
-    appearanceGroup->add(&m_pointSymbol);
+    caf::PdmUiGroup* nameGroup = uiOrdering.addNewGroup("Curve Name");
-    appearanceGroup->add(&m_symbolSkipPixelDistance);
+    nameGroup->setCollapsedByDefault(true);
-    appearanceGroup->add(&m_lineStyle);
+    RimPlotCurve::curveNameUiOrdering(*nameGroup);
-    appearanceGroup->add(&m_curveName);
+
-    appearanceGroup->add(&m_isUsingAutoName);
     if (m_isUsingAutoName)
     {
-        appearanceGroup->add(&m_addWellNameToCurveName);
+        nameGroup->add(&m_addWellNameToCurveName);
-        appearanceGroup->add(&m_addCaseNameToCurveName);
+        nameGroup->add(&m_addCaseNameToCurveName);
-        appearanceGroup->add(&m_addPropertyToCurveName);
+        nameGroup->add(&m_addPropertyToCurveName);
-        appearanceGroup->add(&m_addDateToCurveName);
+        nameGroup->add(&m_addDateToCurveName);
-        appearanceGroup->add(&m_addTimestepToCurveName);
+        nameGroup->add(&m_addTimestepToCurveName);
     }
 
 

ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp

@@ -176,13 +176,11 @@ void RimWellLogFileCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrder
     curveDataGroup->add(&m_wellLogChannnelName);
 
     caf::PdmUiGroup* appearanceGroup = uiOrdering.addNewGroup("Appearance");
-    appearanceGroup->add(&m_curveColor);
+    RimPlotCurve::appearanceUiOrdering(*appearanceGroup);
-    appearanceGroup->add(&m_curveThickness);
+
-    appearanceGroup->add(&m_pointSymbol);
+    caf::PdmUiGroup* nameGroup = uiOrdering.addNewGroup("Curve Name");
-    appearanceGroup->add(&m_symbolSkipPixelDistance);
+    RimPlotCurve::curveNameUiOrdering(*nameGroup);
-    appearanceGroup->add(&m_lineStyle);
+
-    appearanceGroup->add(&m_curveName);
-    appearanceGroup->add(&m_isUsingAutoName);
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp

@@ -476,12 +476,13 @@ void RimWellLogPlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
         uiOrdering.add(&m_depthUnit);
     }
 
+    uiOrdering.add(&m_showTrackLegends);
+
     caf::PdmUiGroup* gridGroup = uiOrdering.addNewGroup("Visible Depth Range");
     gridGroup->add(&m_isAutoScaleDepthEnabled);
     gridGroup->add(&m_minVisibleDepth);
     gridGroup->add(&m_maxVisibleDepth);
 
-    uiOrdering.add(&m_showTrackLegends);
 
     uiOrdering.skipRemainingFields(true);
 }

ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp

@@ -395,9 +395,9 @@ void RimWellLogTrack::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
 
     caf::PdmUiGroup* gridGroup = uiOrdering.addNewGroup("Visible X Axis Range");
     gridGroup->add(&m_isAutoScaleXEnabled);
+    gridGroup->add(&m_isLogarithmicScaleEnabled);
     gridGroup->add(&m_visibleXRangeMin);
     gridGroup->add(&m_visibleXRangeMax);
-    gridGroup->add(&m_isLogarithmicScaleEnabled);
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp

@@ -448,17 +448,11 @@ void RimSummaryCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
     uiOrdering.add(&m_plotAxis);
 
     caf::PdmUiGroup* appearanceGroup = uiOrdering.addNewGroup("Appearance");
-    appearanceGroup->add(&m_curveColor);
+    RimPlotCurve::appearanceUiOrdering(*appearanceGroup);
-    appearanceGroup->add(&m_pointSymbol);
-    appearanceGroup->add(&m_symbolSkipPixelDistance);
-    appearanceGroup->add(&m_curveThickness);
-    appearanceGroup->add(&m_lineStyle);
-
 
     caf::PdmUiGroup* nameGroup = uiOrdering.addNewGroup("Curve Name");
     nameGroup->setCollapsedByDefault(true);
-    nameGroup->add(&m_isUsingAutoName);
+    RimPlotCurve::curveNameUiOrdering(*nameGroup);
-    nameGroup->add(&m_curveName);
 
     if (m_isUsingAutoName)
     {