From 7af6ede8ddff62d8aa381b6d6ccb660dc6861a27 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Tue, 3 Jun 2014 10:25:32 +0200 Subject: [PATCH] 2383 CreaMiniTools Bug New Normal Threshold Widget Refres-conflict 2380 CreaMiniTools Feature New Normal new ViewContainer bbtk-application --- .../bbs/appli/ViewerContainer.bbg | 30 +++++++++++-------- .../bbs/appli/ViewerContainer.bbs | 5 +++- .../bbs/boxes/ThresholdWidget.bbg | 20 ++++++------- 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/bbtk_package_creaMiniTools/bbs/appli/ViewerContainer.bbg b/bbtk_package_creaMiniTools/bbs/appli/ViewerContainer.bbg index b1ec1d0..4211c92 100644 --- a/bbtk_package_creaMiniTools/bbs/appli/ViewerContainer.bbg +++ b/bbtk_package_creaMiniTools/bbs/appli/ViewerContainer.bbg @@ -9,18 +9,18 @@ DESCRIPTION:Description ?? AUTHOR:Author ?? COMPLEXBOX:FALSE COMPLEXINPUTS:0 -BOXES:27 +BOXES:28 BOX vtk:LoadHola:Box00 ISEXEC:FALSE -2.097563:242.659534:-900.000000 -47.672563:232.659534:-900.000000 +11.891022:244.495808:-900.000000 +57.466022:234.495808:-900.000000 FIN_BOX BOX creaMaracasVisu:ViewerNV:Box01 ISEXEC:FALSE 0.988964:140.797687:-900.000000 -46.563964:130.797687:-900.000000 +61.628964:130.797687:-900.000000 FIN_BOX BOX vtk:vtkImageDataPointerRelay:Box02 @@ -124,25 +124,25 @@ BOX wx:LayoutTab:Box18 ISEXEC:FALSE -112.408734:174.813321:-900.000000 --66.833734:164.813321:-900.000000 +-54.848734:164.813321:-900.000000 FIN_BOX BOX wx:LayoutTab:Box19 ISEXEC:FALSE -93.177872:97.517317:-900.000000 --47.602872:87.517317:-900.000000 +-35.617872:87.517317:-900.000000 FIN_BOX BOX wx:LayoutTab:Box20 ISEXEC:FALSE -55.580777:18.330843:-900.000000 --10.005777:8.330843:-900.000000 +1.979223:8.330843:-900.000000 FIN_BOX BOX creaMaracasVisu:PanelButtonContainerSettings:Box21 ISEXEC:FALSE -176.673032:-31.744948:-900.000000 --98.004699:-41.744948:-900.000000 +-105.498032:-41.744948:-900.000000 PORT ButtonName:"Window and Color Level" PORT @@ -166,7 +166,7 @@ BOX creaMaracasVisu:PanelButtonContainerSettings:Box25 ISEXEC:FALSE -184.373682:-71.047749:-900.000000 --100.367156:-81.047749:-900.000000 +-113.198682:-81.047749:-900.000000 PORT ButtonName:"2. Threshold" PORT @@ -210,11 +210,14 @@ ISEXEC:FALSE -38.640142:-22.056390:-900.000000 6.934858:-32.056390:-900.000000 FIN_BOX +BOX +creaImageIO:ImagesChooserDialogBox:Box32 +ISEXEC:FALSE +-19.147597:256.304682:-900.000000 +52.027403:246.304682:-900.000000 +FIN_BOX CONNECTIONS:40 CONNECTION -Box00:Out:Box02:In -NumberOfControlPoints:0 -CONNECTION Box02:Out:Box01:In NumberOfControlPoints:0 CONNECTION @@ -331,4 +334,7 @@ NumberOfControlPoints:0 CONNECTION Box02:Out:Box27:In NumberOfControlPoints:0 +CONNECTION +Box32:Out:Box02:In +NumberOfControlPoints:0 APP_END diff --git a/bbtk_package_creaMiniTools/bbs/appli/ViewerContainer.bbs b/bbtk_package_creaMiniTools/bbs/appli/ViewerContainer.bbs index ed84d1c..52fa394 100644 --- a/bbtk_package_creaMiniTools/bbs/appli/ViewerContainer.bbs +++ b/bbtk_package_creaMiniTools/bbs/appli/ViewerContainer.bbs @@ -14,6 +14,7 @@ include wx include std include toolsbbtk include creaMiniTools +include creaImageIO author "Author ??" description "Description ??" @@ -92,8 +93,8 @@ new MagicBox Box29 new Crop_Widget Box31 +new ImagesChooserDialogBox Box32 -connect Box00.Out Box02.In connect Box02.Out Box01.In @@ -173,6 +174,8 @@ connect Box02.Out Box31.Image connect Box02.Out Box27.In +connect Box32.Out Box02.In + # Complex input ports diff --git a/bbtk_package_creaMiniTools/bbs/boxes/ThresholdWidget.bbg b/bbtk_package_creaMiniTools/bbs/boxes/ThresholdWidget.bbg index c1a4d7f..fee39b8 100644 --- a/bbtk_package_creaMiniTools/bbs/boxes/ThresholdWidget.bbg +++ b/bbtk_package_creaMiniTools/bbs/boxes/ThresholdWidget.bbg @@ -36,8 +36,8 @@ BOXES:14 BOX wx:CommandButton:Box00 ISEXEC:FALSE --39.442677:-10.190191:-900.000000 -6.132323:-20.190191:-900.000000 +-41.477542:22.367648:-900.000000 +4.097458:12.367648:-900.000000 PORT Label:Run FIN_BOX @@ -45,7 +45,7 @@ BOX wx:LayoutLine:Box01 ISEXEC:FALSE -58.126568:-46.803915:-900.000000 --0.566568:-56.803915:-900.000000 +-12.551568:-56.803915:-900.000000 PORT WinTitle:"Parameters" FIN_BOX @@ -67,7 +67,7 @@ BOX creaMaracasVisu:ViewerNV:Box03 ISEXEC:FALSE 115.049769:-104.290651:-900.000000 -175.689769:-114.290651:-900.000000 +160.624769:-114.290651:-900.000000 PORT nTypeView:"0" FIN_BOX @@ -83,7 +83,7 @@ BOX creaMaracasVisu:SliderMinMax:Box07 ISEXEC:FALSE 111.749978:-6.422702:-900.000000 -166.229978:-16.422702:-900.000000 +157.324978:-16.422702:-900.000000 PORT InMax:5000 PORT @@ -97,7 +97,7 @@ BOX wx:LayoutTab:Box09 ISEXEC:FALSE -23.353929:-110.866779:-900.000000 -34.206071:-120.866779:-900.000000 +22.221071:-120.866779:-900.000000 FIN_BOX BOX toolsbbtk:SaveMHD-Button:Box10 @@ -116,8 +116,8 @@ FIN_BOX BOX wxvtk:IsoSurfaceWidget:Box12 ISEXEC:FALSE -55.130394:-63.135950:-900.000000 -100.705394:-73.135950:-900.000000 +65.524618:-60.966881:-900.000000 +111.099618:-70.966881:-900.000000 PORT Title:"Iso Surface" FIN_BOX @@ -226,9 +226,9 @@ CONNECTION Box00:BoxChange:Box07:BoxExecute NumberOfControlPoints:0 CONNECTION -Box02:Out:Box12:In +Box05:Widget:Widget:Widget NumberOfControlPoints:0 CONNECTION -Box05:Widget:Widget:Widget +Box02:Out:Box12:In NumberOfControlPoints:0 APP_END -- 2.47.1