OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-16 18:34:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3269 Compdat Export Performance : Moved fields to private and protected

Browse Source
This commit is contained in:
Magne Sjaastad 2018-08-24 09:34:24 +02:00
parent d88bff3a72
commit b3a7dc943c
5 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@ -91,8 +91,8 @@ RimEclipseCase::RimEclipseCase()
CAF_PDM_InitFieldNoDefault(&m_fractureModelResults, "FractureModelResults", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_fractureModelResults, "FractureModelResults", "", "", "", "");
m_fractureModelResults.uiCapability()->setUiHidden(true); m_fractureModelResults.uiCapability()->setUiHidden(true);
CAF_PDM_InitField(&flipXAxis, "FlipXAxis", false, "Flip X Axis", "", "", ""); CAF_PDM_InitField(&m_flipXAxis, "FlipXAxis", false, "Flip X Axis", "", "", "");
CAF_PDM_InitField(&flipYAxis, "FlipYAxis", false, "Flip Y Axis", "", "", ""); CAF_PDM_InitField(&m_flipYAxis, "FlipYAxis", false, "Flip Y Axis", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_filesContainingFaultsSemColSeparated, "CachedFileNamesContainingFaults", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_filesContainingFaultsSemColSeparated, "CachedFileNamesContainingFaults", "", "", "", "");
m_filesContainingFaultsSemColSeparated.uiCapability()->setUiHidden(true); m_filesContainingFaultsSemColSeparated.uiCapability()->setUiHidden(true);
@ -397,18 +397,18 @@ const RigVirtualPerforationTransmissibilities* RimEclipseCase::computeAndGetVirt
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimEclipseCase::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) void RimEclipseCase::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{ {
if (changedField == &releaseResultMemory) if (changedField == &m_releaseResultMemory)
{ {
reloadDataAndUpdate(); reloadDataAndUpdate();
releaseResultMemory = oldValue.toBool(); m_releaseResultMemory = oldValue.toBool();
} }
else if (changedField == &flipXAxis || changedField == &flipYAxis) else if (changedField == &m_flipXAxis || changedField == &m_flipYAxis)
{ {
RigEclipseCaseData* rigEclipseCase = eclipseCaseData(); RigEclipseCaseData* rigEclipseCase = eclipseCaseData();
if (rigEclipseCase) if (rigEclipseCase)
{ {
rigEclipseCase->mainGrid()->setFlipAxis(flipXAxis, flipYAxis); rigEclipseCase->mainGrid()->setFlipAxis(m_flipXAxis, m_flipYAxis);
computeCachedData(); computeCachedData();

15
ApplicationCode/ProjectDataModel/RimEclipseCase.h
View File

@ -61,12 +61,8 @@ public:
RimEclipseCase(); RimEclipseCase();
virtual ~RimEclipseCase(); virtual ~RimEclipseCase();
// Fields: // Fields:
caf::PdmField<bool> releaseResultMemory;
caf::PdmChildArrayField<RimEclipseView*> reservoirViews; caf::PdmChildArrayField<RimEclipseView*> reservoirViews;
caf::PdmField<bool> flipXAxis;
caf::PdmField<bool> flipYAxis;
std::vector<QString> filesContainingFaults() const; std::vector<QString> filesContainingFaults() const;
void setFilesContainingFaults(const std::vector<QString>& val); void setFilesContainingFaults(const std::vector<QString>& val);
@ -133,12 +129,17 @@ private:
void createTimeStepFormatString(); void createTimeStepFormatString();
virtual std::vector<Rim3dView*> allSpecialViews() const override; virtual std::vector<Rim3dView*> allSpecialViews() const override;
protected:
caf::PdmField<bool> m_flipXAxis;
caf::PdmField<bool> m_flipYAxis;
private: private:
caf::PdmField<QString> m_filesContainingFaultsSemColSeparated;
caf::PdmField<bool> m_releaseResultMemory;
cvf::ref<RigEclipseCaseData> m_rigEclipseCase; cvf::ref<RigEclipseCaseData> m_rigEclipseCase;
QString m_timeStepFormatString; QString m_timeStepFormatString;
std::map<QString , cvf::Color3f> m_wellToColorMap; std::map<QString, cvf::Color3f> m_wellToColorMap;
caf::PdmField<QString > m_filesContainingFaultsSemColSeparated;
caf::PdmChildField<RimReservoirCellResultsStorage*> m_matrixModelResults; caf::PdmChildField<RimReservoirCellResultsStorage*> m_matrixModelResults;
caf::PdmChildField<RimReservoirCellResultsStorage*> m_fractureModelResults; caf::PdmChildField<RimReservoirCellResultsStorage*> m_fractureModelResults;

8
ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp
View File

@ -124,7 +124,7 @@ bool RimEclipseInputCase::openDataFileSet(const QStringList& fileNames)
this->caseUserDescription = caseName; this->caseUserDescription = caseName;
this->eclipseCaseData()->mainGrid()->setFlipAxis(flipXAxis, flipYAxis); this->eclipseCaseData()->mainGrid()->setFlipAxis(m_flipXAxis, m_flipYAxis);
computeCachedData(); computeCachedData();
@ -208,7 +208,7 @@ bool RimEclipseInputCase::openEclipseGridFile()
results(RiaDefines::MATRIX_MODEL)->setReaderInterface(readerInterface.p()); results(RiaDefines::MATRIX_MODEL)->setReaderInterface(readerInterface.p());
results(RiaDefines::FRACTURE_MODEL)->setReaderInterface(readerInterface.p()); results(RiaDefines::FRACTURE_MODEL)->setReaderInterface(readerInterface.p());
this->eclipseCaseData()->mainGrid()->setFlipAxis(flipXAxis, flipYAxis); this->eclipseCaseData()->mainGrid()->setFlipAxis(m_flipXAxis, m_flipYAxis);
computeCachedData(); computeCachedData();
loadAndSyncronizeInputProperties(); loadAndSyncronizeInputProperties();
@ -397,8 +397,8 @@ void RimEclipseInputCase::defineUiOrdering(QString uiConfigName, caf::PdmUiOrder
auto group = uiOrdering.addNewGroup("Case Options"); auto group = uiOrdering.addNewGroup("Case Options");
group->add(&activeFormationNames); group->add(&activeFormationNames);
group->add(&flipXAxis); group->add(&m_flipXAxis);
group->add(&flipYAxis); group->add(&m_flipYAxis);
} }

8
ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp
View File

@ -79,9 +79,9 @@ RimEclipseResultCase::RimEclipseResultCase()
caseDirectory.xmlCapability()->setIOWritable(false); caseDirectory.xmlCapability()->setIOWritable(false);
caseDirectory.uiCapability()->setUiHidden(true); caseDirectory.uiCapability()->setUiHidden(true);
flipXAxis.xmlCapability()->setIOWritable(true); m_flipXAxis.xmlCapability()->setIOWritable(true);
//flipXAxis.uiCapability()->setUiHidden(true); //flipXAxis.uiCapability()->setUiHidden(true);
flipYAxis.xmlCapability()->setIOWritable(true); m_flipYAxis.xmlCapability()->setIOWritable(true);
//flipYAxis.uiCapability()->setUiHidden(true); //flipYAxis.uiCapability()->setUiHidden(true);
CAF_PDM_InitField(&m_sourSimFileName, "SourSimFileName", QString(), "SourSim File Name", "", "", ""); CAF_PDM_InitField(&m_sourSimFileName, "SourSimFileName", QString(), "SourSim File Name", "", "", "");
@ -590,8 +590,8 @@ void RimEclipseResultCase::defineUiOrdering(QString uiConfigName, caf::PdmUiOrde
auto group = uiOrdering.addNewGroup("Case Options"); auto group = uiOrdering.addNewGroup("Case Options");
group->add(&activeFormationNames); group->add(&activeFormationNames);
group->add(&flipXAxis); group->add(&m_flipXAxis);
group->add(&flipYAxis); group->add(&m_flipYAxis);
if (eclipseCaseData() if (eclipseCaseData()
&& eclipseCaseData()->results(RiaDefines::MATRIX_MODEL) && eclipseCaseData()->results(RiaDefines::MATRIX_MODEL)

8
ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp
View File

@ -113,8 +113,8 @@ RimEclipseStatisticsCase::RimEclipseStatisticsCase()
m_populateSelectionAfterLoadingGrid = false; m_populateSelectionAfterLoadingGrid = false;
// These does not work properly for statistics case, so hide for now // These does not work properly for statistics case, so hide for now
flipXAxis.uiCapability()->setUiHidden(true); m_flipXAxis.uiCapability()->setUiHidden(true);
flipYAxis.uiCapability()->setUiHidden(true); m_flipYAxis.uiCapability()->setUiHidden(true);
activeFormationNames.uiCapability()->setUiHidden(true); activeFormationNames.uiCapability()->setUiHidden(true);
} }
@ -385,8 +385,8 @@ void RimEclipseStatisticsCase::defineUiOrdering(QString uiConfigName, caf::PdmUi
group = uiOrdering.addNewGroup("Case Options"); group = uiOrdering.addNewGroup("Case Options");
group->add(&m_wellDataSourceCase); group->add(&m_wellDataSourceCase);
group->add(&activeFormationNames); group->add(&activeFormationNames);
group->add(&flipXAxis); group->add(&m_flipXAxis);
group->add(&flipYAxis); group->add(&m_flipYAxis);
} }
QList<caf::PdmOptionItemInfo> toOptionList(const QStringList& varList) QList<caf::PdmOptionItemInfo> toOptionList(const QStringList& varList)