registration widget

diff --git a/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbg b/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbg
index ad8b3efebfd4cc543cb9094aed82460f89778852..ff4926a33dbcfa7dee12a4462856b6c53bbf965f 100644 (file)
--- a/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbg
+++ b/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /home/davila/Creatis/All/creatools_source/creaRigidRegistration/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbg
+# - /home/davila/Creatis/All/creatools_source/creaRigidRegistration/PackRecalage/bbs/appli/ExampleRecalage3D1Point_3a.bbg
 # ----------------------------------
 
 APP_START
@@ -9,178 +9,46 @@ DESCRIPTION:Recalage3D 1-point
 AUTHOR:info-dev@creatis.insa-lyon.fr
 COMPLEXBOX:FALSE
 COMPLEXINPUTS:0
-BOXES:39
+BOXES:11
 BOX
 creaMaracasVisu:ViewerNV:viewer
 ISEXEC:FALSE
-90.360135:-42.468343:-900.000000
-151.000135:-52.468343:-900.000000
+-78.223439:-100.062703:-900.000000
+-17.583439:-110.062703:-900.000000
 PORT
 nTypeView:"5"
 FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:viewer2
 ISEXEC:FALSE
--45.086058:-20.661012:-900.000000
-15.553942:-30.661012:-900.000000
-PORT
-nTypeView:"5"
-FIN_BOX
-BOX
-wx:Slider:sdrAngleX
-ISEXEC:FALSE
--153.088264:-26.096799:-900.000000
--101.688264:-36.096799:-900.000000
-PORT
-In:"0"
-PORT
-Max:"180"
-PORT
-Min:"-180"
-PORT
-Title:"Rotation angle in X Axis"
-FIN_BOX
-BOX
-wx:Slider:sdrAngleY
-ISEXEC:FALSE
--124.807150:-48.145742:-900.000000
--73.407150:-58.145742:-900.000000
-PORT
-In:"0"
-PORT
-Max:"180"
-PORT
-Min:"-180"
-PORT
-Title:"Rotation angle in Y Axis"
-FIN_BOX
-BOX
-wx:Slider:sdrAngleZ
-ISEXEC:FALSE
--122.668078:-72.632880:-900.000000
--71.268078:-82.632880:-900.000000
-PORT
-In:"0"
-PORT
-Max:"180"
-PORT
-Min:"-180"
-PORT
-Title:"Rotation angle in Z Axis"
-FIN_BOX
-BOX
-wx:Slider:sdrScaleX
-ISEXEC:FALSE
--238.911928:-38.853711:-900.000000
--187.511928:-48.853711:-900.000000
-PORT
-In:"100"
-PORT
-Max:"300"
-PORT
-Min:"10"
-PORT
-Title:"Scale in X Axis"
-FIN_BOX
-BOX
-wx:Slider:sdrScaleY
-ISEXEC:FALSE
--251.610900:-55.346663:-900.000000
--200.210900:-65.346663:-900.000000
-PORT
-In:"100"
-PORT
-Max:"300"
-PORT
-Min:"10"
-PORT
-Title:"Scale in Y Axis"
-FIN_BOX
-BOX
-wx:Slider:sdrScaleZ
-ISEXEC:FALSE
--221.246429:-71.526605:-900.000000
--169.846429:-81.526605:-900.000000
-PORT
-In:"100"
-PORT
-Max:"300"
-PORT
-Min:"10"
-PORT
-Title:"Scale in Z Axis"
-FIN_BOX
-BOX
-PackRecalage:Transform3D1PointBox:transform
-ISEXEC:FALSE
--82.895553:-211.980656:-900.000000
--11.720553:-221.980656:-900.000000
-FIN_BOX
-BOX
-PackRecalage:ReSlicerBox:reslicer
-ISEXEC:FALSE
-9.868770:-240.662296:-900.000000
-55.443770:-250.662296:-900.000000
-FIN_BOX
-BOX
-std:MultipleInputs:mult
-ISEXEC:FALSE
-34.133463:-99.687937:-900.000000
-79.708463:-109.687937:-900.000000
-FIN_BOX
-BOX
-std:MultipleInputs:mult2
-ISEXEC:FALSE
--306.113269:-114.895249:-900.000000
--260.538269:-124.895249:-900.000000
-FIN_BOX
-BOX
-std:MultipleInputs:mult3
-ISEXEC:FALSE
--7.207547:-159.189958:-900.000000
-38.367453:-169.189958:-900.000000
-FIN_BOX
-BOX
-creaMaracasVisu:ViewerNV:viewerResult
-ISEXEC:FALSE
-225.201963:-265.292080:-900.000000
-285.841963:-275.292080:-900.000000
+-9.071012:-101.575424:-900.000000
+51.568988:-111.575424:-900.000000
 PORT
 nTypeView:"5"
 FIN_BOX
 BOX
 wx:LayoutSplit:imagesLayout
 ISEXEC:FALSE
