#3770 window color level reset base viewer 2D

diff --git a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg
index 6acfa69649e5f3d9611907854c811eac6847a3ec..4d68f0523eb96037bfd2e1885cbac6838f5fb067 100644 (file)
--- a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg
+++ b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg
@@ -14,29 +14,33 @@ PACKAGENAME:PackRecalage
 COMPLEXOUTPUTS:1
 COMPLEX_PORT
 Widget
-12.745006:-161.854537:-900.000000
+61.252213:-169.894406:-900.000000
 FIN_COMPLEX_PORT
-COMPLEXINPUTS:2
+COMPLEXINPUTS:3
 COMPLEX_PORT
 ImageVector1
--93.386525:60.549415:-900.000000
+-116.863827:117.249315:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 ImageVector2
--5.355679:60.452088:-900.000000
+-14.215038:118.037924:-900.000000
 FIN_COMPLEX_PORT
-BOXES:40
+COMPLEX_PORT
+windowcolorlevel
+26.116036:118.799900:-900.000000
+FIN_COMPLEX_PORT
+BOXES:43
 BOX
 PackRecalage:ImageSwitcherBox:switch
 ISEXEC:FALSE
-92.502390:19.166377:-900.000000
-117.022390:16.666377:-900.000000
+32.480230:35.777676:-900.000000
+57.000230:33.277676:-900.000000
 FIN_BOX
 BOX
 wx:CheckBox:checkS
 ISEXEC:FALSE
-159.992251:31.684980:-900.000000
-181.777251:29.184980:-900.000000
+99.970091:48.296279:-900.000000
+121.755091:45.796279:-900.000000
 PORT
 In:"true"
 PORT
@@ -45,8 +49,8 @@ FIN_BOX
 BOX
 wx:Slider:sdrT
 ISEXEC:FALSE
-116.799493:31.455359:-900.000000
-146.599493:28.955359:-900.000000
+56.777333:48.066658:-900.000000
+86.577333:45.566658:-900.000000
 PORT
 In:"500"
 PORT
@@ -59,8 +63,8 @@ FIN_BOX
 BOX
 wx:LayoutSplit:switchWindow
 ISEXEC:FALSE
-11.070712:-150.332601:-900.000000
-33.830712:-152.832601:-900.000000
+62.525871:-143.096719:-900.000000
+85.285871:-145.596719:-900.000000
 PORT
 Proportion:"90"
 PORT
@@ -69,16 +73,16 @@ FIN_BOX
 BOX
 wx:LayoutLine:Box47
 ISEXEC:FALSE
-150.759319:4.352553:-900.000000
-184.079319:1.852553:-900.000000
+90.737159:20.963852:-900.000000
+124.057159:18.463852:-900.000000
 PORT
 Orientation:H
 FIN_BOX
 BOX
 wx:LayoutLine:Box48
 ISEXEC:FALSE
-120.023450:-25.257486:-900.000000
-153.343450:-27.757486:-900.000000
+66.969177:-4.090262:-900.000000
+100.289177:-6.590262:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:Box49
@@ -111,30 +115,30 @@ FIN_BOX
 BOX
 vtk:GetVectorVtkImageDataElement:Box19
 ISEXEC:FALSE
--123.478992:40.117378:-900.000000
--99.643992:37.617378:-900.000000
+-138.982871:97.038762:-900.000000
+-115.147871:94.538762:-900.000000
 PORT
 I:"1"
 FIN_BOX
 BOX
 vtk:GetVectorVtkImageDataElement:Box21
 ISEXEC:FALSE
--108.546418:33.204817:-900.000000
--84.711418:30.704817:-900.000000
+-124.050297:90.126201:-900.000000
+-100.215297:87.626201:-900.000000
 PORT
 I:"1"
 FIN_BOX
 BOX
 std:MagicBox:Box22
 ISEXEC:FALSE
--106.750993:50.101943:-900.000000
--85.150993:47.601943:-900.000000
+-122.254872:107.023327:-900.000000
+-100.654872:104.523327:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box23
 ISEXEC:FALSE
--4.293806:49.541560:-900.000000
-17.306194:47.041560:-900.000000
+-19.797685:106.462944:-900.000000
+1.802315:103.962944:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:Box24
@@ -153,16 +157,16 @@ FIN_BOX
 BOX
 vtk:GetVectorVtkImageDataElement:Box26
 ISEXEC:FALSE
--191.676063:36.936610:-900.000000
--167.841063:34.436610:-900.000000
+-207.179942:93.857994:-900.000000
+-183.344942:91.357994:-900.000000
 PORT
 I:"0"
 FIN_BOX
 BOX
 vtk:GetVectorVtkImageDataElement:Box27
 ISEXEC:FALSE
