From e5d75e040b6139325accd420d712b5b825ef8440 Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Mon, 9 Jul 2012 12:51:16 +0000 Subject: [PATCH] 1490 , 1491 Feature: Viewer NV: - Save option - Show image properties Save Planes: new interface --- .../bbs/appli/SaveImagePlanes.bbg | 30 +++++---- .../bbs/appli/SaveImagePlanes.bbs | 11 ++-- .../bbs/appli/viewerNVExample.bbg | 64 ++++++++++++++++--- .../bbs/appli/viewerNVExample.bbs | 27 ++++++-- 4 files changed, 104 insertions(+), 28 deletions(-) diff --git a/bbtk_package_creaMiniTools/bbs/appli/SaveImagePlanes.bbg b/bbtk_package_creaMiniTools/bbs/appli/SaveImagePlanes.bbg index 1277e92..7088d21 100644 --- a/bbtk_package_creaMiniTools/bbs/appli/SaveImagePlanes.bbg +++ b/bbtk_package_creaMiniTools/bbs/appli/SaveImagePlanes.bbg @@ -114,12 +114,12 @@ FIN_BOX BOX wx:LayoutSplit:Box15 ISEXEC:FALSE -25.494825:-262.334824:-900.000000 -71.069825:-272.334824:-900.000000 +-15.280580:-258.750173:-900.000000 +30.294420:-268.750173:-900.000000 PORT Orientation:"H" PORT -Proportion:"40" +Proportion:"35" PORT WinTitle:"Interactive Planes" FIN_BOX @@ -194,6 +194,10 @@ wx:LayoutTab:Box25 ISEXEC:TRUE 69.750490:-297.474686:-900.000000 127.310490:-307.474686:-900.000000 +PORT +WinHeight:"800" +PORT +WinWidth:"1000" FIN_BOX BOX wx:LayoutSplit:Box26 @@ -203,6 +207,8 @@ ISEXEC:FALSE PORT Orientation:"H" PORT +Proportion:"30" +PORT WinTitle:"3 Points plane definition" FIN_BOX BOX @@ -326,27 +332,18 @@ CONNECTION viewer:Widget:main:Widget4 NumberOfControlPoints:0 CONNECTION -planes:ImageX:viewerUL:In -NumberOfControlPoints:0 -CONNECTION viewerUL:Widget:upleft:Widget1 NumberOfControlPoints:0 CONNECTION planes:BoxChange:viewerUL:BoxExecute NumberOfControlPoints:0 CONNECTION -planes:ImageY:viewerUR:In -NumberOfControlPoints:0 -CONNECTION viewerUR:Widget:upright:Widget1 NumberOfControlPoints:0 CONNECTION planes:BoxChange:viewerUR:BoxExecute NumberOfControlPoints:0 CONNECTION -planes:ImageZ:viewerDL:In -NumberOfControlPoints:0 -CONNECTION viewerDL:Widget:downleft:Widget1 NumberOfControlPoints:0 CONNECTION @@ -498,4 +495,13 @@ NumberOfControlPoints:0 CONNECTION Box26:Widget:Box25:Widget2 NumberOfControlPoints:0 +CONNECTION +planes:ImageZ:viewerDL:In +NumberOfControlPoints:0 +CONNECTION +planes:ImageY:viewerUR:In +NumberOfControlPoints:0 +CONNECTION +planes:ImageX:viewerUL:In +NumberOfControlPoints:0 APP_END diff --git a/bbtk_package_creaMiniTools/bbs/appli/SaveImagePlanes.bbs b/bbtk_package_creaMiniTools/bbs/appli/SaveImagePlanes.bbs index d882650..dbff913 100644 --- a/bbtk_package_creaMiniTools/bbs/appli/SaveImagePlanes.bbs +++ b/bbtk_package_creaMiniTools/bbs/appli/SaveImagePlanes.bbs @@ -59,7 +59,7 @@ new SaveMHD-Button Box14 new LayoutSplit Box15 set Box15.Orientation "H" - set Box15.Proportion "40" + set Box15.Proportion "35" set Box15.WinTitle "Interactive Planes" new SaveMHD-Button Box16 @@ -87,9 +87,12 @@ new LayoutLine Box23 new vtkImageDataPointerRelay Box24 new LayoutTab Box25 + set Box25.WinHeight "800" + set Box25.WinWidth "1000" new LayoutSplit Box26 set Box26.Orientation "H" + set Box26.Proportion "30" set Box26.WinTitle "3 Points plane definition" new ViewerNV Box27 @@ -137,13 +140,10 @@ connect planes.PlaneX viewer.Obs1 connect planes.PlaneY viewer.Obs2 connect planes.PlaneZ viewer.Obs3 connect viewer.Widget main.Widget4 -connect planes.ImageX viewerUL.In connect viewerUL.Widget upleft.Widget1 connect planes.BoxChange viewerUL.BoxExecute -connect planes.ImageY viewerUR.In connect viewerUR.Widget upright.Widget1 connect planes.BoxChange viewerUR.BoxExecute -connect planes.ImageZ viewerDL.In connect viewerDL.Widget downleft.Widget1 connect planes.BoxChange viewerDL.BoxExecute connect Box13.Widget Box11.Widget1 @@ -194,5 +194,8 @@ connect Box43.BoxChange planes.BoxExecute connect Box10.Out Box24.In connect Box15.Widget Box25.Widget1 connect Box26.Widget Box25.Widget2 +connect planes.ImageZ viewerDL.In +connect planes.ImageY viewerUR.In +connect planes.ImageX viewerUL.In exec Box25 diff --git a/bbtk_package_creaMiniTools/bbs/appli/viewerNVExample.bbg b/bbtk_package_creaMiniTools/bbs/appli/viewerNVExample.bbg index 188da81..5e87d73 100755 --- a/bbtk_package_creaMiniTools/bbs/appli/viewerNVExample.bbg +++ b/bbtk_package_creaMiniTools/bbs/appli/viewerNVExample.bbg @@ -1,6 +1,6 @@ # ---------------------------------- -# - BBTKGEditor v 1.2 BBG BlackBox Diagram file -# - /home/pechan/Documents/courses/development/creatis/dev/src/creaMiniTools/examples/bbg/viewers/viewerNVExample.bbg +# - BBTKGEditor v 1.3 BBG BlackBox Diagram file +# - /Users/davila/Creatis/All5/creatools_source/creaMiniTools/bbtk_package_creaMiniTools/bbs/appli/viewerNVExample.bbg # ---------------------------------- APP_START @@ -8,21 +8,69 @@ CATEGORY: DESCRIPTION:Description ?? AUTHOR:Author ?? COMPLEXBOX:FALSE -BOXES:2 +BOXES:6 BOX creaImageIO:ImagesChooserDialogBox:Box00 ISEXEC:FALSE --50.710900:92.180095:900.000000 -49.289100:82.180095:900.000000 +-32.069940:88.006745:-900.000000 +39.105060:78.006745:-900.000000 FIN_BOX BOX creaMaracasVisu:ViewerNV:Box01 +ISEXEC:FALSE +-95.504848:60.069929:-900.000000 +-34.864848:50.069929:-900.000000 +FIN_BOX +BOX +toolsbbtk:ImageVtkPropertiesWidget:Box04 +ISEXEC:FALSE +-29.630779:60.652674:-900.000000 +41.544221:50.652674:-900.000000 +FIN_BOX +BOX +wx:LayoutTab:Box05 ISEXEC:TRUE --50.710900:35.308057:900.000000 -49.289100:25.308057:900.000000 +-26.570323:1.112893:-900.000000 +30.989677:-8.887107:-900.000000 +PORT +WinHide:"800" +PORT +WinWidth:"1000" +FIN_BOX +BOX +toolsbbtk:SaveMHD-Button:Box06 +ISEXEC:FALSE +50.219301:61.487344:-900.000000 +95.794301:51.487344:-900.000000 +FIN_BOX +BOX +wx:LayoutLine:Box07 +ISEXEC:FALSE +-83.327871:40.620598:-900.000000 +-25.767871:30.620598:-900.000000 +PORT +WinTitle:"MPR Viewer" FIN_BOX -CONNECTIONS:1 +CONNECTIONS:7 CONNECTION Box00:Out:Box01:In NumberOfControlPoints:0 +CONNECTION +Box00:Out:Box04:in +NumberOfControlPoints:0 +CONNECTION +Box04:widget:Box05:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box06:Widget:Box05:Widget3 +NumberOfControlPoints:0 +CONNECTION +Box00:Out:Box06:In +NumberOfControlPoints:0 +CONNECTION +Box01:Widget:Box07:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box07:Widget:Box05:Widget1 +NumberOfControlPoints:0 APP_END diff --git a/bbtk_package_creaMiniTools/bbs/appli/viewerNVExample.bbs b/bbtk_package_creaMiniTools/bbs/appli/viewerNVExample.bbs index 4d8aa16..e1be372 100755 --- a/bbtk_package_creaMiniTools/bbs/appli/viewerNVExample.bbs +++ b/bbtk_package_creaMiniTools/bbs/appli/viewerNVExample.bbs @@ -1,6 +1,6 @@ # ---------------------------------- -# - BBTKGEditor v 1.2 BBS BlackBox Script -# - /home/pechan/Documents/courses/development/creatis/dev/src/creaMiniTools/examples/bbg/viewers/viewerNVExample.bbs +# - BBTKGEditor v 1.3 BBS BlackBox Script +# - /Users/davila/Creatis/All5/creatools_source/creaMiniTools/bbtk_package_creaMiniTools/bbs/appli/viewerNVExample.bbs # ---------------------------------- # BBTK GEditor Script @@ -10,6 +10,8 @@ include std include itkvtk include creaImageIO include creaMaracasVisu +include toolsbbtk +include wx author "Author ??" description "Description ??" @@ -19,7 +21,24 @@ new ImagesChooserDialogBox Box00 new ViewerNV Box01 +new ImageVtkPropertiesWidget Box04 -connect Box00.Out Box01.In +new LayoutTab Box05 + set Box05.WinHide "800" + set Box05.WinWidth "1000" + +new SaveMHD-Button Box06 + +new LayoutLine Box07 + set Box07.WinTitle "MPR Viewer" -exec Box01 + +connect Box00.Out Box01.In +connect Box00.Out Box04.in +connect Box04.widget Box05.Widget2 +connect Box06.Widget Box05.Widget3 +connect Box00.Out Box06.In +connect Box01.Widget Box07.Widget1 +connect Box07.Widget Box05.Widget1 + +exec Box05 -- 2.45.0