From 5de2560696c73fae856eba087176a1a7b0ba5fbd Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Fri, 14 Jun 2013 17:50:58 +0200 Subject: [PATCH] 2020 Feature Comparing Images in XY XZ YZ planes --- .../bbs/boxes/CompareImagesSwitcherWidget.bbg | 22 +- .../boxes/CompareImagesSwitcherWidget_3Dp.bbg | 278 +++++++++++++----- .../boxes/CompareImagesSwitcherWidget_3Dp.bbs | 107 +++++-- .../boxes/CompareImagesWidget_base_3Dp_B.bbg | 120 +++++--- .../boxes/CompareImagesWidget_base_3Dp_B.bbs | 21 +- ...CompareImagesWidget_base_interface_3Dp.bbg | 132 +++++++-- ...CompareImagesWidget_base_interface_3Dp.bbs | 33 ++- .../CompareImages_3DwithPlanes_Widget.bbg | 164 +++-------- .../CompareImages_3DwithPlanes_Widget.bbs | 45 +-- .../bbPackRecalageImageRecalageProperties.cxx | 2 + .../bbPackRecalageImageRecalageProperties.h | 4 + .../src/bbPackRecalageImageSwitcherFilter.cxx | 88 ++++++ .../src/bbPackRecalageImageSwitcherFilter.h | 51 ++++ 13 files changed, 724 insertions(+), 343 deletions(-) create mode 100644 PackRecalage/src/bbPackRecalageImageSwitcherFilter.cxx create mode 100644 PackRecalage/src/bbPackRecalageImageSwitcherFilter.h diff --git a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget.bbg b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget.bbg index 0508a21..5347159 100644 --- a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget.bbg +++ b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget.bbg @@ -13,16 +13,16 @@ PACKAGENAME:PackRecalage COMPLEXOUTPUTS:1 COMPLEX_PORT Widget --82.943006:83.715697:-900.000000 +-95.955289:84.025513:-900.000000 FIN_COMPLEX_PORT COMPLEXINPUTS:2 COMPLEX_PORT Image1 --104.441217:381.121351:-900.000000 +-103.201952:313.271590:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT Image2 -18.836202:375.841039:-900.000000 +-23.608626:313.258154:-900.000000 FIN_COMPLEX_PORT BOXES:7 BOX @@ -34,8 +34,8 @@ FIN_BOX BOX wx:CheckBox:checkS ISEXEC:FALSE --82.146015:296.605172:-900.000000 --36.571015:286.605172:-900.000000 +-79.073457:294.044707:-900.000000 +-33.498457:284.044707:-900.000000 PORT In:"false" PORT @@ -44,8 +44,8 @@ FIN_BOX BOX wx:Slider:sdrT ISEXEC:FALSE --137.063679:292.235608:-900.000000 --94.381544:282.235608:-900.000000 +-156.582103:295.023954:-900.000000 +-105.182103:285.023954:-900.000000 PORT In:"500" PORT @@ -58,8 +58,8 @@ FIN_BOX BOX wx:LayoutSplit:switchWindow ISEXEC:FALSE --89.365862:136.311788:-900.000000 --43.790862:126.311788:-900.000000 +-114.151163:139.409951:-900.000000 +-68.576163:129.409951:-900.000000 PORT Proportion:"80" FIN_BOX @@ -75,13 +75,13 @@ BOX wx:LayoutLine:Box48 ISEXEC:FALSE -84.838862:170.670039:-900.000000 --39.263862:160.670039:-900.000000 +-27.278862:160.670039:-900.000000 FIN_BOX BOX creaMaracasVisu:ViewerNV:Box49 ISEXEC:FALSE -158.632980:170.265535:-900.000000 --91.453735:160.265535:-900.000000 +-97.992980:160.265535:-900.000000 PORT nTypeView:0 FIN_BOX diff --git a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg index bb06526..0b4d59a 100644 --- a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg +++ b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg @@ -13,39 +13,39 @@ PACKAGENAME:PackRecalage COMPLEXOUTPUTS:1 COMPLEX_PORT Widget --86.440137:59.235778:-900.000000 +29.671612:-131.445757:-900.000000 FIN_COMPLEX_PORT COMPLEXINPUTS:2 COMPLEX_PORT -Image1 --225.286533:374.127088:-900.000000 +ImageVector1 +-133.409322:201.831382:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT -Image2 --82.580607:376.618179:-900.000000 +ImageVector2 +-7.650970:201.506959:-900.000000 FIN_COMPLEX_PORT -BOXES:15 +BOXES:27 BOX PackRecalage:ImageSwitcherBox:switch ISEXEC:FALSE --236.731933:238.613192:-900.000000 --191.156933:228.613192:-900.000000 +172.679775:65.498525:-900.000000 +218.254775:55.498525:-900.000000 FIN_BOX BOX wx:CheckBox:checkS ISEXEC:FALSE --4.431985:290.776620:-900.000000 -41.143015:280.776620:-900.000000 +228.560359:105.616599:-900.000000 +274.135359:95.616599:-900.000000 PORT -In:"false" +In:"true" PORT Title:"On" FIN_BOX BOX wx:Slider:sdrT ISEXEC:FALSE --87.326700:289.904187:-900.000000 --35.926700:279.904187:-900.000000 +166.856418:104.851197:-900.000000 +218.256418:94.851197:-900.000000 PORT In:"500" PORT @@ -58,90 +58,178 @@ FIN_BOX BOX wx:LayoutSplit:switchWindow ISEXEC:FALSE --93.977323:83.421289:-900.000000 --48.402323:73.421289:-900.000000 +12.201262:-106.424745:-900.000000 +57.776262:-116.424745:-900.000000 PORT Proportion:"80" FIN_BOX BOX wx:LayoutLine:Box47 ISEXEC:FALSE --16.666358:193.622611:-900.000000 -28.908642:183.622611:-900.000000 +212.417684:9.408267:-900.000000 +269.977684:-0.591733:-900.000000 PORT Orientation:H FIN_BOX BOX wx:LayoutLine:Box48 ISEXEC:FALSE --40.843730:167.779848:-900.000000 -4.731270:157.779848:-900.000000 +76.753747:-64.327520:-900.000000 +134.313747:-74.327520:-900.000000 FIN_BOX BOX creaMaracasVisu:ViewerNV:Box49 ISEXEC:FALSE --252.108185:165.936671:-900.000000 --119.708302:155.936671:-900.000000 +-207.829297:-9.757593:-900.000000 +-147.189297:-19.757593:-900.000000 PORT nTypeView:0 FIN_BOX BOX -creaMaracasVisu:ViewerNV:Box09 +wx:LayoutSplit:Box10 ISEXEC:FALSE --186.372516:167.327051:-900.000000 --99.869989:157.327051:-900.000000 +-82.103886:-69.211419:-900.000000 +-36.528886:-79.211419:-900.000000 PORT -nTypeView:0 +Orientation:"H" FIN_BOX BOX -wx:LayoutSplit:Box10 +wx:LayoutSplit:Box12 +ISEXEC:FALSE +-162.363566:-34.597023:-900.000000 +-116.788566:-44.597023:-900.000000 +FIN_BOX +BOX +PackRecalage:ImageSwitcherFilter:Box17 +ISEXEC:FALSE +-216.556769:16.785448:-900.000000 +-170.981769:6.785448:-900.000000 +FIN_BOX +BOX +vtk:GetVectorVtkImageDataElement:Box19 ISEXEC:FALSE --153.529071:113.780677:-900.000000 --107.954071:103.780677:-900.000000 +-258.664040:125.670629:-900.000000 +-187.489040:115.670629:-900.000000 PORT -Orientation:"H" +I:"1" FIN_BOX BOX -wx:LayoutSplit:Box11 +vtk:GetVectorVtkImageDataElement:Box21 ISEXEC:FALSE --139.251650:134.728017:-900.000000 --93.676650:124.728017:-900.000000 +-237.331791:102.628759:-900.000000 +-166.156791:92.628759:-900.000000 +PORT +I:"1" FIN_BOX BOX -wx:LayoutSplit:Box12 +std:MagicBox:Box22 +ISEXEC:FALSE +-152.501419:167.006478:-900.000000 +-106.926419:157.006478:-900.000000 +FIN_BOX +BOX +std:MagicBox:Box23 +ISEXEC:FALSE +-6.134009:165.138534:-900.000000 +39.440991:155.138534:-900.000000 +FIN_BOX +BOX +creaMaracasVisu:ViewerNV:Box24 +ISEXEC:FALSE +-133.337236:-10.426995:-900.000000 +-72.697236:-20.426995:-900.000000 +PORT +nTypeView:0 +FIN_BOX +BOX +PackRecalage:ImageSwitcherFilter:Box25 +ISEXEC:FALSE +-118.174100:17.189781:-900.000000 +-72.599100:7.189781:-900.000000 +FIN_BOX +BOX +vtk:GetVectorVtkImageDataElement:Box26 +ISEXEC:FALSE +-161.355106:124.464359:-900.000000 +-90.180106:114.464359:-900.000000 +PORT +I:"0" +FIN_BOX +BOX +vtk:GetVectorVtkImageDataElement:Box27 ISEXEC:FALSE --206.320142:135.318900:-900.000000 --127.441599:125.318900:-900.000000 +-141.633460:101.959356:-900.000000 +-70.458460:91.959356:-900.000000 +PORT +I:"0" FIN_BOX BOX -creaMaracasVisu:ViewerNV:Box13 +creaMaracasVisu:ViewerNV:Box28 ISEXEC:FALSE --108.472352:167.805415:-900.000000 --62.897352:157.805415:-900.000000 +-47.438421:-10.695429:-900.000000 +13.201579:-20.695429:-900.000000 PORT nTypeView:0 FIN_BOX BOX -creaMaracasVisu:ViewerNV:Box14 +wx:LayoutSplit:Box29 +ISEXEC:FALSE +-9.220403:-34.192690:-900.000000 +36.354597:-44.192690:-900.000000 +FIN_BOX +BOX +PackRecalage:ImageSwitcherFilter:Box30 ISEXEC:FALSE --130.383336:189.578066:-900.000000 --83.037481:179.578066:-900.000000 +-40.596732:14.237009:-900.000000 +4.978268:4.237009:-900.000000 +FIN_BOX +BOX +vtk:GetVectorVtkImageDataElement:Box31 +ISEXEC:FALSE +-61.766167:127.417131:-900.000000 +9.408833:117.417131:-900.000000 +PORT +I:"2" +FIN_BOX +BOX +vtk:GetVectorVtkImageDataElement:Box32 +ISEXEC:FALSE +-40.702352:104.106827:-900.000000 +30.472648:94.106827:-900.000000 +PORT +I:"2" +FIN_BOX +BOX +creaMaracasVisu:ViewerNV:Box33 +ISEXEC:FALSE +18.463758:-9.754229:-900.000000 +79.103758:-19.754229:-900.000000 PORT nTypeView:0 FIN_BOX BOX -vtk:vtkImageDataPointerRelay:Box16 +PackRecalage:ImageSwitcherFilter:Box34 +ISEXEC:FALSE +16.447132:14.372908:-900.000000 +62.022132:4.372908:-900.000000 +FIN_BOX +BOX +vtk:GetVectorVtkImageDataElement:Box35 ISEXEC:FALSE --227.442499:337.483080:-900.000000 --156.267499:327.483080:-900.000000 +60.238676:128.358331:-900.000000 +131.413676:118.358331:-900.000000 +PORT +I:"2" FIN_BOX BOX -vtk:vtkImageDataPointerRelay:Box17 +vtk:GetVectorVtkImageDataElement:Box36 ISEXEC:FALSE --116.128515:339.220283:-900.000000 --44.953515:329.220283:-900.000000 +62.243691:106.121762:-900.000000 +133.418691:96.121762:-900.000000 +PORT +I:"2" FIN_BOX -CONNECTIONS:28 +CONNECTIONS:46 CONNECTION checkS:Out:switch:On NumberOfControlPoints:0 @@ -167,63 +255,117 @@ CONNECTION Box48:Widget:switchWindow:Widget2 NumberOfControlPoints:0 CONNECTION -switch:Out:Box49:In +switchWindow:Widget:Widget:Widget NumberOfControlPoints:0 CONNECTION -switch:BoxChange:Box49:BoxExecute +Box12:Widget:Box10:Widget1 NumberOfControlPoints:0 CONNECTION -switchWindow:Widget:Widget:Widget +Box10:Widget:switchWindow:Widget1 NumberOfControlPoints:0 CONNECTION -Box12:Widget:Box10:Widget1 +Box49:Widget:Box12:Widget1 NumberOfControlPoints:0 CONNECTION -Box11:Widget:Box10:Widget2 +Box17:Out:Box49:In NumberOfControlPoints:0 CONNECTION -Box10:Widget:switchWindow:Widget1 +switch:BoxChange:Box17:BoxExecute NumberOfControlPoints:0 CONNECTION -Box49:Widget:Box12:Widget1 +Box17:BoxChange:Box49:BoxExecute +NumberOfControlPoints:0 +CONNECTION +ImageVector1:ImageVector1:Box22:In +NumberOfControlPoints:0 +CONNECTION +ImageVector2:ImageVector2:Box23:In +NumberOfControlPoints:0 +CONNECTION +Box22:Out:Box19:In +NumberOfControlPoints:0 +CONNECTION +Box23:Out:Box21:In +NumberOfControlPoints:0 +CONNECTION +Box19:Out:Box17:In1 +NumberOfControlPoints:0 +CONNECTION +Box21:Out:Box17:In2 +NumberOfControlPoints:0 +CONNECTION +Box25:Out:Box24:In +NumberOfControlPoints:0 +CONNECTION +Box25:BoxChange:Box24:BoxExecute +NumberOfControlPoints:0 +CONNECTION +Box26:Out:Box25:In1 +NumberOfControlPoints:0 +CONNECTION +Box27:Out:Box25:In2 +NumberOfControlPoints:0 +CONNECTION +Box24:Widget:Box12:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box28:Widget:Box29:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box30:Out:Box28:In +NumberOfControlPoints:0 +CONNECTION +Box30:BoxChange:Box28:BoxExecute +NumberOfControlPoints:0 +CONNECTION +Box31:Out:Box30:In1 +NumberOfControlPoints:0 +CONNECTION +Box32:Out:Box30:In2 +NumberOfControlPoints:0 +CONNECTION +Box34:Out:Box33:In +NumberOfControlPoints:0 +CONNECTION +Box34:BoxChange:Box33:BoxExecute NumberOfControlPoints:0 CONNECTION -Box09:Widget:Box12:Widget2 +Box35:Out:Box34:In1 NumberOfControlPoints:0 CONNECTION -Box13:Widget:Box11:Widget1 +Box36:Out:Box34:In2 NumberOfControlPoints:0 CONNECTION -Box14:Widget:Box11:Widget2 +Box33:Widget:Box29:Widget2 NumberOfControlPoints:0 CONNECTION -Image1:Image1:Box16:In +switch:BoxChange:Box30:BoxExecute NumberOfControlPoints:0 CONNECTION -Box16:Out:switch:In1 +switch:BoxChange:Box34:BoxExecute NumberOfControlPoints:0 CONNECTION -Image2:Image2:Box17:In +Box29:Widget:Box10:Widget2 NumberOfControlPoints:0 CONNECTION -Box17:Out:switch:In2 +Box22:Out:Box26:In NumberOfControlPoints:0 CONNECTION -switch:Out:Box09:In +Box23:Out:Box27:In NumberOfControlPoints:0 CONNECTION -switch:Out:Box14:In +switch:BoxChange:Box25:BoxExecute NumberOfControlPoints:0 CONNECTION -switch:Out:Box13:In +Box22:Out:Box31:In NumberOfControlPoints:0 CONNECTION -switch:BoxChange:Box14:BoxExecute +Box23:Out:Box32:In NumberOfControlPoints:0 CONNECTION -switch:BoxChange:Box09:BoxExecute +Box22:Out:Box35:In NumberOfControlPoints:0 CONNECTION -switch:BoxChange:Box13:BoxExecute +Box23:Out:Box36:In NumberOfControlPoints:0 APP_END diff --git a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs index 62e49a2..7b4eb21 100644 --- a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs +++ b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs @@ -9,6 +9,7 @@ include PackRecalage include wx include creaMaracasVisu include vtk +include std define CompareImagesSwitcherWidget_3Dp PackRecalage @@ -20,7 +21,7 @@ category "example" new ImageSwitcherBox switch new CheckBox checkS - set checkS.In "false" + set checkS.In "true" set checkS.Title "On" new Slider sdrT @@ -40,25 +41,57 @@ new LayoutLine Box48 new ViewerNV Box49 set Box49.nTypeView 0 -new ViewerNV Box09 - set Box09.nTypeView 0 - new LayoutSplit Box10 set Box10.Orientation "H" -new LayoutSplit Box11 - new LayoutSplit Box12 -new ViewerNV Box13 - set Box13.nTypeView 0 +new ImageSwitcherFilter Box17 + +new GetVectorVtkImageDataElement Box19 + set Box19.I "1" + +new GetVectorVtkImageDataElement Box21 + set Box21.I "1" + +new MagicBox Box22 + +new MagicBox Box23 + +new ViewerNV Box24 + set Box24.nTypeView 0 + +new ImageSwitcherFilter Box25 + +new GetVectorVtkImageDataElement Box26 + set Box26.I "0" + +new GetVectorVtkImageDataElement Box27 + set Box27.I "0" + +new ViewerNV Box28 + set Box28.nTypeView 0 + +new LayoutSplit Box29 + +new ImageSwitcherFilter Box30 + +new GetVectorVtkImageDataElement Box31 + set Box31.I "2" + +new GetVectorVtkImageDataElement Box32 + set Box32.I "2" + +new ViewerNV Box33 + set Box33.nTypeView 0 -new ViewerNV Box14 - set Box14.nTypeView 0 +new ImageSwitcherFilter Box34 -new vtkImageDataPointerRelay Box16 +new GetVectorVtkImageDataElement Box35 + set Box35.I "2" -new vtkImageDataPointerRelay Box17 +new GetVectorVtkImageDataElement Box36 + set Box36.I "2" connect checkS.Out switch.On @@ -69,27 +102,45 @@ connect switch.Widget Box47.Widget1 connect sdrT.Widget Box48.Widget2 connect Box47.Widget Box48.Widget1 connect Box48.Widget switchWindow.Widget2 -connect switch.Out Box49.In -connect switch.BoxChange Box49.BoxExecute connect Box12.Widget Box10.Widget1 -connect Box11.Widget Box10.Widget2 connect Box10.Widget switchWindow.Widget1 connect Box49.Widget Box12.Widget1 -connect Box09.Widget Box12.Widget2 -connect Box13.Widget Box11.Widget1 -connect Box14.Widget Box11.Widget2 -connect Box16.Out switch.In1 -connect Box17.Out switch.In2 -connect switch.Out Box09.In -connect switch.Out Box14.In -connect switch.Out Box13.In -connect switch.BoxChange Box14.BoxExecute -connect switch.BoxChange Box09.BoxExecute -connect switch.BoxChange Box13.BoxExecute +connect Box17.Out Box49.In +connect switch.BoxChange Box17.BoxExecute +connect Box17.BoxChange Box49.BoxExecute +connect Box22.Out Box19.In +connect Box23.Out Box21.In +connect Box19.Out Box17.In1 +connect Box21.Out Box17.In2 +connect Box25.Out Box24.In +connect Box25.BoxChange Box24.BoxExecute +connect Box26.Out Box25.In1 +connect Box27.Out Box25.In2 +connect Box24.Widget Box12.Widget2 +connect Box28.Widget Box29.Widget1 +connect Box30.Out Box28.In +connect Box30.BoxChange Box28.BoxExecute +connect Box31.Out Box30.In1 +connect Box32.Out Box30.In2 +connect Box34.Out Box33.In +connect Box34.BoxChange Box33.BoxExecute +connect Box35.Out Box34.In1 +connect Box36.Out Box34.In2 +connect Box33.Widget Box29.Widget2 +connect switch.BoxChange Box30.BoxExecute +connect switch.BoxChange Box34.BoxExecute +connect Box29.Widget Box10.Widget2 +connect Box22.Out Box26.In +connect Box23.Out Box27.In +connect switch.BoxChange Box25.BoxExecute +connect Box22.Out Box31.In +connect Box23.Out Box32.In +connect Box22.Out Box35.In +connect Box23.Out Box36.In # Complex input ports -input Image1 Box16.In " " -input Image2 Box17.In " " +input ImageVector1 Box22.In " " +input ImageVector2 Box23.In " " # Complex output ports output Widget switchWindow.Widget " " diff --git a/PackRecalage/bbs/boxes/CompareImagesWidget_base_3Dp_B.bbg b/PackRecalage/bbs/boxes/CompareImagesWidget_base_3Dp_B.bbg index 1908b77..558f148 100644 --- a/PackRecalage/bbs/boxes/CompareImagesWidget_base_3Dp_B.bbg +++ b/PackRecalage/bbs/boxes/CompareImagesWidget_base_3Dp_B.bbg @@ -13,111 +13,133 @@ PACKAGENAME:PackRecalage COMPLEXOUTPUTS:1 COMPLEX_PORT Out --32.605223:-58.511005:-900.000000 -FIN_COMPLEX_PORT -COMPLEXINPUTS:7 -COMPLEX_PORT -SliceZ --27.538531:129.629391:-900.000000 +-39.040299:-19.061192:-900.000000 FIN_COMPLEX_PORT +COMPLEXINPUTS:5 COMPLEX_PORT BoxExecute --150.789639:70.221605:-900.000000 +-149.004941:180.370177:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT ConvolutionFactor --99.643673:66.329482:-900.000000 +-90.891907:177.306831:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT ConvolutionOnOff -11.129720:67.037604:-900.000000 +-76.654192:177.986332:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT In --7.979793:106.076508:-900.000000 -FIN_COMPLEX_PORT -COMPLEX_PORT -SliceX -88.576912:131.194521:-900.000000 +-45.093836:184.744916:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT -SliceY -48.186381:131.318419:-900.000000 +Point +64.238326:184.778911:-900.000000 FIN_COMPLEX_PORT -BOXES:11 +BOXES:15 BOX PackRecalage:ImageConvolution:convol1 ISEXEC:FALSE --118.625541:2.685381:-900.000000 --47.450541:-7.314619:-900.000000 +-129.257405:29.544828:-900.000000 +-58.082405:19.544828:-900.000000 FIN_BOX BOX creaMaracasVisu:SliceImage:Box02 ISEXEC:FALSE --58.785799:68.074751:-900.000000 --13.210799:58.074751:-900.000000 +-59.065585:66.675821:-900.000000 +-13.490585:56.675821:-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 +-28.553872:27.066231:-900.000000 +17.021128:17.066231:-900.000000 FIN_BOX BOX creaMaracasVisu:SliceImage:Box04 ISEXEC:FALSE -53.881524:70.293042:-900.000000 -99.456524:60.293042:-900.000000 +54.161310:66.376039:-900.000000 +99.736310:56.376039:-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 +40.657572:28.034771:-900.000000 +86.232572:18.034771:-900.000000 FIN_BOX BOX creaMaracasVisu:SliceImage:Box06 ISEXEC:FALSE -106.997661:70.524763:-900.000000 -152.572661:60.524763:-900.000000 +106.717875:65.208831:-900.000000 +152.292875:55.208831:-900.000000 PORT TypeOrientation:"2" FIN_BOX BOX PackRecalage:AddImageToVector:Box07 ISEXEC:FALSE --37.023110:-31.715137:-900.000000 -8.551890:-41.715137:-900.000000 +-41.499685:2.698530:-900.000000 +4.075315:-7.301470:-900.000000 FIN_BOX BOX vtk:vtkImageDataPointerRelay:Box08 ISEXEC:FALSE --14.086539:91.849536:-900.000000 -57.088461:81.849536:-900.000000 +-7.705582:106.766132:-900.000000 +63.469418:96.766132:-900.000000 FIN_BOX BOX std:MagicBox:Box09 ISEXEC:FALSE --155.181586:50.777306:-900.000000 --109.606586:40.777306:-900.000000 +-163.575163:67.004889:-900.000000 +-118.000163:57.004889:-900.000000 FIN_BOX BOX std:MagicBox:Box10 ISEXEC:FALSE --106.537429:50.930740:-900.000000 --60.962429:40.930740:-900.000000 +-108.495930:66.598751:-900.000000 +-62.920930:56.598751:-900.000000 FIN_BOX BOX std:MagicBox:Box11 ISEXEC:FALSE --12.560799:49.794560:-900.000000 -33.014201:39.794560:-900.000000 +-8.084224:67.421072:-900.000000 +37.490776:57.421072:-900.000000 +FIN_BOX +BOX +std:GetVectorIntElement:Box12 +ISEXEC:FALSE +101.805438:110.840152:-900.000000 +172.980438:100.840152:-900.000000 +PORT +I:"2" FIN_BOX -CONNECTIONS:26 +BOX +std:GetVectorIntElement:Box13 +ISEXEC:FALSE +70.340365:125.154852:-900.000000 +141.515365:115.154852:-900.000000 +PORT +I:"1" +FIN_BOX +BOX +std:GetVectorIntElement:Box14 +ISEXEC:FALSE +33.623885:140.775162:-900.000000 +104.798885:130.775162:-900.000000 +PORT +I:"0" +FIN_BOX +BOX +std:MagicBox:Box15 +ISEXEC:FALSE +62.865247:169.029337:-900.000000 +108.440247:159.029337:-900.000000 +FIN_BOX +CONNECTIONS:30 CONNECTION Box02:Out:convol1:In NumberOfControlPoints:0 @@ -188,12 +210,24 @@ CONNECTION Box11:Out:Box05:On NumberOfControlPoints:0 CONNECTION -SliceY:SliceY:Box04:Slice +Point:Point:Box15:In +NumberOfControlPoints:0 +CONNECTION +Box15:Out:Box14:In +NumberOfControlPoints:0 +CONNECTION +Box15:Out:Box13:In +NumberOfControlPoints:0 +CONNECTION +Box15:Out:Box12:In +NumberOfControlPoints:0 +CONNECTION +Box14:Out:Box06:Slice NumberOfControlPoints:0 CONNECTION -SliceX:SliceX:Box06:Slice +Box13:Out:Box04:Slice NumberOfControlPoints:0 CONNECTION -SliceZ:SliceZ:Box02:Slice +Box12:Out: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 1ebd4cd..7c2773a 100644 --- a/PackRecalage/bbs/boxes/CompareImagesWidget_base_3Dp_B.bbs +++ b/PackRecalage/bbs/boxes/CompareImagesWidget_base_3Dp_B.bbs @@ -42,6 +42,17 @@ new MagicBox Box10 new MagicBox Box11 +new GetVectorIntElement Box12 + set Box12.I "2" + +new GetVectorIntElement Box13 + set Box13.I "1" + +new GetVectorIntElement Box14 + set Box14.I "0" + +new MagicBox Box15 + connect Box02.Out convol1.In connect Box04.Out Box03.In @@ -61,15 +72,19 @@ connect Box10.Out Box05.Factor connect Box11.Out convol1.On connect Box11.Out Box03.On connect Box11.Out Box05.On +connect Box15.Out Box14.In +connect Box15.Out Box13.In +connect Box15.Out Box12.In +connect Box14.Out Box06.Slice +connect Box13.Out Box04.Slice +connect Box12.Out Box02.Slice # Complex input ports 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 " " +input Point Box15.In " " # Complex output ports output Out Box07.Out " " diff --git a/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbg b/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbg index 2bf6a26..9022de4 100644 --- a/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbg +++ b/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbg @@ -13,35 +13,35 @@ PACKAGENAME:PackRecalage COMPLEXOUTPUTS:5 COMPLEX_PORT BoxChange --501.940096:-65.413696:-900.000000 +-249.406583:-130.793802:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT Widget --727.374600:-65.410778:-900.000000 +-311.272087:-125.379205:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT ConvolutionFactor --623.080251:-66.901331:-900.000000 +-199.314298:-131.871035:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT -SliceZ --757.526410:-64.325786:-900.000000 +ConvolutionOnOff +-161.923397:-131.459983:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT -ConvolutionOnOff --558.972037:-66.774691:-900.000000 +Point +-397.584861:-123.346846:-900.000000 FIN_COMPLEX_PORT COMPLEXINPUTS:1 COMPLEX_PORT -Max --691.578673:76.608044:-900.000000 +InputImage +-345.001276:122.271802:-900.000000 FIN_COMPLEX_PORT -BOXES:6 +BOXES:10 BOX wx:Slider:Box00 ISEXEC:FALSE --708.443865:52.724695:-900.000000 --657.043865:42.724695:-900.000000 +-312.615803:44.390319:-900.000000 +-261.215803:34.390319:-900.000000 PORT Min:"0" PORT @@ -52,8 +52,8 @@ FIN_BOX BOX wx:Slider:Box01 ISEXEC:FALSE --629.428817:54.402532:-900.000000 --578.028817:44.402532:-900.000000 +-233.091213:52.808465:-900.000000 +-181.691213:42.808465:-900.000000 PORT In:"0" PORT @@ -68,36 +68,76 @@ FIN_BOX BOX wx:CheckBox:Box02 ISEXEC:FALSE --559.470333:54.584681:-900.000000 --513.895333:44.584681:-900.000000 +-162.399354:52.990614:-900.000000 +-116.824354:42.990614:-900.000000 PORT In:"True" FIN_BOX BOX std:MultipleInputs:Box03 ISEXEC:FALSE --516.413928:-6.649733:-900.000000 --470.838928:-16.649733:-900.000000 +-248.070175:-62.627828:-900.000000 +-202.495175:-72.627828:-900.000000 FIN_BOX BOX wx:LayoutLine:Box04 ISEXEC:FALSE --720.813034:-40.808029:-900.000000 --663.253034:-50.808029:-900.000000 +-307.839553:-96.528504:-900.000000 +-250.279553:-106.528504:-900.000000 PORT WinTitle:"Appearance" FIN_BOX BOX wx:LayoutSplit:Box05 ISEXEC:FALSE --698.793376:-11.395173:-900.000000 --653.218376:-21.395173:-900.000000 +-193.198175:-61.891436:-900.000000 +-147.623175:-71.891436:-900.000000 PORT Orientation:"H" PORT Proportion:"80" FIN_BOX -CONNECTIONS:13 +BOX +PackRecalage:ImageRecalageProperties:Box08 +ISEXEC:FALSE +-352.104741:101.210902:-900.000000 +-215.243743:91.210902:-900.000000 +FIN_BOX +BOX +wx:Slider:Box11 +ISEXEC:FALSE +-378.936874:43.198025:-900.000000 +-327.536874:33.198025:-900.000000 +PORT +Min:"0" +PORT +ReactiveOnTrack:"1" +PORT +Title:"Y for slice" +FIN_BOX +BOX +wx:Slider:Box13 +ISEXEC:FALSE +-451.783313:45.176743:-900.000000 +-400.383313:35.176743:-900.000000 +PORT +Min:"0" +PORT +ReactiveOnTrack:"1" +PORT +Title:"X for slice" +FIN_BOX +BOX +std:ConcatStrings:Box15 +ISEXEC:FALSE +-385.033924:-65.592429:-900.000000 +-339.458924:-75.592429:-900.000000 +PORT +In2:" " +PORT +In4:" " +FIN_BOX +CONNECTIONS:23 CONNECTION Box02:Widget:Box05:Widget2 NumberOfControlPoints:0 @@ -108,9 +148,6 @@ CONNECTION Box01:Widget:Box05:Widget1 NumberOfControlPoints:0 CONNECTION -Box00:Widget:Box04:Widget1 -NumberOfControlPoints:0 -CONNECTION Box02:BoxChange:Box03:In3 NumberOfControlPoints:0 CONNECTION @@ -120,9 +157,6 @@ CONNECTION Box00:BoxChange:Box03:In1 NumberOfControlPoints:0 CONNECTION -Max:Max:Box00:Max -NumberOfControlPoints:0 -CONNECTION Box03:BoxChange:BoxChange:BoxChange NumberOfControlPoints:0 CONNECTION @@ -132,9 +166,45 @@ CONNECTION Box01:Out:ConvolutionFactor:ConvolutionFactor NumberOfControlPoints:0 CONNECTION -Box00:Out:SliceZ:SliceZ +Box02:Out:ConvolutionOnOff:ConvolutionOnOff NumberOfControlPoints:0 CONNECTION -Box02:Out:ConvolutionOnOff:ConvolutionOnOff +InputImage:InputImage:Box08:In +NumberOfControlPoints:0 +CONNECTION +Box08:LengthZ:Box00:Max +NumberOfControlPoints:0 +CONNECTION +Box08:LengthY:Box11:Max +NumberOfControlPoints:0 +CONNECTION +Box08:LengthX:Box13:Max +NumberOfControlPoints:0 +CONNECTION +Box11:Widget:Box04:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box00:Widget:Box04:Widget3 +NumberOfControlPoints:0 +CONNECTION +Box13:Widget:Box04:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box11:BoxChange:Box03:In4 +NumberOfControlPoints:0 +CONNECTION +Box13:BoxChange:Box03:In5 +NumberOfControlPoints:0 +CONNECTION +Box13:Out:Box15:In1 +NumberOfControlPoints:0 +CONNECTION +Box11:Out:Box15:In3 +NumberOfControlPoints:0 +CONNECTION +Box00:Out:Box15:In5 +NumberOfControlPoints:0 +CONNECTION +Box15:Out:Point:Point NumberOfControlPoints:0 APP_END diff --git a/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbs b/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbs index 362f114..f0b17fd 100644 --- a/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbs +++ b/PackRecalage/bbs/boxes/CompareImagesWidget_base_interface_3Dp.bbs @@ -7,6 +7,7 @@ include std include itkvtk include wx include std +include PackRecalage define CompareImagesWidget_base_interface_3Dp PackRecalage @@ -39,24 +40,50 @@ new LayoutSplit Box05 set Box05.Orientation "H" set Box05.Proportion "80" +new ImageRecalageProperties Box08 + +new Slider Box11 + set Box11.Min "0" + set Box11.ReactiveOnTrack "1" + set Box11.Title "Y for slice" + +new Slider Box13 + set Box13.Min "0" + set Box13.ReactiveOnTrack "1" + set Box13.Title "X for slice" + +new ConcatStrings Box15 + set Box15.In2 " " + set Box15.In4 " " + connect Box02.Widget Box05.Widget2 connect Box05.Widget Box04.Widget4 connect Box01.Widget Box05.Widget1 -connect Box00.Widget Box04.Widget1 connect Box02.BoxChange Box03.In3 connect Box01.BoxChange Box03.In2 connect Box00.BoxChange Box03.In1 +connect Box08.LengthZ Box00.Max +connect Box08.LengthY Box11.Max +connect Box08.LengthX Box13.Max +connect Box11.Widget Box04.Widget2 +connect Box00.Widget Box04.Widget3 +connect Box13.Widget Box04.Widget1 +connect Box11.BoxChange Box03.In4 +connect Box13.BoxChange Box03.In5 +connect Box13.Out Box15.In1 +connect Box11.Out Box15.In3 +connect Box00.Out Box15.In5 # Complex input ports -input Max Box00.Max " " +input InputImage Box08.In " " # Complex output ports output BoxChange Box03.BoxChange " " output Widget Box04.Widget " " output ConvolutionFactor Box01.Out " " -output SliceZ Box00.Out " " output ConvolutionOnOff Box02.Out " " +output Point Box15.Out " " endefine diff --git a/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbg b/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbg index 8c5a24e..250fa8a 100644 --- a/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbg +++ b/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbg @@ -13,41 +13,35 @@ PACKAGENAME:PackRecalage COMPLEXOUTPUTS:1 COMPLEX_PORT Widget -8.553144:-237.783189:-900.000000 +-85.589922:-180.668561:-900.000000 FIN_COMPLEX_PORT COMPLEXINPUTS:3 COMPLEX_PORT In2 -26.287266:82.718028:-900.000000 +-158.009685:76.159418:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT In1 --108.452895:80.075047:-900.000000 +-234.159594:79.419186:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT WinTitle 127.660823:81.277727:-900.000000 FIN_COMPLEX_PORT -BOXES:14 -BOX -PackRecalage:ImageRecalageProperties:properties -ISEXEC:FALSE --81.258594:35.032507:-900.000000 --10.083594:25.032507:-900.000000 -FIN_BOX +BOXES:10 BOX wx:LayoutTab:tabs ISEXEC:FALSE --88.321409:-187.998536:-900.000000 --30.761409:-197.998536:-900.000000 +-143.785521:-124.975377:-900.000000 +-86.225521:-134.975377:-900.000000 PORT Orientation:V FIN_BOX BOX wx:LayoutSplit:window2 ISEXEC:FALSE -1.731870:-215.155455:-900.000000 -47.306870:-225.155455:-900.000000 +-56.157344:-151.860379:-900.000000 +-10.582344:-161.860379:-900.000000 PORT Orientation:H PORT @@ -56,73 +50,52 @@ FIN_BOX BOX vtk:vtkImageDataPointerRelay:Box56 ISEXEC:FALSE --113.184214:59.169083:-900.000000 --42.009214:49.169083:-900.000000 +-249.384689:51.735991:-900.000000 +-178.209689:41.735991:-900.000000 FIN_BOX BOX vtk:vtkImageDataPointerRelay:Box59 ISEXEC:FALSE -19.532669:57.346555:-900.000000 -90.707669:47.346555:-900.000000 +-154.270506:56.253453:-900.000000 +-83.095506:46.253453:-900.000000 FIN_BOX BOX wx:LayoutTab:Box61 ISEXEC:FALSE --14.257291:-185.633602:-900.000000 -43.302709:-195.633602:-900.000000 -FIN_BOX -BOX -PackRecalage:CompareImagesWidget_base_2Dt_A:Box70 -ISEXEC:FALSE --238.800882:-49.037698:-900.000000 --167.625882:-59.037698:-900.000000 -FIN_BOX -BOX -PackRecalage:CompareImagesWidget_base_2Dt_B:Box72 -ISEXEC:FALSE --189.516153:-57.533241:-900.000000 --118.341153:-67.533241:-900.000000 +-77.910625:-124.319736:-900.000000 +-20.350625:-134.319736:-900.000000 FIN_BOX BOX PackRecalage:CompareImagesWidget_base_interface_3Dp:Box18 ISEXEC:FALSE --53.723459:5.389072:-900.000000 -17.451541:-4.610928:-900.000000 -FIN_BOX -BOX -PackRecalage:CompareImagesSwitcherWidget:Box11 -ISEXEC:FALSE --283.197955:-102.690000:-900.000000 --212.022955:-112.690000:-900.000000 -FIN_BOX -BOX -PackRecalage:CompareImagesTransparencyWidget_2Dt:Box12 -ISEXEC:FALSE --196.217189:-104.970773:-900.000000 --125.042189:-114.970773:-900.000000 +-185.132624:12.351239:-900.000000 +-113.957624:2.351239:-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 +-229.423187:-22.858480:-900.000000 +-158.248187:-32.858480:-900.000000 FIN_BOX BOX PackRecalage:CompareImagesTransparencyWidget_3Dp:Box14 -ISEXEC:FALSE --79.856495:-162.402489:-900.000000 --8.681495:-172.402489:-900.000000 +ISEXEC:TRUE +-86.902026:-80.169760:-900.000000 +-15.727026:-90.169760:-900.000000 FIN_BOX BOX PackRecalage:CompareImagesWidget_base_3Dp_B:Box15 ISEXEC:FALSE --5.909477:-64.772182:-900.000000 -65.265523:-74.772182:-900.000000 +-142.252618:-24.946332:-900.000000 +-71.077618:-34.946332:-900.000000 FIN_BOX -CONNECTIONS:43 -CONNECTION -Box59:Out:properties:In -NumberOfControlPoints:0 +BOX +PackRecalage:CompareImagesSwitcherWidget_3Dp:Box17 +ISEXEC:FALSE +-177.551360:-77.490958:-900.000000 +-106.376360:-87.490958:-900.000000 +FIN_BOX +CONNECTIONS:25 CONNECTION In2:In2:Box59:In NumberOfControlPoints:0 @@ -142,60 +115,9 @@ CONNECTION WinTitle:WinTitle:window2:WinTitle NumberOfControlPoints:0 CONNECTION -Box56:Out:Box70:In -NumberOfControlPoints:0 -CONNECTION -Box70:Widget:Box61:Widget2 -NumberOfControlPoints:0 -CONNECTION -Box59:Out:Box72:In -NumberOfControlPoints:0 -CONNECTION -properties:LengthZ:Box18:Max -NumberOfControlPoints:0 -CONNECTION Box18:Widget:Box61:Widget1 NumberOfControlPoints:0 CONNECTION -Box18:BoxChange:Box70:BoxExecute -NumberOfControlPoints:0 -CONNECTION -Box18:SliceZ:Box70:SliceZ -NumberOfControlPoints:0 -CONNECTION -Box18:SliceZ:Box72:SliceZ -NumberOfControlPoints:0 -CONNECTION -Box18:ConvolutionFactor:Box70:ConvolutionFactor -NumberOfControlPoints:0 -CONNECTION -Box18:ConvolutionFactor:Box72:ConvolutionFactor -NumberOfControlPoints:0 -CONNECTION -Box18:ConvolutionOnOff:Box70:ConvolutionOnOff -NumberOfControlPoints:0 -CONNECTION -Box18:ConvolutionOnOff:Box72:ConvolutionOnOff -NumberOfControlPoints:0 -CONNECTION -Box70:Out:Box11:Image1 -NumberOfControlPoints:0 -CONNECTION -Box72:Out:Box11:Image2 -NumberOfControlPoints:0 -CONNECTION -Box11:Widget:tabs:Widget1 -NumberOfControlPoints:0 -CONNECTION -Box70:BoxChange:Box12:BoxExecute -NumberOfControlPoints:0 -CONNECTION -Box70:Out:Box12:Image1 -NumberOfControlPoints:0 -CONNECTION -Box72:Out:Box12:Image2 -NumberOfControlPoints:0 -CONNECTION Box18:BoxChange:Box13:BoxExecute NumberOfControlPoints:0 CONNECTION @@ -208,15 +130,6 @@ 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 @@ -238,15 +151,24 @@ CONNECTION Box18:ConvolutionOnOff:Box15:ConvolutionOnOff NumberOfControlPoints:0 CONNECTION -Box18:SliceZ:Box15:SliceX +Box59:Out:Box15:In NumberOfControlPoints:0 CONNECTION -Box18:SliceZ:Box15:SliceY +Box59:Out:Box18:InputImage NumberOfControlPoints:0 CONNECTION -Box18:SliceZ:Box15:SliceZ +Box18:Point:Box15:Point NumberOfControlPoints:0 CONNECTION -Box59:Out:Box15:In +Box18:Point:Box13:Point +NumberOfControlPoints:0 +CONNECTION +Box17:Widget:tabs:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box13:Out:Box17:ImageVector1 +NumberOfControlPoints:0 +CONNECTION +Box15:Out:Box17:ImageVector2 NumberOfControlPoints:0 APP_END diff --git a/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs b/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs index bca9707..25c9f33 100644 --- a/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs +++ b/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs @@ -5,9 +5,9 @@ include std include itkvtk -include PackRecalage include wx include vtk +include PackRecalage define CompareImages_3DwithPlanes_Widget PackRecalage @@ -16,8 +16,6 @@ description "creatisRecalage" category "example" -new ImageRecalageProperties properties - new LayoutTab tabs set tabs.Orientation V @@ -31,51 +29,24 @@ new vtkImageDataPointerRelay Box59 new LayoutTab Box61 -new CompareImagesWidget_base_2Dt_A Box70 - -new CompareImagesWidget_base_2Dt_B Box72 - new CompareImagesWidget_base_interface_3Dp Box18 -new CompareImagesSwitcherWidget Box11 - -new CompareImagesTransparencyWidget_2Dt Box12 - new CompareImagesWidget_base_3Dp_B Box13 new CompareImagesTransparencyWidget_3Dp Box14 new CompareImagesWidget_base_3Dp_B Box15 +new CompareImagesSwitcherWidget_3Dp Box17 + -connect Box59.Out properties.In connect Box61.Widget window2.Widget1 connect tabs.Widget window2.Widget2 -connect Box56.Out Box70.In -connect Box70.Widget Box61.Widget2 -connect Box59.Out Box72.In -connect properties.LengthZ Box18.Max connect Box18.Widget Box61.Widget1 -connect Box18.BoxChange Box70.BoxExecute -connect Box18.SliceZ Box70.SliceZ -connect Box18.SliceZ Box72.SliceZ -connect Box18.ConvolutionFactor Box70.ConvolutionFactor -connect Box18.ConvolutionFactor Box72.ConvolutionFactor -connect Box18.ConvolutionOnOff Box70.ConvolutionOnOff -connect Box18.ConvolutionOnOff Box72.ConvolutionOnOff -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 @@ -83,10 +54,13 @@ 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 +connect Box59.Out Box18.InputImage +connect Box18.Point Box15.Point +connect Box18.Point Box13.Point +connect Box17.Widget tabs.Widget1 +connect Box13.Out Box17.ImageVector1 +connect Box15.Out Box17.ImageVector2 # Complex input ports input In2 Box59.In " " @@ -96,5 +70,6 @@ input WinTitle window2.WinTitle " " # Complex output ports output Widget window2.Widget " " +exec Box14 endefine diff --git a/PackRecalage/src/bbPackRecalageImageRecalageProperties.cxx b/PackRecalage/src/bbPackRecalageImageRecalageProperties.cxx index ed42c76..6f763ab 100644 --- a/PackRecalage/src/bbPackRecalageImageRecalageProperties.cxx +++ b/PackRecalage/src/bbPackRecalageImageRecalageProperties.cxx @@ -36,6 +36,8 @@ void ImageRecalageProperties::Process() image = bbGetInputIn(); if(image != NULL) { + bbSetOutputLengthX((int)image->GetDimensions()[0] - 1); + bbSetOutputLengthY((int)image->GetDimensions()[1] - 1); bbSetOutputLengthZ((int)image->GetDimensions()[2] - 1); if(image->GetScalarType() == VTK_DOUBLE) diff --git a/PackRecalage/src/bbPackRecalageImageRecalageProperties.h b/PackRecalage/src/bbPackRecalageImageRecalageProperties.h index ef77eac..b5b0aa9 100644 --- a/PackRecalage/src/bbPackRecalageImageRecalageProperties.h +++ b/PackRecalage/src/bbPackRecalageImageRecalageProperties.h @@ -41,6 +41,8 @@ class bbPackRecalage_EXPORT ImageRecalageProperties { BBTK_BLACK_BOX_INTERFACE(ImageRecalageProperties,bbtk::AtomicBlackBox); BBTK_DECLARE_INPUT(In,vtkImageData*); + BBTK_DECLARE_OUTPUT(LengthX,int); + BBTK_DECLARE_OUTPUT(LengthY,int); BBTK_DECLARE_OUTPUT(LengthZ,int); BBTK_DECLARE_OUTPUT(ColorLevel,int); BBTK_DECLARE_OUTPUT(MidColorLevel,int); @@ -57,6 +59,8 @@ BBTK_AUTHOR("jn.trillos44@uniandes.edu.co"); BBTK_DESCRIPTION("Finds image properties necessary for image registration."); BBTK_CATEGORY("image"); BBTK_INPUT(ImageRecalageProperties,In,"Image",vtkImageData*,""); +BBTK_OUTPUT(ImageRecalageProperties,LengthX,"Lenght in X",int,""); +BBTK_OUTPUT(ImageRecalageProperties,LengthY,"Lenght in Y",int,""); BBTK_OUTPUT(ImageRecalageProperties,LengthZ,"Lenght in Z",int,""); BBTK_OUTPUT(ImageRecalageProperties,ColorLevel,"ColorLevel/WindowLevel range of the Image",int,""); BBTK_OUTPUT(ImageRecalageProperties,MidColorLevel,"Medium value of the ColorLevel/WindowLevel range of the Image",int,""); diff --git a/PackRecalage/src/bbPackRecalageImageSwitcherFilter.cxx b/PackRecalage/src/bbPackRecalageImageSwitcherFilter.cxx new file mode 100644 index 0000000..4605dfe --- /dev/null +++ b/PackRecalage/src/bbPackRecalageImageSwitcherFilter.cxx @@ -0,0 +1,88 @@ +//===== +// 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 "bbPackRecalageImageSwitcherFilter.h" +#include "bbPackRecalagePackage.h" +namespace bbPackRecalage +{ + +BBTK_ADD_BLACK_BOX_TO_PACKAGE(PackRecalage,ImageSwitcherFilter) +BBTK_BLACK_BOX_IMPLEMENTATION(ImageSwitcherFilter,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 ImageSwitcherFilter::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 = " <