X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=PackRecalage%2Fbbs%2Fappli%2FExampleRecalage3D1Point.bbs;h=4d791c53db7c98625a388e2348b47e525818a594;hb=9e77cea52961ce9043c8f3e5f86024a1b6588355;hp=c558614dcdc97d6f9edbcce196ca3e370ff6ef03;hpb=398f6fa7e88b0f408e45de17a7dbde5fa964cae4;p=creaRigidRegistration.git

diff --git a/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbs b/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbs
index c558614..4d791c5 100644
--- a/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbs
+++ b/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbs
@@ -8,34 +8,24 @@
 
 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 "5"
-
-new ViewerNV viewer2
-  set viewer2.nTypeView "5"
-
 new LayoutSplit imagesLayout
-  set imagesLayout.Orientation "v"
+  set imagesLayout.Orientation "H"
   set imagesLayout.Proportion "50"
+  set imagesLayout.WinTitle "Input Images"
 
 new LayoutSplit resultLayout
-  set resultLayout.Proportion "70"
-
-new LayoutSplit main
-  set main.Orientation "h"
-  set main.Proportion "25"
-  set main.WinHeight "800"
-  set main.WinWidth "1200"
+  set resultLayout.Proportion "80"
+  set resultLayout.WinTitle "Registration"
 
 new vtkImageDataPointerRelay Box22
 
@@ -60,27 +50,23 @@ new LayoutTab Box13
 new CompareImagesWidget Box14
   set Box14.WinTitle "2D+t"
 
+new LayoutTab Box15
+  set Box15.WinHeight "800"
+  set Box15.WinWidth "1200"
 
-connect viewer.Widget imagesLayout.Widget1
-
-connect viewer2.Widget imagesLayout.Widget2
-
-connect imagesLayout.Widget main.Widget1
+new LoadHola Box27
 
-connect resultLayout.Widget main.Widget2
+new Getting3D1Point Box28
+  set Box28.Title "Move Image"
 
-connect Box22.Out viewer2.In
+new Getting3D1Point Box29
+  set Box29.Title "Fix Image"
 
-connect Box24.Out Box22.In
+new MultipleInputs Box26
 
-connect Box23.Out viewer.In
-
-connect Box25.Out Box23.In
 
 connect Box22.Out Box52.Image1
 
-connect Box23.Out Box52.Image2
-
 connect Box52.Out Box20.Image2
 
 connect Box52.BoxChange Box20.BoxExecute
@@ -107,7 +93,37 @@ connect Box23.Out Box14.In1
 
 connect Box52.BoxChange Box13.BoxExecute
 
+connect imagesLayout.Widget Box15.Widget1
+
+connect resultLayout.Widget Box15.Widget2
+
+connect Box20.Point Box11.Point
+
+connect Box20.BoxChange Box11.BoxExecute
+
+connect Box27.Out Box22.In
+
+connect Box27.Out Box23.In
+
+connect Box29.Widget imagesLayout.Widget1
+
+connect Box28.Widget imagesLayout.Widget2
+
+connect Box27.Out Box29.Image
+
+connect Box27.Out Box28.Image
+
+connect Box29.BoxChange Box26.In1
+
+connect Box28.BoxChange Box26.In2
+
+connect Box26.BoxChange Box52.BoxExecute
+
+connect Box29.Point Box52.CenterPoint
+
+connect Box28.Point Box52.OriginPoint
+
 
 
 # Complex input ports
-exec main
+exec Box15