--177.870911:30.185109:-900.000000
--154.035911:27.685109:-900.000000
+-175.213103:88.435397:-900.000000
+-151.378103:85.935397:-900.000000
 PORT
 I:"0"
 FIN_BOX
@@ -189,16 +193,16 @@ FIN_BOX
 BOX
 vtk:GetVectorVtkImageDataElement:Box31
 ISEXEC:FALSE
--43.236317:38.225139:-900.000000
--19.401317:35.725139:-900.000000
+-58.740196:95.146523:-900.000000
+-34.905196:92.646523:-900.000000
 PORT
 I:"2"
 FIN_BOX
 BOX
 vtk:GetVectorVtkImageDataElement:Box32
 ISEXEC:FALSE
--28.491646:31.232048:-900.000000
--4.656646:28.732048:-900.000000
+-43.995525:88.153432:-900.000000
+-20.160525:85.653432:-900.000000
 PORT
 I:"2"
 FIN_BOX
@@ -318,7 +322,29 @@ ISEXEC:FALSE
 38.152994:-83.138636:-900.000000
 60.187994:-85.638636:-900.000000
 FIN_BOX
-CONNECTIONS:61
+BOX
+std:MagicBox:Box61
+ISEXEC:FALSE
+20.780393:106.482876:-900.000000
+42.380393:103.982876:-900.000000
+FIN_BOX
+BOX
+std:GetVectorDoubleElement:Box62
+ISEXEC:FALSE
+12.968772:89.724707:-900.000000
+36.093772:87.224707:-900.000000
+PORT
+I:"0"
+FIN_BOX
+BOX
+std:GetVectorDoubleElement:Box63
+ISEXEC:FALSE
+53.098357:90.361266:-900.000000
+76.223357:87.861266:-900.000000
+PORT
+I:"1"
+FIN_BOX
+CONNECTIONS:64
 CONNECTION
 checkS:Out:switch:On
 NumberOfControlPoints:0
@@ -502,4 +528,13 @@ NumberOfControlPoints:0
 CONNECTION
 Box60:widget:Box52:Widget2
 NumberOfControlPoints:0
+CONNECTION
+windowcolorlevel:windowcolorlevel:Box61:In
+NumberOfControlPoints:0
+CONNECTION
+Box61:Out:Box62:In
+NumberOfControlPoints:0
+CONNECTION
+Box61:Out:Box63:In
+NumberOfControlPoints:0
 APP_END

diff --git a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs
index 1b20c4313e937ab268d66653c4c144116c43cdfe..8b055edf1323627d4f2c0d89c570bfc1a635a385 100644 (file)
--- a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs
+++ b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs
@@ -124,6 +124,14 @@ new std:MultipleInputs Box59
 
 new creaMaracasVisu:HelpViewerNV Box60
 
+new std:MagicBox Box61
+
+new std:GetVectorDoubleElement Box62
+  set Box62.I "0"
+
+new std:GetVectorDoubleElement Box63
+  set Box63.I "1"
+
 
 connect checkS.Out switch.On
 connect sdrT.Out switch.Time
@@ -183,10 +191,13 @@ connect Box54.BoxChange Box59.In2
 connect Box56.Out Box24.ColorLevel
 connect Box55.Out Box24.WindowLevel
 connect Box60.widget Box52.Widget2
+connect Box61.Out Box62.In
+connect Box61.Out Box63.In
 
 # Complex input ports
 input ImageVector1 Box22.In " "
 input ImageVector2 Box23.In " "
+input windowcolorlevel Box61.In " "
 
 # Complex output ports
 output Widget switchWindow.Widget " "

diff --git a/PackRecalage/bbs/boxes/CompareImagesTransparencyWidget_3Dp.bbg b/PackRecalage/bbs/boxes/CompareImagesTransparencyWidget_3Dp.bbg
index 850ec8bee337bebda90f43584c90592328a8d86b..6acfe843c587461b7418547e74a1e2690d2afa8a 100644 (file)
--- a/PackRecalage/bbs/boxes/CompareImagesTransparencyWidget_3Dp.bbg
+++ b/PackRecalage/bbs/boxes/CompareImagesTransparencyWidget_3Dp.bbg
@@ -16,31 +16,35 @@ COMPLEX_PORT
 Widget
 101.042067:-166.603818:-900.000000
 FIN_COMPLEX_PORT
-COMPLEXINPUTS:3
+COMPLEXINPUTS:4
 COMPLEX_PORT
 BoxExecute
-158.133458:7.884485:-900.000000
+67.014947:59.290918:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 VectorImage1
--37.050613:7.726917:-900.000000
+-50.694026:55.478864:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 VectorImate2
-36.384894:8.006302:-900.000000
+11.534391:58.681837:-900.000000
 FIN_COMPLEX_PORT
