#3464 merge vtk8itk5wx3-mingw64

diff --git a/PackRecalage/bbs/boxes/CompareImagesWidget.bbg b/PackRecalage/bbs/boxes/CompareImagesWidget.bbg
index c1d3c85b7416b93bd556c3d732dabec85ec6e6e0..627142648922a1ac901fda2ef2b103beab85d775 100644 (file)
--- a/PackRecalage/bbs/boxes/CompareImagesWidget.bbg
+++ b/PackRecalage/bbs/boxes/CompareImagesWidget.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /home/davila/Creatis/All/creatools_source/creaRigidRegistration/PackRecalage/bbs/boxes/CompareImagesWidget.bbg
+# - /home/davila/Creatis/C8/creatools_source/creaRigidRegistration/PackRecalage/bbs/boxes/CompareImagesWidget.bbg
 # ----------------------------------
 
 APP_START
@@ -28,18 +28,18 @@ COMPLEX_PORT
 WinTitle
 452.869978:45.181751:-900.000000
 FIN_COMPLEX_PORT
-BOXES:36
+BOXES:37
 BOX
 PackRecalage:ImageRecalageProperties:properties
 ISEXEC:FALSE
-611.308256:-6.931722:-900.000000
-682.483256:-16.931722:-900.000000
+539.826193:-452.173474:-900.000000
+595.376193:-462.173474:-900.000000
 FIN_BOX
 BOX
 wx:Slider:sdrZ
 ISEXEC:FALSE
-567.054652:-61.454750:-900.000000
-618.454652:-71.454750:-900.000000
+150.457366:-521.645863:-900.000000
+201.857366:-531.645863:-900.000000
 PORT
 Min:"0"
 PORT
@@ -50,8 +50,8 @@ FIN_BOX
 BOX
 wx:Slider:sdrF
 ISEXEC:FALSE
-829.057291:-86.758889:-900.000000
-880.457291:-96.758889:-900.000000
+239.873940:-516.699316:-900.000000
+291.273940:-526.699316:-900.000000
 PORT
 In:"0"
 PORT
@@ -66,22 +66,22 @@ FIN_BOX
 BOX
 wx:CheckBox:checkF
 ISEXEC:FALSE
-864.894336:-109.592108:-900.000000
-910.469336:-119.592108:-900.000000
+333.547054:-512.792558:-900.000000
+371.197054:-522.792558:-900.000000
 PORT
 In:"True"
 FIN_BOX
 BOX
 std:MultipleInputs:multF
 ISEXEC:FALSE
-873.672975:-258.351155:-900.000000
-919.247975:-268.351155:-900.000000
+217.666169:-629.290083:-900.000000
+256.666169:-639.290083:-900.000000
 FIN_BOX
 BOX
 wx:Slider:colorLevel
 ISEXEC:FALSE
-626.588388:-79.223450:-900.000000
-677.988388:-89.223450:-900.000000
+603.292740:-550.814817:-900.000000
+654.692740:-560.814817:-900.000000
 PORT
 Min:"0"
 PORT
@@ -92,8 +92,8 @@ FIN_BOX
 BOX
 wx:Slider:windowLevel
 ISEXEC:FALSE
-697.550959:-84.063593:-900.000000
-748.950959:-94.063593:-900.000000
+674.847946:-558.490407:-900.000000
+726.247946:-568.490407:-900.000000
 PORT
 Min:"0"
 PORT
@@ -104,20 +104,20 @@ FIN_BOX
 BOX
 std:MultipleInputs:multLevels
 ISEXEC:FALSE
-288.287844:-125.896361:-900.000000
-333.862844:-135.896361:-900.000000
+679.603024:-599.665695:-900.000000
+723.553024:-609.665695:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CheckBoardBox:cbb
 ISEXEC:FALSE
-558.230487:-599.874244:-900.000000
-603.805487:-609.874244:-900.000000
+536.125779:-738.028671:-900.000000
+576.300779:-748.028671:-900.000000
 FIN_BOX
 BOX
 wx:Slider:sdr
 ISEXEC:FALSE
-655.843588:-494.766848:-900.000000
-707.243588:-504.766848:-900.000000
+616.765621:-647.526172:-900.000000
+668.165621:-657.526172:-900.000000
 PORT
 In:"14"
 PORT
@@ -128,8 +128,8 @@ FIN_BOX
 BOX
 wx:Slider:sdr2
 ISEXEC:FALSE
-714.326943:-493.179468:-900.000000
-765.726943:-503.179468:-900.000000
+704.458770:-649.096607:-900.000000
+755.858770:-659.096607:-900.000000
 PORT
 In:"14"
 PORT
