2075 Feature Registration 3D 1P

diff --git a/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbg b/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbg
index 954422c9c01d5fd6a5c1e23a79bb65105cbbf3ab..a4bb1e1d221e0c0d57951da60a36f46f83297615 100644 (file)
--- a/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbg
+++ b/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbg
@@ -9,28 +9,12 @@ DESCRIPTION:Recalage3D 1-point
 AUTHOR:info-dev@creatis.insa-lyon.fr
 COMPLEXBOX:FALSE
 COMPLEXINPUTS:0
-BOXES:19
-BOX
-creaMaracasVisu:ViewerNV:viewer
-ISEXEC:FALSE
--97.386127:-9.305749:-900.000000
--36.746127:-19.305749:-900.000000
-PORT
-nTypeView:"6 1 2 0"
-FIN_BOX
-BOX
-creaMaracasVisu:ViewerNV:viewer2
-ISEXEC:FALSE
--30.923938:-7.498719:-900.000000
-29.716062:-17.498719:-900.000000
-PORT
-nTypeView:"6 1 2 0"
-FIN_BOX
+BOXES:17
 BOX
 wx:LayoutSplit:imagesLayout
 ISEXEC:FALSE
--53.427874:-62.295044:-900.000000
--7.852874:-72.295044:-900.000000
+-54.010260:-77.048824:-900.000000
+-8.435260:-87.048824:-900.000000
 PORT
 Orientation:"H"
 PORT
@@ -41,8 +25,8 @@ FIN_BOX
 BOX
 wx:LayoutSplit:resultLayout
 ISEXEC:FALSE
-45.262930:-64.213422:-900.000000
-90.837930:-74.213422:-900.000000
+11.120301:-78.947472:-900.000000
+56.695301:-88.947472:-900.000000
 PORT
 Proportion:"80"
 PORT
@@ -51,60 +35,60 @@ FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box22
 ISEXEC:FALSE
-15.030994:79.476906:-900.000000
-86.205994:69.476906:-900.000000
+107.380883:88.788511:-900.000000
+178.555883:78.788511:-900.000000
 FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box23
 ISEXEC:FALSE
-94.941217:79.316208:-900.000000
-166.116217:69.316208:-900.000000
+142.515412:74.166661:-900.000000
+213.690412:64.166661:-900.000000
 FIN_BOX
 BOX
 creaImageIO:ImagesChooserDialogBox:Box24
 ISEXEC:FALSE
-20.909954:105.817542:-900.000000
-92.084954:95.817542:-900.000000
+33.462854:124.513351:-900.000000
+104.637854:114.513351:-900.000000
 FIN_BOX
 BOX
 creaImageIO:ImagesChooserDialogBox:Box25
 ISEXEC:FALSE
-102.275907:106.160598:-900.000000
-173.450907:96.160598:-900.000000
+110.822562:122.452660:-900.000000
+181.997562:112.452660:-900.000000
 FIN_BOX
 BOX
 PackRecalage:Recalage3D1PointWidget:Box52
 ISEXEC:FALSE
-84.715423:45.756620:-900.000000
-155.890423:35.756620:-900.000000
+38.191108:46.064170:-900.000000
+109.366108:36.064170:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesWidget3D:Box20
 ISEXEC:FALSE
-54.793552:24.685861:-900.000000
-125.968552:14.685861:-900.000000
+76.232469:5.962266:-900.000000
+147.407469:-4.037734:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImages_3DwithPlanes_Widget:Box11
 ISEXEC:FALSE
-99.969470:0.134151:-900.000000
-171.144470:-9.865849:-900.000000
+82.677789:-18.202280:-900.000000
+153.852789:-28.202280:-900.000000
 PORT
 WinTitle:"3D Planes"
 FIN_BOX
 BOX
 wx:LayoutSplit:Box12
 ISEXEC:FALSE
-75.204558:-41.416627:-900.000000
-120.779558:-51.416627:-900.000000
+33.930445:-57.712879:-900.000000
+79.505445:-67.712879:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
 BOX
 wx:LayoutTab:Box13
 ISEXEC:FALSE
-88.329405:-20.159797:-900.000000
-145.889405:-30.159797:-900.000000
+62.479203:-39.878969:-900.000000
+120.039203:-49.878969:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesWidget:Box14
@@ -117,55 +101,46 @@ FIN_BOX
 BOX
 wx:LayoutTab:Box15
 ISEXEC:TRUE
-7.083741:-94.255430:-900.000000
-64.643741:-104.255430:-900.000000
+5.719422:-104.975080:-900.000000
+63.279422:-114.975080:-900.000000
 PORT
 WinHeight:"800"
 PORT
 WinWidth:"1200"
 FIN_BOX
 BOX
-wx:LayoutTab:Box16
+vtk:LoadHola:Box27
 ISEXEC:FALSE
--94.922135:-43.252492:-900.000000
--37.362135:-53.252492:-900.000000
+-27.570872:124.059434:-900.000000
+18.004128:114.059434:-900.000000
 FIN_BOX
 BOX
-wx:LayoutTab:Box17
+PackRecalage:Getting3D1Point:Box28
 ISEXEC:FALSE
--29.418361:-41.419053:-900.000000
-28.141639:-51.419053:-900.000000
+4.338710:97.491790:-900.000000
+49.913710:87.491790:-900.000000
+PORT
+Title:"Move Image"
 FIN_BOX
 BOX
-wx:LayoutLine:Box18
+PackRecalage:Getting3D1Point:Box29
 ISEXEC:FALSE
--27.584922:-24.751426:-900.000000
-29.975078:-34.751426:-900.000000
+-49.403978:96.251514:-900.000000
+-3.828978:86.251514:-900.000000
 PORT
-WinTitle:"Move Image"
+Title:"Fix Image"
 FIN_BOX
 BOX
-wx:LayoutLine:Box19
+std:MultipleInputs:Box26
 ISEXEC:FALSE
--96.922250:-25.584807:-900.000000
--39.362250:-35.584807:-900.000000
-PORT
-WinTitle:"Fix Image"
+36.625880:71.083256:-900.000000
+82.200880:61.083256:-900.000000
 FIN_BOX
 CONNECTIONS:29
 CONNECTION
-Box22:Out:viewer2:In
-NumberOfControlPoints:0
-CONNECTION
-Box23:Out:viewer:In
-NumberOfControlPoints:0
-CONNECTION
 Box22:Out:Box52:Image1
 NumberOfControlPoints:0
 CONNECTION
-Box23:Out:Box52:Image2
-NumberOfControlPoints:0
-CONNECTION
 Box52:Out:Box20:Image2
 NumberOfControlPoints:0
 CONNECTION
@@ -211,33 +186,42 @@ CONNECTION
 resultLayout:Widget:Box15:Widget2
 NumberOfControlPoints:0
 CONNECTION
