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

(578) Disable commands in 3D view if range/property is overridden

Browse Source
This commit is contained in:
Magne Sjaastad
2015-10-30 15:26:10 +01:00
parent 765c659c7f
commit cb1723494c
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@@ -47,6 +47,7 @@
#include "RimOilField.h"
#include "RimProject.h"
#include "RimView.h"
#include "RimViewController.h"
#include "RimWellPath.h"
#include "RimWellPathCollection.h"
#include "RimWellLogFile.h"
@@ -157,9 +158,15 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
// IJK -slice commands
menu.addAction(QIcon(":/CellFilter_Range.png"), QString("I-slice range filter"), this, SLOT(slotRangeFilterI()));
menu.addAction(QIcon(":/CellFilter_Range.png"), QString("J-slice range filter"), this, SLOT(slotRangeFilterJ()));
menu.addAction(QIcon(":/CellFilter_Range.png"), QString("K-slice range filter"), this, SLOT(slotRangeFilterK()));
RimViewController* viewController = NULL;
if (m_reservoirView) viewController = m_reservoirView->viewController();
if (!viewController || !viewController->isRangeFiltersControlled())
{
menu.addAction(QIcon(":/CellFilter_Range.png"), QString("I-slice range filter"), this, SLOT(slotRangeFilterI()));
menu.addAction(QIcon(":/CellFilter_Range.png"), QString("J-slice range filter"), this, SLOT(slotRangeFilterJ()));
menu.addAction(QIcon(":/CellFilter_Range.png"), QString("K-slice range filter"), this, SLOT(slotRangeFilterK()));
}
RimEclipseView* eclipseView = dynamic_cast<RimEclipseView*>(m_reservoirView.p());
if (eclipseView)
@@ -175,7 +182,11 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
{
propertyAction->setEnabled(false);
}
menu.addAction(propertyAction);
if (!viewController || !viewController->isPropertyFilterOveridden())
{
menu.addAction(propertyAction);
}
}
// Hide faults command
@@ -196,10 +207,12 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
RimGeoMechCellColors* cellColors = geoMechView->cellResult().p();
if (cellColors)
{
menu.addAction(QIcon(":/CellFilter_Values.png"), QString("Add property filter"), this, SLOT(slotAddGeoMechPropertyFilter()));
if (!viewController || !viewController->isPropertyFilterOveridden())
{
menu.addAction(QIcon(":/CellFilter_Values.png"), QString("Add property filter"), this, SLOT(slotAddGeoMechPropertyFilter()));
}
}
}
}
}
@@ -294,6 +307,9 @@ void RiuViewerCommands::slotRangeFilterK()
createSliceRangeFilter(2);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuViewerCommands::createSliceRangeFilter(int ijOrk)
{
RimView* eclipseView = m_reservoirView.p();