#3471 Add manual option to CompareImageSwitcherWidget

diff --git a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg
index 14b2444e8df132bdb560d31686be47d239f95198..2cc6c5c135c9dafe1ce0661a4963106e18f18fcd 100644 (file)
--- a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg
+++ b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg
@@ -29,28 +29,28 @@ COMPLEX_PORT
 windowcolorlevel
 26.116036:118.799900:-900.000000
 FIN_COMPLEX_PORT
-BOXES:45
+BOXES:47
 BOX
 PackRecalage:ImageSwitcherBox:switch
 ISEXEC:FALSE
-32.480230:35.777676:-900.000000
-54.915230:33.277676:-900.000000
+35.808314:39.559590:-900.000000
+60.328314:37.059590:-900.000000
 FIN_BOX
 BOX
 wx:CheckBox:checkS
 ISEXEC:FALSE
 99.970091:48.296279:-900.000000
-121.600091:45.796279:-900.000000
+121.755091:45.796279:-900.000000
 PORT
 In:"true"
 PORT
-Title:"On"
+Title:"Auto"
 FIN_BOX
 BOX
 wx:Slider:sdrT
 ISEXEC:FALSE
 56.777333:48.066658:-900.000000
-77.932333:45.566658:-900.000000
+86.577333:45.566658:-900.000000
 PORT
 In:"500"
 PORT
@@ -64,7 +64,7 @@ BOX
 wx:LayoutSplit:switchWindow
 ISEXEC:FALSE
 62.525871:-143.096719:-900.000000
-84.190871:-145.596719:-900.000000
+85.285871:-145.596719:-900.000000
 PORT
 Proportion:"95"
 PORT
@@ -74,7 +74,7 @@ BOX
 wx:LayoutLine:Box47
 ISEXEC:FALSE
 90.072707:7.231845:-900.000000
-111.732707:4.731845:-900.000000
+123.392707:4.731845:-900.000000
 PORT
 Orientation:H
 FIN_BOX
@@ -82,13 +82,13 @@ BOX
 wx:LayoutLine:Box48
 ISEXEC:FALSE
 78.929312:-18.043753:-900.000000
-100.589312:-20.543753:-900.000000
+112.249312:-20.543753:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:Box49
 ISEXEC:FALSE
 -96.028458:-16.207341:-900.000000
-40.360000:-18.707341:-900.000000
+-55.668458:-18.707341:-900.000000
 PORT
 nTypeView:"-1"
 FIN_BOX
@@ -96,7 +96,7 @@ BOX
 wx:LayoutSplit:Box10
 ISEXEC:FALSE
 -38.883692:-138.691650:-900.000000
-22.760000:-141.191650:-900.000000
+-16.123692:-141.191650:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -104,19 +104,19 @@ BOX
 wx:LayoutSplit:Box12
 ISEXEC:FALSE
 -93.887764:-111.585904:-900.000000
-22.760000:-114.085904:-900.000000
+-71.127764:-114.085904:-900.000000
 FIN_BOX
 BOX
 PackRecalage:ImageSwitcherFilter:Box17
 ISEXEC:FALSE
 -92.191761:3.827540:-900.000000
-8.680000:1.327540:-900.000000
+-69.661761:1.327540:-900.000000
 FIN_BOX
 BOX
 vtk:GetVectorVtkImageDataElement:Box19
 ISEXEC:FALSE
 -138.982871:97.038762:-900.000000
-10.440000:94.538762:-900.000000
+-115.147871:94.538762:-900.000000
 PORT
 I:"1"
 FIN_BOX
@@ -124,7 +124,7 @@ BOX
 vtk:GetVectorVtkImageDataElement:Box21
 ISEXEC:FALSE
 -124.050297:90.126201:-900.000000
-10.440000:87.626201:-900.000000
+-100.215297:87.626201:-900.000000
 PORT
 I:"1"
 FIN_BOX
@@ -132,13 +132,13 @@ BOX
 std:MagicBox:Box22
 ISEXEC:FALSE
 -122.254872:107.023327:-900.000000
-8.680000:104.523327:-900.000000
+-100.654872:104.523327:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box23
 ISEXEC:FALSE
 -19.797685:106.462944:-900.000000
