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

#3540 Create seperate 2d view with parallel, look down and linked views

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-10-23 16:32:40 +02:00
parent 45531865ba
commit f80472ffa6
50 changed files with 1014 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@@ -26,6 +26,7 @@
#include "RiaRegressionTest.h"
#include "RiaRegressionTestRunner.h"
#include "Rim2dEclipseView.h"
#include "Rim2dIntersectionView.h"
#include "Rim3dView.h"
#include "RimCellEdgeColors.h"
@@ -795,6 +796,14 @@ void RiuMainWindow::setResultInfo(const QString& info) const
m_resultInfoPanel->setInfo(info);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::refreshViewActions()
{
this->slotRefreshViewActions();
}
//==================================================================================================
//
// Action slots
@@ -839,7 +848,9 @@ void RiuMainWindow::slotRefreshEditActions()
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::slotRefreshViewActions()
{
bool enabled = RiaApplication::instance()->activeGridView() != nullptr;
RimGridView* gridView = RiaApplication::instance()->activeGridView();
Rim2dEclipseView* view2d = dynamic_cast<Rim2dEclipseView*>(gridView);
bool enabled = gridView != nullptr && view2d == nullptr;
m_viewFromNorth->setEnabled(enabled);
m_viewFromSouth->setEnabled(enabled);
m_viewFromEast->setEnabled(enabled);
@@ -1543,15 +1554,20 @@ void RiuMainWindow::slotToggleFaultLabelsAction(bool showLabels)
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::refreshDrawStyleActions()
{
Rim3dView* view = RiaApplication::instance()->activeReservoirView();
bool is3DView = view != nullptr;
bool isGridView = RiaApplication::instance()->activeGridView() != nullptr;
RimGridView* gridView = RiaApplication::instance()->activeGridView();
Rim2dEclipseView* view2d = dynamic_cast<Rim2dEclipseView*>(gridView);
bool is2dMap = view2d != nullptr;
bool is3dGridView = gridView != nullptr && !is2dMap;
m_drawStyleLinesAction->setEnabled(is3DView);
m_drawStyleLinesSolidAction->setEnabled(is3DView);
m_drawStyleSurfOnlyAction->setEnabled(is3DView);
m_drawStyleFaultLinesSolidAction->setEnabled(is3DView);
m_disableLightingAction->setEnabled(is3DView);
Rim3dView* view = RiaApplication::instance()->activeReservoirView();
bool is3dView = view != nullptr && !is2dMap;
m_drawStyleLinesAction->setEnabled(is3dView);
m_drawStyleLinesSolidAction->setEnabled(is3dView);
m_drawStyleSurfOnlyAction->setEnabled(is3dView);
m_drawStyleFaultLinesSolidAction->setEnabled(is3dView);
m_disableLightingAction->setEnabled(is3dView);
bool lightingDisabledInView = view ? view->isLightingDisabled() : false;
@@ -1559,8 +1575,8 @@ void RiuMainWindow::refreshDrawStyleActions()
m_disableLightingAction->setChecked(lightingDisabledInView);
m_disableLightingAction->blockSignals(false);
m_drawStyleHideGridCellsAction->setEnabled(isGridView);
if (isGridView)
m_drawStyleHideGridCellsAction->setEnabled(is3dGridView);
if (is3dGridView)
{
m_drawStyleHideGridCellsAction->blockSignals(true);
m_drawStyleHideGridCellsAction->setChecked(!view->isGridVisualizationMode());
@@ -1570,9 +1586,9 @@ void RiuMainWindow::refreshDrawStyleActions()
RimEclipseView* eclView = dynamic_cast<RimEclipseView*>(view);
bool hasEclipseView = eclView != nullptr;
m_showWellCellsAction->setEnabled(hasEclipseView);
m_showWellCellsAction->setEnabled(hasEclipseView && !is2dMap);
if (hasEclipseView)
if (hasEclipseView && !is2dMap)
{
m_showWellCellsAction->blockSignals(true);
eclView->wellCollection()->updateStateForVisibilityCheckboxes();

3
ApplicationCode/UserInterface/RiuMainWindow.h
View File

@@ -93,7 +93,8 @@ public:
void setResultInfo(const QString& info) const;
void refreshAnimationActions();
void refreshViewActions();
void refreshAnimationActions();
void updateScaleValue();
RiuProcessMonitor* processMonitor();

23
ApplicationCode/UserInterface/RiuViewer.cpp
View File

@@ -824,14 +824,33 @@ void RiuViewer::updateGridBoxData(double scaleZ,
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
void RiuViewer::showEdgeTickMarks(bool enable)
void RiuViewer::showEdgeTickMarksXY(bool enable)
{
m_mainRendering->removeOverlayItem(m_windowEdgeAxisOverlay.p());
if (enable)
{
m_windowEdgeAxisOverlay->setDomainAxes(RivWindowEdgeAxesOverlayItem::XY_AXES);
m_windowEdgeAxisOverlay->setIsSwitchingYAxisSign(false);
m_mainRendering->addOverlayItem(m_windowEdgeAxisOverlay.p());
}
m_showWindowEdgeAxes = enable;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuViewer::showEdgeTickMarksXZ(bool enable)
{
m_mainRendering->removeOverlayItem(m_windowEdgeAxisOverlay.p());
if (enable)
{
m_windowEdgeAxisOverlay->setDomainAxes(RivWindowEdgeAxesOverlayItem::XZ_AXES);
m_windowEdgeAxisOverlay->setIsSwitchingYAxisSign(true);
m_mainRendering->addOverlayItem(m_windowEdgeAxisOverlay.p());
}

3
ApplicationCode/UserInterface/RiuViewer.h
View File

@@ -90,7 +90,8 @@ public:
const cvf::Vec3d& displayModelOffset,
const cvf::Color3f& backgroundColor,
const cvf::BoundingBox& domainCoordBoundingBox);
void showEdgeTickMarks(bool enable);
void showEdgeTickMarksXY(bool enable);
void showEdgeTickMarksXZ(bool enable);
void updateAnnotationItems();