--40.421850:-472.113974:-900.000000
-5.153150:-482.113974:-900.000000
+-13.395914:-119.626520:-900.000000
+32.179086:-129.626520:-900.000000
 PORT
 Orientation:"v"
 PORT
 Proportion:"50"
 FIN_BOX
 BOX
-wx:LayoutLine:toolsLayout
-ISEXEC:FALSE
--280.858190:-208.062393:-900.000000
--223.298190:-218.062393:-900.000000
-PORT
-Orientation:"v"
-PORT
-WinTitle:"Rotation"
-FIN_BOX
-BOX
 wx:LayoutSplit:resultLayout
 ISEXEC:FALSE
-41.826255:-473.243255:-900.000000
-87.401255:-483.243255:-900.000000
+78.551776:-103.401289:-900.000000
+124.126776:-113.401289:-900.000000
 PORT
 Proportion:"70"
 FIN_BOX
 BOX
 wx:LayoutSplit:main
 ISEXEC:TRUE
--3.260949:-500.894082:-900.000000
-42.314051:-510.894082:-900.000000
+28.141037:-139.355096:-900.000000
+73.716037:-149.355096:-900.000000
 PORT
 Orientation:"h"
 PORT
@@ -193,223 +61,40 @@ FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box22
 ISEXEC:FALSE
--80.407015:12.725826:-900.000000
--9.232015:2.725826:-900.000000
+-26.597823:27.085923:-900.000000
+44.577177:17.085923:-900.000000
 FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box23
 ISEXEC:FALSE
-78.836417:-15.052381:-900.000000
-150.011417:-25.052381:-900.000000
+49.827351:27.600195:-900.000000
+121.002351:17.600195:-900.000000
 FIN_BOX
 BOX
 creaImageIO:ImagesChooserDialogBox:Box24
 ISEXEC:FALSE
--44.746941:47.713068:-900.000000
-26.428059:37.713068:-900.000000
+-26.429081:60.271568:-900.000000
+44.745919:50.271568:-900.000000
 FIN_BOX
 BOX
 creaImageIO:ImagesChooserDialogBox:Box25
 ISEXEC:FALSE