-BOXES:35
+COMPLEX_PORT
+windowcolorlevel
+144.575419:54.925991:-900.000000
+FIN_COMPLEX_PORT
+BOXES:38
 BOX
 PackRecalage:TransparencyBox:Box00
 ISEXEC:FALSE
--71.936096:-33.220051:-900.000000
--49.646096:-35.720051:-900.000000
+-72.324240:-33.375309:-900.000000
+-50.034240:-35.875309:-900.000000
 FIN_BOX
 BOX
 wx:Slider:Box01
 ISEXEC:FALSE
-89.355031:2.656268:-900.000000
-119.155031:0.156268:-900.000000
+89.697784:31.980528:-900.000000
+119.497784:29.480528:-900.000000
 PORT
 In:"50"
 PORT
@@ -53,16 +57,16 @@ FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:Box02
 ISEXEC:FALSE
--73.506794:-81.433309:-900.000000
--33.146794:-83.933309:-900.000000
+-73.894938:-81.588567:-900.000000
+-33.534938:-84.088567:-900.000000
 PORT
 nTypeView:"-1"
 FIN_BOX
 BOX
 wx:LayoutSplit:Box03
 ISEXEC:FALSE
-98.249201:-159.324649:-900.000000
-121.009201:-161.824649:-900.000000
+97.861057:-159.479907:-900.000000
+120.621057:-161.979907:-900.000000
 PORT
 Proportion:"90"
 PORT
@@ -71,229 +75,251 @@ FIN_BOX
 BOX
 std:MultipleInputs:Box04
 ISEXEC:FALSE
-218.081701:-15.740626:-900.000000
-240.051701:-18.240626:-900.000000
+60.373483:24.214866:-900.000000
+82.343483:21.714866:-900.000000
 FIN_BOX
 BOX
 PackRecalage:TransparencyBox:Box05
 ISEXEC:FALSE
-13.668433:-33.958545:-900.000000
-35.958433:-36.458545:-900.000000
+13.280289:-34.113803:-900.000000
+35.570289:-36.613803:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:Box06
 ISEXEC:FALSE
-9.181733:-39.877892:-900.000000
-49.541733:-42.377892:-900.000000
+8.793589:-40.033150:-900.000000
+49.153589:-42.533150:-900.000000
 PORT
 nTypeView:"-1"
 FIN_BOX
 BOX
 PackRecalage:TransparencyBox:Box07
 ISEXEC:FALSE
-73.045849:-34.920279:-900.000000
-95.335849:-37.420279:-900.000000
+72.657705:-35.075537:-900.000000
+94.947705:-37.575537:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:Box08
 ISEXEC:FALSE
-69.753222:-77.244722:-900.000000
-110.113222:-79.744722:-900.000000
+69.365078:-77.399980:-900.000000
+109.725078:-79.899980:-900.000000
 PORT
 nTypeView:"-1"
 FIN_BOX
 BOX
 wx:LayoutSplit:Box11
 ISEXEC:FALSE
--30.113013:-136.861871:-900.000000
--7.353013:-139.361871:-900.000000
+-30.501157:-137.017129:-900.000000
+-7.741157:-139.517129:-900.000000
 FIN_BOX
 BOX
 wx:LayoutSplit:Box12
 ISEXEC:FALSE
-93.850494:-143.653659:-900.000000
-116.610494:-146.153659:-900.000000
+93.462350:-143.808917:-900.000000
+116.222350:-146.308917:-900.000000
 FIN_BOX
 BOX
 wx:LayoutSplit:Box13
 ISEXEC:FALSE
-35.579227:-150.464103:-900.000000
-58.339227:-152.964103:-900.000000
+35.191083:-150.619361:-900.000000
+57.951083:-153.119361:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
 BOX
 vtk:GetVectorVtkImageDataElement:Box17
 ISEXEC:FALSE
--135.026830:-12.013734:-900.000000
--111.191830:-14.513734:-900.000000
+-147.109328:18.528688:-900.000000
+-123.274328:16.028688:-900.000000
 PORT
 I:"0"
 FIN_BOX
 BOX
 vtk:GetVectorVtkImageDataElement:Box18
 ISEXEC:FALSE
--110.076641:-15.482972:-900.000000
--86.241641:-17.982972:-900.000000
+-122.159139:15.059450:-900.000000
+-98.324139:12.559450:-900.000000
 PORT
 I:"0"
 FIN_BOX
 BOX
 std:MagicBox:Box19
 ISEXEC:FALSE
-28.875055:-3.826410:-900.000000
-50.475055:-6.326410:-900.000000
+15.574395:45.475706:-900.000000
+37.174395:42.975706:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box20
 ISEXEC:FALSE
