#2981 BBTK Feature New Normal - FormatOutput of filters in string

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

diff --git a/packages/vtk/src/bbvtkSegmentationConnectivity.cxx b/packages/vtk/src/bbvtkSegmentationConnectivity.cxx
index 2deda14b1e2856a14a06bb4298fcd581e09d02b5..218c9db239d416b70a09501db280729f65a5106d 100644 (file)
--- a/packages/vtk/src/bbvtkSegmentationConnectivity.cxx
+++ b/packages/vtk/src/bbvtkSegmentationConnectivity.cxx
@@ -1,33 +1,38 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbvtkSegmentationConnectivity.cxx,v $
   Language:  C++
-  Date:      $Date: 2011/06/16 12:28:43 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2012/11/16 08:51:58 $
+  Version:   $Revision: 1.8 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
-* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
-*
-*  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.
-* ------------------------------------------------------------------------ */                                                                         
-
 /**
  *  \file 
  *  \brief 
@@ -38,6 +43,8 @@
 #include "bbvtkSegmentationConnectivity.h"
 #include "bbvtkPackage.h"
 
+#include "bbtkStaticLecture.h"
+
 namespace bbvtk
 {
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,SegmentationConnectivity);
@@ -49,7 +56,7 @@ namespace bbvtk
   void SegmentationConnectivity::bbUserSetDefaultValues() 
   { 
          thresh2       = NULL;
-         cast2         = NULL;
+//       cast2         = NULL;
          connect2      = NULL;
          cast4         = NULL;
                
@@ -64,12 +71,32 @@ namespace bbvtk
          threshold.push_back(0);
          bbSetInputThresholdMinMax(threshold);
          bbSetOutputOut(NULL);
+
+         bbSetInputOutputFormat("SAME");
+         bbSetInputValue(255);
+
+
   }
 
 // --------------------------------------------------------------
                
        void SegmentationConnectivity::bbUserInitializeProcessing()
        {
+
+               thresh2 = vtkImageThreshold::New();
+                       thresh2->SetInValue(255);
+                       thresh2->SetOutputScalarTypeToUnsignedChar();
+               connect2 = vtkImageSeedConnectivity::New();
+                       connect2->SetInput(thresh2->GetOutput());
+                       connect2->SetInputConnectValue(255);
+                       connect2->SetOutputConnectedValue( 255 );
+                       connect2->SetOutputUnconnectedValue(0);
+               cast4 = vtkImageCast::New();
+                       cast4->SetInput(connect2->GetOutput());
+
+// EED 2016 06 15
+
+/*
                thresh2 = vtkImageThreshold::New();
                        thresh2->SetInValue(255);
                        thresh2->SetOutputScalarTypeToUnsignedShort();
@@ -85,6 +112,8 @@ namespace bbvtk
                cast4 = vtkImageCast::New();
                        cast4->SetInput(connect2->GetOutput());
                        cast4->SetOutputScalarTypeToUnsignedShort();
+*/
+
        }
 
 // --------------------------------------------------------------
@@ -96,11 +125,11 @@ namespace bbvtk
                  thresh2->Delete();
                  thresh2=NULL;
          }
-         if (cast2!=NULL)
-         {
-                 cast2->Delete();
-                 cast2=NULL;
-         }
+//       if (cast2!=NULL)
+//       {
+//               cast2->Delete();
+//               cast2=NULL;
+//       }
          if (connect2!=NULL)
          {
                  connect2->Delete();
@@ -113,10 +142,17 @@ namespace bbvtk
          }  
   }
 
+
+
+
 // --------------------------------------------------------------
                
   void SegmentationConnectivity::DoProcess()
   {
+       int outputformat = bbtkStaticLecture::GetTypeFormat( bbGetInputOutputFormat() , bbGetInputIn() );
+
+
+
     vtkImageData *imagedata = bbGetInputIn();
     imagedata->UpdateInformation();
     imagedata->SetUpdateExtent(imagedata->GetWholeExtent());
@@ -124,8 +160,11 @@ namespace bbvtk
     thresh2->ThresholdBetween(3000, 3001);
     thresh2->SetInput(imagedata);
     thresh2->ThresholdBetween(bbGetInputThresholdMinMax()[0], bbGetInputThresholdMinMax()[1]);
+    thresh2->Modified();
     thresh2->Update();
-    cast2->Update();
+// EED 2016 06 15
+//    cast2->Modified();
+//    cast2->Update();
     connect2->RemoveAllSeeds ();
          
        int x = bbGetInputPositionXYZ()[0];
@@ -146,6 +185,10 @@ namespace bbvtk
          if ( z>=maxz ) {  printf("Warnnig bbtk::vtk::SegmentationConnectivity::DoProcess limites of the image out of range z: %d -> %d \n",y, maxz-1 ); z=maxz-1; }
          
          connect2->AddSeed( x,y,z );
+         connect2->SetOutputConnectedValue( bbGetInputValue() );
+         cast4->SetOutputScalarType( outputformat );
+
+         connect2->Modified();
          connect2->Update();
          cast4->Update();                      
          bbSetOutputOut(cast4->GetOutput() );