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

2d Maps: Renames to make classes and variables more consistent.

Browse Source 
* Everything is now named something related to ContourMap:
  - Rim2dEclipseView -> RimContourMapView
  - Rim2dGridProjection -> RimContourMapProjection
  ....
This commit is contained in:
Gaute Lindkvist
2018-11-09 09:04:40 +01:00
parent 9b8584c707
commit 53fad80e89
27 changed files with 254 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/CMakeLists_files.cmake
View File

@@ -13,7 +13,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicGeoMechPropertyFilterNewFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicGeoMechPropertyFilterNewInViewFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicGeoMechPropertyFilterNewExec.h
${CMAKE_CURRENT_LIST_DIR}/RicNewViewFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicNew2dContourViewFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicNewContourMapViewFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicPropertyFilterNewExec.h
${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterExecImpl.h
${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterInsertExec.h
@@ -92,7 +92,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicGeoMechPropertyFilterNewFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicGeoMechPropertyFilterNewInViewFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicGeoMechPropertyFilterNewExec.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewViewFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNew2dContourViewFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewContourMapViewFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterExecImpl.cpp
${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterInsertExec.cpp
${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterInsertFeature.cpp

30
ApplicationCode/Commands/RicNew2dContourViewFeature.cpp → ApplicationCode/Commands/RicNewContourMapViewFeature.cpp
View File

@@ -16,10 +16,10 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicNew2dContourViewFeature.h"
#include "RicNewContourMapViewFeature.h"
#include "Rim2dEclipseView.h"
#include "Rim2dEclipseViewCollection.h"
#include "RimContourMapView.h"
#include "RimContourMapViewCollection.h"
#include "RimCellEdgeColors.h"
#include "RimEclipseView.h"
#include "RimEclipseCase.h"
@@ -37,27 +37,27 @@
#include <QAction>
CAF_CMD_SOURCE_INIT(RicNew2dContourViewFeature, "RicNew2dContourViewFeature");
CAF_CMD_SOURCE_INIT(RicNewContourMapViewFeature, "RicNewContourMapViewFeature");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicNew2dContourViewFeature::isCommandEnabled()
bool RicNewContourMapViewFeature::isCommandEnabled()
{
bool selectedView = caf::SelectionManager::instance()->selectedItemOfType<RimEclipseView>() != nullptr;
bool selectedCase = caf::SelectionManager::instance()->selectedItemOfType<RimEclipseCase>() != nullptr;
bool selectedMapCollection = caf::SelectionManager::instance()->selectedItemOfType<Rim2dEclipseViewCollection>();
bool selectedMapCollection = caf::SelectionManager::instance()->selectedItemOfType<RimContourMapViewCollection>();
return selectedView || selectedCase || selectedMapCollection;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicNew2dContourViewFeature::onActionTriggered(bool isChecked)
void RicNewContourMapViewFeature::onActionTriggered(bool isChecked)
{
RimEclipseView* reservoirView = caf::SelectionManager::instance()->selectedItemOfType<RimEclipseView>();
RimEclipseCase* eclipseCase = caf::SelectionManager::instance()->selectedItemAncestorOfType<RimEclipseCase>();
Rim2dEclipseView* contourMap = nullptr;
RimContourMapView* contourMap = nullptr;
// Find case to insert into
if (reservoirView)
@@ -85,9 +85,9 @@ void RicNew2dContourViewFeature::onActionTriggered(bool isChecked)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicNew2dContourViewFeature::setupActionLook(QAction* actionToSetup)
void RicNewContourMapViewFeature::setupActionLook(QAction* actionToSetup)
{
Rim2dEclipseView* contourMap = caf::SelectionManager::instance()->selectedItemOfType<Rim2dEclipseView>();
RimContourMapView* contourMap = caf::SelectionManager::instance()->selectedItemOfType<RimContourMapView>();
RimEclipseView* eclipseView = caf::SelectionManager::instance()->selectedItemOfType<RimEclipseView>();
if (contourMap)
{
@@ -107,10 +107,10 @@ void RicNew2dContourViewFeature::setupActionLook(QAction* actionToSetup)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
Rim2dEclipseView* RicNew2dContourViewFeature::create2dContourMapFrom3dView(RimEclipseCase* eclipseCase, const RimEclipseView* sourceView)
RimContourMapView* RicNewContourMapViewFeature::create2dContourMapFrom3dView(RimEclipseCase* eclipseCase, const RimEclipseView* sourceView)
{
Rim2dEclipseView* contourMap = dynamic_cast<Rim2dEclipseView*>(sourceView->xmlCapability()->copyAndCastByXmlSerialization(
Rim2dEclipseView::classKeywordStatic(), sourceView->classKeyword(), caf::PdmDefaultObjectFactory::instance()));
RimContourMapView* contourMap = dynamic_cast<RimContourMapView*>(sourceView->xmlCapability()->copyAndCastByXmlSerialization(
RimContourMapView::classKeywordStatic(), sourceView->classKeyword(), caf::PdmDefaultObjectFactory::instance()));
CVF_ASSERT(contourMap);
contourMap->setEclipseCase(eclipseCase);
@@ -132,9 +132,9 @@ Rim2dEclipseView* RicNew2dContourViewFeature::create2dContourMapFrom3dView(RimEc
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
Rim2dEclipseView* RicNew2dContourViewFeature::create2dContourMap(RimEclipseCase* eclipseCase)
RimContourMapView* RicNewContourMapViewFeature::create2dContourMap(RimEclipseCase* eclipseCase)
{
Rim2dEclipseView* contourMap = new Rim2dEclipseView();
RimContourMapView* contourMap = new RimContourMapView();
contourMap->setEclipseCase(eclipseCase);
// Set default values

8
ApplicationCode/Commands/RicNew2dContourViewFeature.h → ApplicationCode/Commands/RicNewContourMapViewFeature.h
View File

@@ -22,13 +22,13 @@
#include "cafCmdFeature.h"
class RimEclipseCase;
class Rim2dEclipseView;
class RimContourMapView;
class RimEclipseView;
//==================================================================================================
///
//==================================================================================================
class RicNew2dContourViewFeature : public caf::CmdFeature
class RicNewContourMapViewFeature : public caf::CmdFeature
{
CAF_CMD_HEADER_INIT;
@@ -38,7 +38,7 @@ protected:
void onActionTriggered( bool isChecked ) override;
void setupActionLook( QAction* actionToSetup ) override;
static Rim2dEclipseView* create2dContourMapFrom3dView(RimEclipseCase* eclipseCase, const RimEclipseView* reservoirView);
static Rim2dEclipseView* create2dContourMap(RimEclipseCase* eclipseCase);
static RimContourMapView* create2dContourMapFrom3dView(RimEclipseCase* eclipseCase, const RimEclipseView* reservoirView);
static RimContourMapView* create2dContourMap(RimEclipseCase* eclipseCase);
};

4
ApplicationCode/Commands/RicNewViewFeature.cpp
View File

@@ -19,7 +19,7 @@
#include "RicNewViewFeature.h"
#include "Rim2dEclipseView.h"
#include "RimContourMapView.h"
#include "RimEclipseCase.h"
#include "RimEclipseView.h"
#include "RimGeoMechCase.h"
@@ -161,7 +161,7 @@ RimEclipseView* RicNewViewFeature::selectedEclipseView()
for (RimEclipseView* view : selection)
{
if (dynamic_cast<Rim2dEclipseView*>(view) == nullptr)
if (dynamic_cast<RimContourMapView*>(view) == nullptr)
{
return view;
}

4
ApplicationCode/Commands/RicTogglePerspectiveViewFeature.cpp
View File

@@ -20,7 +20,7 @@
#include "RicTogglePerspectiveViewFeature.h"
#include "RiuViewer.h"
#include "Rim2dEclipseView.h"
#include "RimContourMapView.h"
#include "Rim3dView.h"
#include "RimGridView.h"
#include "RiuMainWindow.h"
@@ -37,7 +37,7 @@ bool RicTogglePerspectiveViewFeature::isCommandEnabled()
{
this->action(); // Retrieve the action to update the looks
RimGridView* activeGridView = RiaApplication::instance()->activeGridView();
Rim2dEclipseView* view2d = dynamic_cast<Rim2dEclipseView*>(activeGridView);
RimContourMapView* view2d = dynamic_cast<RimContourMapView*>(activeGridView);
return !view2d && activeGridView && RiaApplication::instance()->activeReservoirView()->viewer();
}

4
ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeatureUi.cpp
View File

@@ -22,7 +22,7 @@
#include "RiaApplication.h"
#include "RiaOptionItemFactory.h"
#include "Rim2dEclipseView.h"
#include "RimContourMapView.h"
#include "RimCase.h"
#include "RimGridView.h"
#include "RimViewLinker.h"
@@ -83,7 +83,7 @@ std::vector<RimGridView*> RicLinkVisibleViewsFeatureUi::masterViewCandidates() c
// Set Active view as master view if the active view isn't a contour map.
for (size_t i = 0; i < m_allViews.size(); i++)
{
Rim2dEclipseView* contourMap = dynamic_cast<Rim2dEclipseView*>(m_allViews[i]);
RimContourMapView* contourMap = dynamic_cast<RimContourMapView*>(m_allViews[i]);
if (contourMap == nullptr)
{
masterCandidates.push_back(m_allViews[i]);