From ede1ebe522c9dcc90203df98981958cd28cb78f1 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Thu, 23 May 2019 16:30:27 +0200 Subject: [PATCH] #3182 creaVtk Feature New Normal - Clean PlaneVecterVisu_Widget --- .../bbs/boxes/VectorVisuPlane.bbg | 51 ++++-- .../bbs/boxes/VectorVisuPlane.bbs | 5 + .../bbs/boxes/VectorVisuPlane_Widget.bbg | 146 +++++++++++++----- .../bbs/boxes/VectorVisuPlane_Widget.bbs | 27 ++++ .../bbs/boxes/VectorsVisu_Interface.bbg | 67 ++++++-- .../bbs/boxes/VectorsVisu_Interface.bbs | 14 +- 6 files changed, 240 insertions(+), 70 deletions(-) diff --git a/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane.bbg b/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane.bbg index 8daac66..9f20a1c 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane.bbg +++ b/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane.bbg @@ -13,9 +13,9 @@ PACKAGENAME:creaVtk COMPLEXOUTPUTS:1 COMPLEX_PORT outvtkdataset -65.397463:-185.352165:-900.000000 +153.573569:-190.269048:-900.000000 FIN_COMPLEX_PORT -COMPLEXINPUTS:4 +COMPLEXINPUTS:5 COMPLEX_PORT structuredpoints 168.091564:208.867022:-900.000000 @@ -32,18 +32,22 @@ COMPLEX_PORT orientation 81.925146:210.995455:-900.000000 FIN_COMPLEX_PORT -BOXES:22 +COMPLEX_PORT +ResolutionPlane +220.331663:206.252378:-900.000000 +FIN_COMPLEX_PORT +BOXES:23 BOX vtk:ProbeFilter:Box05 ISEXEC:FALSE -68.090835:-154.896636:-900.000000 -104.490835:-164.896636:-900.000000 +163.478369:-153.585467:-900.000000 +199.878369:-163.585467:-900.000000 FIN_BOX BOX creaVtk:PlaneSource:Box06 ISEXEC:FALSE --55.604401:-115.235612:-900.000000 --17.154401:-125.235612:-900.000000 +91.572189:-97.748914:-900.000000 +130.022189:-107.748914:-900.000000 PORT Center:"10 10 10" PORT @@ -94,8 +98,8 @@ FIN_BOX BOX std:GetVectorIntElement:Box20 ISEXEC:FALSE -12.597771:35.349688:-900.000000 -59.047771:25.349688:-900.000000 +-6.414177:45.511247:-900.000000 +40.035823:35.511247:-900.000000 PORT I:"2" FIN_BOX @@ -142,8 +146,8 @@ FIN_BOX BOX std:MagicBox:Box43 ISEXEC:FALSE -37.054745:160.043818:-900.000000 -73.129745:150.043818:-900.000000 +35.415784:161.354987:-900.000000 +71.490784:151.354987:-900.000000 FIN_BOX BOX std:StringSelect:Box45 @@ -172,8 +176,8 @@ FIN_BOX BOX std:MagicBox:Box48 ISEXEC:FALSE -103.365686:162.462813:-900.000000 -139.440686:152.462813:-900.000000 +104.676855:160.496060:-900.000000 +140.751855:150.496060:-900.000000 FIN_BOX BOX std:GetVectorIntElement:Box49 @@ -196,8 +200,8 @@ FIN_BOX BOX std:StringSelect:Box33 ISEXEC:FALSE -135.527853:-57.599081:-900.000000 -177.687853:-67.599081:-900.000000 +181.090971:-38.587133:-900.000000 +223.250971:-48.587133:-900.000000 PORT In0:"1 0 0" PORT @@ -211,7 +215,13 @@ ISEXEC:FALSE 92.061688:100.413387:-900.000000 128.136688:90.413387:-900.000000 FIN_BOX -CONNECTIONS:37 +BOX +std:MagicBox:Box35 +ISEXEC:FALSE +208.217045:162.784387:-900.000000 +244.292045:152.784387:-900.000000 +FIN_BOX +CONNECTIONS:40 CONNECTION Box06:PolyData:Box05:Input NumberOfControlPoints:0 @@ -323,4 +333,13 @@ NumberOfControlPoints:0 CONNECTION Box21:Out:Box45:In2 NumberOfControlPoints:0 +CONNECTION +ResolutionPlane:ResolutionPlane:Box35:In +NumberOfControlPoints:0 +CONNECTION +Box35:Out:Box06:XResolution +NumberOfControlPoints:0 +CONNECTION +Box35:Out:Box06:YResolution +NumberOfControlPoints:0 APP_END diff --git a/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane.bbs b/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane.bbs index 652e0db..1214af8 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane.bbs +++ b/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane.bbs @@ -83,6 +83,8 @@ new std:StringSelect Box33 new std:MagicBox Box34 +new std:MagicBox Box35 + connect Box06.PolyData Box05.Input connect Box15.Size Box16.In @@ -116,12 +118,15 @@ connect Box34.Out Box33.In connect Box46.Out Box45.In0 connect Box50.Out Box45.In1 connect Box21.Out Box45.In2 +connect Box35.Out Box06.XResolution +connect Box35.Out Box06.YResolution # Complex input ports input structuredpoints Box41.In " " input boxexecute Box43.BoxExecute " " input point Box48.In " " input orientation Box34.In " " +input ResolutionPlane Box35.In " " # Complex output ports output outvtkdataset Box05.Out " " diff --git a/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane_Widget.bbg b/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane_Widget.bbg index adca375..befe895 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane_Widget.bbg +++ b/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane_Widget.bbg @@ -13,67 +13,67 @@ PACKAGENAME:creaVtk COMPLEXOUTPUTS:1 COMPLEX_PORT outwidget -12.972521:-79.709422:-900.000000 +10.147096:-179.347579:-900.000000 FIN_COMPLEX_PORT COMPLEXINPUTS:7 COMPLEX_PORT structuredpoints -212.110624:122.074220:-900.000000 +118.034259:165.342792:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT Point -171.858822:122.692544:-900.000000 +95.483236:163.994363:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT wxvtkbaseview1_2D --131.175717:120.031151:-900.000000 +-107.246885:158.382840:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT wxvtkbaseview2_2D --76.740507:119.102934:-900.000000 +-79.035052:161.715922:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT wxvtkbaseview3_2D --26.739466:120.454247:-900.000000 +-54.929596:161.100482:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT vtkbaseview_3D -20.660762:120.110437:-900.000000 +304.933942:145.606474:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT boxExecute -191.311263:123.319785:-900.000000 +136.897755:166.588357:-900.000000 FIN_COMPLEX_PORT -BOXES:21 +BOXES:25 BOX creaVtk:VectorsVisu_Interface:Box01 ISEXEC:FALSE --10.602310:-6.448999:-900.000000 -36.722690:-16.448999:-900.000000 +-3.043156:153.547981:-900.000000 +44.281844:143.547981:-900.000000 FIN_BOX BOX creaVtk:VectorVisuPlane:Box02 ISEXEC:FALSE --99.757409:11.634232:-900.000000 --57.607409:1.634232:-900.000000 +-113.961606:-24.698150:-900.000000 +-71.811606:-34.698150:-900.000000 FIN_BOX BOX creaVtk:VectorsVisu:Box03 ISEXEC:FALSE --97.110320:-50.060640:-900.000000 --59.485320:-60.060640:-900.000000 +-136.482193:-77.371299:-900.000000 +-98.857193:-87.371299:-900.000000 FIN_BOX BOX creaVtk:VectorsVisu:Box04 ISEXEC:FALSE --33.087761:-53.009755:-900.000000 -4.537239:-63.009755:-900.000000 +-51.014755:-75.763474:-900.000000 +-13.389755:-85.763474:-900.000000 FIN_BOX BOX creaVtk:VectorsVisu:Box05 ISEXEC:FALSE -30.171274:-54.116137:-900.000000 -67.796274:-64.116137:-900.000000 +29.195353:-72.904199:-900.000000 +66.820353:-82.904199:-900.000000 FIN_BOX BOX creaMaracasVisu:wxVtkBaseView_Info:Box06 @@ -84,14 +84,14 @@ FIN_BOX BOX creaVtk:VectorVisuPlane:Box07 ISEXEC:FALSE --36.047788:12.741780:-900.000000 -6.102212:2.741780:-900.000000 +-33.711142:-27.630277:-900.000000 +8.438858:-37.630277:-900.000000 FIN_BOX BOX creaVtk:VectorVisuPlane:Box08 ISEXEC:FALSE -58.065379:10.578012:-900.000000 -100.215379:0.578012:-900.000000 +51.315067:-23.043733:-900.000000 +93.465067:-33.043733:-900.000000 FIN_BOX BOX std:MagicBox:Box09 @@ -114,38 +114,38 @@ FIN_BOX BOX creaMaracasVisu:wxVtkBaseView_Info:Box12 ISEXEC:FALSE --19.448948:61.219596:-900.000000 -26.701052:51.219596:-900.000000 +-14.747332:60.995710:-900.000000 +31.402668:50.995710:-900.000000 FIN_BOX BOX creaVtk:VectorVisuPlane:Box13 ISEXEC:FALSE -198.651191:-8.262430:-900.000000 -240.801191:-18.262430:-900.000000 +198.904161:-16.357475:-900.000000 +241.054161:-26.357475:-900.000000 PORT orientation:"0" FIN_BOX BOX creaVtk:VectorsVisu:Box14 ISEXEC:FALSE -183.872272:-41.868749:-900.000000 -221.497272:-51.868749:-900.000000 +191.703406:-83.369531:-900.000000 +229.328406:-93.369531:-900.000000 PORT Orientation:"0" FIN_BOX BOX creaVtk:VectorsVisu:Box15 ISEXEC:FALSE -283.894309:-42.657652:-900.000000 -321.519309:-52.657652:-900.000000 +264.416184:-76.688399:-900.000000 +302.041184:-86.688399:-900.000000 PORT Orientation:"1" FIN_BOX BOX creaVtk:VectorsVisu:Box16 ISEXEC:FALSE -362.072416:-44.715724:-900.000000 -399.697416:-54.715724:-900.000000 +360.761247:-82.084036:-900.000000 +398.386247:-92.084036:-900.000000 PORT Orientation:"2" FIN_BOX @@ -168,8 +168,8 @@ FIN_BOX BOX creaMaracasVisu:wxVtkBaseView_Info:Box20 ISEXEC:FALSE -243.103893:59.188056:-900.000000 -289.253893:49.188056:-900.000000 +288.011426:71.644160:-900.000000 +334.161426:61.644160:-900.000000 FIN_BOX BOX std:MagicBox:Box21 @@ -183,7 +183,39 @@ ISEXEC:FALSE 127.554980:-6.909168:-900.000000 167.254980:-16.909168:-900.000000 FIN_BOX -CONNECTIONS:79 +BOX +vtk:UpdateRender:Box23 +ISEXEC:FALSE +-98.045859:-113.623551:-900.000000 +-57.720859:-123.623551:-900.000000 +PORT +Active:"true" +FIN_BOX +BOX +vtk:UpdateRender:Box25 +ISEXEC:FALSE +-49.207261:-114.114134:-900.000000 +-8.882261:-124.114134:-900.000000 +PORT +Active:"true" +FIN_BOX +BOX +vtk:UpdateRender:Box26 +ISEXEC:FALSE +-55.516158:-135.095298:-900.000000 +-15.191158:-145.095298:-900.000000 +PORT +Active:"true" +FIN_BOX +BOX +vtk:UpdateRender:Box27 +ISEXEC:FALSE +270.324759:-126.478955:-900.000000 +310.649759:-136.478955:-900.000000 +PORT +Active:"true" +FIN_BOX +CONNECTIONS:93 CONNECTION Box01:widget:outwidget:outwidget NumberOfControlPoints:0 @@ -421,4 +453,46 @@ NumberOfControlPoints:0 CONNECTION Box24:BoxChange:Box16:BoxExecute NumberOfControlPoints:0 +CONNECTION +Box01:Resolution:Box02:ResolutionPlane +NumberOfControlPoints:0 +CONNECTION +Box01:Resolution:Box07:ResolutionPlane +NumberOfControlPoints:0 +CONNECTION +Box01:Resolution:Box08:ResolutionPlane +NumberOfControlPoints:0 +CONNECTION +Box01:Resolution:Box13:ResolutionPlane +NumberOfControlPoints:0 +CONNECTION +Box01:Resolution:Box17:ResolutionPlane +NumberOfControlPoints:0 +CONNECTION +Box01:Resolution:Box18:ResolutionPlane +NumberOfControlPoints:0 +CONNECTION +Box06:vtkRenderer:Box23:Renderer +NumberOfControlPoints:0 +CONNECTION +Box01:boxChange:Box23:BoxExecute +NumberOfControlPoints:0 +CONNECTION +Box11:vtkRenderer:Box25:Renderer +NumberOfControlPoints:0 +CONNECTION +Box12:vtkRenderer:Box26:Renderer +NumberOfControlPoints:0 +CONNECTION +Box20:vtkRenderer:Box27:Renderer +NumberOfControlPoints:0 +CONNECTION +Box01:boxChange:Box25:BoxExecute +NumberOfControlPoints:0 +CONNECTION +Box01:boxChange:Box26:BoxExecute +NumberOfControlPoints:0 +CONNECTION +Box01:boxChange:Box27:BoxExecute +NumberOfControlPoints:0 APP_END diff --git a/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane_Widget.bbs b/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane_Widget.bbs index 4f3f818..77b17f8 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane_Widget.bbs +++ b/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane_Widget.bbs @@ -8,6 +8,7 @@ include itkvtk include creaVtk include creaMaracasVisu include std +include vtk define VectorVisuPlane_Widget creaVtk @@ -64,6 +65,18 @@ new std:MagicBox Box21 new std:MultipleInputs Box24 +new vtk:UpdateRender Box23 + set Box23.Active "true" + +new vtk:UpdateRender Box25 + set Box25.Active "true" + +new vtk:UpdateRender Box26 + set Box26.Active "true" + +new vtk:UpdateRender Box27 + set Box27.Active "true" + connect Box06.vtkRenderer Box03.Renderer connect Box06.Direction Box02.orientation @@ -136,6 +149,20 @@ connect Box24.BoxChange Box04.BoxExecute connect Box24.BoxChange Box05.BoxExecute connect Box24.BoxChange Box15.BoxExecute connect Box24.BoxChange Box16.BoxExecute +connect Box01.Resolution Box02.ResolutionPlane +connect Box01.Resolution Box07.ResolutionPlane +connect Box01.Resolution Box08.ResolutionPlane +connect Box01.Resolution Box13.ResolutionPlane +connect Box01.Resolution Box17.ResolutionPlane +connect Box01.Resolution Box18.ResolutionPlane +connect Box06.vtkRenderer Box23.Renderer +connect Box01.boxChange Box23.BoxExecute +connect Box11.vtkRenderer Box25.Renderer +connect Box12.vtkRenderer Box26.Renderer +connect Box20.vtkRenderer Box27.Renderer +connect Box01.boxChange Box25.BoxExecute +connect Box01.boxChange Box26.BoxExecute +connect Box01.boxChange Box27.BoxExecute # Complex input ports input Point Box09.In " " diff --git a/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Interface.bbg b/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Interface.bbg index c60a0dd..ed237d3 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Interface.bbg +++ b/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Interface.bbg @@ -10,7 +10,7 @@ AUTHOR:Author ?? COMPLEXBOX:TRUE COMPLEXBOXNAME:VectorsVisu_Interface PACKAGENAME:creaVtk -COMPLEXOUTPUTS:6 +COMPLEXOUTPUTS:7 COMPLEX_PORT Opacity 42.538344:-69.870059:-900.000000 @@ -25,7 +25,7 @@ active FIN_COMPLEX_PORT COMPLEX_PORT ScaleFactor -96.911312:-79.249580:-900.000000 +98.010322:-71.281755:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT boxChange @@ -35,8 +35,12 @@ COMPLEX_PORT Type -36.743528:-74.778045:-900.000000 FIN_COMPLEX_PORT +COMPLEX_PORT +Resolution +135.040901:-72.809438:-900.000000 +FIN_COMPLEX_PORT COMPLEXINPUTS:0 -BOXES:10 +BOXES:11 BOX wx:CheckBox:Box00 ISEXEC:FALSE @@ -66,16 +70,16 @@ FIN_BOX BOX std:Div:Box02 ISEXEC:FALSE -33.671471:18.616028:-900.000000 -62.996471:8.616028:-900.000000 +41.089791:-19.299830:-900.000000 +70.414791:-29.299830:-900.000000 PORT In2:"100.0" FIN_BOX BOX wx:LayoutLine:Box03 ISEXEC:FALSE --99.511791:9.027061:-900.000000 --41.951791:-0.972939:-900.000000 +-87.147924:15.346371:-900.000000 +-29.587924:5.346371:-900.000000 PORT WinTitle:"Vector field" FIN_BOX @@ -83,7 +87,7 @@ BOX wx:LayoutTab:Box04 ISEXEC:FALSE -83.037560:-20.291032:-900.000000 --46.787560:-30.291032:-900.000000 +-25.477560:-30.291032:-900.000000 FIN_BOX BOX std:MultipleInputs:Box05 @@ -96,8 +100,8 @@ FIN_BOX BOX wx:Slider:Box06 ISEXEC:FALSE -76.333366:74.957602:-900.000000 -107.908366:64.957602:-900.000000 +62.595736:71.111066:-900.000000 +94.170736:61.111066:-900.000000 PORT ChangeResolution:"true" PORT @@ -105,7 +109,7 @@ In:"100" PORT Label:"true" PORT -Max:"500000" +Max:"50000" PORT Min:"1" PORT @@ -116,8 +120,8 @@ FIN_BOX BOX std:Div:Box07 ISEXEC:FALSE -79.821975:17.274812:-900.000000 -109.146975:7.274812:-900.000000 +85.545028:-22.113257:-900.000000 +114.870028:-32.113257:-900.000000 PORT In2:"100.0" FIN_BOX @@ -125,7 +129,7 @@ BOX wx:ComboBox:Box08 ISEXEC:FALSE -72.891216:88.085161:-900.000000 --30.731216:78.085161:-900.000000 +-35.716216:78.085161:-900.000000 PORT In:"Line Arrow" PORT @@ -134,14 +138,34 @@ FIN_BOX BOX wx:LayoutLine:Box09 ISEXEC:FALSE --80.107632:55.442679:-900.000000 --22.547632:45.442679:-900.000000 +-107.033386:57.091195:-900.000000 +-49.473386:47.091195:-900.000000 PORT Orientation:"H" PORT WinTitle:"Vector field" FIN_BOX -CONNECTIONS:17 +BOX +wx:Slider:Box10 +ISEXEC:FALSE +121.335852:72.977394:-900.000000 +172.735852:62.977394:-900.000000 +PORT +ChangeResolution:"true" +PORT +In:"100" +PORT +Label:"true" +PORT +Max:"200" +PORT +Min:"1" +PORT +ReactiveOnTrack:"true" +PORT +Title:"Resolution" +FIN_BOX +CONNECTIONS:20 CONNECTION Box01:Widget:Box03:Widget2 NumberOfControlPoints:0 @@ -193,4 +217,13 @@ NumberOfControlPoints:0 CONNECTION Box08:Out:Type:Type NumberOfControlPoints:0 +CONNECTION +Box10:Widget:Box03:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box10:BoxChange:Box05:In4 +NumberOfControlPoints:0 +CONNECTION +Box10:Out:Resolution:Resolution +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 67df3f7..97821ba 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Interface.bbs +++ b/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Interface.bbs @@ -41,7 +41,7 @@ new wx:Slider Box06 set Box06.ChangeResolution "true" set Box06.In "100" set Box06.Label "true" - set Box06.Max "500000" + set Box06.Max "50000" set Box06.Min "1" set Box06.ReactiveOnTrack "true" set Box06.Title "Scale Factor" @@ -57,6 +57,15 @@ new wx:LayoutLine Box09 set Box09.Orientation "H" set Box09.WinTitle "Vector field" +new wx:Slider Box10 + set Box10.ChangeResolution "true" + set Box10.In "100" + set Box10.Label "true" + set Box10.Max "200" + set Box10.Min "1" + set Box10.ReactiveOnTrack "true" + set Box10.Title "Resolution" + connect Box01.Widget Box03.Widget2 connect Box01.Out Box02.In1 @@ -69,6 +78,8 @@ connect Box06.Out Box07.In1 connect Box08.Widget Box09.Widget2 connect Box00.Widget Box09.Widget1 connect Box09.Widget Box03.Widget1 +connect Box10.Widget Box03.Widget4 +connect Box10.BoxChange Box05.In4 # Complex input ports @@ -79,6 +90,7 @@ output active Box00.Out " " output ScaleFactor Box07.Out " " output boxChange Box05.BoxChange " " output Type Box08.Out " " +output Resolution Box10.Out " " endefine -- 2.47.1