From 214731ac3153629b08ce03f440500b20f5cda35d Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Fri, 2 Jun 2023 11:06:09 +0200 Subject: [PATCH] N#3508 IFTI read multiple images --- bbtk_creaVtk_PKG/.DS_Store | Bin 6148 -> 8196 bytes .../src/bbcreaVtkMarchingCubes2.h | 2 +- .../src/bbcreaVtkNIFTIImageReader.cxx | 68 +++++++++--------- 3 files changed, 36 insertions(+), 34 deletions(-) diff --git a/bbtk_creaVtk_PKG/.DS_Store b/bbtk_creaVtk_PKG/.DS_Store index 220c1c2cdfc67b69cd7b97f6d1a94f5743e0a976..041e49fd4f90ee4e9cc1d0577b3467ea8abf6373 100644 GIT binary patch literal 8196 zcmeHMOK=oL818Qp$jpRD2MA=AN4AJaDkQK8NDTPMlShGuV)G)PVRvUBBa@l1GrIv( z(Ri~2q11~9_25Ac_$WOndZfyW9<0I?f~5z`^5n$}s29t>r)PNtaA(V?n`al#}SAl@IXdDydRQu3EC0S8A-!e2X$cyK(w61 zVWTk@1ER@@c0_bWQqoX^bR{ZX5tSH_?j%n}b{!F&kyN@fM8yZ9nGsbe2xq7JCqr|F z4oTxajzAoNJ0l=!_cG?QJj-P#Z>`@Q+YeHy%TUV77c8t$E7VH$+4Pt<%y}O zw)V%GlAE_|nQlr>wWLz*P05y2YifF0Q)}usZQnn7%o%sR({c-lUIVOZ&X!)gxgXQd zIayktFpai&gk*C>j$iDSUoDisvlDXHS4z9q^h%?DU{D|BONz9$zKOv0Tz}BY`$R|i zVxK~=JLkFk@|MsKd|dacJ0{HH(T}4VqU#O*GDLDZeSm=t^B~G zZ3bfpGJei-P1`*>RJ46N>sbA6X56YqlcvosUr}3SB#c!h)m#^q*Q>*YtbM#-2PeZh z*3=pLA(IyIv}cN0O#ZQ|g_`<0!#F53-Fb_8Q&mIp`UXSq_h}zI6B#x&>w5n&dg9!t zC5VN$wCcuylgU~RH#OLQpl`x* z!6VaDEW#Dc(k?8K}y-zuDb&<@1rORs8 z)HgJ@Qf}Npi-cDRQMckW1m|s#4#62d&^f>o`C=qi>Z|9=mjObxbwU-%#Ve$BQeUeQ zs`&!RuG816glE1`vWYc8&6dmrHh~{)DD+ z7BY#(M5n6qe*wn#*m?E|`+|K%VEmr_$bM$O699nNpbEb z)Qai6>v--_l9YgXyK&6jvj~*QJJ*W(zjyxc|MzVE_{MPr;t1UT2%x+t-P1+unC}fN zYV9Olhv^bc*v&{9x=~G5$j@h4h}(PkWQdtZXn?b#BCc3zcWwfm(k?}={o?#43lkm TqtDzVk 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) -- 2.45.1