]> Creatis software - creaRigidRegistration.git/commitdiff
#3469 AddImageTo vector from creaRigidRegistration::PackRecalage to bbtk::vtk
authoreduardo.davila@creatis.insa-lyon.fr <eduardo.davila@creatis.insa-lyon.fr>
Fri, 22 Mar 2024 14:20:15 +0000 (15:20 +0100)
committereduardo.davila@creatis.insa-lyon.fr <eduardo.davila@creatis.insa-lyon.fr>
Fri, 22 Mar 2024 14:20:15 +0000 (15:20 +0100)
12 files changed:
PackRecalage/bbs/boxes/CompareImagesParallelWidget.bbg [new file with mode: 0644]
PackRecalage/bbs/boxes/CompareImagesParallelWidget.bbs [new file with mode: 0644]
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/CompareImagesWidget_base_3Dp_B.bbg
PackRecalage/bbs/boxes/CompareImagesWidget_base_3Dp_B.bbs
PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbg
PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs
PackRecalage/src/bbPackRecalageAddImageToVector.cxx [deleted file]
PackRecalage/src/bbPackRecalageAddImageToVector.h [deleted file]

diff --git a/PackRecalage/bbs/boxes/CompareImagesParallelWidget.bbg b/PackRecalage/bbs/boxes/CompareImagesParallelWidget.bbg
new file mode 100644 (file)
index 0000000..4c7bb2e
--- /dev/null
@@ -0,0 +1,424 @@
+# ----------------------------------
+# - BBTKGEditor v 1.6 BBG BlackBox Diagram file
+# - /Users/davila/Creatis/C23/creatools_source/creaRigidRegistration/PackRecalage/bbs/boxes/CompareImagesParallelWidget.bbg
+# ----------------------------------
+
+APP_START
+CATEGORY:<VOID>
+DESCRIPTION:Description ??
+AUTHOR:Author ??
+EXPORTFORMAT:0
+COMPLEXBOX:TRUE
+COMPLEXBOXNAME:CompareParallelWidget
+PACKAGENAME:PackRecalage
+COMPLEXOUTPUTS:1
+COMPLEX_PORT
+widget
+6.784998:-91.605139:-900.000000
+FIN_COMPLEX_PORT
+COMPLEXINPUTS:4
+COMPLEX_PORT
+Image1
+-49.024457:46.037536:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+Image2
+-12.142481:45.907670:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+point
+48.201847:46.777230:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+boxExecute
+-74.160296:46.101218:-900.000000
+FIN_COMPLEX_PORT
+BOXES:29
+BOX
+wx:LayoutLine:Box03
+ISEXEC:FALSE
+-124.305078:-50.180834:-900.000000
+-90.985078:-52.680834:-900.000000
+PORT
+Orientation:"H"
+PORT
+WinTitle:"YZ"
+FIN_BOX
+BOX
+std:MagicBox:Box04
+ISEXEC:FALSE
+-51.362047:31.752264:-900.000000
+-29.762047:29.252264:-900.000000
+FIN_BOX
+BOX
+std:MagicBox:Box05
+ISEXEC:FALSE
+-16.193871:31.648557:-900.000000
+5.406129:29.148557:-900.000000
+FIN_BOX
+BOX
+wx:LayoutTab:Box06
+ISEXEC:FALSE
+-1.553731:-71.347377:-900.000000
+31.766269:-73.847377:-900.000000
+PORT
+WinTitle:"Parallel"
+FIN_BOX
+BOX
+creaMaracasVisu:ViewerNV:Box07
+ISEXEC:FALSE
+-143.731970:24.171782:-900.000000
+-103.371970:21.671782:-900.000000
+PORT
+nTypeView:"1"
+FIN_BOX
+BOX
+creaMaracasVisu:ViewerNV:Box08
+ISEXEC:FALSE
+-129.428834:-27.449906:-900.000000
+-89.068834:-29.949906:-900.000000
+PORT
+nTypeView:"1"
+FIN_BOX
+BOX
+wx:LayoutLine:Box09
+ISEXEC:FALSE
+6.293355:-45.876576:-900.000000
+39.613355:-48.376576:-900.000000
+PORT
+Orientation:"H"
+PORT
+WinTitle:"XZ"
+FIN_BOX
+BOX
+creaMaracasVisu:ViewerNV:Box10
+ISEXEC:FALSE
+-20.484647:18.220401:-900.000000
+19.875353:15.720401:-900.000000
+PORT
+nTypeView:"2"
+FIN_BOX
+BOX
+creaMaracasVisu:ViewerNV:Box11
+ISEXEC:FALSE
+4.834483:-27.284499:-900.000000
+45.194483:-29.784499:-900.000000
+PORT
+nTypeView:"2"
+FIN_BOX
+BOX
+wx:LayoutLine:Box12
+ISEXEC:FALSE
+141.832439:-53.555691:-900.000000
+175.152439:-56.055691:-900.000000
+PORT
+Orientation:"H"
+PORT
+WinTitle:"XY"
+FIN_BOX
+BOX
+creaMaracasVisu:ViewerNV:Box13
+ISEXEC:FALSE
+121.926866:19.391613:-900.000000
+162.286866:16.891613:-900.000000
+PORT
+nTypeView:"0"
+FIN_BOX
+BOX
+creaMaracasVisu:ViewerNV:Box14
+ISEXEC:FALSE
+152.522376:-36.367170:-900.000000
+192.882376:-38.867170:-900.000000
+PORT
+nTypeView:"0"
+FIN_BOX
+BOX
+creaMaracasVisu:wxVtkBaseView_Info:Box15
+ISEXEC:FALSE
+-157.113674:15.280717:-900.000000
+-128.073674:12.780717:-900.000000
+PORT
+InteractionType:"12"
+FIN_BOX
+BOX
+std:GetVectorDoubleElement:Box16
+ISEXEC:FALSE
+-158.486966:8.201640:-900.000000
+-135.361966:5.701640:-900.000000
+PORT
+I:"0"
+FIN_BOX
+BOX
+std:GetVectorDoubleElement:Box18
+ISEXEC:FALSE
+-123.762550:8.401434:-900.000000
+-100.637550:5.901434:-900.000000
+PORT
+I:"1"
+FIN_BOX
+BOX
+creaMaracasVisu:wxVtkBaseView_Info:Box19
+ISEXEC:FALSE
+-20.299185:7.227675:-900.000000
+8.740815:4.727675:-900.000000
+PORT
+InteractionType:"12"
+FIN_BOX
+BOX
+std:GetVectorDoubleElement:Box20
+ISEXEC:FALSE
+-21.672478:0.148597:-900.000000
+1.452522:-2.351403:-900.000000
+PORT
+I:"0"
+FIN_BOX
+BOX
+std:GetVectorDoubleElement:Box21
+ISEXEC:FALSE
+13.051938:0.348391:-900.000000
+36.176938:-2.151609:-900.000000
+PORT
+I:"1"
+FIN_BOX
+BOX
+creaMaracasVisu:wxVtkBaseView_Info:Box22
+ISEXEC:FALSE
+129.158863:8.284604:-900.000000
+158.198863:5.784604:-900.000000
+PORT
+InteractionType:"12"
+FIN_BOX
+BOX
+std:GetVectorDoubleElement:Box23
+ISEXEC:FALSE
+128.728398:0.734113:-900.000000
+151.853398:-1.765887:-900.000000
+PORT
+I:"0"
+FIN_BOX
+BOX
+std:GetVectorDoubleElement:Box24
+ISEXEC:FALSE
+163.452815:0.933906:-900.000000
+186.577815:-1.566094:-900.000000
+PORT
+I:"1"
+FIN_BOX
+BOX
+std:MagicBox:Box25
+ISEXEC:FALSE
+45.244824:33.361102:-900.000000
+66.844824:30.861102:-900.000000
+FIN_BOX
+BOX
+creaMaracasVisu:SetPosition:Box26
+ISEXEC:FALSE
+-206.945001:-34.139409:-900.000000
+-185.285001:-36.639409:-900.000000
+FIN_BOX
+BOX
+creaMaracasVisu:SetPosition:Box27
+ISEXEC:FALSE
+-182.677604:-34.223792:-900.000000
+-161.017604:-36.723792:-900.000000
+FIN_BOX
+BOX
+creaMaracasVisu:SetPosition:Box28
+ISEXEC:FALSE
+-41.155247:-36.130386:-900.000000
+-19.495247:-38.630386:-900.000000
+FIN_BOX
+BOX
+creaMaracasVisu:SetPosition:Box29
+ISEXEC:FALSE
+-18.339805:-36.180198:-900.000000
+3.320195:-38.680198:-900.000000
+FIN_BOX
+BOX
+creaMaracasVisu:SetPosition:Box30
+ISEXEC:FALSE
+103.499966:-47.680028:-900.000000
+125.159966:-50.180028:-900.000000
+FIN_BOX
+BOX
+creaMaracasVisu:SetPosition:Box31
+ISEXEC:FALSE
+126.733709:-47.520690:-900.000000
+148.393709:-50.020690:-900.000000
+FIN_BOX
+BOX
+std:MagicBox:Box32
+ISEXEC:FALSE
+-79.192176:32.827304:-900.000000
+-57.592176:30.327304:-900.000000
+FIN_BOX
+CONNECTIONS:56
+CONNECTION
+Image1:Image1:Box04:In
+NumberOfControlPoints:0
+CONNECTION
+Image2:Image2:Box05:In
+NumberOfControlPoints:0
+CONNECTION
+Box06:Widget:widget:widget
+NumberOfControlPoints:0
+CONNECTION
+Box04:Out:Box07:In
+NumberOfControlPoints:0
+CONNECTION
+Box05:Out:Box08:In
+NumberOfControlPoints:0
+CONNECTION
+Box07:Widget:Box03:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box08:Widget:Box03:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box03:Widget:Box06:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box10:Widget:Box09:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box11:Widget:Box09:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box09:Widget:Box06:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box13:Widget:Box12:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box14:Widget:Box12:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box12:Widget:Box06:Widget3
+NumberOfControlPoints:0
+CONNECTION
+Box04:Out:Box13:In
+NumberOfControlPoints:0
+CONNECTION
+Box05:Out:Box14:In
+NumberOfControlPoints:0
+CONNECTION
+Box04:Out:Box10:In
+NumberOfControlPoints:0
+CONNECTION
+Box05:Out:Box11:In
+NumberOfControlPoints:0
+CONNECTION
+Box07:wxVtkBaseView1:Box15:wxVtkBaseView
+NumberOfControlPoints:0
+CONNECTION
+Box15:WindowColorLevel:Box16:In
+NumberOfControlPoints:0
+CONNECTION
+Box16:Out:Box08:WindowLevel
+NumberOfControlPoints:0
+CONNECTION
+Box18:Out:Box08:ColorLevel
+NumberOfControlPoints:0
+CONNECTION
+Box15:WindowColorLevel:Box18:In
+NumberOfControlPoints:0
+CONNECTION
+Box15:BoxChange:Box08:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box19:WindowColorLevel:Box20:In
+NumberOfControlPoints:0
+CONNECTION
+Box19:WindowColorLevel:Box21:In
+NumberOfControlPoints:0
+CONNECTION
+Box22:WindowColorLevel:Box23:In
+NumberOfControlPoints:0
+CONNECTION
+Box22:WindowColorLevel:Box24:In
+NumberOfControlPoints:0
+CONNECTION
+Box10:wxVtkBaseView1:Box19:wxVtkBaseView
+NumberOfControlPoints:0
+CONNECTION
+Box13:wxVtkBaseView1:Box22:wxVtkBaseView
+NumberOfControlPoints:0
+CONNECTION
+Box19:BoxChange:Box11:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box22:BoxChange:Box14:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box20:Out:Box11:WindowLevel
+NumberOfControlPoints:0
+CONNECTION
+Box21:Out:Box11:ColorLevel
+NumberOfControlPoints:0
+CONNECTION
+Box23:Out:Box14:WindowLevel
+NumberOfControlPoints:0
+CONNECTION
+Box24:Out:Box14:ColorLevel
+NumberOfControlPoints:0
+CONNECTION
+point:point:Box25:In
+NumberOfControlPoints:0
+CONNECTION
+Box25:Out:Box26:Point
+NumberOfControlPoints:0
+CONNECTION
+Box25:Out:Box28:Point
+NumberOfControlPoints:0
+CONNECTION
+Box25:Out:Box30:Point
+NumberOfControlPoints:0
+CONNECTION
+Box07:wxVtkBaseView1:Box26:wxVtkBaseView
+NumberOfControlPoints:0
+CONNECTION
+Box08:wxVtkBaseView1:Box27:wxVtkBaseView
+NumberOfControlPoints:0
+CONNECTION
+Box10:wxVtkBaseView1:Box28:wxVtkBaseView
+NumberOfControlPoints:0
+CONNECTION
+Box11:wxVtkBaseView1:Box29:wxVtkBaseView
+NumberOfControlPoints:0
+CONNECTION
+Box13:wxVtkBaseView1:Box30:wxVtkBaseView
+NumberOfControlPoints:0
+CONNECTION
+Box14:wxVtkBaseView1:Box31:wxVtkBaseView
+NumberOfControlPoints:0
+CONNECTION
+boxExecute:boxExecute:Box32:In
+NumberOfControlPoints:0
+CONNECTION
+Box32:BoxChange:Box26:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box32:BoxChange:Box28:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box32:BoxChange:Box30:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box07:Point:Box27:Point
+NumberOfControlPoints:0
+CONNECTION
+Box07:BoxChange:Box27:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box10:BoxChange:Box29:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box10:Point:Box29:Point
+NumberOfControlPoints:0
+CONNECTION
+Box13:BoxChange:Box31:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box13:Point:Box31:Point
+NumberOfControlPoints:0
+APP_END
diff --git a/PackRecalage/bbs/boxes/CompareImagesParallelWidget.bbs b/PackRecalage/bbs/boxes/CompareImagesParallelWidget.bbs
new file mode 100644 (file)
index 0000000..37f44f9
--- /dev/null
@@ -0,0 +1,162 @@
+# ----------------------------------
+# - BBTKGEditor v 1.6 BBS BlackBox Script (Complex Box)
+# - /Users/davila/Creatis/C23/creatools_source/creaRigidRegistration/PackRecalage/bbs/boxes/CompareImagesParallelWidget.bbs
+# ----------------------------------
+
+include std
+include itkvtk
+include wx
+include std
+include creaMaracasVisu
+
+define CompareParallelWidget PackRecalage
+
+author "Author ??"
+description "Description ??"
+
+category "<VOID>"
+
+new wx:LayoutLine Box03
+  set Box03.Orientation "H"
+  set Box03.WinTitle "YZ"
+
+new std:MagicBox Box04
+
+new std:MagicBox Box05
+
+new wx:LayoutTab Box06
+  set Box06.WinTitle "Parallel"
+
+new creaMaracasVisu:ViewerNV Box07
+  set Box07.nTypeView "1"
+
+new creaMaracasVisu:ViewerNV Box08
+  set Box08.nTypeView "1"
+
+new wx:LayoutLine Box09
+  set Box09.Orientation "H"
+  set Box09.WinTitle "XZ"
+
+new creaMaracasVisu:ViewerNV Box10
+  set Box10.nTypeView "2"
+
+new creaMaracasVisu:ViewerNV Box11
+  set Box11.nTypeView "2"
+
+new wx:LayoutLine Box12
+  set Box12.Orientation "H"
+  set Box12.WinTitle "XY"
+
+new creaMaracasVisu:ViewerNV Box13
+  set Box13.nTypeView "0"
+
+new creaMaracasVisu:ViewerNV Box14
+  set Box14.nTypeView "0"
+
+new creaMaracasVisu:wxVtkBaseView_Info Box15
+  set Box15.InteractionType "12"
+
+new std:GetVectorDoubleElement Box16
+  set Box16.I "0"
+
+new std:GetVectorDoubleElement Box18
+  set Box18.I "1"
+
+new creaMaracasVisu:wxVtkBaseView_Info Box19
+  set Box19.InteractionType "12"
+
+new std:GetVectorDoubleElement Box20
+  set Box20.I "0"
+
+new std:GetVectorDoubleElement Box21
+  set Box21.I "1"
+
+new creaMaracasVisu:wxVtkBaseView_Info Box22
+  set Box22.InteractionType "12"
+
+new std:GetVectorDoubleElement Box23
+  set Box23.I "0"
+
+new std:GetVectorDoubleElement Box24
+  set Box24.I "1"
+
+new std:MagicBox Box25
+
+new creaMaracasVisu:SetPosition Box26
+
+new creaMaracasVisu:SetPosition Box27
+
+new creaMaracasVisu:SetPosition Box28
+
+new creaMaracasVisu:SetPosition Box29
+
+new creaMaracasVisu:SetPosition Box30
+
+new creaMaracasVisu:SetPosition Box31
+
+new std:MagicBox Box32
+
+
+connect Box04.Out Box07.In
+connect Box05.Out Box08.In
+connect Box07.Widget Box03.Widget1
+connect Box08.Widget Box03.Widget2
+connect Box03.Widget Box06.Widget1
+connect Box10.Widget Box09.Widget1
+connect Box11.Widget Box09.Widget2
+connect Box09.Widget Box06.Widget2
+connect Box13.Widget Box12.Widget1
+connect Box14.Widget Box12.Widget2
+connect Box12.Widget Box06.Widget3
+connect Box04.Out Box13.In
+connect Box05.Out Box14.In
+connect Box04.Out Box10.In
+connect Box05.Out Box11.In
+connect Box07.wxVtkBaseView1 Box15.wxVtkBaseView
+connect Box15.WindowColorLevel Box16.In
+connect Box16.Out Box08.WindowLevel
+connect Box18.Out Box08.ColorLevel
+connect Box15.WindowColorLevel Box18.In
+connect Box15.BoxChange Box08.BoxExecute
+connect Box19.WindowColorLevel Box20.In
+connect Box19.WindowColorLevel Box21.In
+connect Box22.WindowColorLevel Box23.In
+connect Box22.WindowColorLevel Box24.In
+connect Box10.wxVtkBaseView1 Box19.wxVtkBaseView
+connect Box13.wxVtkBaseView1 Box22.wxVtkBaseView
+connect Box19.BoxChange Box11.BoxExecute
+connect Box22.BoxChange Box14.BoxExecute
+connect Box20.Out Box11.WindowLevel
+connect Box21.Out Box11.ColorLevel
+connect Box23.Out Box14.WindowLevel
+connect Box24.Out Box14.ColorLevel
+connect Box25.Out Box26.Point
+connect Box25.Out Box28.Point
+connect Box25.Out Box30.Point
+connect Box07.wxVtkBaseView1 Box26.wxVtkBaseView
+connect Box08.wxVtkBaseView1 Box27.wxVtkBaseView
+connect Box10.wxVtkBaseView1 Box28.wxVtkBaseView
+connect Box11.wxVtkBaseView1 Box29.wxVtkBaseView
+connect Box13.wxVtkBaseView1 Box30.wxVtkBaseView
+connect Box14.wxVtkBaseView1 Box31.wxVtkBaseView
+connect Box32.BoxChange Box26.BoxExecute
+connect Box32.BoxChange Box28.BoxExecute
+connect Box32.BoxChange Box30.BoxExecute
+connect Box07.Point Box27.Point
+connect Box07.BoxChange Box27.BoxExecute
+connect Box10.BoxChange Box29.BoxExecute
+connect Box10.Point Box29.Point
+connect Box13.BoxChange Box31.BoxExecute
+connect Box13.Point Box31.Point
+
+# Complex input ports
+input Image1 Box04.In " "
+input Image2 Box05.In " "
+input point Box25.In " "
+input boxExecute Box32.In " "
+
+# Complex output ports
+output widget Box06.Widget " "
+
+
+endefine
index dcd6e3710d0185b0d0961be14aabaac35d3ec745..2934d87d69003ff1cb84157ae5466420b1866e68 100644 (file)
@@ -25,7 +25,7 @@ COMPLEX_PORT
 ImageVector2
 -5.355679:60.452088:-900.000000
 FIN_COMPLEX_PORT
