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 Changed colors to megenta, and improved interface for manipulator a bit. Adjusted size of handles.

Browse Source
This commit is contained in:
Jacob Støren 2016-10-03 09:39:18 +02:00
parent 58acd22afa
commit 87e7b5dc80
3 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationCode/Commands/IntersectionBoxCommands/RicBoxManipulatorEventHandler.cpp
View File

@ -82,17 +82,14 @@ bool RicBoxManipulatorEventHandler::eventFilter(QObject *obj, QEvent* inputEvent
cvf::HitItemCollection hitItems; cvf::HitItemCollection hitItems;
if (m_viewer->rayPick(mouseEvent->x(), mouseEvent->y(), &hitItems)) if (m_viewer->rayPick(mouseEvent->x(), mouseEvent->y(), &hitItems))
{ {
if (hitItems.firstItem() && hitItems.firstItem()->part()) m_partManager->tryToActivateManipulator(hitItems.firstItem());
{
m_partManager->activateManipulator(hitItems.firstItem()->part(), hitItems.firstItem()->intersectionPoint());
if (m_partManager->isManipulatorActive()) if(m_partManager->isManipulatorActive())
{ {
updateParts(); updateParts();
emit notifyRedraw(); emit notifyRedraw();
return true; return true;
}
} }
} }
} }

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

@ -13,6 +13,7 @@
#include "cvfPrimitiveSetIndexedUShort.h" #include "cvfPrimitiveSetIndexedUShort.h"
#include "cvfRay.h" #include "cvfRay.h"
#include "cvfPrimitiveSetDirect.h" #include "cvfPrimitiveSetDirect.h"
#include "cvfHitItem.h"
using namespace cvf; using namespace cvf;
@ -88,13 +89,18 @@ void BoxManipulatorPartManager::appendPartsToModel(cvf::ModelBasicList* model)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void BoxManipulatorPartManager::activateManipulator(const cvf::Part* candidatePart, const cvf::Vec3d& intersectionPoint) void BoxManipulatorPartManager::tryToActivateManipulator(const cvf::HitItem* hitItem)
{ {
endManipulator(); endManipulator();
if (!candidatePart) return; if (!hitItem) return;
const cvf::Object* siConstObj = candidatePart->sourceInfo(); const cvf::Part* pickedPart = hitItem->part();
const cvf::Vec3d intersectionPoint = hitItem->intersectionPoint();
if (!pickedPart) return;
const cvf::Object* siConstObj = pickedPart->sourceInfo();
cvf::Object* siObj = const_cast<cvf::Object*>(siConstObj); cvf::Object* siObj = const_cast<cvf::Object*>(siConstObj);
BoxManipulatorSourceInfo* candidateSourceInfo = dynamic_cast<BoxManipulatorSourceInfo*>(siObj); BoxManipulatorSourceInfo* candidateSourceInfo = dynamic_cast<BoxManipulatorSourceInfo*>(siObj);
@ -252,7 +258,7 @@ void BoxManipulatorPartManager::createAllHandleParts()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void BoxManipulatorPartManager::createCubeFaceHandlePart(BoxFace face, cvf::Vec3f p1, cvf::Vec3f p2, cvf::Vec3f p3, cvf::Vec3f p4) void BoxManipulatorPartManager::createCubeFaceHandlePart(BoxFace face, cvf::Vec3f p1, cvf::Vec3f p2, cvf::Vec3f p3, cvf::Vec3f p4)
{ {
float handleSize = static_cast<float>(m_sizeOnStartManipulation.length() * 0.04); float handleSize = static_cast<float>(m_sizeOnStartManipulation.length() * 0.02);
Vec3f center = (p1 + p2 + p3 + p4) / 4.0f; Vec3f center = (p1 + p2 + p3 + p4) / 4.0f;
@ -264,7 +270,7 @@ void BoxManipulatorPartManager::createCubeFaceHandlePart(BoxFace face, cvf::Vec3
Vec3f v = nv * handleSize; Vec3f v = nv * handleSize;
Vec3f w = nw * handleSize; Vec3f w = nw * handleSize;
Vec3f pi1 = center - u / 2.0f - v / 2.0f + w*0.1f; Vec3f pi1 = center - u / 2.0f - v / 2.0f + w*0.025f;
Vec3f pi2 = pi1 + u; Vec3f pi2 = pi1 + u;
Vec3f pi3 = pi2 + v; Vec3f pi3 = pi2 + v;
@ -279,7 +285,7 @@ void BoxManipulatorPartManager::createCubeFaceHandlePart(BoxFace face, cvf::Vec3
handlePart->updateBoundingBox(); handlePart->updateBoundingBox();
caf::SurfaceEffectGenerator surfaceGen(cvf::Color3::GREEN, caf::PO_1); caf::SurfaceEffectGenerator surfaceGen(cvf::Color3::MAGENTA, caf::PO_1);
cvf::ref<cvf::Effect> eff = surfaceGen.generateCachedEffect(); cvf::ref<cvf::Effect> eff = surfaceGen.generateCachedEffect();
handlePart->setEffect(eff.p()); handlePart->setEffect(eff.p());
@ -398,7 +404,7 @@ void BoxManipulatorPartManager::createBoundingBoxPart()
// part->setPriority(priMesh); // part->setPriority(priMesh);
cvf::ref<cvf::Effect> eff; cvf::ref<cvf::Effect> eff;
caf::MeshEffectGenerator effectGenerator(cvf::Color3::WHITE); caf::MeshEffectGenerator effectGenerator(cvf::Color3::MAGENTA);
eff = effectGenerator.generateCachedEffect(); eff = effectGenerator.generateCachedEffect();
part->setEffect(eff.p()); part->setEffect(eff.p());

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

@ -13,6 +13,7 @@ namespace cvf {
class Part; class Part;
class DrawableGeo; class DrawableGeo;
class Ray; class Ray;
class HitItem;
} }
namespace caf { namespace caf {
@ -54,7 +55,7 @@ public:
void originAndSize(cvf::Vec3d* origin, cvf::Vec3d* size); void originAndSize(cvf::Vec3d* origin, cvf::Vec3d* size);
bool isManipulatorActive() const; bool isManipulatorActive() const;
void activateManipulator(const cvf::Part* part, const cvf::Vec3d& intersectionPoint); void tryToActivateManipulator(const cvf::HitItem* hitItem);
void updateManipulatorFromRay(const cvf::Ray* ray); void updateManipulatorFromRay(const cvf::Ray* ray);
void endManipulator(); void endManipulator();