]> Creatis software - creaRigidRegistration.git/commitdiff
2020 Feature Comparing Images in XY XZ YZ planes
authorEduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Tue, 9 Jul 2013 21:04:30 +0000 (23:04 +0200)
committerEduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Tue, 9 Jul 2013 21:04:30 +0000 (23:04 +0200)
12 files changed:
PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbg
PackRecalage/bbs/appli/ExampleRecalage3D1Point.bbs
PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg
PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs
PackRecalage/bbs/boxes/CompareImagesTransparencyWidget_3Dp.bbg
PackRecalage/bbs/boxes/CompareImagesTransparencyWidget_3Dp.bbs
PackRecalage/bbs/boxes/CompareImagesWidget3D.bbg
PackRecalage/bbs/boxes/CompareImagesWidget3D.bbs
PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbg
PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs
PackRecalage/bbs/boxes/Recalage3D1PointWidget.bbg
PackRecalage/bbs/boxes/Recalage3D1PointWidget.bbs

index c8d2615b4cfb9d4f3cf11ab744d647412dac1c2e..954422c9c01d5fd6a5c1e23a79bb65105cbbf3ab 100644 (file)
@@ -9,54 +9,44 @@ DESCRIPTION:Recalage3D 1-point
 AUTHOR:info-dev@creatis.insa-lyon.fr
 COMPLEXBOX:FALSE
 COMPLEXINPUTS:0
 AUTHOR:info-dev@creatis.insa-lyon.fr
 COMPLEXBOX:FALSE
 COMPLEXINPUTS:0
-BOXES:15
+BOXES:19
 BOX
 creaMaracasVisu:ViewerNV:viewer
 ISEXEC:FALSE
 BOX
 creaMaracasVisu:ViewerNV:viewer
 ISEXEC:FALSE
--95.886041:-28.640196:-900.000000
--50.311041:-38.640196:-900.000000
+-97.386127:-9.305749:-900.000000
+-36.746127:-19.305749:-900.000000
 PORT
 PORT
-nTypeView:"5"
+nTypeView:"6 1 2 0"
 FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:viewer2
 ISEXEC:FALSE
 FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:viewer2
 ISEXEC:FALSE
--30.590585:-28.499929:-900.000000
-14.984415:-38.499929:-900.000000
+-30.923938:-7.498719:-900.000000
+29.716062:-17.498719:-900.000000
 PORT
 PORT
-nTypeView:"5"
+nTypeView:"6 1 2 0"
 FIN_BOX
 BOX
 wx:LayoutSplit:imagesLayout
 ISEXEC:FALSE
 FIN_BOX
 BOX
 wx:LayoutSplit:imagesLayout
 ISEXEC:FALSE
--11.258778:-56.794727:-900.000000
-34.316222:-66.794727:-900.000000
+-53.427874:-62.295044:-900.000000
+-7.852874:-72.295044:-900.000000
 PORT
 PORT
-Orientation:"v"
+Orientation:"H"
 PORT
 Proportion:"50"
 PORT
 Proportion:"50"
+PORT
+WinTitle:"Input Images"
 FIN_BOX
 BOX
 wx:LayoutSplit:resultLayout
 ISEXEC:FALSE
 FIN_BOX
 BOX
 wx:LayoutSplit:resultLayout
 ISEXEC:FALSE
-39.262584:-34.045017:-900.000000
-84.837584:-44.045017:-900.000000
+45.262930:-64.213422:-900.000000
+90.837930:-74.213422:-900.000000
 PORT
 PORT
-Proportion:"70"
-FIN_BOX
-BOX
-wx:LayoutSplit:main
-ISEXEC:TRUE
-30.278173:-76.523303:-900.000000
-75.853173:-86.523303:-900.000000
-PORT
-Orientation:"h"
-PORT
-Proportion:"25"
-PORT
-WinHeight:"800"
+Proportion:"80"
 PORT
 PORT
-WinWidth:"1200"
+WinTitle:"Registration"
 FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box22
 FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box22
@@ -85,36 +75,36 @@ FIN_BOX
 BOX
 PackRecalage:Recalage3D1PointWidget:Box52
 ISEXEC:FALSE
 BOX
 PackRecalage:Recalage3D1PointWidget:Box52
 ISEXEC:FALSE
-82.461349:49.513410:-900.000000
-153.636349:39.513410:-900.000000
+84.715423:45.756620:-900.000000
+155.890423:35.756620:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesWidget3D:Box20
 ISEXEC:FALSE
 FIN_BOX
 BOX
 PackRecalage:CompareImagesWidget3D:Box20
 ISEXEC:FALSE
-25.866266:24.435408:-900.000000
-97.041266:14.435408:-900.000000
+54.793552:24.685861:-900.000000
+125.968552:14.685861:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImages_3DwithPlanes_Widget:Box11
 ISEXEC:FALSE
 FIN_BOX
 BOX
 PackRecalage:CompareImages_3DwithPlanes_Widget:Box11
 ISEXEC:FALSE
-99.719017:23.927157:-900.000000
-170.894017:13.927157:-900.000000
+99.969470:0.134151:-900.000000
+171.144470:-9.865849:-900.000000
 PORT
 WinTitle:"3D Planes"
 FIN_BOX
 BOX
 wx:LayoutSplit:Box12
 ISEXEC:FALSE
 PORT
 WinTitle:"3D Planes"
 FIN_BOX
 BOX
 wx:LayoutSplit:Box12
 ISEXEC:FALSE
-83.845176:-12.238888:-900.000000
-129.420176:-22.238888:-900.000000
+75.204558:-41.416627:-900.000000
+120.779558:-51.416627:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
 BOX
 wx:LayoutTab:Box13
 ISEXEC:FALSE
 PORT
 Orientation:"H"
 FIN_BOX
 BOX
 wx:LayoutTab:Box13
 ISEXEC:FALSE
-98.097060:6.012510:-900.000000
-155.657060:-3.987490:-900.000000
+88.329405:-20.159797:-900.000000
+145.889405:-30.159797:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesWidget:Box14
 FIN_BOX
 BOX
 PackRecalage:CompareImagesWidget:Box14
@@ -124,32 +114,52 @@ ISEXEC:FALSE
 PORT
 WinTitle:"2D+t"
 FIN_BOX
 PORT
 WinTitle:"2D+t"
 FIN_BOX
-CONNECTIONS:23
-CONNECTION
-viewer:Widget:imagesLayout:Widget1
-NumberOfControlPoints:0
-CONNECTION
-viewer2:Widget:imagesLayout:Widget2
-NumberOfControlPoints:0
-CONNECTION
-imagesLayout:Widget:main:Widget1
-NumberOfControlPoints:0
-CONNECTION
-resultLayout:Widget:main:Widget2
-NumberOfControlPoints:0
+BOX
+wx:LayoutTab:Box15
+ISEXEC:TRUE
+7.083741:-94.255430:-900.000000
+64.643741:-104.255430:-900.000000
+PORT
+WinHeight:"800"
+PORT
+WinWidth:"1200"
+FIN_BOX
+BOX
+wx:LayoutTab:Box16
+ISEXEC:FALSE
+-94.922135:-43.252492:-900.000000
+-37.362135:-53.252492:-900.000000
+FIN_BOX
+BOX
+wx:LayoutTab:Box17
+ISEXEC:FALSE
+-29.418361:-41.419053:-900.000000
+28.141639:-51.419053:-900.000000
+FIN_BOX
+BOX
+wx:LayoutLine:Box18
+ISEXEC:FALSE
+-27.584922:-24.751426:-900.000000
+29.975078:-34.751426:-900.000000
+PORT
+WinTitle:"Move Image"
+FIN_BOX
+BOX
+wx:LayoutLine:Box19
+ISEXEC:FALSE
+-96.922250:-25.584807:-900.000000
+-39.362250:-35.584807:-900.000000
+PORT
+WinTitle:"Fix Image"
+FIN_BOX
+CONNECTIONS:29
 CONNECTION
 Box22:Out:viewer2:In
 NumberOfControlPoints:0
 CONNECTION
 CONNECTION
 Box22:Out:viewer2:In
 NumberOfControlPoints:0
 CONNECTION
-Box24:Out:Box22:In
-NumberOfControlPoints:0
-CONNECTION
 Box23:Out:viewer:In
 NumberOfControlPoints:0
 CONNECTION
 Box23:Out:viewer:In
 NumberOfControlPoints:0
 CONNECTION
-Box25:Out:Box23:In
-NumberOfControlPoints:0
-CONNECTION
 Box22:Out:Box52:Image1
 NumberOfControlPoints:0
 CONNECTION
 Box22:Out:Box52:Image1
 NumberOfControlPoints:0
 CONNECTION
@@ -163,8 +173,7 @@ Box52:BoxChange:Box20:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
 Box52:Widget:resultLayout:Widget2
 NumberOfControlPoints:0
 CONNECTION
 Box52:Widget:resultLayout:Widget2
-NumberOfControlPoints:1
-90.032890:1.161733:-900.000000
+NumberOfControlPoints:0
 CONNECTION
 Box23:Out:Box11:In1
 NumberOfControlPoints:0
 CONNECTION
 Box23:Out:Box11:In1
 NumberOfControlPoints:0
@@ -195,4 +204,40 @@ NumberOfControlPoints:0
 CONNECTION
 Box52:BoxChange:Box13:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
 Box52:BoxChange:Box13:BoxExecute
 NumberOfControlPoints:0
+CONNECTION
+imagesLayout:Widget:Box15:Widget1
+NumberOfControlPoints:0
+CONNECTION
+resultLayout:Widget:Box15:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box16:Widget:imagesLayout:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box17:Widget:imagesLayout:Widget2
+NumberOfControlPoints:0
+CONNECTION
+viewer2:Widget:Box18:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box18:Widget:Box17:Widget1
+NumberOfControlPoints:0
+CONNECTION
+viewer:Widget:Box19:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box19:Widget:Box16:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box20:Point:Box11:Point
+NumberOfControlPoints:0
+CONNECTION
+Box20:BoxChange:Box11:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box24:Out:Box22:In
+NumberOfControlPoints:0
+CONNECTION
+Box25:Out:Box23:In
+NumberOfControlPoints:0
 APP_END
 APP_END
index c558614dcdc97d6f9edbcce196ca3e370ff6ef03..03e6efc84c53d5ca55981aa5578545c0d1d3610b 100644 (file)
@@ -19,23 +19,19 @@ description "Recalage3D 1-point"
 category "example"
 
 new ViewerNV viewer
 category "example"
 
 new ViewerNV viewer
-  set viewer.nTypeView "5"
+  set viewer.nTypeView "6 1 2 0"
 
 new ViewerNV viewer2
 
 new ViewerNV viewer2
-  set viewer2.nTypeView "5"
+  set viewer2.nTypeView "6 1 2 0"
 
 new LayoutSplit imagesLayout
 
 new LayoutSplit imagesLayout
-  set imagesLayout.Orientation "v"
+  set imagesLayout.Orientation "H"
   set imagesLayout.Proportion "50"
   set imagesLayout.Proportion "50"
+  set imagesLayout.WinTitle "Input Images"
 
 new LayoutSplit resultLayout
 
 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
 
 
 new vtkImageDataPointerRelay Box22
 
