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

#3807 Rename RimContourMapView to RimEclipseContourMapView

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-01-11 13:56:35 +01:00
parent 31c67e29e4
commit f3c188ef56
26 changed files with 110 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/ProjectDataModel/RimViewController.cpp
View File

@@ -28,7 +28,7 @@
#include "RigGeoMechCaseData.h"
#include "RigMainGrid.h"
#include "RimContourMapView.h"
#include "RimEclipseContourMapView.h"
#include "Rim3dView.h"
#include "RimCase.h"
#include "RimCellRangeFilter.h"
@@ -671,8 +671,8 @@ RimGridView* RimViewController::masterView() const
//--------------------------------------------------------------------------------------------------
bool RimViewController::isCameraControlPossible() const
{
RimContourMapView* contourMapMasterView = dynamic_cast<RimContourMapView*>(masterView());
RimContourMapView* contourMapManagedView = dynamic_cast<RimContourMapView*>(managedEclipseView());
RimEclipseContourMapView* contourMapMasterView = dynamic_cast<RimEclipseContourMapView*>(masterView());
RimEclipseContourMapView* contourMapManagedView = dynamic_cast<RimEclipseContourMapView*>(managedEclipseView());
return !(contourMapMasterView || contourMapManagedView);
}
@@ -910,8 +910,8 @@ bool RimViewController::isRangeFilterMappingApplicable() const
//--------------------------------------------------------------------------------------------------
bool RimViewController::isCellResultControlAdvisable() const
{
bool contourMapMasterView = dynamic_cast<RimContourMapView*>(masterView()) != nullptr;
bool contourMapManagedView = dynamic_cast<RimContourMapView*>(managedEclipseView()) != nullptr;
bool contourMapMasterView = dynamic_cast<RimEclipseContourMapView*>(masterView()) != nullptr;
bool contourMapManagedView = dynamic_cast<RimEclipseContourMapView*>(managedEclipseView()) != nullptr;
return !isMasterAndDepViewDifferentType() && contourMapMasterView != contourMapManagedView;
}
@@ -920,8 +920,8 @@ bool RimViewController::isCellResultControlAdvisable() const
//--------------------------------------------------------------------------------------------------
bool RimViewController::isRangeFilterControlAdvisable() const
{
bool contourMapMasterView = dynamic_cast<RimContourMapView*>(masterView()) != nullptr;
bool contourMapManagedView = dynamic_cast<RimContourMapView*>(managedEclipseView()) != nullptr;
bool contourMapMasterView = dynamic_cast<RimEclipseContourMapView*>(masterView()) != nullptr;
bool contourMapManagedView = dynamic_cast<RimEclipseContourMapView*>(managedEclipseView()) != nullptr;
return isRangeFilterControlPossible() && contourMapMasterView != contourMapManagedView;
}
@@ -930,8 +930,8 @@ bool RimViewController::isRangeFilterControlAdvisable() const
//--------------------------------------------------------------------------------------------------
bool RimViewController::isPropertyFilterControlAdvisable() const
{
bool contourMapMasterView = dynamic_cast<RimContourMapView*>(masterView()) != nullptr;
bool contourMapManagedView = dynamic_cast<RimContourMapView*>(managedEclipseView()) != nullptr;
bool contourMapMasterView = dynamic_cast<RimEclipseContourMapView*>(masterView()) != nullptr;
bool contourMapManagedView = dynamic_cast<RimEclipseContourMapView*>(managedEclipseView()) != nullptr;
return isPropertyFilterControlPossible() && contourMapMasterView != contourMapManagedView;
}