(#884) Refactor and cleanup

This commit is contained in:
Magne Sjaastad
2016-09-29 11:43:47 +02:00
parent de11836e03
commit 593d72d63b
18 changed files with 515 additions and 583 deletions

View File

@@ -101,6 +101,24 @@ cvf::Vec3d RimIntersectionBox::boxSize() const
return cvf::Vec3d(m_maxXCoord, m_maxYCoord, m_maxZCoord) - cvf::Vec3d(m_minXCoord, m_minYCoord, m_minZCoord);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimIntersectionBox::setFromOriginAndSize(const cvf::Vec3d& origin, const cvf::Vec3d& size)
{
m_minXCoord = origin.x();
m_minYCoord = origin.y();
m_minZCoord = origin.z();
m_maxXCoord = origin.x() + size.x();
m_maxYCoord = origin.y() + size.y();
m_maxZCoord = origin.z() + size.z();
updateConnectedEditors();
rebuildGeometryAndScheduleCreateDisplayModel();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -54,6 +54,7 @@ public:
cvf::Mat4d boxOrigin() const;
cvf::Vec3d boxSize() const;
SinglePlaneState singlePlaneState() const;
void setFromOriginAndSize(const cvf::Vec3d& origin, const cvf::Vec3d& size);
RivIntersectionBoxPartMgr* intersectionBoxPartMgr();

View File

@@ -25,8 +25,10 @@
#include "RivWellPathCollectionPartMgr.h"
#include "cafDisplayCoordTransform.h"
#include "cafFrameAnimationControl.h"
#include "cafPdmObjectFactory.h"
#include "cvfCamera.h"
#include "cvfModel.h"
#include "cvfModelBasicList.h"
@@ -927,3 +929,22 @@ void RimView::zoomAll()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
cvf::ref<caf::DisplayCoordTransform> RimView::displayCoordTransform()
{
cvf::ref<caf::DisplayCoordTransform> coordTrans = new caf::DisplayCoordTransform;
cvf::Vec3d scale(1.0, 1.0, scaleZ);
coordTrans->setScale(scale);
RimCase* rimCase = ownerCase();
if (rimCase)
{
coordTrans->setTranslation(rimCase->displayModelOffset());
}
return coordTrans;
}

View File

@@ -62,6 +62,10 @@ namespace cvf
class Part;
}
namespace caf
{
class DisplayCoordTransform;
}
//==================================================================================================
///
///
@@ -161,6 +165,8 @@ public:
virtual void zoomAll() override;
cvf::ref<caf::DisplayCoordTransform> displayCoordTransform();
public:
virtual void loadDataAndUpdate() = 0;
virtual RimCase* ownerCase() = 0;