@@ -60,23 +56,25 @@ new LayoutTab Box13
 new CompareImagesWidget Box14
   set Box14.WinTitle "2D+t"
 
 new CompareImagesWidget Box14
   set Box14.WinTitle "2D+t"
 
+new LayoutTab Box15
+  set Box15.WinHeight "800"
+  set Box15.WinWidth "1200"
 
 
-connect viewer.Widget imagesLayout.Widget1
+new LayoutTab Box16
 
 
-connect viewer2.Widget imagesLayout.Widget2
+new LayoutTab Box17
 
 
-connect imagesLayout.Widget main.Widget1
+new LayoutLine Box18
+  set Box18.WinTitle "Move Image"
 
 
-connect resultLayout.Widget main.Widget2
+new LayoutLine Box19
+  set Box19.WinTitle "Fix Image"
 
 
-connect Box22.Out viewer2.In
 
 
-connect Box24.Out Box22.In
+connect Box22.Out viewer2.In
 
 connect Box23.Out viewer.In
 
 
 connect Box23.Out viewer.In
 
-connect Box25.Out Box23.In
-
 connect Box22.Out Box52.Image1
 
 connect Box23.Out Box52.Image2
 connect Box22.Out Box52.Image1
 
 connect Box23.Out Box52.Image2
@@ -107,7 +105,31 @@ connect Box23.Out Box14.In1
 
 connect Box52.BoxChange Box13.BoxExecute
 
 
 connect Box52.BoxChange Box13.BoxExecute
 
+connect imagesLayout.Widget Box15.Widget1
+
+connect resultLayout.Widget Box15.Widget2
+
+connect Box16.Widget imagesLayout.Widget1
+
+connect Box17.Widget imagesLayout.Widget2
+
+connect viewer2.Widget Box18.Widget1
+
+connect Box18.Widget Box17.Widget1
+
+connect viewer.Widget Box19.Widget1
+
+connect Box19.Widget Box16.Widget1
+
+connect Box20.Point Box11.Point
+
+connect Box20.BoxChange Box11.BoxExecute
+
+connect Box24.Out Box22.In
+
+connect Box25.Out Box23.In
+
 
 
 # Complex input ports
 
 
 # Complex input ports
-exec main
+exec Box15
index 94ba45a2ceff4fa3c11bcd85272e19b7f84a3e42..5a71fbbe78bfd1de38a9b506114d7b887aacecb1 100644 (file)
@@ -13,7 +13,7 @@ PACKAGENAME:PackRecalage
 COMPLEXOUTPUTS:1
 COMPLEX_PORT
 Widget
 COMPLEXOUTPUTS:1
 COMPLEX_PORT
 Widget
-10.881246:-134.666962:-900.000000
+9.779254:-145.273634:-900.000000
 FIN_COMPLEX_PORT
 COMPLEXINPUTS:2
 COMPLEX_PORT
 FIN_COMPLEX_PORT
 COMPLEXINPUTS:2
 COMPLEX_PORT
@@ -24,7 +24,7 @@ COMPLEX_PORT
 ImageVector2
 -7.650970:201.506959:-900.000000
 FIN_COMPLEX_PORT
 ImageVector2
 -7.650970:201.506959:-900.000000
 FIN_COMPLEX_PORT
-BOXES:27
+BOXES:39
 BOX
 PackRecalage:ImageSwitcherBox:switch
 ISEXEC:FALSE
 BOX
 PackRecalage:ImageSwitcherBox:switch
 ISEXEC:FALSE
@@ -58,10 +58,10 @@ FIN_BOX
 BOX
 wx:LayoutSplit:switchWindow
 ISEXEC:FALSE
 BOX
 wx:LayoutSplit:switchWindow
 ISEXEC:FALSE
-12.201262:-106.424745:-900.000000
-57.776262:-116.424745:-900.000000
+9.170784:-129.015578:-900.000000
+54.745784:-139.015578:-900.000000
 PORT
 PORT
-Proportion:"80"
+Proportion:"90"
 FIN_BOX
 BOX
 wx:LayoutLine:Box47
 FIN_BOX
 BOX
 wx:LayoutLine:Box47
@@ -74,30 +74,30 @@ FIN_BOX
 BOX
 wx:LayoutLine:Box48
 ISEXEC:FALSE
 BOX
 wx:LayoutLine:Box48
 ISEXEC:FALSE
-181.711362:-65.401255:-900.000000
-239.271362:-75.401255:-900.000000
+171.462072:-84.191621:-900.000000
+229.022072:-94.191621:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:Box49
 ISEXEC:FALSE
 FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:Box49
 ISEXEC:FALSE
--207.829297:-9.757593:-900.000000
--147.189297:-19.757593:-900.000000
+-212.488065:-27.283436:-900.000000
+-151.848065:-37.283436:-900.000000
 PORT
 PORT
-nTypeView:0
+nTypeView:"-1"
 FIN_BOX
 BOX
 wx:LayoutSplit:Box10
 ISEXEC:FALSE
 FIN_BOX
 BOX
 wx:LayoutSplit:Box10
 ISEXEC:FALSE
--82.103886:-69.211419:-900.000000
--36.528886:-79.211419:-900.000000
+-59.661405:-102.024887:-900.000000
+-14.086405:-112.024887:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
 BOX
 wx:LayoutSplit:Box12
 ISEXEC:FALSE
 PORT
 Orientation:"H"
 FIN_BOX
 BOX
 wx:LayoutSplit:Box12
 ISEXEC:FALSE
--162.363566:-34.597023:-900.000000
--116.788566:-44.597023:-900.000000
+-142.093048:-80.131087:-900.000000
+-96.518048:-90.131087:-900.000000
 FIN_BOX
 BOX
 PackRecalage:ImageSwitcherFilter:Box17
 FIN_BOX
 BOX
 PackRecalage:ImageSwitcherFilter:Box17
@@ -136,16 +136,16 @@ FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:Box24
 ISEXEC:FALSE
 BOX
 creaMaracasVisu:ViewerNV:Box24
 ISEXEC:FALSE
--133.337236:-10.426995:-900.000000
--72.697236:-20.426995:-900.000000
+-132.228005:-26.178069:-900.000000
+-71.588005:-36.178069:-900.000000
 PORT
 PORT
-nTypeView:0
+nTypeView:"-1"
 FIN_BOX
 BOX
 PackRecalage:ImageSwitcherFilter:Box25
 ISEXEC:FALSE
 FIN_BOX
 BOX
 PackRecalage:ImageSwitcherFilter:Box25
 ISEXEC:FALSE
--118.174100:17.189781:-900.000000
--72.599100:7.189781:-900.000000
+-126.227114:16.945750:-900.000000
+-80.652114:6.945750:-900.000000
 FIN_BOX
 BOX
 vtk:GetVectorVtkImageDataElement:Box26
 FIN_BOX
 BOX
 vtk:GetVectorVtkImageDataElement:Box26
@@ -166,22 +166,22 @@ FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:Box28
 ISEXEC:FALSE
 BOX
 creaMaracasVisu:ViewerNV:Box28
 ISEXEC:FALSE
--47.438421:-10.695429:-900.000000
-13.201579:-20.695429:-900.000000
+-43.245529:-24.117119:-900.000000
+17.394471:-34.117119:-900.000000
 PORT
 PORT
-nTypeView:0
+nTypeView:"-1"
 FIN_BOX
 BOX
 wx:LayoutSplit:Box29
 ISEXEC:FALSE
 FIN_BOX
 BOX
 wx:LayoutSplit:Box29
 ISEXEC:FALSE
--9.220403:-34.192690:-900.000000
-36.354597:-44.192690:-900.000000
+-4.744306:-83.615406:-900.000000
+40.830694:-93.615406:-900.000000
 FIN_BOX
 BOX
 PackRecalage:ImageSwitcherFilter:Box30
 ISEXEC:FALSE
 FIN_BOX
 BOX
 PackRecalage:ImageSwitcherFilter:Box30
 ISEXEC:FALSE
--40.596732:14.237009:-900.000000
-4.978268:4.237009:-900.000000
+-40.108671:13.992978:-900.000000
+5.466329:3.992978:-900.000000
 FIN_BOX
 BOX
 vtk:GetVectorVtkImageDataElement:Box31
 FIN_BOX
 BOX
 vtk:GetVectorVtkImageDataElement:Box31
@@ -202,16 +202,16 @@ FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:Box33
 ISEXEC:FALSE
 BOX
 creaMaracasVisu:ViewerNV:Box33
 ISEXEC:FALSE
-18.463758:-9.754229:-900.000000
-79.103758:-19.754229:-900.000000
+36.477662:-25.860257:-900.000000
+97.117662:-35.860257:-900.000000
 PORT
 PORT
-nTypeView:0
+nTypeView:"-1"
 FIN_BOX
 BOX
 PackRecalage:ImageSwitcherFilter:Box34
 ISEXEC:FALSE
 FIN_BOX
 BOX
 PackRecalage:ImageSwitcherFilter:Box34
 ISEXEC:FALSE
-16.447132:14.372908:-900.000000
-62.022132:4.372908:-900.000000
+38.165867:16.569185:-900.000000
+83.740867:6.569185:-900.000000
 FIN_BOX
 BOX
 vtk:GetVectorVtkImageDataElement:Box35
 FIN_BOX
 BOX
 vtk:GetVectorVtkImageDataElement:Box35
@@ -229,7 +229,87 @@ ISEXEC:FALSE
 PORT
 I:"2"
 FIN_BOX
 PORT
 I:"2"
 FIN_BOX
-CONNECTIONS:46
+BOX
+creaMaracasVisu:ImageChangeInformation:Box37
+ISEXEC:FALSE
+-209.755500:-6.100768:-900.000000
+-138.580500:-16.100768:-900.000000
+FIN_BOX
+BOX
+creaMaracasVisu:ImageChangeInformation:Box38
+ISEXEC:FALSE
+-123.645359:-6.044734:-900.000000
+-52.470359:-16.044734:-900.000000
+FIN_BOX
+BOX
+creaMaracasVisu:ImageChangeInformation:Box39
+ISEXEC:FALSE
+-34.307929:-4.891134:-900.000000
+36.867071:-14.891134:-900.000000
+FIN_BOX
+BOX
+creaMaracasVisu:ImageChangeInformation:Box40
+ISEXEC:FALSE
+43.993230:-5.079130:-900.000000
+115.168230:-15.079130:-900.000000
+FIN_BOX
+BOX
+wx:LayoutTab:Box41
+ISEXEC:FALSE
+-209.029859:-60.984709:-900.000000
+-151.469859:-70.984709:-900.000000
+FIN_BOX
+BOX
+wx:LayoutLine:Box42
+ISEXEC:FALSE
+-208.505223:-44.819919:-900.000000
+-150.945223:-54.819919:-900.000000
+PORT
+WinTitle:"Plane XZ  (rotation/slice Y)"
+FIN_BOX
+BOX
+wx:LayoutTab:Box44
+ISEXEC:FALSE
+-139.164728:-59.994069:-900.000000
+-81.604728:-69.994069:-900.000000
+FIN_BOX
+BOX
+wx:LayoutLine:Box45
+ISEXEC:FALSE
+-138.364593:-44.104777:-900.000000
+-80.804593:-54.104777:-900.000000
+PORT
+WinTitle:"Plane XY  (rotation/slice Z)"
+FIN_BOX
+BOX
+wx:LayoutTab:Box46
+ISEXEC:FALSE
+-45.633169:-61.509307:-900.000000
+11.926831:-71.509307:-900.000000
+FIN_BOX
+BOX
+wx:LayoutLine:Box50
+ISEXEC:FALSE
+-45.108532:-45.344518:-900.000000
+12.451468:-55.344518:-900.000000
+PORT
+WinTitle:"Plane YZ  (rotation/slice X)"
+FIN_BOX
+BOX
+wx:LayoutTab:Box51
+ISEXEC:FALSE
+24.231963:-60.518667:-900.000000
+81.791963:-70.518667:-900.000000
+FIN_BOX
+BOX
+wx:LayoutLine:Box52
+ISEXEC:FALSE
+25.032097:-44.629375:-900.000000
+82.592097:-54.629375:-900.000000
+PORT
+WinTitle:"Plane YZ  (rotation/slice X)"
+FIN_BOX
+CONNECTIONS:58
 CONNECTION
 checkS:Out:switch:On
 NumberOfControlPoints:0
 CONNECTION
 checkS:Out:switch:On
 NumberOfControlPoints:0