-8.680000:103.962944:-900.000000
+1.802315:103.962944:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:Box24
@@ -152,13 +152,13 @@ BOX
 PackRecalage:ImageSwitcherFilter:Box25
 ISEXEC:FALSE
 -167.086469:4.681027:-900.000000
-8.680000:2.181027:-900.000000
+-144.556469:2.181027:-900.000000
 FIN_BOX
 BOX
 vtk:GetVectorVtkImageDataElement:Box26
 ISEXEC:FALSE
 -207.179942:93.857994:-900.000000
-10.440000:91.357994:-900.000000
+-183.344942:91.357994:-900.000000
 PORT
 I:"0"
 FIN_BOX
@@ -166,7 +166,7 @@ BOX
 vtk:GetVectorVtkImageDataElement:Box27
 ISEXEC:FALSE
 -175.213103:88.435397:-900.000000
-10.440000:85.935397:-900.000000
+-151.378103:85.935397:-900.000000
 PORT
 I:"0"
 FIN_BOX
@@ -174,7 +174,7 @@ BOX
 creaMaracasVisu:ViewerNV:Box28
 ISEXEC:FALSE
 -32.526980:-78.734192:-900.000000
-40.360000:-81.234192:-900.000000
+7.833020:-81.234192:-900.000000
 PORT
 nTypeView:"-1"
 FIN_BOX
@@ -182,19 +182,19 @@ BOX
 wx:LayoutSplit:Box29
 ISEXEC:FALSE
 1.189206:-114.805770:-900.000000
-22.854206:-117.305770:-900.000000
+23.949206:-117.305770:-900.000000
 FIN_BOX
 BOX
 PackRecalage:ImageSwitcherFilter:Box30
 ISEXEC:FALSE
 -26.666626:6.815431:-900.000000
-8.680000:4.315431:-900.000000
+-4.136626:4.315431:-900.000000
 FIN_BOX
 BOX
 vtk:GetVectorVtkImageDataElement:Box31
 ISEXEC:FALSE
 -58.740196:95.146523:-900.000000
-10.440000:92.646523:-900.000000
+-34.905196:92.646523:-900.000000
 PORT
 I:"2"
 FIN_BOX
@@ -202,7 +202,7 @@ BOX
 vtk:GetVectorVtkImageDataElement:Box32
 ISEXEC:FALSE
 -43.995525:88.153432:-900.000000
-10.440000:85.653432:-900.000000
+-20.160525:85.653432:-900.000000
 PORT
 I:"2"
 FIN_BOX
@@ -210,31 +210,31 @@ BOX
 creaMaracasVisu:ImageChangeInformation:Box37
 ISEXEC:FALSE
 -88.840316:-3.843721:-900.000000
-10.440000:-6.343721:-900.000000
+-65.690316:-6.343721:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ImageChangeInformation:Box38
 ISEXEC:FALSE
 -165.279240:-2.216118:-900.000000
-10.440000:-4.716118:-900.000000
+-142.129240:-4.716118:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ImageChangeInformation:Box39
 ISEXEC:FALSE
 -24.418248:-0.863293:-900.000000
-10.440000:-3.363293:-900.000000
+-1.268248:-3.363293:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box41
 ISEXEC:FALSE
 -83.157696:-100.808264:-900.000000
-33.320000:-103.308264:-900.000000
+-49.837696:-103.308264:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box42
 ISEXEC:FALSE
 -80.172913:-94.750733:-900.000000
-33.320000:-97.250733:-900.000000
+-46.852913:-97.250733:-900.000000
 PORT
 WinTitle:"Plane XZ  (rotation/slice Y)"
 FIN_BOX
@@ -242,13 +242,13 @@ BOX
 wx:LayoutTab:Box44
 ISEXEC:FALSE
 -167.343844:-99.705676:-900.000000
-33.320000:-102.205676:-900.000000
+-134.023844:-102.205676:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box45
 ISEXEC:FALSE
 -166.783749:-94.133492:-900.000000
-33.320000:-96.633492:-900.000000
+-133.463749:-96.633492:-900.000000
 PORT
 WinTitle:"Plane XY  (rotation/slice Z)"
 FIN_BOX