-Box16:Widget:imagesLayout:Widget1
+Box20:Point:Box11:Point
 NumberOfControlPoints:0
 CONNECTION
-Box17:Widget:imagesLayout:Widget2
+Box20:BoxChange:Box11:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-viewer2:Widget:Box18:Widget1
+Box27:Out:Box22:In
 NumberOfControlPoints:0
 CONNECTION
-Box18:Widget:Box17:Widget1
+Box27:Out:Box23:In
 NumberOfControlPoints:0
 CONNECTION
-viewer:Widget:Box19:Widget1
+Box29:Widget:imagesLayout:Widget1
 NumberOfControlPoints:0
 CONNECTION
-Box19:Widget:Box16:Widget1
+Box28:Widget:imagesLayout:Widget2
 NumberOfControlPoints:0
 CONNECTION
-Box20:Point:Box11:Point
+Box27:Out:Box29:Image
 NumberOfControlPoints:0
 CONNECTION
-Box20:BoxChange:Box11:BoxExecute
+Box27:Out:Box28:Image
+NumberOfControlPoints:0
+CONNECTION
+Box29:BoxChange:Box26:In1
+NumberOfControlPoints:0
+CONNECTION
+Box28:BoxChange:Box26:In2
+NumberOfControlPoints:0
+CONNECTION
+Box26:BoxChange:Box52:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-Box24:Out:Box22:In
+Box29:Point:Box52:CenterPoint
 NumberOfControlPoints:0
 CONNECTION
-Box25:Out:Box23:In
+Box28:Point:Box52:OriginPoint
 NumberOfControlPoints:0
 APP_END

diff --git a/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbs b/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbs
index 03e6efc84c53d5ca55981aa5578545c0d1d3610b..4d791c53db7c98625a388e2348b47e525818a594 100644 (file)
--- a/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbs
+++ b/PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbs
@@ -8,22 +8,16 @@
 
 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"
@@ -60,25 +54,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 "Move Image"
 
-new LayoutLine Box19
-  set Box19.WinTitle "Fix Image"
+new Getting3D1Point Box29
+  set Box29.Title "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 +97,31 @@ connect imagesLayout.Widget Box15.Widget1
 
 connect resultLayout.Widget Box15.Widget2
 
-connect Box16.Widget imagesLayout.Widget1
+connect Box20.Point Box11.Point
 
-connect Box17.Widget imagesLayout.Widget2
+connect Box20.BoxChange Box11.BoxExecute
 
-connect viewer2.Widget Box18.Widget1
+connect Box27.Out Box22.In
 
-connect Box18.Widget Box17.Widget1
+connect Box27.Out Box23.In
 
-connect viewer.Widget Box19.Widget1
+connect Box29.Widget imagesLayout.Widget1
 
-connect Box19.Widget Box16.Widget1
+connect Box28.Widget imagesLayout.Widget2
 
-connect Box20.Point Box11.Point
+connect Box27.Out Box29.Image
 
-connect Box20.BoxChange Box11.BoxExecute
+connect Box27.Out Box28.Image
+
+connect Box29.BoxChange Box26.In1
+
+connect Box28.BoxChange Box26.In2
+
+connect Box26.BoxChange Box52.BoxExecute
 
-connect Box24.Out Box22.In
+connect Box29.Point Box52.CenterPoint
 
-connect Box25.Out Box23.In
+connect Box28.Point Box52.OriginPoint
 
 
 

diff --git a/PackRecalage/bbs/boxes/CompareImagesWidget3D.bbg b/PackRecalage/bbs/boxes/CompareImagesWidget3D.bbg
index 5434a3529865b5abaea27e38fadc2d33b3b57bba..b1e9b41426b600c030fb5e00a72fc23e8fc6d3f8 100644 (file)
--- a/PackRecalage/bbs/boxes/CompareImagesWidget3D.bbg
+++ b/PackRecalage/bbs/boxes/CompareImagesWidget3D.bbg
@@ -41,7 +41,7 @@ BOX
 creaMaracasVisu:ViewerNV:viewerResult
 ISEXEC:FALSE
 54.701425:-26.949203:-900.000000
-115.341425:-36.949203:-900.000000
+100.276425:-36.949203:-900.000000
 PORT
 nTypeView:"6"
 FIN_BOX
@@ -55,7 +55,7 @@ BOX
 wx:LayoutTab:Box26
 ISEXEC:FALSE
 2.523718:-177.334792:-900.000000
-60.083718:-187.334792:-900.000000
+48.098718:-187.334792:-900.000000
 PORT
 WinTitle:"2D-Compare"
 FIN_BOX
@@ -75,7 +75,7 @@ BOX
 wx:LayoutLine:Box29
 ISEXEC:FALSE
 -36.447166:-116.254418:-900.000000
-21.112834:-126.254418:-900.000000
+9.127834:-126.254418:-900.000000
 FIN_BOX
 BOX
 wxvtk:IsoSurfaceWidget:Box30
@@ -84,6 +84,8 @@ ISEXEC:FALSE
 -14.614126:-58.428471:-900.000000
 PORT
 Title:"Reference image"
+PORT
+Vertical:"V"
 FIN_BOX
 BOX
 wxvtk:IsoSurfaceWidget:Box31
@@ -92,18 +94,20 @@ ISEXEC:FALSE
 53.879120:-61.097085:-900.000000
 PORT
 Title:"Registration image"
+PORT
+Vertical:"V"
 FIN_BOX
 BOX
 wx:LayoutTab:Box38
 ISEXEC:FALSE
 -13.417754:-99.991659:-900.000000
-44.142246:-109.991659:-900.000000
+32.157246:-109.991659:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box39
 ISEXEC:FALSE
 -74.673912:-90.664048:-900.000000
--17.113912:-100.664048:-900.000000
+-29.098912:-100.664048:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:Box19

diff --git a/PackRecalage/bbs/boxes/CompareImagesWidget3D.bbs b/PackRecalage/bbs/boxes/CompareImagesWidget3D.bbs
index d29e29d7d61690f3405fb3e26fe02dda7a267deb..6454c9c905085bb9736b1d56085f2c5476082aa4 100644 (file)
--- a/PackRecalage/bbs/boxes/CompareImagesWidget3D.bbs
+++ b/PackRecalage/bbs/boxes/CompareImagesWidget3D.bbs
@@ -35,9 +35,11 @@ new LayoutLine Box29
 
 new IsoSurfaceWidget Box30
   set Box30.Title "Reference image"
+  set Box30.Vertical "V"
 
 new IsoSurfaceWidget Box31
   set Box31.Title "Registration image"
+  set Box31.Vertical "V"
 
 new LayoutTab Box38
 

