Changeset 3455 for trunk

Timestamp:

Mar 5, 2013 3:25:33 PM (11 years ago)

Author:

ldelgass

Message:

Fix legend height

Location:

trunk/packages/vizservers/vtkvis

Files:

• ColorMap.cpp (modified) (1 diff)
• ColorMap.h (modified) (1 diff)
• RpVtkRenderer.cpp (modified) (3 diffs)

trunk/packages/vizservers/vtkvis/ColorMap.cpp

@@ -172 +172 @@
         }
     }
+}
+
+/**
+ * \brief Get the number of discrete color table entries
+ *
+ * The number of table entries refers to the underlying 
+ * vtkLookupTable and is independent of the number of 
+ * control points in the transfer function.
+ */
+int ColorMap::getNumberOfTableEntries()
+{
+    return _numTableEntries;
 }
 

trunk/packages/vizservers/vtkvis/ColorMap.h

@@ -95 +95 @@
     void setNumberOfTableEntries(int numEntries);
 
+    int getNumberOfTableEntries();
+
     void addControlPoint(ControlPoint& cp);
 

trunk/packages/vizservers/vtkvis/RpVtkRenderer.cpp

@@ -1887 +1887 @@
     if (_scalarBarActor == NULL) {
         _scalarBarActor = vtkSmartPointer<vtkScalarBarActor>::New();
+        _scalarBarActor->DrawFrameOff();
+        _scalarBarActor->DrawBackgroundOff();
         _legendRenderer->AddViewProp(_scalarBarActor);
     }
@@ -1907 +1909 @@
         if (width > height) {
             // horizontal
-            _scalarBarActor->SetHeight(2.5); // VTK: floor(actorHeight * .4)
-            _scalarBarActor->SetWidth(1);
+            _scalarBarActor->SetHeight((((double)height+1.5)/((double)height))/0.4); // VTK: floor(actorHeight * .4)
+            _scalarBarActor->SetWidth(1); // VTK: actorWidth
         } else {
             // vertical
-            _scalarBarActor->SetHeight((double)height/(.86*height)); // VTK: floor(actorHeight * .86)
+            _scalarBarActor->SetHeight((((double)height+1.5)/((double)height))/0.86); // VTK: floor(actorHeight * .86)
             _scalarBarActor->SetWidth(((double)(width+5))/((double)width)); // VTK: actorWidth - 4 pixels
         }
@@ -2054 +2056 @@
 
     _scalarBarActor->SetLookupTable(lut);
+    _scalarBarActor->SetMaximumNumberOfColors((width > height ? width : height));
 
     if (drawTitle) {