-66.270272:48.049484:-900.000000
-137.445272:38.049484:-900.000000
-FIN_BOX
-BOX
-wx:LayoutTab:Box26
-ISEXEC:FALSE
-75.709436:-446.477577:-900.000000
-133.269436:-456.477577:-900.000000
-PORT
-WinTitle:"2D-Compare"
-FIN_BOX
-BOX
-PackRecalage:CompareImagesWidget:Box27
-ISEXEC:FALSE
-30.818476:-420.063285:-900.000000
-101.993476:-430.063285:-900.000000
-PORT
-WinTitle:"2D-Comparing"
-FIN_BOX
-BOX
-wx:LayoutSplit:Box28
-ISEXEC:FALSE
-199.046104:-426.771380:-900.000000
-244.621104:-436.771380:-900.000000
-PORT
-Orientation:"H"
-PORT
-Proportion:"50"
-PORT
-WinTitle:"3D-Comparing"
-FIN_BOX
-BOX
-wx:LayoutLine:Box29
-ISEXEC:FALSE
-135.414196:-398.280657:-900.000000
-192.974196:-408.280657:-900.000000
-FIN_BOX
-BOX
-wxvtk:IsoSurfaceWidget:Box30
-ISEXEC:FALSE
-114.262492:-316.339524:-900.000000
-159.837492:-326.339524:-900.000000
-PORT
-Title:"Reference image"
-FIN_BOX
-BOX
-wxvtk:IsoSurfaceWidget:Box31
-ISEXEC:FALSE
-187.729941:-322.707814:-900.000000
-233.304941:-332.707814:-900.000000
-PORT
-Title:"Registration image"
-FIN_BOX
-BOX
-wx:LayoutTab:Box32
-ISEXEC:FALSE
--239.056959:-330.032399:-900.000000
--181.496959:-340.032399:-900.000000
-FIN_BOX
-BOX
-wx:LayoutLine:Box33
-ISEXEC:FALSE
--210.800488:-207.744386:-900.000000
--153.240488:-217.744386:-900.000000
-PORT
-WinTitle:"Scale"
-FIN_BOX
-BOX
-wx:Slider:TranslateZ
-ISEXEC:FALSE
--178.833568:35.008744:-900.000000
--127.433568:25.008744:-900.000000
-FIN_BOX
-BOX
-wx:Slider:TranslateY
-ISEXEC:FALSE
--198.558287:50.632292:-900.000000
--147.158287:40.632292:-900.000000
-FIN_BOX
-BOX
-wx:Slider:TranslateX
-ISEXEC:FALSE
--220.976208:67.939091:-900.000000
--169.576208:57.939091:-900.000000
-FIN_BOX
-BOX
-wx:LayoutLine:Box37
-ISEXEC:FALSE
--144.549789:-208.672448:-900.000000
--86.989789:-218.672448:-900.000000
-PORT
-WinTitle:"Translate"
-FIN_BOX
-BOX
-wx:LayoutTab:Box38
-ISEXEC:FALSE
-134.239380:-364.807837:-900.000000
-191.799380:-374.807837:-900.000000
-FIN_BOX
-BOX
-wx:LayoutTab:Box39
-ISEXEC:FALSE
-71.124395:-366.016312:-900.000000
-128.684395:-376.016312:-900.000000
+51.990104:61.564018:-900.000000
+123.165104:51.564018:-900.000000
 FIN_BOX
 BOX
-wx:LayoutLine:Box40
+PackRecalage:Recalage3D1PointWidget:Box52
 ISEXEC:FALSE
--136.798660:-280.761253:-900.000000
--79.238660:-290.761253:-900.000000
-PORT
-WinTitle:"Save"
+28.417586:-17.915301:-900.000000
+99.592586:-27.915301:-900.000000
 FIN_BOX
 BOX
-toolsbbtk:SaveMHD-Button:Box41
+PackRecalage:CompareImagesWidget3D:Box20
 ISEXEC:FALSE
--142.015270:-262.292236:-900.000000
--96.440270:-272.292236:-900.000000
+18.654027:-58.445572:-900.000000
+89.829027:-68.445572:-900.000000
 FIN_BOX