-BOXES:40
+BOXES:39
 BOX
 PackRecalage:ImageSwitcherBox:switch
 ISEXEC:FALSE
@@ -277,12 +277,6 @@ PORT
 WinTitle:"Viewer help"
 FIN_BOX
 BOX
-creaMaracasVisu:HelpViewerNV:Box53
-ISEXEC:FALSE
-38.626906:-90.428699:-900.000000
-60.661906:-92.928699:-900.000000
-FIN_BOX
-BOX
 creaMaracasVisu:wxVtkBaseView_Info:Box54
 ISEXEC:FALSE
 -99.994455:-30.626837:-900.000000
@@ -318,7 +312,7 @@ ISEXEC:FALSE
 -185.233594:-55.932074:-900.000000
 -163.263594:-58.432074:-900.000000
 FIN_BOX
-CONNECTIONS:61
+CONNECTIONS:60
 CONNECTION
 checkS:Out:switch:On
 NumberOfControlPoints:0
@@ -458,9 +452,6 @@ CONNECTION
 Box51:Widget:Box29:Widget2
 NumberOfControlPoints:0
 CONNECTION
-Box53:widget:Box52:Widget1
-NumberOfControlPoints:0
-CONNECTION
 Box54:WindowColorLevel:Box55:In
 NumberOfControlPoints:0
 CONNECTION
