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

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