--40.264995:-3.136910:-900.000000
--18.664995:-5.636910:-900.000000
+-54.296552:44.459779:-900.000000
+-32.696552:41.959779:-900.000000
 FIN_BOX
 BOX
 vtk:GetVectorVtkImageDataElement:Box22
 ISEXEC:FALSE
--57.370518:-13.314178:-900.000000
--33.535518:-15.814178:-900.000000
+-69.453016:17.228244:-900.000000
+-45.618016:14.728244:-900.000000
 PORT
 I:"1"
 FIN_BOX
 BOX
 vtk:GetVectorVtkImageDataElement:Box23
 ISEXEC:FALSE
--29.376745:-17.967047:-900.000000
--5.541745:-20.467047:-900.000000
+-41.459243:12.575375:-900.000000
+-17.624243:10.075375:-900.000000
 PORT
 I:"1"
 FIN_BOX
 BOX
 vtk:GetVectorVtkImageDataElement:Box24
 ISEXEC:FALSE
-44.157422:-18.515062:-900.000000
-67.992422:-21.015062:-900.000000
+-10.560743:21.529023:-900.000000
+13.274257:19.029023:-900.000000
 PORT
 I:"2"
 FIN_BOX
 BOX
 vtk:GetVectorVtkImageDataElement:Box25
 ISEXEC:FALSE
-60.107139:-15.156608:-900.000000
-83.942139:-17.656608:-900.000000
+14.403372:24.887477:-900.000000
+38.238372:22.387477:-900.000000
 PORT
 I:"2"
 FIN_BOX
 BOX
 wx:LayoutTab:Box28
 ISEXEC:FALSE
--60.430868:-120.620576:-900.000000
--27.110868:-123.120576:-900.000000
+-60.819012:-120.775834:-900.000000
+-27.499012:-123.275834:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box29
 ISEXEC:FALSE
--61.922305:-115.307017:-900.000000
--28.602305:-117.807017:-900.000000
+-62.310449:-115.462275:-900.000000
+-28.990449:-117.962275:-900.000000
 PORT
 WinTitle:"Plane XY (rotation/slice Z)"
 FIN_BOX
 BOX
 wx:LayoutTab:Box30
 ISEXEC:FALSE
-18.757854:-121.689914:-900.000000
-52.077854:-124.189914:-900.000000
+18.369710:-121.845172:-900.000000
+51.689710:-124.345172:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box31
 ISEXEC:FALSE
-17.346106:-116.547117:-900.000000
-50.666106:-119.047117:-900.000000
+16.957962:-116.702375:-900.000000
+50.277962:-119.202375:-900.000000
 PORT
 WinTitle:"Plane XZ  (rotation/slice Y)"
 FIN_BOX
 BOX
 wx:LayoutTab:Box32
 ISEXEC:FALSE
-72.687373:-122.708354:-900.000000
-106.007373:-125.208354:-900.000000
+72.299229:-122.863612:-900.000000
+105.619229:-125.363612:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box33
 ISEXEC:FALSE
-71.275625:-117.565557:-900.000000
-104.595625:-120.065557:-900.000000
+70.887481:-117.720815:-900.000000
+104.207481:-120.220815:-900.000000
 PORT
 WinTitle:"Plane YZ  (rotation/slice X)"
 FIN_BOX
 BOX
 wx:LayoutTab:Box34
 ISEXEC:FALSE
-120.569325:-122.940213:-900.000000
-153.889325:-125.440213:-900.000000
+120.181181:-123.095471:-900.000000
+153.501181:-125.595471:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box35
 ISEXEC:FALSE
-119.157577:-117.797416:-900.000000
-152.477577:-120.297416:-900.000000
+118.769433:-117.952674:-900.000000
+152.089433:-120.452674:-900.000000
 PORT
 WinTitle:"Viewer help"
 FIN_BOX
 BOX
 creaMaracasVisu:wxVtkBaseView_Info:Box37
 ISEXEC:FALSE
--8.076674:-49.674644:-900.000000
-20.963326:-52.174644:-900.000000
+-8.464818:-49.829902:-900.000000
+20.575182:-52.329902:-900.000000
 PORT
 InteractionType:"12"
 FIN_BOX
 BOX
 std:GetVectorDoubleElement:Box38
 ISEXEC:FALSE
--11.842967:-58.777477:-900.000000
-11.282033:-61.277477:-900.000000
+-12.231111:-58.932735:-900.000000
+10.893889:-61.432735:-900.000000
 PORT
 I:"0"
 FIN_BOX
 BOX
 std:GetVectorDoubleElement:Box39
 ISEXEC:FALSE
-19.887417:-59.483199:-900.000000
-43.012417:-61.983199:-900.000000
+19.499273:-59.638457:-900.000000
+42.624273:-62.138457:-900.000000
 PORT
 I:"1"
 FIN_BOX
 BOX
 std:MultipleInputs:Box40
 ISEXEC:FALSE
