#3263 creaMaracasVisu Feature New Normal - ViewerNV sync ParallelScale Camera

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / Contour / ContourExtractData.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
index 801078958158d57a1b217ec054d5fc78c39355d3..da3d19b816e7aab56e211799800c3660d91ba27c 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
@@ -575,24 +575,18 @@ void ContourExtractData::InitVtkImagesResult()
                imagedataValueResult->Delete();
        }
        imagedataValueResult = vtkImageData::New();
-<<<<<<< HEAD
-       //        imagedataValueResult->SetScalarType(scalartype);
-=======
-
-//EED 2017-12-18
-       imagedataValueResult->SetScalarType(scalartype);
-       //imagedataValueResult->SetScalarTypeToUnsignedShort();
-
->>>>>>> master
        imagedataValueResult->SetSpacing(spc);
        imagedataValueResult->SetDimensions( newDim );
 
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
-       imagedataValueResult->SetScalarTypeToUnsignedShort();
+
+//EED 2017-12-18
+       imagedataValueResult->SetScalarType(scalartype);
+       //imagedataValueResult->SetScalarTypeToUnsignedShort();
        imagedataValueResult->AllocateScalars();
 #else
-       imagedataValueResult->AllocateScalars(VTK_UNSIGNED_SHORT,1);
+       imagedataValueResult->AllocateScalars(scalartype,1);
 #endif
 
 
@@ -601,25 +595,19 @@ void ContourExtractData::InitVtkImagesResult()
                imagedataMaskResult->Delete();
        }
        imagedataMaskResult  = vtkImageData::New();
-<<<<<<< HEAD
-       //        imagedataMaskResult->SetScalarType(scalartype);
-=======
 
-//EED 2017-12-18
-//     imagedataMaskResult->SetScalarType(scalartype);
-//     imagedataMaskResult->SetScalarTypeToUnsignedShort();
-       imagedataMaskResult->SetScalarTypeToUnsignedChar();
 
->>>>>>> master
        imagedataMaskResult->SetSpacing(spc);
        imagedataMaskResult->SetDimensions( newDim );
 
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
-       imagedataMaskResult->SetScalarTypeToUnsignedShort();
+    //EED 2017-12-18
+    //imagedataMaskResult->SetScalarTypeToUnsignedShort();
+       imagedataMaskResult->SetScalarTypeToUnsignedChar();
        imagedataMaskResult->AllocateScalars();
 #else
-       imagedataMaskResult->AllocateScalars(VTK_UNSIGNED_SHORT,1);
+       imagedataMaskResult->AllocateScalars(VTK_UNSIGNED_CHAR,1);
 #endif
 
 }