@@ -264,12 +344,6 @@ CONNECTION
 Box10:Widget:switchWindow:Widget1
 NumberOfControlPoints:0
 CONNECTION
 Box10:Widget:switchWindow:Widget1
 NumberOfControlPoints:0
 CONNECTION
-Box49:Widget:Box12:Widget1
-NumberOfControlPoints:0
-CONNECTION
-Box17:Out:Box49:In
-NumberOfControlPoints:0
-CONNECTION
 switch:BoxChange:Box17:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
 switch:BoxChange:Box17:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
@@ -294,9 +368,6 @@ CONNECTION
 Box21:Out:Box17:In2
 NumberOfControlPoints:0
 CONNECTION
 Box21:Out:Box17:In2
 NumberOfControlPoints:0
 CONNECTION
-Box25:Out:Box24:In
-NumberOfControlPoints:0
-CONNECTION
 Box25:BoxChange:Box24:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
 Box25:BoxChange:Box24:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
@@ -306,15 +377,6 @@ CONNECTION
 Box27:Out:Box25:In2
 NumberOfControlPoints:0
 CONNECTION
 Box27:Out:Box25:In2
 NumberOfControlPoints:0
 CONNECTION
-Box24:Widget:Box12:Widget2
-NumberOfControlPoints:0
-CONNECTION
-Box28:Widget:Box29:Widget1
-NumberOfControlPoints:0
-CONNECTION
-Box30:Out:Box28:In
-NumberOfControlPoints:0
-CONNECTION
 Box30:BoxChange:Box28:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
 Box30:BoxChange:Box28:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
@@ -324,9 +386,6 @@ CONNECTION
 Box32:Out:Box30:In2
 NumberOfControlPoints:0
 CONNECTION
 Box32:Out:Box30:In2
 NumberOfControlPoints:0
 CONNECTION
-Box34:Out:Box33:In
-NumberOfControlPoints:0
-CONNECTION
 Box34:BoxChange:Box33:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
 Box34:BoxChange:Box33:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
@@ -336,9 +395,6 @@ CONNECTION
 Box36:Out:Box34:In2
 NumberOfControlPoints:0
 CONNECTION
 Box36:Out:Box34:In2
 NumberOfControlPoints:0
 CONNECTION
-Box33:Widget:Box29:Widget2
-NumberOfControlPoints:0
-CONNECTION
 switch:BoxChange:Box30:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
 switch:BoxChange:Box30:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
@@ -368,4 +424,64 @@ NumberOfControlPoints:0
 CONNECTION
 Box23:Out:Box36:In
 NumberOfControlPoints:0
 CONNECTION
 Box23:Out:Box36:In
 NumberOfControlPoints:0
+CONNECTION
+Box17:Out:Box37:In
+NumberOfControlPoints:0
+CONNECTION
+Box37:Out:Box49:In
+NumberOfControlPoints:0
+CONNECTION
+Box25:Out:Box38:In
+NumberOfControlPoints:0
+CONNECTION
+Box38:Out:Box24:In
+NumberOfControlPoints:0
+CONNECTION
+Box30:Out:Box39:In
+NumberOfControlPoints:0
+CONNECTION
+Box39:Out:Box28:In
+NumberOfControlPoints:0
+CONNECTION
+Box34:Out:Box40:In
+NumberOfControlPoints:0
+CONNECTION
+Box40:Out:Box33:In
+NumberOfControlPoints:0
+CONNECTION
+Box41:Widget:Box12:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box49:Widget:Box42:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box42:Widget:Box41:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box45:Widget:Box44:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box24:Widget:Box45:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box44:Widget:Box12:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box50:Widget:Box46:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box52:Widget:Box51:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box28:Widget:Box50:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box46:Widget:Box29:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box33:Widget:Box52:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box51:Widget:Box29:Widget2
+NumberOfControlPoints:0
 APP_END
 APP_END
index 7b4eb2102d63156872483c0d67c858c4d74f8751..0a1439ef7e8c12acefc0924a124f6f316223b21c 100644 (file)
@@ -31,7 +31,7 @@ new Slider sdrT
   set sdrT.ReactiveOnTrack "True"
 
 new LayoutSplit switchWindow
   set sdrT.ReactiveOnTrack "True"
 
 new LayoutSplit switchWindow
-  set switchWindow.Proportion "80"
+  set switchWindow.Proportion "90"
 
 new LayoutLine Box47
   set Box47.Orientation H
 
 new LayoutLine Box47
   set Box47.Orientation H
@@ -39,7 +39,7 @@ new LayoutLine Box47
 new LayoutLine Box48
 
 new ViewerNV Box49
 new LayoutLine Box48
 
 new ViewerNV Box49
-  set Box49.nTypeView 0
+  set Box49.nTypeView "-1"
 
 new LayoutSplit Box10
   set Box10.Orientation "H"
 
 new LayoutSplit Box10
   set Box10.Orientation "H"
@@ -59,7 +59,7 @@ new MagicBox Box22
 new MagicBox Box23
 
 new ViewerNV Box24
 new MagicBox Box23
 
 new ViewerNV Box24
-  set Box24.nTypeView 0
+  set Box24.nTypeView "-1"
 
 new ImageSwitcherFilter Box25
 
 
 new ImageSwitcherFilter Box25
 
@@ -70,7 +70,7 @@ new GetVectorVtkImageDataElement Box27
   set Box27.I "0"
 
 new ViewerNV Box28
   set Box27.I "0"
 
 new ViewerNV Box28
-  set Box28.nTypeView 0
+  set Box28.nTypeView "-1"
 
 new LayoutSplit Box29
 
 
 new LayoutSplit Box29
 
@@ -83,7 +83,7 @@ new GetVectorVtkImageDataElement Box32
   set Box32.I "2"
 
 new ViewerNV Box33
   set Box32.I "2"
 
 new ViewerNV Box33
-  set Box33.nTypeView 0
+  set Box33.nTypeView "-1"
 
 new ImageSwitcherFilter Box34
 
 
 new ImageSwitcherFilter Box34
 
@@ -93,6 +93,34 @@ new GetVectorVtkImageDataElement Box35
 new GetVectorVtkImageDataElement Box36
   set Box36.I "2"
 
 new GetVectorVtkImageDataElement Box36
   set Box36.I "2"
 
+new ImageChangeInformation Box37
+
+new ImageChangeInformation Box38
+
+new ImageChangeInformation Box39
+
+new ImageChangeInformation Box40
+
+new LayoutTab Box41
+
+new LayoutLine Box42
+  set Box42.WinTitle "Plane XZ  (rotation/slice Y)"
+
+new LayoutTab Box44
+
+new LayoutLine Box45
+  set Box45.WinTitle "Plane XY  (rotation/slice Z)"
+
+new LayoutTab Box46
+
+new LayoutLine Box50
+  set Box50.WinTitle "Plane YZ  (rotation/slice X)"
+
+new LayoutTab Box51
+
+new LayoutLine Box52
+  set Box52.WinTitle "Plane YZ  (rotation/slice X)"
+
 
 connect checkS.Out switch.On
 connect sdrT.Out switch.Time
 
 connect checkS.Out switch.On
 connect sdrT.Out switch.Time
@@ -104,29 +132,21 @@ connect Box47.Widget Box48.Widget1
 connect Box48.Widget switchWindow.Widget2
 connect Box12.Widget Box10.Widget1
 connect Box10.Widget switchWindow.Widget1
 connect Box48.Widget switchWindow.Widget2
 connect Box12.Widget Box10.Widget1
 connect Box10.Widget switchWindow.Widget1
-connect Box49.Widget Box12.Widget1
-connect Box17.Out Box49.In
 connect switch.BoxChange Box17.BoxExecute
 connect Box17.BoxChange Box49.BoxExecute
 connect Box22.Out Box19.In
 connect Box23.Out Box21.In
 connect Box19.Out Box17.In1
 connect Box21.Out Box17.In2
 connect switch.BoxChange Box17.BoxExecute
 connect Box17.BoxChange Box49.BoxExecute
 connect Box22.Out Box19.In
 connect Box23.Out Box21.In
 connect Box19.Out Box17.In1
 connect Box21.Out Box17.In2
-connect Box25.Out Box24.In
 connect Box25.BoxChange Box24.BoxExecute
 connect Box26.Out Box25.In1
 connect Box27.Out Box25.In2
 connect Box25.BoxChange Box24.BoxExecute
 connect Box26.Out Box25.In1
 connect Box27.Out Box25.In2
-connect Box24.Widget Box12.Widget2
-connect Box28.Widget Box29.Widget1
-connect Box30.Out Box28.In
 connect Box30.BoxChange Box28.BoxExecute
 connect Box31.Out Box30.In1
 connect Box32.Out Box30.In2
 connect Box30.BoxChange Box28.BoxExecute
 connect Box31.Out Box30.In1
 connect Box32.Out Box30.In2
-connect Box34.Out Box33.In
 connect Box34.BoxChange Box33.BoxExecute
 connect Box35.Out Box34.In1
 connect Box36.Out Box34.In2
 connect Box34.BoxChange Box33.BoxExecute
 connect Box35.Out Box34.In1
 connect Box36.Out Box34.In2
-connect Box33.Widget Box29.Widget2
 connect switch.BoxChange Box30.BoxExecute
 connect switch.BoxChange Box34.BoxExecute
 connect Box29.Widget Box10.Widget2
 connect switch.BoxChange Box30.BoxExecute
 connect switch.BoxChange Box34.BoxExecute
 connect Box29.Widget Box10.Widget2
@@ -137,6 +157,26 @@ connect Box22.Out Box31.In
 connect Box23.Out Box32.In
 connect Box22.Out Box35.In
 connect Box23.Out Box36.In
 connect Box23.Out Box32.In
 connect Box22.Out Box35.In
 connect Box23.Out Box36.In