--60.395119:-50.500860:-900.000000
--38.425119:-53.000860:-900.000000
+-60.783263:-50.656118:-900.000000
+-38.813263:-53.156118:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:Box41
 ISEXEC:FALSE
-79.315687:-52.669793:-900.000000
-101.285687:-55.169793:-900.000000
+78.927543:-52.825051:-900.000000
+100.897543:-55.325051:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:HelpViewerNV:Box42
 ISEXEC:FALSE
-44.320276:-79.951527:-900.000000
-66.355276:-82.451527:-900.000000
+43.932132:-80.106785:-900.000000
+65.967132:-82.606785:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:HelpViewerNV:Box43
 ISEXEC:FALSE
-118.145728:-107.956441:-900.000000
-140.180728:-110.456441:-900.000000
+117.757584:-108.111699:-900.000000
+139.792584:-110.611699:-900.000000
+FIN_BOX
+BOX
+std:MagicBox:Box44
+ISEXEC:FALSE
+139.277581:43.937472:-900.000000
+160.877581:41.437472:-900.000000
 FIN_BOX
-CONNECTIONS:57
+BOX
+std:GetVectorDoubleElement:Box45
+ISEXEC:FALSE
+135.797145:29.739349:-900.000000
+158.922145:27.239349:-900.000000
+PORT
+I:"0"
+FIN_BOX
+BOX
+std:GetVectorDoubleElement:Box46
+ISEXEC:FALSE
+172.140810:30.930812:-900.000000
+195.265810:28.430812:-900.000000
+PORT
+I:"1"
+FIN_BOX
+CONNECTIONS:60
 CONNECTION
 Box01:Out:Box00:Percent
 NumberOfControlPoints:0
 CONNECTION
 Box01:Widget:Box03:Widget2
 NumberOfControlPoints:1
-185.120239:-41.048355:-900.000000
+184.732101:-41.203613:-900.000000
 CONNECTION
 Box01:BoxChange:Box04:In2
 NumberOfControlPoints:0
@@ -459,4 +485,13 @@ NumberOfControlPoints:0
 CONNECTION
 Box43:widget:Box35:Widget2
 NumberOfControlPoints:0
+CONNECTION
+windowcolorlevel:windowcolorlevel:Box44:In
+NumberOfControlPoints:0
+CONNECTION
+Box44:Out:Box45:In
+NumberOfControlPoints:0
+CONNECTION
+Box44:Out:Box46:In
+NumberOfControlPoints:0
 APP_END

diff --git a/PackRecalage/bbs/boxes/CompareImagesTransparencyWidget_3Dp.bbs b/PackRecalage/bbs/boxes/CompareImagesTransparencyWidget_3Dp.bbs
index 0d74b10f6e94ca5a02bc1211366da5d362241d60..e9674682c84c2f857c1afaba1e933ca0efc5048e 100644 (file)
--- a/PackRecalage/bbs/boxes/CompareImagesTransparencyWidget_3Dp.bbs
+++ b/PackRecalage/bbs/boxes/CompareImagesTransparencyWidget_3Dp.bbs
@@ -111,6 +111,14 @@ new creaMaracasVisu:HelpViewerNV Box42
 
 new creaMaracasVisu:HelpViewerNV Box43
 
+new std:MagicBox Box44
+
+new std:GetVectorDoubleElement Box45
+  set Box45.I "0"
+
+new std:GetVectorDoubleElement Box46
+  set Box46.I "1"
+
 
 connect Box01.Out Box00.Percent
 connect Box01.Widget Box03.Widget2
@@ -165,11 +173,14 @@ connect Box37.BoxChange Box11.BoxExecute
 connect Box37.BoxChange Box40.In2
 connect Box37.BoxChange Box41.In2
 connect Box43.widget Box35.Widget2
+connect Box44.Out Box45.In
+connect Box44.Out Box46.In
 
 # Complex input ports
 input BoxExecute Box04.In1 " "
 input VectorImate2 Box19.In " "
 input VectorImage1 Box20.In " "
+input windowcolorlevel Box44.In " "
 
 # Complex output ports
 output Widget Box03.Widget " "

diff --git a/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbg b/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbg
index 09cd89ba55310dbfc7c523a05645f5d5a1dd52c0..11553792d2c7d92dce2b3e07786a40dea3401baf 100644 (file)
--- a/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbg
+++ b/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbg
@@ -1,75 +1,118 @@
 # ----------------------------------
-# - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /home/davila/Creatis/All/creatools_source/creaRigidRegistration/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbg
+# - BBTKGEditor v 1.6 BBG BlackBox Diagram file
+# - /Users/davila/Creatis/C23/creatools_source/creaRigidRegistration/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbg
 # ----------------------------------
 
 APP_START
 CATEGORY:<VOID>
 DESCRIPTION:Description ??
 AUTHOR:Author ??