-BOX
-wx:CommandButton:Box42
-ISEXEC:FALSE
--114.705724:-249.870670:-900.000000
--69.130724:-259.870670:-900.000000
-PORT
-Label:"Same Matrix"
-PORT
-WinTitle:"Same Matrix"
-FIN_BOX
-CONNECTIONS:66
-CONNECTION
-viewer2:Point:transform:CenterPoint
-NumberOfControlPoints:0
-CONNECTION
-sdrAngleX:Out:transform:AngleX
-NumberOfControlPoints:0
-CONNECTION
-sdrAngleY:Out:transform:AngleY
-NumberOfControlPoints:0
-CONNECTION
-sdrAngleZ:Out:transform:AngleZ
-NumberOfControlPoints:0
-CONNECTION
-sdrScaleX:Out:transform:ScaleX
-NumberOfControlPoints:0
-CONNECTION
-sdrScaleY:Out:transform:ScaleY
-NumberOfControlPoints:0
-CONNECTION
-sdrScaleZ:Out:transform:ScaleZ
-NumberOfControlPoints:0
-CONNECTION
-viewer:Point:reslicer:Origin
-NumberOfControlPoints:0
-CONNECTION
-transform:Out:reslicer:Transform
-NumberOfControlPoints:0
-CONNECTION
-viewer:BoxChange:mult:In1
-NumberOfControlPoints:0
-CONNECTION
-viewer2:BoxChange:mult:In2
-NumberOfControlPoints:0
-CONNECTION
-sdrAngleX:BoxChange:mult:In3
-NumberOfControlPoints:0
-CONNECTION
-sdrAngleY:BoxChange:mult:In4
-NumberOfControlPoints:0
-CONNECTION
-sdrAngleZ:BoxChange:mult:In5
-NumberOfControlPoints:0
-CONNECTION
-sdrScaleX:BoxChange:mult2:In1
-NumberOfControlPoints:0
-CONNECTION
-sdrScaleY:BoxChange:mult2:In2
-NumberOfControlPoints:0
-CONNECTION
-sdrScaleZ:BoxChange:mult2:In3
-NumberOfControlPoints:0
-CONNECTION
-mult:BoxChange:mult3:In1
-NumberOfControlPoints:0
-CONNECTION
-mult2:BoxChange:mult3:In2
-NumberOfControlPoints:0
-CONNECTION
-mult3:BoxChange:transform:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
-mult3:BoxChange:reslicer:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
-reslicer:Out:viewerResult:In
-NumberOfControlPoints:0
-CONNECTION
-mult3:BoxChange:viewerResult:BoxExecute
-NumberOfControlPoints:0
+CONNECTIONS:15
 CONNECTION
 viewer:Widget:imagesLayout:Widget1
 NumberOfControlPoints:0
@@ -417,15 +102,6 @@ CONNECTION
 viewer2:Widget:imagesLayout:Widget2
 NumberOfControlPoints:0
 CONNECTION
-sdrAngleX:Widget:toolsLayout:Widget1
-NumberOfControlPoints:0
-CONNECTION
-sdrAngleY:Widget:toolsLayout:Widget2
-NumberOfControlPoints:0
-CONNECTION
-sdrAngleZ:Widget:toolsLayout:Widget3
-NumberOfControlPoints:0
-CONNECTION
 imagesLayout:Widget:main:Widget1
 NumberOfControlPoints:0
 CONNECTION
@@ -435,9 +111,6 @@ CONNECTION
 Box22:Out:viewer2:In
 NumberOfControlPoints:0
 CONNECTION
-Box22:Out:reslicer:In
-NumberOfControlPoints:0
-CONNECTION
 Box24:Out:Box22:In
 NumberOfControlPoints:0
 CONNECTION
@@ -447,96 +120,27 @@ CONNECTION
 Box25:Out:Box23:In
 NumberOfControlPoints:0
 CONNECTION
-Box27:Widget:Box26:Widget2
+Box22:Out:Box52:Image1
 NumberOfControlPoints:0
 CONNECTION
-Box26:Widget:resultLayout:Widget1
+Box23:Out:Box52:Image2
 NumberOfControlPoints:0
 CONNECTION
-reslicer:Out:Box27:In2
+Box20:Widget:resultLayout:Widget1
 NumberOfControlPoints:0
 CONNECTION
-Box23:Out:Box27:In1
-NumberOfControlPoints:0
+Box23:Out:Box20:Image1
+NumberOfControlPoints:2
+112.791573:-27.331705:-900.000000
+53.984684:-42.909939:-900.000000
 CONNECTION
-viewerResult:Widget:Box28:Widget2
+Box52:Out:Box20:Image2
 NumberOfControlPoints:0
 CONNECTION
