Merge topic 'charts-mouse-api'

240cde04 ENH: Use float for block dimensions.

Charts/vtkBlockItem.cxx

@@ -30,17 +30,17 @@
 #include "vtkObjectFactory.h"
 
 //-----------------------------------------------------------------------------
-vtkStandardNewMacro(vtkBlockItem);
+vtkStandardNewMacro(vtkBlockItem)
 
 //-----------------------------------------------------------------------------
 vtkBlockItem::vtkBlockItem()
 {
   this->MouseOver = false;
   this->scalarFunction = NULL;
-  this->Dimensions[0]=0;
-  this->Dimensions[1]=0;
-  this->Dimensions[2]=0;
-  this->Dimensions[3]=0;
+  this->Dimensions[0] = 0;
+  this->Dimensions[1] = 0;
+  this->Dimensions[2] = 0;
+  this->Dimensions[3] = 0;
 }
 
 //-----------------------------------------------------------------------------
@@ -65,17 +65,14 @@ bool vtkBlockItem::Paint(vtkContext2D *painter)
     {
     painter->GetBrush()->SetColor(0, 255, 0);
     }
-  painter->DrawRect(static_cast<float>(this->Dimensions[0]),
-                    static_cast<float>(this->Dimensions[1]),
-                    static_cast<float>(this->Dimensions[2]),
-                    static_cast<float>(this->Dimensions[3]));
+  painter->DrawRect(this->Dimensions[0], this->Dimensions[1],
+                    this->Dimensions[2], this->Dimensions[3]);
 
-  int x = vtkContext2D::FloatToInt(this->Dimensions[0] + 0.5 * this->Dimensions[2]);
-  int y = vtkContext2D::FloatToInt(this->Dimensions[1] + 0.5 * this->Dimensions[3]);
+  float x = this->Dimensions[0] + 0.5 * this->Dimensions[2];
+  float y = this->Dimensions[1] + 0.5 * this->Dimensions[3];
   if (this->Label)
     {
-    painter->DrawString(static_cast<float>(x),static_cast<float>(y),
-                        this->Label);
+    painter->DrawString(x, y, this->Label);
     }
 
   if (this->scalarFunction)

Charts/vtkBlockItem.h

@@ -78,14 +78,14 @@ public:
   // coordinate of the bottom corner. Elements 2 and 3 are the width and
   // height.
   // Initial value is (0,0,0,0).
-  vtkSetVector4Macro(Dimensions, int);
+  vtkSetVector4Macro(Dimensions, float);
 
   // Description:
   // Get the dimensions of the block, elements 0 and 1 are the x and y
   // coordinate of the bottom corner. Elements 2 and 3 are the width and
   // height.
   // Initial value is (0,0,0,0)
-  vtkGetVector4Macro(Dimensions, int);
+  vtkGetVector4Macro(Dimensions, float);
 
 //BTX
   void SetScalarFunctor(double (*scalarFunction)(double, double));
@@ -96,7 +96,7 @@ protected:
   vtkBlockItem();
   ~vtkBlockItem();
 
-  int Dimensions[4];
+  float Dimensions[4];
 
   vtkStdString Label;