+connect Box17.Out Box37.In
+connect Box37.Out Box49.In
+connect Box25.Out Box38.In
+connect Box38.Out Box24.In
+connect Box30.Out Box39.In
+connect Box39.Out Box28.In
+connect Box34.Out Box40.In
+connect Box40.Out Box33.In
+connect Box41.Widget Box12.Widget1
+connect Box49.Widget Box42.Widget1
+connect Box42.Widget Box41.Widget1
+connect Box45.Widget Box44.Widget1
+connect Box24.Widget Box45.Widget1
+connect Box44.Widget Box12.Widget2
+connect Box50.Widget Box46.Widget1
+connect Box52.Widget Box51.Widget1
+connect Box28.Widget Box50.Widget1
+connect Box46.Widget Box29.Widget1
+connect Box33.Widget Box52.Widget1
+connect Box51.Widget Box29.Widget2
 
 # Complex input ports
 input ImageVector1 Box22.In " "
 
 # Complex input ports
 input ImageVector1 Box22.In " "
index 6ab22ea2af40d2870bac763a8d3183b1d207dd4a..652a18c0ff751a9f9e795f40a6dd197f3658cf9c 100644 (file)
@@ -13,7 +13,7 @@ PACKAGENAME:PackRecalage
 COMPLEXOUTPUTS:1
 COMPLEX_PORT
 Widget
 COMPLEXOUTPUTS:1
 COMPLEX_PORT
 Widget
-84.821881:-229.191181:-900.000000
+143.195244:-259.362919:-900.000000
 FIN_COMPLEX_PORT
 COMPLEXINPUTS:3
 COMPLEX_PORT
 FIN_COMPLEX_PORT
 COMPLEXINPUTS:3
 COMPLEX_PORT
@@ -28,7 +28,7 @@ COMPLEX_PORT
 VectorImate2
 51.978420:26.687673:-900.000000
 FIN_COMPLEX_PORT
 VectorImate2
 51.978420:26.687673:-900.000000
 FIN_COMPLEX_PORT
-BOXES:24
+BOXES:32
 BOX
 PackRecalage:TransparencyBox:Box00
 ISEXEC:FALSE
 BOX
 PackRecalage:TransparencyBox:Box00
 ISEXEC:FALSE
@@ -52,18 +52,18 @@ FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:Box02
 ISEXEC:FALSE
 BOX
 creaMaracasVisu:ViewerNV:Box02
 ISEXEC:FALSE
--106.624738:-126.479388:-900.000000
--45.984738:-136.479388:-900.000000
+-106.738580:-127.731651:-900.000000
+-46.098580:-137.731651:-900.000000
 PORT
 nTypeView:"-1"
 FIN_BOX
 BOX
 wx:LayoutSplit:Box03
 ISEXEC:FALSE
 PORT
 nTypeView:"-1"
 FIN_BOX
 BOX
 wx:LayoutSplit:Box03
 ISEXEC:FALSE
-81.332101:-207.512434:-900.000000
-126.907101:-217.512434:-900.000000
+139.205435:-235.099023:-900.000000
+184.780435:-245.099023:-900.000000
 PORT
 PORT
-Proportion:"80"
+Proportion:"90"
 PORT
 WinTitle:"Transparency"
 FIN_BOX
 PORT
 WinTitle:"Transparency"
 FIN_BOX
@@ -118,20 +118,20 @@ FIN_BOX
 BOX
 wx:LayoutSplit:Box11
 ISEXEC:FALSE
 BOX
 wx:LayoutSplit:Box11
 ISEXEC:FALSE
--40.822256:-154.378798:-900.000000
-4.752744:-164.378798:-900.000000
+-42.155666:-183.713821:-900.000000
+3.419334:-193.713821:-900.000000
 FIN_BOX
 BOX
 wx:LayoutSplit:Box12
 ISEXEC:FALSE
 FIN_BOX
 BOX
 wx:LayoutSplit:Box12
 ISEXEC:FALSE
-137.350086:-154.012609:-900.000000
-182.925086:-164.012609:-900.000000
+133.784493:-186.218207:-900.000000
+179.359493:-196.218207:-900.000000
 FIN_BOX
 BOX
 wx:LayoutSplit:Box13
 ISEXEC:FALSE
 FIN_BOX
 BOX
 wx:LayoutSplit:Box13
 ISEXEC:FALSE
-41.843116:-185.396038:-900.000000
-87.418116:-195.396038:-900.000000
+49.676901:-205.563867:-900.000000
+95.251901:-215.563867:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
 PORT
 Orientation:"H"
 FIN_BOX
@@ -211,7 +211,63 @@ ISEXEC:FALSE
 PORT
 I:"2"
 FIN_BOX
 PORT
 I:"2"
 FIN_BOX
-CONNECTIONS:45
+BOX
+wx:LayoutTab:Box28
+ISEXEC:FALSE
+-103.761623:-164.149919:-900.000000
+-46.201623:-174.149919:-900.000000
+FIN_BOX
+BOX
+wx:LayoutLine:Box29
+ISEXEC:FALSE
+-105.892248:-146.438055:-900.000000
+-48.332248:-156.438055:-900.000000
+PORT
+WinTitle:"Plane XY (rotation/slice Z)"
+FIN_BOX
+BOX
+wx:LayoutTab:Box30
+ISEXEC:FALSE
+-7.491407:-163.680338:-900.000000
+50.068593:-173.680338:-900.000000
+FIN_BOX
+BOX
+wx:LayoutLine:Box31
+ISEXEC:FALSE
+-9.508190:-146.537683:-900.000000
+48.051810:-156.537683:-900.000000
+PORT
+WinTitle:"Plane XZ  (rotation/slice Y)"
+FIN_BOX
+BOX
+wx:LayoutTab:Box32
+ISEXEC:FALSE
+103.263821:-166.066627:-900.000000
+160.823821:-176.066627:-900.000000
+FIN_BOX
+BOX
+wx:LayoutLine:Box33
+ISEXEC:FALSE
+101.247038:-148.923973:-900.000000
+158.807038:-158.923973:-900.000000
+PORT
+WinTitle:"Plane YZ  (rotation/slice X)"
+FIN_BOX
+BOX
+wx:LayoutTab:Box34
+ISEXEC:FALSE
+171.666610:-166.839491:-900.000000
+229.226610:-176.839491:-900.000000
+FIN_BOX
+BOX
+wx:LayoutLine:Box35
+ISEXEC:FALSE
+169.649827:-149.696836:-900.000000
+227.209827:-159.696836:-900.000000
+PORT
+WinTitle:"Plane YZ  (rotation/slice X)"
+FIN_BOX
+CONNECTIONS:53
 CONNECTION
 Box01:Out:Box00:Percent
 NumberOfControlPoints:0
 CONNECTION
 Box01:Out:Box00:Percent
 NumberOfControlPoints:0
@@ -238,12 +294,6 @@ CONNECTION
 BoxExecute:BoxExecute:Box04:In1
 NumberOfControlPoints:0
 CONNECTION
 BoxExecute:BoxExecute:Box04:In1
 NumberOfControlPoints:0
 CONNECTION
-Box08:Widget:Box12:Widget1
-NumberOfControlPoints:0
-CONNECTION
-Box10:Widget:Box12:Widget2
-NumberOfControlPoints:0
-CONNECTION
 Box12:Widget:Box13:Widget2
 NumberOfControlPoints:0
 CONNECTION
 Box12:Widget:Box13:Widget2
 NumberOfControlPoints:0
 CONNECTION
@@ -325,12 +375,6 @@ CONNECTION
 Box19:Out:Box23:In
 NumberOfControlPoints:0
 CONNECTION
 Box19:Out:Box23:In
 NumberOfControlPoints:0
 CONNECTION
-Box06:Widget:Box11:Widget1
-NumberOfControlPoints:0
-CONNECTION
-Box02:Widget:Box11:Widget2
-NumberOfControlPoints:0
-CONNECTION
 Box09:BoxChange:Box10:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
 Box09:BoxChange:Box10:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
@@ -348,4 +392,40 @@ NumberOfControlPoints:0
 CONNECTION
 Box20:Out:Box26:In
 NumberOfControlPoints:0
 CONNECTION
 Box20:Out:Box26:In
 NumberOfControlPoints:0
+CONNECTION
+Box29:Widget:Box28:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box31:Widget:Box30:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box33:Widget:Box32:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box35:Widget:Box34:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box02:Widget:Box29:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box28:Widget:Box11:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box06:Widget:Box31:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box30:Widget:Box11:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box08:Widget:Box33:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box32:Widget:Box12:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box10:Widget:Box35:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box34:Widget:Box12:Widget2
+NumberOfControlPoints:0
 APP_END
 APP_END
index 57a151f2a094bf93a8fdb9e163693e2b5c53f796..7055cfc05d1a21904b8c494cfdebede4aa918c76 100644 (file)
@@ -30,7 +30,7 @@ new ViewerNV Box02
   set Box02.nTypeView "-1"
 
 new LayoutSplit Box03
   set Box02.nTypeView "-1"
 
 new LayoutSplit Box03
-  set Box03.Proportion "80"
+  set Box03.Proportion "90"
   set Box03.WinTitle "Transparency"
 
 new MultipleInputs Box04
   set Box03.WinTitle "Transparency"
 
 new MultipleInputs Box04
@@ -85,6 +85,26 @@ new GetVectorVtkImageDataElement Box26
 new GetVectorVtkImageDataElement Box27
   set Box27.I "2"
 
 new GetVectorVtkImageDataElement Box27
   set Box27.I "2"
 
+new LayoutTab Box28
+
+new LayoutLine Box29
+  set Box29.WinTitle "Plane XY (rotation/slice Z)"
+
+new LayoutTab Box30
+
+new LayoutLine Box31
+  set Box31.WinTitle "Plane XZ  (rotation/slice Y)"
+
+new LayoutTab Box32
+
+new LayoutLine Box33
+  set Box33.WinTitle "Plane YZ  (rotation/slice X)"
+
+new LayoutTab Box34
+
+new LayoutLine Box35
+  set Box35.WinTitle "Plane YZ  (rotation/slice X)"
+
 
 connect Box01.Out Box00.Percent
 connect Box01.Widget Box03.Widget2
 
 connect Box01.Out Box00.Percent
 connect Box01.Widget Box03.Widget2
@@ -92,8 +112,6 @@ connect Box01.BoxChange Box04.In2
 connect Box04.BoxChange Box00.BoxExecute
 connect Box00.BoxChange Box02.BoxExecute
 connect Box00.Out Box02.In
 connect Box04.BoxChange Box00.BoxExecute
 connect Box00.BoxChange Box02.BoxExecute
 connect Box00.Out Box02.In
-connect Box08.Widget Box12.Widget1
-connect Box10.Widget Box12.Widget2
 connect Box12.Widget Box13.Widget2
 connect Box11.Widget Box13.Widget1
 connect Box04.BoxChange Box05.BoxExecute
 connect Box12.Widget Box13.Widget2
 connect Box11.Widget Box13.Widget1
 connect Box04.BoxChange Box05.BoxExecute
@@ -119,14 +137,24 @@ connect Box19.Out Box25.In
 connect Box25.Out Box07.In2
 connect Box24.Out Box07.In1
 connect Box19.Out Box23.In
 connect Box25.Out Box07.In2
 connect Box24.Out Box07.In1
 connect Box19.Out Box23.In