diff --git a/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbg b/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbg
index 9022de45f81e8cec7378b5e6ae179a218cd661dd..09cd89ba55310dbfc7c523a05645f5d5a1dd52c0 100644 (file)
--- a/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbg
+++ b/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbg
@@ -10,45 +10,25 @@ AUTHOR:Author ??
 COMPLEXBOX:TRUE
 COMPLEXBOXNAME:CompareImagesWidget_base_interface_3Dp
 PACKAGENAME:PackRecalage
-COMPLEXOUTPUTS:5
+COMPLEXOUTPUTS:4
 COMPLEX_PORT
 BoxChange
--249.406583:-130.793802:-900.000000
+-292.069549:-130.188654:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 Widget
--311.272087:-125.379205:-900.000000
+-183.585764:-132.640986:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 ConvolutionFactor
--199.314298:-131.871035:-900.000000
+-226.545978:-129.147867:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 ConvolutionOnOff
--161.923397:-131.459983:-900.000000
+-111.696076:-129.644538:-900.000000
 FIN_COMPLEX_PORT
-COMPLEX_PORT
-Point
--397.584861:-123.346846:-900.000000
-FIN_COMPLEX_PORT
-COMPLEXINPUTS:1
-COMPLEX_PORT
-InputImage
--345.001276:122.271802:-900.000000
-FIN_COMPLEX_PORT
-BOXES:10
-BOX
-wx:Slider:Box00
-ISEXEC:FALSE
--312.615803:44.390319:-900.000000
--261.215803:34.390319:-900.000000
-PORT
-Min:"0"
-PORT
-ReactiveOnTrack:"1"
-PORT
-Title:"Z for slice"
-FIN_BOX
+COMPLEXINPUTS:0
+BOXES:4
 BOX
 wx:Slider:Box01
 ISEXEC:FALSE
@@ -76,16 +56,8 @@ FIN_BOX
 BOX
 std:MultipleInputs:Box03
 ISEXEC:FALSE
--248.070175:-62.627828:-900.000000
--202.495175:-72.627828:-900.000000
-FIN_BOX
-BOX
-wx:LayoutLine:Box04
-ISEXEC:FALSE
--307.839553:-96.528504:-900.000000
--250.279553:-106.528504:-900.000000
-PORT
-WinTitle:"Appearance"
+-293.758883:-59.904660:-900.000000
+-248.183883:-69.904660:-900.000000
 FIN_BOX
 BOX
 wx:LayoutSplit:Box05
@@ -95,58 +67,9 @@ ISEXEC:FALSE
 PORT
 Orientation:"H"
 PORT
-Proportion:"80"
-FIN_BOX
-BOX
-PackRecalage:ImageRecalageProperties:Box08
-ISEXEC:FALSE
--352.104741:101.210902:-900.000000
--215.243743:91.210902:-900.000000
-FIN_BOX
-BOX
-wx:Slider:Box11
-ISEXEC:FALSE
--378.936874:43.198025:-900.000000
--327.536874:33.198025:-900.000000
-PORT
-Min:"0"
-PORT
-ReactiveOnTrack:"1"
-PORT
-Title:"Y for slice"
-FIN_BOX
-BOX
-wx:Slider:Box13
-ISEXEC:FALSE
--451.783313:45.176743:-900.000000
--400.383313:35.176743:-900.000000
-PORT
-Min:"0"
-PORT
-ReactiveOnTrack:"1"
-PORT
-Title:"X for slice"
-FIN_BOX
-BOX
-std:ConcatStrings:Box15
-ISEXEC:FALSE
--385.033924:-65.592429:-900.000000
--339.458924:-75.592429:-900.000000
-PORT
-In2:" "
-PORT
-In4:" "
+Proportion:"10"
 FIN_BOX
-CONNECTIONS:23
-CONNECTION
-Box02:Widget:Box05:Widget2
-NumberOfControlPoints:0
-CONNECTION
-Box05:Widget:Box04:Widget4
-NumberOfControlPoints:0
-CONNECTION
-Box01:Widget:Box05:Widget1
-NumberOfControlPoints:0
+CONNECTIONS:8
 CONNECTION
 Box02:BoxChange:Box03:In3
 NumberOfControlPoints:0
@@ -154,57 +77,21 @@ CONNECTION
 Box01:BoxChange:Box03:In2
 NumberOfControlPoints:0
 CONNECTION
-Box00:BoxChange:Box03:In1
-NumberOfControlPoints:0
-CONNECTION
 Box03:BoxChange:BoxChange:BoxChange
 NumberOfControlPoints:0
 CONNECTION
-Box04:Widget:Widget:Widget
-NumberOfControlPoints:0
-CONNECTION
 Box01:Out:ConvolutionFactor:ConvolutionFactor
 NumberOfControlPoints:0
 CONNECTION
 Box02:Out:ConvolutionOnOff:ConvolutionOnOff
 NumberOfControlPoints:0
 CONNECTION
-InputImage:InputImage:Box08:In
-NumberOfControlPoints:0
-CONNECTION
-Box08:LengthZ:Box00:Max
-NumberOfControlPoints:0
-CONNECTION
-Box08:LengthY:Box11:Max
+Box05:Widget:Widget:Widget
 NumberOfControlPoints:0
 CONNECTION
-Box08:LengthX:Box13:Max
-NumberOfControlPoints:0
-CONNECTION
-Box11:Widget:Box04:Widget2
-NumberOfControlPoints:0
-CONNECTION
-Box00:Widget:Box04:Widget3
-NumberOfControlPoints:0
-CONNECTION
-Box13:Widget:Box04:Widget1
-NumberOfControlPoints:0
-CONNECTION
-Box11:BoxChange:Box03:In4
-NumberOfControlPoints:0
-CONNECTION
-Box13:BoxChange:Box03:In5
-NumberOfControlPoints:0
-CONNECTION
-Box13:Out:Box15:In1
-NumberOfControlPoints:0
-CONNECTION
-Box11:Out:Box15:In3
-NumberOfControlPoints:0
-CONNECTION
-Box00:Out:Box15:In5
+Box02:Widget:Box05:Widget2
 NumberOfControlPoints:0
 CONNECTION
-Box15:Out:Point:Point
+Box01:Widget:Box05:Widget1
 NumberOfControlPoints:0
 APP_END

diff --git a/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbs b/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbs
index f0b17fd2892c0f7f67e1d2d6c751d122d90d97ad..d04c9a4809d1f1e1c7dbc0214b0d7a57fb51066b 100644 (file)
--- a/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbs
+++ b/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbs
@@ -7,7 +7,6 @@ include std
 include itkvtk
 include wx
 include std
-include PackRecalage
 
 define CompareImagesWidget_base_interface_3Dp PackRecalage
 
@@ -16,11 +15,6 @@ description "Description ??"
 
 category "<VOID>"
 
