mirror of
https://github.com/OPM/ResInsight.git
synced 2026-11-04 13:16:56 -06:00
#1813 Observed data: Move uniqueShortName to RimOilField to include observedData
This commit is contained in:
1 parent
12c8051266
commit
28c86b08d7
3 files changed
+84
-9
No files matched your search
@@ -19,13 +19,15 @@
|
||||
#include "RimSummaryCase.h"
|
||||
|
||||
#include "RigSummaryCaseData.h"
|
||||
|
||||
#include "RimEclipseCase.h"
|
||||
#include "RimMainPlotCollection.h"
|
||||
#include "RimOilField.h"
|
||||
#include "RimProject.h"
|
||||
#include "RimSummaryCaseMainCollection.h"
|
||||
#include "RimSummaryPlotCollection.h"
|
||||
|
||||
#include <QFileInfo>
|
||||
#include "RimProject.h"
|
||||
#include "RimSummaryPlotCollection.h"
|
||||
#include "RimMainPlotCollection.h"
|
||||
|
||||
CAF_PDM_ABSTRACT_SOURCE_INIT(RimSummaryCase,"SummaryCase");
|
||||
|
||||
@@ -157,16 +159,16 @@ void RimSummaryCase::updateAutoShortName()
|
||||
{
|
||||
if(m_useAutoShortName)
|
||||
{
|
||||
RimSummaryCaseMainCollection* summaryCaseMainCollection = NULL;
|
||||
this->firstAncestorOrThisOfType(summaryCaseMainCollection);
|
||||
CVF_ASSERT(summaryCaseMainCollection);
|
||||
RimOilField* oilField = NULL;
|
||||
this->firstAncestorOrThisOfType(oilField);
|
||||
CVF_ASSERT(oilField);
|
||||
|
||||
m_shortName = summaryCaseMainCollection->uniqueShortNameForCase(this);
|
||||
updateTreeItemName();
|
||||
m_shortName = oilField->uniqueShortNameForCase(this);
|
||||
}
|
||||
else if (m_shortName() == QString("Display Name"))
|
||||
{
|
||||
m_shortName = caseName();
|
||||
updateTreeItemName();
|
||||
}
|
||||
|
||||
updateTreeItemName();
|
||||
}
|
||||
Reference in new issue
Block a user