X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=PackRecalage%2Fbbs%2Fboxes%2FCompareImagesWidget3D.bbs;h=6d2285fcb01881aa9ebee0fc427e0bdcaeef5f7e;hb=5b6e06ea55193ecce4fe2c59b1f3cb698835020b;hp=0ac285b6c8fd7b332483190180494a34cf1883c0;hpb=6b024ba9309731b6ba4591ea2f429aa89de3aa9c;p=creaRigidRegistration.git

diff --git a/PackRecalage/bbs/boxes/CompareImagesWidget3D.bbs b/PackRecalage/bbs/boxes/CompareImagesWidget3D.bbs
index 0ac285b..6d2285f 100644
--- a/PackRecalage/bbs/boxes/CompareImagesWidget3D.bbs
+++ b/PackRecalage/bbs/boxes/CompareImagesWidget3D.bbs
@@ -8,7 +8,6 @@ include itkvtk
 include creaMaracasVisu
 include vtk
 include wx
-include PackRecalage
 include wxvtk
 include std
 
@@ -27,9 +26,6 @@ new vtkImageDataPointerRelay Box23
 new LayoutTab Box26
   set Box26.WinTitle "2D-Compare"
 
-new CompareImagesWidget Box27
-  set Box27.WinTitle "2Dt-Comparing"
-
 new LayoutSplit Box28
   set Box28.Orientation "H"
   set Box28.Proportion "50"
@@ -38,10 +34,14 @@ new LayoutSplit Box28
 new LayoutLine Box29
 
 new IsoSurfaceWidget Box30
-  set Box30.Title "Reference image"
+  set Box30.Colour "1 1 0"
+  set Box30.Title "1. Reference image"
+  set Box30.Vertical "V"
 
 new IsoSurfaceWidget Box31
-  set Box31.Title "Registration image"
+  set Box31.Colour "1 1 1"
+  set Box31.Title "2. Registration image"
+  set Box31.Vertical "V"
 
 new LayoutTab Box38
 
@@ -51,12 +51,36 @@ new MultipleInputs Box19
 
 new vtkImageDataPointerRelay Box20
 
-new CompareImages_3DwithPlanes_Widget Box12
-  set Box12.WinTitle "3D planes Comparing"
+new SphereListWidget Box11
+  set Box11.WinTitle "3. Center Point"
+  set Box11.lstPointX "10 10"
+  set Box11.lstPointY "10 20"
+  set Box11.lstPointZ "10 30"
+
+new LayoutTab Box12
+
+new MagicBox Box13
+
+new GetVectorIntElement Box14
+  set Box14.I "0"
+
+new ConcatStrings Box15
+
+new GetVectorIntElement Box16
+  set Box16.I "1"
+
+new ConcatStrings Box17
+
+new GetVectorIntElement Box18
+  set Box18.I "2"
+
+new ConcatStrings Box21
+
+new ImageVtkProperties Box22
+
+new ConcatStrings Box24
 
 
-connect Box27.Widget Box26.Widget2
-connect Box23.Out Box27.In1
 connect viewerResult.Widget Box28.Widget2
 connect Box28.Widget Box26.Widget1
 connect Box29.Widget Box28.Widget1
@@ -71,19 +95,34 @@ connect Box30.BoxChange Box19.In1
 connect Box31.BoxChange Box19.In2
 connect Box19.BoxChange viewerResult.BoxExecute
 connect Box20.Out viewerResult.In
-connect Box20.Out Box27.In2
 connect Box20.Out Box31.In
-connect Box23.Out Box12.In1
-connect Box20.Out Box12.In2
-connect Box12.Widget Box26.Widget3
+connect Box11.Widget Box12.Widget1
+connect Box12.Widget Box29.Widget3
+connect viewerResult.Renderer1 Box11.Renderer
+connect Box13.Out Box14.In
+connect Box14.Out Box15.In1
+connect Box15.Out Box11.lstPointX
+connect Box16.Out Box17.In1
+connect Box18.Out Box21.In1
+connect Box13.Out Box16.In
+connect Box17.Out Box11.lstPointY
+connect Box13.Out Box18.In
+connect Box21.Out Box11.lstPointZ
+connect Box23.Out Box22.In
+connect Box22.Spacing Box24.In1
+connect Box24.Out Box11.spc
 
 # Complex input ports
 input BoxExecute Box19.In3 " "
 input Image1 Box23.In " "
 input Image2 Box20.In " "
+input CenterPoint Box13.In " "
+input WinTitle Box28.WinTitle " "
 
 # Complex output ports
 output Widget Box26.Widget " "
+output Point viewerResult.Point " "
+output BoxChange viewerResult.BoxChange " "
 
 
 endefine