-new Slider Box00
-  set Box00.Min "0"
-  set Box00.ReactiveOnTrack "1"
-  set Box00.Title "Z for slice"
-
 new Slider Box01
   set Box01.In "0"
   set Box01.Max "100"
@@ -33,57 +27,23 @@ new CheckBox Box02
 
 new MultipleInputs Box03
 
-new LayoutLine Box04
-  set Box04.WinTitle "Appearance"
-
 new LayoutSplit Box05
   set Box05.Orientation "H"
-  set Box05.Proportion "80"
-
-new ImageRecalageProperties Box08
-
-new Slider Box11
-  set Box11.Min "0"
-  set Box11.ReactiveOnTrack "1"
-  set Box11.Title "Y for slice"
-
-new Slider Box13
-  set Box13.Min "0"
-  set Box13.ReactiveOnTrack "1"
-  set Box13.Title "X for slice"
+  set Box05.Proportion "10"
 
-new ConcatStrings Box15
-  set Box15.In2 " "
-  set Box15.In4 " "
 
-
-connect Box02.Widget Box05.Widget2
-connect Box05.Widget Box04.Widget4
-connect Box01.Widget Box05.Widget1
 connect Box02.BoxChange Box03.In3
 connect Box01.BoxChange Box03.In2
-connect Box00.BoxChange Box03.In1
-connect Box08.LengthZ Box00.Max
-connect Box08.LengthY Box11.Max
-connect Box08.LengthX Box13.Max
-connect Box11.Widget Box04.Widget2
-connect Box00.Widget Box04.Widget3
-connect Box13.Widget Box04.Widget1
-connect Box11.BoxChange Box03.In4
-connect Box13.BoxChange Box03.In5
-connect Box13.Out Box15.In1
-connect Box11.Out Box15.In3
-connect Box00.Out Box15.In5
+connect Box02.Widget Box05.Widget2
+connect Box01.Widget Box05.Widget1
 
 # Complex input ports
-input InputImage Box08.In " "
 
 # Complex output ports
 output BoxChange Box03.BoxChange " "
-output Widget Box04.Widget " "
 output ConvolutionFactor Box01.Out " "
 output ConvolutionOnOff Box02.Out " "
-output Point Box15.Out " "
+output Widget Box05.Widget " "
 
 
 endefine

diff --git a/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbg b/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbg
index a75d721ae4b35ebc4c3af105efa6d2bb84985d04..c47f34b13d830d8e6a30cea129baeecd6387eb70 100644 (file)
--- a/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbg
+++ b/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbg
@@ -13,49 +13,39 @@ PACKAGENAME:PackRecalage
 COMPLEXOUTPUTS:1
 COMPLEX_PORT
 Widget
--58.161675:-182.887022:-900.000000
+-108.366991:-196.535870:-900.000000
 FIN_COMPLEX_PORT
 COMPLEXINPUTS:5
 COMPLEX_PORT
 In2
--85.607181:89.066828:-900.000000
+-128.435187:86.737006:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 In1
--208.143095:91.519883:-900.000000
+-228.445825:83.864755:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 WinTitle
-127.862501:88.941502:-900.000000
+-66.610205:85.090557:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 Point
-0.100839:90.856067:-900.000000
+11.084283:87.860582:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 BoxExecute
--253.268323:87.997313:-900.000000
+-277.232202:86.333155:-900.000000
 FIN_COMPLEX_PORT
-BOXES:12
+BOXES:11
 BOX
 wx:LayoutTab:tabs
 ISEXEC:FALSE
--143.785521:-124.975377:-900.000000
--86.225521:-134.975377:-900.000000
+-225.271510:-125.902354:-900.000000
+-167.711510:-135.902354:-900.000000
 PORT
 Orientation:V
 FIN_BOX
 BOX
-wx:LayoutSplit:window2
-ISEXEC:FALSE
--58.577483:-151.053666:-900.000000
--13.002483:-161.053666:-900.000000
-PORT
-Orientation:H
-PORT
-Proportion:"25"
-FIN_BOX
-BOX
 vtk:vtkImageDataPointerRelay:Box56
 ISEXEC:FALSE
 -233.390434:61.714899:-900.000000
@@ -64,58 +54,60 @@ FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box59
 ISEXEC:FALSE
--112.173081:57.295180:-900.000000
--40.998081:47.295180:-900.000000
-FIN_BOX
-BOX
-wx:LayoutTab:Box61
-ISEXEC:FALSE
--77.910625:-124.319736:-900.000000
--20.350625:-134.319736:-900.000000
+-139.679829:61.146125:-900.000000
+-68.504829:51.146125:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesWidget_base_interface_3Dp:Box18
 ISEXEC:FALSE
--187.587765:27.362104:-900.000000
--116.412765:17.362104:-900.000000
+-178.721954:28.498746:-900.000000
+-107.546954:18.498746:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesWidget_base_3Dp_B:Box13
 ISEXEC:FALSE
--244.750737:-25.076941:-900.000000
--173.575737:-35.076941:-900.000000
+-247.413390:-29.070921:-900.000000
+-176.238390:-39.070921:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesTransparencyWidget_3Dp:Box14
 ISEXEC:FALSE
--86.902026:-80.169760:-900.000000
--15.727026:-90.169760:-900.000000
+-180.424968:-80.994962:-900.000000
+-109.249968:-90.994962:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesWidget_base_3Dp_B:Box15
 ISEXEC:FALSE
--105.143814:-24.341297:-900.000000
--33.968814:-34.341297:-900.000000
+-143.103126:-28.467309:-900.000000
+-71.928126:-38.467309:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesSwitcherWidget_3Dp:Box17
 ISEXEC:FALSE
--180.576534:-79.911097:-900.000000
--109.401534:-89.911097:-900.000000
+-259.611672:-82.254672:-900.000000
+-188.436672:-92.254672:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:Box11
 ISEXEC:FALSE
--291.496324:-1.439026:-900.000000
--245.921324:-11.439026:-900.000000
+-281.827702:1.495944:-900.000000
+-236.252702:-8.504056:-900.000000
 FIN_BOX
 BOX
 std:StringRelay:Box12
 ISEXEC:FALSE
-11.811087:42.278323:-900.000000
-57.386087:32.278323:-900.000000
+-8.818974:28.249882:-900.000000
+36.756026:18.249882:-900.000000
 FIN_BOX
-CONNECTIONS:28
+BOX
+wx:LayoutSplit:Box16
+ISEXEC:FALSE
+-107.295275:-169.215306:-900.000000
+-61.720275:-179.215306:-900.000000
+PORT
+Proportion:"10"
+FIN_BOX
+CONNECTIONS:26
 CONNECTION
 In2:In2:Box59:In
 NumberOfControlPoints:0
