OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Labels on top fixes

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-04-03 14:20:32 +02:00
parent 815689372a
commit 5e517e47dd
4 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp
View File

@ -94,17 +94,16 @@ RimGridCrossPlotDataSet::RimGridCrossPlotDataSet()
CAF_PDM_InitFieldNoDefault(&m_grouping, "Grouping", "Group Data by", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_grouping, "Grouping", "Group Data by", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_xAxisProperty, "XAxisProperty", "X-Axis Property", "", "", ""); 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()->setUiHidden(true);
m_xAxisProperty.uiCapability()->setUiTreeChildrenHidden(true); m_xAxisProperty.uiCapability()->setUiTreeChildrenHidden(true);
m_xAxisProperty->setLabelsOnTop(true);
m_xAxisProperty->setTernaryEnabled(false); m_xAxisProperty->setTernaryEnabled(false);
CAF_PDM_InitFieldNoDefault(&m_yAxisProperty, "YAxisProperty", "Y-Axis Property", "", "", ""); 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()->setUiHidden(true);
m_yAxisProperty.uiCapability()->setUiTreeChildrenHidden(true); m_yAxisProperty.uiCapability()->setUiTreeChildrenHidden(true);
m_yAxisProperty->setLabelsOnTop(true);
m_yAxisProperty->setTernaryEnabled(false); m_yAxisProperty->setTernaryEnabled(false);
CAF_PDM_InitFieldNoDefault(&m_groupingProperty, "GroupingProperty", "Data Grouping Property", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_groupingProperty, "GroupingProperty", "Data Grouping Property", "", "", "");

31
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@ -74,9 +74,9 @@ CAF_PDM_SOURCE_INIT(RimEclipseResultDefinition, "ResultDefinition");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimEclipseResultDefinition::RimEclipseResultDefinition() RimEclipseResultDefinition::RimEclipseResultDefinition(caf::PdmUiItemInfo::LabelPosType labelPosition)
: m_diffResultOptionsEnabled(false) : m_diffResultOptionsEnabled(false)
, m_labelsOnTop(false) , m_labelPosition(labelPosition)
, m_ternaryEnabled(true) , m_ternaryEnabled(true)
{ {
CAF_PDM_InitObject("Result Definition", "", "", ""); CAF_PDM_InitObject("Result Definition", "", "", "");
@ -114,19 +114,22 @@ RimEclipseResultDefinition::RimEclipseResultDefinition()
CAF_PDM_InitFieldNoDefault(&m_flowTracerSelectionMode, "FlowTracerSelectionMode", "Tracers", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_flowTracerSelectionMode, "FlowTracerSelectionMode", "Tracers", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_phaseSelection, "PhaseSelection", "Phases", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_phaseSelection, "PhaseSelection", "Phases", "", "", "");
m_phaseSelection.uiCapability()->setUiLabelPosition(m_labelPosition);
// Ui only fields // Ui only fields
CAF_PDM_InitFieldNoDefault(&m_resultTypeUiField, "MResultType", "Type", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_resultTypeUiField, "MResultType", "Type", "", "", "");
m_resultTypeUiField.xmlCapability()->disableIO(); m_resultTypeUiField.xmlCapability()->disableIO();
m_resultTypeUiField.uiCapability()->setUiLabelPosition(m_labelPosition);
CAF_PDM_InitFieldNoDefault(&m_porosityModelUiField, "MPorosityModelType", "Porosity", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_porosityModelUiField, "MPorosityModelType", "Porosity", "", "", "");
m_porosityModelUiField.xmlCapability()->disableIO(); m_porosityModelUiField.xmlCapability()->disableIO();
m_porosityModelUiField.uiCapability()->setUiLabelPosition(m_labelPosition);
CAF_PDM_InitField( CAF_PDM_InitField(
&m_resultVariableUiField, "MResultVariable", RiaDefines::undefinedResultName(), "Result Property", "", "", ""); &m_resultVariableUiField, "MResultVariable", RiaDefines::undefinedResultName(), "Result Property", "", "", "");
m_resultVariableUiField.xmlCapability()->disableIO(); m_resultVariableUiField.xmlCapability()->disableIO();
m_resultVariableUiField.uiCapability()->setUiEditorTypeName(caf::PdmUiListEditor::uiEditorTypeName()); m_resultVariableUiField.uiCapability()->setUiEditorTypeName(caf::PdmUiListEditor::uiEditorTypeName());
m_resultVariableUiField.uiCapability()->setUiLabelPosition(m_labelPosition);
CAF_PDM_InitFieldNoDefault(&m_flowSolutionUiField, "MFlowDiagSolution", "Solution", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_flowSolutionUiField, "MFlowDiagSolution", "Solution", "", "", "");
m_flowSolutionUiField.xmlCapability()->disableIO(); m_flowSolutionUiField.xmlCapability()->disableIO();
@ -151,6 +154,7 @@ RimEclipseResultDefinition::RimEclipseResultDefinition()
CAF_PDM_InitFieldNoDefault(&m_selectedSouringTracersUiField, "MSelectedSouringTracers", "Tracers", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_selectedSouringTracersUiField, "MSelectedSouringTracers", "Tracers", "", "", "");
m_selectedSouringTracersUiField.xmlCapability()->disableIO(); m_selectedSouringTracersUiField.xmlCapability()->disableIO();
m_selectedSouringTracersUiField.uiCapability()->setUiEditorTypeName(caf::PdmUiListEditor::uiEditorTypeName()); 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; 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); m_resultVariableUiField.uiCapability()->setUiName(resultPropertyLabel);
} }
if (m_labelsOnTop)
{
std::vector<caf::PdmFieldHandle*> fields;
this->fields(fields);
for (auto field : fields)
{
if (field->uiCapability())
{
field->uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::TOP);
}
}
}
uiOrdering.skipRemainingFields(true); uiOrdering.skipRemainingFields(true);
} }

