From 7023236741dc31a74f65795775cef9f10011ebf3 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 9 Nov 2011 11:10:09 +0000 Subject: [PATCH] + rename methods to a more obvious name git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5106 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d --- src/Gui/BlenderNavigationStyle.cpp | 2 +- src/Gui/CADNavigationStyle.cpp | 2 +- src/Gui/InventorNavigationStyle.cpp | 4 ++-- src/Gui/NavigationStyle.cpp | 6 +++--- src/Gui/NavigationStyle.h | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Gui/BlenderNavigationStyle.cpp b/src/Gui/BlenderNavigationStyle.cpp index 3b431e1ba..aeb875c80 100644 --- a/src/Gui/BlenderNavigationStyle.cpp +++ b/src/Gui/BlenderNavigationStyle.cpp @@ -247,7 +247,7 @@ SbBool BlenderNavigationStyle::processSoEvent(const SoEvent * const ev) float dci = (float)QApplication::doubleClickInterval()/1000.0f; // is it just a middle click? if (tmp.getValue() < dci && !this->lockrecenter) { - if (!this->moveToPoint(pos)) { + if (!this->lookAtPoint(pos)) { panToCenter(panningplane, posn); this->interactiveCountDec(); } diff --git a/src/Gui/CADNavigationStyle.cpp b/src/Gui/CADNavigationStyle.cpp index a54541c9e..965ace1bf 100644 --- a/src/Gui/CADNavigationStyle.cpp +++ b/src/Gui/CADNavigationStyle.cpp @@ -276,7 +276,7 @@ SbBool CADNavigationStyle::processSoEvent(const SoEvent * const ev) float dci = (float)QApplication::doubleClickInterval()/1000.0f; // is it just a middle click? if (tmp.getValue() < dci && !this->lockrecenter) { - if (!this->moveToPoint(pos)) { + if (!this->lookAtPoint(pos)) { panToCenter(panningplane, posn); this->interactiveCountDec(); } diff --git a/src/Gui/InventorNavigationStyle.cpp b/src/Gui/InventorNavigationStyle.cpp index aa4e41eec..65db39aff 100644 --- a/src/Gui/InventorNavigationStyle.cpp +++ b/src/Gui/InventorNavigationStyle.cpp @@ -182,7 +182,7 @@ SbBool InventorNavigationStyle::processSoEvent(const SoEvent * const ev) float dci = (float)QApplication::doubleClickInterval()/1000.0f; // is it just a left click? if (tmp.getValue() < dci && !this->lockrecenter) { - if (!this->moveToPoint(pos)) { + if (!this->lookAtPoint(pos)) { panToCenter(panningplane, posn); this->interactiveCountDec(); } @@ -240,7 +240,7 @@ SbBool InventorNavigationStyle::processSoEvent(const SoEvent * const ev) float dci = (float)QApplication::doubleClickInterval()/1000.0f; // is it just a middle click? if (tmp.getValue() < dci && !this->lockrecenter) { - if (!this->moveToPoint(pos)) { + if (!this->lookAtPoint(pos)) { panToCenter(panningplane, posn); this->interactiveCountDec(); } diff --git a/src/Gui/NavigationStyle.cpp b/src/Gui/NavigationStyle.cpp index ebe387011..c5283e00f 100644 --- a/src/Gui/NavigationStyle.cpp +++ b/src/Gui/NavigationStyle.cpp @@ -281,7 +281,7 @@ void NavigationStyle::seekToPoint(const SbVec3f& scenepos) viewer->seekToPoint(scenepos); } -SbBool NavigationStyle::moveToPoint(const SbVec2s screenpos) +SbBool NavigationStyle::lookAtPoint(const SbVec2s screenpos) { SoCamera* cam = viewer->getCamera(); if (cam == 0) return FALSE; @@ -299,11 +299,11 @@ SbBool NavigationStyle::moveToPoint(const SbVec2s screenpos) SbVec3f hitpoint; hitpoint = picked->getPoint(); - setCameraPosition(hitpoint); + lookAtPoint(hitpoint); return TRUE; } -void NavigationStyle::setCameraPosition(const SbVec3f& pos) +void NavigationStyle::lookAtPoint(const SbVec3f& pos) { SoCamera* cam = viewer->getCamera(); if (cam == 0) return; diff --git a/src/Gui/NavigationStyle.h b/src/Gui/NavigationStyle.h index 30a9e8033..4186d9e2f 100644 --- a/src/Gui/NavigationStyle.h +++ b/src/Gui/NavigationStyle.h @@ -116,7 +116,7 @@ public: void redraw(); void setCameraOrientation(const SbRotation& rot); - void setCameraPosition(const SbVec3f&); + void lookAtPoint(const SbVec3f&); void boxZoom(const SbBox2s& box); virtual void viewAll(); @@ -150,7 +150,7 @@ protected: void setSeekMode(SbBool enable); SbBool seekToPoint(const SbVec2s screenpos); void seekToPoint(const SbVec3f& scenepos); - SbBool moveToPoint(const SbVec2s screenpos); + SbBool lookAtPoint(const SbVec2s screenpos); void reorientCamera(SoCamera * camera, const SbRotation & rot); void panCamera(SoCamera * camera,