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/IntersectionBoxCommands/RicAppendIntersectionBoxFeature.cpp
View File

@@ -22,7 +22,7 @@
#include "RimIntersectionBox.h"
#include "RimIntersectionCollection.h"
#include "RimGridView.h"
#include "RiuMainWindow.h"
#include "Riu3DMainWindowTools.h"
#include "cafCmdExecCommandManager.h"
#include "cafSelectionManager.h"
@@ -61,7 +61,7 @@ void RicAppendIntersectionBoxFeature::onActionTriggered(bool isChecked)
intersectionBox->setToDefaultSizeBox();
coll->updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(intersectionBox);
Riu3DMainWindowTools::selectAsCurrentItem(intersectionBox);
RimGridView* rimView = nullptr;
coll->firstAncestorOrThisOfTypeAsserted(rimView);