diff --git a/ApplicationCode/ProjectDataModel/RimViewController.cpp b/ApplicationCode/ProjectDataModel/RimViewController.cpp index 6063e47787..f778a94bff 100644 --- a/ApplicationCode/ProjectDataModel/RimViewController.cpp +++ b/ApplicationCode/ProjectDataModel/RimViewController.cpp @@ -231,7 +231,7 @@ void RimViewController::fieldChangedByUi(const caf::PdmFieldHandle* changedField //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimEclipseView* RimViewController::managedEclipseView() +RimEclipseView* RimViewController::managedEclipseView() const { RimView* rimView = m_managedView; @@ -241,7 +241,7 @@ RimEclipseView* RimViewController::managedEclipseView() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimGeoMechView* RimViewController::managedGeoView() +RimGeoMechView* RimViewController::managedGeoView() const { RimView* rimView = m_managedView; @@ -442,7 +442,7 @@ void RimViewController::updateOptionSensitivity() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimView* RimViewController::managedView() +RimView* RimViewController::managedView() const { return m_managedView; } @@ -549,7 +549,7 @@ void RimViewController::updateLegendDefinitions() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimViewLinker* RimViewController::ownerViewLinker() +RimViewLinker* RimViewController::ownerViewLinker() const { RimViewLinker* viewLinker = NULL; this->firstAncestorOrThisOfType(viewLinker); @@ -628,7 +628,7 @@ const RigCaseToCaseCellMapper* RimViewController::cellMapper() } else if (masterFemPart && dependEclGrid) { - m_caseToCaseCellMapper = new RigCaseToCaseCellMapper(masterFemPart, dependEclGrid); + m_caseToCaseCellMapper = new RigCaseToCaseCellMapper(masterFemPart, dependEclGrid); } } @@ -638,7 +638,7 @@ const RigCaseToCaseCellMapper* RimViewController::cellMapper() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimView* RimViewController::masterView() +RimView* RimViewController::masterView() const { return ownerViewLinker()->masterView(); } @@ -646,7 +646,7 @@ RimView* RimViewController::masterView() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimViewController::isMasterAndDepViewDifferentType() +bool RimViewController::isMasterAndDepViewDifferentType() const { RimEclipseView* eclipseMasterView = dynamic_cast(masterView()); RimGeoMechView* geoMasterView = dynamic_cast(masterView()); @@ -667,7 +667,7 @@ bool RimViewController::isMasterAndDepViewDifferentType() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimViewController::scheduleCreateDisplayModelAndRedrawForDependentView() +void RimViewController::scheduleCreateDisplayModelAndRedrawForDependentView() const { if (!this->isActive()) return; @@ -687,7 +687,7 @@ void RimViewController::scheduleCreateDisplayModelAndRedrawForDependentView() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimViewController::scheduleGeometryRegenForDepViews(RivCellSetEnum geometryType) +void RimViewController::scheduleGeometryRegenForDepViews(RivCellSetEnum geometryType) const { if (!this->isActive()) return; @@ -712,7 +712,7 @@ void RimViewController::scheduleGeometryRegenForDepViews(RivCellSetEnum geometry //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimViewController::isActive() +bool RimViewController::isActive() const { return ownerViewLinker()->isActive() && this->m_isActive(); } @@ -720,7 +720,7 @@ bool RimViewController::isActive() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimViewController::isCameraLinked() +bool RimViewController::isCameraLinked() const { if (ownerViewLinker()->isActive() && this->m_isActive()) { @@ -743,7 +743,7 @@ bool RimViewController::showCursor() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimViewController::isTimeStepLinked() +bool RimViewController::isTimeStepLinked() const { if (ownerViewLinker()->isActive() && this->m_isActive()) { @@ -758,7 +758,7 @@ bool RimViewController::isTimeStepLinked() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimViewController::isResultColorControlled() +bool RimViewController::isResultColorControlled() const { if (ownerViewLinker()->isActive() && this->m_isActive()) { @@ -773,7 +773,7 @@ bool RimViewController::isResultColorControlled() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimViewController::isLegendDefinitionsControlled() +bool RimViewController::isLegendDefinitionsControlled() const { if (ownerViewLinker()->isActive() && this->m_isActive()) { @@ -788,7 +788,7 @@ bool RimViewController::isLegendDefinitionsControlled() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimViewController::isVisibleCellsOveridden() +bool RimViewController::isVisibleCellsOveridden() const { if (isMasterAndDepViewDifferentType()) { @@ -810,7 +810,7 @@ bool RimViewController::isVisibleCellsOveridden() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimViewController::isRangeFilterControlPossible() +bool RimViewController::isRangeFilterControlPossible() const { return true; #if 0 @@ -844,7 +844,7 @@ bool RimViewController::isRangeFilterControlPossible() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimViewController::isRangeFilterMappingApliccable() +bool RimViewController::isRangeFilterMappingApliccable() const { if (!isMasterAndDepViewDifferentType()) return false; @@ -877,7 +877,7 @@ bool RimViewController::isRangeFilterMappingApliccable() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimViewController::isRangeFiltersControlled() +bool RimViewController::isRangeFiltersControlled() const { if (!isRangeFilterControlPossible()) return false; @@ -893,7 +893,7 @@ bool RimViewController::isRangeFiltersControlled() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimViewController::isPropertyFilterControlPossible() +bool RimViewController::isPropertyFilterControlPossible() const { // The cases need to be the same RimGeoMechView* geomView = dynamic_cast(masterView()); @@ -925,7 +925,7 @@ bool RimViewController::isPropertyFilterControlPossible() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimViewController::isPropertyFilterOveridden() +bool RimViewController::isPropertyFilterOveridden() const { if (!isPropertyFilterControlPossible()) return false; diff --git a/ApplicationCode/ProjectDataModel/RimViewController.h b/ApplicationCode/ProjectDataModel/RimViewController.h index af78f9ca24..e8eda82175 100644 --- a/ApplicationCode/ProjectDataModel/RimViewController.h +++ b/ApplicationCode/ProjectDataModel/RimViewController.h @@ -47,29 +47,29 @@ public: RimViewController(void); virtual ~RimViewController(void); - bool isActive(); + bool isActive() const; - RimView* managedView(); + RimView* managedView() const; void setManagedView(RimView* view); - RimView* masterView(); - RimViewLinker* ownerViewLinker(); + RimView* masterView() const; + RimViewLinker* ownerViewLinker() const; const RigCaseToCaseCellMapper* cellMapper(); - bool isCameraLinked(); + bool isCameraLinked() const; bool showCursor() const; - bool isTimeStepLinked(); + bool isTimeStepLinked() const; - bool isResultColorControlled(); - bool isLegendDefinitionsControlled(); - bool isRangeFiltersControlled(); + bool isResultColorControlled() const; + bool isLegendDefinitionsControlled() const; + bool isRangeFiltersControlled() const; - bool isVisibleCellsOveridden(); - bool isPropertyFilterOveridden(); + bool isVisibleCellsOveridden() const; + bool isPropertyFilterOveridden() const; - void scheduleCreateDisplayModelAndRedrawForDependentView(); - void scheduleGeometryRegenForDepViews(RivCellSetEnum geometryType); + void scheduleCreateDisplayModelAndRedrawForDependentView() const; + void scheduleGeometryRegenForDepViews(RivCellSetEnum geometryType) const; void updateOverrides(); void updateOptionSensitivity(); void removeOverrides(); @@ -94,16 +94,17 @@ private: void updateResultColorsControl(); void updateLegendDefinitions(); - bool isMasterAndDepViewDifferentType(); - bool isRangeFilterControlPossible(); - bool isPropertyFilterControlPossible(); - bool isRangeFilterMappingApliccable(); + bool isMasterAndDepViewDifferentType() const; + bool isRangeFilterControlPossible() const; + bool isPropertyFilterControlPossible() const; + bool isRangeFilterMappingApliccable() const; - RimEclipseView* managedEclipseView(); - RimGeoMechView* managedGeoView(); + RimEclipseView* managedEclipseView() const; + RimGeoMechView* managedGeoView() const; + static void removeOverrides(RimView* view); - static bool askUserToRestoreOriginalRangeFilterCollection(const QString& viewName); + private: caf::PdmField m_name; caf::PdmPtrField m_managedView; diff --git a/ApplicationCode/ProjectDataModel/RimViewLinker.cpp b/ApplicationCode/ProjectDataModel/RimViewLinker.cpp index 0aec965759..cc8240f1d0 100644 --- a/ApplicationCode/ProjectDataModel/RimViewLinker.cpp +++ b/ApplicationCode/ProjectDataModel/RimViewLinker.cpp @@ -250,7 +250,7 @@ void RimViewLinker::removeOverrides() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimViewLinker::allViewsForCameraSync(const RimView* source, std::vector& views) +void RimViewLinker::allViewsForCameraSync(const RimView* source, std::vector& views) const { if (!isActive()) return; @@ -325,7 +325,7 @@ void RimViewLinker::setMasterView(RimView* view) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimView* RimViewLinker::masterView() +RimView* RimViewLinker::masterView() const { return m_masterView; } @@ -385,7 +385,7 @@ void RimViewLinker::updateScaleZ(RimView* sourceView, double scaleZ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimViewLinker::isActive() +bool RimViewLinker::isActive() const { RimViewLinkerCollection* viewLinkerCollection = NULL; this->firstAncestorOrThisOfType(viewLinkerCollection); @@ -510,24 +510,6 @@ void RimViewLinker::updateCursorPosition(const RimView* sourceView, const cvf::V } } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimViewLinker::disableCursor() -{ - std::vector viewsToUpdate; - allViewsForCameraSync(m_masterView, viewsToUpdate); - - for (RimView* destinationView : viewsToUpdate) - { - RiuViewer* destinationViewer = destinationView->viewer(); - if (destinationViewer) - { - destinationViewer->setCursorPosition(cvf::Vec3d::UNDEFINED); - } - } -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -677,11 +659,11 @@ void RimViewLinker::addDependentView(RimView* view) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimViewLinker::addViewControllers(caf::PdmUiTreeOrdering& uiTreeOrdering) +void RimViewLinker::addViewControllers(caf::PdmUiTreeOrdering& uiTreeOrdering) const { for (size_t j = 0; j < m_viewControllers.size(); j++) { - uiTreeOrdering.add(m_viewControllers()[j]); + uiTreeOrdering.add(m_viewControllers[j]); } } diff --git a/ApplicationCode/ProjectDataModel/RimViewLinker.h b/ApplicationCode/ProjectDataModel/RimViewLinker.h index 0cba89a1b6..61c39d8f54 100644 --- a/ApplicationCode/ProjectDataModel/RimViewLinker.h +++ b/ApplicationCode/ProjectDataModel/RimViewLinker.h @@ -53,10 +53,10 @@ public: RimViewLinker(void); virtual ~RimViewLinker(void); - bool isActive(); + bool isActive() const; void setMasterView(RimView* view); - RimView* masterView(); + RimView* masterView() const; void addDependentView(RimView* view); void updateDependentViews(); @@ -80,13 +80,12 @@ public: void updateUiNameAndIcon(); - void addViewControllers(caf::PdmUiTreeOrdering& uiTreeOrdering); + void addViewControllers(caf::PdmUiTreeOrdering& uiTreeOrdering) const; static void applyIconEnabledState(caf::PdmObject* obj, const QIcon& icon, bool disable); static void findNameAndIconFromView(QString* name, QIcon* icon, RimView* view); void updateCursorPosition(const RimView* sourceView, const cvf::Vec3d& domainCoord); - void disableCursor(); public: static QString displayNameForView(RimView* view); @@ -96,7 +95,7 @@ protected: virtual void initAfterRead(); private: - void allViewsForCameraSync(const RimView* source, std::vector& views); + void allViewsForCameraSync(const RimView* source, std::vector& views) const; void removeOverrides();