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

Merged intersection box interactive manipulation

Browse Source
This commit is contained in:
Magne Sjaastad
2016-09-30 10:01:17 +02:00
parent 7456d1e697 593d72d63b
commit d7a69bdae8
23 changed files with 1403 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@@ -47,6 +47,7 @@
#include "RimGeoMechCase.h"
#include "RimGeoMechCellColors.h"
#include "RimGeoMechView.h"
#include "RimIntersectionBox.h"
#include "RimLegendConfig.h"
#include "RimTernaryLegendConfig.h"
#include "RimViewController.h"
@@ -133,6 +134,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
{
m_currentGridIdx = cvf::UNDEFINED_SIZE_T;
m_currentCellIndex = cvf::UNDEFINED_SIZE_T;
m_currentPickedObject = nullptr;
int winPosX = event->x();
int winPosY = event->y();
@@ -195,7 +197,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
{
findCellAndGridIndex(crossSectionSourceInfo, firstPartTriangleIndex, &m_currentCellIndex, &m_currentGridIdx);
m_currentFaceIndex = cvf::StructGridInterface::NO_FACE;
m_currentCrossSection = const_cast<RimIntersection*>(crossSectionSourceInfo->crossSection());
m_currentPickedObject = const_cast<RimIntersection*>(crossSectionSourceInfo->crossSection());
menu.addAction(QString("Hide intersection"), this, SLOT(slotHideIntersection()));
}
@@ -203,6 +205,14 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
{
findCellAndGridIndex(intersectionBoxSourceInfo, firstPartTriangleIndex, &m_currentCellIndex, &m_currentGridIdx);
m_currentFaceIndex = cvf::StructGridInterface::NO_FACE;
m_currentPickedObject = const_cast<RimIntersectionBox*>(intersectionBoxSourceInfo->intersectionBox());
menu.addAction(caf::CmdFeatureManager::instance()->action("RicEditIntersectionBoxFeature"));
menu.addSeparator();
QStringList commandIdList;
commandIdList << "RicEditIntersectionBoxFeature";
caf::CmdFeatureManager::instance()->refreshCheckedState(commandIdList);
}
// IJK -slice commands
@@ -442,10 +452,11 @@ void RiuViewerCommands::slotAddGeoMechPropertyFilter()
//--------------------------------------------------------------------------------------------------
void RiuViewerCommands::slotHideIntersection()
{
if (m_currentCrossSection)
RimIntersection* rimIntersection = dynamic_cast<RimIntersection*>(currentPickedObject());
if (rimIntersection)
{
m_currentCrossSection->isActive = false;
m_currentCrossSection->updateConnectedEditors();
rimIntersection->isActive = false;
rimIntersection->updateConnectedEditors();
if (m_reservoirView)
{
@@ -591,6 +602,14 @@ cvf::Vec3d RiuViewerCommands::lastPickPositionInDomainCoords() const
return m_currentPickPositionInDomainCoords;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmObject* RiuViewerCommands::currentPickedObject() const
{
return m_currentPickedObject;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------