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

6
ApplicationCode/ProjectDataModel/RimPropertyFilterCollection.cpp
View File

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