@@ -123,21 +115,6 @@ CONNECTION
 In1:In1:Box56:In
 NumberOfControlPoints:0
 CONNECTION
-window2:Widget:Widget:Widget
-NumberOfControlPoints:0
-CONNECTION
-Box61:Widget:window2:Widget1
-NumberOfControlPoints:0
-CONNECTION
-tabs:Widget:window2:Widget2
-NumberOfControlPoints:0
-CONNECTION
-WinTitle:WinTitle:window2:WinTitle
-NumberOfControlPoints:0
-CONNECTION
-Box18:Widget:Box61:Widget1
-NumberOfControlPoints:0
-CONNECTION
 Box18:ConvolutionFactor:Box13:ConvolutionFactor
 NumberOfControlPoints:0
 CONNECTION
@@ -168,9 +145,6 @@ CONNECTION
 Box59:Out:Box15:In
 NumberOfControlPoints:0
 CONNECTION
-Box59:Out:Box18:InputImage
-NumberOfControlPoints:0
-CONNECTION
 Box17:Widget:tabs:Widget1
 NumberOfControlPoints:0
 CONNECTION
@@ -200,4 +174,16 @@ NumberOfControlPoints:0
 CONNECTION
 Box12:Out:Box13:Point
 NumberOfControlPoints:0
+CONNECTION
+Box18:Widget:Box16:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box16:Widget:Widget:Widget
+NumberOfControlPoints:0
+CONNECTION
+WinTitle:WinTitle:Box16:WinTitle
+NumberOfControlPoints:0
+CONNECTION
+tabs:Widget:Box16:Widget2
+NumberOfControlPoints:0
 APP_END

diff --git a/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs b/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs
index 792dc6a450b0e15d5eba1e88eef82934481371fd..eb19c8d34f792dbdc5ca7ed0117a22f20078dfc5 100644 (file)
--- a/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs
+++ b/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs
@@ -20,16 +20,10 @@ category "example"
 new LayoutTab tabs
   set tabs.Orientation V
 
-new LayoutSplit window2
-  set window2.Orientation H
-  set window2.Proportion "25"
-
 new vtkImageDataPointerRelay Box56
 
 new vtkImageDataPointerRelay Box59
 
-new LayoutTab Box61
-
 new CompareImagesWidget_base_interface_3Dp Box18
 
 new CompareImagesWidget_base_3Dp_B Box13
@@ -44,10 +38,10 @@ new MultipleInputs Box11
 
 new StringRelay Box12
 
+new LayoutSplit Box16
+  set Box16.Proportion "10"
+
 
-connect Box61.Widget window2.Widget1
-connect tabs.Widget window2.Widget2
-connect Box18.Widget Box61.Widget1
 connect Box18.ConvolutionFactor Box13.ConvolutionFactor
 connect Box18.ConvolutionOnOff Box13.ConvolutionOnOff
 connect Box56.Out Box13.In
@@ -58,7 +52,6 @@ connect Box15.Out Box14.VectorImate2
 connect Box18.ConvolutionFactor Box15.ConvolutionFactor
 connect Box18.ConvolutionOnOff Box15.ConvolutionOnOff
 connect Box59.Out Box15.In
-connect Box59.Out Box18.InputImage
 connect Box17.Widget tabs.Widget1
 connect Box13.Out Box17.ImageVector1
 connect Box15.Out Box17.ImageVector2
@@ -67,16 +60,18 @@ connect Box11.Out Box13.BoxExecute
 connect Box11.Out Box15.BoxExecute
 connect Box12.Out Box15.Point
 connect Box12.Out Box13.Point
+connect Box18.Widget Box16.Widget1
+connect tabs.Widget Box16.Widget2
 
 # Complex input ports
 input In2 Box59.In " "
 input In1 Box56.In " "
-input WinTitle window2.WinTitle " "
 input BoxExecute Box11.In1 " "
 input Point Box12.In " "
+input WinTitle Box16.WinTitle " "
 
 # Complex output ports
-output Widget window2.Widget " "
+output Widget Box16.Widget " "
 
 
 endefine

