#2331 Renamed RimView to Rim3dView

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

View File

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