-connect Box06.Widget Box11.Widget1
-connect Box02.Widget Box11.Widget2
 connect Box09.BoxChange Box10.BoxExecute
 connect Box09.Out Box10.In
 connect Box27.Out Box09.In2
 connect Box26.Out Box09.In1
 connect Box19.Out Box27.In
 connect Box20.Out Box26.In
 connect Box09.BoxChange Box10.BoxExecute
 connect Box09.Out Box10.In
 connect Box27.Out Box09.In2
 connect Box26.Out Box09.In1
 connect Box19.Out Box27.In
 connect Box20.Out Box26.In
+connect Box29.Widget Box28.Widget1
+connect Box31.Widget Box30.Widget1
+connect Box33.Widget Box32.Widget1
+connect Box35.Widget Box34.Widget1
+connect Box02.Widget Box29.Widget1
+connect Box28.Widget Box11.Widget2
+connect Box06.Widget Box31.Widget1
+connect Box30.Widget Box11.Widget1
+connect Box08.Widget Box33.Widget1
+connect Box32.Widget Box12.Widget1
+connect Box10.Widget Box35.Widget1
+connect Box34.Widget Box12.Widget2
 
 # Complex input ports
 input BoxExecute Box04.In1 " "
 
 # Complex input ports
 input BoxExecute Box04.In1 " "
index 28ed404bb04f34c5e74bcc660f3d91f6d806b386..5434a3529865b5abaea27e38fadc2d33b3b57bba 100644 (file)
@@ -10,10 +10,18 @@ AUTHOR:info-dev@creatis.insa-lyon.fr
 COMPLEXBOX:TRUE
 COMPLEXBOXNAME:CompareImagesWidget3D
 PACKAGENAME:PackRecalage
 COMPLEXBOX:TRUE
 COMPLEXBOXNAME:CompareImagesWidget3D
 PACKAGENAME:PackRecalage
-COMPLEXOUTPUTS:1
+COMPLEXOUTPUTS:3
 COMPLEX_PORT
 Widget
 COMPLEX_PORT
 Widget
--180.607881:-224.549013:-900.000000
+9.292392:-218.781014:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+Point
+106.268121:-221.728592:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+BoxChange
+90.295201:-220.841208:-900.000000
 FIN_COMPLEX_PORT
 COMPLEXINPUTS:3
 COMPLEX_PORT
 FIN_COMPLEX_PORT
 COMPLEXINPUTS:3
 COMPLEX_PORT
@@ -32,8 +40,8 @@ BOXES:11
 BOX
 creaMaracasVisu:ViewerNV:viewerResult
 ISEXEC:FALSE
 BOX
 creaMaracasVisu:ViewerNV:viewerResult
 ISEXEC:FALSE
-44.718350:-27.392895:-900.000000
-105.358350:-37.392895:-900.000000
+54.701425:-26.949203:-900.000000
+115.341425:-36.949203:-900.000000
 PORT
 nTypeView:"6"
 FIN_BOX
 PORT
 nTypeView:"6"
 FIN_BOX
@@ -46,16 +54,16 @@ FIN_BOX
 BOX
 wx:LayoutTab:Box26
 ISEXEC:FALSE
 BOX
 wx:LayoutTab:Box26
 ISEXEC:FALSE
--184.936248:-192.642174:-900.000000
--127.376248:-202.642174:-900.000000
+2.523718:-177.334792:-900.000000
+60.083718:-187.334792:-900.000000
 PORT
 WinTitle:"2D-Compare"
 FIN_BOX
 BOX
 wx:LayoutSplit:Box28
 ISEXEC:FALSE
 PORT
 WinTitle:"2D-Compare"
 FIN_BOX
 BOX
 wx:LayoutSplit:Box28
 ISEXEC:FALSE
--46.147657:-153.281784:-900.000000
--0.572657:-163.281784:-900.000000
+6.651718:-153.503630:-900.000000
+52.226718:-163.503630:-900.000000
 PORT
 Orientation:"H"
 PORT
 PORT
 Orientation:"H"
 PORT
@@ -72,16 +80,16 @@ FIN_BOX
 BOX
 wxvtk:IsoSurfaceWidget:Box30
 ISEXEC:FALSE
 BOX
 wxvtk:IsoSurfaceWidget:Box30
 ISEXEC:FALSE
--38.448207:-51.312470:-900.000000
-7.126793:-61.312470:-900.000000
+-60.189126:-48.428471:-900.000000
+-14.614126:-58.428471:-900.000000
 PORT
 Title:"Reference image"
 FIN_BOX
 BOX
 wxvtk:IsoSurfaceWidget:Box31
 ISEXEC:FALSE
 PORT
 Title:"Reference image"
 FIN_BOX
 BOX
 wxvtk:IsoSurfaceWidget:Box31
 ISEXEC:FALSE
-26.051809:-48.434932:-900.000000
-71.626809:-58.434932:-900.000000
+8.304120:-51.097085:-900.000000
+53.879120:-61.097085:-900.000000
 PORT
 Title:"Registration image"
 FIN_BOX
 PORT
 Title:"Registration image"
 FIN_BOX
@@ -100,8 +108,8 @@ FIN_BOX
 BOX
 std:MultipleInputs:Box19
 ISEXEC:FALSE
 BOX
 std:MultipleInputs:Box19
 ISEXEC:FALSE
-6.171590:-68.304284:-900.000000
-51.746590:-78.304284:-900.000000
+-18.009636:-68.082438:-900.000000
+27.565364:-78.082438:-900.000000
 FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box20
 FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box20
@@ -109,13 +117,13 @@ ISEXEC:FALSE
 23.468025:0.813061:-900.000000
 94.643025:-9.186939:-900.000000
 FIN_BOX
 23.468025:0.813061:-900.000000
 94.643025:-9.186939:-900.000000
 FIN_BOX
-CONNECTIONS:19
+CONNECTIONS:21
 CONNECTION
 viewerResult:Widget:Box28:Widget2
 NumberOfControlPoints:3
 70.604240:-82.351540:-900.000000
 51.890862:-124.768517:-900.000000
 CONNECTION
 viewerResult:Widget:Box28:Widget2
 NumberOfControlPoints:3
 70.604240:-82.351540:-900.000000
 51.890862:-124.768517:-900.000000
--6.576315:-143.627396:-900.000000
+35.942902:-139.423691:-900.000000
 CONNECTION
 Box28:Widget:Box26:Widget1
 NumberOfControlPoints:0
 CONNECTION
 Box28:Widget:Box26:Widget1
 NumberOfControlPoints:0
@@ -125,7 +133,7 @@ NumberOfControlPoints:0
 CONNECTION
 Box31:Widget:Box38:Widget2
 NumberOfControlPoints:2
 CONNECTION
 Box31:Widget:Box38:Widget2
 NumberOfControlPoints:2
-62.806999:-77.049416:-900.000000
+42.598286:-73.535385:-900.000000
 7.914438:-93.267677:-900.000000
 CONNECTION
 Box38:Widget:Box29:Widget2
 7.914438:-93.267677:-900.000000
 CONNECTION
 Box38:Widget:Box29:Widget2
@@ -176,4 +184,10 @@ NumberOfControlPoints:0
 CONNECTION
 Image2:Image2:Box20:In
 NumberOfControlPoints:0
 CONNECTION
 Image2:Image2:Box20:In
 NumberOfControlPoints:0
+CONNECTION
+viewerResult:Point:Point:Point
+NumberOfControlPoints:0
+CONNECTION
+viewerResult:BoxChange:BoxChange:BoxChange
+NumberOfControlPoints:0
 APP_END
 APP_END
index 87cc58ea25f9129f1a4c66c3ca2c2f6a79787d7e..d29e29d7d61690f3405fb3e26fe02dda7a267deb 100644 (file)
@@ -71,6 +71,8 @@ input Image2 Box20.In " "
 
 # Complex output ports
 output Widget Box26.Widget " "
 
 # Complex output ports
 output Widget Box26.Widget " "
+output Point viewerResult.Point " "
+output BoxChange viewerResult.BoxChange " "
 
 
 endefine
 
 
 endefine
index 250fa8a3deffa92a7f58bf8dcdc4c50024241e07..a75d721ae4b35ebc4c3af105efa6d2bb84985d04 100644 (file)
@@ -13,22 +13,30 @@ PACKAGENAME:PackRecalage
 COMPLEXOUTPUTS:1
 COMPLEX_PORT
 Widget
 COMPLEXOUTPUTS:1
 COMPLEX_PORT
 Widget
--85.589922:-180.668561:-900.000000
+-58.161675:-182.887022:-900.000000
 FIN_COMPLEX_PORT
 FIN_COMPLEX_PORT
-COMPLEXINPUTS:3
+COMPLEXINPUTS:5
 COMPLEX_PORT
 In2
 COMPLEX_PORT
 In2
--158.009685:76.159418:-900.000000
+-85.607181:89.066828:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 In1
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 In1
--234.159594:79.419186:-900.000000
+-208.143095:91.519883:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 WinTitle
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 WinTitle
-127.660823:81.277727:-900.000000
+127.862501:88.941502:-900.000000
 FIN_COMPLEX_PORT
 FIN_COMPLEX_PORT
-BOXES:10
+COMPLEX_PORT
+Point
+0.100839:90.856067:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+BoxExecute
+-253.268323:87.997313:-900.000000
+FIN_COMPLEX_PORT
+BOXES:12
 BOX
 wx:LayoutTab:tabs
 ISEXEC:FALSE
 BOX
 wx:LayoutTab:tabs
 ISEXEC:FALSE
@@ -40,8 +48,8 @@ FIN_BOX
 BOX
 wx:LayoutSplit:window2
 ISEXEC:FALSE
 BOX
 wx:LayoutSplit:window2
 ISEXEC:FALSE
--56.157344:-151.860379:-900.000000
--10.582344:-161.860379:-900.000000
+-58.577483:-151.053666:-900.000000
+-13.002483:-161.053666:-900.000000
 PORT
 Orientation:H
 PORT
 PORT
 Orientation:H
 PORT
@@ -50,14 +58,14 @@ FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box56
 ISEXEC:FALSE
 BOX
 vtk:vtkImageDataPointerRelay:Box56
 ISEXEC:FALSE
--249.384689:51.735991:-900.000000
--178.209689:41.735991:-900.000000
+-233.390434:61.714899:-900.000000
+-162.215434:51.714899:-900.000000
 FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box59
 ISEXEC:FALSE
 FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box59
 ISEXEC:FALSE
--154.270506:56.253453:-900.000000
--83.095506:46.253453:-900.000000
+-112.173081:57.295180:-900.000000
+-40.998081:47.295180:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box61
 FIN_BOX
 BOX
 wx:LayoutTab:Box61
@@ -68,34 +76,46 @@ FIN_BOX
 BOX
 PackRecalage:CompareImagesWidget_base_interface_3Dp:Box18
 ISEXEC:FALSE
 BOX
 PackRecalage:CompareImagesWidget_base_interface_3Dp:Box18
 ISEXEC:FALSE
--185.132624:12.351239:-900.000000
--113.957624:2.351239:-900.000000
+-187.587765:27.362104:-900.000000
+-116.412765:17.362104:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesWidget_base_3Dp_B:Box13
 ISEXEC:FALSE
 FIN_BOX
 BOX
 PackRecalage:CompareImagesWidget_base_3Dp_B:Box13
 ISEXEC:FALSE