index 018a352ec3795e712fa9527fed8f642a2a7c71f2..14aba5a0a77104f09eb05b845e6cd5a90f941475 100644 (file)
@@ -109,8 +109,6 @@ new wx:LayoutTab Box51
 new wx:LayoutLine Box52
   set Box52.WinTitle "Viewer help"
 
-new creaMaracasVisu:HelpViewerNV Box53
-
 new creaMaracasVisu:wxVtkBaseView_Info Box54
   set Box54.InteractionType "12"
 
@@ -168,7 +166,6 @@ connect Box52.Widget Box51.Widget1
 connect Box28.Widget Box50.Widget1
 connect Box46.Widget Box29.Widget1
 connect Box51.Widget Box29.Widget2
-connect Box53.widget Box52.Widget1
 connect Box54.WindowColorLevel Box55.In
 connect Box54.WindowColorLevel Box56.In
 connect Box55.Out Box28.WindowLevel
index 0a21cd4fb7e04e1a2f3f5f41dfdf2c6bae5f5cb7..c50ba8499574d970061fc6be5ccffb40b1ccf038 100644 (file)
@@ -29,7 +29,7 @@ COMPLEX_PORT
 VectorImate2
 36.384894:8.006302:-900.000000
 FIN_COMPLEX_PORT