-Box28:Widget:Box26:Widget1
+Box52:BoxChange:Box20:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-Box29:Widget:Box28:Widget1
-NumberOfControlPoints:0
-CONNECTION
-sdrScaleX:Widget:Box33:Widget1
-NumberOfControlPoints:0
-CONNECTION
-sdrScaleY:Widget:Box33:Widget2
-NumberOfControlPoints:0
-CONNECTION
-sdrScaleZ:Widget:Box33:Widget3
-NumberOfControlPoints:0
-CONNECTION
-Box33:Widget:Box32:Widget2
-NumberOfControlPoints:0
-CONNECTION
-toolsLayout:Widget:Box32:Widget1
-NumberOfControlPoints:0
-CONNECTION
-Box32:Widget:resultLayout:Widget2
-NumberOfControlPoints:0
-CONNECTION
-TranslateX:Widget:Box37:Widget1
-NumberOfControlPoints:0
-CONNECTION
-TranslateY:Widget:Box37:Widget2
-NumberOfControlPoints:0
-CONNECTION
-TranslateZ:Widget:Box37:Widget3
-NumberOfControlPoints:0
-CONNECTION
-Box37:Widget:Box32:Widget3
-NumberOfControlPoints:0
-CONNECTION
-Box31:Widget:Box38:Widget2
-NumberOfControlPoints:0
-CONNECTION
-Box38:Widget:Box29:Widget2
-NumberOfControlPoints:0
-CONNECTION
-Box39:Widget:Box29:Widget1
-NumberOfControlPoints:0
-CONNECTION
-Box30:Widget:Box39:Widget1
-NumberOfControlPoints:0
-CONNECTION
-Box23:Out:Box30:In
-NumberOfControlPoints:0
-CONNECTION
-viewerResult:Renderer1:Box30:vtkRenderer
-NumberOfControlPoints:0
-CONNECTION
-Box30:BoxChange:mult3:In3
-NumberOfControlPoints:0
-CONNECTION
-viewerResult:Renderer1:Box31:vtkRenderer
-NumberOfControlPoints:0
-CONNECTION
-Box31:BoxChange:mult3:In4
-NumberOfControlPoints:0
-CONNECTION
-reslicer:Out:Box31:In
-NumberOfControlPoints:0
-CONNECTION
-Box40:Widget:Box32:Widget4
-NumberOfControlPoints:0
-CONNECTION
-Box41:Widget:Box40:Widget1
-NumberOfControlPoints:0
-CONNECTION
-Box42:Widget:Box40:Widget2
-NumberOfControlPoints:0
-CONNECTION
-reslicer:Out:Box41:In
-NumberOfControlPoints:0
+Box52:Widget:resultLayout:Widget2
+NumberOfControlPoints:1
+93.103615:-51.917995:-900.000000
 APP_END

diff --git a/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbs b/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbs
index 21fae96b117b4fe42ca8776546d3061ee3d9502c..c1abe4b64fc22d3b32969dc50441f7cfef9771ea 100644 (file)
--- a/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbs
+++ b/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script
-# - /home/davila/Creatis/All/creatools_source/creaRigidRegistration/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbs
+# - /home/davila/Creatis/All/creatools_source/creaRigidRegistration/PackRecalage/bbs/appli/ExampleRecalage3D1Point_3a.bbs
 # ----------------------------------
 
 # BBTK GEditor Script
@@ -10,12 +10,9 @@ include std
 include itkvtk
 include creaMaracasVisu
 include wx
-include PackRecalage
-include std
 include vtk
 include creaImageIO
-include wxvtk
-include toolsbbtk
+include PackRecalage
 
 author "info-dev@creatis.insa-lyon.fr"
 description "Recalage3D 1-point"
@@ -27,63 +24,10 @@ new ViewerNV viewer
 new ViewerNV viewer2
   set viewer2.nTypeView "5"
 
