#3158 BBTK Bug New Normal Create - Image Box Reset vtkImageData in Process

[bbtk.git] / packages / vtk / src / bbvtkCreateImage.cxx

diff --git a/packages/vtk/src/bbvtkCreateImage.cxx b/packages/vtk/src/bbvtkCreateImage.cxx
index 9bc6d5144adcdc2c6448f662aeb59eb9065eeba5..c5f71b5fa96406085fd4901905d020c7d9025e90 100644 (file)
--- a/packages/vtk/src/bbvtkCreateImage.cxx
+++ b/packages/vtk/src/bbvtkCreateImage.cxx
@@ -53,66 +53,79 @@ void CreateImage::Process()
 //    * TYPE is the C++ type of the input/output
 //      (the one provided in the attribute 'type' of the tag 'input')
 
-       
-       printf("EED CreateImage::Process Start\n");
-
-       double  spc[6];
+       double  spc[3];
        int             dim[3]; 
        int             outputformat = VTK_UNSIGNED_SHORT;
-       
-       if (bbGetInputOutputFormat()=="VTK_BIT")                        outputformat = VTK_BIT;
-       else if (bbGetInputOutputFormat()=="VTK_CHAR")                  outputformat = VTK_CHAR;
-       else if (bbGetInputOutputFormat()=="VTK_SIGNED_CHAR")           outputformat = VTK_SIGNED_CHAR;
-       else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_CHAR")         outputformat = VTK_UNSIGNED_CHAR;
-       else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_SHORT")        outputformat = VTK_UNSIGNED_SHORT;
-       else if (bbGetInputOutputFormat()=="VTK_INT")                   outputformat = VTK_INT;
-       else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_INT")          outputformat = VTK_UNSIGNED_INT;
-       else if (bbGetInputOutputFormat()=="VTK_LONG")                  outputformat = VTK_LONG;
-       else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_LONG")         outputformat = VTK_UNSIGNED_LONG;
-       else if (bbGetInputOutputFormat()=="VTK_FLOAT")                 outputformat = VTK_FLOAT;
-       else if (bbGetInputOutputFormat()=="VTK_DOUBLE")                outputformat = VTK_DOUBLE;
-               
+       if (bbGetInputOutputFormat()=="VTK_BIT")                                        outputformat = VTK_BIT;                 // 1
+       else if (bbGetInputOutputFormat()=="VTK_CHAR")                          outputformat = VTK_CHAR;                                // 2
+       else if (bbGetInputOutputFormat()=="MET_CHAR")                          outputformat = VTK_CHAR;                                // 2
+       else if (bbGetInputOutputFormat()=="VTK_SIGNED_CHAR")           outputformat = VTK_SIGNED_CHAR;         // 15
+       else if (bbGetInputOutputFormat()=="MET_UCHAR")                         outputformat = VTK_UNSIGNED_CHAR;       // 3
+       else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_CHAR")         outputformat = VTK_UNSIGNED_CHAR;       // 3
+       else if (bbGetInputOutputFormat()=="VTK_SHORT")                         outputformat = VTK_SHORT;               // 4
+       else if (bbGetInputOutputFormat()=="MET_SHORT")                         outputformat = VTK_SHORT;               // 4
+       else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_SHORT")        outputformat = VTK_UNSIGNED_SHORT;      // 5
+       else if (bbGetInputOutputFormat()=="MET_USHORT")                        outputformat = VTK_UNSIGNED_SHORT;      // 5
+       else if (bbGetInputOutputFormat()=="VTK_INT")                           outputformat = VTK_INT;                 // 6
+       else if (bbGetInputOutputFormat()=="MET_INT")                           outputformat = VTK_INT;                 // 6
+       else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_INT")          outputformat = VTK_UNSIGNED_INT;        // 7 
+       else if (bbGetInputOutputFormat()=="MEY_UINT")                          outputformat = VTK_UNSIGNED_INT;        // 7 
+       else if (bbGetInputOutputFormat()=="VTK_LONG")                          outputformat = VTK_LONG;                // 8
+       else if (bbGetInputOutputFormat()=="MET_LONG")                          outputformat = VTK_LONG;                // 8
+       else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_LONG")         outputformat = VTK_UNSIGNED_LONG;       // 9
+       else if (bbGetInputOutputFormat()=="MET_ULONG")                         outputformat = VTK_UNSIGNED_LONG;       // 9
+       else if (bbGetInputOutputFormat()=="VTK_FLOAT")                         outputformat = VTK_FLOAT;               // 10
+       else if (bbGetInputOutputFormat()=="MET_FLOAT")                         outputformat = VTK_FLOAT;               // 10
+       else if (bbGetInputOutputFormat()=="VTK_DOUBLE")                        outputformat = VTK_DOUBLE;              // 11           
+       else if (bbGetInputOutputFormat()=="MET_DOUBLE")                        outputformat = VTK_DOUBLE;              // 11  
        spc[0] = bbGetInputSpacing()[0];
        spc[1] = bbGetInputSpacing()[1];
        spc[2] = bbGetInputSpacing()[2];