+EXPORTFORMAT:0
 COMPLEXBOX:TRUE
 COMPLEXBOXNAME:CompareImagesWidget_base_interface_3Dp
 PACKAGENAME:PackRecalage
-COMPLEXOUTPUTS:4
+COMPLEXOUTPUTS:5
 COMPLEX_PORT
 BoxChange
--292.069549:-130.188654:-900.000000
+-103.038159:-38.810340:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 Widget
--183.585764:-132.640986:-900.000000
+-55.104423:-40.796259:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 ConvolutionFactor
--226.545978:-129.147867:-900.000000
+-67.798524:-41.373608:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 ConvolutionOnOff
--111.696076:-129.644538:-900.000000
+-18.409032:-40.522434:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+windowcolorlevel
+3.489619:-40.655364:-900.000000
 FIN_COMPLEX_PORT
 COMPLEXINPUTS:0
-BOXES:4
+BOXES:8
 BOX
 wx:Slider:Box01
 ISEXEC:FALSE
--233.091213:52.808465:-900.000000
--181.691213:42.808465:-900.000000
+-67.754377:13.213292:-900.000000
+-37.954377:10.713292:-900.000000
+PORT
+In:"-12000"
 PORT
-In:"0"
+Label:"true"
 PORT
-Max:"100"
+Max:"12000"
 PORT
-Min:"0"
+Min:"-12000"
 PORT
-ReactiveOnTrack:"1"
+ReactiveOnTrack:"false"
 PORT
 Title:"Convolution Factor"
 FIN_BOX
 BOX
 wx:CheckBox:Box02
 ISEXEC:FALSE
--162.399354:52.990614:-900.000000
--116.824354:42.990614:-900.000000
+-19.395273:13.643002:-900.000000
+2.234727:11.143002:-900.000000
 PORT
-In:"True"
+In:"False"
 FIN_BOX
 BOX
 std:MultipleInputs:Box03
 ISEXEC:FALSE
--293.758883:-59.904660:-900.000000
--248.183883:-69.904660:-900.000000
+-103.220517:-18.100207:-900.000000
+-81.250517:-20.600207:-900.000000
 FIN_BOX
 BOX
 wx:LayoutSplit:Box05
 ISEXEC:FALSE
--193.198175:-61.891436:-900.000000
--147.623175:-71.891436:-900.000000
+-56.957255:-19.071306:-900.000000
+-34.197255:-21.571306:-900.000000
 PORT
 Orientation:"H"
 PORT
 Proportion:"10"
 FIN_BOX
-CONNECTIONS:8
+BOX
+std:Div:Box06
+ISEXEC:FALSE
+-69.584444:2.052022:-900.000000
+-48.659444:-0.447978:-900.000000
+PORT
+In2:"100"
+FIN_BOX
+BOX
+std:StringSelect:Box07
+ISEXEC:FALSE
+-11.825569:-5.024114:-900.000000
+12.694431:-7.524114:-900.000000
+PORT
+In0:"80"
+PORT
+In1:"4300"
+FIN_BOX
+BOX
+std:StringSelect:Box08
+ISEXEC:FALSE
+15.926844:-4.387555:-900.000000
+40.446844:-6.887555:-900.000000
+PORT
+In0:"380"
+PORT
+In1:"10800"
+FIN_BOX
+BOX
+std:ConcatStrings:Box09
+ISEXEC:FALSE
+-0.036000:-17.376280:-900.000000
+22.724000:-19.876280:-900.000000
+PORT
+In2:"  "
+FIN_BOX
+CONNECTIONS:13
 CONNECTION
 Box02:BoxChange:Box03:In3
 NumberOfControlPoints:0
@@ -80,9 +123,6 @@ CONNECTION
 Box03:BoxChange:BoxChange:BoxChange
 NumberOfControlPoints:0
 CONNECTION
-Box01:Out:ConvolutionFactor:ConvolutionFactor
-NumberOfControlPoints:0
-CONNECTION
 Box02:Out:ConvolutionOnOff:ConvolutionOnOff
 NumberOfControlPoints:0
 CONNECTION
@@ -94,4 +134,22 @@ NumberOfControlPoints:0
 CONNECTION
 Box01:Widget:Box05:Widget1
 NumberOfControlPoints:0
