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

#884 Fixed occasional crashes using the 3D manipulator

Browse Source
This commit is contained in:
Jacob Støren
2016-10-04 09:47:09 +02:00
parent c7aae71dbc
commit 47df6a6122
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Fwk/AppFwk/cafVizExtensions/cafBoxManipulatorPartManager.cpp
View File

@@ -32,6 +32,13 @@ BoxManipulatorPartManager::BoxManipulatorPartManager()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
BoxManipulatorPartManager::~BoxManipulatorPartManager()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -137,6 +144,8 @@ void BoxManipulatorPartManager::tryToActivateManipulator(const cvf::HitItem* hit
void BoxManipulatorPartManager::updateManipulatorFromRay(const cvf::Ray* ray)
{
if (!isManipulatorActive()) return;
if (m_boundingBoxPart.isNull()) return;
BoxFace face = m_handleIds[m_currentHandleIndex].first;
cvf::Vec3d faceDir = normalFromFace(face);
@@ -360,7 +369,6 @@ void BoxManipulatorPartManager::recreateAllGeometryAndParts()
{
createBoundingBoxPart();
createAllHandleParts();
createAllHandleParts();
}
//--------------------------------------------------------------------------------------------------

1
Fwk/AppFwk/cafVizExtensions/cafBoxManipulatorPartManager.h
View File

@@ -49,6 +49,7 @@ public:
public:
BoxManipulatorPartManager();
~BoxManipulatorPartManager();
void setOrigin(const cvf::Vec3d& origin);
void setSize(const cvf::Vec3d& size);