#2331 Refactor the viewer-view communication to pave way for 2dIntersection Views

This commit is contained in:
Jacob Støren
2018-01-11 12:59:52 +01:00
parent 57b521c6d9
commit 5644684606
6 changed files with 197 additions and 77 deletions

View File

@@ -20,10 +20,12 @@
#pragma once
#include "RiuViewerToViewInterface.h"
#include "cafViewer.h"
#include "cafPdmObject.h"
#include "cafPdmPointer.h"
#include "cafPdmInterfacePointer.h"
#include "cafMouseState.h"
#include "cvfStructGrid.h"
@@ -46,6 +48,7 @@ namespace cvf
class OverlayItem;
class Part;
class OverlayAxisCross;
class BoundingBox;
}
//==================================================================================================
@@ -64,8 +67,8 @@ public:
void setDefaultView();
cvf::Vec3d pointOfInterest();
void setPointOfInterest(cvf::Vec3d poi);
void setOwnerReservoirView(Rim3dView * owner);
Rim3dView* ownerReservoirView();
void setOwnerReservoirView(RiuViewerToViewInterface * owner);
RiuViewerToViewInterface* ownerReservoirView();
RimViewWindow* ownerViewWindow() const override;
void setEnableMask(unsigned int mask);
@@ -75,8 +78,11 @@ public:
void setHistogram(double min, double max, const std::vector<size_t>& histogram);
void setHistogramPercentiles(double pmin, double pmax, double mean);
void updateGridBoxData();
cvf::Model* gridBoxModel() const;
void showGridBox(bool enable);
void updateGridBoxData(double scaleZ,
const cvf::Vec3d& displayModelOffset,
const cvf::Color3f& backgroundColor,
const cvf::BoundingBox& domainCoordBoundingBox);
void updateAnnotationItems();
@@ -91,6 +97,7 @@ public:
void setCurrentFrame(int frameIndex);
void showAxisCross(bool enable);
void setAxisLabels(const cvf::String& xLabel, const cvf::String& yLabel, const cvf::String& zLabel);
cvf::Vec3d lastPickPositionInDomainCoords() const;
@@ -141,7 +148,7 @@ private:
cvf::ref<cvf::OverlayAxisCross> m_axisCross;
cvf::Collection<cvf::OverlayItem> m_visibleLegends;
caf::PdmPointer<Rim3dView> m_rimView;
caf::PdmInterfacePointer<RiuViewerToViewInterface> m_rimView;
QPoint m_lastMousePressPosition;
RiuViewerCommands* m_viewerCommands;