From d371da246f887856d26c3e302ddc892fbbf5f802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Fri, 14 Aug 2015 13:18:42 +0200 Subject: [PATCH] Renamed uiPdmModel() to uiPdmModel_OBSOLETE() To make it easier to see what code is using the obsolete stuff. --- ApplicationCode/Application/RiaApplication.cpp | 14 +++++++------- .../ProjectDataModel/RimEclipseCellColors.cpp | 4 ++-- .../ProjectDataModel/RimEclipseStatisticsCase.cpp | 4 ++-- .../ProjectDataModel/RimScriptCollection.cpp | 2 +- .../SocketInterface/RiaPropertyDataCommands.cpp | 4 ++-- ApplicationCode/UserInterface/RiuMainWindow.h | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp index 3bb50afdf9..27b49b8727 100644 --- a/ApplicationCode/Application/RiaApplication.cpp +++ b/ApplicationCode/Application/RiaApplication.cpp @@ -446,12 +446,12 @@ void RiaApplication::addWellPathsToModel(QList wellPathFilePaths) oilField->wellPathCollection->setProject(m_project); m_project->updateConnectedEditors(); - RiuMainWindow::instance()->uiPdmModel()->updateUiSubTree(m_project); + RiuMainWindow::instance()->uiPdmModel_OBSOLETE()->updateUiSubTree(m_project); } if (oilField->wellPathCollection) oilField->wellPathCollection->addWellPaths(wellPathFilePaths); - RiuMainWindow::instance()->uiPdmModel()->updateUiSubTree(oilField->wellPathCollection); + RiuMainWindow::instance()->uiPdmModel_OBSOLETE()->updateUiSubTree(oilField->wellPathCollection); oilField->wellPathCollection->updateConnectedEditors(); } @@ -665,7 +665,7 @@ bool RiaApplication::openEclipseCase(const QString& caseName, const QString& cas riv->cellResult()->setResultVariable(RimDefines::undefinedResultName()); } - RimUiTreeModelPdm* uiModel = RiuMainWindow::instance()->uiPdmModel(); + RimUiTreeModelPdm* uiModel = RiuMainWindow::instance()->uiPdmModel_OBSOLETE(); uiModel->updateUiSubTree(analysisModels); analysisModels->updateConnectedEditors(); @@ -704,7 +704,7 @@ bool RiaApplication::openInputEclipseCaseFromFileNames(const QStringList& fileNa riv->cellResult()->setResultVariable(RimDefines::undefinedResultName()); } - RimUiTreeModelPdm* uiModel = RiuMainWindow::instance()->uiPdmModel(); + RimUiTreeModelPdm* uiModel = RiuMainWindow::instance()->uiPdmModel_OBSOLETE(); uiModel->updateUiSubTree(analysisModels); analysisModels->updateConnectedEditors(); @@ -751,7 +751,7 @@ bool RiaApplication::openOdbCaseFromFile(const QString& fileName) //} progress.incrementProgress(); progress.setProgressDescription("Loading results information"); - RimUiTreeModelPdm* uiModel = RiuMainWindow::instance()->uiPdmModel(); + RimUiTreeModelPdm* uiModel = RiuMainWindow::instance()->uiPdmModel_OBSOLETE(); uiModel->updateUiSubTree(m_project); m_project->updateConnectedEditors(); @@ -1327,7 +1327,7 @@ void RiaApplication::applyPreferences() if (this->project()) { this->project()->setScriptDirectories(m_preferences->scriptDirectories()); - RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel(); + RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel_OBSOLETE(); if (treeModel) treeModel->updateUiSubTree(this->project()->scriptCollection()); this->project()->scriptCollection()->updateConnectedEditors(); } @@ -1783,7 +1783,7 @@ bool RiaApplication::addEclipseCases(const QStringList& fileNames) gridCaseGroup->loadMainCaseAndActiveCellInfo(); } - RimUiTreeModelPdm* uiModel = RiuMainWindow::instance()->uiPdmModel(); + RimUiTreeModelPdm* uiModel = RiuMainWindow::instance()->uiPdmModel_OBSOLETE(); uiModel->updateUiSubTree( m_project->activeOilField()->analysisModels()); m_project->activeOilField()->analysisModels()->updateConnectedEditors(); diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp b/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp index b747e361bc..d3a12b389a 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp @@ -90,11 +90,11 @@ void RimEclipseCellColors::fieldChangedByUi(const caf::PdmFieldHandle* changedFi if (faultColors) { faultColors->updateConnectedEditors(); - RiuMainWindow::instance()->uiPdmModel()->updateUiSubTree(faultColors); + RiuMainWindow::instance()->uiPdmModel_OBSOLETE()->updateUiSubTree(faultColors); } else { - RiuMainWindow::instance()->uiPdmModel()->updateUiSubTree(this); + RiuMainWindow::instance()->uiPdmModel_OBSOLETE()->updateUiSubTree(this); } } diff --git a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp index faeb42acf5..206d4c1eaf 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp @@ -451,7 +451,7 @@ void RimEclipseStatisticsCase::fieldChangedByUi(const caf::PdmFieldHandle* chang if (&m_wellDataSourceCase == changedField) { - RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel(); + RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel_OBSOLETE(); // Find or load well data for given case RimEclipseCase* sourceResultCase = caseGroup()->caseCollection()->findByDescription(m_wellDataSourceCase); @@ -479,7 +479,7 @@ void RimEclipseStatisticsCase::fieldChangedByUi(const caf::PdmFieldHandle* chang //-------------------------------------------------------------------------------------------------- void RimEclipseStatisticsCase::setWellResultsAndUpdateViews(const cvf::Collection& sourceCaseWellResults) { - RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel(); + RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel_OBSOLETE(); this->reservoirData()->setWellResults(sourceCaseWellResults); diff --git a/ApplicationCode/ProjectDataModel/RimScriptCollection.cpp b/ApplicationCode/ProjectDataModel/RimScriptCollection.cpp index 9543d2d48c..8e3184dc34 100644 --- a/ApplicationCode/ProjectDataModel/RimScriptCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimScriptCollection.cpp @@ -178,7 +178,7 @@ void RimScriptCollection::fieldChangedByUi(const caf::PdmFieldHandle *changedFie QFileInfo fi(directory); this->setUiName(fi.baseName()); this->readContentFromDisc(); - RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel(); + RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel_OBSOLETE(); if (treeModel) treeModel->updateUiSubTree(this); } } diff --git a/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp b/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp index 1867c6257a..41d5cb978e 100644 --- a/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp +++ b/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp @@ -642,7 +642,7 @@ public: inputProperty->eclipseKeyword = ""; inputProperty->fileName = ""; inputRes->m_inputPropertyCollection->inputProperties.push_back(inputProperty); - RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel(); + RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel_OBSOLETE(); treeModel->updateUiSubTree(inputRes->m_inputPropertyCollection()); inputRes->m_inputPropertyCollection()->updateConnectedEditors(); } @@ -1008,7 +1008,7 @@ public: inputProperty->eclipseKeyword = ""; inputProperty->fileName = ""; inputRes->m_inputPropertyCollection->inputProperties.push_back(inputProperty); - RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel(); + RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel_OBSOLETE(); treeModel->updateUiSubTree(inputRes->m_inputPropertyCollection()); inputRes->m_inputPropertyCollection()->updateConnectedEditors(); } diff --git a/ApplicationCode/UserInterface/RiuMainWindow.h b/ApplicationCode/UserInterface/RiuMainWindow.h index 06d8c39ca8..2de1c4592a 100644 --- a/ApplicationCode/UserInterface/RiuMainWindow.h +++ b/ApplicationCode/UserInterface/RiuMainWindow.h @@ -88,7 +88,7 @@ public: void updateScaleValue(); void forceProjectTreeRepaint(); - RimUiTreeModelPdm* uiPdmModel() { return m_OBSOLETE_treeModelPdm;} + RimUiTreeModelPdm* uiPdmModel_OBSOLETE() { return m_OBSOLETE_treeModelPdm;} RiuProcessMonitor* processMonitor();