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

Merge branch 'dev' into cmake-improvements

Browse Source
This commit is contained in:
Magne Sjaastad
2018-02-28 08:33:39 +01:00
parent 89c090ba24 267e3ef59d
commit 25a1823f35
141 changed files with 1097 additions and 804 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeature.cpp
View File

@@ -29,7 +29,7 @@
#include "RimViewLinker.h"
#include "RimViewLinkerCollection.h"
#include "RiuMainWindow.h"
#include "Riu3DMainWindowTools.h"
#include "cafPdmUiPropertyViewDialog.h"
@@ -177,7 +177,7 @@ void RicLinkVisibleViewsFeature::linkViews(std::vector<RimGridView*>& views)
proj->viewLinkerCollection.uiCapability()->updateConnectedEditors();
proj->updateConnectedEditors();
RiuMainWindow::instance()->setExpanded(proj->viewLinkerCollection());
Riu3DMainWindowTools::setExpanded(proj->viewLinkerCollection());
}

6
ApplicationCode/Commands/ViewLink/RicSetMasterViewFeature.cpp
View File

@@ -27,7 +27,7 @@
#include "RimViewLinker.h"
#include "RimViewLinkerCollection.h"
#include "RiuMainWindow.h"
#include "Riu3DMainWindowTools.h"
#include <QAction>
#include <QTreeView>
@@ -81,8 +81,8 @@ void RicSetMasterViewFeature::onActionTriggered(bool isChecked)
proj->updateConnectedEditors();
// Set managed view collection to selected and expanded in project tree
RiuMainWindow::instance()->selectAsCurrentItem(viewLinker);
RiuMainWindow::instance()->setExpanded(viewLinker);
Riu3DMainWindowTools::selectAsCurrentItem(viewLinker);
Riu3DMainWindowTools::setExpanded(viewLinker);
}
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/Commands/ViewLink/RicShowLinkOptionsFeature.cpp
View File

@@ -24,7 +24,7 @@
#include "Rim3dView.h"
#include "RimViewController.h"
#include "RimViewLinker.h"
#include "RiuMainWindow.h"
#include "Riu3DMainWindowTools.h"
#include "cafSelectionManager.h"
@@ -61,7 +61,7 @@ void RicShowLinkOptionsFeature::onActionTriggered(bool isChecked)
RimViewController* viewController = activeView->viewController();
RiuMainWindow::instance()->selectAsCurrentItem(viewController);
Riu3DMainWindowTools::selectAsCurrentItem(viewController);
}
//--------------------------------------------------------------------------------------------------