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

#2476 2dIntersectionView. Clean up context menus

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-03-14 08:05:38 +01:00
parent 15e242d1e3
commit b7e8834b4c
5 changed files with 109 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ApplicationCode/Commands/RicSelectColorResult.cpp
View File

@@ -25,18 +25,31 @@
#include "RimGeoMechCellColors.h"
#include "RimGeoMechView.h"
#include "RimGridView.h"
#include "Rim2dIntersectionView.h"
#include "RimIntersection.h"
#include "Riu3DMainWindowTools.h"
#include <QAction>
CAF_CMD_SOURCE_INIT(RicSelectColorResult, "RicSelectColorResult");
//--------------------------------------------------------------------------------------------------
/// Internal function
//--------------------------------------------------------------------------------------------------
RimGridView* gridViewFrom2dIntersectionView(const Rim2dIntersectionView* int2dView)
{
RimGridView* gridView = nullptr;
int2dView->intersection()->firstAncestorOrThisOfType(gridView);
return gridView;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSelectColorResult::setupActionLook(QAction* actionToSetup)
{
actionToSetup->setText("Color Result");
actionToSetup->setText("Select Color Result");
actionToSetup->setIcon(QIcon(":/CellResult.png"));
}
@@ -47,7 +60,7 @@ bool RicSelectColorResult::isCommandEnabled()
{
if (RicWellLogTools::isWellPathOrSimWellSelectedInView()) return false;
return RiaApplication::instance()->activeGridView() != nullptr;
return RiaApplication::instance()->activeReservoirView() != nullptr;
}
//--------------------------------------------------------------------------------------------------
@@ -55,18 +68,23 @@ bool RicSelectColorResult::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicSelectColorResult::onActionTriggered(bool isChecked)
{
RimGridView* activeView = RiaApplication::instance()->activeGridView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
Rim2dIntersectionView* int2dView = dynamic_cast<Rim2dIntersectionView*>(activeView);
RimGridView* gridView = nullptr;
RimEclipseView* eclView = dynamic_cast<RimEclipseView*>(activeView);
if (int2dView) gridView = gridViewFrom2dIntersectionView(int2dView);
else gridView = dynamic_cast<RimGridView*>(activeView);
RimEclipseView* eclView = dynamic_cast<RimEclipseView*>(gridView);
if (eclView)
{
Riu3DMainWindowTools::selectAsCurrentItem(eclView->cellResult());
Riu3DMainWindowTools::selectAsCurrentItem(eclView->cellResult(), int2dView == nullptr);
return;
}
RimGeoMechView* geoMechView = dynamic_cast<RimGeoMechView*>(activeView);
RimGeoMechView* geoMechView = dynamic_cast<RimGeoMechView*>(gridView);
if (geoMechView)
{
Riu3DMainWindowTools::selectAsCurrentItem(geoMechView->cellResult());
Riu3DMainWindowTools::selectAsCurrentItem(geoMechView->cellResult(), int2dView== nullptr);
}
}