#3470 merge vtk8itk5wx3-mingw64

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / pPlotter / pHistogram.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pHistogram.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pHistogram.cxx
index c14e9511348f57ac1bf39256258777ebdfbaf2d9..4bac5fba7d5e09ce09047fd6f213698d32a6ced3 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pHistogram.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pHistogram.cxx
@@ -135,9 +135,16 @@ void pHistogram::initializePoints(int xDimension)
        //setting image data of the points
        points->SetDimensions(xDimension,1,1);
 //EED  points->SetScalarTypeToUnsignedShort();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        points->SetScalarTypeToDouble();
        points->AllocateScalars();
        points->Update();
+#else
+       points->AllocateScalars(VTK_DOUBLE,1);
+#endif
+
 }
 
 /*
@@ -146,7 +153,6 @@ void pHistogram::initializePoints(int xDimension)
 void pHistogram::setPoints(vtkImageData* imageData)
 {
 
-printf("EED pHistogram::setPoints Trinng new histogram ..\n");
 /*
 printf("EED pHistogram::setPoints Test: vtkPComputeHistogram2DOutliers\n");
 vtkComputeHistogram2DOutliers *vtkhist = vtkComputeHistogram2DOutliers::New();
@@ -163,12 +169,12 @@ printf("EED pHistogram::setPoints colums:%d\n", (int)(resulttable->GetNumberOfCo
        */
 
        char*                           dataImagePointerC               = (char*)imageData->GetScalarPointer(0,0,0);
-       unsigned char*  dataImagePointerUC      = (unsigned char*)imageData->GetScalarPointer(0,0,0);
+       unsigned char*          dataImagePointerUC              = (unsigned char*)imageData->GetScalarPointer(0,0,0);
        short*                          dataImagePointerS               = (short*)imageData->GetScalarPointer(0,0,0);
-       unsigned short*         dataImagePointerUS      = (unsigned short*)imageData->GetScalarPointer(0,0,0);
+       unsigned short*         dataImagePointerUS              = (unsigned short*)imageData->GetScalarPointer(0,0,0);
        float*                          dataImagePointerF               = (float*)imageData->GetScalarPointer(0,0,0);
-       double*                                 dataImagePointerD               = (double*)imageData->GetScalarPointer(0,0,0);
-       double*                                 dataHistogramPointer    = (double*)points->GetScalarPointer(0,0,0);
+       double*                         dataImagePointerD               = (double*)imageData->GetScalarPointer(0,0,0);
+       double*                         dataHistogramPointer    = (double*)points->GetScalarPointer(0,0,0);
        
        /*
         Range of greys