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

#2331 Renamed RimView to Rim3dView

Browse Source
This commit is contained in:
Jacob Støren
2018-01-09 10:11:28 +01:00
parent 038914dc01
commit cb6d49a611
139 changed files with 1487 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
View File

@@ -59,7 +59,7 @@ ${CEE_CURRENT_LIST_DIR}RimGeoMechPropertyFilterCollection.h
${CEE_CURRENT_LIST_DIR}RimGeoMechResultDefinition.h
${CEE_CURRENT_LIST_DIR}RimGeoMechCellColors.h
${CEE_CURRENT_LIST_DIR}RimViewWindow.h
${CEE_CURRENT_LIST_DIR}RimView.h
${CEE_CURRENT_LIST_DIR}Rim3dView.h
${CEE_CURRENT_LIST_DIR}RimViewManipulator.h
${CEE_CURRENT_LIST_DIR}RimCase.h
${CEE_CURRENT_LIST_DIR}RimViewController.h
@@ -160,7 +160,7 @@ ${CEE_CURRENT_LIST_DIR}RimGeoMechPropertyFilterCollection.cpp
${CEE_CURRENT_LIST_DIR}RimGeoMechResultDefinition.cpp
${CEE_CURRENT_LIST_DIR}RimGeoMechCellColors.cpp
${CEE_CURRENT_LIST_DIR}RimViewWindow.cpp
${CEE_CURRENT_LIST_DIR}RimView.cpp
${CEE_CURRENT_LIST_DIR}Rim3dView.cpp
${CEE_CURRENT_LIST_DIR}RimViewManipulator.cpp
${CEE_CURRENT_LIST_DIR}RimCase.cpp
${CEE_CURRENT_LIST_DIR}RimViewController.cpp

2
ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.cpp
View File

@@ -22,7 +22,7 @@
#include "RimFishboneWellPath.h"
#include "RimFishbonesCollection.h"
#include "RimProject.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RigWellPath.h"

6
ApplicationCode/ProjectDataModel/Completions/RimFracture.cpp
View File