-BOXES:34
+BOXES:33
 BOX
 PackRecalage:TransparencyBox:Box00
 ISEXEC:FALSE
@@ -134,7 +134,7 @@ BOX
 vtk:GetVectorVtkImageDataElement:Box18
 ISEXEC:FALSE
 -110.076641:-15.482972:-900.000000
--86.241642:-17.982972:-900.000000
+-86.241641:-17.982972:-900.000000
 PORT
 I:"0"
 FIN_BOX
@@ -239,12 +239,6 @@ PORT
 WinTitle:"Viewer help"
 FIN_BOX
 BOX
-creaMaracasVisu:HelpViewerNV:Box36
-ISEXEC:FALSE
-122.788713:-110.971884:-900.000000
-144.823713:-113.471884:-900.000000
-FIN_BOX
-BOX
 creaMaracasVisu:wxVtkBaseView_Info:Box37
 ISEXEC:FALSE
 -8.076674:-49.674644:-900.000000
@@ -280,7 +274,7 @@ ISEXEC:FALSE
 79.315687:-52.669793:-900.000000
 101.285687:-55.169793:-900.000000
 FIN_BOX
-CONNECTIONS:57
+CONNECTIONS:56
 CONNECTION
 Box01:Out:Box00:Percent
 NumberOfControlPoints:0
