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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ApplicationCode/Application/RiaApplication.cpp
View File

@ -557,14 +557,14 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi
CVF_ASSERT(cas);
caseProgress.setProgressDescription(cas->caseUserDescription());
std::vector<RimView*> views = cas->views();
std::vector<Rim3dView*> views = cas->views();
{ // To delete the view progress before incrementing the caseProgress
caf::ProgressInfo viewProgress(views.size(), "Creating Views");
size_t j;
for ( j = 0; j < views.size(); j++ )
{
RimView* riv = views[j];
Rim3dView* riv = views[j];
CVF_ASSERT(riv);
viewProgress.setProgressDescription(riv->name());
@ -1152,7 +1152,7 @@ void RiaApplication::createInputMockModel()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const RimView* RiaApplication::activeReservoirView() const
const Rim3dView* RiaApplication::activeReservoirView() const
{
return m_activeReservoirView;
}
@ -1160,7 +1160,7 @@ const RimView* RiaApplication::activeReservoirView() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimView* RiaApplication::activeReservoirView()
Rim3dView* RiaApplication::activeReservoirView()
{
return m_activeReservoirView;
}
@ -1187,7 +1187,7 @@ RimViewWindow* RiaApplication::activePlotWindow() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaApplication::setActiveReservoirView(RimView* rv)
void RiaApplication::setActiveReservoirView(Rim3dView* rv)
{
m_activeReservoirView = rv;
}
@ -1765,7 +1765,7 @@ void RiaApplication::applyPreferences()
this->project()->setScriptDirectories(m_preferences->scriptDirectories());
this->project()->updateConnectedEditors();
std::vector<RimView*> visibleViews;
std::vector<Rim3dView*> visibleViews;
this->project()->allVisibleViews(visibleViews);
for (auto view : visibleViews)
@ -2312,7 +2312,7 @@ QString RiaApplication::commandLineParameterHelp() const
/// Schedule a creation of the Display model and redraw of the reservoir view
/// The redraw will happen as soon as the event loop is entered
//--------------------------------------------------------------------------------------------------
void RiaApplication::scheduleDisplayModelUpdateAndRedraw(RimView* resViewToUpdate)
void RiaApplication::scheduleDisplayModelUpdateAndRedraw(Rim3dView* resViewToUpdate)
{
m_resViewsToUpdate.push_back(resViewToUpdate);
@ -2375,8 +2375,8 @@ void RiaApplication::slotUpdateScheduledDisplayModels()
// Compress to remove duplicates
// and update dependent views after independent views
std::set<RimView*> independent3DViewsToUpdate;
std::set<RimView*> dependent3DViewsToUpdate;
std::set<Rim3dView*> independent3DViewsToUpdate;
std::set<Rim3dView*> dependent3DViewsToUpdate;
for (size_t i = 0; i < m_resViewsToUpdate.size(); ++i)
{
@ -2388,7 +2388,7 @@ void RiaApplication::slotUpdateScheduledDisplayModels()
independent3DViewsToUpdate.insert(m_resViewsToUpdate[i]);
}
for (std::set<RimView*>::iterator it = independent3DViewsToUpdate.begin(); it != independent3DViewsToUpdate.end(); ++it )
for (std::set<Rim3dView*>::iterator it = independent3DViewsToUpdate.begin(); it != independent3DViewsToUpdate.end(); ++it )
{
if (*it)
{
@ -2396,7 +2396,7 @@ void RiaApplication::slotUpdateScheduledDisplayModels()
}
}
for (std::set<RimView*>::iterator it = dependent3DViewsToUpdate.begin(); it != dependent3DViewsToUpdate.end(); ++it)
for (std::set<Rim3dView*>::iterator it = dependent3DViewsToUpdate.begin(); it != dependent3DViewsToUpdate.end(); ++it)
{
if (*it)
{
@ -2414,7 +2414,7 @@ void RiaApplication::slotRecalculateCompletionType()
{
std::set<RimEclipseCase*> uniqueCases(m_eclipseCasesToRecalculate.begin(), m_eclipseCasesToRecalculate.end());
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
QModelIndex mi = RiuMainWindow::instance()->projectTreeView()->treeView()->currentIndex();
for (RimEclipseCase* eclipseCase : uniqueCases)
@ -2551,11 +2551,11 @@ void RiaApplication::regressionTestConfigureProject()
RimCase* cas = projectCases[i];
if (!cas) continue;
std::vector<RimView*> views = cas->views();
std::vector<Rim3dView*> views = cas->views();
for (size_t j = 0; j < views.size(); j++)
{
RimView* riv = views[j];
Rim3dView* riv = views[j];
if (riv && riv->viewer())
{

16
ApplicationCode/Application/RiaApplication.h
View File

@ -50,7 +50,7 @@ class RimEclipseCase;
class RimEclipseView;
class RimProject;
class RimSummaryPlot;
class RimView;
class Rim3dView;
class RimViewWindow;
class RimWellLogPlot;
class RimWellAllocationPlot;
@ -99,13 +99,13 @@ public:
void executeRegressionTests(const QString& regressionTestPath, QStringList* testFilter = nullptr);
void setActiveReservoirView(RimView*);
RimView* activeReservoirView();
const RimView* activeReservoirView() const;
void setActiveReservoirView(Rim3dView*);
Rim3dView* activeReservoirView();
const Rim3dView* activeReservoirView() const;
RimViewWindow* activePlotWindow() const;
void scheduleDisplayModelUpdateAndRedraw(RimView* resViewToUpdate);
void scheduleDisplayModelUpdateAndRedraw(Rim3dView* resViewToUpdate);
void scheduleRecalculateCompletionTypeAndRedrawAllViews();
void scheduleRecalculateCompletionTypeAndRedrawEclipseCase(RimEclipseCase* eclipseCase);
@ -234,16 +234,16 @@ private slots:
// Friend classes required to have access to slotUpdateScheduledDisplayModels
// As snapshots are produced fast in sequence, the feature must have access to force redraw
// of scheduled redraws
friend class RimView;
friend class Rim3dView;
friend class RicExportMultipleSnapshotsFeature;
friend class RiaArgumentParser;
private:
caf::PdmPointer<RimView> m_activeReservoirView;
caf::PdmPointer<Rim3dView> m_activeReservoirView;
caf::PdmPointer<RimProject> m_project;
std::vector<caf::PdmPointer<RimView> > m_resViewsToUpdate;
std::vector<caf::PdmPointer<Rim3dView> > m_resViewsToUpdate;
QTimer* m_resViewUpdateTimer;
std::vector<caf::PdmPointer<RimEclipseCase> > m_eclipseCasesToRecalculate;
QTimer* m_recalculateCompletionTypeTimer;

2
ApplicationCode/CommandFileInterface/RicfComputeCaseGroupStatistics.cpp
View File

@ -25,7 +25,7 @@
#include "RimEclipseStatisticsCase.h"
#include "RimIdenticalGridCaseGroup.h"
#include "RimCaseCollection.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RiaApplication.h"
#include "RiaLogging.h"

2
ApplicationCode/CommandFileInterface/RicfExportProperty.cpp
View File

@ -88,7 +88,7 @@ void RicfExportProperty::execute()
// FIXME : Select correct view?
RimEclipseView* view;
for (RimView* v : eclipseCase->views())
for (Rim3dView* v : eclipseCase->views())
{
view = dynamic_cast<RimEclipseView*>(v);
if (view) break;

2
ApplicationCode/CommandFileInterface/RicfExportSimWellCompletions.cpp
View File

@ -91,7 +91,7 @@ void RicfExportSimWellCompletions::execute()
// FIXME : Select correct view?
RimEclipseView* view;
for (RimView* v : exportSettings->caseToApply->views())
for (Rim3dView* v : exportSettings->caseToApply->views())
{
view = dynamic_cast<RimEclipseView*>(v);
if (view) break;

4
ApplicationCode/CommandFileInterface/RicfSetTimeStep.cpp
View File

@ -22,7 +22,7 @@
#include "RimOilField.h"
#include "RimEclipseCaseCollection.h"
#include "RimEclipseCase.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
@ -63,7 +63,7 @@ void RicfSetTimeStep::execute()
}
}
for (RimView* view : eclipseCase->views())
for (Rim3dView* view : eclipseCase->views())
{
view->setCurrentTimeStepAndUpdate(m_timeStepIndex);
}

4
ApplicationCode/Commands/CompletionCommands/RicNewFishbonesSubsFeature.cpp
View File

@ -28,7 +28,7 @@
#include "RimFishboneWellPathCollection.h"
#include "RimFishbonesCollection.h"
#include "RimFishbonesMultipleSubs.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimWellPathCollection.h"
#include "RiuMainWindow.h"
@ -150,7 +150,7 @@ void RicNewFishbonesSubsFeature::askUserToSetUsefulScaling(RimFishbonesCollectio
fishboneCollection->firstAncestorOrThisOfTypeAsserted(wellPathColl);
wellPathColl->wellPathRadiusScaleFactor = 0.01;
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return;
RiaApplication* app = RiaApplication::instance();

4
ApplicationCode/Commands/CrossSectionCommands/RicAppendIntersectionFeature.cpp
View File

@ -21,7 +21,7 @@
#include "RimIntersection.h"
#include "RimIntersectionCollection.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "cafCmdExecCommandManager.h"
#include "cafSelectionManager.h"
@ -102,7 +102,7 @@ void RicAppendIntersectionFeatureCmd::redo()
intersection->name = QString("Intersection");
m_intersectionCollection->appendIntersection(intersection);
RimView* view = nullptr;
Rim3dView* view = nullptr;
m_intersectionCollection->firstAncestorOrThisOfTypeAsserted(view);
//Enable display of grid cells, to be able to show generated property filter

4
ApplicationCode/Commands/CrossSectionCommands/RicNewAzimuthDipIntersectionFeature.cpp
View File

@ -23,7 +23,7 @@
#include "RimCase.h"
#include "RimIntersection.h"
#include "RimIntersectionCollection.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RiuMainWindow.h"
#include "RiuSelectionManager.h"
@ -61,7 +61,7 @@ bool RicNewAzimuthDipIntersectionFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicNewAzimuthDipIntersectionFeature::onActionTriggered(bool isChecked)
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return;
RicNewAzimuthDipIntersectionFeatureCmd* cmd = new RicNewAzimuthDipIntersectionFeatureCmd(activeView->crossSectionCollection);

4
ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineIntersectionFeature.cpp
View File

@ -24,7 +24,7 @@
#include "RimCase.h"
#include "RimIntersection.h"
#include "RimIntersectionCollection.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RiuMainWindow.h"
#include "RiuSelectionManager.h"
@ -60,7 +60,7 @@ bool RicNewPolylineIntersectionFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicNewPolylineIntersectionFeature::onActionTriggered(bool isChecked)
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return;
RicNewPolylineIntersectionFeatureCmd* cmd = new RicNewPolylineIntersectionFeatureCmd(activeView->crossSectionCollection);

4
ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.cpp
View File

@ -24,7 +24,7 @@
#include "RimIntersection.h"
#include "RimIntersectionCollection.h"
#include "RimWellPath.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "cafCmdExecCommandManager.h"
#include "cafSelectionManager.h"
@ -56,7 +56,7 @@ bool RicNewWellPathIntersectionFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicNewWellPathIntersectionFeature::onActionTriggered(bool isChecked)
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return;
std::vector<RimWellPath*> collection;

6
ApplicationCode/Commands/EclipseCommands/RicEclipseHideFaultFeature.cpp
View File

@ -28,7 +28,7 @@
#include "RimEclipseView.h"
#include "RimFaultInView.h"
#include "RimFaultInViewCollection.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RigFault.h"
#include "RigMainGrid.h"
@ -45,7 +45,7 @@ CAF_CMD_SOURCE_INIT(RicEclipseHideFaultFeature, "RicEclipseHideFaultFeature");
//--------------------------------------------------------------------------------------------------
bool RicEclipseHideFaultFeature::isCommandEnabled()
{
RimView* view = RiaApplication::instance()->activeReservoirView();
Rim3dView* view = RiaApplication::instance()->activeReservoirView();
if (!view) return false;
RimEclipseView* eclView = dynamic_cast<RimEclipseView*>(view);
@ -63,7 +63,7 @@ void RicEclipseHideFaultFeature::onActionTriggered(bool isChecked)
if (!userData.isNull() && userData.type() == QVariant::List)
{
RimView* view = RiaApplication::instance()->activeReservoirView();
Rim3dView* view = RiaApplication::instance()->activeReservoirView();
if (!view) return;
RimEclipseView* eclView = dynamic_cast<RimEclipseView*>(view);
if (!eclView) return;

2
ApplicationCode/Commands/EclipseCommands/RicEclipsePropertyFilterFeatureImpl.cpp
View File

@ -91,7 +91,7 @@ void RicEclipsePropertyFilterFeatureImpl::insertPropertyFilter(RimEclipsePropert
//--------------------------------------------------------------------------------------------------
bool RicEclipsePropertyFilterFeatureImpl::isPropertyFilterCommandAvailable(caf::PdmObjectHandle* object)
{
RimView* rimView = NULL;
Rim3dView* rimView = NULL;
object->firstAncestorOrThisOfType(rimView);
if (rimView)
{

4
ApplicationCode/Commands/EclipseCommands/RicEclipsePropertyFilterNewExec.cpp
View File

@ -23,7 +23,7 @@
#include "RimEclipsePropertyFilter.h"
#include "RimEclipsePropertyFilterCollection.h"
#include "RimView.h"
#include "Rim3dView.h"
//--------------------------------------------------------------------------------------------------
@ -58,7 +58,7 @@ void RicEclipsePropertyFilterNewExec::redo()
{
RicEclipsePropertyFilterFeatureImpl::addPropertyFilter(m_propertyFilterCollection);
RimView* view = nullptr;
Rim3dView* view = nullptr;
m_propertyFilterCollection->firstAncestorOrThisOfTypeAsserted(view);
//Enable display of grid cells, to be able to show generated property filter

6
ApplicationCode/Commands/EclipseCommands/RicEclipsePropertyFilterNewInViewFeature.cpp
View File

@ -26,7 +26,7 @@
#include "RimEclipseCellColors.h"
#include "RimEclipsePropertyFilterCollection.h"
#include "RimEclipseView.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "cafCmdExecCommandManager.h"
@ -39,7 +39,7 @@ CAF_CMD_SOURCE_INIT(RicEclipsePropertyFilterNewInViewFeature, "RicEclipsePropert
//--------------------------------------------------------------------------------------------------
bool RicEclipsePropertyFilterNewInViewFeature::isCommandEnabled()
{
RimView* view = RiaApplication::instance()->activeReservoirView();
Rim3dView* view = RiaApplication::instance()->activeReservoirView();
if (!view) return false;
RimEclipseView* eclView = dynamic_cast<RimEclipseView*>(view);
@ -64,7 +64,7 @@ bool RicEclipsePropertyFilterNewInViewFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicEclipsePropertyFilterNewInViewFeature::onActionTriggered(bool isChecked)
{
RimView* view = RiaApplication::instance()->activeReservoirView();
Rim3dView* view = RiaApplication::instance()->activeReservoirView();
if (!view) return;
RimEclipseView* eclView = dynamic_cast<RimEclipseView*>(view);
if (!eclView) return;

12
ApplicationCode/Commands/ExportCommands/RicExportMultipleSnapshotsFeature.cpp
View File

@ -36,7 +36,7 @@
#include "RimGeoMechView.h"
#include "RimMultiSnapshotDefinition.h"
#include "RimProject.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RiuExportMultipleSnapshotsWidget.h"
#include "RiuViewer.h"
@ -79,7 +79,7 @@ void RicExportMultipleSnapshotsFeature::onActionTriggered(bool isChecked)
RiuExportMultipleSnapshotsWidget dlg(nullptr, proj);
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (activeView && proj->multiSnapshotDefinitions.size() == 0)
{
dlg.addSnapshotItemFromActiveView();
@ -116,7 +116,7 @@ void RicExportMultipleSnapshotsFeature::exportMultipleSnapshots(const QString& f
{
if (!msd->isActive()) continue;
RimView* sourceView = msd->view();
Rim3dView* sourceView = msd->view();
if (!sourceView) continue;
if (!sourceView->viewer()) continue;
@ -178,7 +178,7 @@ void RicExportMultipleSnapshotsFeature::exportMultipleSnapshots(const QString& f
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicExportMultipleSnapshotsFeature::exportViewVariations(RimView* rimView, RimMultiSnapshotDefinition* msd, const QString& folder)
void RicExportMultipleSnapshotsFeature::exportViewVariations(Rim3dView* rimView, RimMultiSnapshotDefinition* msd, const QString& folder)
{
if (msd->selectedEclipseResults().size() > 0)
{
@ -206,7 +206,7 @@ void RicExportMultipleSnapshotsFeature::exportViewVariations(RimView* rimView, R
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicExportMultipleSnapshotsFeature::exportViewVariationsToFolder(RimView* rimView, RimMultiSnapshotDefinition* msd, const QString& folder)
void RicExportMultipleSnapshotsFeature::exportViewVariationsToFolder(Rim3dView* rimView, RimMultiSnapshotDefinition* msd, const QString& folder)
{
RimCase* rimCase = rimView->ownerCase();
CVF_ASSERT(rimCase);
@ -293,7 +293,7 @@ void RicExportMultipleSnapshotsFeature::exportViewVariationsToFolder(RimView* ri
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RicExportMultipleSnapshotsFeature::resultName(RimView* rimView)
QString RicExportMultipleSnapshotsFeature::resultName(Rim3dView* rimView)
{
if (dynamic_cast<RimEclipseView*>(rimView))
{

8
ApplicationCode/Commands/ExportCommands/RicExportMultipleSnapshotsFeature.h
View File

@ -22,7 +22,7 @@
class RimMultiSnapshotDefinition;
class RimProject;
class RimView;
class Rim3dView;
//==================================================================================================
///
@ -39,10 +39,10 @@ protected:
public:
static void exportMultipleSnapshots(const QString& folder, RimProject* project);
static void exportViewVariations(RimView* rimView, RimMultiSnapshotDefinition* msd, const QString& folder);
static void exportViewVariations(Rim3dView* rimView, RimMultiSnapshotDefinition* msd, const QString& folder);
private:
static void exportViewVariationsToFolder(RimView* rimView, RimMultiSnapshotDefinition* msd, const QString& folder);
static QString resultName(RimView* rimView);
static void exportViewVariationsToFolder(Rim3dView* rimView, RimMultiSnapshotDefinition* msd, const QString& folder);
static QString resultName(Rim3dView* rimView);
};

4
ApplicationCode/Commands/ExportCommands/RicSaveEclipseInputVisibleCellsFeature.cpp
View File

@ -30,7 +30,7 @@
#include "RimEclipseCase.h"
#include "RimEclipseCellColors.h"
#include "RimEclipseView.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RigActiveCellInfo.h"
#include "RigEclipseCaseData.h"
@ -174,7 +174,7 @@ void RicSaveEclipseInputActiveVisibleCellsFeature::setupActionLook(QAction* acti
//--------------------------------------------------------------------------------------------------
RimEclipseView* RicSaveEclipseInputActiveVisibleCellsFeature::getEclipseActiveView()
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
return dynamic_cast<RimEclipseView*>(activeView);
}

2
ApplicationCode/Commands/ExportCommands/RicSaveEclipseResultAsInputPropertyFeature.cpp
View File

@ -22,7 +22,7 @@
#include "RicSaveEclipseResultAsInputPropertyExec.h"
#include "RimEclipseCellColors.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "cafSelectionManager.h"
#include "cafCmdExecCommandManager.h"

6
ApplicationCode/Commands/ExportCommands/RicSnapshotAllViewsToFileFeature.cpp
View File

@ -24,7 +24,7 @@
#include "RimMainPlotCollection.h"
#include "RimProject.h"
#include "RimViewWindow.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimCase.h"
#include "Rim3dOverlayInfoConfig.h"
@ -97,11 +97,11 @@ void RicSnapshotAllViewsToFileFeature::exportSnapshotOfAllViewsIntoFolder(QStrin
RimCase* cas = projectCases[i];
if (!cas) continue;
std::vector<RimView*> views = cas->views();
std::vector<Rim3dView*> views = cas->views();
for (size_t j = 0; j < views.size(); j++)
{
RimView* riv = views[j];
Rim3dView* riv = views[j];
if (riv && riv->viewer())
{

8
ApplicationCode/Commands/ExportCommands/RicSnapshotFilenameGenerator.cpp
View File

@ -19,7 +19,7 @@
#include "RicSnapshotFilenameGenerator.h"
#include "RimViewWindow.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimCase.h"
#include "RimEclipseView.h"
#include "RimEclipseCellColors.h"
@ -35,7 +35,7 @@
QString RicSnapshotFilenameGenerator::generateSnapshotFileName(RimViewWindow* viewWindow)
{
{
RimView* view = dynamic_cast<RimView*>(viewWindow);
Rim3dView* view = dynamic_cast<Rim3dView*>(viewWindow);
if (view != nullptr)
{
return generateSnapshotFilenameForRimView(view);
@ -59,7 +59,7 @@ QString RicSnapshotFilenameGenerator::generateSnapshotFileName(RimViewWindow* vi
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RicSnapshotFilenameGenerator::generateSnapshotFilenameForRimView(RimView* rimView)
QString RicSnapshotFilenameGenerator::generateSnapshotFilenameForRimView(Rim3dView* rimView)
{
QStringList timeSteps = rimView->ownerCase()->timeStepStrings();
int timeStep = rimView->currentTimeStep();
@ -79,7 +79,7 @@ QString RicSnapshotFilenameGenerator::generateSnapshotFilenameForRimView(RimView
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RicSnapshotFilenameGenerator::resultName(RimView * rimView)
QString RicSnapshotFilenameGenerator::resultName(Rim3dView * rimView)
{
if (dynamic_cast<RimEclipseView*>(rimView))
{

6
ApplicationCode/Commands/ExportCommands/RicSnapshotFilenameGenerator.h
View File

@ -21,7 +21,7 @@
#include <QString>
class RimViewWindow;
class RimView;
class Rim3dView;
//==================================================================================================
///
@ -32,6 +32,6 @@ public:
static QString generateSnapshotFileName(RimViewWindow* viewWindow);
private:
static QString generateSnapshotFilenameForRimView(RimView* rimView);
static QString resultName(RimView* rimView);
static QString generateSnapshotFilenameForRimView(Rim3dView* rimView);
static QString resultName(Rim3dView* rimView);
};

4
ApplicationCode/Commands/FlowCommands/RicPlotProductionRateFeature.cpp
View File

@ -37,7 +37,7 @@
#include "RimSummaryCurveAppearanceCalculator.h"
#include "RimSummaryPlot.h"
#include "RimSummaryPlotCollection.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RiaSummaryTools.h"
#include "RiuMainPlotWindow.h"
@ -238,7 +238,7 @@ bool RicPlotProductionRateFeature::isInjector(RimSimWellInView* well)
RigSimWellData* wRes = well->simWellData();
if (wRes)
{
RimView* rimView = nullptr;
Rim3dView* rimView = nullptr;
well->firstAncestorOrThisOfTypeAsserted(rimView);
int currentTimeStep = rimView->currentTimeStep();

2
ApplicationCode/Commands/FlowCommands/RicSelectViewUI.cpp
View File

@ -94,7 +94,7 @@ QList<caf::PdmOptionItemInfo> RicSelectViewUI::calculateValueOptions(const caf::
{
if (m_currentCase)
{
for (RimView* v : m_currentCase->views())
for (Rim3dView* v : m_currentCase->views())
{
QIcon icon = v->uiCapability()->uiIcon();
QString displayName = v->name;

2
ApplicationCode/Commands/FlowCommands/RicShowContributingWellsFeature.cpp
View File

@ -94,7 +94,7 @@ void RicShowContributingWellsFeature::onActionTriggered(bool isChecked)
{
modifiedView->createDisplayModelAndRedraw();
std::vector<RimView*> viewsToUpdate;
std::vector<Rim3dView*> viewsToUpdate;
viewsToUpdate.push_back(modifiedView);
RimViewManipulator::applySourceViewCameraOnDestinationViews(eclipseView, viewsToUpdate);

6
ApplicationCode/Commands/FlowCommands/RicShowFlowCharacteristicsPlotFeature.cpp
View File

@ -30,7 +30,7 @@
#include "RimFlowPlotCollection.h"
#include "RimMainPlotCollection.h"
#include "RimProject.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RiuMainPlotWindow.h"
@ -40,7 +40,7 @@ CAF_CMD_SOURCE_INIT(RicShowFlowCharacteristicsPlotFeature, "RicShowFlowCharacter
RimEclipseResultCase* activeEclipseResultCase()
{
RimView * activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView * activeView = RiaApplication::instance()->activeReservoirView();
RimEclipseView* eclView = dynamic_cast<RimEclipseView*>(activeView);
@ -78,7 +78,7 @@ void RicShowFlowCharacteristicsPlotFeature::onActionTriggered(bool isChecked)
{
// Make sure flow results for the the active timestep is calculated, to avoid an empty plot
{
RimView * activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView * activeView = RiaApplication::instance()->activeReservoirView();
if (activeView && eclCase->defaultFlowDiagSolution()->flowDiagResults())
{
// Trigger calculation

6
ApplicationCode/Commands/FlowCommands/RicShowWellAllocationPlotFeature.cpp
View File

@ -25,7 +25,7 @@
#include "RimMainPlotCollection.h"
#include "RimProject.h"
#include "RimSimWellInView.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimWellAllocationPlot.h"
#include "RiuMainPlotWindow.h"
@ -57,7 +57,7 @@ bool RicShowWellAllocationPlotFeature::isCommandEnabled()
if (wellPathCollection.empty()) return false;
RimView* view = RiaApplication::instance()->activeReservoirView();
Rim3dView* view = RiaApplication::instance()->activeReservoirView();
if (!view) return false;
RimEclipseView* eclView = dynamic_cast<RimEclipseView*>(view);
if (!eclView) return false;
@ -91,7 +91,7 @@ void RicShowWellAllocationPlotFeature::onActionTriggered(bool isChecked)
}
else if (wellPathCollection.size() > 0)
{
RimView* view = RiaApplication::instance()->activeReservoirView();
Rim3dView* view = RiaApplication::instance()->activeReservoirView();
if (!view) return;
RimEclipseView* eclView = dynamic_cast<RimEclipseView*>(view);
if (!eclView) return;

4
ApplicationCode/Commands/IntersectionBoxCommands/RicAppendIntersectionBoxFeature.cpp
View File

@ -21,7 +21,7 @@
#include "RimCase.h"
#include "RimIntersectionBox.h"
#include "RimIntersectionCollection.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RiuMainWindow.h"
#include "cafCmdExecCommandManager.h"
@ -63,7 +63,7 @@ void RicAppendIntersectionBoxFeature::onActionTriggered(bool isChecked)
coll->updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(intersectionBox);
RimView* rimView = nullptr;
Rim3dView* rimView = nullptr;
coll->firstAncestorOrThisOfTypeAsserted(rimView);
rimView->showGridCells(false);
}

6
ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxAtPosFeature.cpp
View File

@ -23,7 +23,7 @@
#include "RimCase.h"
#include "RimIntersectionBox.h"
#include "RimIntersectionCollection.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RiuMainWindow.h"
#include "RiuViewer.h"
@ -50,7 +50,7 @@ bool RicIntersectionBoxAtPosFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicIntersectionBoxAtPosFeature::onActionTriggered(bool isChecked)
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (activeView)
{
RimIntersectionCollection* coll = activeView->crossSectionCollection();
@ -67,7 +67,7 @@ void RicIntersectionBoxAtPosFeature::onActionTriggered(bool isChecked)
coll->updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(intersectionBox);
RimView* rimView = NULL;
Rim3dView* rimView = NULL;
coll->firstAncestorOrThisOfType(rimView);
if (rimView)
{

6
ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxXSliceFeature.cpp
View File

@ -23,7 +23,7 @@
#include "RimCase.h"
#include "RimIntersectionBox.h"
#include "RimIntersectionCollection.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RiuMainWindow.h"
#include "RiuViewer.h"
@ -50,7 +50,7 @@ bool RicIntersectionBoxXSliceFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicIntersectionBoxXSliceFeature::onActionTriggered(bool isChecked)
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (activeView)
{
RimIntersectionCollection* coll = activeView->crossSectionCollection();
@ -67,7 +67,7 @@ void RicIntersectionBoxXSliceFeature::onActionTriggered(bool isChecked)
coll->updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(intersectionBox);
RimView* rimView = NULL;
Rim3dView* rimView = NULL;
coll->firstAncestorOrThisOfType(rimView);
if (rimView)
{

6
ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxYSliceFeature.cpp
View File

@ -23,7 +23,7 @@
#include "RimCase.h"
#include "RimIntersectionBox.h"
#include "RimIntersectionCollection.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RiuMainWindow.h"
#include "RiuViewer.h"
@ -50,7 +50,7 @@ bool RicIntersectionBoxYSliceFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicIntersectionBoxYSliceFeature::onActionTriggered(bool isChecked)
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (activeView)
{
RimIntersectionCollection* coll = activeView->crossSectionCollection();
@ -67,7 +67,7 @@ void RicIntersectionBoxYSliceFeature::onActionTriggered(bool isChecked)
coll->updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(intersectionBox);
RimView* rimView = NULL;
Rim3dView* rimView = NULL;
coll->firstAncestorOrThisOfType(rimView);
if (rimView)
{

6
ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxZSliceFeature.cpp
View File

@ -23,7 +23,7 @@
#include "RimCase.h"
#include "RimIntersectionBox.h"
#include "RimIntersectionCollection.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RiuMainWindow.h"
#include "RiuViewer.h"
@ -50,7 +50,7 @@ bool RicIntersectionBoxZSliceFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicIntersectionBoxZSliceFeature::onActionTriggered(bool isChecked)
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (activeView)
{
RimIntersectionCollection* coll = activeView->crossSectionCollection();
@ -66,7 +66,7 @@ void RicIntersectionBoxZSliceFeature::onActionTriggered(bool isChecked)
coll->updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(intersectionBox);
RimView* rimView = NULL;
Rim3dView* rimView = NULL;
coll->firstAncestorOrThisOfType(rimView);
if (rimView)
{

2
ApplicationCode/Commands/RicConvertAllFractureTemplatesToFieldFeature.cpp
View File

@ -27,7 +27,7 @@
#include "RimFracture.h"
#include "RimFractureExportSettings.h"
#include "RimFractureTemplateCollection.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimWellPathCollection.h"
#include "RiuMainWindow.h"

2
ApplicationCode/Commands/RicConvertAllFractureTemplatesToMetricFeature.cpp
View File

@ -27,7 +27,7 @@
#include "RimFracture.h"
#include "RimFractureExportSettings.h"
#include "RimFractureTemplateCollection.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimWellPathCollection.h"
#include "RiuMainWindow.h"

2
ApplicationCode/Commands/RicConvertFractureTemplateUnitFeature.cpp
View File

@ -27,7 +27,7 @@
#include "RimEllipseFractureTemplate.h"
#include "RimFracture.h"
#include "RimFractureExportSettings.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimWellPathCollection.h"
#include "RiuMainWindow.h"

4
ApplicationCode/Commands/RicDeleteItemExec.cpp
View File

@ -33,7 +33,7 @@
#include "RimSimWellInView.h"
#include "RimSummaryPlotCollection.h"
#include "RimSummaryCrossPlotCollection.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimViewLinkerCollection.h"
#include "RimWellLogPlot.h"
#include "RimWellLogPlotCollection.h"
@ -95,7 +95,7 @@ void RicDeleteItemExec::redo()
caf::PdmObjectHandle* parentObj = listField->ownerObject();
parentObj->uiCapability()->updateConnectedEditors();
RimView* view = NULL;
Rim3dView* view = NULL;
parentObj->firstAncestorOrThisOfType(view);
// Range Filters

4
ApplicationCode/Commands/RicFlyToObjectFeature.cpp
View File

@ -21,7 +21,7 @@
#include "RiaApplication.h"
#include "Rim3dPropertiesInterface.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RiuViewer.h"
@ -59,7 +59,7 @@ bool RicFlyToObjectFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicFlyToObjectFeature::onActionTriggered(bool isChecked)
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return;
RiuViewer* destinationViewer = activeView->viewer();

6
ApplicationCode/Commands/RicGeoMechPropertyFilterNewInViewFeature.cpp
View File

@ -26,7 +26,7 @@
#include "RimGeoMechCellColors.h"
#include "RimGeoMechPropertyFilterCollection.h"
#include "RimGeoMechView.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "cafCmdExecCommandManager.h"
@ -39,7 +39,7 @@ CAF_CMD_SOURCE_INIT(RicGeoMechPropertyFilterNewInViewFeature, "RicGeoMechPropert
//--------------------------------------------------------------------------------------------------
bool RicGeoMechPropertyFilterNewInViewFeature::isCommandEnabled()
{
RimView* view = RiaApplication::instance()->activeReservoirView();
Rim3dView* view = RiaApplication::instance()->activeReservoirView();
if (!view) return false;
RimGeoMechView* geoMechView = dynamic_cast<RimGeoMechView*>(view);
@ -62,7 +62,7 @@ bool RicGeoMechPropertyFilterNewInViewFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicGeoMechPropertyFilterNewInViewFeature::onActionTriggered(bool isChecked)
{
RimView* view = RiaApplication::instance()->activeReservoirView();
Rim3dView* view = RiaApplication::instance()->activeReservoirView();
if (!view) return;
RimGeoMechView* eclView = dynamic_cast<RimGeoMechView*>(view);
if (!eclView) return;

6
ApplicationCode/Commands/RicGridStatisticsDialog.cpp
View File

@ -115,7 +115,7 @@ void RicGridStatisticsDialog::setLabel(const QString& labelText)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicGridStatisticsDialog::updateFromRimView(RimView* rimView)
void RicGridStatisticsDialog::updateFromRimView(Rim3dView* rimView)
{
m_currentRimView = rimView;
setInfoText(m_currentRimView);
@ -134,7 +134,7 @@ QImage RicGridStatisticsDialog::screenShotImage()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicGridStatisticsDialog::setInfoText(RimView* view)
void RicGridStatisticsDialog::setInfoText(Rim3dView* view)
{
Rim3dOverlayInfoConfig* overlayInfo = view->overlayInfoConfig();
if (view && overlayInfo)
@ -151,7 +151,7 @@ void RicGridStatisticsDialog::setInfoText(RimView* view)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicGridStatisticsDialog::setHistogramData(RimView* view)
void RicGridStatisticsDialog::setHistogramData(Rim3dView* view)
{
deletePlotItems(m_historgramPlot);
deletePlotItems(m_aggregatedPlot);

8
ApplicationCode/Commands/RicGridStatisticsDialog.h
View File

@ -46,12 +46,12 @@ public:
~RicGridStatisticsDialog();
void setLabel(const QString& labelText);
void updateFromRimView(RimView* rimView);
void updateFromRimView(Rim3dView* rimView);
QImage screenShotImage();
private:
void setInfoText(RimView* eclipseView);
void setHistogramData(RimView* eclipseView);
void setInfoText(Rim3dView* eclipseView);
void setHistogramData(Rim3dView* eclipseView);
private:
void createAndConnectToolbarActions();
@ -74,5 +74,5 @@ private:
QwtPlot* m_aggregatedPlot;
QDialogButtonBox* m_buttons;
caf::PdmPointer<RimView> m_currentRimView;
caf::PdmPointer<Rim3dView> m_currentRimView;
};

6
ApplicationCode/Commands/RicHideIntersectionBoxFeature.cpp
View File

@ -21,7 +21,7 @@
#include "RiaApplication.h"
#include "RimIntersectionBox.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RiuSelectionManager.h"
@ -34,7 +34,7 @@ CAF_CMD_SOURCE_INIT(RicHideIntersectionBoxFeature, "RicHideIntersectionBoxFeatur
//--------------------------------------------------------------------------------------------------
bool RicHideIntersectionBoxFeature::isCommandEnabled()
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return false;
RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
@ -56,7 +56,7 @@ bool RicHideIntersectionBoxFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicHideIntersectionBoxFeature::onActionTriggered(bool isChecked)
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return;
RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();

6
ApplicationCode/Commands/RicHideIntersectionFeature.cpp
View File

@ -21,7 +21,7 @@
#include "RiaApplication.h"
#include "RimIntersection.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RiuSelectionManager.h"
@ -34,7 +34,7 @@ CAF_CMD_SOURCE_INIT(RicHideIntersectionFeature, "RicHideIntersectionFeature");
//--------------------------------------------------------------------------------------------------
bool RicHideIntersectionFeature::isCommandEnabled()
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return false;
RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
@ -56,7 +56,7 @@ bool RicHideIntersectionFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicHideIntersectionFeature::onActionTriggered(bool isChecked)
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return;
RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();

4
ApplicationCode/Commands/RicImportFormationNamesFeature.cpp
View File

@ -27,7 +27,7 @@
#include "RimGeoMechCase.h"
#include "RimOilField.h"
#include "RimProject.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RigEclipseCaseData.h"
#include "RigFemPartResultsCollection.h"
@ -83,7 +83,7 @@ void RicImportFormationNamesFeature::onActionTriggered(bool isChecked)
if (!cases.empty())
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
RimCase* ownerCase = activeView->ownerCase();
if (ownerCase)

4
ApplicationCode/Commands/RicNewSimWellFractureAtPosFeature.cpp
View File

@ -30,7 +30,7 @@
#include "RimSimWellFracture.h"
#include "RimSimWellFractureCollection.h"
#include "RimSimWellInView.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RiuMainWindow.h"
#include "RiuSelectionManager.h"
@ -49,7 +49,7 @@ CAF_CMD_SOURCE_INIT(RicNewSimWellFractureAtPosFeature, "RicNewSimWellFractureAtP
//--------------------------------------------------------------------------------------------------
void RicNewSimWellFractureAtPosFeature::onActionTriggered(bool isChecked)
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return;
RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();

6
ApplicationCode/Commands/RicNewSliceRangeFilterFeature.cpp
View File

@ -23,7 +23,7 @@
#include "RicRangeFilterFeatureImpl.h"
#include "RicRangeFilterNewExec.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimViewController.h"
#include "cafCmdExecCommandManager.h"
@ -39,7 +39,7 @@ CAF_CMD_SOURCE_INIT(RicNewSliceRangeFilterFeature, "RicNewSliceRangeFilterFeatur
//--------------------------------------------------------------------------------------------------
bool RicNewSliceRangeFilterFeature::isCommandEnabled()
{
RimView* view = RiaApplication::instance()->activeReservoirView();
Rim3dView* view = RiaApplication::instance()->activeReservoirView();
if (!view) return false;
RimViewController* vc = view->viewController();
@ -57,7 +57,7 @@ void RicNewSliceRangeFilterFeature::onActionTriggered(bool isChecked)
if (!userData.isNull() && userData.type() == QVariant::List)
{
RimView* view = RiaApplication::instance()->activeReservoirView();
Rim3dView* view = RiaApplication::instance()->activeReservoirView();
RimCellRangeFilterCollection* rangeFilterCollection = view->rangeFilterCollection();
RicRangeFilterNewExec* filterExec = new RicRangeFilterNewExec(rangeFilterCollection);

8
ApplicationCode/Commands/RicNewViewFeature.cpp
View File

@ -23,7 +23,7 @@
#include "RimEclipseView.h"
#include "RimGeoMechCase.h"
#include "RimGeoMechView.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RiuMainWindow.h"
#include "RiaLogging.h"
@ -39,7 +39,7 @@ CAF_CMD_SOURCE_INIT(RicNewViewFeature, "RicNewViewFeature");
//--------------------------------------------------------------------------------------------------
void RicNewViewFeature::addReservoirView(RimEclipseCase* eclipseCase, RimGeoMechCase* geomCase)
{
RimView* newView = createReservoirView(eclipseCase, geomCase);
Rim3dView* newView = createReservoirView(eclipseCase, geomCase);
if (newView)
{
@ -89,9 +89,9 @@ void RicNewViewFeature::setupActionLook(QAction* actionToSetup)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimView* RicNewViewFeature::createReservoirView(RimEclipseCase* eclipseCase, RimGeoMechCase* geomCase)
Rim3dView* RicNewViewFeature::createReservoirView(RimEclipseCase* eclipseCase, RimGeoMechCase* geomCase)
{
RimView* insertedView = NULL;
Rim3dView* insertedView = NULL;
if (eclipseCase)
{

4
ApplicationCode/Commands/RicNewViewFeature.h
View File

@ -25,7 +25,7 @@ class RimEclipseCase;
class RimEclipseView;
class RimGeoMechCase;
class RimGeoMechView;
class RimView;
class Rim3dView;
//==================================================================================================
///
@ -44,7 +44,7 @@ protected:
virtual void setupActionLook( QAction* actionToSetup );
private:
static RimView* createReservoirView(RimEclipseCase* eclipseCase, RimGeoMechCase* geomCase);
static Rim3dView* createReservoirView(RimEclipseCase* eclipseCase, RimGeoMechCase* geomCase);
static RimEclipseCase* selectedEclipseCase();
static RimGeoMechCase* selectedGeoMechCase();

6
ApplicationCode/Commands/RicRangeFilterFeatureImpl.cpp
View File

@ -25,7 +25,7 @@
#include "RimCellRangeFilter.h"
#include "RimCellRangeFilterCollection.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimViewController.h"
#include "cafSelectionManager.h"
@ -40,7 +40,7 @@ bool RicRangeFilterFeatureImpl::isRangeFilterCommandAvailable()
RimCellRangeFilterCollection* rangeFilterCollection = findRangeFilterCollection();
if (!rangeFilterCollection) return false;
RimView* view;
Rim3dView* view;
rangeFilterCollection->firstAncestorOrThisOfType(view);
if (view)
{
@ -86,7 +86,7 @@ RimCellRangeFilterCollection* RicRangeFilterFeatureImpl::findRangeFilterCollecti
selectedRangeFilter[0]->firstAncestorOrThisOfType(rangeFilterCollection);
}
RimView* view = RiaApplication::instance()->activeReservoirView();
Rim3dView* view = RiaApplication::instance()->activeReservoirView();
if (view)
{
rangeFilterCollection = view->rangeFilterCollection();

2
ApplicationCode/Commands/RicRangeFilterInsertExec.cpp
View File

@ -21,7 +21,7 @@
#include "RimCellRangeFilter.h"
#include "RimCellRangeFilterCollection.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RiuMainWindow.h"

4
ApplicationCode/Commands/RicRangeFilterNewExec.cpp
View File

@ -23,7 +23,7 @@
#include "RimCellRangeFilter.h"
#include "RimCellRangeFilterCollection.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RiuMainWindow.h"
@ -77,7 +77,7 @@ void RicRangeFilterNewExec::redo()
RiuMainWindow::instance()->selectAsCurrentItem(rangeFilter);
RimView* view = nullptr;
Rim3dView* view = nullptr;
m_cellRangeFilterCollection->firstAncestorOrThisOfTypeAsserted(view);
//Enable display of grid cells, to be able to show generated range filter

2
ApplicationCode/Commands/RicShowGridStatisticsFeature.cpp
View File

@ -50,7 +50,7 @@ bool RicShowGridStatisticsFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicShowGridStatisticsFeature::onActionTriggered(bool isChecked)
{
RimView * activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView * activeView = RiaApplication::instance()->activeReservoirView();
if (activeView)
{

2
ApplicationCode/Commands/RicTogglePerspectiveViewFeature.cpp
View File

@ -20,7 +20,7 @@
#include "RicTogglePerspectiveViewFeature.h"
#include "RiuViewer.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RiuMainWindow.h"
#include "RiaApplication.h"

4
ApplicationCode/Commands/RicWellLogTools.cpp
View File

@ -24,7 +24,7 @@
#include "RimEclipseResultCase.h"
#include "RimProject.h"
#include "RimSimWellInView.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimWellLogExtractionCurve.h"
#include "RimWellLogFileChannel.h"
#include "RimWellLogFileCurve.h"
@ -173,7 +173,7 @@ RimWellPath* RicWellLogTools::selectedWellPathWithLogFile()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellLogExtractionCurve* RicWellLogTools::addExtractionCurve(RimWellLogTrack* plotTrack, RimView* view, RimWellPath* wellPath, const RimSimWellInView* simWell, int branchIndex, bool useBranchDetection)
RimWellLogExtractionCurve* RicWellLogTools::addExtractionCurve(RimWellLogTrack* plotTrack, Rim3dView* view, RimWellPath* wellPath, const RimSimWellInView* simWell, int branchIndex, bool useBranchDetection)
{
CVF_ASSERT(plotTrack);
RimWellLogExtractionCurve* curve = new RimWellLogExtractionCurve();

4
ApplicationCode/Commands/RicWellLogTools.h
View File

@ -23,7 +23,7 @@
#include <vector>
class RimSimWellInView;
class RimView;
class Rim3dView;
class RimWellLogExtractionCurve;
class RimWellLogFileChannel;
class RimWellLogFileCurve;
@ -45,7 +45,7 @@ public:
static void addWellLogChannelsToPlotTrack(RimWellLogTrack* plotTrack,
const std::vector<RimWellLogFileChannel*>& wellLogFileChannels);
static RimWellPath* selectedWellPathWithLogFile();
static RimWellLogExtractionCurve* addExtractionCurve(RimWellLogTrack* plotTrack, RimView* view, RimWellPath* wellPath,
static RimWellLogExtractionCurve* addExtractionCurve(RimWellLogTrack* plotTrack, Rim3dView* view, RimWellPath* wellPath,
const RimSimWellInView* simWell, int branchIndex,
bool useBranchDetection);
static RimWellLogRftCurve* addRftCurve(RimWellLogTrack* plotTrack, const RimSimWellInView* simWell);

2
ApplicationCode/Commands/SummaryPlotCommands/RicNewGridTimeHistoryCurveFeature.cpp
View File

@ -147,7 +147,7 @@ QString RicNewGridTimeHistoryCurveFeature::suggestedNewPlotName()
QString resultName;
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
RimEclipseView* eclView = dynamic_cast<RimEclipseView*>(activeView);
if (eclView)
{

2
ApplicationCode/Commands/SummaryPlotCommands/RicViewZoomAllFeature.cpp
View File

@ -21,7 +21,7 @@
#include "RiaApplication.h"
#include "RimSummaryPlot.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimViewWindow.h"
#include "RimWellAllocationPlot.h"
#include "RimWellLogPlot.h"

8
ApplicationCode/Commands/ViewLink/RicLinkViewFeature.cpp
View File

@ -24,7 +24,7 @@
#include "RicLinkVisibleViewsFeature.h"
#include "RimProject.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimViewLinkerCollection.h"
#include "RimViewLinker.h"
@ -39,7 +39,7 @@ CAF_CMD_SOURCE_INIT(RicLinkViewFeature, "RicLinkViewFeature");
//--------------------------------------------------------------------------------------------------
bool RicLinkViewFeature::isCommandEnabled()
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return false;
RimProject* proj = RiaApplication::instance()->project();
@ -71,10 +71,10 @@ bool RicLinkViewFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicLinkViewFeature::onActionTriggered(bool isChecked)
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return;
std::vector<RimView*> views;
std::vector<Rim3dView*> views;
views.push_back(activeView);
RicLinkVisibleViewsFeature::linkViews(views);

22
ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeature.cpp
View File

@ -25,7 +25,7 @@
#include "RimViewController.h"
#include "RimProject.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimViewLinker.h"
#include "RimViewLinkerCollection.h"
@ -46,8 +46,8 @@ CAF_CMD_SOURCE_INIT(RicLinkVisibleViewsFeature, "RicLinkVisibleViewsFeature");
bool RicLinkVisibleViewsFeature::isCommandEnabled()
{
RimProject* proj = RiaApplication::instance()->project();
std::vector<RimView*> visibleViews;
std::vector<RimView*> linkedviews;
std::vector<Rim3dView*> visibleViews;
std::vector<Rim3dView*> linkedviews;
proj->allVisibleViews(visibleViews);
if (proj->viewLinkerCollection() && proj->viewLinkerCollection()->viewLinker())
@ -66,7 +66,7 @@ bool RicLinkVisibleViewsFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicLinkVisibleViewsFeature::onActionTriggered(bool isChecked)
{
std::vector<RimView*> views;
std::vector<Rim3dView*> views;
findNotLinkedVisibleViews(views);
linkViews(views);
@ -85,7 +85,7 @@ void RicLinkVisibleViewsFeature::setupActionLook(QAction* actionToSetup)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicLinkVisibleViewsFeature::allLinkedViews(std::vector<RimView*>& views)
void RicLinkVisibleViewsFeature::allLinkedViews(std::vector<Rim3dView*>& views)
{
RimProject* proj = RiaApplication::instance()->project();
if (proj->viewLinkerCollection()->viewLinker())
@ -97,14 +97,14 @@ void RicLinkVisibleViewsFeature::allLinkedViews(std::vector<RimView*>& views)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicLinkVisibleViewsFeature::findNotLinkedVisibleViews(std::vector<RimView*> &views)
void RicLinkVisibleViewsFeature::findNotLinkedVisibleViews(std::vector<Rim3dView*> &views)
{
RimProject* proj = RiaApplication::instance()->project();
std::vector<RimView*> alreadyLinkedViews;
std::vector<Rim3dView*> alreadyLinkedViews;
allLinkedViews(alreadyLinkedViews);
std::vector<RimView*> visibleViews;
std::vector<Rim3dView*> visibleViews;
proj->allVisibleViews(visibleViews);
for (size_t i = 0; i < visibleViews.size(); i++)
@ -128,7 +128,7 @@ void RicLinkVisibleViewsFeature::findNotLinkedVisibleViews(std::vector<RimView*>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicLinkVisibleViewsFeature::linkViews(std::vector<RimView*>& views)
void RicLinkVisibleViewsFeature::linkViews(std::vector<Rim3dView*>& views)
{
RimProject* proj = RiaApplication::instance()->project();
RimViewLinker* viewLinker = proj->viewLinkerCollection->viewLinker();
@ -149,7 +149,7 @@ void RicLinkVisibleViewsFeature::linkViews(std::vector<RimView*>& views)
propertyDialog.setWindowIcon(QIcon(":/chain.png"));
if (propertyDialog.exec() != QDialog::Accepted) return;
RimView* masterView = featureUi.masterView();
Rim3dView* masterView = featureUi.masterView();
viewLinker = new RimViewLinker;
proj->viewLinkerCollection()->viewLinker = viewLinker;
viewLinker->setMasterView(masterView);
@ -157,7 +157,7 @@ void RicLinkVisibleViewsFeature::linkViews(std::vector<RimView*>& views)
for (size_t i = 0; i < views.size(); i++)
{
RimView* rimView = views[i];
Rim3dView* rimView = views[i];
if (rimView == viewLinker->masterView()) continue;
viewLinker->addDependentView(rimView);

8
ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeature.h
View File

@ -23,7 +23,7 @@
#include <vector>
class RimView;
class Rim3dView;
//==================================================================================================
///
@ -33,7 +33,7 @@ class RicLinkVisibleViewsFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT;
public:
static void linkViews(std::vector<RimView*> &views);
static void linkViews(std::vector<Rim3dView*> &views);
protected:
// Overrides
@ -44,6 +44,6 @@ protected:
virtual void setupActionLook(QAction* actionToSetup);
private:
void findNotLinkedVisibleViews(std::vector<RimView*> &views);
void allLinkedViews(std::vector<RimView*>& views);
void findNotLinkedVisibleViews(std::vector<Rim3dView*> &views);
void allLinkedViews(std::vector<Rim3dView*>& views);
};

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

@ -22,7 +22,7 @@
#include "RiaApplication.h"
#include "RimCase.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimViewLinker.h"
CAF_PDM_SOURCE_INIT(RicLinkVisibleViewsFeatureUi, "RicLinkVisibleViewsFeatureUi");
@ -40,11 +40,11 @@ RicLinkVisibleViewsFeatureUi::RicLinkVisibleViewsFeatureUi(void)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicLinkVisibleViewsFeatureUi::setViews(const std::vector<RimView*>& allViews)
void RicLinkVisibleViewsFeatureUi::setViews(const std::vector<Rim3dView*>& allViews)
{
m_allViews = allViews;
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
// Set Active view as master view
for (size_t i = 0; i < allViews.size(); i++)
@ -65,7 +65,7 @@ void RicLinkVisibleViewsFeatureUi::setViews(const std::vector<RimView*>& allView
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimView* RicLinkVisibleViewsFeatureUi::masterView()
Rim3dView* RicLinkVisibleViewsFeatureUi::masterView()
{
return m_masterView;
}
@ -79,7 +79,7 @@ QList<caf::PdmOptionItemInfo> RicLinkVisibleViewsFeatureUi::calculateValueOption
if (fieldNeedingOptions == &m_masterView)
{
for (RimView* v : m_allViews)
for (Rim3dView* v : m_allViews)
{
RimCase* rimCase = nullptr;
v->firstAncestorOrThisOfType(rimCase);

10
ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeatureUi.h
View File

@ -25,7 +25,7 @@
#include <vector>
class RimView;
class Rim3dView;
//==================================================================================================
///
@ -37,14 +37,14 @@ class RicLinkVisibleViewsFeatureUi : public caf::PdmObject
public:
RicLinkVisibleViewsFeatureUi(void);
void setViews(const std::vector<RimView*>& allViews);
RimView* masterView();
void setViews(const std::vector<Rim3dView*>& allViews);
Rim3dView* masterView();
protected:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly);
private:
caf::PdmPtrField<RimView*> m_masterView;
caf::PdmPtrField<Rim3dView*> m_masterView;
std::vector<RimView*> m_allViews;
std::vector<Rim3dView*> m_allViews;
};

8
ApplicationCode/Commands/ViewLink/RicSetMasterViewFeature.cpp
View File

@ -22,7 +22,7 @@
#include "RiaApplication.h"
#include "RimProject.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimViewController.h"
#include "RimViewLinker.h"
#include "RimViewLinkerCollection.h"
@ -39,7 +39,7 @@ CAF_CMD_SOURCE_INIT(RicSetMasterViewFeature, "RicSetMasterViewFeature");
//--------------------------------------------------------------------------------------------------
bool RicSetMasterViewFeature::isCommandEnabled()
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return false;
RimProject* proj = RiaApplication::instance()->project();
@ -62,7 +62,7 @@ bool RicSetMasterViewFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicSetMasterViewFeature::onActionTriggered(bool isChecked)
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return;
RimProject* proj = RiaApplication::instance()->project();
@ -70,7 +70,7 @@ void RicSetMasterViewFeature::onActionTriggered(bool isChecked)
viewLinker->applyRangeFilterCollectionByUserChoice();
RimView* previousMasterView = viewLinker->masterView();
Rim3dView* previousMasterView = viewLinker->masterView();
viewLinker->setMasterView(activeView);
viewLinker->updateDependentViews();

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

@ -20,7 +20,7 @@
#include "RicShowAllLinkedViewsFeature.h"
#include "RimViewController.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimViewLinker.h"
#include "cafSelectionManager.h"
@ -58,7 +58,7 @@ void RicShowAllLinkedViewsFeature::onActionTriggered(bool isChecked)
for (size_t i = 0; i < linkedViews.size(); i++)
{
std::vector<RimView*> views;
std::vector<Rim3dView*> views;
linkedViews[i]->allViews(views);
for (size_t j = 0; j < views.size(); j++)

6
ApplicationCode/Commands/ViewLink/RicShowLinkOptionsFeature.cpp
View File

@ -21,7 +21,7 @@
#include "RiaApplication.h"
#include "RimProject.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimViewController.h"
#include "RimViewLinker.h"
#include "RiuMainWindow.h"
@ -38,7 +38,7 @@ CAF_CMD_SOURCE_INIT(RicShowLinkOptionsFeature, "RicShowLinkOptionsFeature");
//--------------------------------------------------------------------------------------------------
bool RicShowLinkOptionsFeature::isCommandEnabled()
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return false;
RimViewController* viewController = activeView->viewController();
@ -56,7 +56,7 @@ bool RicShowLinkOptionsFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicShowLinkOptionsFeature::onActionTriggered(bool isChecked)
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return;
RimViewController* viewController = activeView->viewController();

6
ApplicationCode/Commands/ViewLink/RicUnLinkViewFeature.cpp
View File

@ -22,7 +22,7 @@
#include "RiaApplication.h"
#include "RimProject.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimViewController.h"
#include "RimViewLinker.h"
@ -39,7 +39,7 @@ CAF_CMD_SOURCE_INIT(RicUnLinkViewFeature, "RicUnLinkViewFeature");
//--------------------------------------------------------------------------------------------------
bool RicUnLinkViewFeature::isCommandEnabled()
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return false;
RimViewController* viewController = activeView->viewController();
@ -58,7 +58,7 @@ bool RicUnLinkViewFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicUnLinkViewFeature::onActionTriggered(bool isChecked)
{
RimView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return;
RimViewController* viewController = activeView->viewController();

2
ApplicationCode/Commands/WellLogCommands/RicNewPltPlotFeature.cpp
View File

@ -28,7 +28,7 @@
#include "RimProject.h"
#include "RimSimWellInView.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimWellLogExtractionCurve.h"
#include "RimWellPltPlot.h"
#include "RimWellLogPlot.h"

2
ApplicationCode/Commands/WellLogCommands/RicNewPltPlotFeature.h
View File

@ -22,7 +22,7 @@
#include "cafCmdFeature.h"
class RimSimWellInView;
class RimView;
class Rim3dView;
class RimWellLogExtractionCurve;
class RimWellLogTrack;
class RimWellPath;

2
ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp
View File

@ -29,7 +29,7 @@
#include "RimProject.h"
#include "RimSimWellInView.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimWellLogExtractionCurve.h"
#include "RimWellLogPlot.h"
#include "RimWellLogTrack.h"

4
ApplicationCode/Commands/WellPathCommands/RicIntersectionViewerEventHandler.cpp
View File

@ -18,7 +18,7 @@
#include "RicIntersectionViewerEventHandler.h"
#include "RimIntersection.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "cafDisplayCoordTransform.h"
#include "cafSelectionManager.h"
@ -49,7 +49,7 @@ bool RicIntersectionViewerEventHandler::handleEvent(cvf::Object* eventObject)
{
RimIntersection* intersection = selection[0];
RimView* rimView = nullptr;
Rim3dView* rimView = nullptr;
intersection->firstAncestorOrThisOfType(rimView);
CVF_ASSERT(rimView);

4
ApplicationCode/Commands/WellPathCommands/RicWellPathViewerEventHandler.cpp
View File

@ -21,7 +21,7 @@
#include "RiaApplication.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimWellPath.h"
#include "RiuMainWindow.h"
@ -56,7 +56,7 @@ bool RicWellPathViewerEventHandler::handleEvent(cvf::Object* eventObject)
const RivWellPathSourceInfo* wellPathSourceInfo = dynamic_cast<const RivWellPathSourceInfo*>(uiEvent->firstHitPart->sourceInfo());
if (wellPathSourceInfo)
{
RimView* rimView = RiaApplication::instance()->activeReservoirView();
Rim3dView* rimView = RiaApplication::instance()->activeReservoirView();
if (!rimView) return false;
cvf::ref<caf::DisplayCoordTransform> transForm = rimView->displayCoordTransform();

2
ApplicationCode/GeoMech/GeoMechVisualization/RivFemElmVisibilityCalculator.cpp
View File

@ -254,7 +254,7 @@ void RivFemElmVisibilityCalculator::computeOverriddenCellVisibility(cvf::UByteAr
CVF_ASSERT(elmVisibilities != NULL);
CVF_ASSERT(femPart != NULL);
RimView* masterView = masterViewLink->ownerViewLinker()->masterView();
Rim3dView* masterView = masterViewLink->ownerViewLinker()->masterView();
cvf::ref<cvf::UByteArray> totCellVisibility = masterView->currentTotalCellVisibility();
int elmCount = femPart->elementCount();

2
ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartPartMgr.cpp
View File

@ -299,7 +299,7 @@ void RivFemPartPartMgr::updateCellResultColor(size_t timeStepIndex, RimGeoMechCe
}
}
RimView* view = NULL;
Rim3dView* view = NULL;
cellResultColors->firstAncestorOrThisOfType(view);
CVF_ASSERT(view);

2
ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechVizLogic.cpp
View File

@ -28,7 +28,7 @@
#include "RimGeoMechCellColors.h"
#include "RimGeoMechPropertyFilterCollection.h"
#include "RimGeoMechView.h"
#include "RimView.h"
#include "Rim3dView.h"
#include "RimViewController.h"
#include "RivCellSetEnum.h"

2
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
View File

@ -604,7 +604,7 @@ void RivReservoirViewPartMgr::computeOverriddenCellVisibility(cvf::UByteArray* c
CVF_ASSERT(masterViewLink);
RimView* masterView = masterViewLink->ownerViewLinker()->masterView();
Rim3dView* masterView = masterViewLink->ownerViewLinker()->masterView();
// get cell visibility
#if 1

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);

Some files were not shown because too many files have changed in this diff Show More