Changeset 4316 for trunk

Timestamp:

Apr 2, 2014 1:08:25 AM (10 years ago)

Author:

ldelgass

Message:

A couple crash fixes

Location:

trunk/packages/vizservers/geovis

Files:

• Renderer.cpp (modified) (3 diffs)
• RendererCmd.cpp (modified) (1 diff)

trunk/packages/vizservers/geovis/Renderer.cpp

@@ -953 +953 @@
  * \param[in] y Viewport coordinate vertical panning (positive number pans 
  * camera up, object down)
- * \param[in] absolute Control if pan amount is relative to current or absolute
  */
 void Renderer::panCamera(double x, double y)
@@ -979 +978 @@
  * \brief Dolly camera or set orthographic scaling based on camera type
  *
- * \param[in] z Ratio to change zoom (greater than 1 is zoom in, less than 1 is zoom out)
- * \param[in] absolute Control if zoom factor is relative to current setting or absolute
- */
-void Renderer::zoomCamera(double z)
-{
-    TRACE("Enter: z: %g camDist: %g", z, _manipulator->getDistance());
+ * \param[in] y Mouse y coordinate in normalized screen coords
+ */
+void Renderer::zoomCamera(double y)
+{
+    TRACE("Enter: y: %g", y);
 
     if (_manipulator.valid()) {
+        TRACE("camDist: %g", _manipulator->getDistance());
         // FIXME: zoom here wants y mouse coords in normalized viewport coords
-        //_manipulator->zoom(0, z);
+        //_manipulator->zoom(0, y);
 
         double dist = _manipulator->getDistance();
-        dist *= (1.0 + z);
+        dist *= (1.0 + y);
         _manipulator->setDistance(dist);
 
@@ -1005 +1004 @@
 void Renderer::setCameraDistance(double dist)
 {
-    TRACE("Enter: dist: %g camDist: %g", dist, _manipulator->getDistance());
+    TRACE("Enter: dist: %g", dist);
 
     if (_manipulator.valid()) {
+        TRACE("camDist: %g", _manipulator->getDistance());
+
         _manipulator->setDistance(dist);
 

trunk/packages/vizservers/geovis/RendererCmd.cpp

@@ -357 +357 @@
 
 static CmdSpec cameraOps[] = {
-    {"dist",    1, CameraSetDistanceOp,      3, 3, "dist"},
+    {"dist",    1, CameraSetDistanceOp,      3, 3, "distance"},
     {"get",     1, CameraGetViewpointOp,     2, 2, ""},
     {"orient",  1, CameraOrientOp,           6, 6, "qw qx qy qz"},