From: eduardo.davila@creatis.insa-lyon.fr Date: Fri, 22 Mar 2024 14:21:47 +0000 (+0100) Subject: #3522 AddImageTo vector from creaRigidRegistration::PackRecalage to bbtk::vtk X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=bb126c70f9387c6476ed615ce6dc484946266df5;p=creaVtk.git #3522 AddImageTo vector from creaRigidRegistration::PackRecalage to bbtk::vtk --- diff --git a/bbtk_creaVtk_PKG/.DS_Store b/bbtk_creaVtk_PKG/.DS_Store index bce742e..9e9655d 100644 Binary files a/bbtk_creaVtk_PKG/.DS_Store and b/bbtk_creaVtk_PKG/.DS_Store differ diff --git a/bbtk_creaVtk_PKG/bbs/boxes/CompareImagesByRGB-Widget.bbg b/bbtk_creaVtk_PKG/bbs/boxes/CompareImagesByRGB-Widget.bbg index 8e66657..6e0d15f 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/CompareImagesByRGB-Widget.bbg +++ b/bbtk_creaVtk_PKG/bbs/boxes/CompareImagesByRGB-Widget.bbg @@ -16,7 +16,7 @@ COMPLEX_PORT OutWidget -96.899656:-60.971144:-900.000000 FIN_COMPLEX_PORT -COMPLEXINPUTS:3 +COMPLEXINPUTS:4 COMPLEX_PORT Image1 -28.376331:49.016424:-900.000000 @@ -29,12 +29,16 @@ COMPLEX_PORT boxExecute -79.374801:54.164565:-900.000000 FIN_COMPLEX_PORT -BOXES:22 +COMPLEX_PORT +point +51.120607:47.957203:-900.000000 +FIN_COMPLEX_PORT +BOXES:24 BOX creaMaracasVisu:ViewerNV:Box00 ISEXEC:FALSE -30.398756:-19.880524:-900.000000 -9.961244:-22.380524:-900.000000 +40.360000:-22.380524:-900.000000 PORT nTypeView:"1 2 0" FIN_BOX @@ -42,13 +46,13 @@ BOX creaVtk:ImageAppendComponents:Box02 ISEXEC:FALSE -142.508041:-8.826360:-900.000000 --119.203041:-11.326360:-900.000000 +12.200000:-11.326360:-900.000000 FIN_BOX BOX vtk:RescaleSlopeIntercept:Box05 ISEXEC:FALSE -30.766000:26.971657:-900.000000 --7.941000:24.471657:-900.000000 +13.960000:24.471657:-900.000000 PORT A:"0" PORT @@ -62,7 +66,7 @@ BOX creaMaracasVisu:SetwxVtkBaseViewLookupTable:Box06 ISEXEC:FALSE -8.998989:-34.795786:-900.000000 -14.691011:-37.295786:-900.000000 +15.720000:-37.295786:-900.000000 FIN_BOX BOX wx:LayoutSplit:Box07 @@ -117,7 +121,7 @@ PORT In7:"0 1 1" FIN_BOX BOX -PackRecalage:AddImageToVector:Box19 +vtk:AddImageToVector:Box19 ISEXEC:FALSE -9.620652:11.668598:-900.000000 14.899348:9.168598:-900.000000 @@ -150,25 +154,25 @@ BOX vtk:GetVectorVtkImageDataElement:Box23 ISEXEC:FALSE -189.675216:-0.170840:-900.000000 --165.840216:-2.670840:-900.000000 +10.440000:-2.670840:-900.000000 FIN_BOX BOX vtk:GetVectorVtkImageDataElement:Box24 ISEXEC:FALSE -129.997356:-0.301792:-900.000000 --106.162356:-2.801792:-900.000000 +10.440000:-2.801792:-900.000000 FIN_BOX BOX vtk:GetVectorVtkImageDataElement:Box25 ISEXEC:FALSE -69.221232:-0.581756:-900.000000 --45.386232:-3.081756:-900.000000 +10.440000:-3.081756:-900.000000 FIN_BOX BOX wx:Slider:Box26 ISEXEC:FALSE -214.690885:35.295401:-900.000000 --184.890885:32.795401:-900.000000 +29.800000:32.795401:-900.000000 PORT Max:"7" PORT @@ -180,7 +184,7 @@ BOX vtk:vtkImageDataPointerRelay:Box29 ISEXEC:FALSE -34.261608:36.502126:-900.000000 --11.051608:34.002126:-900.000000 +6.920000:34.002126:-900.000000 FIN_BOX BOX vtk:vtkImageDataPointerRelay:Box30 @@ -192,7 +196,7 @@ BOX wx:LayoutLine:Box31 ISEXEC:FALSE -215.869975:-7.092907:-900.000000 --182.549975:-9.592907:-900.000000 +33.320000:-9.592907:-900.000000 PORT Orientation:"H" FIN_BOX @@ -208,15 +212,27 @@ BOX std:MagicBox:Box33 ISEXEC:FALSE -75.880313:44.013910:-900.000000 --54.280313:41.513910:-900.000000 +8.680000:41.513910:-900.000000 FIN_BOX BOX std:MultipleInputs:Box34 ISEXEC:FALSE -96.436044:-26.534530:-900.000000 --74.466044:-29.034530:-900.000000 +21.000000:-29.034530:-900.000000 +FIN_BOX +BOX +std:MagicBox:Box35 +ISEXEC:FALSE +47.421775:41.223652:-900.000000 +69.021775:38.723652:-900.000000 +FIN_BOX +BOX +creaMaracasVisu:SetPosition:Box36 +ISEXEC:FALSE +-20.158944:-46.989146:-900.000000 +1.501056:-49.489146:-900.000000 FIN_BOX -CONNECTIONS:35 +CONNECTIONS:38 CONNECTION Box02:Out:Box00:In NumberOfControlPoints:0 @@ -322,4 +338,13 @@ NumberOfControlPoints:0 CONNECTION Box33:BoxChange:Box34:In2 NumberOfControlPoints:0 +CONNECTION +point:point:Box35:In +NumberOfControlPoints:0 +CONNECTION +Box00:wxVtkBaseView1:Box36:wxVtkBaseView +NumberOfControlPoints:0 +CONNECTION +Box35:Out:Box36:Point +NumberOfControlPoints:0 APP_END diff --git a/bbtk_creaVtk_PKG/bbs/boxes/CompareImagesByRGB-Widget.bbs b/bbtk_creaVtk_PKG/bbs/boxes/CompareImagesByRGB-Widget.bbs index 9a467c6..8bd0353 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/CompareImagesByRGB-Widget.bbs +++ b/bbtk_creaVtk_PKG/bbs/boxes/CompareImagesByRGB-Widget.bbs @@ -10,7 +10,6 @@ include creaVtk include vtk include wx include std -include PackRecalage define CompareImagesByRGB-Widget creaVtk @@ -54,7 +53,7 @@ new std:StringSelect Box18 set Box18.In6 "1 0 1" set Box18.In7 "0 1 1" -new PackRecalage:AddImageToVector Box19 +new vtk:AddImageToVector Box19 new std:GetVectorStringElement Box20 set Box20.I "0" @@ -90,6 +89,10 @@ new std:MagicBox Box33 new std:MultipleInputs Box34 +new std:MagicBox Box35 + +new creaMaracasVisu:SetPosition Box36 + connect Box02.Out Box00.In connect Box10.LookupTable Box06.ScalarToColors @@ -122,11 +125,14 @@ connect Box31.Widget Box07.Widget2 connect Box26.BoxChange Box34.In1 connect Box34.BoxChange Box06.BoxExecute connect Box33.BoxChange Box34.In2 +connect Box00.wxVtkBaseView1 Box36.wxVtkBaseView +connect Box35.Out Box36.Point # Complex input ports input Image1 Box29.In " " input Image2 Box30.In " " input boxExecute Box33.BoxExecute " " +input point Box35.In " " # Complex output ports output OutWidget Box07.Widget " "