From 6b024ba9309731b6ba4591ea2f429aa89de3aa9c Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Mon, 10 Jun 2013 17:36:00 +0200 Subject: [PATCH] 2028 Feature Create the box AddImageToVector, Clean comments 2020 Feature Comparing Images in XY XZ YZ planes, Transparent Widget 3Dp --- .../CompareImagesTransparencyWidget_3Dp.bbg | 227 +++++++++++++----- .../CompareImagesTransparencyWidget_3Dp.bbs | 73 ++++-- .../bbs/boxes/CompareImagesWidget3D.bbg | 12 +- .../bbs/boxes/CompareImagesWidget3D.bbs | 2 +- .../boxes/CompareImagesWidget_base_3Dp_B.bbg | 169 +++++++++++-- .../boxes/CompareImagesWidget_base_3Dp_B.bbs | 62 ++++- .../CompareImages_3DwithPlanes_Widget.bbg | 135 ++++++++--- .../CompareImages_3DwithPlanes_Widget.bbs | 43 +++- .../src/bbPackRecalageAddImageToVector.cxx | 23 +- 9 files changed, 575 insertions(+), 171 deletions(-) diff --git a/PackRecalage/bbs/boxes/CompareImagesTransparencyWidget_3Dp.bbg b/PackRecalage/bbs/boxes/CompareImagesTransparencyWidget_3Dp.bbg index aeb44db..6ab22ea 100644 --- a/PackRecalage/bbs/boxes/CompareImagesTransparencyWidget_3Dp.bbg +++ b/PackRecalage/bbs/boxes/CompareImagesTransparencyWidget_3Dp.bbg @@ -13,33 +13,33 @@ PACKAGENAME:PackRecalage COMPLEXOUTPUTS:1 COMPLEX_PORT Widget -96.125740:-267.341705:-900.000000 +84.821881:-229.191181:-900.000000 FIN_COMPLEX_PORT COMPLEXINPUTS:3 COMPLEX_PORT BoxExecute -236.574784:11.139953:-900.000000 +225.904940:26.281617:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT -Image1 --55.480342:33.038968:-900.000000 +VectorImage1 +-52.929447:25.756390:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT -Image2 -31.278473:33.864116:-900.000000 +VectorImate2 +51.978420:26.687673:-900.000000 FIN_COMPLEX_PORT -BOXES:17 +BOXES:24 BOX PackRecalage:TransparencyBox:Box00 ISEXEC:FALSE --41.217866:-103.299354:-900.000000 -4.357134:-113.299354:-900.000000 +-102.765851:-110.733504:-900.000000 +-57.190851:-120.733504:-900.000000 FIN_BOX BOX wx:Slider:Box01 ISEXEC:FALSE -115.086237:-3.617913:-900.000000 -166.486237:-13.617913:-900.000000 +127.650045:8.854228:-900.000000 +179.050045:-1.145772:-900.000000 PORT In:"50" PORT @@ -52,16 +52,16 @@ FIN_BOX BOX creaMaracasVisu:ViewerNV:Box02 ISEXEC:FALSE --46.926234:-134.604037:-900.000000 -13.713766:-144.604037:-900.000000 +-106.624738:-126.479388:-900.000000 +-45.984738:-136.479388:-900.000000 PORT -nTypeView:"0" +nTypeView:"-1" FIN_BOX BOX wx:LayoutSplit:Box03 ISEXEC:FALSE -90.869732:-239.304537:-900.000000 -136.444732:-249.304537:-900.000000 +81.332101:-207.512434:-900.000000 +126.907101:-217.512434:-900.000000 PORT Proportion:"80" PORT @@ -70,28 +70,28 @@ FIN_BOX BOX std:MultipleInputs:Box04 ISEXEC:FALSE -217.001433:-39.467391:-900.000000 -262.576433:-49.467391:-900.000000 +311.545287:-52.468753:-900.000000 +357.120287:-62.468753:-900.000000 FIN_BOX BOX PackRecalage:TransparencyBox:Box05 ISEXEC:FALSE -30.326498:-101.723723:-900.000000 -75.901498:-111.723723:-900.000000 +-3.529661:-110.543171:-900.000000 +42.045339:-120.543171:-900.000000 FIN_BOX BOX creaMaracasVisu:ViewerNV:Box06 ISEXEC:FALSE -25.824487:-134.476034:-900.000000 -86.464487:-144.476034:-900.000000 +-9.853317:-128.470859:-900.000000 +50.786683:-138.470859:-900.000000 PORT -nTypeView:"0" +nTypeView:"-1" FIN_BOX BOX PackRecalage:TransparencyBox:Box07 ISEXEC:FALSE -105.160928:-100.806104:-900.000000 -150.735928:-110.806104:-900.000000 +104.351213:-116.400931:-900.000000 +149.926213:-126.400931:-900.000000 FIN_BOX BOX creaMaracasVisu:ViewerNV:Box08 @@ -99,13 +99,13 @@ ISEXEC:FALSE 99.935102:-133.317144:-900.000000 160.575102:-143.317144:-900.000000 PORT -nTypeView:"0" +nTypeView:"-1" FIN_BOX BOX PackRecalage:TransparencyBox:Box09 ISEXEC:FALSE -171.660524:-102.959214:-900.000000 -217.235524:-112.959214:-900.000000 +173.545270:-116.529382:-900.000000 +219.120270:-126.529382:-900.000000 FIN_BOX BOX creaMaracasVisu:ViewerNV:Box10 @@ -113,47 +113,105 @@ ISEXEC:FALSE 168.606142:-134.022625:-900.000000 229.246142:-144.022625:-900.000000 PORT -nTypeView:"0" +nTypeView:"-1" FIN_BOX BOX wx:LayoutSplit:Box11 ISEXEC:FALSE -41.483966:-169.568358:-900.000000 -87.058966:-179.568358:-900.000000 +-40.822256:-154.378798:-900.000000 +4.752744:-164.378798:-900.000000 FIN_BOX BOX wx:LayoutSplit:Box12 ISEXEC:FALSE -134.170876:-175.913835:-900.000000 -179.745876:-185.913835:-900.000000 +137.350086:-154.012609:-900.000000 +182.925086:-164.012609:-900.000000 FIN_BOX BOX wx:LayoutSplit:Box13 ISEXEC:FALSE -90.944253:-204.471300:-900.000000 -136.519253:-214.471300:-900.000000 +41.843116:-185.396038:-900.000000 +87.418116:-195.396038:-900.000000 PORT Orientation:"H" FIN_BOX BOX -vtk:vtkImageDataPointerRelay:Box14 +vtk:GetVectorVtkImageDataElement:Box17 ISEXEC:FALSE --61.259031:-5.334892:-900.000000 -9.915969:-15.334892:-900.000000 +-192.895472:-40.045781:-900.000000 +-121.720472:-50.045781:-900.000000 +PORT +I:"0" +FIN_BOX +BOX +vtk:GetVectorVtkImageDataElement:Box18 +ISEXEC:FALSE +-157.252345:-51.609907:-900.000000 +-86.077345:-61.609907:-900.000000 +PORT +I:"0" +FIN_BOX +BOX +std:MagicBox:Box19 +ISEXEC:FALSE +41.250079:-12.754701:-900.000000 +86.825079:-22.754701:-900.000000 +FIN_BOX +BOX +std:MagicBox:Box20 +ISEXEC:FALSE +-57.521421:-10.456367:-900.000000 +-11.946421:-20.456367:-900.000000 +FIN_BOX +BOX +vtk:GetVectorVtkImageDataElement:Box22 +ISEXEC:FALSE +-81.957883:-44.380593:-900.000000 +-10.782883:-54.380593:-900.000000 +PORT +I:"1" +FIN_BOX +BOX +vtk:GetVectorVtkImageDataElement:Box23 +ISEXEC:FALSE +-41.966779:-59.890158:-900.000000 +29.208221:-69.890158:-900.000000 +PORT +I:"1" +FIN_BOX +BOX +vtk:GetVectorVtkImageDataElement:Box24 +ISEXEC:FALSE +63.082032:-61.716873:-900.000000 +134.257032:-71.716873:-900.000000 +PORT +I:"2" +FIN_BOX +BOX +vtk:GetVectorVtkImageDataElement:Box25 +ISEXEC:FALSE +85.867342:-50.522028:-900.000000 +157.042342:-60.522028:-900.000000 +PORT +I:"2" FIN_BOX BOX -vtk:vtkImageDataPointerRelay:Box15 +vtk:GetVectorVtkImageDataElement:Box26 ISEXEC:FALSE -22.462176:-7.265063:-900.000000 -93.637176:-17.265063:-900.000000 +185.609664:-60.708223:-900.000000 +256.784664:-70.708223:-900.000000 +PORT +I:"2" FIN_BOX BOX -vtk:LoadHola:Box16 +vtk:GetVectorVtkImageDataElement:Box27 ISEXEC:FALSE -136.229599:24.533575:-900.000000 -181.804599:14.533575:-900.000000 +209.486893:-48.527095:-900.000000 +280.661893:-58.527095:-900.000000 +PORT +I:"2" FIN_BOX -CONNECTIONS:28 +CONNECTIONS:45 CONNECTION Box01:Out:Box00:Percent NumberOfControlPoints:0 @@ -180,12 +238,6 @@ CONNECTION BoxExecute:BoxExecute:Box04:In1 NumberOfControlPoints:0 CONNECTION -Box02:Widget:Box11:Widget1 -NumberOfControlPoints:0 -CONNECTION -Box06:Widget:Box11:Widget2 -NumberOfControlPoints:0 -CONNECTION Box08:Widget:Box12:Widget1 NumberOfControlPoints:0 CONNECTION @@ -216,27 +268,84 @@ CONNECTION Box01:Out:Box09:Percent NumberOfControlPoints:0 CONNECTION -Box14:Out:Box00:In1 +Box17:Out:Box00:In1 +NumberOfControlPoints:0 +CONNECTION +Box18:Out:Box00:In2 +NumberOfControlPoints:0 +CONNECTION +Box13:Widget:Box03:Widget1 +NumberOfControlPoints:0 +CONNECTION +VectorImate2:VectorImate2:Box19:In +NumberOfControlPoints:0 +CONNECTION +Box19:Out:Box18:In +NumberOfControlPoints:0 +CONNECTION +Box20:Out:Box17:In +NumberOfControlPoints:0 +CONNECTION +VectorImage1:VectorImage1:Box20:In +NumberOfControlPoints:0 +CONNECTION +Box05:BoxChange:Box06:BoxExecute +NumberOfControlPoints:0 +CONNECTION +Box07:BoxChange:Box08:BoxExecute +NumberOfControlPoints:0 +CONNECTION +Box05:Out:Box06:In +NumberOfControlPoints:0 +CONNECTION +Box07:Out:Box08:In +NumberOfControlPoints:0 +CONNECTION +Box20:Out:Box22:In +NumberOfControlPoints:0 +CONNECTION +Box22:Out:Box05:In1 +NumberOfControlPoints:0 +CONNECTION +Box23:Out:Box05:In2 +NumberOfControlPoints:0 +CONNECTION +Box20:Out:Box24:In +NumberOfControlPoints:0 +CONNECTION +Box19:Out:Box25:In +NumberOfControlPoints:0 +CONNECTION +Box25:Out:Box07:In2 +NumberOfControlPoints:0 +CONNECTION +Box24:Out:Box07:In1 +NumberOfControlPoints:0 +CONNECTION +Box19:Out:Box23:In +NumberOfControlPoints:0 +CONNECTION +Box06:Widget:Box11:Widget1 NumberOfControlPoints:0 CONNECTION -Image1:Image1:Box14:In +Box02:Widget:Box11:Widget2 NumberOfControlPoints:0 CONNECTION -Box15:Out:Box00:In2 +Box09:BoxChange:Box10:BoxExecute NumberOfControlPoints:0 CONNECTION -Image2:Image2:Box15:In +Box09:Out:Box10:In NumberOfControlPoints:0 CONNECTION -Box16:Out:Box06:In +Box27:Out:Box09:In2 NumberOfControlPoints:0 CONNECTION -Box16:Out:Box08:In +Box26:Out:Box09:In1 NumberOfControlPoints:0 CONNECTION -Box16:Out:Box10:In +Box19:Out:Box27:In NumberOfControlPoints:0 CONNECTION -Box02:Widget:Box03:Widget1 +Box20:Out:Box26:In NumberOfControlPoints:0 APP_END diff --git a/PackRecalage/bbs/boxes/CompareImagesTransparencyWidget_3Dp.bbs b/PackRecalage/bbs/boxes/CompareImagesTransparencyWidget_3Dp.bbs index c5027a8..57a151f 100644 --- a/PackRecalage/bbs/boxes/CompareImagesTransparencyWidget_3Dp.bbs +++ b/PackRecalage/bbs/boxes/CompareImagesTransparencyWidget_3Dp.bbs @@ -27,7 +27,7 @@ new Slider Box01 set Box01.ReactiveOnTrack "true" new ViewerNV Box02 - set Box02.nTypeView "0" + set Box02.nTypeView "-1" new LayoutSplit Box03 set Box03.Proportion "80" @@ -38,17 +38,17 @@ new MultipleInputs Box04 new TransparencyBox Box05 new ViewerNV Box06 - set Box06.nTypeView "0" + set Box06.nTypeView "-1" new TransparencyBox Box07 new ViewerNV Box08 - set Box08.nTypeView "0" + set Box08.nTypeView "-1" new TransparencyBox Box09 new ViewerNV Box10 - set Box10.nTypeView "0" + set Box10.nTypeView "-1" new LayoutSplit Box11 @@ -57,11 +57,33 @@ new LayoutSplit Box12 new LayoutSplit Box13 set Box13.Orientation "H" -new vtkImageDataPointerRelay Box14 +new GetVectorVtkImageDataElement Box17 + set Box17.I "0" -new vtkImageDataPointerRelay Box15 +new GetVectorVtkImageDataElement Box18 + set Box18.I "0" -new LoadHola Box16 +new MagicBox Box19 + +new MagicBox Box20 + +new GetVectorVtkImageDataElement Box22 + set Box22.I "1" + +new GetVectorVtkImageDataElement Box23 + set Box23.I "1" + +new GetVectorVtkImageDataElement Box24 + set Box24.I "2" + +new GetVectorVtkImageDataElement Box25 + set Box25.I "2" + +new GetVectorVtkImageDataElement Box26 + set Box26.I "2" + +new GetVectorVtkImageDataElement Box27 + set Box27.I "2" connect Box01.Out Box00.Percent @@ -70,8 +92,6 @@ connect Box01.BoxChange Box04.In2 connect Box04.BoxChange Box00.BoxExecute connect Box00.BoxChange Box02.BoxExecute connect Box00.Out Box02.In -connect Box02.Widget Box11.Widget1 -connect Box06.Widget Box11.Widget2 connect Box08.Widget Box12.Widget1 connect Box10.Widget Box12.Widget2 connect Box12.Widget Box13.Widget2 @@ -82,17 +102,36 @@ connect Box04.BoxChange Box09.BoxExecute connect Box01.Out Box05.Percent connect Box01.Out Box07.Percent connect Box01.Out Box09.Percent -connect Box14.Out Box00.In1 -connect Box15.Out Box00.In2 -connect Box16.Out Box06.In -connect Box16.Out Box08.In -connect Box16.Out Box10.In -connect Box02.Widget Box03.Widget1 +connect Box17.Out Box00.In1 +connect Box18.Out Box00.In2 +connect Box13.Widget Box03.Widget1 +connect Box19.Out Box18.In +connect Box20.Out Box17.In +connect Box05.BoxChange Box06.BoxExecute +connect Box07.BoxChange Box08.BoxExecute +connect Box05.Out Box06.In +connect Box07.Out Box08.In +connect Box20.Out Box22.In +connect Box22.Out Box05.In1 +connect Box23.Out Box05.In2 +connect Box20.Out Box24.In +connect Box19.Out Box25.In +connect Box25.Out Box07.In2 +connect Box24.Out Box07.In1 +connect Box19.Out Box23.In +connect Box06.Widget Box11.Widget1 +connect Box02.Widget Box11.Widget2 +connect Box09.BoxChange Box10.BoxExecute +connect Box09.Out Box10.In +connect Box27.Out Box09.In2 +connect Box26.Out Box09.In1 +connect Box19.Out Box27.In +connect Box20.Out Box26.In # Complex input ports input BoxExecute Box04.In1 " " -input Image1 Box14.In " " -input Image2 Box15.In " " +input VectorImate2 Box19.In " " +input VectorImage1 Box20.In " " # Complex output ports output Widget Box03.Widget " " diff --git a/PackRecalage/bbs/boxes/CompareImagesWidget3D.bbg b/PackRecalage/bbs/boxes/CompareImagesWidget3D.bbg index 29d3c43..ef0fbfd 100644 --- a/PackRecalage/bbs/boxes/CompareImagesWidget3D.bbg +++ b/PackRecalage/bbs/boxes/CompareImagesWidget3D.bbg @@ -35,7 +35,7 @@ ISEXEC:FALSE 44.718350:-27.392895:-900.000000 105.358350:-37.392895:-900.000000 PORT -nTypeView:"5" +nTypeView:"6" FIN_BOX BOX vtk:vtkImageDataPointerRelay:Box23 @@ -47,7 +47,7 @@ BOX wx:LayoutTab:Box26 ISEXEC:FALSE -184.936248:-192.642174:-900.000000 --127.376248:-202.642174:-900.000000 +-122.337432:-202.642174:-900.000000 PORT WinTitle:"2D-Compare" FIN_BOX @@ -55,7 +55,7 @@ BOX PackRecalage:CompareImagesWidget:Box27 ISEXEC:FALSE -283.502923:-95.491651:-900.000000 --212.327923:-105.491651:-900.000000 +-198.294902:-105.491651:-900.000000 PORT WinTitle:"2Dt-Comparing" FIN_BOX @@ -75,7 +75,7 @@ BOX wx:LayoutLine:Box29 ISEXEC:FALSE -36.447166:-116.254418:-900.000000 -21.112834:-126.254418:-900.000000 +9.127834:-126.254418:-900.000000 FIN_BOX BOX wxvtk:IsoSurfaceWidget:Box30 @@ -97,13 +97,13 @@ BOX wx:LayoutTab:Box38 ISEXEC:FALSE -13.417754:-99.991659:-900.000000 -44.142246:-109.991659:-900.000000 +32.157246:-109.991659:-900.000000 FIN_BOX BOX wx:LayoutTab:Box39 ISEXEC:FALSE -74.673912:-90.664048:-900.000000 --17.113912:-100.664048:-900.000000 +-29.098912:-100.664048:-900.000000 FIN_BOX BOX std:MultipleInputs:Box19 diff --git a/PackRecalage/bbs/boxes/CompareImagesWidget3D.bbs b/PackRecalage/bbs/boxes/CompareImagesWidget3D.bbs index 9db4c98..0ac285b 100644 --- a/PackRecalage/bbs/boxes/CompareImagesWidget3D.bbs +++ b/PackRecalage/bbs/boxes/CompareImagesWidget3D.bbs @@ -20,7 +20,7 @@ description "Recalage3D 1-point" category "example" new ViewerNV viewerResult - set viewerResult.nTypeView "5" + set viewerResult.nTypeView "6" new vtkImageDataPointerRelay Box23 diff --git a/PackRecalage/bbs/boxes/CompareImagesWidget_base_3Dp_B.bbg b/PackRecalage/bbs/boxes/CompareImagesWidget_base_3Dp_B.bbg index f5f0403..1908b77 100644 --- a/PackRecalage/bbs/boxes/CompareImagesWidget_base_3Dp_B.bbg +++ b/PackRecalage/bbs/boxes/CompareImagesWidget_base_3Dp_B.bbg @@ -13,62 +13,187 @@ PACKAGENAME:PackRecalage COMPLEXOUTPUTS:1 COMPLEX_PORT Out --337.715913:-303.921781:-900.000000 +-32.605223:-58.511005:-900.000000 FIN_COMPLEX_PORT -COMPLEXINPUTS:5 +COMPLEXINPUTS:7 COMPLEX_PORT SliceZ --319.498823:204.633310:-900.000000 +-27.538531:129.629391:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT BoxExecute --396.389512:203.237945:-900.000000 +-150.789639:70.221605:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT ConvolutionFactor --365.379250:201.941952:-900.000000 +-99.643673:66.329482:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT ConvolutionOnOff --235.808531:201.387474:-900.000000 +11.129720:67.037604:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT In --337.831050:201.681709:-900.000000 +-7.979793:106.076508:-900.000000 FIN_COMPLEX_PORT -BOXES:2 +COMPLEX_PORT +SliceX +88.576912:131.194521:-900.000000 +FIN_COMPLEX_PORT +COMPLEX_PORT +SliceY +48.186381:131.318419:-900.000000 +FIN_COMPLEX_PORT +BOXES:11 BOX -vtk:SliceImage:imgslice1 +PackRecalage:ImageConvolution:convol1 ISEXEC:FALSE --342.315734:101.785328:-900.000000 --296.740734:91.785328:-900.000000 +-118.625541:2.685381:-900.000000 +-47.450541:-7.314619:-900.000000 FIN_BOX BOX -PackRecalage:ImageConvolution:convol1 +creaMaracasVisu:SliceImage:Box02 +ISEXEC:FALSE +-58.785799:68.074751:-900.000000 +-13.210799:58.074751:-900.000000 +PORT +TypeOrientation:"0" +FIN_BOX +BOX +PackRecalage:ImageConvolution:Box03 +ISEXEC:FALSE +-23.517726:2.724857:-900.000000 +22.057274:-7.275143:-900.000000 +FIN_BOX +BOX +creaMaracasVisu:SliceImage:Box04 +ISEXEC:FALSE +53.881524:70.293042:-900.000000 +99.456524:60.293042:-900.000000 +PORT +TypeOrientation:"1" +FIN_BOX +BOX +PackRecalage:ImageConvolution:Box05 +ISEXEC:FALSE +36.740569:5.092327:-900.000000 +82.315569:-4.907673:-900.000000 +FIN_BOX +BOX +creaMaracasVisu:SliceImage:Box06 ISEXEC:FALSE --346.736688:-26.263667:-900.000000 --275.561688:-36.263667:-900.000000 +106.997661:70.524763:-900.000000 +152.572661:60.524763:-900.000000 +PORT +TypeOrientation:"2" FIN_BOX -CONNECTIONS:7 +BOX +PackRecalage:AddImageToVector:Box07 +ISEXEC:FALSE +-37.023110:-31.715137:-900.000000 +8.551890:-41.715137:-900.000000 +FIN_BOX +BOX +vtk:vtkImageDataPointerRelay:Box08 +ISEXEC:FALSE +-14.086539:91.849536:-900.000000 +57.088461:81.849536:-900.000000 +FIN_BOX +BOX +std:MagicBox:Box09 +ISEXEC:FALSE +-155.181586:50.777306:-900.000000 +-109.606586:40.777306:-900.000000 +FIN_BOX +BOX +std:MagicBox:Box10 +ISEXEC:FALSE +-106.537429:50.930740:-900.000000 +-60.962429:40.930740:-900.000000 +FIN_BOX +BOX +std:MagicBox:Box11 +ISEXEC:FALSE +-12.560799:49.794560:-900.000000 +33.014201:39.794560:-900.000000 +FIN_BOX +CONNECTIONS:26 +CONNECTION +Box02:Out:convol1:In +NumberOfControlPoints:0 +CONNECTION +Box04:Out:Box03:In +NumberOfControlPoints:0 +CONNECTION +Box06:Out:Box05:In +NumberOfControlPoints:0 +CONNECTION +convol1:Out:Box07:In0 +NumberOfControlPoints:0 +CONNECTION +Box03:Out:Box07:In1 +NumberOfControlPoints:0 +CONNECTION +Box05:Out:Box07:In2 +NumberOfControlPoints:0 +CONNECTION +Box07:Out:Out:Out +NumberOfControlPoints:0 +CONNECTION +In:In:Box08:In +NumberOfControlPoints:0 +CONNECTION +Box08:Out:Box02:In +NumberOfControlPoints:0 +CONNECTION +Box08:Out:Box04:In +NumberOfControlPoints:0 +CONNECTION +Box08:Out:Box06:In +NumberOfControlPoints:0 +CONNECTION +Box09:BoxChange:convol1:BoxExecute +NumberOfControlPoints:0 +CONNECTION +Box09:BoxChange:Box03:BoxExecute +NumberOfControlPoints:0 +CONNECTION +Box09:BoxChange:Box05:BoxExecute +NumberOfControlPoints:0 +CONNECTION +BoxExecute:BoxExecute:Box09:In +NumberOfControlPoints:0 +CONNECTION +ConvolutionFactor:ConvolutionFactor:Box10:In +NumberOfControlPoints:0 +CONNECTION +Box10:Out:convol1:Factor +NumberOfControlPoints:0 +CONNECTION +Box10:Out:Box03:Factor +NumberOfControlPoints:0 +CONNECTION +Box10:Out:Box05:Factor +NumberOfControlPoints:0 CONNECTION -imgslice1:Out:convol1:In +ConvolutionOnOff:ConvolutionOnOff:Box11:In NumberOfControlPoints:0 CONNECTION -convol1:Out:Out:Out +Box11:Out:convol1:On NumberOfControlPoints:0 CONNECTION -SliceZ:SliceZ:imgslice1:Z +Box11:Out:Box03:On NumberOfControlPoints:0 CONNECTION -ConvolutionFactor:ConvolutionFactor:convol1:Factor +Box11:Out:Box05:On NumberOfControlPoints:0 CONNECTION -ConvolutionOnOff:ConvolutionOnOff:convol1:On +SliceY:SliceY:Box04:Slice NumberOfControlPoints:0 CONNECTION -In:In:imgslice1:In +SliceX:SliceX:Box06:Slice NumberOfControlPoints:0 CONNECTION -BoxExecute:BoxExecute:convol1:BoxExecute +SliceZ:SliceZ:Box02:Slice NumberOfControlPoints:0 APP_END diff --git a/PackRecalage/bbs/boxes/CompareImagesWidget_base_3Dp_B.bbs b/PackRecalage/bbs/boxes/CompareImagesWidget_base_3Dp_B.bbs index 8f74b49..1ebd4cd 100644 --- a/PackRecalage/bbs/boxes/CompareImagesWidget_base_3Dp_B.bbs +++ b/PackRecalage/bbs/boxes/CompareImagesWidget_base_3Dp_B.bbs @@ -5,8 +5,10 @@ include std include itkvtk -include vtk include PackRecalage +include creaMaracasVisu +include vtk +include std define CompareImagesWidget_base_3Dp_B PackRecalage @@ -15,22 +17,62 @@ description "creatisRecalage" category "example" -new SliceImage imgslice1 - new ImageConvolution convol1 +new SliceImage Box02 + set Box02.TypeOrientation "0" + +new ImageConvolution Box03 + +new SliceImage Box04 + set Box04.TypeOrientation "1" + +new ImageConvolution Box05 + +new SliceImage Box06 + set Box06.TypeOrientation "2" + +new AddImageToVector Box07 + +new vtkImageDataPointerRelay Box08 + +new MagicBox Box09 + +new MagicBox Box10 + +new MagicBox Box11 + -connect imgslice1.Out convol1.In +connect Box02.Out convol1.In +connect Box04.Out Box03.In +connect Box06.Out Box05.In +connect convol1.Out Box07.In0 +connect Box03.Out Box07.In1 +connect Box05.Out Box07.In2 +connect Box08.Out Box02.In +connect Box08.Out Box04.In +connect Box08.Out Box06.In +connect Box09.BoxChange convol1.BoxExecute +connect Box09.BoxChange Box03.BoxExecute +connect Box09.BoxChange Box05.BoxExecute +connect Box10.Out convol1.Factor +connect Box10.Out Box03.Factor +connect Box10.Out Box05.Factor +connect Box11.Out convol1.On +connect Box11.Out Box03.On +connect Box11.Out Box05.On # Complex input ports -input SliceZ imgslice1.Z " " -input ConvolutionFactor convol1.Factor " " -input ConvolutionOnOff convol1.On " " -input In imgslice1.In " " -input BoxExecute convol1.BoxExecute " " +input In Box08.In " " +input BoxExecute Box09.In " " +input ConvolutionFactor Box10.In " " +input ConvolutionOnOff Box11.In " " +input SliceY Box04.Slice " " +input SliceX Box06.Slice " " +input SliceZ Box02.Slice " " # Complex output ports -output Out convol1.Out " " +output Out Box07.Out " " endefine diff --git a/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbg b/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbg index 5c4fbab..8c5a24e 100644 --- a/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbg +++ b/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbg @@ -28,7 +28,7 @@ COMPLEX_PORT WinTitle 127.660823:81.277727:-900.000000 FIN_COMPLEX_PORT -BOXES:11 +BOXES:14 BOX PackRecalage:ImageRecalageProperties:properties ISEXEC:FALSE @@ -68,40 +68,58 @@ FIN_BOX BOX wx:LayoutTab:Box61 ISEXEC:FALSE --6.540113:-112.137700:-900.000000 -51.019887:-122.137700:-900.000000 +-14.257291:-185.633602:-900.000000 +43.302709:-195.633602:-900.000000 FIN_BOX BOX PackRecalage:CompareImagesWidget_base_2Dt_A:Box70 ISEXEC:FALSE --94.598075:-51.688713:-900.000000 --23.423075:-61.688713:-900.000000 +-238.800882:-49.037698:-900.000000 +-167.625882:-59.037698:-900.000000 FIN_BOX BOX PackRecalage:CompareImagesWidget_base_2Dt_B:Box72 ISEXEC:FALSE --8.764256:-51.539865:-900.000000 -62.410744:-61.539865:-900.000000 +-189.516153:-57.533241:-900.000000 +-118.341153:-67.533241:-900.000000 FIN_BOX BOX -PackRecalage:CompareImagesSwitcherWidget_3Dp:Box36 +PackRecalage:CompareImagesWidget_base_interface_3Dp:Box18 ISEXEC:FALSE --153.977625:-150.876669:-900.000000 --82.802625:-160.876669:-900.000000 +-53.723459:5.389072:-900.000000 +17.451541:-4.610928:-900.000000 FIN_BOX BOX -PackRecalage:CompareImagesTransparencyWidget_3Dp:Box37 +PackRecalage:CompareImagesSwitcherWidget:Box11 ISEXEC:FALSE --71.714979:-150.701122:-900.000000 --0.539979:-160.701122:-900.000000 +-283.197955:-102.690000:-900.000000 +-212.022955:-112.690000:-900.000000 FIN_BOX BOX -PackRecalage:CompareImagesWidget_base_interface_3Dp:Box18 +PackRecalage:CompareImagesTransparencyWidget_2Dt:Box12 +ISEXEC:FALSE +-196.217189:-104.970773:-900.000000 +-125.042189:-114.970773:-900.000000 +FIN_BOX +BOX +PackRecalage:CompareImagesWidget_base_3Dp_B:Box13 +ISEXEC:FALSE +-98.091526:-63.436604:-900.000000 +-26.916526:-73.436604:-900.000000 +FIN_BOX +BOX +PackRecalage:CompareImagesTransparencyWidget_3Dp:Box14 ISEXEC:FALSE --61.656138:2.384024:-900.000000 -9.518862:-7.615976:-900.000000 +-79.856495:-162.402489:-900.000000 +-8.681495:-172.402489:-900.000000 FIN_BOX -CONNECTIONS:26 +BOX +PackRecalage:CompareImagesWidget_base_3Dp_B:Box15 +ISEXEC:FALSE +-5.909477:-64.772182:-900.000000 +65.265523:-74.772182:-900.000000 +FIN_BOX +CONNECTIONS:43 CONNECTION Box59:Out:properties:In NumberOfControlPoints:0 @@ -133,51 +151,102 @@ CONNECTION Box59:Out:Box72:In NumberOfControlPoints:0 CONNECTION -Box70:Out:Box36:Image1 +properties:LengthZ:Box18:Max +NumberOfControlPoints:0 +CONNECTION +Box18:Widget:Box61:Widget1 NumberOfControlPoints:0 CONNECTION -Box72:Out:Box36:Image2 +Box18:BoxChange:Box70:BoxExecute NumberOfControlPoints:0 CONNECTION -Box37:Widget:tabs:Widget2 +Box18:SliceZ:Box70:SliceZ NumberOfControlPoints:0 CONNECTION -Box72:Out:Box37:Image2 +Box18:SliceZ:Box72:SliceZ NumberOfControlPoints:0 CONNECTION -Box70:Out:Box37:Image1 +Box18:ConvolutionFactor:Box70:ConvolutionFactor NumberOfControlPoints:0 CONNECTION -Box36:Widget:tabs:Widget1 +Box18:ConvolutionFactor:Box72:ConvolutionFactor NumberOfControlPoints:0 CONNECTION -properties:LengthZ:Box18:Max +Box18:ConvolutionOnOff:Box70:ConvolutionOnOff NumberOfControlPoints:0 CONNECTION -Box18:Widget:Box61:Widget1 +Box18:ConvolutionOnOff:Box72:ConvolutionOnOff NumberOfControlPoints:0 CONNECTION -Box18:BoxChange:Box70:BoxExecute +Box70:Out:Box11:Image1 NumberOfControlPoints:0 CONNECTION -Box18:SliceZ:Box70:SliceZ +Box72:Out:Box11:Image2 NumberOfControlPoints:0 CONNECTION -Box18:SliceZ:Box72:SliceZ +Box11:Widget:tabs:Widget1 NumberOfControlPoints:0 CONNECTION -Box18:ConvolutionFactor:Box70:ConvolutionFactor +Box70:BoxChange:Box12:BoxExecute NumberOfControlPoints:0 CONNECTION -Box18:ConvolutionFactor:Box72:ConvolutionFactor +Box70:Out:Box12:Image1 NumberOfControlPoints:0 CONNECTION -Box18:ConvolutionOnOff:Box70:ConvolutionOnOff +Box72:Out:Box12:Image2 NumberOfControlPoints:0 CONNECTION -Box18:ConvolutionOnOff:Box72:ConvolutionOnOff +Box18:BoxChange:Box13:BoxExecute +NumberOfControlPoints:0 +CONNECTION +Box18:ConvolutionFactor:Box13:ConvolutionFactor +NumberOfControlPoints:0 +CONNECTION +Box18:ConvolutionOnOff:Box13:ConvolutionOnOff +NumberOfControlPoints:0 +CONNECTION +Box56:Out:Box13:In +NumberOfControlPoints:0 +CONNECTION +Box18:SliceZ:Box13:SliceZ +NumberOfControlPoints:0 +CONNECTION +Box18:SliceZ:Box13:SliceX +NumberOfControlPoints:0 +CONNECTION +Box18:SliceZ:Box13:SliceY +NumberOfControlPoints:0 +CONNECTION +Box13:Out:Box14:VectorImage1 +NumberOfControlPoints:0 +CONNECTION +Box14:Widget:tabs:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box18:BoxChange:Box14:BoxExecute +NumberOfControlPoints:0 +CONNECTION +Box15:Out:Box14:VectorImate2 +NumberOfControlPoints:0 +CONNECTION +Box18:BoxChange:Box15:BoxExecute +NumberOfControlPoints:0 +CONNECTION +Box18:ConvolutionFactor:Box15:ConvolutionFactor +NumberOfControlPoints:0 +CONNECTION +Box18:ConvolutionOnOff:Box15:ConvolutionOnOff +NumberOfControlPoints:0 +CONNECTION +Box18:SliceZ:Box15:SliceX +NumberOfControlPoints:0 +CONNECTION +Box18:SliceZ:Box15:SliceY +NumberOfControlPoints:0 +CONNECTION +Box18:SliceZ:Box15:SliceZ NumberOfControlPoints:0 CONNECTION -Box70:BoxChange:Box37:BoxExecute +Box59:Out:Box15:In NumberOfControlPoints:0 APP_END diff --git a/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs b/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs index 46cedc1..bca9707 100644 --- a/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs +++ b/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs @@ -35,11 +35,17 @@ new CompareImagesWidget_base_2Dt_A Box70 new CompareImagesWidget_base_2Dt_B Box72 -new CompareImagesSwitcherWidget_3Dp Box36 +new CompareImagesWidget_base_interface_3Dp Box18 -new CompareImagesTransparencyWidget_3Dp Box37 +new CompareImagesSwitcherWidget Box11 -new CompareImagesWidget_base_interface_3Dp Box18 +new CompareImagesTransparencyWidget_2Dt Box12 + +new CompareImagesWidget_base_3Dp_B Box13 + +new CompareImagesTransparencyWidget_3Dp Box14 + +new CompareImagesWidget_base_3Dp_B Box15 connect Box59.Out properties.In @@ -48,12 +54,6 @@ connect tabs.Widget window2.Widget2 connect Box56.Out Box70.In connect Box70.Widget Box61.Widget2 connect Box59.Out Box72.In -connect Box70.Out Box36.Image1 -connect Box72.Out Box36.Image2 -connect Box37.Widget tabs.Widget2 -connect Box72.Out Box37.Image2 -connect Box70.Out Box37.Image1 -connect Box36.Widget tabs.Widget1 connect properties.LengthZ Box18.Max connect Box18.Widget Box61.Widget1 connect Box18.BoxChange Box70.BoxExecute @@ -63,7 +63,30 @@ connect Box18.ConvolutionFactor Box70.ConvolutionFactor connect Box18.ConvolutionFactor Box72.ConvolutionFactor connect Box18.ConvolutionOnOff Box70.ConvolutionOnOff connect Box18.ConvolutionOnOff Box72.ConvolutionOnOff -connect Box70.BoxChange Box37.BoxExecute +connect Box70.Out Box11.Image1 +connect Box72.Out Box11.Image2 +connect Box11.Widget tabs.Widget1 +connect Box70.BoxChange Box12.BoxExecute +connect Box70.Out Box12.Image1 +connect Box72.Out Box12.Image2 +connect Box18.BoxChange Box13.BoxExecute +connect Box18.ConvolutionFactor Box13.ConvolutionFactor +connect Box18.ConvolutionOnOff Box13.ConvolutionOnOff +connect Box56.Out Box13.In +connect Box18.SliceZ Box13.SliceZ +connect Box18.SliceZ Box13.SliceX +connect Box18.SliceZ Box13.SliceY +connect Box13.Out Box14.VectorImage1 +connect Box14.Widget tabs.Widget2 +connect Box18.BoxChange Box14.BoxExecute +connect Box15.Out Box14.VectorImate2 +connect Box18.BoxChange Box15.BoxExecute +connect Box18.ConvolutionFactor Box15.ConvolutionFactor +connect Box18.ConvolutionOnOff Box15.ConvolutionOnOff +connect Box18.SliceZ Box15.SliceX +connect Box18.SliceZ Box15.SliceY +connect Box18.SliceZ Box15.SliceZ +connect Box59.Out Box15.In # Complex input ports input In2 Box59.In " " diff --git a/PackRecalage/src/bbPackRecalageAddImageToVector.cxx b/PackRecalage/src/bbPackRecalageAddImageToVector.cxx index 3ad1c5f..27297c4 100644 --- a/PackRecalage/src/bbPackRecalageAddImageToVector.cxx +++ b/PackRecalage/src/bbPackRecalageAddImageToVector.cxx @@ -28,21 +28,18 @@ void AddImageToVector::Process() // bbSetOutputOut( bbGetInputIn() ); // std::cout << "Output value = " < lstImages=bbGetInputImageVector(); - lstImages.push_back( bbGetInputIn0() ); - lstImages.push_back( bbGetInputIn1() ); - lstImages.push_back( bbGetInputIn2() ); - lstImages.push_back( bbGetInputIn3() ); - lstImages.push_back( bbGetInputIn4() ); - lstImages.push_back( bbGetInputIn5() ); - lstImages.push_back( bbGetInputIn6() ); - lstImages.push_back( bbGetInputIn7() ); - lstImages.push_back( bbGetInputIn8() ); - lstImages.push_back( bbGetInputIn9() ); + 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) -- 2.47.1