diff --git a/PackRecalage/bbs/boxes/Getting3D1Point.bbg b/PackRecalage/bbs/boxes/Getting3D1Point.bbg
new file mode 100644 (file)
index 0000000..df93520
--- /dev/null
+++ b/PackRecalage/bbs/boxes/Getting3D1Point.bbg
@@ -0,0 +1,239 @@
+# ----------------------------------
+# - BBTKGEditor v 1.4 BBG BlackBox Diagram file
+# - /home/davila/Creatis/All/creatools_source/creaRigidRegistration/PackRecalage/bbs/boxes/Getting3D1Point.bbg
+# ----------------------------------
+
+APP_START
+CATEGORY:example
+DESCRIPTION:Recalage3D 1-point
+AUTHOR:info-dev@creatis.insa-lyon.fr
+COMPLEXBOX:TRUE
+COMPLEXBOXNAME:Getting3D1Point
+PACKAGENAME:PackRecalage
+COMPLEXOUTPUTS:3
+COMPLEX_PORT
+Widget
+-77.006680:-269.212328:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+Point
+-104.571026:-272.427771:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+BoxChange
+-128.449648:-271.307624:-900.000000
+FIN_COMPLEX_PORT
+COMPLEXINPUTS:2
+COMPLEX_PORT
+Image
+-35.570535:98.934380:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+Title
+44.647887:97.174128:-900.000000
+FIN_COMPLEX_PORT
+BOXES:15
+BOX
+creaMaracasVisu:ViewerNV:viewer
+ISEXEC:FALSE
+-157.091707:27.264366:-900.000000
+-96.451707:17.264366:-900.000000
+PORT
+nTypeView:"6 1 2 0"
+FIN_BOX
+BOX
+vtk:vtkImageDataPointerRelay:Box23
+ISEXEC:FALSE
+-39.020030:78.128608:-900.000000
+32.154970:68.128608:-900.000000
+FIN_BOX
+BOX
+wx:LayoutTab:Box16
+ISEXEC:FALSE
+-79.479953:-246.833415:-900.000000
+-21.919953:-256.833415:-900.000000
+FIN_BOX
+BOX
+toolsbbtk:ImageVtkPropertiesWidget:Box21
+ISEXEC:FALSE
+-12.508566:-13.602502:-900.000000
+58.666434:-23.602502:-900.000000
+FIN_BOX
+BOX
+wxvtk:IsoSurfaceWidget:Box05
+ISEXEC:FALSE
+-63.363842:-15.816669:-900.000000
+-17.788842:-25.816669:-900.000000
+PORT
+Title:"Surface"
+PORT
+Vertical:"V"
+FIN_BOX
+BOX
+creaMaracasVisu:ShowNPoints:Box08
+ISEXEC:FALSE
+-127.952857:-14.914714:-900.000000
+-79.632857:-24.914714:-900.000000
+PORT
+Type:"1"
+PORT
+WinTitle:"Point select"
+FIN_BOX
+BOX
+wx:LayoutTab:Box10
+ISEXEC:FALSE
+-160.526380:-115.329572:-900.000000
+-102.966380:-125.329572:-900.000000
+FIN_BOX
+BOX
+wx:LayoutSplit:Box11
+ISEXEC:FALSE
+-200.662523:-175.460575:-900.000000
+-155.087523:-185.460575:-900.000000
+FIN_BOX
+BOX
+wx:LayoutLine:Box12
+ISEXEC:FALSE
+-73.961469:-153.530973:-900.000000
+-16.401469:-163.530973:-900.000000
+PORT
+Orientation:"H"
+FIN_BOX
+BOX
+wx:LayoutTab:Box13
+ISEXEC:FALSE
+-47.818195:-35.879715:-900.000000
+9.741805:-45.879715:-900.000000
+FIN_BOX
+BOX
+wx:LayoutTab:Box14
+ISEXEC:FALSE
+15.967926:-34.616102:-900.000000
+73.527926:-44.616102:-900.000000
+FIN_BOX
+BOX
+wx:LayoutLine:Box17
+ISEXEC:FALSE
+-74.809442:-226.688471:-900.000000
+-17.249442:-236.688471:-900.000000
+FIN_BOX
+BOX
+wx:LayoutLine:Box18
+ISEXEC:FALSE
+-161.088014:-92.384025:-900.000000
+-103.528014:-102.384025:-900.000000
+PORT
+WinTitle:"Point selected"
+FIN_BOX
+BOX
+std:ConcatStrings:Box19
+ISEXEC:FALSE
+-101.661934:-50.610710:-900.000000
+-56.086934:-60.610710:-900.000000
+PORT
+In2:" "
+PORT
+In4:" "
+FIN_BOX
+BOX
+wx:OutputText:Box20
+ISEXEC:FALSE
+-133.512618:-72.203368:-900.000000
+-87.937618:-82.203368:-900.000000
+FIN_BOX
+CONNECTIONS:31
+CONNECTION
+Box23:Out:viewer:In
+NumberOfControlPoints:0
+CONNECTION
+Box23:Out:Box21:in
+NumberOfControlPoints:0
+CONNECTION
+Image:Image:Box23:In
+NumberOfControlPoints:0
+CONNECTION
+viewer:Renderer1:Box05:vtkRenderer
+NumberOfControlPoints:0
+CONNECTION
+Box23:Out:Box05:In
+NumberOfControlPoints:0
+CONNECTION
+Box05:BoxChange:viewer:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+viewer:BoxChange:Box08:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+viewer:Point:Box08:In
+NumberOfControlPoints:0
+CONNECTION
+viewer:Renderer1:Box08:Renderer
+NumberOfControlPoints:0
+CONNECTION
+Box23:Out:Box08:Image
+NumberOfControlPoints:0
+CONNECTION
+Box05:Widget:Box13:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box21:widget:Box14:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box10:Widget:Box12:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box13:Widget:Box12:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box14:Widget:Box12:Widget3
+NumberOfControlPoints:0
+CONNECTION
+viewer:Widget:Box11:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box12:Widget:Box11:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box16:Widget:Widget:Widget
+NumberOfControlPoints:0
+CONNECTION
+Box11:Widget:Box17:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box17:Widget:Box16:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Title:Title:Box17:WinTitle
+NumberOfControlPoints:1
+86.409637:-25.629166:-900.000000
+CONNECTION
+Box08:Widget:Box18:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box18:Widget:Box10:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box08:lstPointsX:Box19:In1
+NumberOfControlPoints:0
+CONNECTION
+Box08:lstPointsY:Box19:In3
+NumberOfControlPoints:0
+CONNECTION
+Box08:lstPointsZ:Box19:In5
+NumberOfControlPoints:0
+CONNECTION
+Box19:Out:Box20:In
+NumberOfControlPoints:0
+CONNECTION
+Box20:Widget:Box18:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box08:BoxChange:Box20:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box19:Out:Point:Point
+NumberOfControlPoints:0
+CONNECTION
+Box08:BoxChange:BoxChange:BoxChange
+NumberOfControlPoints:0
+APP_END

diff --git a/PackRecalage/bbs/boxes/Getting3D1Point.bbs b/PackRecalage/bbs/boxes/Getting3D1Point.bbs
new file mode 100644 (file)
index 0000000..aeeca01
--- /dev/null
+++ b/PackRecalage/bbs/boxes/Getting3D1Point.bbs
@@ -0,0 +1,99 @@
+# ----------------------------------
+# - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
+# - /home/davila/Creatis/All/creatools_source/creaRigidRegistration/PackRecalage/bbs/boxes/Getting3D1Point.bbs
+# ----------------------------------
+
+include std
+include itkvtk
+include creaMaracasVisu
+include vtk
+include wx
+include toolsbbtk
+include wxvtk
+include std
+
+define Getting3D1Point PackRecalage
+
+author "info-dev@creatis.insa-lyon.fr"
+description "Recalage3D 1-point"
+
+category "example"
+
+new ViewerNV viewer
+  set viewer.nTypeView "6 1 2 0"
+
+new vtkImageDataPointerRelay Box23
+
+new LayoutTab Box16
+
+new ImageVtkPropertiesWidget Box21
+
+new IsoSurfaceWidget Box05
+  set Box05.Title "Surface"
+  set Box05.Vertical "V"
+
+new ShowNPoints Box08
+  set Box08.Type "1"
+  set Box08.WinTitle "Point select"
+
+new LayoutTab Box10
+
+new LayoutSplit Box11
+
+new LayoutLine Box12
+  set Box12.Orientation "H"
+
+new LayoutTab Box13
+
+new LayoutTab Box14
+
+new LayoutLine Box17
+
+new LayoutLine Box18
+  set Box18.WinTitle "Point selected"
+
+new ConcatStrings Box19
+  set Box19.In2 " "
+  set Box19.In4 " "
+
+new OutputText Box20
+
+
+connect Box23.Out viewer.In
+connect Box23.Out Box21.in
+connect viewer.Renderer1 Box05.vtkRenderer
+connect Box23.Out Box05.In
+connect Box05.BoxChange viewer.BoxExecute
+connect viewer.BoxChange Box08.BoxExecute
+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
+
+# Complex input ports
+input Image Box23.In " "
+input Title Box17.WinTitle " "
+
+# Complex output ports
+output Widget Box16.Widget " "
+output Point Box19.Out " "
+output BoxChange Box08.BoxChange " "
+
+
+endefine