@@ -409,9 +403,6 @@ CONNECTION
 Box34:Widget:Box12:Widget2
 NumberOfControlPoints:0
 CONNECTION
-Box36:widget:Box35:Widget1
-NumberOfControlPoints:0
-CONNECTION
 Box37:WindowColorLevel:Box38:In
 NumberOfControlPoints:0
 CONNECTION
index aa3674404c87e5a873588dd7d4bd92354afba845..e15faddab941c65ea30dda29fd51a4f718236ad7 100644 (file)
@@ -94,8 +94,6 @@ new wx:LayoutTab Box34
 new wx:LayoutLine Box35
   set Box35.WinTitle "Viewer help"
 
-new creaMaracasVisu:HelpViewerNV Box36
-
 new creaMaracasVisu:wxVtkBaseView_Info Box37
   set Box37.InteractionType "12"
 
@@ -148,7 +146,6 @@ connect Box30.Widget Box11.Widget1
 connect Box08.Widget Box33.Widget1
 connect Box32.Widget Box12.Widget1
 connect Box34.Widget Box12.Widget2
-connect Box36.widget Box35.Widget1
 connect Box37.WindowColorLevel Box38.In
 connect Box37.WindowColorLevel Box39.In
 connect Box38.Out Box02.WindowLevel
index f3a0e07bff403d12ff35b2202bb5c8991f7d7679..5241e812679c6aaeb03d466b568880c7c2aeb349 100644 (file)
@@ -81,7 +81,7 @@ PORT
 TypeOrientation:"2"
 FIN_BOX
 BOX
-PackRecalage:AddImageToVector:Box07
+vtk:AddImageToVector:Box07
 ISEXEC:FALSE
 -29.049779:-18.118540:-900.000000
 -4.529779:-20.618540:-900.000000
@@ -90,13 +90,13 @@ BOX
 vtk:vtkImageDataPointerRelay:Box08
 ISEXEC:FALSE
 -33.164330:46.674938:-900.000000
--9.954330:44.174938:-900.000000
+6.920000:44.174938:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box09
 ISEXEC:FALSE
 -111.324904:21.759402:-900.000000
--89.724904:19.259402:-900.000000
+8.680000:19.259402:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box10
index 67bf3a04f350231a1487dfced02e698842a7442e..fd42f0083034e3cfdef07193cd92caef4de9d3b1 100644 (file)
@@ -32,7 +32,7 @@ new PackRecalage:ImageConvolution Box05
 new creaMaracasVisu:SliceImage Box06
   set Box06.TypeOrientation "2"
 
-new PackRecalage:AddImageToVector Box07
+new vtk:AddImageToVector Box07
 
 new vtk:vtkImageDataPointerRelay Box08
 
index fbe49da78ebac521554d0f9bbec833907d4c7f68..4e747d6bdb9914283ecb89cbe024903dcd73bd13 100644 (file)
@@ -14,35 +14,35 @@ PACKAGENAME:PackRecalage
 COMPLEXOUTPUTS:1
 COMPLEX_PORT
 Widget
--74.419573:-102.932032:-900.000000
+-66.405159:-119.432880:-900.000000
 FIN_COMPLEX_PORT
 COMPLEXINPUTS:5
 COMPLEX_PORT
 In2
--89.904631:26.021102:-900.000000
+-79.587339:28.312052:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 In1
--159.912078:25.159426:-900.000000
+-159.912078:27.690149:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 WinTitle
--46.627143:25.527167:-900.000000
+-42.444130:27.998948:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 Point
-7.758998:26.358175:-900.000000
+-117.859522:27.833974:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 BoxExecute
--194.062541:25.899947:-900.000000
+-196.846336:27.165309:-900.000000
 FIN_COMPLEX_PORT
