X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaRigidRegistration.git;a=blobdiff_plain;f=PackRecalage%2Fbbs%2Fboxes%2FGetting3D1Point.bbs;h=aa38cd41de1bb8d8f019239f38bce75f903d2265;hp=aeeca018603e86a1701b9c89d250c8e4eed3dc20;hb=5b6e06ea55193ecce4fe2c59b1f3cb698835020b;hpb=9e77cea52961ce9043c8f3e5f86024a1b6588355

diff --git a/PackRecalage/bbs/boxes/Getting3D1Point.bbs b/PackRecalage/bbs/boxes/Getting3D1Point.bbs
index aeeca01..aa38cd4 100644
--- a/PackRecalage/bbs/boxes/Getting3D1Point.bbs
+++ b/PackRecalage/bbs/boxes/Getting3D1Point.bbs
@@ -11,6 +11,7 @@ include wx
 include toolsbbtk
 include wxvtk
 include std
+include PackRecalage
 
 define Getting3D1Point PackRecalage
 
@@ -29,10 +30,12 @@ new LayoutTab Box16
 new ImageVtkPropertiesWidget Box21
 
 new IsoSurfaceWidget Box05
-  set Box05.Title "Surface"
+  set Box05.Colour "1 1 0"
+  set Box05.Title "2. Surface"
   set Box05.Vertical "V"
 
 new ShowNPoints Box08
+  set Box08.Colour "0.32 0.12 0.12"
   set Box08.Type "1"
   set Box08.WinTitle "Point select"
 
@@ -50,7 +53,7 @@ new LayoutTab Box14
 new LayoutLine Box17
 
 new LayoutLine Box18
-  set Box18.WinTitle "Point selected"
+  set Box18.WinTitle "3. Point selected"
 
 new ConcatStrings Box19
   set Box19.In2 " "
@@ -58,6 +61,18 @@ new ConcatStrings Box19
 
 new OutputText Box20
 
+new ImageCenter Box22
+
+new Filter3DPointVector Box24
+
+new ConcatStrings Box26
+
+new LayoutLine Box27
+  set Box27.WinTitle "1. Image Properties"
+
+new ConcatStrings Box28
+  set Box28.In1 "Selected Point: "
+
 
 connect Box23.Out viewer.In
 connect Box23.Out Box21.in
@@ -69,22 +84,28 @@ connect viewer.Point Box08.In
 connect viewer.Renderer1 Box08.Renderer
 connect Box23.Out Box08.Image
 connect Box05.Widget Box13.Widget1
-connect Box21.widget Box14.Widget1
-connect Box10.Widget Box12.Widget1
 connect Box13.Widget Box12.Widget2
-connect Box14.Widget Box12.Widget3
 connect viewer.Widget Box11.Widget2
 connect Box12.Widget Box11.Widget1
 connect Box11.Widget Box17.Widget1
 connect Box17.Widget Box16.Widget1
-connect Box08.Widget Box18.Widget1
 connect Box18.Widget Box10.Widget1
 connect Box08.lstPointsX Box19.In1
 connect Box08.lstPointsY Box19.In3
 connect Box08.lstPointsZ Box19.In5
-connect Box19.Out Box20.In
-connect Box20.Widget Box18.Widget2
 connect Box08.BoxChange Box20.BoxExecute
+connect Box23.Out Box22.In
+connect Box19.Out Box24.In
+connect Box22.Point Box24.Initial
+connect Box24.Out Box26.In1
+connect Box21.widget Box27.Widget1
+connect Box27.Widget Box14.Widget1
+connect Box10.Widget Box12.Widget3
+connect Box14.Widget Box12.Widget1
+connect Box08.Widget Box18.Widget1
+connect Box20.Widget Box18.Widget2
+connect Box19.Out Box28.In2
+connect Box28.Out Box20.In
 
 # Complex input ports
 input Image Box23.In " "
@@ -92,7 +113,7 @@ input Title Box17.WinTitle " "
 
 # Complex output ports
 output Widget Box16.Widget " "
-output Point Box19.Out " "
+output Point Box26.Out " "
 output BoxChange Box08.BoxChange " "