--229.423187:-22.858480:-900.000000
--158.248187:-32.858480:-900.000000
+-244.750737:-25.076941:-900.000000
+-173.575737:-35.076941:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesTransparencyWidget_3Dp:Box14
 FIN_BOX
 BOX
 PackRecalage:CompareImagesTransparencyWidget_3Dp:Box14
-ISEXEC:TRUE
+ISEXEC:FALSE
 -86.902026:-80.169760:-900.000000
 -15.727026:-90.169760:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesWidget_base_3Dp_B:Box15
 ISEXEC:FALSE
 -86.902026:-80.169760:-900.000000
 -15.727026:-90.169760:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesWidget_base_3Dp_B:Box15
 ISEXEC:FALSE
--142.252618:-24.946332:-900.000000
--71.077618:-34.946332:-900.000000
+-105.143814:-24.341297:-900.000000
+-33.968814:-34.341297:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesSwitcherWidget_3Dp:Box17
 ISEXEC:FALSE
 FIN_BOX
 BOX
 PackRecalage:CompareImagesSwitcherWidget_3Dp:Box17
 ISEXEC:FALSE
--177.551360:-77.490958:-900.000000
--106.376360:-87.490958:-900.000000
+-180.576534:-79.911097:-900.000000
+-109.401534:-89.911097:-900.000000
+FIN_BOX
+BOX
+std:MultipleInputs:Box11
+ISEXEC:FALSE
+-291.496324:-1.439026:-900.000000
+-245.921324:-11.439026:-900.000000
 FIN_BOX
 FIN_BOX
-CONNECTIONS:25
+BOX
+std:StringRelay:Box12
+ISEXEC:FALSE
+11.811087:42.278323:-900.000000
+57.386087:32.278323:-900.000000
+FIN_BOX
+CONNECTIONS:28
 CONNECTION
 In2:In2:Box59:In
 NumberOfControlPoints:0
 CONNECTION
 In2:In2:Box59:In
 NumberOfControlPoints:0
@@ -118,9 +138,6 @@ CONNECTION
 Box18:Widget:Box61:Widget1
 NumberOfControlPoints:0
 CONNECTION
 Box18:Widget:Box61:Widget1
 NumberOfControlPoints:0
 CONNECTION
-Box18:BoxChange:Box13:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
 Box18:ConvolutionFactor:Box13:ConvolutionFactor
 NumberOfControlPoints:0
 CONNECTION
 Box18:ConvolutionFactor:Box13:ConvolutionFactor
 NumberOfControlPoints:0
 CONNECTION
@@ -142,9 +159,6 @@ CONNECTION
 Box15:Out:Box14:VectorImate2
 NumberOfControlPoints:0
 CONNECTION
 Box15:Out:Box14:VectorImate2
 NumberOfControlPoints:0
 CONNECTION
-Box18:BoxChange:Box15:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
 Box18:ConvolutionFactor:Box15:ConvolutionFactor
 NumberOfControlPoints:0
 CONNECTION
 Box18:ConvolutionFactor:Box15:ConvolutionFactor
 NumberOfControlPoints:0
 CONNECTION
@@ -157,18 +171,33 @@ CONNECTION
 Box59:Out:Box18:InputImage
 NumberOfControlPoints:0
 CONNECTION
 Box59:Out:Box18:InputImage
 NumberOfControlPoints:0
 CONNECTION
-Box18:Point:Box15:Point
+Box17:Widget:tabs:Widget1
 NumberOfControlPoints:0
 CONNECTION
 NumberOfControlPoints:0
 CONNECTION
-Box18:Point:Box13:Point
+Box13:Out:Box17:ImageVector1
 NumberOfControlPoints:0
 CONNECTION
 NumberOfControlPoints:0
 CONNECTION
-Box17:Widget:tabs:Widget1
+Box15:Out:Box17:ImageVector2
 NumberOfControlPoints:0
 CONNECTION
 NumberOfControlPoints:0
 CONNECTION
-Box13:Out:Box17:ImageVector1
+BoxExecute:BoxExecute:Box11:In1
 NumberOfControlPoints:0
 CONNECTION
 NumberOfControlPoints:0
 CONNECTION
-Box15:Out:Box17:ImageVector2
+Box18:BoxChange:Box11:In2
+NumberOfControlPoints:0
+CONNECTION
+Box11:Out:Box13:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box11:Out:Box15:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Point:Point:Box12:In
+NumberOfControlPoints:0
+CONNECTION
+Box12:Out:Box15:Point
+NumberOfControlPoints:0
+CONNECTION
+Box12:Out:Box13:Point
 NumberOfControlPoints:0
 APP_END
 NumberOfControlPoints:0
 APP_END
index 25c9f338b456092da9b3a3f5f49a89c17b9191ab..792dc6a450b0e15d5eba1e88eef82934481371fd 100644 (file)
@@ -8,6 +8,7 @@ include itkvtk
 include wx
 include vtk
 include PackRecalage
 include wx
 include vtk
 include PackRecalage
+include std
 
 define CompareImages_3DwithPlanes_Widget PackRecalage
 
 
 define CompareImages_3DwithPlanes_Widget PackRecalage
 
@@ -39,11 +40,14 @@ new CompareImagesWidget_base_3Dp_B Box15
 
 new CompareImagesSwitcherWidget_3Dp Box17
 
 
 new CompareImagesSwitcherWidget_3Dp Box17
 
+new MultipleInputs Box11
+
+new StringRelay Box12
+
 
 connect Box61.Widget window2.Widget1
 connect tabs.Widget window2.Widget2
 connect Box18.Widget Box61.Widget1
 
 connect Box61.Widget window2.Widget1
 connect tabs.Widget window2.Widget2
 connect Box18.Widget Box61.Widget1
-connect Box18.BoxChange Box13.BoxExecute
 connect Box18.ConvolutionFactor Box13.ConvolutionFactor
 connect Box18.ConvolutionOnOff Box13.ConvolutionOnOff
 connect Box56.Out Box13.In
 connect Box18.ConvolutionFactor Box13.ConvolutionFactor
 connect Box18.ConvolutionOnOff Box13.ConvolutionOnOff
 connect Box56.Out Box13.In
@@ -51,25 +55,28 @@ connect Box13.Out Box14.VectorImage1
 connect Box14.Widget tabs.Widget2
 connect Box18.BoxChange Box14.BoxExecute
 connect Box15.Out Box14.VectorImate2
 connect Box14.Widget tabs.Widget2
 connect Box18.BoxChange Box14.BoxExecute
 connect Box15.Out Box14.VectorImate2
-connect Box18.BoxChange Box15.BoxExecute
 connect Box18.ConvolutionFactor Box15.ConvolutionFactor
 connect Box18.ConvolutionOnOff Box15.ConvolutionOnOff
 connect Box59.Out Box15.In
 connect Box59.Out Box18.InputImage
 connect Box18.ConvolutionFactor Box15.ConvolutionFactor
 connect Box18.ConvolutionOnOff Box15.ConvolutionOnOff
 connect Box59.Out Box15.In
 connect Box59.Out Box18.InputImage
-connect Box18.Point Box15.Point
-connect Box18.Point Box13.Point
 connect Box17.Widget tabs.Widget1
 connect Box13.Out Box17.ImageVector1
 connect Box15.Out Box17.ImageVector2
 connect Box17.Widget tabs.Widget1
 connect Box13.Out Box17.ImageVector1
 connect Box15.Out Box17.ImageVector2
+connect Box18.BoxChange Box11.In2
+connect Box11.Out Box13.BoxExecute
+connect Box11.Out Box15.BoxExecute
+connect Box12.Out Box15.Point
+connect Box12.Out Box13.Point
 
 # Complex input ports
 input In2 Box59.In " "
 input In1 Box56.In " "
 input WinTitle window2.WinTitle " "
 
 # Complex input ports
 input In2 Box59.In " "
 input In1 Box56.In " "
 input WinTitle window2.WinTitle " "
+input BoxExecute Box11.In1 " "
+input Point Box12.In " "
 
 # Complex output ports
 output Widget window2.Widget " "
 
 
 # Complex output ports
 output Widget window2.Widget " "
 
-exec Box14
 
 endefine
 
 endefine
index 30a460d496cf8014784e1b9c9b679e60a0c73177..ba91db67527e237dde85a853dac6a7c3485d91d7 100644 (file)
@@ -13,15 +13,15 @@ PACKAGENAME:PackRecalage
 COMPLEXOUTPUTS:3
 COMPLEX_PORT
 Out
 COMPLEXOUTPUTS:3
 COMPLEX_PORT
 Out
-8.933001:-415.415453:-900.000000
+21.509447:-445.284511:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 Widget
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 Widget
--56.153037:-418.185072:-900.000000
+-209.035453:-428.010420:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 BoxChange
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 BoxChange
-101.026776:-409.866011:-900.000000
+97.489651:-445.237264:-900.000000
 FIN_COMPLEX_PORT
 COMPLEXINPUTS:2
 COMPLEX_PORT
 FIN_COMPLEX_PORT
 COMPLEXINPUTS:2
 COMPLEX_PORT
@@ -32,12 +32,14 @@ COMPLEX_PORT
 Image2
 221.424351:134.619332:-900.000000
 FIN_COMPLEX_PORT
 Image2
 221.424351:134.619332:-900.000000
 FIN_COMPLEX_PORT
-BOXES:32
+BOXES:35
 BOX
 wx:Slider:sdrAngleX
 ISEXEC:FALSE
 BOX
 wx:Slider:sdrAngleX
 ISEXEC:FALSE
--174.029489:-27.933749:-900.000000
--122.629489:-37.933749:-900.000000
+-228.265410:-20.466484:-900.000000
+-176.865410:-30.466484:-900.000000
+PORT
+ChangeResolution:"true"
 PORT
 In:"0"
 PORT
 PORT
 In:"0"
 PORT
@@ -50,8 +52,10 @@ FIN_BOX
 BOX
 wx:Slider:sdrAngleY
 ISEXEC:FALSE
 BOX
 wx:Slider:sdrAngleY
 ISEXEC:FALSE
--139.870137:-31.245806:-900.000000
--88.470137:-41.245806:-900.000000
+-186.245780:-30.852792:-900.000000
+-134.845780:-40.852792:-900.000000
+PORT
+ChangeResolution:"true"
 PORT
 In:"0"
 PORT
 PORT
 In:"0"
 PORT
@@ -64,8 +68,10 @@ FIN_BOX
 BOX
 wx:Slider:sdrAngleZ
 ISEXEC:FALSE
 BOX
 wx:Slider:sdrAngleZ
 ISEXEC:FALSE
--107.605091:-41.772127:-900.000000
--56.205091:-51.772127:-900.000000
+-139.832233:-41.379113:-900.000000
+-88.432233:-51.379113:-900.000000
+PORT
+ChangeResolution:"true"
 PORT
 In:"0"
 PORT
 PORT
 In:"0"
 PORT
@@ -81,6 +87,8 @@ ISEXEC:FALSE
 -400.546966:-11.712447:-900.000000
 -349.146966:-21.712447:-900.000000
 PORT
 -400.546966:-11.712447:-900.000000
 -349.146966:-21.712447:-900.000000
 PORT
