2119 BBTK Bug New Normal VTK_SHORT format missing

diff --git a/packages/vtk/src/bbvtkCreateImage.cxx b/packages/vtk/src/bbvtkCreateImage.cxx
index 9bc6d5144adcdc2c6448f662aeb59eb9065eeba5..305fec38dac35e0d6b2f7c5d2c5c35d8b11bd57f 100644 (file)
--- a/packages/vtk/src/bbvtkCreateImage.cxx
+++ b/packages/vtk/src/bbvtkCreateImage.cxx
@@ -60,17 +60,19 @@ void CreateImage::Process()
        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()=="VTK_SIGNED_CHAR")           outputformat = VTK_SIGNED_CHAR;         // 15
+       else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_CHAR")         outputformat = VTK_UNSIGNED_CHAR;       // 3
+       else if (bbGetInputOutputFormat()=="VTK_SHORT")                 outputformat = VTK_SHORT;               // 4
+       else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_SHORT")        outputformat = VTK_UNSIGNED_SHORT;      // 5
+       else if (bbGetInputOutputFormat()=="VTK_INT")                   outputformat = VTK_INT;                 // 6
+       else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_INT")          outputformat = VTK_UNSIGNED_INT;        // 7 
+       else if (bbGetInputOutputFormat()=="VTK_LONG")                  outputformat = VTK_LONG;                // 8
+       else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_LONG")         outputformat = VTK_UNSIGNED_LONG;       // 9
+       else if (bbGetInputOutputFormat()=="VTK_FLOAT")                 outputformat = VTK_FLOAT;               // 10
+       else if (bbGetInputOutputFormat()=="VTK_DOUBLE")                outputformat = VTK_DOUBLE;              // 11  
                
        spc[0] = bbGetInputSpacing()[0];
        spc[1] = bbGetInputSpacing()[1];

diff --git a/packages/vtk/src/bbvtkImageVtkProperties.cxx b/packages/vtk/src/bbvtkImageVtkProperties.cxx
index 0a2d06d09323dd9d0d638d21b35cf09d7b0e8681..9a8b563f68715fd7f628bbe54022e039e467d15e 100644 (file)
--- a/packages/vtk/src/bbvtkImageVtkProperties.cxx
+++ b/packages/vtk/src/bbvtkImageVtkProperties.cxx
@@ -72,17 +72,19 @@ void ImageVtkProperties::Process()
 
                vrange.push_back((float)range[0]);
                vrange.push_back((float)range[1]);