-new Slider sdrAngleX
-  set sdrAngleX.In "0"
-  set sdrAngleX.Max "180"
-  set sdrAngleX.Min "-180"
-  set sdrAngleX.Title "Rotation angle in X Axis"
-
-new Slider sdrAngleY
-  set sdrAngleY.In "0"
-  set sdrAngleY.Max "180"
-  set sdrAngleY.Min "-180"
-  set sdrAngleY.Title "Rotation angle in Y Axis"
-
-new Slider sdrAngleZ
-  set sdrAngleZ.In "0"
-  set sdrAngleZ.Max "180"
-  set sdrAngleZ.Min "-180"
-  set sdrAngleZ.Title "Rotation angle in Z Axis"
-
-new Slider sdrScaleX
-  set sdrScaleX.In "100"
-  set sdrScaleX.Max "300"
-  set sdrScaleX.Min "10"
-  set sdrScaleX.Title "Scale in X Axis"
-
-new Slider sdrScaleY
-  set sdrScaleY.In "100"
-  set sdrScaleY.Max "300"
-  set sdrScaleY.Min "10"
-  set sdrScaleY.Title "Scale in Y Axis"
-
-new Slider sdrScaleZ
-  set sdrScaleZ.In "100"
-  set sdrScaleZ.Max "300"
-  set sdrScaleZ.Min "10"
-  set sdrScaleZ.Title "Scale in Z Axis"
-
-new Transform3D1PointBox transform
-
-new ReSlicerBox reslicer
-
-new MultipleInputs mult
-
-new MultipleInputs mult2
-
-new MultipleInputs mult3
-
-new ViewerNV viewerResult
-  set viewerResult.nTypeView "5"
-
 new LayoutSplit imagesLayout
   set imagesLayout.Orientation "v"
   set imagesLayout.Proportion "50"
 
-new LayoutLine toolsLayout
-  set toolsLayout.Orientation "v"
-  set toolsLayout.WinTitle "Rotation"
-
 new LayoutSplit resultLayout
   set resultLayout.Proportion "70"
 
@@ -101,184 +45,40 @@ new ImagesChooserDialogBox Box24
 
 new ImagesChooserDialogBox Box25
 
-new LayoutTab Box26
-  set Box26.WinTitle "2D-Compare"
-
-new CompareImagesWidget Box27
-  set Box27.WinTitle "2D-Comparing"
-
-new LayoutSplit Box28
-  set Box28.Orientation "H"
-  set Box28.Proportion "50"
-  set Box28.WinTitle "3D-Comparing"
-
-new LayoutLine Box29
-
-new IsoSurfaceWidget Box30
-  set Box30.Title "Reference image"
-
-new IsoSurfaceWidget Box31
-  set Box31.Title "Registration image"
-
-new LayoutTab Box32
-
-new LayoutLine Box33
-  set Box33.WinTitle "Scale"
-
-new Slider TranslateZ
-
-new Slider TranslateY
-
-new Slider TranslateX
-
-new LayoutLine Box37
-  set Box37.WinTitle "Translate"
-
-new LayoutTab Box38
-
-new LayoutTab Box39
-
-new LayoutLine Box40
-  set Box40.WinTitle "Save"
-
-new SaveMHD-Button Box41
-
-new CommandButton Box42
-  set Box42.Label "Same Matrix"
-  set Box42.WinTitle "Same Matrix"
-
-
-connect viewer2.Point transform.CenterPoint
-
-connect sdrAngleX.Out transform.AngleX
-
-connect sdrAngleY.Out transform.AngleY
-
-connect sdrAngleZ.Out transform.AngleZ
-
-connect sdrScaleX.Out transform.ScaleX
-
-connect sdrScaleY.Out transform.ScaleY
-
-connect sdrScaleZ.Out transform.ScaleZ
-
-connect viewer.Point reslicer.Origin
+new Recalage3D1PointWidget Box52
 
-connect transform.Out reslicer.Transform
+new CompareImagesWidget3D Box20
 
