#3320 ReadImages box

diff --git a/bbtk/src/bbcreaImageIOReadImages.cxx b/bbtk/src/bbcreaImageIOReadImages.cxx
index 33a7839e7554c2e43e0d1ccf32ff5b3616990c74..8098413d0e98fcb4d148d3e26d697d71a8405b8c 100644 (file)
--- a/bbtk/src/bbcreaImageIOReadImages.cxx
+++ b/bbtk/src/bbcreaImageIOReadImages.cxx
@@ -34,15 +34,23 @@ void ReadImages::Process()
        std::vector<vtkImageData*>                                                      mResults;
        VectorMapInfoDicom                                                                      mResultsDicomAtr;
        creaImageIO::SimpleView                                                         mView;
-       if( mView.readFile(bbGetInputLstNameImages() , bbGetInputDicomTags() , mResultsDicomAtr , mResults)==true )
+  
+       if (bbGetInputActive()==true)
        {
-               bbSetOutputOut( mView.getVolumeSelected( mResults ) );
-               bbSetOutputOutImages( mResults  );
-               bbSetOutputDicomInfo( mResultsDicomAtr  );
+               if( mView.readFile(bbGetInputLstNameImages() , bbGetInputDicomTags() , mResultsDicomAtr , mResults)==true )
+               {
+                       bbSetOutputOut( mView.getVolumeSelected( mResults ) );
+                       bbSetOutputOutImages( mResults  );
+                       bbSetOutputDicomInfo( mResultsDicomAtr  );
+               } else {
+                       bbSetOutputOut( NULL );
+                       printf("EED Warning! ReadImages::Process   Files(s) not found. \n");
+               }// if readFile
        } else {
-               bbSetOutputOut( NULL );
-               printf("EED Warning! ReadImages::Process   Files(s) not found. \n");
-       }// if readFile
+                       bbSetOutputOutImages( mResults  );
+                       bbSetOutputDicomInfo( mResultsDicomAtr  );
+                       bbSetOutputOut( NULL );         
+       }//Active       
 }
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
@@ -52,7 +60,7 @@ void ReadImages::bbUserSetDefaultValues()
 
 //  SET HERE THE DEFAULT INPUT/OUTPUT VALUES OF YOUR BOX 
 //    Here we initialize the input 'In' to 0
-//   bbSetInputIn(0);
+   bbSetInputActive(true);
   
 }
 //===== 

diff --git a/bbtk/src/bbcreaImageIOReadImages.h b/bbtk/src/bbcreaImageIOReadImages.h
index cb2079eece163e4f69cec943da0408ccc3f25479..74e4c0cea3bccb56fff83b228cda11b716b1ee90 100644 (file)
--- a/bbtk/src/bbcreaImageIOReadImages.h
+++ b/bbtk/src/bbcreaImageIOReadImages.h
@@ -24,6 +24,7 @@ class bbcreaImageIO_EXPORT ReadImages
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
 //===== 
+  BBTK_DECLARE_INPUT(Active,bool);
   BBTK_DECLARE_INPUT(DicomTags,std::vector<std::string>);
   BBTK_DECLARE_INPUT(LstNameImages,std::vector<std::string>);
   BBTK_DECLARE_OUTPUT(Out,vtkImageData*);
@@ -42,6 +43,7 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(ReadImages,bbtk::AtomicBlackBox);
   BBTK_DESCRIPTION("No Description.");
   BBTK_CATEGORY("empty");
 
+  BBTK_INPUT(ReadImages,Active,"(default true)  Active true/false",bool,"");
   BBTK_INPUT(ReadImages,DicomTags,"Dicom Tags (vector of Dicom tags ex: D0028_0030  D0020_0037)",std::vector<std::string>,"");
   BBTK_INPUT(ReadImages,LstNameImages,"List path to images",std::vector<std::string>,"");