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/IntersectionViewCommands/RicNewIntersectionViewFeature.cpp
View File

@@ -22,7 +22,7 @@
#include "RimCase.h"
#include "RimIntersection.h"
#include "RiuMainWindow.h"
#include "Riu3DMainWindowTools.h"
#include "RiuSelectionManager.h"
#include "cafSelectionManagerTools.h"
@@ -67,7 +67,7 @@ void RicNewIntersectionViewFeature::onActionTriggered(bool isChecked)
QString text = QString("The intersection view only supports vertical intersections.\n"
"The intersection '%1' is not vertical but a converted version will be shown in the view .").arg(intersection->name());
QMessageBox::warning(RiuMainWindow::instance(), "New Intersection View", text);
QMessageBox::warning(Riu3DMainWindowTools::mainWindowWidget(), "New Intersection View", text);
}
Rim2dIntersectionView* intersectionView = intersection->correspondingIntersectionView();