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

Renamed uiPdmModel() to uiPdmModel_OBSOLETE()

Browse Source 
To make it easier to see what code is using the obsolete stuff.
This commit is contained in:
Jacob Støren
2015-08-14 13:18:42 +02:00
parent d0e1bedd8c
commit d371da246f
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/Application/RiaApplication.cpp
View File

@@ -446,12 +446,12 @@ void RiaApplication::addWellPathsToModel(QList<QString> wellPathFilePaths)
oilField->wellPathCollection->setProject(m_project); oilField->wellPathCollection->setProject(m_project);
m_project->updateConnectedEditors(); m_project->updateConnectedEditors();
RiuMainWindow::instance()->uiPdmModel()->updateUiSubTree(m_project); RiuMainWindow::instance()->uiPdmModel_OBSOLETE()->updateUiSubTree(m_project);
} }
if (oilField->wellPathCollection) oilField->wellPathCollection->addWellPaths(wellPathFilePaths); if (oilField->wellPathCollection) oilField->wellPathCollection->addWellPaths(wellPathFilePaths);
RiuMainWindow::instance()->uiPdmModel()->updateUiSubTree(oilField->wellPathCollection); RiuMainWindow::instance()->uiPdmModel_OBSOLETE()->updateUiSubTree(oilField->wellPathCollection);
oilField->wellPathCollection->updateConnectedEditors(); oilField->wellPathCollection->updateConnectedEditors();
} }
@@ -665,7 +665,7 @@ bool RiaApplication::openEclipseCase(const QString& caseName, const QString& cas
riv->cellResult()->setResultVariable(RimDefines::undefinedResultName()); riv->cellResult()->setResultVariable(RimDefines::undefinedResultName());
} }
RimUiTreeModelPdm* uiModel = RiuMainWindow::instance()->uiPdmModel(); RimUiTreeModelPdm* uiModel = RiuMainWindow::instance()->uiPdmModel_OBSOLETE();
uiModel->updateUiSubTree(analysisModels); uiModel->updateUiSubTree(analysisModels);
analysisModels->updateConnectedEditors(); analysisModels->updateConnectedEditors();
@@ -704,7 +704,7 @@ bool RiaApplication::openInputEclipseCaseFromFileNames(const QStringList& fileNa
riv->cellResult()->setResultVariable(RimDefines::undefinedResultName()); riv->cellResult()->setResultVariable(RimDefines::undefinedResultName());
} }
RimUiTreeModelPdm* uiModel = RiuMainWindow::instance()->uiPdmModel(); RimUiTreeModelPdm* uiModel = RiuMainWindow::instance()->uiPdmModel_OBSOLETE();
uiModel->updateUiSubTree(analysisModels); uiModel->updateUiSubTree(analysisModels);
analysisModels->updateConnectedEditors(); analysisModels->updateConnectedEditors();
@@ -751,7 +751,7 @@ bool RiaApplication::openOdbCaseFromFile(const QString& fileName)
//} //}
progress.incrementProgress(); progress.incrementProgress();
progress.setProgressDescription("Loading results information"); progress.setProgressDescription("Loading results information");
RimUiTreeModelPdm* uiModel = RiuMainWindow::instance()->uiPdmModel(); RimUiTreeModelPdm* uiModel = RiuMainWindow::instance()->uiPdmModel_OBSOLETE();
uiModel->updateUiSubTree(m_project); uiModel->updateUiSubTree(m_project);
m_project->updateConnectedEditors(); m_project->updateConnectedEditors();
@@ -1327,7 +1327,7 @@ void RiaApplication::applyPreferences()
if (this->project()) if (this->project())
{ {
this->project()->setScriptDirectories(m_preferences->scriptDirectories()); this->project()->setScriptDirectories(m_preferences->scriptDirectories());
RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel(); RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel_OBSOLETE();
if (treeModel) treeModel->updateUiSubTree(this->project()->scriptCollection()); if (treeModel) treeModel->updateUiSubTree(this->project()->scriptCollection());
this->project()->scriptCollection()->updateConnectedEditors(); this->project()->scriptCollection()->updateConnectedEditors();
} }
@@ -1783,7 +1783,7 @@ bool RiaApplication::addEclipseCases(const QStringList& fileNames)
gridCaseGroup->loadMainCaseAndActiveCellInfo(); gridCaseGroup->loadMainCaseAndActiveCellInfo();
} }
RimUiTreeModelPdm* uiModel = RiuMainWindow::instance()->uiPdmModel(); RimUiTreeModelPdm* uiModel = RiuMainWindow::instance()->uiPdmModel_OBSOLETE();
uiModel->updateUiSubTree( m_project->activeOilField()->analysisModels()); uiModel->updateUiSubTree( m_project->activeOilField()->analysisModels());
m_project->activeOilField()->analysisModels()->updateConnectedEditors(); m_project->activeOilField()->analysisModels()->updateConnectedEditors();

