Changeset 2113 for trunk

Timestamp:

Feb 28, 2011, 3:16:37 AM (13 years ago)

Author:

ldelgass

Message:

Fix remaining vestiges of rgba control points in ColorMap?

Location:

trunk/packages/vizservers/vtkvis

Files:

• ColorMap.cpp (modified) (1 diff)
• RpVtkRenderer.cpp (modified) (2 diffs)

trunk/packages/vizservers/vtkvis/ColorMap.cpp

@@ -48 +48 @@
         cp.value = 1.0;
 
-    TRACE("New control point: %g  = %g %g %g %g",
-          cp.value, cp.color[0], cp.color[1], cp.color[2], cp.color[3]);
+    TRACE("New control point: %g  = %g %g %g",
+          cp.value, cp.color[0], cp.color[1], cp.color[2]);
 
     for (std::list<ControlPoint>::iterator itr = _controlPoints.begin();

trunk/packages/vizservers/vtkvis/RpVtkRenderer.cpp

@@ -962 +962 @@
     //camera->SetPitch(pitch); // Rotate about camera
     camera->Roll(roll); // Roll about camera view axis
-   _renderer->ResetCameraClippingRange();
+    _renderer->ResetCameraClippingRange();
     storeCameraOrientation();
     _needsRedraw = true;
@@ -979 +979 @@
     trans->Translate(x, y, 0);
     camera->ApplyTransform(trans);
-   _renderer->ResetCameraClippingRange();
+    _renderer->ResetCameraClippingRange();
     storeCameraOrientation();
     _needsRedraw = true;