+CONNECTION
+Box01:Out:Box06:In1
+NumberOfControlPoints:0
+CONNECTION
+Box06:Out:ConvolutionFactor:ConvolutionFactor
+NumberOfControlPoints:0
+CONNECTION
+Box02:Out:Box07:In
+NumberOfControlPoints:0
+CONNECTION
+Box07:Out:Box09:In1
+NumberOfControlPoints:0
+CONNECTION
+Box08:Out:Box09:In3
+NumberOfControlPoints:0
+CONNECTION
+Box09:Out:windowcolorlevel:windowcolorlevel
+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 d04c9a4809d1f1e1c7dbc0214b0d7a57fb51066b..ac68d00f982a27e66659f1ed05c6e5603df10372 100644 (file)
--- a/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbs
+++ b/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
-# - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
-# - /home/davila/Creatis/All/creatools_source/creaRigidRegistration/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbs
+# - BBTKGEditor v 1.6 BBS BlackBox Script (Complex Box)
+# - /Users/davila/Creatis/C23/creatools_source/creaRigidRegistration/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbs
 # ----------------------------------
 
 include std
@@ -15,35 +15,55 @@ description "Description ??"
 
 category "<VOID>"
 
-new Slider Box01
-  set Box01.In "0"
-  set Box01.Max "100"
-  set Box01.Min "0"
-  set Box01.ReactiveOnTrack "1"
+new wx:Slider Box01
+  set Box01.In "-12000"
+  set Box01.Label "true"
+  set Box01.Max "12000"
+  set Box01.Min "-12000"
+  set Box01.ReactiveOnTrack "false"
   set Box01.Title "Convolution Factor"
 
-new CheckBox Box02
-  set Box02.In "True"
+new wx:CheckBox Box02
+  set Box02.In "False"
 
-new MultipleInputs Box03
+new std:MultipleInputs Box03
 
-new LayoutSplit Box05
+new wx:LayoutSplit Box05
   set Box05.Orientation "H"
   set Box05.Proportion "10"
 
+new std:Div Box06
+  set Box06.In2 "100"
+
+new std:StringSelect Box07
+  set Box07.In0 "80"
+  set Box07.In1 "4300"
+
+new std:StringSelect Box08
+  set Box08.In0 "380"
+  set Box08.In1 "10800"
+
+new std:ConcatStrings Box09
+  set Box09.In2 "  "
+
 
 connect Box02.BoxChange Box03.In3
 connect Box01.BoxChange Box03.In2
 connect Box02.Widget Box05.Widget2
 connect Box01.Widget Box05.Widget1
+connect Box01.Out Box06.In1
+connect Box02.Out Box07.In
+connect Box07.Out Box09.In1
+connect Box08.Out Box09.In3
 
 # Complex input ports
 
 # Complex output ports
 output BoxChange Box03.BoxChange " "
-output ConvolutionFactor Box01.Out " "
 output ConvolutionOnOff Box02.Out " "
 output Widget Box05.Widget " "
+output ConvolutionFactor Box06.Out " "
+output windowcolorlevel Box09.Out " "
 
 
 endefine

diff --git a/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbg b/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbg
index 4e747d6bdb9914283ecb89cbe024903dcd73bd13..a500b5347e4ac55923aca063e9982228477f8972 100644 (file)
--- a/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbg
+++ b/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbg
@@ -14,139 +14,139 @@ PACKAGENAME:PackRecalage
 COMPLEXOUTPUTS:1
 COMPLEX_PORT
 Widget
--66.405159:-119.432880:-900.000000
+23.094658:-95.112277:-900.000000
 FIN_COMPLEX_PORT
 COMPLEXINPUTS:5
 COMPLEX_PORT
 In2
--79.587339:28.312052:-900.000000
+9.912478:52.632655:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 In1
--159.912078:27.690149:-900.000000
+-70.412261:52.010752:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 WinTitle
--42.444130:27.998948:-900.000000
+47.055687:52.319551:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 Point
--117.859522:27.833974:-900.000000
+-28.359705:52.154577:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 BoxExecute
--196.846336:27.165309:-900.000000
+-107.346519:51.485912:-900.000000
 FIN_COMPLEX_PORT
 BOXES:17
 BOX
 wx:LayoutTab:tabs
 ISEXEC:FALSE
--113.414337:-96.242566:-900.000000
--80.094337:-98.742566:-900.000000
+-23.914520:-71.921963:-900.000000
+9.405480:-74.421963:-900.000000
 PORT
 Orientation:V
 FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box56
 ISEXEC:FALSE
--163.373304:18.514470:-900.000000
--140.163304:16.014470:-900.000000
+-73.873487:42.835073:-900.000000
+-50.663487:40.335073:-900.000000
 FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box59
 ISEXEC:FALSE
--82.288012:18.343837:-900.000000
--59.078012:15.843837:-900.000000
+7.211805:42.664440:-900.000000
+30.421805:40.164440:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesWidget_base_interface_3Dp:Box18
 ISEXEC:FALSE
--126.621538:2.181095:-900.000000
--101.631538:-0.318905:-900.000000
+-37.121721:26.501698:-900.000000
+-12.131721:24.001698:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesWidget_base_3Dp_B:Box13
 ISEXEC:FALSE
