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

#864 Improved UI label names

Browse Source
This commit is contained in:
Magne Sjaastad 2016-11-04 14:40:24 +01:00
parent 1bd070a8f5
commit 65f118ba24
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp
View File

@ -34,16 +34,16 @@ RimSummaryCurveAutoName::RimSummaryCurveAutoName()
{ {
CAF_PDM_InitObject("RimSummaryCurveAutoName", "", "", ""); CAF_PDM_InitObject("RimSummaryCurveAutoName", "", "", "");
CAF_PDM_InitField(&m_quantity, "Quantity", true, "Quantity", "", "", ""); CAF_PDM_InitField(&m_vectorName, "VectorName", true, "Vector Name", "", "", "");
CAF_PDM_InitField(&m_unit, "Unit", true, "Unit", "", "", ""); CAF_PDM_InitField(&m_unit, "Unit", true, "Unit", "", "", "");
CAF_PDM_InitField(&m_regionNumber, "RegionNumber", true, "RegionNumber", "", "", ""); CAF_PDM_InitField(&m_regionNumber, "RegionNumber", true, "Region Number", "", "", "");
CAF_PDM_InitField(&m_wellGroupName, "WellGroupName", true, "WellGroupName", "", "", ""); CAF_PDM_InitField(&m_wellGroupName, "WellGroupName", true, "Well Group Name", "", "", "");
CAF_PDM_InitField(&m_wellName, "WellName", true, "WellName", "", "", ""); CAF_PDM_InitField(&m_wellName, "WellName", true, "Well Name", "", "", "");
CAF_PDM_InitField(&m_wellSegmentNumber, "WellSegmentNumber", true, "WellSegmentNumber", "", "", ""); CAF_PDM_InitField(&m_wellSegmentNumber, "WellSegmentNumber", true, "Well Segment Number", "", "", "");
CAF_PDM_InitField(&m_lgrName, "LgrName", true, "LgrName", "", "", ""); CAF_PDM_InitField(&m_lgrName, "LgrName", true, "Lgr Name", "", "", "");
CAF_PDM_InitField(&m_completion, "Completion", true, "Completion", "", "", ""); CAF_PDM_InitField(&m_completion, "Completion", true, "Completion", "", "", "");
CAF_PDM_InitField(&m_caseName, "CaseName", true, "CaseName", "", "", ""); CAF_PDM_InitField(&m_caseName, "CaseName", true, "Case Name", "", "", "");
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -56,7 +56,7 @@ QString RimSummaryCurveAutoName::curveName(const RifEclipseSummaryAddress& summa
RimSummaryCurve* summaryCurve = nullptr; RimSummaryCurve* summaryCurve = nullptr;
this->firstAncestorOrThisOfType(summaryCurve); this->firstAncestorOrThisOfType(summaryCurve);
if (m_quantity) if (m_vectorName)
{ {
text += summaryAddress.quantityName(); text += summaryAddress.quantityName();
@ -231,7 +231,7 @@ void RimSummaryCurveAutoName::fieldChangedByUi(const caf::PdmFieldHandle* change
void RimSummaryCurveAutoName::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) void RimSummaryCurveAutoName::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{ {
uiOrdering.add(&m_caseName); uiOrdering.add(&m_caseName);
uiOrdering.add(&m_quantity); uiOrdering.add(&m_vectorName);
uiOrdering.add(&m_unit); uiOrdering.add(&m_unit);
uiOrdering.add(&m_regionNumber); uiOrdering.add(&m_regionNumber);
uiOrdering.add(&m_wellGroupName); uiOrdering.add(&m_wellGroupName);

14
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.h
View File

@ -31,21 +31,21 @@ class RimSummaryCurveAutoName : public caf::PdmObject
public: public:
RimSummaryCurveAutoName();; RimSummaryCurveAutoName();;
QString curveName(const RifEclipseSummaryAddress& summaryAddress) const; QString curveName(const RifEclipseSummaryAddress& summaryAddress) const;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
protected: protected:
friend RimSummaryCurve; friend RimSummaryCurve;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
private: private:
void appendWellName(std::string& text, const RifEclipseSummaryAddress& summaryAddress) const; void appendWellName(std::string& text, const RifEclipseSummaryAddress& summaryAddress) const;
void appendLgrName(std::string& text, const RifEclipseSummaryAddress& summaryAddress) const; void appendLgrName(std::string& text, const RifEclipseSummaryAddress& summaryAddress) const;
private: private:
caf::PdmField<bool> m_quantity; caf::PdmField<bool> m_vectorName;
caf::PdmField<bool> m_unit; caf::PdmField<bool> m_unit;
caf::PdmField<bool> m_regionNumber; caf::PdmField<bool> m_regionNumber;
caf::PdmField<bool> m_wellGroupName; caf::PdmField<bool> m_wellGroupName;