diff --git a/PackRecalage/bbs/boxes/ImageCenter.bbg b/PackRecalage/bbs/boxes/ImageCenter.bbg
new file mode 100644 (file)
index 0000000..fbb9728
--- /dev/null
+++ b/PackRecalage/bbs/boxes/ImageCenter.bbg
@@ -0,0 +1,57 @@
+# ----------------------------------
+# - BBTKGEditor v 1.4 BBG BlackBox Diagram file
+# - /home/davila/Creatis/All/creatools_source/creaRigidRegistration/PackRecalage/bbs/boxes/ImageCenter.bbg
+# ----------------------------------
+
+APP_START
+CATEGORY:<VOID>
+DESCRIPTION:Description ??
+AUTHOR:Author ??
+COMPLEXBOX:TRUE
+COMPLEXBOXNAME:ImageCenter
+PACKAGENAME:PackRecalage
+COMPLEXOUTPUTS:1
+COMPLEX_PORT
+Point
+-72.503093:-7.990137:-900.000000
+FIN_COMPLEX_PORT
+COMPLEXINPUTS:1
+COMPLEX_PORT
+In
+-76.988002:78.025263:-900.000000
+FIN_COMPLEX_PORT
+BOXES:3
+BOX
+std:ConcatStrings:Box00
+ISEXEC:FALSE
+-78.364827:34.917489:-900.000000
+-32.789827:24.917489:-900.000000
+FIN_BOX
+BOX
+std:VectorRescaleSlope:Box01
+ISEXEC:FALSE
+-74.431594:12.921868:-900.000000
+-28.856594:2.921868:-900.000000
+PORT
+A:"0.5"
+FIN_BOX
+BOX
+vtk:ImageVtkProperties:Box02
+ISEXEC:FALSE
+-84.548002:56.225263:-900.000000
+-38.973002:46.225263:-900.000000
+FIN_BOX
+CONNECTIONS:4
+CONNECTION
+Box02:Size:Box00:In1
+NumberOfControlPoints:0
+CONNECTION
+Box00:Out:Box01:In
+NumberOfControlPoints:0
+CONNECTION
+In:In:Box02:In
+NumberOfControlPoints:0
+CONNECTION
+Box01:Out:Point:Point
+NumberOfControlPoints:0
+APP_END

diff --git a/PackRecalage/bbs/boxes/ImageCenter.bbs b/PackRecalage/bbs/boxes/ImageCenter.bbs
new file mode 100644 (file)
index 0000000..4bba8fc
--- /dev/null
+++ b/PackRecalage/bbs/boxes/ImageCenter.bbs
@@ -0,0 +1,36 @@
+# ----------------------------------
+# - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
+# - /home/davila/Creatis/All/creatools_source/creaRigidRegistration/PackRecalage/bbs/boxes/ImageCenter.bbs
+# ----------------------------------
+
+include std
+include itkvtk
+include std
+include vtk
+
+define ImageCenter PackRecalage
+
+author "Author ??"
+description "Description ??"
+
+category "<VOID>"
+
+new ConcatStrings Box00
+
+new VectorRescaleSlope Box01
+  set Box01.A "0.5"
+
+new ImageVtkProperties Box02
+
+
+connect Box02.Size Box00.In1
+connect Box00.Out Box01.In
+
+# Complex input ports
+input In Box02.In " "
+
+# Complex output ports
+output Point Box01.Out " "
+
+
+endefine

diff --git a/PackRecalage/bbs/boxes/Recalage3D1PointWidget.bbg b/PackRecalage/bbs/boxes/Recalage3D1PointWidget.bbg
index ba91db67527e237dde85a853dac6a7c3485d91d7..27d34f327f58905141b9c9fb31ba7e6e5b8ae02a 100644 (file)
--- a/PackRecalage/bbs/boxes/Recalage3D1PointWidget.bbg
+++ b/PackRecalage/bbs/boxes/Recalage3D1PointWidget.bbg
@@ -23,16 +23,24 @@ COMPLEX_PORT
 BoxChange
 97.489651:-445.237264:-900.000000
 FIN_COMPLEX_PORT
-COMPLEXINPUTS:2
+COMPLEXINPUTS:4
 COMPLEX_PORT
 Image1
 93.036335:127.259510:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
-Image2
-221.424351:134.619332:-900.000000
+OriginPoint
+-9.400195:118.821040:-900.000000
 FIN_COMPLEX_PORT
-BOXES:35
+COMPLEX_PORT
+CenterPoint
+-36.407518:118.821040:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+BoxExecute
+-96.193197:114.622654:-900.000000
+FIN_COMPLEX_PORT
+BOXES:33
 BOX
 wx:Slider:sdrAngleX
 ISEXEC:FALSE
@@ -144,8 +152,8 @@ FIN_BOX
 BOX
 std:MultipleInputs:mult
 ISEXEC:FALSE
--50.640168:-89.266153:-900.000000
--5.065168:-99.266153:-900.000000
+-97.379209:-93.208000:-900.000000
+-51.804209:-103.208000:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:mult2
@@ -176,12 +184,6 @@ ISEXEC:FALSE
 155.851205:99.455145:-900.000000
 FIN_BOX
 BOX
-vtk:vtkImageDataPointerRelay:Box23
-ISEXEC:FALSE
-192.884836:45.355205:-900.000000
-264.059836:35.355205:-900.000000
-FIN_BOX
-BOX
 wx:LayoutTab:Box32
 ISEXEC:FALSE
 -207.650205:-395.261812:-900.000000
@@ -298,30 +300,10 @@ PORT
 Title:"Reactive"
 FIN_BOX
 BOX
-std:ConcatStrings:Box45
-ISEXEC:FALSE
-88.775351:62.230349:-900.000000
-134.350351:52.230349:-900.000000
-FIN_BOX
-BOX
 std:ConcatStrings:Box46
 ISEXEC:FALSE
-10.855039:8.887646:-900.000000
-56.430039:-1.112354:-900.000000
-FIN_BOX
-BOX
-std:VectorRescaleSlope:Box47
-ISEXEC:FALSE
-81.587922:38.328329:-900.000000
-152.762922:28.328329:-900.000000
-PORT
-A:"0.5"
-FIN_BOX
-BOX
-vtk:ImageVtkProperties:Box48
-ISEXEC:FALSE
-92.759639:83.538123:-900.000000
-138.334639:73.538123:-900.000000
+-25.048814:5.074847:-900.000000
+20.526186:-4.925153:-900.000000
 FIN_BOX
 BOX
 std:GetVectorDoubleElement:Box49
@@ -336,8 +318,8 @@ FIN_BOX
 BOX
 std:GetVectorDoubleElement:Box50
 ISEXEC:FALSE
