#3162 creaMaracasVisu Bug New Normal - Threshold layer

[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 dead6db868955deba9bd041ea289ae60ec4e45f4..c08f5d977fa6307339d3bcfb6c9b189681d9a98d 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
@@ -1,3 +1,27 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
 
 #include "ContourExtractData.h"
 
@@ -363,10 +387,13 @@ void ContourExtractData::PutVtkImageDataResultValue( int x, int y, int z, double
 {
        unsigned short *pValue;
        unsigned short *pMask;
-       pValue  = (unsigned short *)imagedataValueResult->GetScalarPointer(x,y,z);
-       pMask   = (unsigned short *)imagedataMaskResult->GetScalarPointer(x,y,z);
-       *pMask  = 255;
-       *pValue = (unsigned short)value;
+//EED 2017-12-18
+       imagedataValueResult->SetScalarComponentFromDouble(x,y,z,0,value);
+       imagedataMaskResult->SetScalarComponentFromDouble(x,y,z,0,255);
+//     pValue  = (unsigned short *)imagedataValueResult->GetScalarPointer(x,y,z);
+//     *pValue = (unsigned short)value;
+//     pMask   = (unsigned char *)imagedataMaskResult->GetScalarPointer(x,y,z);
+//     *pMask  = 255;
 }
 
 //------------------------------------------------------------------------
@@ -383,8 +410,8 @@ void ContourExtractData::ResetImageResult(int z)
                imagedataValueResult->GetExtent(ext);
 
                int size = (ext[1]-ext[0]+1) * (ext[3]-ext[2]+1); 
-               memset(pValue,0,size*2);
-               memset(pMask,0,size*2);
+               memset(pValue,0, size*imagedataValueResult->GetScalarSize() );
+               memset(pMask,0, size*imagedataMaskResult->GetScalarSize() );
        } // if
 }
 
@@ -534,8 +561,11 @@ void ContourExtractData::InitVtkImagesResult()
                imagedataValueResult->Delete();
        }
        imagedataValueResult = vtkImageData::New();
-       //        imagedataValueResult->SetScalarType(scalartype);
-       imagedataValueResult->SetScalarTypeToUnsignedShort();
+
+//EED 2017-12-18
+       imagedataValueResult->SetScalarType(scalartype);
+       //imagedataValueResult->SetScalarTypeToUnsignedShort();
+
        imagedataValueResult->SetSpacing(spc);
        imagedataValueResult->SetDimensions( newDim );
        imagedataValueResult->AllocateScalars();
@@ -545,8 +575,12 @@ void ContourExtractData::InitVtkImagesResult()
                imagedataMaskResult->Delete();
        }
        imagedataMaskResult  = vtkImageData::New();
-       //        imagedataMaskResult->SetScalarType(scalartype);
-       imagedataMaskResult->SetScalarTypeToUnsignedShort();
+
+//EED 2017-12-18
+//     imagedataMaskResult->SetScalarType(scalartype);
+//     imagedataMaskResult->SetScalarTypeToUnsignedShort();
+       imagedataMaskResult->SetScalarTypeToUnsignedChar();
+
        imagedataMaskResult->SetSpacing(spc);
        imagedataMaskResult->SetDimensions( newDim );
        imagedataMaskResult->AllocateScalars();