From 6c621b712c4f3ba585d24a2ce98ddc52abb19cb9 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Sun, 26 May 2019 20:14:27 +0200 Subject: [PATCH] 3182 creaVtk Feature New Normal - Clean PlaneVecterVisu_Widget --- .../bbs/boxes/VectorVisuPlane.bbg | 50 ++-- .../bbs/boxes/VectorVisuPlane.bbs | 4 +- .../bbs/boxes/VectorVisuPlane_Widget.bbg | 191 ++++-------- .../bbs/boxes/VectorVisuPlane_Widget.bbs | 43 +-- .../bbs/boxes/VectorsVisu_Interface.bbg | 279 +++++++++++++++--- .../bbs/boxes/VectorsVisu_Interface.bbs | 88 +++++- bbtk_creaVtk_PKG/src/bbcreaVtkPlaneSource.cxx | 76 +++-- lib/creaVtk/vtkVectorsVisu.cpp | 18 +- 8 files changed, 485 insertions(+), 264 deletions(-) diff --git a/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane.bbg b/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane.bbg index 9f20a1c..9f24b07 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane.bbg +++ b/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane.bbg @@ -13,7 +13,7 @@ PACKAGENAME:creaVtk COMPLEXOUTPUTS:1 COMPLEX_PORT outvtkdataset -153.573569:-190.269048:-900.000000 +166.704997:-189.595641:-900.000000 FIN_COMPLEX_PORT COMPLEXINPUTS:5 COMPLEX_PORT @@ -46,8 +46,8 @@ FIN_BOX BOX creaVtk:PlaneSource:Box06 ISEXEC:FALSE -91.572189:-97.748914:-900.000000 -130.022189:-107.748914:-900.000000 +94.101891:-106.947829:-900.000000 +132.551891:-116.947829:-900.000000 PORT Center:"10 10 10" PORT @@ -106,8 +106,8 @@ FIN_BOX BOX std:ConcatStrings:Box21 ISEXEC:FALSE --37.754838:12.042731:-900.000000 -1.970162:2.042731:-900.000000 +-83.537606:12.320630:-900.000000 +-43.812606:2.320630:-900.000000 PORT In2:" " PORT @@ -116,8 +116,8 @@ FIN_BOX BOX std:MathOperationVector:Box22 ISEXEC:FALSE --97.981490:-56.193301:-900.000000 --50.456490:-66.193301:-900.000000 +-89.409251:-75.781700:-900.000000 +-41.884251:-85.781700:-900.000000 PORT Type:"2" FIN_BOX @@ -152,14 +152,14 @@ FIN_BOX BOX std:StringSelect:Box45 ISEXEC:FALSE --129.200732:-36.832657:-900.000000 --87.040732:-46.832657:-900.000000 +-128.065356:-53.449117:-900.000000 +-85.905356:-63.449117:-900.000000 FIN_BOX BOX std:ConcatStrings:Box46 ISEXEC:FALSE --166.643801:11.251334:-900.000000 --126.918801:1.251334:-900.000000 +-202.286031:9.447795:-900.000000 +-162.561031:-0.552205:-900.000000 PORT In2:" " PORT @@ -168,8 +168,8 @@ FIN_BOX BOX std:GetVectorIntElement:Box47 ISEXEC:FALSE --179.093435:36.317539:-900.000000 --132.643435:26.317539:-900.000000 +-250.207922:63.996866:-900.000000 +-203.757922:53.996866:-900.000000 PORT I:"0" FIN_BOX @@ -182,16 +182,16 @@ FIN_BOX BOX std:GetVectorIntElement:Box49 ISEXEC:FALSE --75.467291:34.093419:-900.000000 --29.017291:24.093419:-900.000000 +-75.803994:40.827484:-900.000000 +-29.353994:30.827484:-900.000000 PORT I:"1" FIN_BOX BOX std:ConcatStrings:Box50 ISEXEC:FALSE --90.467260:10.836635:-900.000000 --50.742260:0.836635:-900.000000 +-145.515014:11.542261:-900.000000 +-105.790014:1.542261:-900.000000 PORT In2:" " PORT @@ -200,8 +200,8 @@ FIN_BOX BOX std:StringSelect:Box33 ISEXEC:FALSE -181.090971:-38.587133:-900.000000 -223.250971:-48.587133:-900.000000 +180.417564:-35.556804:-900.000000 +222.577564:-45.556804:-900.000000 PORT In0:"1 0 0" PORT @@ -325,21 +325,21 @@ CONNECTION Box34:Out:Box33:In NumberOfControlPoints:0 CONNECTION -Box46:Out:Box45:In0 +ResolutionPlane:ResolutionPlane:Box35:In NumberOfControlPoints:0 CONNECTION -Box50:Out:Box45:In1 +Box35:Out:Box06:XResolution NumberOfControlPoints:0 CONNECTION -Box21:Out:Box45:In2 +Box35:Out:Box06:YResolution NumberOfControlPoints:0 CONNECTION -ResolutionPlane:ResolutionPlane:Box35:In +Box46:Out:Box45:In0 NumberOfControlPoints:0 CONNECTION -Box35:Out:Box06:XResolution +Box50:Out:Box45:In1 NumberOfControlPoints:0 CONNECTION -Box35:Out:Box06:YResolution +Box21:Out:Box45:In2 NumberOfControlPoints:0 APP_END diff --git a/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane.bbs b/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane.bbs index 1214af8..1fc0def 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane.bbs +++ b/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane.bbs @@ -115,11 +115,11 @@ connect Box24.Out Box50.In5 connect Box33.Out Box06.Normal connect Box34.Out Box45.In connect Box34.Out Box33.In +connect Box35.Out Box06.XResolution +connect Box35.Out Box06.YResolution 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 " " diff --git a/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane_Widget.bbg b/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane_Widget.bbg index befe895..d74d5f1 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane_Widget.bbg +++ b/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane_Widget.bbg @@ -26,7 +26,7 @@ Point FIN_COMPLEX_PORT COMPLEX_PORT wxvtkbaseview1_2D --107.246885:158.382840:-900.000000 +-109.523616:163.189273:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT wxvtkbaseview2_2D @@ -44,7 +44,7 @@ COMPLEX_PORT boxExecute 136.897755:166.588357:-900.000000 FIN_COMPLEX_PORT -BOXES:25 +BOXES:22 BOX creaVtk:VectorsVisu_Interface:Box01 ISEXEC:FALSE @@ -52,46 +52,28 @@ ISEXEC:FALSE 44.281844:143.547981:-900.000000 FIN_BOX BOX -creaVtk:VectorVisuPlane:Box02 -ISEXEC:FALSE --113.961606:-24.698150:-900.000000 --71.811606:-34.698150:-900.000000 -FIN_BOX -BOX creaVtk:VectorsVisu:Box03 ISEXEC:FALSE --136.482193:-77.371299:-900.000000 --98.857193:-87.371299:-900.000000 +-179.879248:-71.409870:-900.000000 +-142.254248:-81.409870:-900.000000 FIN_BOX BOX creaVtk:VectorsVisu:Box04 ISEXEC:FALSE --51.014755:-75.763474:-900.000000 --13.389755:-85.763474:-900.000000 +-53.890021:-71.117417:-900.000000 +-16.265021:-81.117417:-900.000000 FIN_BOX BOX creaVtk:VectorsVisu:Box05 ISEXEC:FALSE -29.195353:-72.904199:-900.000000 -66.820353:-82.904199:-900.000000 +25.906741:-74.169050:-900.000000 +63.531741:-84.169050:-900.000000 FIN_BOX BOX creaMaracasVisu:wxVtkBaseView_Info:Box06 ISEXEC:FALSE --143.868867:57.458390:-900.000000 --97.718867:47.458390:-900.000000 -FIN_BOX -BOX -creaVtk:VectorVisuPlane:Box07 -ISEXEC:FALSE --33.711142:-27.630277:-900.000000 -8.438858:-37.630277:-900.000000 -FIN_BOX -BOX -creaVtk:VectorVisuPlane:Box08 -ISEXEC:FALSE -51.315067:-23.043733:-900.000000 -93.465067:-33.043733:-900.000000 +-150.446091:63.276704:-900.000000 +-104.296091:53.276704:-900.000000 FIN_BOX BOX std:MagicBox:Box09 @@ -108,44 +90,44 @@ FIN_BOX BOX creaMaracasVisu:wxVtkBaseView_Info:Box11 ISEXEC:FALSE --84.129734:58.927188:-900.000000 --37.979734:48.927188:-900.000000 +-79.070331:59.180158:-900.000000 +-32.920331:49.180158:-900.000000 FIN_BOX BOX creaMaracasVisu:wxVtkBaseView_Info:Box12 ISEXEC:FALSE --14.747332:60.995710:-900.000000 -31.402668:50.995710:-900.000000 +-6.652287:59.730859:-900.000000 +39.497713:49.730859:-900.000000 FIN_BOX BOX creaVtk:VectorVisuPlane:Box13 ISEXEC:FALSE -198.904161:-16.357475:-900.000000 -241.054161:-26.357475:-900.000000 +213.070490:-10.033221:-900.000000 +255.220490:-20.033221:-900.000000 PORT orientation:"0" FIN_BOX BOX creaVtk:VectorsVisu:Box14 ISEXEC:FALSE -191.703406:-83.369531:-900.000000 -229.328406:-93.369531:-900.000000 +138.245167:-121.547117:-900.000000 +175.870167:-131.547117:-900.000000 PORT Orientation:"0" FIN_BOX BOX creaVtk:VectorsVisu:Box15 ISEXEC:FALSE -264.416184:-76.688399:-900.000000 -302.041184:-86.688399:-900.000000 +283.742959:-94.464991:-900.000000 +321.367959:-104.464991:-900.000000 PORT Orientation:"1" FIN_BOX BOX creaVtk:VectorsVisu:Box16 ISEXEC:FALSE -360.761247:-82.084036:-900.000000 -398.386247:-92.084036:-900.000000 +371.638964:-91.949872:-900.000000 +409.263964:-101.949872:-900.000000 PORT Orientation:"2" FIN_BOX @@ -186,36 +168,36 @@ FIN_BOX BOX vtk:UpdateRender:Box23 ISEXEC:FALSE --98.045859:-113.623551:-900.000000 --57.720859:-123.623551:-900.000000 +-146.616129:-113.623551:-900.000000 +-106.291129:-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 +-78.298829:-113.608194:-900.000000 +-37.973829:-123.608194:-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 +7.473410:-115.110656:-900.000000 +47.798410:-125.110656:-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 +256.664371:-161.894777:-900.000000 +296.989371:-171.894777:-900.000000 PORT Active:"true" FIN_BOX -CONNECTIONS:93 +CONNECTIONS:78 CONNECTION Box01:widget:outwidget:outwidget NumberOfControlPoints:0 @@ -223,12 +205,6 @@ CONNECTION Box06:vtkRenderer:Box03:Renderer NumberOfControlPoints:0 CONNECTION -Box06:Direction:Box02:orientation -NumberOfControlPoints:0 -CONNECTION -Box02:outvtkdataset:Box03:In -NumberOfControlPoints:0 -CONNECTION Box01:Opacity:Box03:Opacity NumberOfControlPoints:0 CONNECTION @@ -238,9 +214,6 @@ CONNECTION Box01:Type:Box03:TypeForm NumberOfControlPoints:0 CONNECTION -Box01:active:Box03:Active -NumberOfControlPoints:0 -CONNECTION Box01:Opacity:Box04:Opacity NumberOfControlPoints:0 CONNECTION @@ -250,57 +223,24 @@ CONNECTION Box01:Type:Box04:TypeForm NumberOfControlPoints:0 CONNECTION -Box01:active:Box04:Active -NumberOfControlPoints:0 -CONNECTION Box06:Direction:Box03:Orientation NumberOfControlPoints:0 CONNECTION Point:Point:Box09:In NumberOfControlPoints:0 CONNECTION -Box09:Out:Box02:point -NumberOfControlPoints:0 -CONNECTION structuredpoints:structuredpoints:Box10:In NumberOfControlPoints:0 CONNECTION -Box10:Out:Box02:structuredpoints -NumberOfControlPoints:0 -CONNECTION -Box09:Out:Box07:point -NumberOfControlPoints:0 -CONNECTION -Box10:Out:Box07:structuredpoints -NumberOfControlPoints:0 -CONNECTION -Box10:Out:Box08:structuredpoints -NumberOfControlPoints:0 -CONNECTION -Box09:Out:Box08:point -NumberOfControlPoints:0 -CONNECTION -wxvtkbaseview1_2D:wxvtkbaseview1_2D:Box06:wxVtkBaseView -NumberOfControlPoints:0 -CONNECTION -wxvtkbaseview2_2D:wxvtkbaseview2_2D:Box11:wxVtkBaseView -NumberOfControlPoints:0 -CONNECTION Box11:vtkRenderer:Box04:Renderer NumberOfControlPoints:0 CONNECTION -Box07:outvtkdataset:Box04:In -NumberOfControlPoints:0 -CONNECTION Box11:Direction:Box04:Orientation NumberOfControlPoints:0 CONNECTION Box12:vtkRenderer:Box05:Renderer NumberOfControlPoints:0 CONNECTION -Box08:outvtkdataset:Box05:In -NumberOfControlPoints:0 -CONNECTION Box12:Direction:Box05:Orientation NumberOfControlPoints:0 CONNECTION @@ -316,15 +256,6 @@ CONNECTION Box01:Type:Box05:TypeForm NumberOfControlPoints:0 CONNECTION -Box01:active:Box05:Active -NumberOfControlPoints:0 -CONNECTION -Box11:Direction:Box07:orientation -NumberOfControlPoints:0 -CONNECTION -Box12:Direction:Box08:orientation -NumberOfControlPoints:0 -CONNECTION Box13:outvtkdataset:Box14:In NumberOfControlPoints:0 CONNECTION @@ -376,15 +307,6 @@ CONNECTION boxExecute:boxExecute:Box21:In NumberOfControlPoints:0 CONNECTION -Box21:Out:Box02:boxexecute -NumberOfControlPoints:0 -CONNECTION -Box21:Out:Box07:boxexecute -NumberOfControlPoints:0 -CONNECTION -Box21:Out:Box08:boxexecute -NumberOfControlPoints:0 -CONNECTION Box21:Out:Box13:boxexecute NumberOfControlPoints:0 CONNECTION @@ -421,15 +343,6 @@ CONNECTION Box01:ScaleFactor:Box16:ScaleFactor NumberOfControlPoints:0 CONNECTION -Box01:active:Box14:Active -NumberOfControlPoints:0 -CONNECTION -Box01:active:Box15:Active -NumberOfControlPoints:0 -CONNECTION -Box01:active:Box16:Active -NumberOfControlPoints:0 -CONNECTION Box21:Out:Box24:In1 NumberOfControlPoints:0 CONNECTION @@ -454,15 +367,6 @@ 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 @@ -495,4 +399,37 @@ NumberOfControlPoints:0 CONNECTION Box01:boxChange:Box27:BoxExecute NumberOfControlPoints:0 +CONNECTION +Box01:activeXZ:Box03:Active +NumberOfControlPoints:0 +CONNECTION +Box01:activeYZ:Box04:Active +NumberOfControlPoints:0 +CONNECTION +Box01:activeXY:Box05:Active +NumberOfControlPoints:0 +CONNECTION +wxvtkbaseview2_2D:wxvtkbaseview2_2D:Box06:wxVtkBaseView +NumberOfControlPoints:0 +CONNECTION +wxvtkbaseview1_2D:wxvtkbaseview1_2D:Box11:wxVtkBaseView +NumberOfControlPoints:0 +CONNECTION +Box17:outvtkdataset:Box03:In +NumberOfControlPoints:0 +CONNECTION +Box13:outvtkdataset:Box04:In +NumberOfControlPoints:0 +CONNECTION +Box18:outvtkdataset:Box05:In +NumberOfControlPoints:0 +CONNECTION +Box01:active3DYZ:Box14:Active +NumberOfControlPoints:0 +CONNECTION +Box01:active3DXZ:Box15:Active +NumberOfControlPoints:0 +CONNECTION +Box01:active3DXY:Box16:Active +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 77b17f8..f4faa57 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane_Widget.bbs +++ b/bbtk_creaVtk_PKG/bbs/boxes/VectorVisuPlane_Widget.bbs @@ -19,8 +19,6 @@ category "" new creaVtk:VectorsVisu_Interface Box01 -new creaVtk:VectorVisuPlane Box02 - new creaVtk:VectorsVisu Box03 new creaVtk:VectorsVisu Box04 @@ -29,10 +27,6 @@ new creaVtk:VectorsVisu Box05 new creaMaracasVisu:wxVtkBaseView_Info Box06 -new creaVtk:VectorVisuPlane Box07 - -new creaVtk:VectorVisuPlane Box08 - new std:MagicBox Box09 new std:MagicBox Box10 @@ -79,35 +73,20 @@ new vtk:UpdateRender Box27 connect Box06.vtkRenderer Box03.Renderer -connect Box06.Direction Box02.orientation -connect Box02.outvtkdataset Box03.In connect Box01.Opacity Box03.Opacity connect Box01.ScaleFactor Box03.ScaleFactor connect Box01.Type Box03.TypeForm -connect Box01.active Box03.Active connect Box01.Opacity Box04.Opacity connect Box01.ScaleFactor Box04.ScaleFactor connect Box01.Type Box04.TypeForm -connect Box01.active Box04.Active connect Box06.Direction Box03.Orientation -connect Box09.Out Box02.point -connect Box10.Out Box02.structuredpoints -connect Box09.Out Box07.point -connect Box10.Out Box07.structuredpoints -connect Box10.Out Box08.structuredpoints -connect Box09.Out Box08.point connect Box11.vtkRenderer Box04.Renderer -connect Box07.outvtkdataset Box04.In connect Box11.Direction Box04.Orientation connect Box12.vtkRenderer Box05.Renderer -connect Box08.outvtkdataset Box05.In connect Box12.Direction Box05.Orientation connect Box01.Opacity Box05.Opacity connect Box01.ScaleFactor Box05.ScaleFactor connect Box01.Type Box05.TypeForm -connect Box01.active Box05.Active -connect Box11.Direction Box07.orientation -connect Box12.Direction Box08.orientation connect Box13.outvtkdataset Box14.In connect Box17.outvtkdataset Box15.In connect Box18.outvtkdataset Box16.In @@ -123,9 +102,6 @@ connect Box09.Out Box18.point connect Box20.Direction Box14.Orientation connect Box20.Direction Box15.Orientation connect Box20.Direction Box16.Orientation -connect Box21.Out Box02.boxexecute -connect Box21.Out Box07.boxexecute -connect Box21.Out Box08.boxexecute connect Box21.Out Box13.boxexecute connect Box21.Out Box17.boxexecute connect Box21.Out Box18.boxexecute @@ -138,9 +114,6 @@ connect Box01.Opacity Box16.Opacity connect Box01.ScaleFactor Box14.ScaleFactor connect Box01.ScaleFactor Box15.ScaleFactor connect Box01.ScaleFactor Box16.ScaleFactor -connect Box01.active Box14.Active -connect Box01.active Box15.Active -connect Box01.active Box16.Active connect Box21.Out Box24.In1 connect Box01.boxChange Box24.In2 connect Box24.BoxChange Box03.BoxExecute @@ -149,9 +122,6 @@ 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 @@ -163,15 +133,24 @@ connect Box20.vtkRenderer Box27.Renderer connect Box01.boxChange Box25.BoxExecute connect Box01.boxChange Box26.BoxExecute connect Box01.boxChange Box27.BoxExecute +connect Box01.activeXZ Box03.Active +connect Box01.activeYZ Box04.Active +connect Box01.activeXY Box05.Active +connect Box17.outvtkdataset Box03.In +connect Box13.outvtkdataset Box04.In +connect Box18.outvtkdataset Box05.In +connect Box01.active3DYZ Box14.Active +connect Box01.active3DXZ Box15.Active +connect Box01.active3DXY Box16.Active # Complex input ports input Point Box09.In " " input structuredpoints Box10.In " " -input wxvtkbaseview1_2D Box06.wxVtkBaseView " " -input wxvtkbaseview2_2D Box11.wxVtkBaseView " " input wxvtkbaseview3_2D Box12.wxVtkBaseView " " input vtkbaseview_3D Box20.wxVtkBaseView " " input boxExecute Box21.In " " +input wxvtkbaseview2_2D Box06.wxVtkBaseView " " +input wxvtkbaseview1_2D Box11.wxVtkBaseView " " # Complex output ports output outwidget Box01.widget " " diff --git a/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Interface.bbg b/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Interface.bbg index ed237d3..6b5c6f3 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:7 +COMPLEXOUTPUTS:13 COMPLEX_PORT Opacity 42.538344:-69.870059:-900.000000 @@ -21,7 +21,7 @@ widget FIN_COMPLEX_PORT COMPLEX_PORT active --68.012716:-75.136391:-900.000000 +-309.918405:-54.479031:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT ScaleFactor @@ -39,21 +39,45 @@ COMPLEX_PORT Resolution 135.040901:-72.809438:-900.000000 FIN_COMPLEX_PORT +COMPLEX_PORT +activeYZ +-246.741332:-62.122408:-900.000000 +FIN_COMPLEX_PORT +COMPLEX_PORT +activeXZ +-234.757315:-62.498404:-900.000000 +FIN_COMPLEX_PORT +COMPLEX_PORT +activeXY +-258.301271:-62.762468:-900.000000 +FIN_COMPLEX_PORT +COMPLEX_PORT +active3DXY +-188.230914:-63.118705:-900.000000 +FIN_COMPLEX_PORT +COMPLEX_PORT +active3DYZ +-177.192216:-63.118705:-900.000000 +FIN_COMPLEX_PORT +COMPLEX_PORT +active3DXZ +-166.383492:-61.968841:-900.000000 +FIN_COMPLEX_PORT COMPLEXINPUTS:0 -BOXES:11 +BOXES:23 BOX wx:CheckBox:Box00 ISEXEC:FALSE --147.328682:86.047280:-900.000000 --111.003682:76.047280:-900.000000 +-319.671398:229.215607:-900.000000 +-283.346398:219.215607:-900.000000 PORT -Title:"Active Vector" +Title:"active" FIN_BOX BOX wx:Slider:Box01 ISEXEC:FALSE -2.231532:70.499689:-900.000000 -29.343468:60.499689:-900.000000 +49.168468:60.499689:-900.000000 PORT In:"100" PORT @@ -78,16 +102,16 @@ FIN_BOX BOX wx:LayoutLine:Box03 ISEXEC:FALSE --87.147924:15.346371:-900.000000 --29.587924:5.346371:-900.000000 +-99.083516:16.933184:-900.000000 +-41.523516:6.933184:-900.000000 PORT -WinTitle:"Vector field" +Orientation:"H" FIN_BOX BOX wx:LayoutTab:Box04 ISEXEC:FALSE --83.037560:-20.291032:-900.000000 --25.477560:-30.291032:-900.000000 +-88.602903:-23.326674:-900.000000 +-31.042903:-33.326674:-900.000000 FIN_BOX BOX std:MultipleInputs:Box05 @@ -101,7 +125,7 @@ BOX wx:Slider:Box06 ISEXEC:FALSE 62.595736:71.111066:-900.000000 -94.170736:61.111066:-900.000000 +113.995736:61.111066:-900.000000 PORT ChangeResolution:"true" PORT @@ -128,8 +152,8 @@ FIN_BOX BOX wx:ComboBox:Box08 ISEXEC:FALSE --72.891216:88.085161:-900.000000 --35.716216:78.085161:-900.000000 +-27.823446:107.084383:-900.000000 +14.336554:97.084383:-900.000000 PORT In:"Line Arrow" PORT @@ -138,12 +162,10 @@ FIN_BOX BOX wx:LayoutLine:Box09 ISEXEC:FALSE --107.033386:57.091195:-900.000000 --49.473386:47.091195:-900.000000 +-119.658896:-3.230688:-900.000000 +-62.098896:-13.230688:-900.000000 PORT -Orientation:"H" -PORT -WinTitle:"Vector field" +WinTitle:"Vector Field" FIN_BOX BOX wx:Slider:Box10 @@ -165,10 +187,107 @@ ReactiveOnTrack:"true" PORT Title:"Resolution" FIN_BOX -CONNECTIONS:20 -CONNECTION -Box01:Widget:Box03:Widget2 -NumberOfControlPoints:0 +BOX +wx:CheckBox:Box11 +ISEXEC:FALSE +-274.939074:200.152619:-900.000000 +-238.614074:190.152619:-900.000000 +PORT +Title:"2DYZ" +FIN_BOX +BOX +wx:CheckBox:Box12 +ISEXEC:FALSE +-251.538590:186.328512:-900.000000 +-215.213590:176.328512:-900.000000 +PORT +Title:"2DXZ" +FIN_BOX +BOX +wx:LayoutLine:Box13 +ISEXEC:FALSE +-236.454901:95.950415:-900.000000 +-178.894901:85.950415:-900.000000 +PORT +Orientation:"H" +PORT +WinTitle:"Vector field" +FIN_BOX +BOX +wx:CheckBox:Box14 +ISEXEC:FALSE +-301.923823:215.684098:-900.000000 +-265.598823:205.684098:-900.000000 +PORT +Title:"2DXY" +FIN_BOX +BOX +wx:CheckBox:Box17 +ISEXEC:FALSE +-152.599075:223.125680:-900.000000 +-116.274075:213.125680:-900.000000 +PORT +Title:"3DYZ" +FIN_BOX +BOX +wx:CheckBox:Box18 +ISEXEC:FALSE +-173.374556:235.667511:-900.000000 +-137.049556:225.667511:-900.000000 +PORT +Title:"3DXY" +FIN_BOX +BOX +wx:CheckBox:Box19 +ISEXEC:FALSE +-131.498319:209.301572:-900.000000 +-95.173319:199.301572:-900.000000 +PORT +Title:"3DXZ" +FIN_BOX +BOX +wx:LayoutLine:Box20 +ISEXEC:FALSE +-117.812264:98.010113:-900.000000 +-60.252264:88.010113:-900.000000 +PORT +Orientation:"H" +PORT +WinTitle:"Vector field" +FIN_BOX +BOX +wx:LayoutLine:Box23 +ISEXEC:FALSE +-213.120660:66.634174:-900.000000 +-155.560660:56.634174:-900.000000 +PORT +Orientation:"H" +FIN_BOX +BOX +std:MultipleInputs:Box24 +ISEXEC:FALSE +-88.447185:149.525365:-900.000000 +-48.747185:139.525365:-900.000000 +PORT +BoxProcessMode:"Reactive" +FIN_BOX +BOX +std:MultipleInputs:Box25 +ISEXEC:FALSE +-215.973743:125.671630:-900.000000 +-176.273743:115.671630:-900.000000 +PORT +BoxProcessMode:"Reactive" +FIN_BOX +BOX +wx:LayoutLine:Box26 +ISEXEC:FALSE +-90.551971:51.679193:-900.000000 +-32.991971:41.679193:-900.000000 +PORT +Orientation:"H" +FIN_BOX +CONNECTIONS:45 CONNECTION Box01:Out:Box02:In1 NumberOfControlPoints:0 @@ -176,54 +295,132 @@ CONNECTION Box02:Out:Opacity:Opacity NumberOfControlPoints:0 CONNECTION -Box03:Widget:Box04:Widget1 +Box04:Widget:widget:widget NumberOfControlPoints:0 CONNECTION -Box04:Widget:widget:widget +Box00:Out:active:active NumberOfControlPoints:0 CONNECTION -Box01:BoxChange:Box05:In2 +Box06:Widget:Box03:Widget3 NumberOfControlPoints:0 CONNECTION -Box00:BoxChange:Box05:In1 +Box06:Out:Box07:In1 NumberOfControlPoints:0 CONNECTION -Box00:Out:active:active +Box07:Out:ScaleFactor:ScaleFactor NumberOfControlPoints:0 CONNECTION -Box06:Widget:Box03:Widget3 +Box05:BoxChange:boxChange:boxChange NumberOfControlPoints:0 CONNECTION -Box06:BoxChange:Box05:In3 +Box08:Out:Type:Type NumberOfControlPoints:0 CONNECTION -Box06:Out:Box07:In1 +Box10:Widget:Box03:Widget4 NumberOfControlPoints:0 CONNECTION -Box07:Out:ScaleFactor:ScaleFactor +Box10:Out:Resolution:Resolution NumberOfControlPoints:0 CONNECTION -Box05:BoxChange:boxChange:boxChange +Box08:BoxChange:Box05:In2 NumberOfControlPoints:0 CONNECTION -Box08:Widget:Box09:Widget2 +Box01:BoxChange:Box05:In3 NumberOfControlPoints:0 CONNECTION -Box00:Widget:Box09:Widget1 +Box06:BoxChange:Box05:In4 NumberOfControlPoints:0 CONNECTION -Box09:Widget:Box03:Widget1 +Box10:BoxChange:Box05:In5 NumberOfControlPoints:0 CONNECTION -Box08:Out:Type:Type +Box11:Widget:Box13:Widget2 NumberOfControlPoints:0 CONNECTION -Box10:Widget:Box03:Widget4 +Box12:Widget:Box13:Widget3 NumberOfControlPoints:0 CONNECTION -Box10:BoxChange:Box05:In4 +Box11:Out:activeYZ:activeYZ NumberOfControlPoints:0 CONNECTION -Box10:Out:Resolution:Resolution +Box12:Out:activeXZ:activeXZ +NumberOfControlPoints:0 +CONNECTION +Box00:Widget:Box13:Widget5 +NumberOfControlPoints:0 +CONNECTION +Box14:Widget:Box13:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box14:Out:activeXY:activeXY +NumberOfControlPoints:0 +CONNECTION +Box18:Out:active3DXY:active3DXY +NumberOfControlPoints:0 +CONNECTION +Box17:Out:active3DYZ:active3DYZ +NumberOfControlPoints:0 +CONNECTION +Box19:Out:active3DXZ:active3DXZ +NumberOfControlPoints:0 +CONNECTION +Box18:Widget:Box20:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box17:Widget:Box20:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box19:Widget:Box20:Widget3 +NumberOfControlPoints:0 +CONNECTION +Box13:Widget:Box23:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box20:Widget:Box23:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box23:Widget:Box09:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box18:BoxChange:Box24:In1 +NumberOfControlPoints:0 +CONNECTION +Box17:BoxChange:Box24:In2 +NumberOfControlPoints:0 +CONNECTION +Box19:BoxChange:Box24:In3 +NumberOfControlPoints:0 +CONNECTION +Box00:BoxChange:Box25:In1 +NumberOfControlPoints:0 +CONNECTION +Box14:BoxChange:Box25:In2 +NumberOfControlPoints:0 +CONNECTION +Box11:BoxChange:Box25:In3 +NumberOfControlPoints:0 +CONNECTION +Box12:BoxChange:Box25:In4 +NumberOfControlPoints:0 +CONNECTION +Box24:BoxChange:Box05:In8 +NumberOfControlPoints:0 +CONNECTION +Box25:BoxChange:Box05:In7 +NumberOfControlPoints:0 +CONNECTION +Box08:Widget:Box26:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box01:Widget:Box26:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box26:Widget:Box09:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box03:Widget:Box09:Widget3 +NumberOfControlPoints:0 +CONNECTION +Box09:Widget:Box04:Widget1 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 97821ba..4b734cb 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Interface.bbs +++ b/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Interface.bbs @@ -16,7 +16,7 @@ description "Description ??" category "" new wx:CheckBox Box00 - set Box00.Title "Active Vector" + set Box00.Title "active" new wx:Slider Box01 set Box01.In "100" @@ -30,7 +30,7 @@ new std:Div Box02 set Box02.In2 "100.0" new wx:LayoutLine Box03 - set Box03.WinTitle "Vector field" + set Box03.Orientation "H" new wx:LayoutTab Box04 @@ -54,8 +54,7 @@ new wx:ComboBox Box08 set Box08.WinHeight "50" new wx:LayoutLine Box09 - set Box09.Orientation "H" - set Box09.WinTitle "Vector field" + set Box09.WinTitle "Vector Field" new wx:Slider Box10 set Box10.ChangeResolution "true" @@ -66,20 +65,77 @@ new wx:Slider Box10 set Box10.ReactiveOnTrack "true" set Box10.Title "Resolution" +new wx:CheckBox Box11 + set Box11.Title "2DYZ" + +new wx:CheckBox Box12 + set Box12.Title "2DXZ" + +new wx:LayoutLine Box13 + set Box13.Orientation "H" + set Box13.WinTitle "Vector field" + +new wx:CheckBox Box14 + set Box14.Title "2DXY" + +new wx:CheckBox Box17 + set Box17.Title "3DYZ" + +new wx:CheckBox Box18 + set Box18.Title "3DXY" + +new wx:CheckBox Box19 + set Box19.Title "3DXZ" + +new wx:LayoutLine Box20 + set Box20.Orientation "H" + set Box20.WinTitle "Vector field" + +new wx:LayoutLine Box23 + set Box23.Orientation "H" + +new std:MultipleInputs Box24 + set Box24.BoxProcessMode "Reactive" + +new std:MultipleInputs Box25 + set Box25.BoxProcessMode "Reactive" + +new wx:LayoutLine Box26 + set Box26.Orientation "H" + -connect Box01.Widget Box03.Widget2 connect Box01.Out Box02.In1 -connect Box03.Widget Box04.Widget1 -connect Box01.BoxChange Box05.In2 -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 connect Box10.Widget Box03.Widget4 -connect Box10.BoxChange Box05.In4 +connect Box08.BoxChange Box05.In2 +connect Box01.BoxChange Box05.In3 +connect Box06.BoxChange Box05.In4 +connect Box10.BoxChange Box05.In5 +connect Box11.Widget Box13.Widget2 +connect Box12.Widget Box13.Widget3 +connect Box00.Widget Box13.Widget5 +connect Box14.Widget Box13.Widget1 +connect Box18.Widget Box20.Widget1 +connect Box17.Widget Box20.Widget2 +connect Box19.Widget Box20.Widget3 +connect Box13.Widget Box23.Widget1 +connect Box20.Widget Box23.Widget2 +connect Box23.Widget Box09.Widget1 +connect Box18.BoxChange Box24.In1 +connect Box17.BoxChange Box24.In2 +connect Box19.BoxChange Box24.In3 +connect Box00.BoxChange Box25.In1 +connect Box14.BoxChange Box25.In2 +connect Box11.BoxChange Box25.In3 +connect Box12.BoxChange Box25.In4 +connect Box24.BoxChange Box05.In8 +connect Box25.BoxChange Box05.In7 +connect Box08.Widget Box26.Widget1 +connect Box01.Widget Box26.Widget2 +connect Box26.Widget Box09.Widget2 +connect Box03.Widget Box09.Widget3 +connect Box09.Widget Box04.Widget1 # Complex input ports @@ -91,6 +147,12 @@ output ScaleFactor Box07.Out " " output boxChange Box05.BoxChange " " output Type Box08.Out " " output Resolution Box10.Out " " +output activeYZ Box11.Out " " +output activeXZ Box12.Out " " +output activeXY Box14.Out " " +output active3DXY Box18.Out " " +output active3DYZ Box17.Out " " +output active3DXZ Box19.Out " " endefine diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneSource.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneSource.cxx index a5b518e..aa0b1f8 100644 --- a/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneSource.cxx +++ b/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneSource.cxx @@ -16,32 +16,70 @@ BBTK_BLACK_BOX_IMPLEMENTATION(PlaneSource,bbtk::AtomicBlackBox); //===== void PlaneSource::Process() { - vtkPlaneSource *plane; - plane = vtkPlaneSource::New(); - double p0[3]; - p0[0]=0; - p0[1]=0; - p0[2]=0; + double c[3]; + double p0[3]; double p1[3]; - p1[0]=0; - p1[1]=100; - p1[2]=0; - double p2[3]; - p2[0]=0; - p2[1]=0; - p2[2]=100; - double c[3]; - c[0]=bbGetInputCenter()[0]; - c[1]=bbGetInputCenter()[1]; - c[2]=bbGetInputCenter()[2]; + double p2[3]; + vtkPlaneSource *plane; + plane = vtkPlaneSource::New(); + c[0] = bbGetInputCenter()[0]; + c[1] = bbGetInputCenter()[1]; + c[2] = bbGetInputCenter()[2]; + p0[0] = 0; + p0[1] = 0; + p0[2] = 0; + + // xy + if ((bbGetInputNormal()[0]==0) && (bbGetInputNormal()[1]==0) && (bbGetInputNormal()[2]==1) ) + { + p1[0] = 200; + p1[1] = 0; + p1[2] = 0; + p2[0] = 0; + p2[1] = 200; + p2[2] = 0; + } + + // xz + if ((bbGetInputNormal()[0]==0) && (bbGetInputNormal()[1]==1) && (bbGetInputNormal()[2]==0) ) + { + p1[0] = 200; + p1[1] = 0; + p1[2] = 0; + p2[0] = 0; + p2[1] = 0; + p2[2] = 200; + } + + // yz + if ((bbGetInputNormal()[0]==1) && (bbGetInputNormal()[1]==0) && (bbGetInputNormal()[2]==0) ) + { + p1[0] = 0; + p1[1] = 200; + p1[2] = 0; + p2[0] = 0; + p2[1] = 0; + p2[2] = 200; + } + + + +/* + p1[0] = 100; + p1[1] = 0; + p1[2] = 0; + p2[0] = 0; + p2[1] = 100; + p2[2] = 0; +*/ plane->SetResolution( bbGetInputXResolution(), bbGetInputYResolution() ); plane->SetOrigin( p0 ); plane->SetPoint1( p1 ); plane->SetPoint2( p2 ); - plane->Update( ); +// plane->Update( ); plane->SetNormal( bbGetInputNormal()[0], bbGetInputNormal()[1], bbGetInputNormal()[2] ); - plane->Update( ); +// plane->Update( ); plane->SetCenter( c ); plane->Update( ); bbSetOutputPlane( (vtkDataSet*)plane ); diff --git a/lib/creaVtk/vtkVectorsVisu.cpp b/lib/creaVtk/vtkVectorsVisu.cpp index ff49f55..2b4128d 100644 --- a/lib/creaVtk/vtkVectorsVisu.cpp +++ b/lib/creaVtk/vtkVectorsVisu.cpp @@ -73,7 +73,8 @@ void vtkVectorsVisu::Process() } // _orientation if ((GetOrientation()>=0) && (GetOrientation()<=2)) { - _vtkglyph = vtkGlyph2D::New(); + _vtkglyph = vtkGlyph3D::New(); +// _vtkglyph = vtkGlyph2D::New(); } // _orientation } // _vtkglyph NULL @@ -146,22 +147,29 @@ vtkPointData *data = _vtkglyph->GetOutput()->GetPointData(); #endif // Orientation -1 3D OK - // Orientation 2 2D xy OK - // Orientation 0 2D yz + // Orientation 0 2D yz if (GetOrientation()==0) { _trans->Identity(); _trans->Translate(900,0,0); - _trans->RotateWXYZ(-90,0,1,0); _actor->SetUserTransform(_trans); } + // Orientation 1 2D xz if (GetOrientation()==1) { _trans->Identity(); - _trans->RotateWXYZ(90,1,0,0); + _trans->Translate(0,-900,0); + _actor->SetUserTransform(_trans); + } + + // Orientation 2 2D xy + if (GetOrientation()==2) + { + _trans->Identity(); + _trans->Translate(0,0,-900); _actor->SetUserTransform(_trans); } -- 2.47.1