@@ -140,36 +140,36 @@ FIN_BOX
 BOX
 wx:LayoutSplit:checkerBoard
 ISEXEC:FALSE
-644.846530:-650.309000:-900.000000
-690.421530:-660.309000:-900.000000
+544.019687:-789.486642:-900.000000
+588.719687:-799.486642:-900.000000
 PORT
 Proportion:"80"
 FIN_BOX
 BOX
 wx:LayoutLine:ly
 ISEXEC:FALSE
-697.847204:-530.358318:-900.000000
-755.407204:-540.358318:-900.000000
+643.374887:-681.933461:-900.000000
+700.934887:-691.933461:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:viewerCH
 ISEXEC:FALSE
-530.879919:-624.359326:-900.000000
-591.519919:-634.359326:-900.000000
+506.801576:-760.145392:-900.000000
+570.521576:-770.145392:-900.000000
 PORT
 nTypeView:"0"
 FIN_BOX
 BOX
 PackRecalage:TransparencyBox:trans
 ISEXEC:FALSE
-174.200863:-765.830614:-900.000000
-219.775863:-775.830614:-900.000000
+237.984820:-780.451058:-900.000000
+279.809820:-790.451058:-900.000000
 FIN_BOX
 BOX
 wx:Slider:sdrP
 ISEXEC:FALSE
-324.954367:-704.406667:-900.000000
-376.354367:-714.406667:-900.000000
+334.879676:-745.930920:-900.000000
+386.279676:-755.930920:-900.000000
 PORT
 In:"50"
 PORT
@@ -182,58 +182,58 @@ FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:transView
 ISEXEC:FALSE
-164.282997:-798.714564:-900.000000
-224.922997:-808.714564:-900.000000
+209.250725:-814.919150:-900.000000
+272.970725:-824.919150:-900.000000
 PORT
 nTypeView:"0"
 FIN_BOX
 BOX
 wx:LayoutSplit:transparency
 ISEXEC:FALSE
-205.109758:-835.113298:-900.000000
-250.684758:-845.113298:-900.000000
+235.695915:-845.443722:-900.000000
+279.420915:-855.443722:-900.000000
 PORT
 Proportion:"80"
 FIN_BOX
 BOX
 std:MultipleInputs:mult2
 ISEXEC:FALSE
-146.357541:-665.225031:-900.000000
-191.932541:-675.225031:-900.000000
+189.299695:-705.331383:-900.000000
+228.474695:-715.331383:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:mult3
 ISEXEC:FALSE
-401.536745:-634.900546:-900.000000
-447.111745:-644.900546:-900.000000
+386.547502:-726.659017:-900.000000
+425.722502:-736.659017:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:mult4
 ISEXEC:FALSE
 179.123700:-731.703455:-900.000000
-224.698700:-741.703455:-900.000000
+218.298700:-741.703455:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:tabs
 ISEXEC:FALSE
-191.519819:-874.211466:-900.000000
-249.079819:-884.211466:-900.000000
+236.892661:-877.452383:-900.000000
+294.452661:-887.452383:-900.000000
 PORT
 Orientation:V
 FIN_BOX
 BOX
 wx:LayoutLine:tools
 ISEXEC:FALSE
-771.358267:-334.065430:-900.000000
-828.918267:-344.065430:-900.000000
+459.974173:-652.062016:-900.000000
+517.534173:-662.062016:-900.000000
 PORT
 WinTitle:"Appearance"
 FIN_BOX
 BOX
 wx:LayoutSplit:convolTools
 ISEXEC:FALSE
-868.493941:-177.072226:-900.000000
-914.068941:-187.072226:-900.000000
+375.675088:-586.605666:-900.000000
+417.925088:-596.605666:-900.000000
 PORT
 Orientation:"H"
 PORT
@@ -243,7 +243,7 @@ BOX
 wx:LayoutSplit:window2
 ISEXEC:FALSE
 282.177476:-902.826135:-900.000000
-327.752476:-912.826135:-900.000000
+321.652476:-912.826135:-900.000000
 PORT
 Orientation:H
 PORT
@@ -252,42 +252,42 @@ FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box56
 ISEXEC:FALSE
-118.565004:15.062216:-900.000000
-189.740004:5.062216:-900.000000
+278.280926:-370.917928:-900.000000
+330.455926:-380.917928:-900.000000
 FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box59
 ISEXEC:FALSE
-289.953516:7.294430:-900.000000
-361.128516:-2.705570:-900.000000
+464.846105:-417.390719:-900.000000
+517.021105:-427.390719:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box61
 ISEXEC:FALSE
-403.420085:-702.995108:-900.000000
-460.980085:-712.995108:-900.000000
+434.481239:-727.433245:-900.000000
+492.041239:-737.433245:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:Box65
 ISEXEC:FALSE