+ChangeResolution:"true"
+PORT
 In:"100"
 PORT
 Max:"300"
 In:"100"
 PORT
 Max:"300"
@@ -95,6 +103,8 @@ ISEXEC:FALSE
 -371.771757:-19.287304:-900.000000
 -320.371757:-29.287304:-900.000000
 PORT
 -371.771757:-19.287304:-900.000000
 -320.371757:-29.287304:-900.000000
 PORT
+ChangeResolution:"true"
+PORT
 In:"100"
 PORT
 Max:"300"
 In:"100"
 PORT
 Max:"300"
@@ -109,6 +119,8 @@ ISEXEC:FALSE
 -349.265040:-25.694046:-900.000000
 -297.865040:-35.694046:-900.000000
 PORT
 -349.265040:-25.694046:-900.000000
 -297.865040:-35.694046:-900.000000
 PORT
+ChangeResolution:"true"
+PORT
 In:"100"
 PORT
 Max:"300"
 In:"100"
 PORT
 Max:"300"
@@ -120,38 +132,38 @@ FIN_BOX
 BOX
 PackRecalage:Transform3D1PointBox:transform
 ISEXEC:FALSE
 BOX
 PackRecalage:Transform3D1PointBox:transform
 ISEXEC:FALSE
--82.895553:-211.980656:-900.000000
--11.720553:-221.980656:-900.000000
+-56.953842:-279.018158:-900.000000
+14.221158:-289.018158:-900.000000
 FIN_BOX
 BOX
 PackRecalage:ReSlicerBox:reslicer
 ISEXEC:FALSE
 FIN_BOX
 BOX
 PackRecalage:ReSlicerBox:reslicer
 ISEXEC:FALSE
-12.176786:-236.507868:-900.000000
-57.751786:-246.507868:-900.000000
+24.698203:-299.664113:-900.000000
+70.273203:-309.664113:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:mult
 ISEXEC:FALSE
 FIN_BOX
 BOX
 std:MultipleInputs:mult
 ISEXEC:FALSE
--72.899950:-125.121619:-900.000000
--27.324950:-135.121619:-900.000000
+-50.640168:-89.266153:-900.000000
+-5.065168:-99.266153:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:mult2
 ISEXEC:FALSE
 FIN_BOX
 BOX
 std:MultipleInputs:mult2
 ISEXEC:FALSE
--323.747985:-157.879870:-900.000000
--278.172985:-167.879870:-900.000000
+-79.553184:-151.768353:-900.000000
+-33.978184:-161.768353:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:mult3
 ISEXEC:FALSE
 FIN_BOX
 BOX
 std:MultipleInputs:mult3
 ISEXEC:FALSE
--7.207547:-159.189958:-900.000000
-38.367453:-169.189958:-900.000000
+-24.542894:-188.591700:-900.000000
+21.032106:-198.591700:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:toolsLayout
 ISEXEC:FALSE
 FIN_BOX
 BOX
 wx:LayoutLine:toolsLayout
 ISEXEC:FALSE
--289.546775:-208.062393:-900.000000
--231.986775:-218.062393:-900.000000
+-287.130871:-256.648910:-900.000000
+-229.570871:-266.648910:-900.000000
 PORT
 Orientation:"v"
 PORT
 PORT
 Orientation:"v"
 PORT
@@ -160,92 +172,104 @@ FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box22
 ISEXEC:FALSE
 BOX
 vtk:vtkImageDataPointerRelay:Box22
 ISEXEC:FALSE
-84.622612:12.255656:-900.000000
-155.797612:2.255656:-900.000000
+84.676205:109.455145:-900.000000
+155.851205:99.455145:-900.000000
 FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box23
 ISEXEC:FALSE
 FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box23
 ISEXEC:FALSE
-198.521946:1.600496:-900.000000
-269.696946:-8.399504:-900.000000
+192.884836:45.355205:-900.000000
+264.059836:35.355205:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box32
 ISEXEC:FALSE
 FIN_BOX
 BOX
 wx:LayoutTab:Box32
 ISEXEC:FALSE
--239.056959:-330.032399:-900.000000
--181.496959:-340.032399:-900.000000
+-207.650205:-395.261812:-900.000000
+-150.090205:-405.261812:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box33
 ISEXEC:FALSE
 FIN_BOX
 BOX
 wx:LayoutLine:Box33
 ISEXEC:FALSE
--161.565171:-209.675183:-900.000000
--104.005171:-219.675183:-900.000000
+-150.827819:-255.845796:-900.000000
+-93.267819:-265.845796:-900.000000
 PORT
 WinTitle:"Scale"
 FIN_BOX
 BOX
 wx:Slider:TranslateZ
 ISEXEC:FALSE
 PORT
 WinTitle:"Scale"
 FIN_BOX
 BOX
 wx:Slider:TranslateZ
 ISEXEC:FALSE
--216.240041:-6.618584:-900.000000
--164.840041:-16.618584:-900.000000
+259.606217:-130.433324:-900.000000
+311.006217:-140.433324:-900.000000
+PORT
+ChangeResolution:"true"
 PORT
 Max:"1000"
 PORT
 Min:"-1000"
 PORT
 ReactiveOnTrack:"true"
 PORT
 Max:"1000"
 PORT
 Min:"-1000"
 PORT
 ReactiveOnTrack:"true"
+PORT
+Title:"Translate Y Axis"
 FIN_BOX
 BOX
 wx:Slider:TranslateY
 ISEXEC:FALSE
 FIN_BOX
 BOX
 wx:Slider:TranslateY
 ISEXEC:FALSE
--229.193202:16.372069:-900.000000
--177.793202:6.372069:-900.000000
+126.508396:-99.046921:-900.000000
+177.908396:-109.046921:-900.000000
+PORT
+ChangeResolution:"true"
 PORT
 Max:"1000"
 PORT
 Min:"-1000"
 PORT
 ReactiveOnTrack:"true"
 PORT
 Max:"1000"
 PORT
 Min:"-1000"
 PORT
 ReactiveOnTrack:"true"
+PORT
+Title:"Translate Y Axis"
 FIN_BOX
 BOX
 wx:Slider:TranslateX
 ISEXEC:FALSE
 FIN_BOX
 BOX
 wx:Slider:TranslateX
 ISEXEC:FALSE
--251.469571:35.608778:-900.000000
--200.069571:25.608778:-900.000000
+101.052161:-72.761382:-900.000000
+152.452161:-82.761382:-900.000000
+PORT
+ChangeResolution:"true"
 PORT
 Max:"1000"
 PORT
 Min:"-1000"
 PORT
 ReactiveOnTrack:"true"
 PORT
 Max:"1000"
 PORT
 Min:"-1000"
 PORT
 ReactiveOnTrack:"true"
+PORT
+Title:"Translate X Axis"
 FIN_BOX
 BOX
 wx:LayoutLine:Box37
 ISEXEC:FALSE
 FIN_BOX
 BOX
 wx:LayoutLine:Box37
 ISEXEC:FALSE
--224.356055:-207.063451:-900.000000
--166.796055:-217.063451:-900.000000
+-216.571475:-256.723704:-900.000000
+-159.011475:-266.723704:-900.000000
 PORT
 WinTitle:"Translate"
 FIN_BOX
 BOX
 wx:LayoutLine:Box40
 ISEXEC:FALSE
 PORT
 WinTitle:"Translate"
 FIN_BOX
 BOX
 wx:LayoutLine:Box40
 ISEXEC:FALSE
--137.533440:-309.785057:-900.000000
--79.973440:-319.785057:-900.000000
+-150.418262:-369.108926:-900.000000
+-92.858262:-379.108926:-900.000000
 PORT
 WinTitle:"Options"
 FIN_BOX
 BOX
 toolsbbtk:SaveMHD-Button:Box41
 ISEXEC:FALSE
 PORT
 WinTitle:"Options"
 FIN_BOX
 BOX
 toolsbbtk:SaveMHD-Button:Box41
 ISEXEC:FALSE
--142.015270:-262.292236:-900.000000
--96.440270:-272.292236:-900.000000
+-137.988763:-315.115873:-900.000000
+-92.413763:-325.115873:-900.000000
 FIN_BOX
 BOX
 wx:CommandButton:Box42
 ISEXEC:FALSE
 FIN_BOX
 BOX
 wx:CommandButton:Box42
 ISEXEC:FALSE
--109.815764:-277.432262:-900.000000
--64.240764:-287.432262:-900.000000
+-106.057691:-334.340227:-900.000000
+-60.482691:-344.340227:-900.000000
 PORT
 Label:"Same Matrix"
 PORT
 PORT
 Label:"Same Matrix"
 PORT
@@ -254,8 +278,8 @@ FIN_BOX
 BOX
 std:ConcatStrings:Box43
 ISEXEC:FALSE
 BOX
 std:ConcatStrings:Box43
 ISEXEC:FALSE
--247.066934:-38.696583:-900.000000
--201.491934:-48.696583:-900.000000
+147.083269:-228.991288:-900.000000
+192.658269:-238.991288:-900.000000
 PORT
 In2:" "
 PORT
 PORT
 In2:" "
 PORT
@@ -276,34 +300,34 @@ FIN_BOX
 BOX
 std:ConcatStrings:Box45
 ISEXEC:FALSE
 BOX
 std:ConcatStrings:Box45
 ISEXEC:FALSE
-36.108734:-34.969140:-900.000000
-81.683734:-44.969140:-900.000000
+88.775351:62.230349:-900.000000
+134.350351:52.230349:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings:Box46
 ISEXEC:FALSE
 FIN_BOX
 BOX
 std:ConcatStrings:Box46
 ISEXEC:FALSE
-34.423620:-80.795697:-900.000000
-79.998620:-90.795697:-900.000000
+10.855039:8.887646:-900.000000
+56.430039:-1.112354:-900.000000
 FIN_BOX
 BOX
 std:VectorRescaleSlope:Box47
 ISEXEC:FALSE
 FIN_BOX
 BOX
 std:VectorRescaleSlope:Box47
 ISEXEC:FALSE
-28.384437:-60.750196:-900.000000
-99.559437:-70.750196:-900.000000
+81.587922:38.328329:-900.000000
+152.762922:28.328329:-900.000000
 PORT
 A:"0.5"
 FIN_BOX
 BOX
 vtk:ImageVtkProperties:Box48
 ISEXEC:FALSE
 PORT
 A:"0.5"
 FIN_BOX
 BOX
 vtk:ImageVtkProperties:Box48
 ISEXEC:FALSE
-39.287720:-17.419439:-900.000000
-84.862720:-27.419439:-900.000000
+92.759639:83.538123:-900.000000
+138.334639:73.538123:-900.000000
 FIN_BOX
 BOX
 std:GetVectorDoubleElement:Box49
 ISEXEC:FALSE
 FIN_BOX
 BOX
 std:GetVectorDoubleElement:Box49
 ISEXEC:FALSE
-35.650859:-107.818723:-900.000000
-106.825859:-117.818723:-900.000000
+28.301987:-74.727990:-900.000000
+99.476987:-84.727990:-900.000000
 PORT
 I:"0"
 PORT
 PORT
 I:"0"
 PORT
