From 15546f370a550eb33623748e220d611441a4451c Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Wed, 2 Jan 2019 16:59:41 +0100 Subject: [PATCH] Vectors field in ortogonal planes --- .../bbs/boxes/VectorsVisu_Interface.bbg | 77 +++++++++++++------ .../bbs/boxes/VectorsVisu_Interface.bbs | 30 +++++--- .../bbs/boxes/VectorsVisu_Widget.bbg | 9 ++- .../bbs/boxes/VectorsVisu_Widget.bbs | 3 +- bbtk_creaVtk_PKG/src/bbcreaVtkPlaneSource.cxx | 4 +- 5 files changed, 84 insertions(+), 39 deletions(-) diff --git a/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Interface.bbg b/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Interface.bbg index 1a3b7e4..09bd8d8 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Interface.bbg +++ b/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Interface.bbg @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.4 BBG BlackBox Diagram file -# - /home/davila/Creatis/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Interface.bbg +# - /home/davila/Creatis/C8/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Interface.bbg # ---------------------------------- APP_START @@ -10,42 +10,46 @@ AUTHOR:Author ?? COMPLEXBOX:TRUE COMPLEXBOXNAME:VectorsVisu_Interface PACKAGENAME:creaVtk -COMPLEXOUTPUTS:5 +COMPLEXOUTPUTS:6 COMPLEX_PORT Opacity -40.353594:-51.001761:-900.000000 +42.538344:-69.870059:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT widget --69.045254:-49.350565:-900.000000 +-100.028986:-72.786978:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT active --37.624825:-47.529091:-900.000000 +-68.012716:-75.136391:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT ScaleFactor -74.070740:-49.457530:-900.000000 +96.911312:-79.249580:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT boxChange --5.260159:-49.295203:-900.000000 +-6.253227:-75.114980:-900.000000 +FIN_COMPLEX_PORT +COMPLEX_PORT +Type +-36.743528:-74.778045:-900.000000 FIN_COMPLEX_PORT COMPLEXINPUTS:0 -BOXES:8 +BOXES:10 BOX wx:CheckBox:Box00 ISEXEC:FALSE --76.224989:54.666321:-900.000000 --30.649989:44.666321:-900.000000 +-147.328682:86.047280:-900.000000 +-111.003682:76.047280:-900.000000 PORT Title:"Active Vector" FIN_BOX BOX wx:Slider:Box01 ISEXEC:FALSE --8.984397:56.398119:-900.000000 -42.415603:46.398119:-900.000000 +-2.231532:70.499689:-900.000000 +49.168468:60.499689:-900.000000 PORT In:"100" PORT @@ -63,15 +67,15 @@ BOX std:Div:Box02 ISEXEC:FALSE 33.671471:18.616028:-900.000000 -66.446471:8.616028:-900.000000 +62.996471:8.616028:-900.000000 PORT In2:"100.0" FIN_BOX BOX wx:LayoutLine:Box03 ISEXEC:FALSE --85.410221:-1.499463:-900.000000 --27.850221:-11.499463:-900.000000 +-99.511791:9.027061:-900.000000 +-41.951791:-0.972939:-900.000000 PORT WinTitle:"Vector field" FIN_BOX @@ -85,15 +89,15 @@ BOX std:MultipleInputs:Box05 ISEXEC:FALSE -9.535855:-18.209205:-900.000000 -36.039145:-28.209205:-900.000000 +30.164145:-28.209205:-900.000000 PORT BoxProcessMode:"Reactive" FIN_BOX BOX wx:Slider:Box06 ISEXEC:FALSE -58.855363:57.678213:-900.000000 -110.255363:47.678213:-900.000000 +76.333366:74.957602:-900.000000 +127.733366:64.957602:-900.000000 PORT ChangeResolution:"true" PORT @@ -113,18 +117,33 @@ BOX std:Div:Box07 ISEXEC:FALSE 79.821975:17.274812:-900.000000 -112.596975:7.274812:-900.000000 +109.146975:7.274812:-900.000000 PORT In2:"100.0" FIN_BOX -CONNECTIONS:14 +BOX +wx:ComboBox:Box08 +ISEXEC:FALSE +-72.891216:88.085161:-900.000000 +-30.731216:78.085161:-900.000000 +PORT +In:"Line Arrow" +FIN_BOX +BOX +wx:LayoutLine:Box09 +ISEXEC:FALSE +-80.107632:55.442679:-900.000000 +-22.547632:45.442679:-900.000000 +PORT +Orientation:"H" +PORT +WinTitle:"Vector field" +FIN_BOX +CONNECTIONS:17 CONNECTION Box01:Widget:Box03:Widget2 NumberOfControlPoints:0 CONNECTION -Box00:Widget:Box03:Widget1 -NumberOfControlPoints:0 -CONNECTION Box01:Out:Box02:In1 NumberOfControlPoints:0 CONNECTION @@ -160,4 +179,16 @@ NumberOfControlPoints:0 CONNECTION Box05:BoxChange:boxChange:boxChange NumberOfControlPoints:0 +CONNECTION +Box08:Widget:Box09:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box00:Widget:Box09:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box09:Widget:Box03:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box08:Out:Type:Type +NumberOfControlPoints:0 APP_END diff --git a/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Interface.bbs b/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Interface.bbs index c70d6ab..02f5c8f 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Interface.bbs +++ b/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Interface.bbs @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box) -# - /home/davila/Creatis/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Interface.bbs +# - /home/davila/Creatis/C8/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Interface.bbs # ---------------------------------- include std @@ -15,10 +15,10 @@ description "Description ??" category "" -new CheckBox Box00 +new wx:CheckBox Box00 set Box00.Title "Active Vector" -new Slider Box01 +new wx:Slider Box01 set Box01.In "100" set Box01.Label "true" set Box01.Max "100" @@ -26,18 +26,18 @@ new Slider Box01 set Box01.ReactiveOnTrack "true" set Box01.Title "Opacity" -new Div Box02 +new std:Div Box02 set Box02.In2 "100.0" -new LayoutLine Box03 +new wx:LayoutLine Box03 set Box03.WinTitle "Vector field" -new LayoutTab Box04 +new wx:LayoutTab Box04 -new MultipleInputs Box05 +new std:MultipleInputs Box05 set Box05.BoxProcessMode "Reactive" -new Slider Box06 +new wx:Slider Box06 set Box06.ChangeResolution "true" set Box06.In "100" set Box06.Label "true" @@ -46,12 +46,18 @@ new Slider Box06 set Box06.ReactiveOnTrack "true" set Box06.Title "Scale Factor" -new Div Box07 +new std:Div Box07 set Box07.In2 "100.0" +new wx:ComboBox Box08 + set Box08.In "Line Arrow" + +new wx:LayoutLine Box09 + set Box09.Orientation "H" + set Box09.WinTitle "Vector field" + connect Box01.Widget Box03.Widget2 -connect Box00.Widget Box03.Widget1 connect Box01.Out Box02.In1 connect Box03.Widget Box04.Widget1 connect Box01.BoxChange Box05.In2 @@ -59,6 +65,9 @@ connect Box00.BoxChange Box05.In1 connect Box06.Widget Box03.Widget3 connect Box06.BoxChange Box05.In3 connect Box06.Out Box07.In1 +connect Box08.Widget Box09.Widget2 +connect Box00.Widget Box09.Widget1 +connect Box09.Widget Box03.Widget1 # Complex input ports @@ -68,6 +77,7 @@ output widget Box04.Widget " " output active Box00.Out " " output ScaleFactor Box07.Out " " output boxChange Box05.BoxChange " " +output Type Box08.Out " " endefine diff --git a/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Widget.bbg b/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Widget.bbg index c4687a3..d47a5f1 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Widget.bbg +++ b/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Widget.bbg @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.4 BBG BlackBox Diagram file -# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Widget.bbg +# - /home/davila/Creatis/C8/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Widget.bbg # ---------------------------------- APP_START @@ -53,11 +53,11 @@ BOX std:MultipleInputs:Box07 ISEXEC:FALSE -199.014629:-6.443575:-900.000000 --148.406139:-16.443575:-900.000000 +-159.314629:-16.443575:-900.000000 PORT BoxProcessMode:"Reactive" FIN_BOX -CONNECTIONS:10 +CONNECTIONS:11 CONNECTION Box05:Opacity:Box03:Opacity NumberOfControlPoints:0 @@ -88,4 +88,7 @@ NumberOfControlPoints:0 CONNECTION boxExecute:boxExecute:Box07:In1 NumberOfControlPoints:0 +CONNECTION +Box05:Type:Box03:TypeForm +NumberOfControlPoints:0 APP_END diff --git a/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Widget.bbs b/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Widget.bbs index 1b46f4a..cddcb38 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Widget.bbs +++ b/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Widget.bbs @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box) -# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Widget.bbs +# - /home/davila/Creatis/C8/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Widget.bbs # ---------------------------------- include std @@ -30,6 +30,7 @@ connect Box05.ScaleFactor Box03.ScaleFactor connect Box05.active Box03.Active connect Box07.BoxChange Box03.BoxExecute connect Box05.boxChange Box07.In2 +connect Box05.Type Box03.TypeForm # Complex input ports input renderer Box03.Renderer " " diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneSource.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneSource.cxx index 2f8b50d..a5b518e 100644 --- a/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneSource.cxx +++ b/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneSource.cxx @@ -24,12 +24,12 @@ void PlaneSource::Process() p0[2]=0; double p1[3]; p1[0]=0; - p1[1]=1; + p1[1]=100; p1[2]=0; double p2[3]; p2[0]=0; p2[1]=0; - p2[2]=1; + p2[2]=100; double c[3]; c[0]=bbGetInputCenter()[0]; c[1]=bbGetInputCenter()[1]; -- 2.47.1