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 0b9c23154d4b24e601e31364c764fa0ec34e9e89..8520993d694a460b9f539cb717365f9fdcc2b3e6 100644 (file)
--- 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 c1b06250abf555a6db5a0d45fa541c647aa18874..9dcbe7a2eb47b0b1ee6f38a146bfddd15afe40c1 100644 (file)
--- 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 f89dd9bfe91c38c6d4e1833a54bc8bbf8117ba5f..005504479e5b86a5a07227f083d8e361796c624d 100644 (file)
--- 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 b06d6334a83358ca822b3420196ba69f6f1082c3..60ebe9e9ebd199fc4461e3b1d634cfe86b4a3997 100644 (file)
--- 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 e353a3f38a732cdf57a1b7e59e8746cf029b7fb9..cf6a07cd372ba79826c0ff8e4fbfa3eb1f7d30d8 100644 (file)
--- 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 c76eadd5bc6764c36b0eab0bc8c2437904685e25..211e05d2976c3e6e2be945854ea8b6f643230f1f 100644 (file)
--- 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 2181be63ed7373a58505c47eac1074972935eb21..ce51f037d6d529784359d7013bbf7f30aa7276ce 100644 (file)
--- 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 f1d9cff8920e4c83e22020ad68d9d604a9bada15..45890062d002f301e5d20e66ce5136964b7c7e12 100644 (file)
--- 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 046d2fd8f169ad490b4c5b4c33f2804af9376335..1a1038d705862749f70348b6783dbdf5b6f1641b 100644 (file)
--- 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