@@ -47,7 +47,7 @@
#include "RimReservoirCellResultsStorage.h"
#include "RimStimPlanFractureTemplate.h"
#include "RimStimPlanColors.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RivWellFracturePartMgr.h"
@@ -80,7 +80,7 @@ void setDefaultFractureColorResult()
for (RimEclipseCase* const eclCase : proj->eclipseCases())
{
for (RimView* const view : eclCase->views())
for (Rim3dView* const view : eclCase->views())
{
std::vector<RimStimPlanColors*> fractureColors;
view->descendantsIncludingThisOfType(fractureColors);
@@ -183,7 +183,7 @@ void RimFracture::fieldChangedByUi(const caf::PdmFieldHandle* changedField, cons
changedField == &dip ||
changedField == &tilt)
{
RimView* rimView = nullptr;
Rim3dView* rimView = nullptr;
this->firstAncestorOrThisOfType(rimView);
if (rimView)
{

2
ApplicationCode/ProjectDataModel/Completions/RimPerforationCollection.cpp
View File

@@ -21,7 +21,7 @@
#include "RimPerforationInterval.h"
#include "RimProject.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RigWellPath.h"

4
ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
View File

@@ -47,7 +47,7 @@
#include "RimGeoMechView.h"
#include "RimReservoirCellResultsStorage.h"
#include "RimSimWellInViewCollection.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimTools.h"
#include "RiuViewer.h"
@@ -729,7 +729,7 @@ void Rim3dOverlayInfoConfig::defineUiOrdering(QString uiConfigName, caf::PdmUiOr
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void Rim3dOverlayInfoConfig::setReservoirView(RimView* ownerReservoirView)
void Rim3dOverlayInfoConfig::setReservoirView(Rim3dView* ownerReservoirView)
{
m_viewDef = ownerReservoirView;
}

6
ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h
View File

@@ -32,7 +32,7 @@
class RimEclipseView;
class RimGeoMechView;
class RimView;
class Rim3dView;
class RigStatisticsDataCache;
class RicGridStatisticsDialog;
@@ -67,7 +67,7 @@ public:
void update3DInfo();
void setReservoirView(RimView* ownerView);
void setReservoirView(Rim3dView* ownerView);
void setPosition(cvf::Vec2ui position);
@@ -120,7 +120,7 @@ private:
caf::PdmField<caf::AppEnum<StatisticsTimeRangeType> > m_statisticsTimeRange;
caf::PdmField<caf::AppEnum<StatisticsCellRangeType> > m_statisticsCellRange;
caf::PdmPointer<RimView> m_viewDef;
caf::PdmPointer<Rim3dView> m_viewDef;
cvf::Vec2ui m_position;

1093
ApplicationCode/ProjectDataModel/Rim3dView.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

6
ApplicationCode/ProjectDataModel/RimView.h → ApplicationCode/ProjectDataModel/Rim3dView.h
View File

@@ -70,12 +70,12 @@ namespace caf
///
///
//==================================================================================================
class RimView : public RimViewWindow
class Rim3dView : public RimViewWindow
{
CAF_PDM_HEADER_INIT;
public:
RimView(void);
virtual ~RimView(void);
Rim3dView(void);
virtual ~Rim3dView(void);
// 3D Viewer
RiuViewer* viewer();

4
ApplicationCode/ProjectDataModel/RimCase.h
View File

@@ -29,7 +29,7 @@
#include <vector>
class RimView;
class Rim3dView;
class RimFormationNames;
class RimTimeStepFilter;
@@ -49,7 +49,7 @@ public:
caf::PdmPtrField<RimFormationNames*> activeFormationNames;
virtual std::vector<RimView*> views() = 0;
virtual std::vector<Rim3dView*> views() = 0;
virtual void updateFilePathsFromProjectPath(const QString& projectPath, const QString& oldProjectPath) = 0;

6
ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp
View File

@@ -147,7 +147,7 @@ void RimCellRangeFilter::setDefaultValues()
const cvf::StructGridInterface* grid = selectedGrid();
RimView* rimView = nullptr;
Rim3dView* rimView = nullptr;
this->firstAncestorOrThisOfTypeAsserted(rimView);
RigActiveCellInfo* actCellInfo = RigReservoirGridTools::activeCellInfo(rimView);
@@ -246,7 +246,7 @@ void RimCellRangeFilter::defineUiOrdering(QString uiConfigName, caf::PdmUiOrderi
this->firstAncestorOrThisOfTypeAsserted(rimCase);
const cvf::StructGridInterface* mainGrid = RigReservoirGridTools::mainGrid(rimCase);
RimView* rimView = nullptr;
Rim3dView* rimView = nullptr;
this->firstAncestorOrThisOfTypeAsserted(rimView);
RigActiveCellInfo* actCellInfo = RigReservoirGridTools::activeCellInfo(rimView);
@@ -332,7 +332,7 @@ QList<caf::PdmOptionItemInfo> RimCellRangeFilter::calculateValueOptions(const ca
//--------------------------------------------------------------------------------------------------
bool RimCellRangeFilter::isRangeFilterControlled() const
{
RimView* rimView = nullptr;
Rim3dView* rimView = nullptr;
firstAncestorOrThisOfTypeAsserted(rimView);
bool isRangeFilterControlled = false;

8
ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp
View File

@@ -21,7 +21,7 @@
#include "RimCellRangeFilterCollection.h"
#include "RimCellRangeFilter.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimViewController.h"
#include "RimViewLinker.h"
@@ -110,7 +110,7 @@ void RimCellRangeFilterCollection::fieldChangedByUi(const caf::PdmFieldHandle* c
//--------------------------------------------------------------------------------------------------
void RimCellRangeFilterCollection::updateDisplayModeNotifyManagedViews(RimCellRangeFilter* changedRangeFilter)
{
RimView* view = NULL;
Rim3dView* view = NULL;
firstAncestorOrThisOfType(view);
if (!view) return;
@@ -173,9 +173,9 @@ bool RimCellRangeFilterCollection::hasActiveIncludeFilters() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimView* RimCellRangeFilterCollection::baseView() const
Rim3dView* RimCellRangeFilterCollection::baseView() const
{
RimView* rimView = NULL;
Rim3dView* rimView = NULL;
firstAncestorOrThisOfType(rimView);
return rimView;

4
ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.h
View File

@@ -22,7 +22,7 @@
#include "cafPdmChildArrayField.h"
#include "cafPdmField.h"
class RimView;
class Rim3dView;
class RimCellRangeFilter;
namespace cvf {
@@ -58,5 +58,5 @@ protected:
virtual caf::PdmFieldHandle* objectToggleField();
private:
RimView* baseView() const;
Rim3dView* baseView() const;
};

2
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@@ -531,7 +531,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
if (dynamic_cast<RimView*>(uiItem))
if (dynamic_cast<Rim3dView*>(uiItem))
{
menuBuilder << "Separator";
menuBuilder << "RicLinkVisibleViewsFeature";

10
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@@ -266,7 +266,7 @@ void RimEclipseCase::recalculateCompletionTypeAndRedrawAllViews()
{
results(RiaDefines::MATRIX_MODEL)->clearScalarResult(RiaDefines::DYNAMIC_NATIVE, RiaDefines::completionTypeResultName());
for (RimView* view : views())
for (Rim3dView* view : views())
{
RimEclipseView* eclipseView = dynamic_cast<RimEclipseView*>(view);
if (eclipseView)
@@ -329,8 +329,8 @@ void RimEclipseCase::updateFormationNamesData()
{
rigEclipseCase->setActiveFormationNames(nullptr);
}
std::vector<RimView*> views = this->views();
for(RimView* view : views)
std::vector<Rim3dView*> views = this->views();
for(Rim3dView* view : views)
{
RimEclipseView* eclView = dynamic_cast<RimEclipseView*>(view);
@@ -655,9 +655,9 @@ bool RimEclipseCase::openReserviorCase()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimView*> RimEclipseCase::views()
std::vector<Rim3dView*> RimEclipseCase::views()
{
std::vector<RimView*> views;
std::vector<Rim3dView*> views;
for (size_t vIdx = 0; vIdx < reservoirViews.size(); ++vIdx)
{
views.push_back(reservoirViews[vIdx]);

2
ApplicationCode/ProjectDataModel/RimEclipseCase.h
View File

@@ -91,7 +91,7 @@ public:
RimCaseCollection* parentCaseCollection();
virtual std::vector<RimView*> views();
virtual std::vector<Rim3dView*> views();
virtual QStringList timeStepStrings() const override;
virtual QString timeStepName(int frameIdx) const override;
virtual std::vector<QDateTime> timeStepDates() const override;

6
ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp
View File

@@ -267,7 +267,7 @@ void RimEclipsePropertyFilter::updateRangeLabel()
//--------------------------------------------------------------------------------------------------
bool RimEclipsePropertyFilter::isPropertyFilterControlled()
{
RimView* rimView = nullptr;
Rim3dView* rimView = nullptr;
firstAncestorOrThisOfTypeAsserted(rimView);
bool isPropertyFilterControlled = false;
@@ -350,7 +350,7 @@ void RimEclipsePropertyFilter::computeResultValueRange()
if (resultDefinition->isFlowDiagOrInjectionFlooding())
{
RimView* view;
Rim3dView* view;
this->firstAncestorOrThisOfType(view);
int timeStep = 0;
@@ -446,7 +446,7 @@ void RimEclipsePropertyFilter::updateFromCurrentTimeStep()
clearCategories();
RimView* view = nullptr;
Rim3dView* view = nullptr;
this->firstAncestorOrThisOfTypeAsserted(view);
int timeStep = view->currentTimeStep();

2
ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp
View File

@@ -306,7 +306,7 @@ void RimEclipseResultCase::loadAndUpdateSourSimData()
if (!hasSourSimFile())
{
// Deselect SourSimRL cell results
for (RimView* view : views())
for (Rim3dView* view : views())
{
RimEclipseView* eclipseView = dynamic_cast<RimEclipseView*>(view);
if (eclipseView != nullptr)

6
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@@ -35,7 +35,7 @@
#include "RimFlowDiagSolution.h"
#include "RimPlotCurve.h"
#include "RimReservoirCellResultsStorage.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimViewLinker.h"
#include "RimGridTimeHistoryCurve.h"
#include "RimWellLogExtractionCurve.h"
@@ -377,7 +377,7 @@ void RimEclipseResultDefinition::assignFlowSolutionFromCase()
//--------------------------------------------------------------------------------------------------
void RimEclipseResultDefinition::loadDataAndUpdate()
{
RimView* view = nullptr;
Rim3dView* view = nullptr;
this->firstAncestorOrThisOfType(view);
loadResult();
@@ -737,7 +737,7 @@ RigFlowDiagResultAddress RimEclipseResultDefinition::flowDiagResAddress() const
{
size_t timeStep = 0;
RimView* rimView = nullptr;
Rim3dView* rimView = nullptr;
this->firstAncestorOrThisOfType(rimView);
if (rimView)
{

4
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -215,7 +215,7 @@ void RimEclipseView::setVisibleGridPartsWatertight()
//--------------------------------------------------------------------------------------------------
void RimEclipseView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
RimView::fieldChangedByUi(changedField, oldValue, newValue);
Rim3dView::fieldChangedByUi(changedField, oldValue, newValue);
if (changedField == &showInvalidCells)
{
@@ -1449,7 +1449,7 @@ const std::vector<RivCellSetEnum>& RimEclipseView::visibleGridParts() const
//--------------------------------------------------------------------------------------------------
void RimEclipseView::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
RimView::defineUiOrdering(uiConfigName, uiOrdering);
Rim3dView::defineUiOrdering(uiConfigName, uiOrdering);
caf::PdmUiGroup* cellGroup = uiOrdering.addNewGroup("Cell Visibility");
cellGroup->add(&showMainGrid);

4
ApplicationCode/ProjectDataModel/RimEclipseView.h
View File

@@ -33,7 +33,7 @@
#include "cafPdmFieldCvfColor.h"
#include "cafPdmFieldCvfMat4d.h"
#include "RimView.h"
#include "Rim3dView.h"
class RigActiveCellInfo;
class RigCaseCellResultsData;
@@ -81,7 +81,7 @@ enum PartRenderMaskEnum
///
///
//==================================================================================================
class RimEclipseView : public RimView
class RimEclipseView : public Rim3dView
{
CAF_PDM_HEADER_INIT;
public:

2
ApplicationCode/ProjectDataModel/RimFormationNames.cpp
View File

@@ -22,7 +22,7 @@
#include "RimCase.h"
#include "RimTools.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "cafPdmUiFilePathEditor.h"

12
ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp
View File

@@ -194,9 +194,9 @@ void RimGeoMechCase::updateFilePathsFromProjectPath(const QString& newProjectPat
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimView*> RimGeoMechCase::views()
std::vector<Rim3dView*> RimGeoMechCase::views()
{
std::vector<RimView*> views;
std::vector<Rim3dView*> views;
for (size_t vIdx = 0; vIdx < geoMechViews.size(); ++vIdx)
{
views.push_back(geoMechViews[vIdx]);
@@ -360,8 +360,8 @@ void RimGeoMechCase::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
rigCaseData->femPartResults()->setCalculationParameters(m_cohesion(), cvf::Math::toRadians(m_frictionAngleDeg()));
}
std::vector<RimView*> views = this->views();
for ( RimView* view : views )
std::vector<Rim3dView*> views = this->views();
for ( Rim3dView* view : views )
{
if ( view ) // Todo: only those using the variable actively
{
@@ -388,8 +388,8 @@ void RimGeoMechCase::updateFormationNamesData()
rigCaseData->femPartResults()->setActiveFormationNames(nullptr);
}
std::vector<RimView*> views = this->views();
for(RimView* view : views)
std::vector<Rim3dView*> views = this->views();
for(Rim3dView* view : views)
{
RimGeoMechView* geomView = dynamic_cast<RimGeoMechView*>(view);

2
ApplicationCode/ProjectDataModel/RimGeoMechCase.h
View File

@@ -56,7 +56,7 @@ public:
RimGeoMechView* createAndAddReservoirView();
virtual void updateFilePathsFromProjectPath(const QString& projectPath, const QString& oldProjectPath);
virtual std::vector<RimView*> views();
virtual std::vector<Rim3dView*> views();
virtual std::vector<QDateTime> timeStepDates() const override;
virtual QStringList timeStepStrings() const override;

4
ApplicationCode/ProjectDataModel/RimGeoMechCellColors.cpp
View File

@@ -20,7 +20,7 @@
#include "RimGeoMechCellColors.h"
#include "RimLegendConfig.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimViewController.h"
#include "RimViewLinker.h"
@@ -51,7 +51,7 @@ RimGeoMechCellColors::~RimGeoMechCellColors(void)
//--------------------------------------------------------------------------------------------------
void RimGeoMechCellColors::updateIconState()
{
RimView* rimView = NULL;
Rim3dView* rimView = NULL;
this->firstAncestorOrThisOfType(rimView);
CVF_ASSERT(rimView);

2
ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilter.cpp
View File

@@ -193,7 +193,7 @@ bool RimGeoMechPropertyFilter::isPropertyFilterControlled()
{
bool isPropertyFilterControlled = false;
RimView* rimView = NULL;
Rim3dView* rimView = NULL;
firstAncestorOrThisOfType(rimView);
CVF_ASSERT(rimView);
if (rimView)

2
ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
View File

@@ -212,7 +212,7 @@ void RimGeoMechResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
// Get the possible property filter owner
RimGeoMechPropertyFilter* propFilter = dynamic_cast<RimGeoMechPropertyFilter*>(this->parentField()->ownerObject());
RimView* view = nullptr;
Rim3dView* view = nullptr;
this->firstAncestorOrThisOfType(view);
RimPlotCurve* curve = nullptr;
this->firstAncestorOrThisOfType(curve);

2
ApplicationCode/ProjectDataModel/RimGeoMechView.cpp
View File

@@ -490,7 +490,7 @@ cvf::Transform* RimGeoMechView::scaleTransform()
//--------------------------------------------------------------------------------------------------
void RimGeoMechView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
RimView::fieldChangedByUi(changedField, oldValue, newValue);
Rim3dView::fieldChangedByUi(changedField, oldValue, newValue);
}
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/ProjectDataModel/RimGeoMechView.h
View File

@@ -19,7 +19,7 @@
#pragma once
#include "RimView.h"
#include "Rim3dView.h"
#include "cafAppEnum.h"
#include "cafPdmChildField.h"
@@ -51,7 +51,7 @@ namespace cvf {
///
///
//==================================================================================================
class RimGeoMechView : public RimView
class RimGeoMechView : public Rim3dView
{
CAF_PDM_HEADER_INIT;

4
ApplicationCode/ProjectDataModel/RimGridCollection.cpp
View File

@@ -18,7 +18,7 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RimGridCollection.h"
#include "RimView.h"
#include "Rim3dView.h"
CAF_PDM_SOURCE_INIT(RimGridCollection, "GridCollection");
@@ -57,7 +57,7 @@ void RimGridCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField
{
if (changedField == &isActive)
{
RimView* rimView = NULL;
Rim3dView* rimView = NULL;
this->firstAncestorOrThisOfType(rimView);
CVF_ASSERT(rimView);

4
ApplicationCode/ProjectDataModel/RimIntersection.cpp
View File

@@ -32,7 +32,7 @@
#include "RimSimWellInView.h"
#include "RimSimWellInViewCollection.h"
#include "RimTools.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimWellPath.h"
#include "RiuViewer.h"
@@ -845,7 +845,7 @@ void RimIntersection::rebuildGeometryAndScheduleCreateDisplayModel()
{
m_crossSectionPartMgr = nullptr;
RimView* rimView = nullptr;
Rim3dView* rimView = nullptr;
this->firstAncestorOrThisOfType(rimView);
if (rimView)
{

12
ApplicationCode/ProjectDataModel/RimIntersectionBox.cpp
View File

@@ -20,7 +20,7 @@
#include "RimCase.h"
#include "RimEclipseView.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "IntersectionBoxCommands/RicBoxManipulatorEventHandler.h"
@@ -318,7 +318,7 @@ void RimIntersectionBox::fieldChangedByUi(const caf::PdmFieldHandle* changedFiel
{
if (m_boxManipulator)
{
RimView* rimView = nullptr;
Rim3dView* rimView = nullptr;
this->firstAncestorOrThisOfType(rimView);
if (rimView)
@@ -345,7 +345,7 @@ void RimIntersectionBox::updateBoxManipulatorGeometry()
{
if (m_boxManipulator.isNull()) return;
RimView* rimView = nullptr;
Rim3dView* rimView = nullptr;
this->firstAncestorOrThisOfType(rimView);
if (!rimView) return;
@@ -470,7 +470,7 @@ void RimIntersectionBox::initAfterRead()
//--------------------------------------------------------------------------------------------------
void RimIntersectionBox::slotScheduleRedraw()
{
RimView* rimView = NULL;
Rim3dView* rimView = NULL;
this->firstAncestorOrThisOfType(rimView);
if (rimView)
{
@@ -483,7 +483,7 @@ void RimIntersectionBox::slotScheduleRedraw()
//--------------------------------------------------------------------------------------------------
void RimIntersectionBox::slotUpdateGeometry(const cvf::Vec3d& origin, const cvf::Vec3d& size)
{
RimView* rimView = nullptr;
Rim3dView* rimView = nullptr;
this->firstAncestorOrThisOfType(rimView);
if (rimView)
@@ -654,7 +654,7 @@ cvf::BoundingBox RimIntersectionBox::currentCellBoundingBox()
//--------------------------------------------------------------------------------------------------
RiuViewer* RimIntersectionBox::viewer()
{
RimView* rimView = nullptr;
Rim3dView* rimView = nullptr;
this->firstAncestorOrThisOfType(rimView);
RiuViewer* riuViewer = nullptr;

6
ApplicationCode/ProjectDataModel/RimIntersectionCollection.cpp
View File

@@ -22,7 +22,7 @@
#include "RimIntersection.h"
#include "RimIntersectionBox.h"
#include "RimSimWellInView.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RiuMainWindow.h"
@@ -156,7 +156,7 @@ void RimIntersectionCollection::appendIntersection(RimIntersection* intersection
updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(intersection);
RimView* rimView = NULL;
Rim3dView* rimView = NULL;
firstAncestorOrThisOfType(rimView);
if (rimView)
{
@@ -179,7 +179,7 @@ void RimIntersectionCollection::fieldChangedByUi(const caf::PdmFieldHandle* chan
{
if (changedField == &isActive)
{
RimView* rimView = NULL;
Rim3dView* rimView = NULL;
firstAncestorOrThisOfType(rimView);
if (rimView)
{

2
ApplicationCode/ProjectDataModel/RimLegendConfig.cpp
View File

@@ -191,7 +191,7 @@ void RimLegendConfig::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
updateLegend();
RimView* view = nullptr;
Rim3dView* view = nullptr;
this->firstAncestorOrThisOfType(view);
if (view)

2
ApplicationCode/ProjectDataModel/RimLegendConfig.h
View File

@@ -46,7 +46,7 @@ namespace caf
class CategoryMapper;
}
class RimView;
class Rim3dView;
//==================================================================================================
///

8
ApplicationCode/ProjectDataModel/RimMultiSnapshotDefinition.cpp
View File

@@ -29,7 +29,7 @@
#include "RimProject.h"
#include "RimReservoirCellResultsStorage.h"
#include "RimTools.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "cafPdmPointer.h"
@@ -92,7 +92,7 @@ QList<caf::PdmOptionItemInfo> RimMultiSnapshotDefinition::calculateValueOptions(
{
options.push_back(caf::PdmOptionItemInfo("None", nullptr));
std::vector<RimView*> views;
std::vector<Rim3dView*> views;
RimProject* proj = RiaApplication::instance()->project();
std::vector<RimCase*> cases;
@@ -100,13 +100,13 @@ QList<caf::PdmOptionItemInfo> RimMultiSnapshotDefinition::calculateValueOptions(
for (RimCase* rimCase : cases)
{
for (RimView* rimView : rimCase->views())
for (Rim3dView* rimView : rimCase->views())
{
views.push_back(rimView);
}
}
for (RimView* view : views)
for (Rim3dView* view : views)
{
QString caseAndView = view->ownerCase()->caseUserDescription() + " - " + view->name();
options.push_back(caf::PdmOptionItemInfo(caseAndView, view));

4
ApplicationCode/ProjectDataModel/RimMultiSnapshotDefinition.h
View File

@@ -27,7 +27,7 @@
#include "cafPdmPtrArrayField.h"
class RimCase;
class RimView;
class Rim3dView;
//==================================================================================================
///
@@ -42,7 +42,7 @@ public:
caf::PdmField<bool> isActive;
caf::PdmPtrField<RimView*> view;
caf::PdmPtrField<Rim3dView*> view;
caf::PdmField< caf::AppEnum< RiaDefines::ResultCatType > > eclipseResultType;
caf::PdmField< std::vector<QString> > selectedEclipseResults;

16
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@@ -58,7 +58,7 @@
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryCrossPlotCollection.h"
#include "RimSummaryPlotCollection.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimViewLinker.h"
#include "RimViewLinkerCollection.h"
#include "RimWellLogFile.h"
@@ -597,12 +597,12 @@ std::vector<RimSummaryCase*> RimProject::allSummaryCases() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimProject::allNotLinkedViews(std::vector<RimView*>& views)
void RimProject::allNotLinkedViews(std::vector<Rim3dView*>& views)
{
std::vector<RimCase*> cases;
allCases(cases);
std::vector<RimView*> alreadyLinkedViews;
std::vector<Rim3dView*> alreadyLinkedViews;
if (viewLinkerCollection->viewLinker())
{
viewLinkerCollection->viewLinker()->allViews(alreadyLinkedViews);
@@ -613,7 +613,7 @@ void RimProject::allNotLinkedViews(std::vector<RimView*>& views)
RimCase* rimCase = cases[caseIdx];
if (!rimCase) continue;
std::vector<RimView*> caseViews = rimCase->views();
std::vector<Rim3dView*> caseViews = rimCase->views();
for (size_t viewIdx = 0; viewIdx < caseViews.size(); viewIdx++)
{
bool isLinked = false;
@@ -635,7 +635,7 @@ void RimProject::allNotLinkedViews(std::vector<RimView*>& views)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimProject::allVisibleViews(std::vector<RimView*>& views)
void RimProject::allVisibleViews(std::vector<Rim3dView*>& views)
{
std::vector<RimCase*> cases;
allCases(cases);
@@ -645,7 +645,7 @@ void RimProject::allVisibleViews(std::vector<RimView*>& views)
RimCase* rimCase = cases[caseIdx];
if (!rimCase) continue;
std::vector<RimView*> caseViews = rimCase->views();
std::vector<Rim3dView*> caseViews = rimCase->views();
for (size_t viewIdx = 0; viewIdx < caseViews.size(); viewIdx++)
{
if (caseViews[viewIdx] && caseViews[viewIdx]->viewer())
@@ -667,7 +667,7 @@ void RimProject::createDisplayModelAndRedrawAllViews()
{
RimCase* rimCase = cases[caseIdx];
if (rimCase == NULL) continue;
std::vector<RimView*> views = rimCase->views();
std::vector<Rim3dView*> views = rimCase->views();
for (size_t viewIdx = 0; viewIdx < views.size(); viewIdx++)
{
@@ -948,7 +948,7 @@ std::vector<RimFractureTemplate*> RimProject::allFractureTemplates() const
//--------------------------------------------------------------------------------------------------
void RimProject::reloadCompletionTypeResultsForEclipseCase(RimEclipseCase* eclipseCase)
{
std::vector<RimView*> views = eclipseCase->views();
std::vector<Rim3dView*> views = eclipseCase->views();
for (size_t viewIdx = 0; viewIdx < views.size(); viewIdx++)
{

6
ApplicationCode/ProjectDataModel/RimProject.h
View File

@@ -47,7 +47,7 @@ class RimObservedData;
class RimOilField;
class RimScriptCollection;
class RimSummaryCase;
class RimView;
class Rim3dView;
class RimViewLinker;
class RimViewLinkerCollection;
class RimWellPath;
@@ -106,8 +106,8 @@ public:
std::vector<RimSummaryCase*> allSummaryCases() const;
void allNotLinkedViews(std::vector<RimView*>& views);
void allVisibleViews(std::vector<RimView*>& views);
void allNotLinkedViews(std::vector<Rim3dView*>& views);
void allVisibleViews(std::vector<Rim3dView*>& views);
void createDisplayModelAndRedrawAllViews();

6
ApplicationCode/ProjectDataModel/RimPropertyFilterCollection.cpp
View File

@@ -18,7 +18,7 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RimPropertyFilterCollection.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimViewController.h"
CAF_PDM_XML_ABSTRACT_SOURCE_INIT(RimPropertyFilterCollection, "RimPropertyFilterCollection"); // Abstract class
@@ -46,7 +46,7 @@ RimPropertyFilterCollection::~RimPropertyFilterCollection()
//--------------------------------------------------------------------------------------------------
void RimPropertyFilterCollection::updateDisplayModelNotifyManagedViews() const
{
RimView* view = NULL;
Rim3dView* view = NULL;
this->firstAncestorOrThisOfType(view);
CVF_ASSERT(view);
if (!view) return;
@@ -83,7 +83,7 @@ void RimPropertyFilterCollection::defineUiTreeOrdering(caf::PdmUiTreeOrdering& u
{
PdmObject::defineUiTreeOrdering(uiTreeOrdering, uiConfigName);
RimView* rimView = NULL;
Rim3dView* rimView = NULL;
this->firstAncestorOrThisOfType(rimView);
RimViewController* viewController = rimView->viewController();
if (viewController && (viewController->isPropertyFilterOveridden()

2
ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.cpp
View File

@@ -145,7 +145,7 @@ void RimTernaryLegendConfig::fieldChangedByUi(const caf::PdmFieldHandle* changed
updateLabelText();
updateLegend();
RimView* view = nullptr;
Rim3dView* view = nullptr;
this->firstAncestorOrThisOfType(view);
if (view)

26
ApplicationCode/ProjectDataModel/RimViewController.cpp
View File

@@ -39,7 +39,7 @@
#include "RimGeoMechPropertyFilterCollection.h"
#include "RimGeoMechView.h"
#include "RimProject.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimViewLinker.h"
#include "RimViewLinkerCollection.h"
@@ -101,7 +101,7 @@ QList<caf::PdmOptionItemInfo> RimViewController::calculateValueOptions(const caf
if (fieldNeedingOptions == &m_managedView)
{
RimProject* proj = RiaApplication::instance()->project();
std::vector<RimView*> views;
std::vector<Rim3dView*> views;
proj->allNotLinkedViews(views);
// Add currently linked view to list
@@ -114,7 +114,7 @@ QList<caf::PdmOptionItemInfo> RimViewController::calculateValueOptions(const caf
this->firstAncestorOrThisOfType(viewLinker);
CVF_ASSERT(viewLinker);
for (RimView* view : views)
for (Rim3dView* view : views)
{
if (view != viewLinker->masterView())
{
@@ -212,7 +212,7 @@ void RimViewController::fieldChangedByUi(const caf::PdmFieldHandle* changedField
else if (changedField == &m_managedView)
{
PdmObjectHandle* prevValue = oldValue.value<caf::PdmPointer<PdmObjectHandle> >().rawPtr();
RimView* previousManagedView = dynamic_cast<RimView*>(prevValue);
Rim3dView* previousManagedView = dynamic_cast<Rim3dView*>(prevValue);
RimViewController::removeOverrides(previousManagedView);
setManagedView(m_managedView());
@@ -232,7 +232,7 @@ void RimViewController::fieldChangedByUi(const caf::PdmFieldHandle* changedField
//--------------------------------------------------------------------------------------------------
RimEclipseView* RimViewController::managedEclipseView() const
{
RimView* rimView = m_managedView;
Rim3dView* rimView = m_managedView;
return dynamic_cast<RimEclipseView*>(rimView);
}
@@ -242,7 +242,7 @@ RimEclipseView* RimViewController::managedEclipseView() const
//--------------------------------------------------------------------------------------------------
RimGeoMechView* RimViewController::managedGeoView() const
{
RimView* rimView = m_managedView;
Rim3dView* rimView = m_managedView;
return dynamic_cast<RimGeoMechView*>(rimView);
}
@@ -254,7 +254,7 @@ void RimViewController::updateOverrides()
{
RimViewLinker* viewLinker = ownerViewLinker();
RimView* masterView = viewLinker->masterView();
Rim3dView* masterView = viewLinker->masterView();
CVF_ASSERT(masterView);
@@ -343,7 +343,7 @@ void RimViewController::removeOverrides()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewController::removeOverrides(RimView* view)
void RimViewController::removeOverrides(Rim3dView* view)
{
if (view)
{
@@ -362,7 +362,7 @@ void RimViewController::removeOverrides(RimView* view)
//--------------------------------------------------------------------------------------------------
void RimViewController::updateOptionSensitivity()
{
RimView* mainView = nullptr;
Rim3dView* mainView = nullptr;
{
RimViewLinker* linkedViews = nullptr;
@@ -448,7 +448,7 @@ void RimViewController::updateOptionSensitivity()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimView* RimViewController::managedView() const
Rim3dView* RimViewController::managedView() const
{
return m_managedView;
}
@@ -456,7 +456,7 @@ RimView* RimViewController::managedView() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewController::setManagedView(RimView* view)
void RimViewController::setManagedView(Rim3dView* view)
{
m_managedView = view;
@@ -644,7 +644,7 @@ const RigCaseToCaseCellMapper* RimViewController::cellMapper()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimView* RimViewController::masterView() const
Rim3dView* RimViewController::masterView() const
{
return ownerViewLinker()->masterView();
}
@@ -1041,7 +1041,7 @@ void RimViewController::applyRangeFilterCollectionByUserChoice()
//--------------------------------------------------------------------------------------------------
bool RimViewController::askUserToRestoreOriginalRangeFilterCollection(const QString& viewName)
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
QMessageBox msgBox(activeView->viewer()->layoutWidget());
msgBox.setIcon(QMessageBox::Question);

12
ApplicationCode/ProjectDataModel/RimViewController.h
View File

@@ -28,7 +28,7 @@
#include "RivCellSetEnum.h"
class RimView;
class Rim3dView;
class RimEclipseView;
class RimGeoMechView;
class RimViewLinker;
@@ -49,10 +49,10 @@ public:
bool isActive() const;
RimView* managedView() const;
void setManagedView(RimView* view);
Rim3dView* managedView() const;
void setManagedView(Rim3dView* view);
RimView* masterView() const;
Rim3dView* masterView() const;
RimViewLinker* ownerViewLinker() const;
const RigCaseToCaseCellMapper* cellMapper();
@@ -102,12 +102,12 @@ private:
RimEclipseView* managedEclipseView() const;
RimGeoMechView* managedGeoView() const;
static void removeOverrides(RimView* view);
static void removeOverrides(Rim3dView* view);
static bool askUserToRestoreOriginalRangeFilterCollection(const QString& viewName);
private:
caf::PdmField<QString> m_name;
caf::PdmPtrField<RimView*> m_managedView;
caf::PdmPtrField<Rim3dView*> m_managedView;
caf::PdmField<bool> m_isActive;
caf::PdmField<bool> m_syncCamera;

38
ApplicationCode/ProjectDataModel/RimViewLinker.cpp
View File

@@ -36,7 +36,7 @@
#include "RimLegendConfig.h"
#include "RimProject.h"
#include "RimTernaryLegendConfig.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimViewController.h"
#include "RimViewLinkerCollection.h"
#include "RimViewManipulator.h"
@@ -83,7 +83,7 @@ RimViewLinker::~RimViewLinker(void)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLinker::updateTimeStep(RimView* sourceView, int timeStep)
void RimViewLinker::updateTimeStep(Rim3dView* sourceView, int timeStep)
{
CVF_ASSERT(sourceView);
@@ -125,7 +125,7 @@ void RimViewLinker::updateTimeStep(RimView* sourceView, int timeStep)
//--------------------------------------------------------------------------------------------------
void RimViewLinker::updateCellResult()
{
RimView* rimView = m_masterView;
Rim3dView* rimView = m_masterView;
RimEclipseView* masterEclipseView = dynamic_cast<RimEclipseView*>(rimView);
if (masterEclipseView && masterEclipseView->cellResult())
{
@@ -137,7 +137,7 @@ void RimViewLinker::updateCellResult()
if (viewLink->managedView())
{
RimView* rimView = viewLink->managedView();
Rim3dView* rimView = viewLink->managedView();
RimEclipseView* eclipseView = dynamic_cast<RimEclipseView*>(rimView);
if (eclipseView)
{
@@ -175,7 +175,7 @@ void RimViewLinker::updateCellResult()
if (viewLink->managedView())
{
RimView* rimView = viewLink->managedView();
Rim3dView* rimView = viewLink->managedView();
RimGeoMechView* geoView = dynamic_cast<RimGeoMechView*>(rimView);
if (geoView)
{
@@ -247,7 +247,7 @@ void RimViewLinker::removeOverrides()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLinker::allViewsForCameraSync(const RimView* source, std::vector<RimView*>& views) const
void RimViewLinker::allViewsForCameraSync(const Rim3dView* source, std::vector<Rim3dView*>& views) const
{
if (!isActive()) return;
@@ -283,7 +283,7 @@ void RimViewLinker::updateDependentViews()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimViewLinker::displayNameForView(RimView* view)
QString RimViewLinker::displayNameForView(Rim3dView* view)
{
QString displayName = "None";
@@ -303,7 +303,7 @@ QString RimViewLinker::displayNameForView(RimView* view)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLinker::setMasterView(RimView* view)
void RimViewLinker::setMasterView(Rim3dView* view)
{
RimViewController* previousViewController = view->viewController();
@@ -324,7 +324,7 @@ void RimViewLinker::setMasterView(RimView* view)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimView* RimViewLinker::masterView() const
Rim3dView* RimViewLinker::masterView() const
{
return m_masterView;
}
@@ -332,7 +332,7 @@ RimView* RimViewLinker::masterView() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLinker::allViews(std::vector<RimView*>& views) const
void RimViewLinker::allViews(std::vector<Rim3dView*>& views) const
{
views.push_back(m_masterView());
@@ -356,7 +356,7 @@ void RimViewLinker::initAfterRead()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLinker::updateScaleZ(RimView* sourceView, double scaleZ)
void RimViewLinker::updateScaleZ(Rim3dView* sourceView, double scaleZ)
{
if (!isActive()) return;
@@ -371,7 +371,7 @@ void RimViewLinker::updateScaleZ(RimView* sourceView, double scaleZ)
}
}
std::vector<RimView*> views;
std::vector<Rim3dView*> views;
allViewsForCameraSync(sourceView, views);
// Make sure scale factors are identical
@@ -454,7 +454,7 @@ void RimViewLinker::scheduleCreateDisplayModelAndRedrawForDependentViews()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLinker::findNameAndIconFromView(QString* name, QIcon* icon, RimView* view)
void RimViewLinker::findNameAndIconFromView(QString* name, QIcon* icon, Rim3dView* view)
{
CVF_ASSERT(name && icon);
@@ -487,7 +487,7 @@ void RimViewLinker::findNameAndIconFromView(QString* name, QIcon* icon, RimView*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLinker::updateCursorPosition(const RimView* sourceView, const cvf::Vec3d& domainCoord)
void RimViewLinker::updateCursorPosition(const Rim3dView* sourceView, const cvf::Vec3d& domainCoord)
{
RimViewController* sourceViewLink = sourceView->viewController();
if (sourceViewLink && !sourceViewLink->showCursor())
@@ -495,10 +495,10 @@ void RimViewLinker::updateCursorPosition(const RimView* sourceView, const cvf::V
return;
}
std::vector<RimView*> viewsToUpdate;
std::vector<Rim3dView*> viewsToUpdate;
allViewsForCameraSync(sourceView, viewsToUpdate);
for (RimView* destinationView : viewsToUpdate)
for (Rim3dView* destinationView : viewsToUpdate)
{
if (destinationView == sourceView) continue;
@@ -521,7 +521,7 @@ void RimViewLinker::updateCursorPosition(const RimView* sourceView, const cvf::V
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLinker::updateCamera(RimView* sourceView)
void RimViewLinker::updateCamera(Rim3dView* sourceView)
{
if (!sourceView->viewer()) return;
@@ -536,7 +536,7 @@ void RimViewLinker::updateCamera(RimView* sourceView)
}
}
std::vector<RimView*> viewsToUpdate;
std::vector<Rim3dView*> viewsToUpdate;
allViewsForCameraSync(sourceView, viewsToUpdate);
RimViewManipulator::applySourceViewCameraOnDestinationViews(sourceView, viewsToUpdate);
@@ -545,7 +545,7 @@ void RimViewLinker::updateCamera(RimView* sourceView)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLinker::addDependentView(RimView* view)
void RimViewLinker::addDependentView(Rim3dView* view)
{
CVF_ASSERT(view && view != m_masterView);

26
ApplicationCode/ProjectDataModel/RimViewLinker.h
View File

@@ -36,7 +36,7 @@ namespace cvf
class RimViewController;
class RiuViewer;
class RimView;
class Rim3dView;
class RimCellRangeFilter;
//==================================================================================================
@@ -53,18 +53,18 @@ public:
bool isActive() const;
void setMasterView(RimView* view);
RimView* masterView() const;
void setMasterView(Rim3dView* view);
Rim3dView* masterView() const;
void addDependentView(RimView* view);
void addDependentView(Rim3dView* view);
void updateDependentViews();
void removeViewController(RimViewController* viewController);
void updateOverrides();
void updateCamera(RimView* sourceView);
void updateTimeStep(RimView* sourceView, int timeStep);
void updateScaleZ(RimView* sourceView, double scaleZ);
void updateCamera(Rim3dView* sourceView);
void updateTimeStep(Rim3dView* sourceView, int timeStep);
void updateScaleZ(Rim3dView* sourceView, double scaleZ);
void updateCellResult();
@@ -74,32 +74,32 @@ public:
void scheduleGeometryRegenForDepViews(RivCellSetEnum geometryType);
void scheduleCreateDisplayModelAndRedrawForDependentViews();
void allViews(std::vector<RimView*>& views) const;
void allViews(std::vector<Rim3dView*>& views) const;
void updateUiNameAndIcon();
void addViewControllers(caf::PdmUiTreeOrdering& uiTreeOrdering) const;
static void applyIconEnabledState(caf::PdmObject* obj, const QIcon& icon, bool disable);
static void findNameAndIconFromView(QString* name, QIcon* icon, RimView* view);
static void findNameAndIconFromView(QString* name, QIcon* icon, Rim3dView* view);
void updateCursorPosition(const RimView* sourceView, const cvf::Vec3d& domainCoord);
void updateCursorPosition(const Rim3dView* sourceView, const cvf::Vec3d& domainCoord);
public:
static QString displayNameForView(RimView* view);
static QString displayNameForView(Rim3dView* view);
protected:
virtual caf::PdmFieldHandle* userDescriptionField() { return &m_name; }
virtual void initAfterRead();
private:
void allViewsForCameraSync(const RimView* source, std::vector<RimView*>& views) const;
void allViewsForCameraSync(const Rim3dView* source, std::vector<Rim3dView*>& views) const;
void removeOverrides();
private:
caf::PdmChildArrayField<RimViewController*> m_viewControllers;
caf::PdmPtrField<RimView*> m_masterView;
caf::PdmPtrField<Rim3dView*> m_masterView;
caf::PdmField<QString> m_name;
QIcon m_originalIcon;
};

6
ApplicationCode/ProjectDataModel/RimViewManipulator.cpp
View File

@@ -21,7 +21,7 @@
#include "RigMainGrid.h"
#include "RimEclipseView.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimCase.h"
#include "RiuViewer.h"
@@ -35,7 +35,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewManipulator::applySourceViewCameraOnDestinationViews(RimView* sourceView, std::vector<RimView*>& destinationViews)
void RimViewManipulator::applySourceViewCameraOnDestinationViews(Rim3dView* sourceView, std::vector<Rim3dView*>& destinationViews)
{
bool setPointOfInterest = false;
cvf::Vec3d sourceCamUp;
@@ -72,7 +72,7 @@ void RimViewManipulator::applySourceViewCameraOnDestinationViews(RimView* source
sourceSceneBB.transform(trans);
}
for (RimView* destinationView : destinationViews)
for (Rim3dView* destinationView : destinationViews)
{
if (!destinationView) continue;

4
ApplicationCode/ProjectDataModel/RimViewManipulator.h
View File

@@ -24,12 +24,12 @@ namespace cvf {
class BoundingBox;
}
class RimView;
class Rim3dView;
class RimViewManipulator
{
public:
static void applySourceViewCameraOnDestinationViews(RimView* sourceView, std::vector<RimView*>& destinationViews);
static void applySourceViewCameraOnDestinationViews(Rim3dView* sourceView, std::vector<Rim3dView*>& destinationViews);
private:
static bool isBoundingBoxesOverlappingOrClose(const cvf::BoundingBox& sourceBB, const cvf::BoundingBox& destBB);

4
ApplicationCode/ProjectDataModel/RimViewWindow.cpp
View File

@@ -198,7 +198,7 @@ void RimViewWindow::setAsMdiWindow(int mainWindowID)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
#include "RimView.h"
#include "Rim3dView.h"
void RimViewWindow::initAfterRead()
{
@@ -207,7 +207,7 @@ void RimViewWindow::initAfterRead()
RimMdiWindowGeometry wg;
int mainWindowID = -1;
if (dynamic_cast<RimView*> (this))
if (dynamic_cast<Rim3dView*> (this))
mainWindowID = 0;
else
mainWindowID = 1;

2
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp
View File

@@ -183,7 +183,7 @@ RimCase* RimWellLogExtractionCurve::rimCase() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellLogExtractionCurve::setPropertiesFromView(RimView* view)
void RimWellLogExtractionCurve::setPropertiesFromView(Rim3dView* view)
{
m_case = view ? view->ownerCase() : NULL;

4
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.h
View File

@@ -28,7 +28,7 @@ class RigWellPath;
class RimCase;
class RimEclipseResultDefinition;
class RimGeoMechResultDefinition;
class RimView;
class Rim3dView;
class RimWellPath;
//==================================================================================================
@@ -52,7 +52,7 @@ public:
void setCase(RimCase* rimCase);
RimCase* rimCase() const;
void setPropertiesFromView(RimView* view);
void setPropertiesFromView(Rim3dView* view);
virtual QString wellName() const;
virtual QString wellLogChannelName() const;