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

(#378) Refactored Expansion in MainWindow,

Browse Source 
Removed some use of the obsolete tree view model
This commit is contained in:
Jacob Støren 2015-08-14 18:06:22 +02:00
parent e805c893c6
commit 6ca74621ef
6 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/RicEclipseCaseNewGroupExec.cpp
View File

@ -74,7 +74,7 @@ void RicEclipseCaseNewGroupExec::redo()
analysisModels->caseGroups().push_back(createdObject); analysisModels->caseGroups().push_back(createdObject);
analysisModels->updateConnectedEditors(); analysisModels->updateConnectedEditors();
RiuMainWindow::instance()->setCurrentObjectInTreeView(createdObject); RiuMainWindow::instance()->setCurrentObjectInTreeView(createdObject);
RiuMainWindow::instance()->setExpanded(createdObject, true);
} }
} }

2
ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp
View File

@ -451,8 +451,6 @@ void RimEclipseStatisticsCase::fieldChangedByUi(const caf::PdmFieldHandle* chang
if (&m_wellDataSourceCase == changedField) if (&m_wellDataSourceCase == changedField)
{ {
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);
if (sourceResultCase) if (sourceResultCase)

1
ApplicationCode/ProjectDataModel/RimScriptCollection.cpp
View File

@ -178,6 +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_OBSOLETE(); RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel_OBSOLETE();
if (treeModel) treeModel->updateUiSubTree(this); if (treeModel) treeModel->updateUiSubTree(this);
} }

5
ApplicationCode/SocketInterface/RiaProjectInfoCommands.cpp
View File

@ -44,6 +44,7 @@
#include "RimWellPathCollection.h" #include "RimWellPathCollection.h"
#include "RimOilField.h" #include "RimOilField.h"
#include "RimEclipseCaseCollection.h" #include "RimEclipseCaseCollection.h"
#include "cafSelectionManager.h"
@ -122,11 +123,9 @@ public:
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
{ {
RiuMainWindow* ruiMainWindow = RiuMainWindow::instance();
if (ruiMainWindow)
{ {
std::vector<RimCase*> cases; std::vector<RimCase*> cases;
ruiMainWindow->selectedCases(cases); caf::SelectionManager::instance()->objectsByType(&cases);
std::vector<qint64> caseIds; std::vector<qint64> caseIds;
std::vector<QString> caseNames; std::vector<QString> caseNames;

17
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@ -2008,10 +2008,12 @@ void RiuMainWindow::updateScaleValue()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuMainWindow::selectedCases(std::vector<RimCase*>& cases) void RiuMainWindow::selectedCases(std::vector<RimCase*>& cases)
{ {
caf::SelectionManager::instance()->objectsByType(&cases);
#if 0 // OBSOLETE
if (m_OBSOLETE_treeView && m_OBSOLETE_treeView->selectionModel()) if (m_OBSOLETE_treeView && m_OBSOLETE_treeView->selectionModel())
{ {
QModelIndexList selectedModelIndexes = m_OBSOLETE_treeView->selectionModel()->selectedIndexes(); QModelIndexList selectedModelIndexes = m_OBSOLETE_treeView->selectionModel()->selectedIndexes();
caf::PdmObjectGroup group; caf::PdmObjectGroup group;
m_OBSOLETE_treeModelPdm->populateObjectGroupFromModelIndexList(selectedModelIndexes, &group); m_OBSOLETE_treeModelPdm->populateObjectGroupFromModelIndexList(selectedModelIndexes, &group);
@ -2023,6 +2025,7 @@ void RiuMainWindow::selectedCases(std::vector<RimCase*>& cases)
cases.push_back(typedObjects[i]); cases.push_back(typedObjects[i]);
} }
} }
#endif
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -2198,13 +2201,10 @@ void RiuMainWindow::appendActionsContextMenuForPdmObject(caf::PdmObjectHandle* p
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuMainWindow::setExpanded(const caf::PdmObject* pdmObject, bool expanded) void RiuMainWindow::setExpanded(const caf::PdmUiItem* uiItem, bool expanded)
{ {
QModelIndex mi = m_OBSOLETE_treeModelPdm->getModelIndexFromPdmObject(pdmObject);
if (m_OBSOLETE_treeView && mi.isValid()) m_projectTreeView->setExpanded(uiItem, expanded);
{
m_OBSOLETE_treeView->setExpanded(mi, expanded);
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -2216,6 +2216,9 @@ void RiuMainWindow::forceProjectTreeRepaint()
// Needed for some reason when changing names and icons in the model // Needed for some reason when changing names and icons in the model
m_OBSOLETE_treeView->scroll(0,1); m_OBSOLETE_treeView->scroll(0,1);
m_OBSOLETE_treeView->scroll(0,-1); m_OBSOLETE_treeView->scroll(0,-1);
m_projectTreeView->scroll(0,1);
m_projectTreeView->scroll(0,-1);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

3
ApplicationCode/UserInterface/RiuMainWindow.h
View File

@ -55,6 +55,7 @@ namespace caf
class PdmUiPropertyView; class PdmUiPropertyView;
class UiPropertyCreatorPdm; class UiPropertyCreatorPdm;
class UiTreeModelPdm; class UiTreeModelPdm;
class PdmUiItem;
} }
namespace ssihub namespace ssihub
@ -104,7 +105,7 @@ public:
void appendActionsContextMenuForPdmObject(caf::PdmObjectHandle* pdmObject, QMenu* menu); void appendActionsContextMenuForPdmObject(caf::PdmObjectHandle* pdmObject, QMenu* menu);
void refreshDrawStyleActions(); void refreshDrawStyleActions();
void setExpanded(const caf::PdmObject* pdmObject, bool expanded); void setExpanded(const caf::PdmUiItem* uiItem, bool expanded);
protected: protected:
virtual void closeEvent(QCloseEvent* event); virtual void closeEvent(QCloseEvent* event);