-BOXES:16
+BOXES:17
 BOX
 wx:LayoutTab:tabs
 ISEXEC:FALSE
--152.924653:-77.415468:-900.000000
--119.604653:-79.915468:-900.000000
+-113.414337:-96.242566:-900.000000
+-80.094337:-98.742566:-900.000000
 PORT
 Orientation:V
 FIN_BOX
@@ -55,20 +55,20 @@ FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box59
 ISEXEC:FALSE
--97.775880:18.343837:-900.000000
--74.565880:15.843837:-900.000000
+-82.288012:18.343837:-900.000000
+-59.078012:15.843837:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesWidget_base_interface_3Dp:Box18
 ISEXEC:FALSE
--126.935814:9.880857:-900.000000
--101.945814:7.380857:-900.000000
+-126.621538:2.181095:-900.000000
+-101.631538:-0.318905:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesWidget_base_3Dp_B:Box13
 ISEXEC:FALSE
--174.681937:-8.725716:-900.000000
--150.446937:-11.225716:-900.000000
+-173.267695:-20.196790:-900.000000
+-149.032695:-22.696790:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesTransparencyWidget_3Dp:Box14
@@ -79,8 +79,8 @@ FIN_BOX
 BOX
 PackRecalage:CompareImagesWidget_base_3Dp_B:Box15
 ISEXEC:FALSE
--96.177219:-9.534813:-900.000000
--71.942219:-12.034813:-900.000000
+-89.577423:-20.691611:-900.000000
+-65.342423:-23.191611:-900.000000
 FIN_BOX
 BOX
 PackRecalage:CompareImagesSwitcherWidget_3Dp:Box17
@@ -91,34 +91,28 @@ FIN_BOX
 BOX
 std:MultipleInputs:Box11
 ISEXEC:FALSE
--197.279391:0.448783:-900.000000
--175.309391:-2.051217:-900.000000
+-195.393735:-0.651183:-900.000000
+-173.423735:-3.151183:-900.000000
 FIN_BOX
 BOX
 std:StringRelay:Box12
 ISEXEC:FALSE
-0.930237:17.806148:-900.000000
-22.625237:15.306148:-900.000000
+-121.214732:18.400322:-900.000000
+-99.519732:15.900322:-900.000000
 FIN_BOX
 BOX
 wx:LayoutSplit:Box16
 ISEXEC:FALSE
--76.430966:-95.476325:-900.000000
--53.670966:-97.976325:-900.000000
+-68.362923:-109.039319:-900.000000
+-45.602923:-111.539319:-900.000000
 PORT
 Proportion:"10"
 FIN_BOX
 BOX
-creaVtk:CompareImagesByRGB-Widget:Box19
-ISEXEC:FALSE
--69.901579:-58.674078:-900.000000
--46.226579:-61.174078:-900.000000
-FIN_BOX
-BOX
 wx:LayoutLine:Box20
 ISEXEC:FALSE
--107.007717:-68.978893:-900.000000
--73.687717:-71.478893:-900.000000
+-76.132895:-65.899037:-900.000000
+-42.812895:-68.399037:-900.000000
 PORT
 WinTitle:"RGB"
 FIN_BOX
@@ -131,16 +125,28 @@ FIN_BOX
 BOX
 PackRecalage:ImageConvolution:Box22
 ISEXEC:FALSE
--43.729401:-27.023708:-900.000000
--21.294401:-29.523708:-900.000000
+-95.356152:-30.060576:-900.000000
+-72.921152:-32.560576:-900.000000
 FIN_BOX
 BOX
 PackRecalage:ImageConvolution:Box23
 ISEXEC:FALSE
--14.044831:-27.161148:-900.000000
-8.390169:-29.661148:-900.000000
+-65.671582:-30.198016:-900.000000
+-43.236582:-32.698016:-900.000000
+FIN_BOX
+BOX
+PackRecalage:CompareParallelWidget:Box24
+ISEXEC:FALSE
+-22.089238:-58.602528:-900.000000
+0.860762:-61.102528:-900.000000
+FIN_BOX
+BOX
+creaVtk:CompareImagesByRGB-Widget:Box25
+ISEXEC:FALSE
+-71.824796:-57.512916:-900.000000
+-48.149796:-60.012916:-900.000000
 FIN_BOX
-CONNECTIONS:40
+CONNECTIONS:46
 CONNECTION
 In2:In2:Box59:In
 NumberOfControlPoints:0
@@ -211,9 +217,6 @@ CONNECTION
 tabs:Widget:Box16:Widget2
 NumberOfControlPoints:0
 CONNECTION
-Box19:OutWidget:Box20:Widget2
-NumberOfControlPoints:0
-CONNECTION
 Box20:Widget:tabs:Widget3
 NumberOfControlPoints:0
 CONNECTION
@@ -229,9 +232,6 @@ CONNECTION
 Box11:BoxChange:Box15:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-Box11:BoxChange:Box19:boxExecute
-NumberOfControlPoints:0
-CONNECTION
 Box18:ConvolutionOnOff:Box22:On
 NumberOfControlPoints:0
 CONNECTION
@@ -241,9 +241,6 @@ CONNECTION
 Box59:Out:Box23:In
 NumberOfControlPoints:0
 CONNECTION
-Box23:Out:Box19:Image2
-NumberOfControlPoints:0
-CONNECTION
 Box56:Out:Box22:In
 NumberOfControlPoints:0
 CONNECTION
@@ -259,6 +256,33 @@ CONNECTION
 Box11:BoxChange:Box23:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-Box22:Out:Box19:Image1