@@ -256,13 +256,13 @@ BOX
 wx:LayoutTab:Box46
 ISEXEC:FALSE
 -23.748311:-102.173738:-900.000000
-33.320000:-104.673738:-900.000000
+9.571689:-104.673738:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box50
 ISEXEC:FALSE
 -23.381065:-97.324301:-900.000000
-33.320000:-99.824301:-900.000000
+9.938935:-99.824301:-900.000000
 PORT
 WinTitle:"Plane YZ  (rotation/slice X)"
 FIN_BOX
@@ -270,13 +270,13 @@ BOX
 wx:LayoutTab:Box51
 ISEXEC:FALSE
 26.284837:-103.104775:-900.000000
-47.899837:-105.604775:-900.000000
+59.604837:-105.604775:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box52
 ISEXEC:FALSE
 32.382029:-96.042609:-900.000000
-54.042029:-98.542609:-900.000000
+65.702029:-98.542609:-900.000000
 PORT
 WinTitle:"Viewer help"
 FIN_BOX
@@ -292,7 +292,7 @@ BOX
 std:GetVectorDoubleElement:Box55
 ISEXEC:FALSE
 -120.262930:-53.254552:-900.000000
-10.440000:-55.754552:-900.000000
+-97.137930:-55.754552:-900.000000
 PORT
 I:"0"
 FIN_BOX
@@ -300,7 +300,7 @@ BOX
 std:GetVectorDoubleElement:Box56
 ISEXEC:FALSE
 -82.055993:-53.835490:-900.000000
-10.440000:-56.335490:-900.000000
+-58.930993:-56.335490:-900.000000
 PORT
 I:"1"
 FIN_BOX
@@ -308,13 +308,13 @@ BOX
 std:MultipleInputs:Box57
 ISEXEC:FALSE
 -17.214029:-54.884857:-900.000000
-21.000000:-57.384857:-900.000000
+4.755971:-57.384857:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:Box59
 ISEXEC:FALSE
 -185.233594:-55.932074:-900.000000
-21.000000:-58.432074:-900.000000
+-163.263594:-58.432074:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:HelpViewerNV:Box60
@@ -358,9 +358,23 @@ BOX
 std:MultipleInputs:Box65
 ISEXEC:FALSE
 -114.976662:-4.084889:-900.000000
-21.000000:-6.584889:-900.000000
+-93.006662:-6.584889:-900.000000
 FIN_BOX
-CONNECTIONS:72
+BOX
+std:MultipleInputs:Box66
+ISEXEC:FALSE
+-11.875208:27.305416:-900.000000
+10.094792:24.805416:-900.000000
+FIN_BOX
+BOX
+wx:CommandButton:Box67
+ISEXEC:FALSE
+114.591980:18.682653:-900.000000
+136.866980:16.182653:-900.000000
+PORT
+Label:"Switch"
+FIN_BOX
+CONNECTIONS:75
 CONNECTION
 checkS:Out:switch:On
 NumberOfControlPoints:0
@@ -371,9 +385,6 @@ CONNECTION
 sdrT:BoxChange:switch:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-checkS:Widget:Box47:Widget2
-NumberOfControlPoints:0
-CONNECTION
 switch:Widget:Box47:Widget1
 NumberOfControlPoints:0
 CONNECTION
@@ -395,9 +406,6 @@ CONNECTION
 Box10:Widget:switchWindow:Widget1
 NumberOfControlPoints:0
 CONNECTION
-switch:BoxChange:Box17:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
 ImageVector1:ImageVector1:Box22:In
 NumberOfControlPoints:0
 CONNECTION
@@ -428,9 +436,6 @@ CONNECTION
 Box32:Out:Box30:In2
 NumberOfControlPoints:0
 CONNECTION
-switch:BoxChange:Box30:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
 Box29:Widget:Box10:Widget2
 NumberOfControlPoints:0
 CONNECTION
@@ -440,9 +445,6 @@ CONNECTION
 Box23:Out:Box27:In
 NumberOfControlPoints:0
 CONNECTION
-switch:BoxChange:Box25:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
 Box22:Out:Box31:In
 NumberOfControlPoints:0
 CONNECTION
@@ -551,9 +553,6 @@ CONNECTION
 Box61:Out:Box63:In
 NumberOfControlPoints:0
 CONNECTION