@@ -312,8 +336,8 @@ FIN_BOX
 BOX
 std:GetVectorDoubleElement:Box50
 ISEXEC:FALSE
 BOX
 std:GetVectorDoubleElement:Box50
 ISEXEC:FALSE
-52.013698:-122.977938:-900.000000
-123.188698:-132.977938:-900.000000
+182.023608:-97.450273:-900.000000
+253.198608:-107.450273:-900.000000
 PORT
 I:"1"
 PORT
 PORT
 I:"1"
 PORT
@@ -322,14 +346,32 @@ FIN_BOX
 BOX
 std:GetVectorDoubleElement:Box51
 ISEXEC:FALSE
 BOX
 std:GetVectorDoubleElement:Box51
 ISEXEC:FALSE
-64.055017:-139.238406:-900.000000
-135.230017:-149.238406:-900.000000
+305.545403:-113.030020:-900.000000
+376.720403:-123.030020:-900.000000
 PORT
 I:"2"
 PORT
 In:"0"
 FIN_BOX
 PORT
 I:"2"
 PORT
 In:"0"
 FIN_BOX
-CONNECTIONS:67
+BOX
+std:Add:Box36
+ISEXEC:FALSE
+82.297875:-102.212792:-900.000000
+115.072875:-112.212792:-900.000000
+FIN_BOX
+BOX
+std:Add:Box38
+ISEXEC:FALSE
+172.230328:-130.916347:-900.000000
+205.005328:-140.916347:-900.000000
+FIN_BOX
+BOX
+std:Add:Box39
+ISEXEC:FALSE
+301.004401:-150.632818:-900.000000
+333.779401:-160.632818:-900.000000
+FIN_BOX
+CONNECTIONS:70
 CONNECTION
 sdrAngleX:Out:transform:AngleX
 NumberOfControlPoints:0
 CONNECTION
 sdrAngleX:Out:transform:AngleX
 NumberOfControlPoints:0
@@ -433,15 +475,6 @@ CONNECTION
 Box33:Widget:Box32:Widget3
 NumberOfControlPoints:0
 CONNECTION
 Box33:Widget:Box32:Widget3
 NumberOfControlPoints:0
 CONNECTION
-TranslateX:Out:Box43:In1
-NumberOfControlPoints:0
-CONNECTION
-TranslateY:Out:Box43:In3
-NumberOfControlPoints:0
-CONNECTION
-TranslateZ:Out:Box43:In5
-NumberOfControlPoints:0
-CONNECTION
 Box43:Out:transform:CenterPoint
 NumberOfControlPoints:0
 CONNECTION
 Box43:Out:transform:CenterPoint
 NumberOfControlPoints:0
 CONNECTION
@@ -499,21 +532,12 @@ CONNECTION
 Box47:Out:Box49:In
 NumberOfControlPoints:0
 CONNECTION
 Box47:Out:Box49:In
 NumberOfControlPoints:0
 CONNECTION
-Box49:Out:TranslateX:In
-NumberOfControlPoints:0
-CONNECTION
 Box47:Out:Box50:In
 NumberOfControlPoints:0
 CONNECTION
 Box47:Out:Box51:In
 NumberOfControlPoints:0
 CONNECTION
 Box47:Out:Box50:In
 NumberOfControlPoints:0
 CONNECTION
 Box47:Out:Box51:In
 NumberOfControlPoints:0
 CONNECTION
-Box50:Out:TranslateY:In
-NumberOfControlPoints:0
-CONNECTION
-Box51:Out:TranslateZ:In
-NumberOfControlPoints:0
-CONNECTION
 Box22:Out:Box48:In
 NumberOfControlPoints:0
 CONNECTION
 Box22:Out:Box48:In
 NumberOfControlPoints:0
 CONNECTION
@@ -531,4 +555,31 @@ NumberOfControlPoints:0
 CONNECTION
 mult3:BoxChange:BoxChange:BoxChange
 NumberOfControlPoints:0
 CONNECTION
 mult3:BoxChange:BoxChange:BoxChange
 NumberOfControlPoints:0
+CONNECTION
+Box49:Out:Box36:In1
+NumberOfControlPoints:0
+CONNECTION
+TranslateX:Out:Box36:In2
+NumberOfControlPoints:0
+CONNECTION
+Box36:Out:Box43:In1
+NumberOfControlPoints:0
+CONNECTION
+TranslateY:Out:Box38:In2
+NumberOfControlPoints:0
+CONNECTION
+TranslateZ:Out:Box39:In2
+NumberOfControlPoints:0
+CONNECTION
+Box38:Out:Box43:In3
+NumberOfControlPoints:0
+CONNECTION
+Box39:Out:Box43:In5
+NumberOfControlPoints:0
+CONNECTION
+Box50:Out:Box38:In1
+NumberOfControlPoints:0
+CONNECTION
+Box51:Out:Box39:In1
+NumberOfControlPoints:0
 APP_END
 APP_END
index bf2059a9a2fbd2185b8ace26181cf986cb665e81..2b6a4e969e57ec5f225ea3b58443807fefe9044b 100644 (file)
@@ -19,36 +19,42 @@ description "Recalage3D 1-point Widget"
 category "widget"
 
 new Slider sdrAngleX
 category "widget"
 
 new Slider sdrAngleX
+  set sdrAngleX.ChangeResolution "true"
   set sdrAngleX.In "0"
   set sdrAngleX.Max "180"
   set sdrAngleX.Min "-180"
   set sdrAngleX.Title "Rotation angle in X Axis"
 
 new Slider sdrAngleY
   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.ChangeResolution "true"
   set sdrAngleY.In "0"
   set sdrAngleY.Max "180"
   set sdrAngleY.Min "-180"
   set sdrAngleY.Title "Rotation angle in Y Axis"
 
 new Slider sdrAngleZ
   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.ChangeResolution "true"
   set sdrAngleZ.In "0"
   set sdrAngleZ.Max "180"
   set sdrAngleZ.Min "-180"
   set sdrAngleZ.Title "Rotation angle in Z Axis"
 
 new Slider sdrScaleX
   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.ChangeResolution "true"
   set sdrScaleX.In "100"
   set sdrScaleX.Max "300"
   set sdrScaleX.Min "10"
   set sdrScaleX.Title "Scale in X Axis"
 
 new Slider sdrScaleY
   set sdrScaleX.In "100"
   set sdrScaleX.Max "300"
   set sdrScaleX.Min "10"
   set sdrScaleX.Title "Scale in X Axis"
 
 new Slider sdrScaleY
+  set sdrScaleY.ChangeResolution "true"
   set sdrScaleY.In "100"
   set sdrScaleY.Max "300"
   set sdrScaleY.Min "10"
   set sdrScaleY.Title "Scale in Y Axis"
 
 new Slider sdrScaleZ
   set sdrScaleY.In "100"
   set sdrScaleY.Max "300"
   set sdrScaleY.Min "10"
   set sdrScaleY.Title "Scale in Y Axis"
 
 new Slider sdrScaleZ
+  set sdrScaleZ.ChangeResolution "true"
   set sdrScaleZ.In "100"
   set sdrScaleZ.Max "300"
   set sdrScaleZ.Min "10"
   set sdrScaleZ.In "100"
   set sdrScaleZ.Max "300"
   set sdrScaleZ.Min "10"
@@ -78,19 +84,25 @@ new LayoutLine Box33
   set Box33.WinTitle "Scale"
 
 new Slider TranslateZ
   set Box33.WinTitle "Scale"
 
 new Slider TranslateZ
+  set TranslateZ.ChangeResolution "true"
   set TranslateZ.Max "1000"
   set TranslateZ.Min "-1000"
   set TranslateZ.ReactiveOnTrack "true"
   set TranslateZ.Max "1000"
   set TranslateZ.Min "-1000"
   set TranslateZ.ReactiveOnTrack "true"
+  set TranslateZ.Title "Translate Y Axis"
 
 new Slider TranslateY
 
 new Slider TranslateY
+  set TranslateY.ChangeResolution "true"
   set TranslateY.Max "1000"
   set TranslateY.Min "-1000"
   set TranslateY.ReactiveOnTrack "true"
   set TranslateY.Max "1000"
   set TranslateY.Min "-1000"
   set TranslateY.ReactiveOnTrack "true"
+  set TranslateY.Title "Translate Y Axis"
 
 new Slider TranslateX
 
 new Slider TranslateX
+  set TranslateX.ChangeResolution "true"
   set TranslateX.Max "1000"
   set TranslateX.Min "-1000"
   set TranslateX.ReactiveOnTrack "true"
   set TranslateX.Max "1000"
   set TranslateX.Min "-1000"
   set TranslateX.ReactiveOnTrack "true"
+  set TranslateX.Title "Translate X Axis"
 
 new LayoutLine Box37
   set Box37.WinTitle "Translate"
 
 new LayoutLine Box37
   set Box37.WinTitle "Translate"
@@ -134,6 +146,12 @@ new GetVectorDoubleElement Box51
   set Box51.I "2"
   set Box51.In "0"
 
   set Box51.I "2"
   set Box51.In "0"
 
+new Add Box36
+
+new Add Box38
+
+new Add Box39
+
 
 connect sdrAngleX.Out transform.AngleX
 connect sdrAngleY.Out transform.AngleY
 
 connect sdrAngleX.Out transform.AngleX
 connect sdrAngleY.Out transform.AngleY
@@ -169,9 +187,6 @@ connect Box42.Widget Box40.Widget2
 connect reslicer.Out Box41.In
 connect Box37.Widget Box32.Widget2
 connect Box33.Widget Box32.Widget3
 connect reslicer.Out Box41.In
 connect Box37.Widget Box32.Widget2
 connect Box33.Widget Box32.Widget3
-connect TranslateX.Out Box43.In1
-connect TranslateY.Out Box43.In3
-connect TranslateZ.Out Box43.In5
 connect Box43.Out transform.CenterPoint
 connect TranslateX.BoxChange mult2.In4
 connect TranslateY.BoxChange mult2.In5
 connect Box43.Out transform.CenterPoint
 connect TranslateX.BoxChange mult2.In4
 connect TranslateY.BoxChange mult2.In5
@@ -191,12 +206,18 @@ connect Box46.Out reslicer.Origin
 connect Box48.Size Box45.In1
 connect Box45.Out Box47.In
 connect Box47.Out Box49.In
 connect Box48.Size Box45.In1
 connect Box45.Out Box47.In
 connect Box47.Out Box49.In
-connect Box49.Out TranslateX.In
 connect Box47.Out Box50.In
 connect Box47.Out Box51.In
 connect Box47.Out Box50.In
 connect Box47.Out Box51.In
-connect Box50.Out TranslateY.In
-connect Box51.Out TranslateZ.In
 connect Box22.Out Box48.In
 connect Box22.Out Box48.In
+connect Box49.Out Box36.In1
+connect TranslateX.Out Box36.In2
+connect Box36.Out Box43.In1
+connect TranslateY.Out Box38.In2
+connect TranslateZ.Out Box39.In2
+connect Box38.Out Box43.In3
+connect Box39.Out Box43.In5
+connect Box50.Out Box38.In1
+connect Box51.Out Box39.In1
 
 # Complex input ports
 input Image1 Box22.In " "
 
 # Complex input ports
 input Image1 Box22.In " "