--173.267695:-20.196790:-900.000000
--149.032695:-22.696790:-900.000000
+-83.767878:4.123813:-900.000000
+-59.532878:1.623813:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesTransparencyWidget_3Dp:Box14
 ISEXEC:FALSE
--123.522582:-58.774574:-900.000000
--98.772582:-61.274574:-900.000000
+-34.022765:-34.453971:-900.000000
+-9.272765:-36.953971:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesWidget_base_3Dp_B:Box15
 ISEXEC:FALSE
--89.577423:-20.691611:-900.000000
--65.342423:-23.191611:-900.000000
+-0.077606:3.628992:-900.000000
+24.157394:1.128992:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesSwitcherWidget_3Dp:Box17
 ISEXEC:FALSE
--178.953274:-58.489407:-900.000000
--154.693274:-60.989407:-900.000000
+-89.453457:-34.168804:-900.000000
+-65.193457:-36.668804:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:Box11
 ISEXEC:FALSE
--195.393735:-0.651183:-900.000000
--173.423735:-3.151183:-900.000000
+-105.893918:23.669420:-900.000000
+-83.923918:21.169420:-900.000000
 FIN_BOX
 BOX
 std:StringRelay:Box12
 ISEXEC:FALSE
--121.214732:18.400322:-900.000000
--99.519732:15.900322:-900.000000
+-31.714915:42.720925:-900.000000
+-10.019915:40.220925:-900.000000
 FIN_BOX
 BOX
 wx:LayoutSplit:Box16
 ISEXEC:FALSE
--68.362923:-109.039319:-900.000000
--45.602923:-111.539319:-900.000000
+21.136894:-84.718716:-900.000000
+43.896894:-87.218716:-900.000000
 PORT
 Proportion:"10"
 FIN_BOX
 BOX
 wx:LayoutLine:Box20
 ISEXEC:FALSE
--76.132895:-65.899037:-900.000000
--42.812895:-68.399037:-900.000000
+13.366922:-41.578434:-900.000000
+46.686922:-44.078434:-900.000000
 PORT
 WinTitle:"RGB"
 FIN_BOX
 BOX
 std:MagicBox:Box21
 ISEXEC:FALSE
--198.553687:17.495161:-900.000000
--176.953687:14.995161:-900.000000
+-109.053870:41.815764:-900.000000
+-87.453870:39.315764:-900.000000
 FIN_BOX
 BOX
 PackRecalage:ImageConvolution:Box22
 ISEXEC:FALSE
--95.356152:-30.060576:-900.000000
--72.921152:-32.560576:-900.000000
+-5.856335:-5.739973:-900.000000
+16.578665:-8.239973:-900.000000
 FIN_BOX
 BOX
 PackRecalage:ImageConvolution:Box23
 ISEXEC:FALSE
--65.671582:-30.198016:-900.000000
--43.236582:-32.698016:-900.000000
+23.828235:-5.877413:-900.000000
+46.263235:-8.377413:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareParallelWidget:Box24
 ISEXEC:FALSE
--22.089238:-58.602528:-900.000000
-0.860762:-61.102528:-900.000000
+67.410579:-34.281925:-900.000000
+90.360579:-36.781925:-900.000000
 FIN_BOX
 BOX
 creaVtk:CompareImagesByRGB-Widget:Box25
 ISEXEC:FALSE
--71.824796:-57.512916:-900.000000
--48.149796:-60.012916:-900.000000
+17.675021:-33.192313:-900.000000
+41.350021:-35.692313:-900.000000
 FIN_BOX
-CONNECTIONS:46
+CONNECTIONS:48
 CONNECTION
 In2:In2:Box59:In
 NumberOfControlPoints:0
@@ -285,4 +285,10 @@ NumberOfControlPoints:0
 CONNECTION
 Box25:OutWidget:Box20:Widget1
 NumberOfControlPoints:0
+CONNECTION
+Box18:windowcolorlevel:Box17:windowcolorlevel
+NumberOfControlPoints:0
+CONNECTION
+Box18:windowcolorlevel:Box14:windowcolorlevel
+NumberOfControlPoints:0
 APP_END

diff --git a/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs b/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs
index 541a06d307a4796e382385362b8974dbc46e427d..7f41a90dba5a4006497cdbc99c92be3c8f17fc3d 100644 (file)
--- a/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs
+++ b/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs
@@ -96,6 +96,8 @@ connect Box23.Out Box25.Image2
 connect Box21.BoxChange Box25.boxExecute
 connect Box12.Out Box25.point
 connect Box25.OutWidget Box20.Widget1
+connect Box18.windowcolorlevel Box17.windowcolorlevel
+connect Box18.windowcolorlevel Box14.windowcolorlevel
 
 # Complex input ports
 input In2 Box59.In " "