+Box24:widget:tabs:Widget5
+NumberOfControlPoints:0
+CONNECTION
+Box22:Out:Box24:Image1
+NumberOfControlPoints:0
+CONNECTION
+Box23:Out:Box24:Image2
+NumberOfControlPoints:0
+CONNECTION
+Box12:Out:Box24:point
+NumberOfControlPoints:0
+CONNECTION
+Box21:BoxChange:Box24:boxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box22:Out:Box25:Image1
+NumberOfControlPoints:0
+CONNECTION
+Box23:Out:Box25:Image2
+NumberOfControlPoints:0
+CONNECTION
+Box21:BoxChange:Box25:boxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box12:Out:Box25:point
+NumberOfControlPoints:0
+CONNECTION
+Box25:OutWidget:Box20:Widget1
 NumberOfControlPoints:0
 APP_END
index a4536c93f954ac096f3a406dba5531da953dc689..541a06d307a4796e382385362b8974dbc46e427d 100644 (file)
@@ -42,8 +42,6 @@ new std:StringRelay Box12
 new wx:LayoutSplit Box16
   set Box16.Proportion "10"
 
-new creaVtk:CompareImagesByRGB-Widget Box19
-
 new wx:LayoutLine Box20
   set Box20.WinTitle "RGB"
 
@@ -53,6 +51,10 @@ new PackRecalage:ImageConvolution Box22
 
 new PackRecalage:ImageConvolution Box23
 
+new PackRecalage:CompareParallelWidget Box24
+
+new creaVtk:CompareImagesByRGB-Widget Box25
+
 
 connect Box18.ConvolutionFactor Box13.ConvolutionFactor
 connect Box18.ConvolutionOnOff Box13.ConvolutionOnOff
@@ -72,22 +74,28 @@ connect Box12.Out Box15.Point
 connect Box12.Out Box13.Point
 connect Box18.Widget Box16.Widget1
 connect tabs.Widget Box16.Widget2
-connect Box19.OutWidget Box20.Widget2
 connect Box20.Widget tabs.Widget3
 connect Box21.BoxChange Box11.In1
 connect Box11.BoxChange Box13.BoxExecute
 connect Box11.BoxChange Box15.BoxExecute
-connect Box11.BoxChange Box19.boxExecute
 connect Box18.ConvolutionOnOff Box22.On
 connect Box18.ConvolutionOnOff Box23.On
 connect Box59.Out Box23.In
-connect Box23.Out Box19.Image2
 connect Box56.Out Box22.In
 connect Box18.ConvolutionFactor Box22.Factor
 connect Box18.ConvolutionFactor Box23.Factor
 connect Box11.BoxChange Box22.BoxExecute
 connect Box11.BoxChange Box23.BoxExecute
-connect Box22.Out Box19.Image1
+connect Box24.widget tabs.Widget5
+connect Box22.Out Box24.Image1
+connect Box23.Out Box24.Image2
+connect Box12.Out Box24.point
+connect Box21.BoxChange Box24.boxExecute
+connect Box22.Out Box25.Image1
+connect Box23.Out Box25.Image2
+connect Box21.BoxChange Box25.boxExecute
+connect Box12.Out Box25.point
+connect Box25.OutWidget Box20.Widget1
 
 # Complex input ports
 input In2 Box59.In " "
