From 9413421b164dcb95484226ed04928a70bc86591a Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Thu, 9 Jan 2020 15:43:43 +0100 Subject: [PATCH] #3336 CreaMiniTools Bug New Normal - ImageTools - offset position --- .../bbs/appli/ImageTool.bbg | 149 ++++++++++-------- .../bbs/appli/ImageTool.bbs | 51 +++--- 2 files changed, 111 insertions(+), 89 deletions(-) diff --git a/bbtk_package_creaMiniTools/bbs/appli/ImageTool.bbg b/bbtk_package_creaMiniTools/bbs/appli/ImageTool.bbg index 7969d28..24f2035 100644 --- a/bbtk_package_creaMiniTools/bbs/appli/ImageTool.bbg +++ b/bbtk_package_creaMiniTools/bbs/appli/ImageTool.bbg @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.4 BBG BlackBox Diagram file -# - /tmpEED/creaTools/creatools_source/creaMiniTools/bbtk_package_creaMiniTools/bbs/appli/ImageTool.bbg +# - /home/davila/Creatis/C8/creatools_source/creaMiniTools/bbtk_package_creaMiniTools/bbs/appli/ImageTool.bbg # ---------------------------------- APP_START @@ -9,7 +9,7 @@ DESCRIPTION:Show N Points AUTHOR:info-dev@creatis.insa-lyon.fr COMPLEXBOX:FALSE COMPLEXINPUTS:0 -BOXES:28 +BOXES:30 BOX creaMaracasVisu:ViewerNV:viewer ISEXEC:FALSE @@ -21,8 +21,8 @@ FIN_BOX BOX creaMaracasVisu:ShowNPoints:showNpoints ISEXEC:FALSE --146.394252:-3.709677:-900.000000 --100.819252:-13.709677:-900.000000 +-130.810673:-0.635541:-900.000000 +-70.170673:-10.635541:-900.000000 PORT Radio:"10" PORT @@ -32,7 +32,7 @@ BOX creaImageIO:ImagesChooserDialogBox:Box04 ISEXEC:FALSE 106.944221:120.009570:-900.000000 -178.119221:110.009570:-900.000000 +158.419221:110.009570:-900.000000 FIN_BOX BOX wx:LayoutTab:Box06 @@ -46,15 +46,15 @@ BOX creaMaracasVisu:ColorLayerImageView:Box10 ISEXEC:FALSE -351.844966:-16.053157:-900.000000 --280.669966:-26.053157:-900.000000 +-281.964966:-26.053157:-900.000000 PORT WinTitle:"Image Layer" FIN_BOX BOX creaMaracasVisu:ManualPaint:Box11 ISEXEC:FALSE --37.981566:-130.541589:-900.000000 -7.593434:-140.541589:-900.000000 +-88.902890:-136.639951:-900.000000 +-43.662890:-146.639951:-900.000000 PORT WinTitle:"Paint" FIN_BOX @@ -62,7 +62,7 @@ BOX wx:LayoutTab:Box12 ISEXEC:FALSE 51.808241:-277.901790:-900.000000 -97.383241:-287.901790:-900.000000 +109.368241:-287.901790:-900.000000 PORT WinTitle:Filters FIN_BOX @@ -70,39 +70,39 @@ BOX wx:LayoutTab:Box13 ISEXEC:FALSE 25.025304:-307.420578:-900.000000 -70.600304:-317.420578:-900.000000 +82.585304:-317.420578:-900.000000 FIN_BOX BOX toolsbbtk:SaveMHD-Button:Box21 ISEXEC:FALSE --101.851785:-27.059586:-900.000000 --56.276785:-37.059586:-900.000000 +-93.258638:-26.505189:-900.000000 +-50.733638:-36.505189:-900.000000 FIN_BOX BOX creaMiniTools:ThresholdWidget:Box22 ISEXEC:FALSE -2.341228:-207.881975:-900.000000 -43.233772:-217.881975:-900.000000 +39.908772:-217.881975:-900.000000 FIN_BOX BOX creaMiniTools:ConnectivityWidget:Box16 ISEXEC:FALSE 61.974834:-215.138914:-900.000000 -107.549834:-225.138914:-900.000000 +107.299834:-225.138914:-900.000000 FIN_BOX BOX wx:LayoutLine:Box18 ISEXEC:FALSE -157.480851:-29.691282:-900.000000 --111.905851:-39.691282:-900.000000 +-99.920851:-39.691282:-900.000000 PORT WinTitle:"show N-Points" FIN_BOX BOX wx:LayoutLine:Box19 ISEXEC:FALSE --125.693371:-52.080329:-900.000000 --80.118371:-62.080329:-900.000000 +-126.524966:-55.683907:-900.000000 +-68.964966:-65.683907:-900.000000 PORT WinTitle:"Save MHD" FIN_BOX @@ -110,7 +110,7 @@ BOX wx:LayoutLine:Box20 ISEXEC:FALSE -373.889781:-114.690466:-900.000000 --328.314781:-124.690466:-900.000000 +-316.329781:-124.690466:-900.000000 PORT WinTitle:"Layers" FIN_BOX @@ -118,7 +118,7 @@ BOX wx:LayoutLine:Box23 ISEXEC:FALSE -94.484830:-201.968967:-900.000000 --48.909830:-211.968967:-900.000000 +-36.924830:-211.968967:-900.000000 PORT Orientation:H PORT @@ -128,43 +128,43 @@ BOX creaMaracasVisu:CutModule2:Box24 ISEXEC:FALSE -31.541511:-156.104481:-900.000000 -14.033489:-166.104481:-900.000000 +6.608489:-166.104481:-900.000000 FIN_BOX BOX std:MultipleInputs:Box25 ISEXEC:FALSE 193.461788:-298.903547:-900.000000 -239.036788:-308.903547:-900.000000 +233.161788:-308.903547:-900.000000 FIN_BOX BOX creaMiniTools:ErodeWidget:Box26 ISEXEC:FALSE 127.580373:-217.870289:-900.000000 -173.155373:-227.870289:-900.000000 +166.280373:-227.870289:-900.000000 FIN_BOX BOX creaMiniTools:DilateWidget:Box27 ISEXEC:FALSE 202.155519:-213.402703:-900.000000 -247.730519:-223.402703:-900.000000 +240.830519:-223.402703:-900.000000 FIN_BOX BOX toolsbbtk:ImageVtkPropertiesWidget:Box28 ISEXEC:FALSE -67.347684:-221.649376:-900.000000 -3.827316:-231.649376:-900.000000 +-15.197684:-231.649376:-900.000000 FIN_BOX BOX wx:LayoutTab:Box29 ISEXEC:FALSE -372.469828:-95.544664:-900.000000 --326.894828:-105.544664:-900.000000 +-314.909828:-105.544664:-900.000000 FIN_BOX BOX creaMiniTools:LayerCol-VolRend-SurRend_Widget:Box30 ISEXEC:FALSE -336.435240:-29.737380:-900.000000 --265.260240:-39.737380:-900.000000 +-276.085240:-39.737380:-900.000000 PORT title:"Layer-1" FIN_BOX @@ -172,7 +172,7 @@ BOX creaMiniTools:LayerCol-VolRend-SurRend_Widget:Box31 ISEXEC:FALSE -327.541464:-46.787001:-900.000000 --256.366464:-56.787001:-900.000000 +-267.191464:-56.787001:-900.000000 PORT title:"Layer-2" FIN_BOX @@ -180,7 +180,7 @@ BOX wx:LayoutLine:Box32 ISEXEC:FALSE -370.565590:-78.671647:-900.000000 --324.990590:-88.671647:-900.000000 +-313.005590:-88.671647:-900.000000 PORT WinTitle:"Layer-Base" FIN_BOX @@ -188,7 +188,7 @@ BOX wx:LayoutTab:Box33 ISEXEC:FALSE -366.766856:-142.939770:-900.000000 --321.191856:-152.939770:-900.000000 +-309.206856:-152.939770:-900.000000 PORT WinTitle:"Superpose" FIN_BOX @@ -196,25 +196,37 @@ BOX creaVtk:VectorsTensors_manualread_Widget:Box35 ISEXEC:FALSE -296.945953:-100.622592:-900.000000 --225.770953:-110.622592:-900.000000 +-235.495953:-110.622592:-900.000000 FIN_BOX BOX creaVtk:OutputWindow:Box36 ISEXEC:TRUE 101.677450:-337.896727:-900.000000 -147.252450:-347.896727:-900.000000 +142.277450:-347.896727:-900.000000 FIN_BOX BOX wx:LayoutSplit:Box37 ISEXEC:TRUE 154.731901:-338.273293:-900.000000 -200.306901:-348.273293:-900.000000 +193.811901:-348.273293:-900.000000 PORT Orientation:"H" PORT WinTitle:"ImageTool.bbg" FIN_BOX -CONNECTIONS:66 +BOX +vtk:vtkImageDataPointerRelay:Box38 +ISEXEC:FALSE +-79.265683:86.819111:-900.000000 +-27.090683:76.819111:-900.000000 +FIN_BOX +BOX +creaMaracasVisu:ImageChangeInformation:Box39 +ISEXEC:FALSE +-126.115812:61.913442:-900.000000 +-74.590812:51.913442:-900.000000 +FIN_BOX +CONNECTIONS:68 CONNECTION viewer:Renderer1:showNpoints:Renderer NumberOfControlPoints:0 @@ -225,22 +237,11 @@ CONNECTION viewer:BoxChange:showNpoints:BoxExecute NumberOfControlPoints:0 CONNECTION -Box04:Out:showNpoints:Image -NumberOfControlPoints:1 --13.630965:26.438316:-900.000000 -CONNECTION -Box04:Out:viewer:In -NumberOfControlPoints:0 -CONNECTION viewer:BoxChange:Box11:BoxExecute NumberOfControlPoints:2 -162.452789:-13.599417:-900.000000 -129.994598:-92.765739:-900.000000 CONNECTION -Box04:Out:Box11:In -NumberOfControlPoints:1 -41.886299:-51.200848:-900.000000 -CONNECTION viewer:wxVtkBaseView2:Box11:WxVtkBaseView1 NumberOfControlPoints:0 CONNECTION @@ -256,23 +257,12 @@ CONNECTION Box12:Widget:Box13:Widget2 NumberOfControlPoints:0 CONNECTION -Box04:Out:Box21:In -NumberOfControlPoints:0 -CONNECTION -Box04:Out:Box22:In -NumberOfControlPoints:1 -53.882099:-78.422401:-900.000000 -CONNECTION Box22:Widget:Box12:Widget1 NumberOfControlPoints:0 CONNECTION Box16:Widget:Box12:Widget2 NumberOfControlPoints:0 CONNECTION -Box04:Out:Box16:In -NumberOfControlPoints:1 -75.021088:-98.781540:-900.000000 -CONNECTION Box18:Widget:Box06:Widget1 NumberOfControlPoints:0 CONNECTION @@ -297,9 +287,6 @@ CONNECTION viewer:BoxChange:Box24:BoxExecute NumberOfControlPoints:0 CONNECTION -Box04:Out:Box24:In -NumberOfControlPoints:0 -CONNECTION viewer:Interactor1:Box24:Interactor NumberOfControlPoints:0 CONNECTION @@ -336,12 +323,6 @@ CONNECTION viewer:Renderer1:Box26:vtkRenderer NumberOfControlPoints:0 CONNECTION -Box04:Out:Box26:In -NumberOfControlPoints:0 -CONNECTION -Box04:Out:Box27:In -NumberOfControlPoints:0 -CONNECTION viewer:Point:Box16:point NumberOfControlPoints:0 CONNECTION @@ -351,10 +332,6 @@ CONNECTION Box28:widget:Box06:Widget5 NumberOfControlPoints:0 CONNECTION -Box04:Out:Box28:in -NumberOfControlPoints:1 -53.842674:-119.647697:-900.000000 -CONNECTION Box29:Widget:Box20:Widget1 NumberOfControlPoints:0 CONNECTION @@ -420,4 +397,40 @@ NumberOfControlPoints:0 CONNECTION viewer:Renderer1:Box31:Rederer3D NumberOfControlPoints:0 +CONNECTION +Box38:Out:Box39:In +NumberOfControlPoints:0 +CONNECTION +Box39:Out:viewer:In +NumberOfControlPoints:0 +CONNECTION +Box04:Out:Box38:In +NumberOfControlPoints:0 +CONNECTION +Box39:Out:showNpoints:Image +NumberOfControlPoints:0 +CONNECTION +Box39:Out:Box21:In +NumberOfControlPoints:0 +CONNECTION +Box39:Out:Box11:In +NumberOfControlPoints:0 +CONNECTION +Box39:Out:Box24:In +NumberOfControlPoints:0 +CONNECTION +Box39:Out:Box22:In +NumberOfControlPoints:0 +CONNECTION +Box39:Out:Box16:In +NumberOfControlPoints:0 +CONNECTION +Box39:Out:Box26:In +NumberOfControlPoints:0 +CONNECTION +Box39:Out:Box27:In +NumberOfControlPoints:0 +CONNECTION +Box39:Out:Box28:in +NumberOfControlPoints:0 APP_END diff --git a/bbtk_package_creaMiniTools/bbs/appli/ImageTool.bbs b/bbtk_package_creaMiniTools/bbs/appli/ImageTool.bbs index b9a04c9..2e15ca7 100644 --- a/bbtk_package_creaMiniTools/bbs/appli/ImageTool.bbs +++ b/bbtk_package_creaMiniTools/bbs/appli/ImageTool.bbs @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.4 BBS BlackBox Script -# - /tmpEED/creaTools/creatools_source/creaMiniTools/bbtk_package_creaMiniTools/bbs/appli/ImageTool.bbs +# - /home/davila/Creatis/C8/creatools_source/creaMiniTools/bbtk_package_creaMiniTools/bbs/appli/ImageTool.bbs # ---------------------------------- # BBTK GEditor Script @@ -15,6 +15,7 @@ include toolsbbtk include creaMiniTools include std include creaVtk +include vtk author "info-dev@creatis.insa-lyon.fr" description "Show N Points" @@ -94,6 +95,10 @@ new wx:LayoutSplit Box37 set Box37.Orientation "H" set Box37.WinTitle "ImageTool.bbg" +new vtk:vtkImageDataPointerRelay Box38 + +new creaMaracasVisu:ImageChangeInformation Box39 + connect viewer.Renderer1 showNpoints.Renderer @@ -101,14 +106,8 @@ connect viewer.Point showNpoints.In connect viewer.BoxChange showNpoints.BoxExecute -connect Box04.Out showNpoints.Image - -connect Box04.Out viewer.In - connect viewer.BoxChange Box11.BoxExecute -connect Box04.Out Box11.In - connect viewer.wxVtkBaseView2 Box11.WxVtkBaseView1 connect viewer.wxVtkBaseView3 Box11.WxVtkBaseView2 @@ -119,16 +118,10 @@ connect Box06.Widget Box13.Widget1 connect Box12.Widget Box13.Widget2 -connect Box04.Out Box21.In - -connect Box04.Out Box22.In - connect Box22.Widget Box12.Widget1 connect Box16.Widget Box12.Widget2 -connect Box04.Out Box16.In - connect Box18.Widget Box06.Widget1 connect showNpoints.Widget Box18.Widget1 @@ -145,8 +138,6 @@ connect Box24.Widget Box23.Widget2 connect viewer.BoxChange Box24.BoxExecute -connect Box04.Out Box24.In - connect viewer.Interactor1 Box24.Interactor connect viewer.Renderer1 Box24.Renderer @@ -171,18 +162,12 @@ connect viewer.Renderer1 Box27.vtkRenderer connect viewer.Renderer1 Box26.vtkRenderer -connect Box04.Out Box26.In - -connect Box04.Out Box27.In - connect viewer.Point Box16.point connect Box25.Out viewer.BoxExecute connect Box28.widget Box06.Widget5 -connect Box04.Out Box28.in - connect Box29.Widget Box20.Widget1 connect viewer.Renderer1 Box30.Rederer3D @@ -227,6 +212,30 @@ connect viewer.Widget Box37.Widget2 connect viewer.Renderer1 Box31.Rederer3D +connect Box38.Out Box39.In + +connect Box39.Out viewer.In + +connect Box04.Out Box38.In + +connect Box39.Out showNpoints.Image + +connect Box39.Out Box21.In + +connect Box39.Out Box11.In + +connect Box39.Out Box24.In + +connect Box39.Out Box22.In + +connect Box39.Out Box16.In + +connect Box39.Out Box26.In + +connect Box39.Out Box27.In + +connect Box39.Out Box28.in + # Complex input ports -- 2.45.0