-182.023608:-97.450273:-900.000000
-253.198608:-107.450273:-900.000000
+182.023608:-102.534004:-900.000000
+253.198608:-112.534004:-900.000000
 PORT
 I:"1"
 PORT
@@ -371,7 +353,19 @@ ISEXEC:FALSE
 301.004401:-150.632818:-900.000000
 333.779401:-160.632818:-900.000000
 FIN_BOX
-CONNECTIONS:70
+BOX
+std:MagicBox:Box52
+ISEXEC:FALSE
+-40.538049:93.084649:-900.000000
+5.036951:83.084649:-900.000000
+FIN_BOX
+BOX
+std:MagicBox:Box53
+ISEXEC:FALSE
+26.486466:91.796524:-900.000000
+72.061466:81.796524:-900.000000
+FIN_BOX
+CONNECTIONS:69
 CONNECTION
 sdrAngleX:Out:transform:AngleX
 NumberOfControlPoints:0
@@ -517,69 +511,66 @@ CONNECTION
 Box44:Widget:Box40:Widget3
 NumberOfControlPoints:0
 CONNECTION
-Box47:Out:Box46:In1
-NumberOfControlPoints:0
-CONNECTION
 Box46:Out:reslicer:Origin
 NumberOfControlPoints:0
 CONNECTION
-Box48:Size:Box45:In1
+Image1:Image1:Box22:In
 NumberOfControlPoints:0
 CONNECTION
-Box45:Out:Box47:In
+reslicer:Out:Out:Out
 NumberOfControlPoints:0
 CONNECTION
-Box47:Out:Box49:In
+Box32:Widget:Widget:Widget
 NumberOfControlPoints:0
 CONNECTION
-Box47:Out:Box50:In
+mult3:BoxChange:BoxChange:BoxChange
 NumberOfControlPoints:0
 CONNECTION
-Box47:Out:Box51:In
+Box49:Out:Box36:In1
 NumberOfControlPoints:0
 CONNECTION
-Box22:Out:Box48:In
+TranslateX:Out:Box36:In2
 NumberOfControlPoints:0
 CONNECTION
-Image1:Image1:Box22:In
+Box36:Out:Box43:In1
 NumberOfControlPoints:0
 CONNECTION
-Image2:Image2:Box23:In
+TranslateY:Out:Box38:In2
 NumberOfControlPoints:0
 CONNECTION
-reslicer:Out:Out:Out
+TranslateZ:Out:Box39:In2
 NumberOfControlPoints:0
 CONNECTION
-Box32:Widget:Widget:Widget
+Box38:Out:Box43:In3
 NumberOfControlPoints:0
 CONNECTION
-mult3:BoxChange:BoxChange:BoxChange
+Box39:Out:Box43:In5
 NumberOfControlPoints:0
 CONNECTION
-Box49:Out:Box36:In1
+Box50:Out:Box38:In1
 NumberOfControlPoints:0
 CONNECTION
-TranslateX:Out:Box36:In2
+Box51:Out:Box39:In1
 NumberOfControlPoints:0
 CONNECTION
-Box36:Out:Box43:In1
+CenterPoint:CenterPoint:Box52:In
 NumberOfControlPoints:0
 CONNECTION
-TranslateY:Out:Box38:In2
+OriginPoint:OriginPoint:Box53:In
 NumberOfControlPoints:0
 CONNECTION
-TranslateZ:Out:Box39:In2
+Box52:Out:Box46:In1
 NumberOfControlPoints:0
 CONNECTION
-Box38:Out:Box43:In3
+Box53:Out:Box49:In
 NumberOfControlPoints:0
 CONNECTION
-Box39:Out:Box43:In5
+Box53:Out:Box50:In
 NumberOfControlPoints:0
 CONNECTION
-Box50:Out:Box38:In1
+Box53:Out:Box51:In
 NumberOfControlPoints:0
 CONNECTION
-Box51:Out:Box39:In1
+BoxExecute:BoxExecute:mult3:In3
 NumberOfControlPoints:0
 APP_END

diff --git a/PackRecalage/bbs/boxes/Recalage3D1PointWidget.bbs b/PackRecalage/bbs/boxes/Recalage3D1PointWidget.bbs
index 2b6a4e969e57ec5f225ea3b58443807fefe9044b..60082c851782ec582a2f52ad9a15ad0bf533e6ca 100644 (file)
--- a/PackRecalage/bbs/boxes/Recalage3D1PointWidget.bbs
+++ b/PackRecalage/bbs/boxes/Recalage3D1PointWidget.bbs
@@ -76,8 +76,6 @@ new LayoutLine toolsLayout
 
 new vtkImageDataPointerRelay Box22
 
-new vtkImageDataPointerRelay Box23
-
 new LayoutTab Box32
 
 new LayoutLine Box33
@@ -125,15 +123,8 @@ new CheckBox Box44
   set Box44.ReactiveOnKeystroke "true"
   set Box44.Title "Reactive"
 
-new ConcatStrings Box45
-
 new ConcatStrings Box46
 
-new VectorRescaleSlope Box47
-  set Box47.A "0.5"
-
-new ImageVtkProperties Box48
-
 new GetVectorDoubleElement Box49
   set Box49.I "0"
   set Box49.In "0"
@@ -152,6 +143,10 @@ new Add Box38
 
 new Add Box39
 
+new MagicBox Box52
+
+new MagicBox Box53
+
 
 connect sdrAngleX.Out transform.AngleX
 connect sdrAngleY.Out transform.AngleY
@@ -201,14 +196,7 @@ connect Box44.Out sdrAngleX.ReactiveOnTrack
 connect Box44.Out sdrAngleY.ReactiveOnTrack
 connect Box44.Out sdrAngleZ.ReactiveOnTrack
 connect Box44.Widget Box40.Widget3
-connect Box47.Out Box46.In1
 connect Box46.Out reslicer.Origin
-connect Box48.Size Box45.In1
-connect Box45.Out Box47.In
-connect Box47.Out Box49.In
-connect Box47.Out Box50.In
-connect Box47.Out Box51.In
-connect Box22.Out Box48.In
 connect Box49.Out Box36.In1
 connect TranslateX.Out Box36.In2
 connect Box36.Out Box43.In1
@@ -218,10 +206,16 @@ connect Box38.Out Box43.In3
 connect Box39.Out Box43.In5
 connect Box50.Out Box38.In1
 connect Box51.Out Box39.In1
+connect Box52.Out Box46.In1
+connect Box53.Out Box49.In
+connect Box53.Out Box50.In
+connect Box53.Out Box51.In
 
 # Complex input ports
 input Image1 Box22.In " "
-input Image2 Box23.In " "
+input CenterPoint Box52.In " "
+input OriginPoint Box53.In " "
+input BoxExecute mult3.In3 " "
 
 # Complex output ports
 output Out reslicer.Out " "