diff --git a/PackRecalage/src/bbPackRecalageAddImageToVector.cxx b/PackRecalage/src/bbPackRecalageAddImageToVector.cxx
deleted file mode 100644 (file)
index 4fc89e3..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-//===== 
-// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
-//===== 
-#include "bbPackRecalageAddImageToVector.h"
-#include "bbPackRecalagePackage.h"
-
-namespace bbPackRecalage
-{
-
-BBTK_ADD_BLACK_BOX_TO_PACKAGE(PackRecalage,AddImageToVector)
-BBTK_BLACK_BOX_IMPLEMENTATION(AddImageToVector,bbtk::AtomicBlackBox);
-//===== 
-// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
-//===== 
-void AddImageToVector::Process()
-{
-
-// THE MAIN PROCESSING METHOD BODY
-//   Here we simply set the input 'In' value to the output 'Out'
-//   And print out the output value
-// INPUT/OUTPUT ACCESSORS ARE OF THE FORM :
-//    void bbSet{Input|Output}NAME(const TYPE&)
-//    const TYPE& bbGet{Input|Output}NAME() const 
-//    Where :
-//    * NAME is the name of the input/output
-//      (the one provided in the attribute 'name' of the tag 'input')
-//    * TYPE is the C++ type of the input/output
-//      (the one provided in the attribute 'type' of the tag 'input')
-
-//    bbSetOutputOut( bbGetInputIn() );
-//    std::cout << "Output value = " <<bbGetOutputOut() << std::endl;
-   std::vector<vtkImageData*> lstImages=bbGetInputImageVector();
-   if (bbGetInputIn0()!=NULL) { lstImages.push_back( bbGetInputIn0() ); }
-   if (bbGetInputIn1()!=NULL) { lstImages.push_back( bbGetInputIn1() ); }
-   if (bbGetInputIn2()!=NULL) { lstImages.push_back( bbGetInputIn2() ); }
-   if (bbGetInputIn3()!=NULL) { lstImages.push_back( bbGetInputIn3() ); }
-   if (bbGetInputIn4()!=NULL) { lstImages.push_back( bbGetInputIn4() ); }
-   if (bbGetInputIn5()!=NULL) { lstImages.push_back( bbGetInputIn5() ); }
-   if (bbGetInputIn6()!=NULL) { lstImages.push_back( bbGetInputIn6() ); }
-   if (bbGetInputIn7()!=NULL) { lstImages.push_back( bbGetInputIn7() ); }
-   if (bbGetInputIn8()!=NULL) { lstImages.push_back( bbGetInputIn8() ); }
-   if (bbGetInputIn9()!=NULL) { lstImages.push_back( bbGetInputIn9() ); }
-   bbSetOutputOut(lstImages);  
-}
-//===== 
-// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
-//===== 
-void AddImageToVector::bbUserSetDefaultValues()
-{
-
-//  SET HERE THE DEFAULT INPUT/OUTPUT VALUES OF YOUR BOX 
-//    Here we initialize the input 'In' to 0
-   bbSetInputIn0(NULL);
-   bbSetInputIn1(NULL);
-   bbSetInputIn2(NULL);
-   bbSetInputIn3(NULL);
-   bbSetInputIn4(NULL);
-   bbSetInputIn5(NULL);
-   bbSetInputIn6(NULL);
-   bbSetInputIn7(NULL);
-   bbSetInputIn8(NULL);
-   bbSetInputIn9(NULL);
-   std::vector<vtkImageData*> lstImages;
-   bbSetInputImageVector(lstImages);  
-}
-//===== 
-// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
-//===== 
-void AddImageToVector::bbUserInitializeProcessing()
-{
-
-//  THE INITIALIZATION METHOD BODY :
-//    Here does nothing 
-//    but this is where you should allocate the internal/output pointers 
-//    if any 
-
-  
-}
-//===== 
-// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
-//===== 
-void AddImageToVector::bbUserFinalizeProcessing()
-{
-
-//  THE FINALIZATION METHOD BODY :
-//    Here does nothing 
-//    but this is where you should desallocate the internal/output pointers 
-//    if any
-  
-}
-}
-// EO namespace bbPackRecalage
-
-
diff --git a/PackRecalage/src/bbPackRecalageAddImageToVector.h b/PackRecalage/src/bbPackRecalageAddImageToVector.h
deleted file mode 100644 (file)
index 88f826b..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-//===== 
-// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
-//===== 
-#ifndef __bbPackRecalageAddImageToVector_h_INCLUDED__
-#define __bbPackRecalageAddImageToVector_h_INCLUDED__
-#include "bbPackRecalage_EXPORT.h"
-#include "bbtkAtomicBlackBox.h"
-#include "iostream"
-
-#include "vtkImageData.h"
-
-namespace bbPackRecalage
-{
-
-class bbPackRecalage_EXPORT AddImageToVector
- : 
-   public bbtk::AtomicBlackBox
-{
-  BBTK_BLACK_BOX_INTERFACE(AddImageToVector,bbtk::AtomicBlackBox);
-//===== 
-// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
-//===== 
-  BBTK_DECLARE_INPUT(ImageVector,std::vector<vtkImageData*>);
-  BBTK_DECLARE_INPUT(In0,vtkImageData*);
-  BBTK_DECLARE_INPUT(In1,vtkImageData*);
-  BBTK_DECLARE_INPUT(In2,vtkImageData*);
-  BBTK_DECLARE_INPUT(In3,vtkImageData*);
-  BBTK_DECLARE_INPUT(In4,vtkImageData*);
-  BBTK_DECLARE_INPUT(In5,vtkImageData*);
-  BBTK_DECLARE_INPUT(In6,vtkImageData*);
-  BBTK_DECLARE_INPUT(In7,vtkImageData*);
-  BBTK_DECLARE_INPUT(In8,vtkImageData*);
-  BBTK_DECLARE_INPUT(In9,vtkImageData*);
-  BBTK_DECLARE_OUTPUT(Out,std::vector<vtkImageData*>);
-  BBTK_PROCESS(Process);
-  void Process();
-//===== 
-// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
-//===== 
-};
-
-BBTK_BEGIN_DESCRIBE_BLACK_BOX(AddImageToVector,bbtk::AtomicBlackBox);
-BBTK_NAME("AddImageToVector");
-BBTK_AUTHOR("Info-Dev");
-BBTK_DESCRIPTION("eduardo.davila@creatis.insa-lyon.fr - Concat at the end of the ImageVector all the inputs. Add vtkImageData* to a vector fo vtkImageData*");
-BBTK_CATEGORY("void");
-BBTK_INPUT(AddImageToVector,ImageVector,"Vector of vtkImagesData*",std::vector<vtkImageData*>,"");
-BBTK_INPUT(AddImageToVector,In0,"Input image 1",vtkImageData*,"");
-BBTK_INPUT(AddImageToVector,In1,"Input image 1",vtkImageData*,"");
-BBTK_INPUT(AddImageToVector,In2,"Input image 1",vtkImageData*,"");
-BBTK_INPUT(AddImageToVector,In3,"Input image 1",vtkImageData*,"");
-BBTK_INPUT(AddImageToVector,In4,"Input image 1",vtkImageData*,"");
-BBTK_INPUT(AddImageToVector,In5,"Input image 1",vtkImageData*,"");
-BBTK_INPUT(AddImageToVector,In6,"Input image 1",vtkImageData*,"");
-BBTK_INPUT(AddImageToVector,In7,"Input image 1",vtkImageData*,"");
-BBTK_INPUT(AddImageToVector,In8,"Input image 1",vtkImageData*,"");
-BBTK_INPUT(AddImageToVector,In9,"Input image 1",vtkImageData*,"");
-BBTK_OUTPUT(AddImageToVector,Out,"Vector of vtkImageData*",std::vector<vtkImageData*>,"");
-BBTK_END_DESCRIBE_BLACK_BOX(AddImageToVector);
-//===== 
-// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
-//===== 
-}
-// EO namespace bbPackRecalage
-
-#endif // __bbPackRecalageAddImageToVector_h_INCLUDED__
-