10
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h
View File

@ -70,7 +70,7 @@ public:
}; };
public: public:
RimEclipseResultDefinition(); RimEclipseResultDefinition(caf::PdmUiItemInfo::LabelPosType labelPosition = caf::PdmUiItemInfo::LEFT);
~RimEclipseResultDefinition() override; ~RimEclipseResultDefinition() override;
void simpleCopy(const RimEclipseResultDefinition* other); void simpleCopy(const RimEclipseResultDefinition* other);
@ -122,7 +122,6 @@ public:
void updateUiFieldsFromActiveResult(); void updateUiFieldsFromActiveResult();
void setDiffResultOptionsEnabled(bool enabled); void setDiffResultOptionsEnabled(bool enabled);
void setLabelsOnTop(bool labelsOnTop);
bool hasDualPorFractureResult(); bool hasDualPorFractureResult();
@ -223,9 +222,10 @@ private:
void ensureProcessingOfObsoleteFields(); void ensureProcessingOfObsoleteFields();
bool isTernaryEnabled() const; bool isTernaryEnabled() const;
private: private:
bool m_diffResultOptionsEnabled; bool m_diffResultOptionsEnabled;
bool m_labelsOnTop; caf::PdmUiItemInfo::LabelPosType m_labelPosition;
bool m_ternaryEnabled; bool m_ternaryEnabled;
}; };

3
Fwk/AppFwk/cafUserInterface/cafPdmUiFormLayoutObjectEditor.cpp
View File

@ -197,7 +197,8 @@ void caf::PdmUiFormLayoutObjectEditor::recursivelyConfigureAndUpdateUiOrderingIn
labelAndFieldVerticalLayout->addWidget(fieldEditorWidget, 1, Qt::AlignTop); labelAndFieldVerticalLayout->addWidget(fieldEditorWidget, 1, Qt::AlignTop);
// Apply margins determined by the editor type // Apply margins determined by the editor type
fieldLabelWidget->setContentsMargins(fieldEditor->labelContentMargins()); //fieldLabelWidget->setContentsMargins(fieldEditor->labelContentMargins());
currentColumn += itemColumnSpan;
} }
else else
{ {