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

#1813 Observed data: Change ui names

Browse Source
This commit is contained in:
Rebecca Cox 2017-09-19 14:19:39 +02:00
parent da2775d184
commit 1eecef9f72
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/Commands/RicImportObservedDataFeature.h
View File

@ -39,5 +39,6 @@ private:
virtual bool isCommandEnabled() override; virtual bool isCommandEnabled() override;
virtual void onActionTriggered(bool isChecked) override; virtual void onActionTriggered(bool isChecked) override;
virtual void setupActionLook(QAction* actionToSetup) override; virtual void setupActionLook(QAction* actionToSetup) override;
static bool createAndAddObservedDataFromFile(const QString& fileName);
static bool createAndAddObservedDataFromFile(const QString& fileName);
}; };

8
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -35,9 +35,9 @@
#include "RimEclipseWell.h" #include "RimEclipseWell.h"
#include "RimEclipseWellCollection.h" #include "RimEclipseWellCollection.h"
#include "RimFault.h" #include "RimFault.h"
#include "RimFlowCharacteristicsPlot.h"
#include "RimFlowDiagSolution.h" #include "RimFlowDiagSolution.h"
#include "RimFlowPlotCollection.h" #include "RimFlowPlotCollection.h"
#include "RimFlowCharacteristicsPlot.h"
#include "RimFormationNames.h" #include "RimFormationNames.h"
#include "RimFormationNamesCollection.h" #include "RimFormationNamesCollection.h"
#include "RimGeoMechCase.h" #include "RimGeoMechCase.h"
@ -48,6 +48,7 @@
#include "RimIntersection.h" #include "RimIntersection.h"
#include "RimIntersectionBox.h" #include "RimIntersectionBox.h"
#include "RimIntersectionCollection.h" #include "RimIntersectionCollection.h"
#include "RimObservedData.h"
#include "RimScriptCollection.h" #include "RimScriptCollection.h"
#include "RimSummaryCase.h" #include "RimSummaryCase.h"
#include "RimSummaryCurve.h" #include "RimSummaryCurve.h"
@ -322,7 +323,10 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
} }
else if (dynamic_cast<RimSummaryCase*>(uiItem)) else if (dynamic_cast<RimSummaryCase*>(uiItem))
{ {
commandIds << "RicNewSummaryPlotFeature"; if (!dynamic_cast<RimObservedData*>(uiItem))
{
commandIds << "RicNewSummaryPlotFeature";
}
} }
else if (dynamic_cast<RimWellLogFileChannel*>(uiItem)) else if (dynamic_cast<RimWellLogFileChannel*>(uiItem))
{ {

4
ApplicationCode/ProjectDataModel/RimObservedData.cpp
View File

@ -30,8 +30,8 @@ RimObservedData::RimObservedData()
{ {
m_isObservedData = true; m_isObservedData = true;
CAF_PDM_InitFieldNoDefault(&m_identifierType, "identifierType", "Identifier Type", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_summaryCategory, "SummaryType", "Summary Type", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_identifierName, "identifierName", "Identifier Name", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_identifierName, "IdentifierName", "Identifier Name", "", "", "");
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

7
ApplicationCode/ProjectDataModel/RimObservedData.h
View File

@ -17,8 +17,11 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#pragma once #pragma once
#include "RimSummaryCase.h" #include "RimSummaryCase.h"
#include "RifEclipseSummaryAddress.h"
#include "cafPdmField.h" #include "cafPdmField.h"
#include "cafPdmObject.h" #include "cafPdmObject.h"
#include "cvfObject.h" #include "cvfObject.h"
@ -38,6 +41,6 @@ public:
virtual void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath) override; virtual void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath) override;
private: private:
caf::PdmField<QString> m_identifierType; caf::PdmField<caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory> > m_summaryCategory;
caf::PdmField<QString> m_identifierName; caf::PdmField<QString> m_identifierName;
}; };

2
ApplicationCode/ProjectDataModel/RimSummaryObservedDataFile.cpp
View File

@ -31,7 +31,7 @@ CAF_PDM_SOURCE_INIT(RimSummaryObservedDataFile, "SummaryObservedDataFile");
RimSummaryObservedDataFile::RimSummaryObservedDataFile() RimSummaryObservedDataFile::RimSummaryObservedDataFile()
{ {
CAF_PDM_InitObject("Observed data file", ":/Default.png", "", ""); CAF_PDM_InitObject("Observed data file", ":/Default.png", "", "");
m_summaryHeaderFilename.uiCapability()->setUiName("File");
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------