-Box64:Widget:Box47:Widget3
-NumberOfControlPoints:0
-CONNECTION
 Box64:Out:Box49:Interpolate
 NumberOfControlPoints:0
 CONNECTION
@@ -577,4 +576,28 @@ NumberOfControlPoints:0
 CONNECTION
 Box64:BoxChange:Box65:In3
 NumberOfControlPoints:0
+CONNECTION
+switch:BoxChange:Box66:In1
+NumberOfControlPoints:0
+CONNECTION
+Box64:Widget:Box47:Widget7
+NumberOfControlPoints:0
+CONNECTION
+checkS:Widget:Box47:Widget5
+NumberOfControlPoints:0
+CONNECTION
+Box67:Widget:Box47:Widget3
+NumberOfControlPoints:0
+CONNECTION
+Box67:BoxChange:Box66:In2
+NumberOfControlPoints:0
+CONNECTION
+Box66:BoxChange:Box25:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box66:BoxChange:Box17:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box66:BoxChange:Box30:BoxExecute
+NumberOfControlPoints:0
 APP_END

diff --git a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs
index 09251d66deb8ea9fcbe4db9cae95a2d4861b8a41..c64b9a6dd3ccc5cfe5e54efb3308938c5f36ef73 100644 (file)
--- a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs
+++ b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs
@@ -22,7 +22,7 @@ new PackRecalage:ImageSwitcherBox switch
 
 new wx:CheckBox checkS
   set checkS.In "true"
-  set checkS.Title "On"
+  set checkS.Title "Auto"
 
 new wx:Slider sdrT
   set sdrT.In "500"
@@ -138,18 +138,21 @@ new wx:CheckBox Box64
 
 new std:MultipleInputs Box65
 
+new std:MultipleInputs Box66
+
+new wx:CommandButton Box67
+  set Box67.Label "Switch"
+
 
 connect checkS.Out switch.On
 connect sdrT.Out switch.Time
 connect sdrT.BoxChange switch.BoxExecute
-connect checkS.Widget Box47.Widget2
 connect switch.Widget Box47.Widget1
 connect sdrT.Widget Box48.Widget2
 connect Box47.Widget Box48.Widget1
 connect Box48.Widget switchWindow.Widget2
 connect Box12.Widget Box10.Widget1
 connect Box10.Widget switchWindow.Widget1
-connect switch.BoxChange Box17.BoxExecute
 connect Box22.Out Box19.In
 connect Box23.Out Box21.In
 connect Box19.Out Box17.In1
@@ -158,11 +161,9 @@ connect Box26.Out Box25.In1
 connect Box27.Out Box25.In2
 connect Box31.Out Box30.In1
 connect Box32.Out Box30.In2
-connect switch.BoxChange Box30.BoxExecute
 connect Box29.Widget Box10.Widget2
 connect Box22.Out Box26.In
 connect Box23.Out Box27.In
-connect switch.BoxChange Box25.BoxExecute
 connect Box22.Out Box31.In
 connect Box23.Out Box32.In
 connect Box17.Out Box37.In
@@ -198,7 +199,6 @@ connect Box55.Out Box24.WindowLevel
 connect Box60.widget Box52.Widget2
 connect Box61.Out Box62.In
 connect Box61.Out Box63.In
-connect Box64.Widget Box47.Widget3
 connect Box64.Out Box49.Interpolate
 connect Box64.Out Box28.Interpolate
 connect Box64.Out Box24.Interpolate
@@ -207,6 +207,14 @@ connect Box64.BoxChange Box59.In3
 connect Box17.BoxChange Box65.In1
 connect Box65.BoxChange Box49.BoxExecute
 connect Box64.BoxChange Box65.In3
+connect switch.BoxChange Box66.In1
+connect Box64.Widget Box47.Widget7
+connect checkS.Widget Box47.Widget5
+connect Box67.Widget Box47.Widget3
+connect Box67.BoxChange Box66.In2
+connect Box66.BoxChange Box25.BoxExecute
+connect Box66.BoxChange Box17.BoxExecute
+connect Box66.BoxChange Box30.BoxExecute
 
 # Complex input ports
 input ImageVector1 Box22.In " "