From 4a20dfd7a614edf4c969d7a77e7f97e35a81569f Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Mon, 21 Aug 2017 16:27:27 +0200 Subject: [PATCH] #3109 creaMaracasVisu Bug New Normal - branch vtk7itk4 compilation with vtk7 --- bbtk/bbs/boxes/Ruler01_XY.bbg | 56 +++++++++++++++++++++-------------- bbtk/bbs/boxes/Ruler01_XY.bbs | 45 +++++++++++++++------------- 2 files changed, 59 insertions(+), 42 deletions(-) diff --git a/bbtk/bbs/boxes/Ruler01_XY.bbg b/bbtk/bbs/boxes/Ruler01_XY.bbg index 3dfe5e6..a11941a 100644 --- a/bbtk/bbs/boxes/Ruler01_XY.bbg +++ b/bbtk/bbs/boxes/Ruler01_XY.bbg @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.4 BBG BlackBox Diagram file -# - /home/davila/Creatis/creaTools/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Ruler01_XY.bbg +# - /tmpEED/creaTools2/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Ruler01_XY.bbg # ---------------------------------- APP_START @@ -44,30 +44,30 @@ COMPLEX_PORT wxvtkbaseview 105.349495:86.477605:-900.000000 FIN_COMPLEX_PORT -BOXES:19 +BOXES:20 BOX vtk:ImageVtkProperties:Box00 ISEXEC:FALSE -162.336304:62.553214:-900.000000 --116.761304:52.553214:-900.000000 +-116.986304:52.553214:-900.000000 FIN_BOX BOX std:ConcatStrings:Box03 ISEXEC:FALSE -102.095937:63.057960:-900.000000 --56.520937:53.057960:-900.000000 +-62.370937:53.057960:-900.000000 FIN_BOX BOX std:ConcatStrings:Box05 ISEXEC:FALSE -153.040731:-106.636945:-900.000000 --107.465731:-116.636945:-900.000000 +-113.315731:-116.636945:-900.000000 FIN_BOX BOX vtk:UpdateRender:Box07 ISEXEC:FALSE 117.890633:-108.600457:-900.000000 -163.465633:-118.600457:-900.000000 +158.215633:-118.600457:-900.000000 PORT Active:"true" FIN_BOX @@ -75,7 +75,7 @@ BOX std:GetVectorFloatElement:Box14 ISEXEC:FALSE -206.131681:2.977152:-900.000000 --134.956681:-7.022848:-900.000000 +-157.406681:-7.022848:-900.000000 PORT I:"0" FIN_BOX @@ -83,7 +83,7 @@ BOX std:ConcatStrings:Box16 ISEXEC:FALSE 122.643426:-194.996817:-900.000000 -168.218426:-204.996817:-900.000000 +162.368426:-204.996817:-900.000000 PORT In2:"p (" PORT @@ -97,25 +97,25 @@ BOX std:Mul:Box17 ISEXEC:FALSE -224.173311:-46.164514:-900.000000 --191.398311:-56.164514:-900.000000 +-194.373311:-56.164514:-900.000000 FIN_BOX BOX std:MagicBox:Box18 ISEXEC:FALSE -226.697757:58.736032:-900.000000 --181.122757:48.736032:-900.000000 +-190.622757:48.736032:-900.000000 FIN_BOX BOX std:MagicBox:Box19 ISEXEC:FALSE -11.287735:-51.026800:-900.000000 -34.287265:-61.026800:-900.000000 +24.787265:-61.026800:-900.000000 FIN_BOX BOX std:MagicBox:Box20 ISEXEC:FALSE 112.639656:-54.547113:-900.000000 -158.214656:-64.547113:-900.000000 +148.714656:-64.547113:-900.000000 PORT BoxProcessMode:"Reactive" FIN_BOX @@ -123,13 +123,13 @@ BOX std:MagicBox:Box26 ISEXEC:FALSE 27.050629:-105.869439:-900.000000 -72.625629:-115.869439:-900.000000 +63.125629:-115.869439:-900.000000 FIN_BOX BOX vtk:Text2D:Box22 ISEXEC:FALSE 76.588028:-260.395303:-900.000000 -109.363028:-270.395303:-900.000000 +109.288028:-270.395303:-900.000000 PORT Color:"0 1 1" FIN_BOX @@ -137,13 +137,13 @@ BOX std:MagicBox:Box23 ISEXEC:FALSE -50.113589:33.218740:-900.000000 --4.538589:23.218740:-900.000000 +-14.038589:23.218740:-900.000000 FIN_BOX BOX creaMaracasVisu:DrawAxe3D:Box25 ISEXEC:FALSE -58.274452:-271.614376:-900.000000 --12.699452:-281.614376:-900.000000 +-20.574452:-281.614376:-900.000000 PORT Colour:"0 1 1" PORT @@ -157,7 +157,7 @@ BOX vtk:Transform:Box27 ISEXEC:FALSE -127.484254:-220.579013:-900.000000 --81.909254:-230.579013:-900.000000 +-91.909254:-230.579013:-900.000000 PORT RotateWXYZ:"45 0 0 1" FIN_BOX @@ -165,7 +165,7 @@ BOX creaMaracasVisu:ChInfo3Dto2DRuler:Box28 ISEXEC:FALSE -67.559786:-150.667179:-900.000000 --21.984786:-160.667179:-900.000000 +-23.234786:-160.667179:-900.000000 PORT Direction:"0" FIN_BOX @@ -173,21 +173,27 @@ BOX vtk:Transform:Box29 ISEXEC:FALSE -157.550533:-151.214722:-900.000000 --111.975533:-161.214722:-900.000000 +-121.975533:-161.214722:-900.000000 FIN_BOX BOX creaMaracasVisu:wxVtkBaseView_Info:Box30 ISEXEC:FALSE 87.518493:10.369667:-900.000000 -158.693493:0.369667:-900.000000 +133.668493:0.369667:-900.000000 FIN_BOX BOX std:MagicBox:Box31 ISEXEC:FALSE -34.175716:55.173035:-900.000000 -11.399284:45.173035:-900.000000 +1.899284:45.173035:-900.000000 FIN_BOX -CONNECTIONS:39 +BOX +wx:OutputText:Box32 +ISEXEC:FALSE +-220.624234:-223.740652:-900.000000 +-183.849234:-233.740652:-900.000000 +FIN_BOX +CONNECTIONS:41 CONNECTION Box00:Spacing:Box05:In1 NumberOfControlPoints:0 @@ -305,4 +311,10 @@ NumberOfControlPoints:0 CONNECTION Box14:Out:Box17:In2 NumberOfControlPoints:0 +CONNECTION +Box05:Out:Box32:In +NumberOfControlPoints:0 +CONNECTION +Box26:Out:Box32:BoxExecute +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Ruler01_XY.bbs b/bbtk/bbs/boxes/Ruler01_XY.bbs index 055a8bb..e112381 100644 --- a/bbtk/bbs/boxes/Ruler01_XY.bbs +++ b/bbtk/bbs/boxes/Ruler01_XY.bbs @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box) -# - /home/davila/Creatis/creaTools/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Ruler01_XY.bbs +# - /tmpEED/creaTools2/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Ruler01_XY.bbs # ---------------------------------- include std @@ -8,6 +8,7 @@ include itkvtk include vtk include std include creaMaracasVisu +include wx define Ruler01_XY creaMaracasVisu @@ -16,57 +17,59 @@ description "Description ??" category "" -new ImageVtkProperties Box00 +new vtk:ImageVtkProperties Box00 -new ConcatStrings Box03 +new std:ConcatStrings Box03 -new ConcatStrings Box05 +new std:ConcatStrings Box05 -new UpdateRender Box07 +new vtk:UpdateRender Box07 set Box07.Active "true" -new GetVectorFloatElement Box14 +new std:GetVectorFloatElement Box14 set Box14.I "0" -new ConcatStrings Box16 +new std:ConcatStrings Box16 set Box16.In2 "p (" set Box16.In4 "u) " set Box16.In5 " ang=" set Box16.In7 " ." -new Mul Box17 +new std:Mul Box17 -new MagicBox Box18 +new std:MagicBox Box18 -new MagicBox Box19 +new std:MagicBox Box19 -new MagicBox Box20 +new std:MagicBox Box20 set Box20.BoxProcessMode "Reactive" -new MagicBox Box26 +new std:MagicBox Box26 -new Text2D Box22 +new vtk:Text2D Box22 set Box22.Color "0 1 1" -new MagicBox Box23 +new std:MagicBox Box23 -new DrawAxe3D Box25 +new creaMaracasVisu:DrawAxe3D Box25 set Box25.Colour "0 1 1" set Box25.lstPointX "0 286.1111" set Box25.lstPointY "0 0" set Box25.lstPointZ "-900 -900" -new Transform Box27 +new vtk:Transform Box27 set Box27.RotateWXYZ "45 0 0 1" -new ChInfo3Dto2DRuler Box28 +new creaMaracasVisu:ChInfo3Dto2DRuler Box28 set Box28.Direction "0" -new Transform Box29 +new vtk:Transform Box29 -new wxVtkBaseView_Info Box30 +new creaMaracasVisu:wxVtkBaseView_Info Box30 -new MagicBox Box31 +new std:MagicBox Box31 + +new wx:OutputText Box32 connect Box00.Spacing Box05.In1 @@ -100,6 +103,8 @@ connect Box30.Direction Box28.Direction connect Box30.vtkRenderer Box19.In connect Box03.Out Box29.Translate connect Box14.Out Box17.In2 +connect Box05.Out Box32.In +connect Box26.Out Box32.BoxExecute # Complex input ports input SizeReal Box18.In " " -- 2.45.1