From: Eduardo DAVILA Date: Fri, 2 Jun 2023 09:06:09 +0000 (+0200) Subject: N#3508 IFTI read multiple images X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=214731ac3153629b08ce03f440500b20f5cda35d;p=creaVtk.git N#3508 IFTI read multiple images --- diff --git a/bbtk_creaVtk_PKG/.DS_Store b/bbtk_creaVtk_PKG/.DS_Store index 220c1c2..041e49f 100644 Binary files a/bbtk_creaVtk_PKG/.DS_Store and b/bbtk_creaVtk_PKG/.DS_Store differ diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkMarchingCubes2.h b/bbtk_creaVtk_PKG/src/bbcreaVtkMarchingCubes2.h index b4d44c4..21fcca2 100644 --- a/bbtk_creaVtk_PKG/src/bbcreaVtkMarchingCubes2.h +++ b/bbtk_creaVtk_PKG/src/bbcreaVtkMarchingCubes2.h @@ -40,7 +40,7 @@ class bbcreaVtk_EXPORT MarchingCubes2 BBTK_BEGIN_DESCRIBE_BLACK_BOX(MarchingCubes2,bbtk::AtomicBlackBox); BBTK_NAME("MarchingCubes2"); BBTK_AUTHOR("InfoDev"); - BBTK_DESCRIPTION("No Description."); + BBTK_DESCRIPTION("No Description. (JavaScript)"); BBTK_CATEGORY("empty"); BBTK_INPUT(MarchingCubes2,Active,"(default true) Active",bool,""); diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkNIFTIImageReader.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkNIFTIImageReader.cxx index fbb3ebb..42ebdd5 100644 --- a/bbtk_creaVtk_PKG/src/bbcreaVtkNIFTIImageReader.cxx +++ b/bbtk_creaVtk_PKG/src/bbcreaVtkNIFTIImageReader.cxx @@ -32,45 +32,47 @@ void NIFTIImageReader::Process() // bbSetOutputOut( bbGetInputIn() ); // std::cout << "Output value = " < lstImages; - std::vector lstImages; + if ( bbGetInputFileNames().size()>0 ) + { + if (bbGetInputType()==0) + { + vtkNIFTIImageReader* reader=vtkNIFTIImageReader::New(); + if ( bbGetInputFileNames().size()==1) + { + reader->SetFileName( bbGetInputFileNames()[0].c_str() ); + reader->Update(); + } else { + vtkStringArray *lstFileNames=vtkStringArray::New(); + int i,size=bbGetInputFileNames().size(); + for (i=0;iInsertNextValue( bbGetInputFileNames()[i].c_str() ); + } // for i + reader->SetFileNames( lstFileNames ); + reader->Update(); + } // FileNames + lstImages.push_back( reader->GetOutput() ); + } // Type 0 - if (bbGetInputType()==0) - { - vtkNIFTIImageReader* reader=vtkNIFTIImageReader::New(); - if ( bbGetInputFileNames().size()==1) - { - reader->SetFileName( bbGetInputFileNames()[0].c_str() ); - reader->Update(); - } else { - vtkStringArray *lstFileNames=vtkStringArray::New(); - int i,size=bbGetInputFileNames().size(); - for (i=0;iInsertNextValue( bbGetInputFileNames()[i].c_str() ); - } // for i - reader->SetFileNames( lstFileNames ); - reader->Update(); - } // FileNames - lstImages.push_back( reader->GetOutput() ); - } // Type 0 - - if (bbGetInputType()==1) - { - int i,size=bbGetInputFileNames().size(); - for (i=0;iSetFileName( bbGetInputFileNames()[i].c_str() ); - reader->Update(); - lstImages.push_back( reader->GetOutput() ); - } // for i - } // Type 1 + if (bbGetInputType()==1) + { + int i,size=bbGetInputFileNames().size(); + for (i=0;iSetFileName( bbGetInputFileNames()[i].c_str() ); + reader->Update(); + lstImages.push_back( reader->GetOutput() ); + } // for i + } // Type 1 + } // if if (lstImages.size()>=1) { bbSetOutputOut( lstImages[0] ); } else {bbSetOutputOut( NULL ); } bbSetOutputOutVector( lstImages ); + } //===== // 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)