OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-12 08:25:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

#3807 Rename RimContourMapView to RimEclipseContourMapView

Browse Source
This commit is contained in:
Gaute Lindkvist committed 2019-01-11 16:06:53 +01:00
1 parent 31c67e29e4
commit f3c188ef56
26 files changed
+110 -110
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/UserInterface/RiuMainWindow.cpp
+4 -4
View File
@@ -26,7 +26,7 @@
#include "RiaRegressionTest.h"
#include "RiaRegressionTestRunner.h"
#include "RimContourMapView.h"
#include "RimEclipseContourMapView.h"
#include "Rim2dIntersectionView.h"
#include "Rim3dView.h"
#include "RimCellEdgeColors.h"
@@ -860,7 +860,7 @@ void RiuMainWindow::slotRefreshEditActions()
void RiuMainWindow::slotRefreshViewActions()
{
RimGridView* gridView = RiaApplication::instance()->activeGridView();
RimContourMapView* view2d = dynamic_cast<RimContourMapView*>(gridView);
RimEclipseContourMapView* view2d = dynamic_cast<RimEclipseContourMapView*>(gridView);
bool enabled = gridView != nullptr && view2d == nullptr;
m_viewFromNorth->setEnabled(enabled);
m_viewFromSouth->setEnabled(enabled);
@@ -1596,7 +1596,7 @@ void RiuMainWindow::slotToggleFaultLabelsAction(bool showLabels)
void RiuMainWindow::refreshDrawStyleActions()
{
RimGridView* gridView = RiaApplication::instance()->activeGridView();
RimContourMapView* view2d = dynamic_cast<RimContourMapView*>(gridView);
RimEclipseContourMapView* view2d = dynamic_cast<RimEclipseContourMapView*>(gridView);
bool is2dMap = view2d != nullptr;
bool is3dGridView = gridView != nullptr && !is2dMap;
@@ -1826,7 +1826,7 @@ void RiuMainWindow::slotScaleChanged(int scaleValue)
void RiuMainWindow::updateScaleValue()
{
Rim3dView* view = RiaApplication::instance()->activeReservoirView();
bool isRegularReservoirView = view && dynamic_cast<RimContourMapView*>(view) == nullptr;
bool isRegularReservoirView = view && dynamic_cast<RimEclipseContourMapView*>(view) == nullptr;
if (isRegularReservoirView)
{
m_scaleFactor->setEnabled(true);