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

#8397 Summary Curve : Add long vector name to auto name for curves

Browse Source
This commit is contained in:
Magne Sjaastad 2021-12-29 15:02:03 +01:00
parent 60873e54f4
commit 0fbd668569
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,8 @@
#include "SummaryPlotCommands/RicSummaryPlotEditorUi.h" #include "SummaryPlotCommands/RicSummaryPlotEditorUi.h"
#include "RiuSummaryQuantityNameInfoProvider.h"
#include "cafPdmUiPushButtonEditor.h" #include "cafPdmUiPushButtonEditor.h"
CAF_PDM_SOURCE_INIT( RimSummaryCurveAutoName, "SummaryCurveAutoName" ); CAF_PDM_SOURCE_INIT( RimSummaryCurveAutoName, "SummaryCurveAutoName" );
@ -43,8 +45,9 @@ RimSummaryCurveAutoName::RimSummaryCurveAutoName()
// clang-format off // clang-format off
CAF_PDM_InitObject("RimSummaryCurveAutoName", "", "", ""); CAF_PDM_InitObject("RimSummaryCurveAutoName", "", "", "");
CAF_PDM_InitField(&m_longVectorName, "LongVectorName", false, "Long Vector Name", "", "", "");
CAF_PDM_InitField(&m_vectorName, "VectorName", true, "Vector Name", "", "", ""); CAF_PDM_InitField(&m_vectorName, "VectorName", true, "Vector Name", "", "", "");
CAF_PDM_InitField(&m_unit, "Unit", false,"Unit", "", "", ""); CAF_PDM_InitField(&m_unit, "Unit", false, "Unit", "", "", "");
CAF_PDM_InitField(&m_regionNumber, "RegionNumber", true, "Region Number", "", "", ""); CAF_PDM_InitField(&m_regionNumber, "RegionNumber", true, "Region Number", "", "", "");
CAF_PDM_InitField(&m_wellGroupName, "WellGroupName", true, "Group Name", "", "", ""); CAF_PDM_InitField(&m_wellGroupName, "WellGroupName", true, "Group Name", "", "", "");
CAF_PDM_InitField(&m_wellName, "WellName", true, "Well Name", "", "", ""); CAF_PDM_InitField(&m_wellName, "WellName", true, "Well Name", "", "", "");
@ -135,6 +138,7 @@ void RimSummaryCurveAutoName::applySettings( const RimSummaryCurveAutoName& othe
{ {
m_caseName = other.m_caseName; m_caseName = other.m_caseName;
m_vectorName = other.m_vectorName; m_vectorName = other.m_vectorName;
m_longVectorName = other.m_longVectorName;
m_unit = other.m_unit; m_unit = other.m_unit;
m_regionNumber = other.m_regionNumber; m_regionNumber = other.m_regionNumber;
m_wellGroupName = other.m_wellGroupName; m_wellGroupName = other.m_wellGroupName;
@ -188,9 +192,20 @@ QString RimSummaryCurveAutoName::buildCurveName( const RifEclipseSummaryAddress&
{ {
bool skipSubString = nameHelper && nameHelper->isPlotDisplayingSingleQuantity(); bool skipSubString = nameHelper && nameHelper->isPlotDisplayingSingleQuantity();
if ( !skipSubString ) if ( !skipSubString )
{
if ( m_longVectorName() )
{
auto quantityName = summaryAddress.quantityName();
if ( summaryAddress.isHistoryQuantity() )
quantityName = quantityName.substr( 0, quantityName.size() - 1 );
text = RiuSummaryQuantityNameInfoProvider::instance()->longNameFromQuantityName( quantityName );
}
else
{ {
text = summaryAddress.quantityName(); text = summaryAddress.quantityName();
} }
}
if ( summaryAddress.category() == RifEclipseSummaryAddress::SUMMARY_ENSEMBLE_STATISTICS ) if ( summaryAddress.category() == RifEclipseSummaryAddress::SUMMARY_ENSEMBLE_STATISTICS )
{ {
@ -424,6 +439,7 @@ void RimSummaryCurveAutoName::defineUiOrdering( QString uiConfigName, caf::PdmUi
{ {
uiOrdering.add( &m_caseName ); uiOrdering.add( &m_caseName );
uiOrdering.add( &m_vectorName ); uiOrdering.add( &m_vectorName );
uiOrdering.add( &m_longVectorName );
uiOrdering.add( &m_wellGroupName ); uiOrdering.add( &m_wellGroupName );
uiOrdering.add( &m_wellName ); uiOrdering.add( &m_wellName );

1
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.h
View File

@ -57,6 +57,7 @@ private:
private: private:
caf::PdmField<bool> m_vectorName; caf::PdmField<bool> m_vectorName;
caf::PdmField<bool> m_longVectorName;
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;