From: jean-pierre roux Date: Thu, 29 Apr 2010 08:18:57 +0000 (+0000) Subject: Now LoadHola is called a 'reader' everywhere, not an 'image' X-Git-Tag: CREATOOLS.2-0-3~23 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=2125d1ce2b22c7b6a9a13ffd0b6a3191e9d97cb0;p=creaMaracasVisu.git Now LoadHola is called a 'reader' everywhere, not an 'image' --- diff --git a/bbtk/bbs/appli/exampleCutModule.bbs b/bbtk/bbs/appli/exampleCutModule.bbs index 0b9c231..8520993 100644 --- a/bbtk/bbs/appli/exampleCutModule.bbs +++ b/bbtk/bbs/appli/exampleCutModule.bbs @@ -10,25 +10,23 @@ load creaMaracasVisu load std load wx +new LoadHola reader -new LoadHola image #new FileSelector openFileDialog # set openFileDialog.Wildcard "(*.mhd)|*.mhd" -#new MetaImageReader image1 -# connect openFileDialog.Out image1.In +#new MetaImageReader reader1 +# connect openFileDialog.Out reader1.In #new ImageCastToUShort image -# connect image1.Out image.In +# connect reader1.Out image.In - -#new ViewerMPR view1 new ViewerNV view1 set view1.nTypeView "6" - connect image.Out view1.In + connect reader.Out view1.In new CutModule cut connect view1.Interactor1 cut.Interactor connect view1.Renderer1 cut.Renderer - connect image.Out cut.In + connect reader.Out cut.In new ViewerNV view2 set view2.nTypeView "6" diff --git a/bbtk/bbs/appli/examplePlaneNPoints.bbs b/bbtk/bbs/appli/examplePlaneNPoints.bbs index c1b0625..9dcbe7a 100644 --- a/bbtk/bbs/appli/examplePlaneNPoints.bbs +++ b/bbtk/bbs/appli/examplePlaneNPoints.bbs @@ -9,15 +9,15 @@ load creaMaracasVisu load std load wx -//new LoadHola image +//new LoadHola reader new FileSelector openFileDialog set openFileDialog.Wildcard "(*.mhd)|*.mhd" -new MetaImageReader image - connect openFileDialog.Out image.In +new MetaImageReader reader + connect openFileDialog.Out reader.In new ImagePlanes planes -connect image.Out planes.In +connect reader.Out planes.In #new Viewer3D viewer @@ -30,18 +30,18 @@ connect image.Out planes.In #set viewer.WinHeight 400 new TransferFunctionView transferfunc - connect image.Out transferfunc.In + connect reader.Out transferfunc.In new ViewerNV viewernv set viewernv.nTypeView "6 1 2 0" #set viewernv.nTypeView "6" - connect image.Out viewernv.In + connect reader.Out viewernv.In connect transferfunc.ColorFunction viewernv.ColorFunction connect transferfunc.WindowLevel viewernv.WindowLevel connect transferfunc.ColorLevel viewernv.ColorLevel new ShowNPoints showpoints - connect image.Out showpoints.Image + connect reader.Out showpoints.Image connect showpoints.lstPointsX planes.PointsX connect showpoints.lstPointsY planes.PointsY connect showpoints.lstPointsZ planes.PointsZ diff --git a/bbtk/bbs/appli/examplePlanesViewerNV_01.bbs b/bbtk/bbs/appli/examplePlanesViewerNV_01.bbs index f89dd9b..0055044 100644 --- a/bbtk/bbs/appli/examplePlanesViewerNV_01.bbs +++ b/bbtk/bbs/appli/examplePlanesViewerNV_01.bbs @@ -6,13 +6,13 @@ include vtk/boxes/bbLoadHola load vtk load creaMaracasVisu -new LoadHola image +new LoadHola reader new ImagePlanes planes new ViewerNV viewer -connect image.Out viewer.In +connect reader.Out viewer.In set viewer.nTypeView "7" -connect image.Out planes.In +connect reader.Out planes.In connect viewer.Interactor1 planes.Interactor load std @@ -21,4 +21,4 @@ set viewer.WinWidth 350 set viewer.WinHeight 400 #set viewer.Slice 20 -exec planes \ No newline at end of file +exec planes diff --git a/bbtk/bbs/appli/examplePlanesViewerNV_02.bbs b/bbtk/bbs/appli/examplePlanesViewerNV_02.bbs index b06d633..60ebe9e 100644 --- a/bbtk/bbs/appli/examplePlanesViewerNV_02.bbs +++ b/bbtk/bbs/appli/examplePlanesViewerNV_02.bbs @@ -6,12 +6,12 @@ include vtk/boxes/bbLoadHola load vtk load creaMaracasVisu -new LoadHola image +new LoadHola reader new ImagePlanes planes new ViewerNV viewer -connect image.Out viewer.In +connect reader.Out viewer.In set viewer.nTypeView "6" -connect image.Out planes.In +connect reader.Out planes.In connect planes.PlaneX viewer.Obs1 connect planes.PlaneY viewer.Obs2 connect planes.PlaneZ viewer.Obs3 @@ -22,4 +22,4 @@ set viewer.WinWidth 350 set viewer.WinHeight 400 #set viewer.Slice 20 -exec viewer \ No newline at end of file +exec viewer diff --git a/bbtk/bbs/appli/exampleShowNPoints.bbs b/bbtk/bbs/appli/exampleShowNPoints.bbs index e353a3f..cf6a07c 100644 --- a/bbtk/bbs/appli/exampleShowNPoints.bbs +++ b/bbtk/bbs/appli/exampleShowNPoints.bbs @@ -14,6 +14,21 @@ include wx load itkvtk load creaMaracasVisu + + +# Use new box (choose the way you want to select images) +# ----------------------------------------------------- +load creaImageIO +new ImagesReader chooser + +# Concatenate all the supposed-to-be consistent 2D images into a single vtkImageData +# WARNING : File names alphabetical order is suposed to be meaningful ... + +new ConcatImages reader + connect chooser.Out reader.In + + + # Here loads hola.mhd # ------------------------- /* @@ -32,10 +47,10 @@ new MetaImageReader reader # uncomment next lines to use Gimmick # ----------------------------------- - +/* load creaImageIO new Gimmick reader - +*/ new ViewerNV viewer connect reader.Out viewer.In diff --git a/bbtk/bbs/appli/exampleViewerMPR.bbs_bug b/bbtk/bbs/appli/exampleViewerMPR.bbs_bug index c76eadd..211e05d 100644 --- a/bbtk/bbs/appli/exampleViewerMPR.bbs_bug +++ b/bbtk/bbs/appli/exampleViewerMPR.bbs_bug @@ -8,9 +8,9 @@ load vtk load creaMaracasVisu include vtk/boxes/bbLoadHola -new LoadHola image +new LoadHola reader new ViewerMPR mpr - connect image.Out mpr.In + connect reader.Out mpr.In -exec mpr \ No newline at end of file +exec mpr diff --git a/bbtk/bbs/appli/exampleViewerNV_A.bbs b/bbtk/bbs/appli/exampleViewerNV_A.bbs index 2181be6..ce51f03 100644 --- a/bbtk/bbs/appli/exampleViewerNV_A.bbs +++ b/bbtk/bbs/appli/exampleViewerNV_A.bbs @@ -8,10 +8,10 @@ load vtk load creaMaracasVisu include vtk/boxes/bbLoadHola -new LoadHola image +new LoadHola reader new ViewerNV viewernv - connect image.Out viewernv.In + connect reader.Out viewernv.In exec viewernv diff --git a/bbtk/bbs/appli/exampleViewerNV_B.bbs b/bbtk/bbs/appli/exampleViewerNV_B.bbs index f1d9cff..4589006 100644 --- a/bbtk/bbs/appli/exampleViewerNV_B.bbs +++ b/bbtk/bbs/appli/exampleViewerNV_B.bbs @@ -8,11 +8,11 @@ load vtk load creaMaracasVisu include vtk/boxes/bbLoadHola -new LoadHola image +new LoadHola reader new ViewerNV viewernv set viewernv.nTypeView "-1 1" - connect image.Out viewernv.In + connect reader.Out viewernv.In exec viewernv diff --git a/bbtk/bbs/appli/exampleViewerNV_C.bbs b/bbtk/bbs/appli/exampleViewerNV_C.bbs index 046d2fd..1a1038d 100644 --- a/bbtk/bbs/appli/exampleViewerNV_C.bbs +++ b/bbtk/bbs/appli/exampleViewerNV_C.bbs @@ -8,11 +8,11 @@ load vtk load creaMaracasVisu include vtk/boxes/bbLoadHola -new LoadHola image +new LoadHola reader new ViewerNV viewernv set viewernv.nTypeView "3" - connect image.Out viewernv.In + connect reader.Out viewernv.In exec viewernv