-       
-               if (bbGetInputIn()->GetScalarType()==VTK_BIT)                           nametype="VTK_BIT";
-               if (bbGetInputIn()->GetScalarType()==VTK_CHAR)                          nametype="VTK_CHAR";
-               if (bbGetInputIn()->GetScalarType()==VTK_SIGNED_CHAR)           nametype="VTK_SIGNED_CHAR";
-               if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_CHAR)         nametype="VTK_UNSIGNED_CHAR";
-               if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_SHORT)        nametype="VTK_UNSIGNED_SHORT";
-               if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_INT)          nametype="VTK_UNSIGNED_INT";
-               if (bbGetInputIn()->GetScalarType()==VTK_LONG)                          nametype="VTK_LONG";
-               if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_LONG)         nametype="VTK_UNSIGNED_LONG";
-               if (bbGetInputIn()->GetScalarType()==VTK_FLOAT)                         nametype="VTK_FLOAT";
-               if (bbGetInputIn()->GetScalarType()==VTK_DOUBLE)                        nametype="VTK_DOUBLE";
+
+               if (bbGetInputIn()->GetScalarType()==VTK_BIT)                   nametype="VTK_BIT";             // 1
+               if (bbGetInputIn()->GetScalarType()==VTK_CHAR)                  nametype="VTK_CHAR";            // 2
+               if (bbGetInputIn()->GetScalarType()==VTK_SIGNED_CHAR)           nametype="VTK_SIGNED_CHAR";     // 15
+               if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_CHAR)         nametype="VTK_UNSIGNED_CHAR";   // 3
+               if (bbGetInputIn()->GetScalarType()==VTK_SHORT)                 nametype="VTK_SHORT";           // 4
+               if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_SHORT)        nametype="VTK_UNSIGNED_SHORT";  // 5
+               if (bbGetInputIn()->GetScalarType()==VTK_INT)                   nametype="VTK_INT";             // 6
+               if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_INT)          nametype="VTK_UNSIGNED_INT";    // 7
+               if (bbGetInputIn()->GetScalarType()==VTK_LONG)                  nametype="VTK_LONG";            // 8  
+               if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_LONG)         nametype="VTK_UNSIGNED_LONG";   // 9
+               if (bbGetInputIn()->GetScalarType()==VTK_FLOAT)                 nametype="VTK_FLOAT";           // 10
+               if (bbGetInputIn()->GetScalarType()==VTK_DOUBLE)                nametype="VTK_DOUBLE";          // 11
        } else {        
                dim                                     = 0;            
                numberoOfComponents     = 0;

diff --git a/packages/vtk/src/bbvtkInversCrop.cxx b/packages/vtk/src/bbvtkInversCrop.cxx
index b56a85132101be44898637c72898c9b8aa352809..7d0962f05e94adc731073c9da1a9b7a7eb4762e7 100644 (file)
--- a/packages/vtk/src/bbvtkInversCrop.cxx
+++ b/packages/vtk/src/bbvtkInversCrop.cxx
@@ -28,6 +28,7 @@ void InversCrop::Process()
 
     if ((bbGetInputImageFix()!=NULL) && (bbGetInputImageMove()!=NULL) )
     {
+printf("EED InversCrop::Process ScalarType %d  %d \n", bbGetInputImageFix()->GetScalarType(), bbGetInputImageMove()->GetScalarType() );
      if ( bbGetInputImageFix()->GetScalarType()==bbGetInputImageMove()->GetScalarType() ) 
      {
         // Creating Image

diff --git a/packages/vtk/src/bbvtkRescaleSlopeIntercept.cxx b/packages/vtk/src/bbvtkRescaleSlopeIntercept.cxx
index 639fd2a036b2a7d4ac36d79a9702596a5ed301f9..dc4e0afc299a4effc6e758f5149a2087a4f67482 100644 (file)
--- a/packages/vtk/src/bbvtkRescaleSlopeIntercept.cxx
+++ b/packages/vtk/src/bbvtkRescaleSlopeIntercept.cxx
@@ -66,17 +66,18 @@ void RescaleSlopeIntercept::Process()
        if (bbGetInputIn()!=0)
        {
                if (bbGetInputOutputFormat()=="SAME")                                   outputformat = bbGetInputIn()->GetScalarType();
-               else 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;
+               else if (bbGetInputOutputFormat()=="VTK_BIT")                   outputformat = VTK_BIT;            // 1
+               else if (bbGetInputOutputFormat()=="VTK_CHAR")                  outputformat = VTK_CHAR;           // 2
+               else if (bbGetInputOutputFormat()=="VTK_SIGNED_CHAR")           outputformat = VTK_SIGNED_CHAR;    // 15
+               else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_CHAR")         outputformat = VTK_UNSIGNED_CHAR;  // 3
+               else if (bbGetInputOutputFormat()=="VTK_SHORT")                 outputformat = VTK_SHORT;          // 4
+               else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_SHORT")        outputformat = VTK_UNSIGNED_SHORT; // 5
+               else if (bbGetInputOutputFormat()=="VTK_INT")                   outputformat = VTK_INT;            // 6
+               else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_INT")          outputformat = VTK_UNSIGNED_INT;   // 7
+               else if (bbGetInputOutputFormat()=="VTK_LONG")                  outputformat = VTK_LONG;           // 8  
+               else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_LONG")         outputformat = VTK_UNSIGNED_LONG;  // 9
+               else if (bbGetInputOutputFormat()=="VTK_FLOAT")                 outputformat = VTK_FLOAT;          // 10
+               else if (bbGetInputOutputFormat()=="VTK_DOUBLE")                outputformat = VTK_DOUBLE;         // 11 
                
                
                bbGetInputIn()->GetScalarRange(range);

diff --git a/packages/vtk/src/bbvtkRescaleSlopeIntercept.h b/packages/vtk/src/bbvtkRescaleSlopeIntercept.h
index 49b151b367d52b3a16228351d2c1787cd1ee6555..77ef177c41e03ed62157579604307d49bb053580 100644 (file)
--- a/packages/vtk/src/bbvtkRescaleSlopeIntercept.h
+++ b/packages/vtk/src/bbvtkRescaleSlopeIntercept.h
@@ -79,7 +79,7 @@ BBTK_INPUT(RescaleSlopeIntercept,In,"Image input",vtkImageData*,"");
 BBTK_INPUT(RescaleSlopeIntercept,Type,"type of operation: 0 (default) SlopeIntercept np=p*A+B, 1 Invert, 2 Redimension A=newMin B=newMax, 3 InvertRedimension A=newMin B=newMax",int,"");
 BBTK_INPUT(RescaleSlopeIntercept,A,"(1 default) see Type description",double,"");
 BBTK_INPUT(RescaleSlopeIntercept,B,"(0 default) see Type description",double,"");
-BBTK_INPUT(RescaleSlopeIntercept,OutputFormat,"Image output format:  SAME (default), VTK_BIT, VTK_CHAR, VTK_SIGNED_CHAR, VTK_UNSIGNED_CHAR, VTK_SHORT VTK_UNSIGNED_SHORT, VTK_INT, VTK_UNSIGNED_INT, VTK_LONG, VTK_UNSIGNED_LONG, VTK_FLOAT, VTK_DOUBLE",std::string,"");
+BBTK_INPUT(RescaleSlopeIntercept,OutputFormat,"Image output format:  SAME (default), VTK_BIT, VTK_CHAR, VTK_SIGNED_CHAR, VTK_UNSIGNED_CHAR, VTK_SHORT, VTK_UNSIGNED_SHORT, VTK_INT, VTK_UNSIGNED_INT, VTK_LONG, VTK_UNSIGNED_LONG, VTK_FLOAT, VTK_DOUBLE",std::string,"");
 BBTK_OUTPUT(RescaleSlopeIntercept,Out,"Image output",vtkImageData*,"");
 BBTK_END_DESCRIBE_BLACK_BOX(RescaleSlopeIntercept);
 //=====