4
ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp
View File

@@ -90,11 +90,11 @@ void RimEclipseCellColors::fieldChangedByUi(const caf::PdmFieldHandle* changedFi
if (faultColors) if (faultColors)
{ {
faultColors->updateConnectedEditors(); faultColors->updateConnectedEditors();
RiuMainWindow::instance()->uiPdmModel()->updateUiSubTree(faultColors); RiuMainWindow::instance()->uiPdmModel_OBSOLETE()->updateUiSubTree(faultColors);
} }
else else
{ {
RiuMainWindow::instance()->uiPdmModel()->updateUiSubTree(this); RiuMainWindow::instance()->uiPdmModel_OBSOLETE()->updateUiSubTree(this);
} }
} }

4
ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp
View File

@@ -451,7 +451,7 @@ void RimEclipseStatisticsCase::fieldChangedByUi(const caf::PdmFieldHandle* chang
if (&m_wellDataSourceCase == changedField) if (&m_wellDataSourceCase == changedField)
{ {
RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel(); RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel_OBSOLETE();
// Find or load well data for given case // Find or load well data for given case
RimEclipseCase* sourceResultCase = caseGroup()->caseCollection()->findByDescription(m_wellDataSourceCase); RimEclipseCase* sourceResultCase = caseGroup()->caseCollection()->findByDescription(m_wellDataSourceCase);
@@ -479,7 +479,7 @@ void RimEclipseStatisticsCase::fieldChangedByUi(const caf::PdmFieldHandle* chang
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimEclipseStatisticsCase::setWellResultsAndUpdateViews(const cvf::Collection<RigSingleWellResultsData>& sourceCaseWellResults) void RimEclipseStatisticsCase::setWellResultsAndUpdateViews(const cvf::Collection<RigSingleWellResultsData>& sourceCaseWellResults)
{ {
RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel(); RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel_OBSOLETE();
this->reservoirData()->setWellResults(sourceCaseWellResults); this->reservoirData()->setWellResults(sourceCaseWellResults);

2
ApplicationCode/ProjectDataModel/RimScriptCollection.cpp
View File

@@ -178,7 +178,7 @@ void RimScriptCollection::fieldChangedByUi(const caf::PdmFieldHandle *changedFie
QFileInfo fi(directory); QFileInfo fi(directory);
this->setUiName(fi.baseName()); this->setUiName(fi.baseName());
this->readContentFromDisc(); this->readContentFromDisc();
RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel(); RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel_OBSOLETE();
if (treeModel) treeModel->updateUiSubTree(this); if (treeModel) treeModel->updateUiSubTree(this);
} }
} }

4
ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
View File

@@ -642,7 +642,7 @@ public:
inputProperty->eclipseKeyword = ""; inputProperty->eclipseKeyword = "";
inputProperty->fileName = ""; inputProperty->fileName = "";
inputRes->m_inputPropertyCollection->inputProperties.push_back(inputProperty); inputRes->m_inputPropertyCollection->inputProperties.push_back(inputProperty);
RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel(); RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel_OBSOLETE();
treeModel->updateUiSubTree(inputRes->m_inputPropertyCollection()); treeModel->updateUiSubTree(inputRes->m_inputPropertyCollection());
inputRes->m_inputPropertyCollection()->updateConnectedEditors(); inputRes->m_inputPropertyCollection()->updateConnectedEditors();
} }
@@ -1008,7 +1008,7 @@ public:
inputProperty->eclipseKeyword = ""; inputProperty->eclipseKeyword = "";
inputProperty->fileName = ""; inputProperty->fileName = "";
inputRes->m_inputPropertyCollection->inputProperties.push_back(inputProperty); inputRes->m_inputPropertyCollection->inputProperties.push_back(inputProperty);
RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel(); RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel_OBSOLETE();
treeModel->updateUiSubTree(inputRes->m_inputPropertyCollection()); treeModel->updateUiSubTree(inputRes->m_inputPropertyCollection());
inputRes->m_inputPropertyCollection()->updateConnectedEditors(); inputRes->m_inputPropertyCollection()->updateConnectedEditors();
} }

2
ApplicationCode/UserInterface/RiuMainWindow.h
View File

@@ -88,7 +88,7 @@ public:
void updateScaleValue(); void updateScaleValue();
void forceProjectTreeRepaint(); void forceProjectTreeRepaint();
RimUiTreeModelPdm* uiPdmModel() { return m_OBSOLETE_treeModelPdm;} RimUiTreeModelPdm* uiPdmModel_OBSOLETE() { return m_OBSOLETE_treeModelPdm;}
RiuProcessMonitor* processMonitor(); RiuProcessMonitor* processMonitor();