-       
        dim[0] =  bbGetInputDimensions()[0];
        dim[1] =  bbGetInputDimensions()[1];
        dim[2] =  bbGetInputDimensions()[2];
-       
+       if ((dim[0]<=0)||(dim[1]<=0)||(dim[2]<=0))
+       {
+               dim[0]=1;
+               dim[1]=1;
+               dim[2]=1;
+       }
+       if ((spc[0]<=0)||(spc[1]<=0)||(spc[2]<=0))
+       {
+               spc[0]=1;
+               spc[1]=1;
+               spc[2]=1;
+       }
+//EED 2017-12-7
+       if (imageoutput!=NULL) 
+       {
+               imageoutput->Delete();
+       }       
+       imageoutput = vtkImageData::New();
        imageoutput->Initialize();
        imageoutput->SetScalarType( outputformat );     
        imageoutput->SetSpacing( spc );
        imageoutput->SetDimensions(  dim[0], dim[1], dim[2] );
        imageoutput->AllocateScalars();
-       
-
-               int i,j,k;
-               long sizeBlock; 
-
-               for (i=0; i<dim[0]; i++)
-               {
-                       imageoutput->SetScalarComponentFromDouble(i,0,0, 0, bbGetInputInitialValue() );
-               }
-               
-               sizeBlock= dim[0] * imageoutput->GetScalarSize();
-                for (j=1; j<dim[1]; j++)
-               {
-                       memcpy(  imageoutput->GetScalarPointer(0,j,0), imageoutput->GetScalarPointer()  , sizeBlock );
-               }               
-
-               sizeBlock= dim[0] * dim[1] * imageoutput->GetScalarSize();
-               for (k=0; k<dim[2]; k++)
-               {
-                       memcpy(  imageoutput->GetScalarPointer(0,0,k) ,imageoutput->GetScalarPointer()  , sizeBlock );
-               } // for k
-
-               imageoutput->Update();
-               imageoutput->Modified();
-               bbSetOutputOut(imageoutput);
-
- printf("EED CreateImage::Process End\n");
-
+       int i,j,k;
+       long sizeBlock; 
+       for (i=0; i<dim[0]; i++)
+       {
+               imageoutput->SetScalarComponentFromDouble(i,0,0, 0, bbGetInputInitialValue() );
+       }       
+       sizeBlock= dim[0] * imageoutput->GetScalarSize();
+            for (j=1; j<dim[1]; j++)
+       {
+               memcpy(  imageoutput->GetScalarPointer(0,j,0), imageoutput->GetScalarPointer()  , sizeBlock );
+       }               
+       sizeBlock= dim[0] * dim[1] * imageoutput->GetScalarSize();
+       for (k=0; k<dim[2]; k++)
+       {
+               memcpy(  imageoutput->GetScalarPointer(0,0,k) ,imageoutput->GetScalarPointer()  , sizeBlock );
+       } // for k
+       imageoutput->Update();
+       imageoutput->Modified();
+       bbSetOutputOut(imageoutput);
 }      
        
 //===== 
@@ -149,7 +162,7 @@ void CreateImage::bbUserInitializeProcessing()
 //    but this is where you should allocate the internal/output pointers 
 //    if any 
 
-       imageoutput = vtkImageData::New();
+//EED 2017-12-7        imageoutput = vtkImageData::New();
 
 }
        
@@ -164,9 +177,8 @@ void CreateImage::bbUserFinalizeProcessing()
 //    but this is where you should desallocate the internal/output pointers 
 //    if any
        imageoutput->Delete();
-
-}
 }
-// EO namespace bbvtk
+
+}// EO namespace bbvtk