-419.572796:-801.103027:-900.000000
-480.212796:-811.103027:-900.000000
+344.018911:-827.232923:-900.000000
+407.738911:-837.232923:-900.000000
 PORT
 nTypeView:0
 FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:Box66
 ISEXEC:FALSE
-497.442434:-799.958959:-900.000000
-558.082434:-809.958959:-900.000000
+421.497172:-830.459865:-900.000000
+485.217172:-840.459865:-900.000000
 PORT
 nTypeView:0
 FIN_BOX
 BOX
 wx:LayoutLine:Box67
 ISEXEC:FALSE
-428.693407:-832.025005:-900.000000
-486.253407:-842.025005:-900.000000
+344.632115:-865.041850:-900.000000
+402.192115:-875.041850:-900.000000
 PORT
 Orientation:H
 PORT
@@ -296,34 +296,40 @@ FIN_BOX
 BOX
 std:MultipleInputs:Box68
 ISEXEC:FALSE
-625.007956:-758.235235:-900.000000
-670.582956:-768.235235:-900.000000
+419.817379:-784.162573:-900.000000
+459.517379:-794.162573:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesSwitcherWidget:Box69
 ISEXEC:FALSE
--91.678462:-684.794791:-900.000000
--20.503462:-694.794791:-900.000000
+137.263160:-780.713436:-900.000000
+195.013160:-790.713436:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesWidget_base_2Dt_A:Box70
 ISEXEC:FALSE
--151.333352:-530.748508:-900.000000
--80.158352:-540.748508:-900.000000
+129.758517:-665.244627:-900.000000
+191.783517:-675.244627:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:Box71
 ISEXEC:FALSE
--194.872618:-467.078336:-900.000000
--149.297618:-477.078336:-900.000000
+105.932142:-617.753110:-900.000000
+145.632142:-627.753110:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesWidget_base_2Dt_B:Box72
 ISEXEC:FALSE
-24.864793:-523.045609:-900.000000
-96.039793:-533.045609:-900.000000
+256.073649:-670.863892:-900.000000
+317.773649:-680.863892:-900.000000
 FIN_BOX
-CONNECTIONS:80
+BOX
+creaMaracasVisu:SetPosition:Box39
+ISEXEC:FALSE
+426.711165:-857.651354:-900.000000
+463.261165:-867.651354:-900.000000
+FIN_BOX
+CONNECTIONS:83
 CONNECTION
 properties:LengthZ:sdrZ:Max
 NumberOfControlPoints:0
@@ -445,9 +451,6 @@ CONNECTION
 sdrF:Widget:convolTools:Widget1
 NumberOfControlPoints:0
 CONNECTION
-window2:Widget:Widget:Widget
-NumberOfControlPoints:0
-CONNECTION
 sdrZ:Widget:tools:Widget1
 NumberOfControlPoints:0
 CONNECTION
@@ -564,4 +567,16 @@ NumberOfControlPoints:0
 CONNECTION
 sdrZ:Out:Box72:SliceZ
 NumberOfControlPoints:0
+CONNECTION
+window2:Widget:Widget:Widget
+NumberOfControlPoints:0
+CONNECTION
+Box65:Point:Box39:Point
+NumberOfControlPoints:0
+CONNECTION
+Box66:wxVtkBaseView1:Box39:wxVtkBaseView
+NumberOfControlPoints:0
+CONNECTION
+Box65:BoxChange:Box39:BoxExecute
+NumberOfControlPoints:0
 APP_END

diff --git a/PackRecalage/bbs/boxes/CompareImagesWidget.bbs b/PackRecalage/bbs/boxes/CompareImagesWidget.bbs
index a32cc73ea8d8c9da275e2dea7f229e77e05f1386..94607d9e39a866f73bba31674b7f3881f9e5cc02 100644 (file)
--- a/PackRecalage/bbs/boxes/CompareImagesWidget.bbs
+++ b/PackRecalage/bbs/boxes/CompareImagesWidget.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.bbs
+# - /home/davila/Creatis/C8/creatools_source/creaRigidRegistration/PackRecalage/bbs/boxes/CompareImagesWidget.bbs
 # ----------------------------------
 
 include std
@@ -18,116 +18,118 @@ description "creatisRecalage"
 
 category "example"
 
-new ImageRecalageProperties properties
+new PackRecalage:ImageRecalageProperties properties
 
-new Slider sdrZ
+new wx:Slider sdrZ
   set sdrZ.Min "0"
   set sdrZ.ReactiveOnTrack "1"
   set sdrZ.Title "Z for slice"
 
