From 5e517e47dd8f5d8525800a3aaaf72ed3b894dd8a Mon Sep 17 00:00:00 2001 From: Gaute Lindkvist Date: Wed, 3 Apr 2019 14:20:32 +0200 Subject: [PATCH] Labels on top fixes --- .../RimGridCrossPlotDataSet.cpp | 7 ++--- .../RimEclipseResultDefinition.cpp | 31 +++++-------------- .../RimEclipseResultDefinition.h | 10 +++--- .../cafPdmUiFormLayoutObjectEditor.cpp | 3 +- 4 files changed, 17 insertions(+), 34 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp b/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp index e44b57a17d..e797261cb3 100644 --- a/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp +++ b/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp @@ -94,17 +94,16 @@ RimGridCrossPlotDataSet::RimGridCrossPlotDataSet() CAF_PDM_InitFieldNoDefault(&m_grouping, "Grouping", "Group Data by", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_xAxisProperty, "XAxisProperty", "X-Axis Property", "", "", ""); - m_xAxisProperty = new RimEclipseResultDefinition; + m_xAxisProperty = new RimEclipseResultDefinition(caf::PdmUiItemInfo::TOP); m_xAxisProperty.uiCapability()->setUiHidden(true); m_xAxisProperty.uiCapability()->setUiTreeChildrenHidden(true); - m_xAxisProperty->setLabelsOnTop(true); m_xAxisProperty->setTernaryEnabled(false); CAF_PDM_InitFieldNoDefault(&m_yAxisProperty, "YAxisProperty", "Y-Axis Property", "", "", ""); - m_yAxisProperty = new RimEclipseResultDefinition; + m_yAxisProperty = new RimEclipseResultDefinition(caf::PdmUiItemInfo::TOP); m_yAxisProperty.uiCapability()->setUiHidden(true); m_yAxisProperty.uiCapability()->setUiTreeChildrenHidden(true); - m_yAxisProperty->setLabelsOnTop(true); + m_yAxisProperty->setTernaryEnabled(false); CAF_PDM_InitFieldNoDefault(&m_groupingProperty, "GroupingProperty", "Data Grouping Property", "", "", ""); diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp index e790f44153..c343d10465 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp @@ -74,9 +74,9 @@ CAF_PDM_SOURCE_INIT(RimEclipseResultDefinition, "ResultDefinition"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimEclipseResultDefinition::RimEclipseResultDefinition() +RimEclipseResultDefinition::RimEclipseResultDefinition(caf::PdmUiItemInfo::LabelPosType labelPosition) : m_diffResultOptionsEnabled(false) - , m_labelsOnTop(false) + , m_labelPosition(labelPosition) , m_ternaryEnabled(true) { CAF_PDM_InitObject("Result Definition", "", "", ""); @@ -114,19 +114,22 @@ RimEclipseResultDefinition::RimEclipseResultDefinition() CAF_PDM_InitFieldNoDefault(&m_flowTracerSelectionMode, "FlowTracerSelectionMode", "Tracers", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_phaseSelection, "PhaseSelection", "Phases", "", "", ""); - + m_phaseSelection.uiCapability()->setUiLabelPosition(m_labelPosition); // Ui only fields CAF_PDM_InitFieldNoDefault(&m_resultTypeUiField, "MResultType", "Type", "", "", ""); m_resultTypeUiField.xmlCapability()->disableIO(); + m_resultTypeUiField.uiCapability()->setUiLabelPosition(m_labelPosition); CAF_PDM_InitFieldNoDefault(&m_porosityModelUiField, "MPorosityModelType", "Porosity", "", "", ""); m_porosityModelUiField.xmlCapability()->disableIO(); + m_porosityModelUiField.uiCapability()->setUiLabelPosition(m_labelPosition); CAF_PDM_InitField( &m_resultVariableUiField, "MResultVariable", RiaDefines::undefinedResultName(), "Result Property", "", "", ""); m_resultVariableUiField.xmlCapability()->disableIO(); m_resultVariableUiField.uiCapability()->setUiEditorTypeName(caf::PdmUiListEditor::uiEditorTypeName()); + m_resultVariableUiField.uiCapability()->setUiLabelPosition(m_labelPosition); CAF_PDM_InitFieldNoDefault(&m_flowSolutionUiField, "MFlowDiagSolution", "Solution", "", "", ""); m_flowSolutionUiField.xmlCapability()->disableIO(); @@ -151,6 +154,7 @@ RimEclipseResultDefinition::RimEclipseResultDefinition() CAF_PDM_InitFieldNoDefault(&m_selectedSouringTracersUiField, "MSelectedSouringTracers", "Tracers", "", "", ""); m_selectedSouringTracersUiField.xmlCapability()->disableIO(); m_selectedSouringTracersUiField.uiCapability()->setUiEditorTypeName(caf::PdmUiListEditor::uiEditorTypeName()); + m_selectedSouringTracersUiField.uiCapability()->setUiLabelPosition(m_labelPosition); } //-------------------------------------------------------------------------------------------------- @@ -1188,14 +1192,6 @@ void RimEclipseResultDefinition::setDiffResultOptionsEnabled(bool enabled) m_diffResultOptionsEnabled = true; } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimEclipseResultDefinition::setLabelsOnTop(bool labelsOnTop) -{ - m_labelsOnTop = labelsOnTop; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -1326,19 +1322,6 @@ void RimEclipseResultDefinition::defineUiOrdering(QString uiConfigName, caf::Pdm m_resultVariableUiField.uiCapability()->setUiName(resultPropertyLabel); } - if (m_labelsOnTop) - { - std::vector fields; - this->fields(fields); - for (auto field : fields) - { - if (field->uiCapability()) - { - field->uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::TOP); - } - } - } - uiOrdering.skipRemainingFields(true); } diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h index 64e114f4ed..9feddca70c 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h @@ -70,7 +70,7 @@ public: }; public: - RimEclipseResultDefinition(); + RimEclipseResultDefinition(caf::PdmUiItemInfo::LabelPosType labelPosition = caf::PdmUiItemInfo::LEFT); ~RimEclipseResultDefinition() override; void simpleCopy(const RimEclipseResultDefinition* other); @@ -122,7 +122,6 @@ public: void updateUiFieldsFromActiveResult(); void setDiffResultOptionsEnabled(bool enabled); - void setLabelsOnTop(bool labelsOnTop); bool hasDualPorFractureResult(); @@ -223,9 +222,10 @@ private: void ensureProcessingOfObsoleteFields(); bool isTernaryEnabled() const; + private: - bool m_diffResultOptionsEnabled; - bool m_labelsOnTop; - bool m_ternaryEnabled; + bool m_diffResultOptionsEnabled; + caf::PdmUiItemInfo::LabelPosType m_labelPosition; + bool m_ternaryEnabled; }; diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiFormLayoutObjectEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiFormLayoutObjectEditor.cpp index 0442680733..8522db61e6 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiFormLayoutObjectEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiFormLayoutObjectEditor.cpp @@ -197,7 +197,8 @@ void caf::PdmUiFormLayoutObjectEditor::recursivelyConfigureAndUpdateUiOrderingIn labelAndFieldVerticalLayout->addWidget(fieldEditorWidget, 1, Qt::AlignTop); // Apply margins determined by the editor type - fieldLabelWidget->setContentsMargins(fieldEditor->labelContentMargins()); + //fieldLabelWidget->setContentsMargins(fieldEditor->labelContentMargins()); + currentColumn += itemColumnSpan; } else {