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

#1930 Curve creator. GUI adjustments

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2017-09-25 09:51:27 +02:00
parent 5d52ba2a83
commit 05c07693b6
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp
View File

@ -180,15 +180,17 @@ RicSummaryCurveCreator::RicSummaryCurveCreator() : m_identifierFieldsMap(
CAF_PDM_InitFieldNoDefault(&m_groupAppearanceType, "GroupAppearanceType", "Group", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_groupAppearanceType, "GroupAppearanceType", "Group", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_regionAppearanceType, "RegionAppearanceType", "Region", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_regionAppearanceType, "RegionAppearanceType", "Region", "", "", "");
//m_targetPlot
m_previewPlot = new RimSummaryPlot(); m_previewPlot = new RimSummaryPlot();
m_previewPlot->setShowDescription(false);
for (const auto& itemTypes : m_identifierFieldsMap) for (const auto& itemTypes : m_identifierFieldsMap)
{ {
for (const auto& itemInputType : itemTypes.second) for (const auto& itemInputType : itemTypes.second)
{ {
itemInputType->pdmField()->uiCapability()->setUiEditorTypeName(caf::PdmUiTreeSelectionEditor::uiEditorTypeName()); itemInputType->pdmField()->uiCapability()->setUiEditorTypeName(caf::PdmUiTreeSelectionEditor::uiEditorTypeName());
itemInputType->pdmField()->uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::TOP);
itemInputType->pdmField()->uiCapability()->setUiLabelPosition(itemTypes.second.size() > 2 ?
caf::PdmUiItemInfo::TOP : caf::PdmUiItemInfo::HIDDEN);
} }
itemTypes.second.back()->pdmField()->uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN); itemTypes.second.back()->pdmField()->uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
} }
@ -593,7 +595,7 @@ void RicSummaryCurveCreator::defineUiOrdering(QString uiConfigName, caf::PdmUiOr
// Appearance settings // Appearance settings
caf::PdmUiGroup* appearanceGroup = uiOrdering.addNewGroupWithKeyword("Curve Appearance Settings", RicSummaryCurveCreatorUiKeywords::appearance()); caf::PdmUiGroup* appearanceGroup = uiOrdering.addNewGroupWithKeyword("Curve Appearance Assignment", RicSummaryCurveCreatorUiKeywords::appearance());
caf::PdmUiGroup* appearanceSubGroup = appearanceGroup->addNewGroup("Appearance Type Assignment"); caf::PdmUiGroup* appearanceSubGroup = appearanceGroup->addNewGroup("Appearance Type Assignment");
appearanceGroup->setCollapsedByDefault(true); appearanceGroup->setCollapsedByDefault(true);
appearanceSubGroup->add(&m_useAutoAppearanceAssignment); appearanceSubGroup->add(&m_useAutoAppearanceAssignment);

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp
View File

@ -36,7 +36,7 @@ CAF_PDM_SOURCE_INIT(RimSummaryCurveCollection, "RimSummaryCurveCollection");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryCurveCollection::RimSummaryCurveCollection() RimSummaryCurveCollection::RimSummaryCurveCollection()
{ {
CAF_PDM_InitObject("Curve Collection", ":/SummaryCurveFilter16x16.png", "", ""); CAF_PDM_InitObject("Summary Curves", ":/SummaryCurveFilter16x16.png", "", "");
CAF_PDM_InitFieldNoDefault(&m_curves, "CollectionCurves", "Collection Curves", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_curves, "CollectionCurves", "Collection Curves", "", "", "");
m_curves.uiCapability()->setUiHidden(true); m_curves.uiCapability()->setUiHidden(true);

8
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@ -1134,6 +1134,14 @@ QString RimSummaryPlot::description() const
return m_userName(); return m_userName();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryPlot::setShowDescription(bool showDescription)
{
m_showPlotTitle = showDescription;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h
View File

@ -54,6 +54,7 @@ public:
void setDescription(const QString& description); void setDescription(const QString& description);
QString description() const; QString description() const;
void setShowDescription(bool showDescription);
void addCurveAndUpdate(RimSummaryCurve* curve); void addCurveAndUpdate(RimSummaryCurve* curve);
void addCurveNoUpdate(RimSummaryCurve* curve); void addCurveNoUpdate(RimSummaryCurve* curve);
@ -133,7 +134,6 @@ private:
void updateTimeAxis(); void updateTimeAxis();
void setZoomIntervalsInQwtPlot(); void setZoomIntervalsInQwtPlot();
private: private:
caf::PdmField<bool> m_showPlotTitle; caf::PdmField<bool> m_showPlotTitle;
caf::PdmField<bool> m_showLegend; caf::PdmField<bool> m_showLegend;