-new Slider sdrF
+new wx:Slider sdrF
   set sdrF.In "0"
   set sdrF.Max "100"
   set sdrF.Min "0"
   set sdrF.ReactiveOnTrack "1"
   set sdrF.Title "Convolution Factor"
 
-new CheckBox checkF
+new wx:CheckBox checkF
   set checkF.In "True"
 
-new MultipleInputs multF
+new std:MultipleInputs multF
 
-new Slider colorLevel
+new wx:Slider colorLevel
   set colorLevel.Min "0"
   set colorLevel.ReactiveOnTrack "true"
   set colorLevel.Title "Color Level"
 
-new Slider windowLevel
+new wx:Slider windowLevel
   set windowLevel.Min "0"
   set windowLevel.ReactiveOnTrack "true"
   set windowLevel.Title "Window Level"
 
-new MultipleInputs multLevels
+new std:MultipleInputs multLevels
 
-new CheckBoardBox cbb
+new PackRecalage:CheckBoardBox cbb
 
-new Slider sdr
+new wx:Slider sdr
   set sdr.In "14"
   set sdr.Max "50"
   set sdr.ReactiveOnTrack "1"
 
-new Slider sdr2
+new wx:Slider sdr2
   set sdr2.In "14"
   set sdr2.Max "50"
   set sdr2.ReactiveOnTrack "1"
 
-new LayoutSplit checkerBoard
+new wx:LayoutSplit checkerBoard
   set checkerBoard.Proportion "80"
 
-new LayoutLine ly
+new wx:LayoutLine ly
 
-new ViewerNV viewerCH
+new creaMaracasVisu:ViewerNV viewerCH
   set viewerCH.nTypeView "0"
 
-new TransparencyBox trans
+new PackRecalage:TransparencyBox trans
 
-new Slider sdrP
+new wx:Slider sdrP
   set sdrP.In "50"
   set sdrP.Max "100"
   set sdrP.Min "0"
   set sdrP.ReactiveOnTrack "true"
 
-new ViewerNV transView
+new creaMaracasVisu:ViewerNV transView
   set transView.nTypeView "0"
 
-new LayoutSplit transparency
+new wx:LayoutSplit transparency
   set transparency.Proportion "80"
 
-new MultipleInputs mult2
+new std:MultipleInputs mult2
 
-new MultipleInputs mult3
+new std:MultipleInputs mult3
 
-new MultipleInputs mult4
+new std:MultipleInputs mult4
 
-new LayoutTab tabs
+new wx:LayoutTab tabs
   set tabs.Orientation V
 
-new LayoutLine tools
+new wx:LayoutLine tools
   set tools.WinTitle "Appearance"
 
-new LayoutSplit convolTools
+new wx:LayoutSplit convolTools
   set convolTools.Orientation "H"
   set convolTools.Proportion "80"
 
-new LayoutSplit window2
+new wx:LayoutSplit window2
   set window2.Orientation H
   set window2.Proportion "25"
 
-new vtkImageDataPointerRelay Box56
+new vtk:vtkImageDataPointerRelay Box56
 
-new vtkImageDataPointerRelay Box59
+new vtk:vtkImageDataPointerRelay Box59
 
-new LayoutTab Box61
+new wx:LayoutTab Box61
 
-new ViewerNV Box65
+new creaMaracasVisu:ViewerNV Box65
   set Box65.nTypeView 0
 
-new ViewerNV Box66
+new creaMaracasVisu:ViewerNV Box66
   set Box66.nTypeView 0
 
-new LayoutLine Box67
+new wx:LayoutLine Box67
   set Box67.Orientation H
   set Box67.WinTitle "Parallel"
 
-new MultipleInputs Box68
+new std:MultipleInputs Box68
 
-new CompareImagesSwitcherWidget Box69
+new PackRecalage:CompareImagesSwitcherWidget Box69
 
-new CompareImagesWidget_base_2Dt_A Box70
+new PackRecalage:CompareImagesWidget_base_2Dt_A Box70
 
-new MultipleInputs Box71
+new std:MultipleInputs Box71
 
-new CompareImagesWidget_base_2Dt_B Box72
+new PackRecalage:CompareImagesWidget_base_2Dt_B Box72
+
+new creaMaracasVisu:SetPosition Box39
 
 
 connect properties.LengthZ sdrZ.Max
@@ -206,6 +208,9 @@ connect checkF.Out Box72.ConvolutionOnOff
 connect sdrF.Out Box72.ConvolutionFactor
 connect multF.BoxChange Box72.BoxExecute
 connect sdrZ.Out Box72.SliceZ
+connect Box65.Point Box39.Point
+connect Box66.wxVtkBaseView1 Box39.wxVtkBaseView
+connect Box65.BoxChange Box39.BoxExecute
 
 # Complex input ports
 input In2 Box59.In " "