X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=PackRecalage%2Fbbs%2Fappli%2FExampleRecalage3D1Point.bbs;h=084eb67fe67f2673f91999fd4e8eb9096aa96794;hb=5b6e06ea55193ecce4fe2c59b1f3cb698835020b;hp=03e6efc84c53d5ca55981aa5578545c0d1d3610b;hpb=b03f28518ed0d92d1513a10f7e2d1041185bad8f;p=creaRigidRegistration.git

diff --git a/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbs b/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbs
index 03e6efc..084eb67 100644
--- a/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbs
+++ b/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbs
@@ -8,45 +8,42 @@
 
 include std
 include itkvtk
-include creaMaracasVisu
 include wx
 include vtk
 include creaImageIO
 include PackRecalage
+include std
 
 author "info-dev@creatis.insa-lyon.fr"
 description "Recalage3D 1-point"
 category "example"
 
-new ViewerNV viewer
-  set viewer.nTypeView "6 1 2 0"
-
-new ViewerNV viewer2
-  set viewer2.nTypeView "6 1 2 0"
-
 new LayoutSplit imagesLayout
   set imagesLayout.Orientation "H"
   set imagesLayout.Proportion "50"
-  set imagesLayout.WinTitle "Input Images"
+  set imagesLayout.WinTitle "1. Input Images"
 
 new LayoutSplit resultLayout
   set resultLayout.Proportion "80"
-  set resultLayout.WinTitle "Registration"
+  set resultLayout.WinTitle "2. Registration"
 
 new vtkImageDataPointerRelay Box22
 
 new vtkImageDataPointerRelay Box23
 
 new ImagesChooserDialogBox Box24
+  set Box24.Title "Fix Image"
 
 new ImagesChooserDialogBox Box25
+  set Box25.Title "Move Image"
 
 new Recalage3D1PointWidget Box52
 
 new CompareImagesWidget3D Box20
+  set Box20.WinTitle "1. Compare 3D"
 
 new CompareImages_3DwithPlanes_Widget Box11
-  set Box11.WinTitle "3D Planes"
+  set Box11.WinTitle "2. Planes 3D"
 
 new LayoutSplit Box12
   set Box12.Orientation "H"
@@ -60,25 +57,19 @@ new LayoutTab Box15
   set Box15.WinHeight "800"
   set Box15.WinWidth "1200"
 
-new LayoutTab Box16
-
-new LayoutTab Box17
+new LoadHola Box27
 
-new LayoutLine Box18
-  set Box18.WinTitle "Move Image"
+new Getting3D1Point Box28
+  set Box28.Title "2. Move Image"
 
-new LayoutLine Box19
-  set Box19.WinTitle "Fix Image"
+new Getting3D1Point Box29
+  set Box29.Title "1. Fix Image"
 
+new MultipleInputs Box26
 
-connect Box22.Out viewer2.In
-
-connect Box23.Out viewer.In
 
 connect Box22.Out Box52.Image1
 
-connect Box23.Out Box52.Image2
-
 connect Box52.Out Box20.Image2
 
 connect Box52.BoxChange Box20.BoxExecute
@@ -109,25 +100,33 @@ connect imagesLayout.Widget Box15.Widget1
 
 connect resultLayout.Widget Box15.Widget2
 
-connect Box16.Widget imagesLayout.Widget1
+connect Box20.Point Box11.Point
+
+connect Box20.BoxChange Box11.BoxExecute
 
-connect Box17.Widget imagesLayout.Widget2
+connect Box27.Out Box22.In
 
-connect viewer2.Widget Box18.Widget1
+connect Box27.Out Box23.In
 
-connect Box18.Widget Box17.Widget1
+connect Box29.Widget imagesLayout.Widget1
 
-connect viewer.Widget Box19.Widget1
+connect Box28.Widget imagesLayout.Widget2
 
-connect Box19.Widget Box16.Widget1
+connect Box27.Out Box29.Image
 
-connect Box20.Point Box11.Point
+connect Box27.Out Box28.Image
 
-connect Box20.BoxChange Box11.BoxExecute
+connect Box29.BoxChange Box26.In1
+
+connect Box28.BoxChange Box26.In2
+
+connect Box26.BoxChange Box52.BoxExecute
+
+connect Box29.Point Box52.CenterPoint
 
-connect Box24.Out Box22.In
+connect Box28.Point Box52.OriginPoint
 
-connect Box25.Out Box23.In
+connect Box29.Point Box20.CenterPoint