-connect viewer.BoxChange mult.In1
-
-connect viewer2.BoxChange mult.In2
-
-connect sdrAngleX.BoxChange mult.In3
-
-connect sdrAngleY.BoxChange mult.In4
-
-connect sdrAngleZ.BoxChange mult.In5
-
-connect sdrScaleX.BoxChange mult2.In1
-
-connect sdrScaleY.BoxChange mult2.In2
-
-connect sdrScaleZ.BoxChange mult2.In3
-
-connect mult.BoxChange mult3.In1
-
-connect mult2.BoxChange mult3.In2
-
-connect mult3.BoxChange transform.BoxExecute
-
-connect mult3.BoxChange reslicer.BoxExecute
-
-connect reslicer.Out viewerResult.In
-
-connect mult3.BoxChange viewerResult.BoxExecute
 
 connect viewer.Widget imagesLayout.Widget1
 
 connect viewer2.Widget imagesLayout.Widget2
 
-connect sdrAngleX.Widget toolsLayout.Widget1
-
-connect sdrAngleY.Widget toolsLayout.Widget2
-
-connect sdrAngleZ.Widget toolsLayout.Widget3
-
 connect imagesLayout.Widget main.Widget1
 
 connect resultLayout.Widget main.Widget2
 
 connect Box22.Out viewer2.In
 
-connect Box22.Out reslicer.In
-
 connect Box24.Out Box22.In
 
 connect Box23.Out viewer.In
 
 connect Box25.Out Box23.In
 
-connect Box27.Widget Box26.Widget2
-
-connect Box26.Widget resultLayout.Widget1
-
-connect reslicer.Out Box27.In2
-
-connect Box23.Out Box27.In1
-
-connect viewerResult.Widget Box28.Widget2
-
-connect Box28.Widget Box26.Widget1
-
-connect Box29.Widget Box28.Widget1
-
-connect sdrScaleX.Widget Box33.Widget1
-
-connect sdrScaleY.Widget Box33.Widget2
-
-connect sdrScaleZ.Widget Box33.Widget3
-
-connect Box33.Widget Box32.Widget2
-
-connect toolsLayout.Widget Box32.Widget1
-
-connect Box32.Widget resultLayout.Widget2
-
-connect TranslateX.Widget Box37.Widget1
-
-connect TranslateY.Widget Box37.Widget2
-
-connect TranslateZ.Widget Box37.Widget3
-
-connect Box37.Widget Box32.Widget3
-
-connect Box31.Widget Box38.Widget2
-
-connect Box38.Widget Box29.Widget2
-
-connect Box39.Widget Box29.Widget1
-
-connect Box30.Widget Box39.Widget1
-
-connect Box23.Out Box30.In
-
-connect viewerResult.Renderer1 Box30.vtkRenderer
-
-connect Box30.BoxChange mult3.In3
-
-connect viewerResult.Renderer1 Box31.vtkRenderer
+connect Box22.Out Box52.Image1
 
-connect Box31.BoxChange mult3.In4
+connect Box23.Out Box52.Image2
 
-connect reslicer.Out Box31.In
+connect Box20.Widget resultLayout.Widget1
 
-connect Box40.Widget Box32.Widget4
+connect Box23.Out Box20.Image1
 
-connect Box41.Widget Box40.Widget1
+connect Box52.Out Box20.Image2
 
-connect Box42.Widget Box40.Widget2
+connect Box52.BoxChange Box20.BoxExecute
 
-connect reslicer.Out Box41.In
+connect Box52.Widget resultLayout.Widget2
 
 
 

diff --git a/PackRecalage/src/bbPackRecalageImageSwitcherBox.cxx b/PackRecalage/src/bbPackRecalageImageSwitcherBox.cxx
index 226f1a49fae923cbad94cc8e39d073506952494a..0279f475ef5d5f760a92eded775a15a34ba2fe0d 100644 (file)
--- a/PackRecalage/src/bbPackRecalageImageSwitcherBox.cxx
+++ b/PackRecalage/src/bbPackRecalageImageSwitcherBox.cxx
@@ -80,7 +80,6 @@ void ImageSwitcherBox::Process()
                }
        }
 
-/* EED 31/052013               
        if(myTimer == NULL)
        {
                myTimer = new MyTimer(this);
@@ -99,7 +98,6 @@ void ImageSwitcherBox::Process()
                myTimer->Start(time);
                oldTime=time;
        }
-*/
 }