2345 creaMaracasVisu Feature Test Phase Normal Ruler01XY

diff --git a/bbtk/bbs/appli/exampleManualContour.bbg b/bbtk/bbs/appli/exampleManualContour.bbg
index 24d8e2dbe4b831334dd60ca062ee060e201afda6..5c72c2aea705d010a02bf4c5f9c4bb562146a95e 100644 (file)
--- a/bbtk/bbs/appli/exampleManualContour.bbg
+++ b/bbtk/bbs/appli/exampleManualContour.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /home/davila/Creatis/All-Vtk_5-10-1/creatools_source/creaMaracasVisu/bbtk/bbs/appli/exampleManualContour.bbg
+# - /home/davila/Creatis/creaTools/creatools_source/creaMaracasVisu/bbtk/bbs/appli/exampleManualContour.bbg
 # ----------------------------------
 
 APP_START
@@ -21,8 +21,6 @@ creaMaracasVisu:ViewerNV:Box01
 ISEXEC:FALSE
 1.811309:39.787619:-900.000000
 62.451309:29.787619:-900.000000
-PORT
-nTypeView:"5 1 3 0"
 FIN_BOX
 BOX
 wx:LayoutSplit:Box05
@@ -36,7 +34,7 @@ BOX
 wx:LayoutTab:Box06
 ISEXEC:FALSE
 17.460900:-20.765927:-900.000000
-75.020900:-30.765927:-900.000000
+63.035900:-30.765927:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ContourControlPoints_Widget:Box08

diff --git a/bbtk/bbs/appli/exampleManualContour.bbs b/bbtk/bbs/appli/exampleManualContour.bbs
index 7d155388163988535d7cc24a7c08606242276b07..1379228e51fb9d2b0908ec051f43aeeb46551ade 100644 (file)
--- a/bbtk/bbs/appli/exampleManualContour.bbs
+++ b/bbtk/bbs/appli/exampleManualContour.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script
-# - /home/davila/Creatis/All-Vtk_5-10-1/creatools_source/creaMaracasVisu/bbtk/bbs/appli/exampleManualContour.bbs
+# - /home/davila/Creatis/creaTools/creatools_source/creaMaracasVisu/bbtk/bbs/appli/exampleManualContour.bbs
 # ----------------------------------
 
 # BBTK GEditor Script
@@ -20,7 +20,6 @@ category "<VOID>"
 new LoadHola Box00
 
 new ViewerNV Box01
-  set Box01.nTypeView "5 1 3 0"
 
 new LayoutSplit Box05
   set Box05.Orientation "H"

diff --git a/bbtk/bbs/boxes/Ruler01_Interface.bbg b/bbtk/bbs/boxes/Ruler01_Interface.bbg
index 89f351e0f1e4897158f0bc71a8fc28fcb1ee9961..85673f4faa19aaad19d3dcb2589e9773708c881a 100644 (file)
--- a/bbtk/bbs/boxes/Ruler01_Interface.bbg
+++ b/bbtk/bbs/boxes/Ruler01_Interface.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /home/davila/Creatis/All/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Ruler01_Interface.bbg
+# - /home/davila/Creatis/creaTools/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Ruler01_Interface.bbg
 # ----------------------------------
 
 APP_START
@@ -41,7 +41,7 @@ BOX
 wx:Slider:Box00
 ISEXEC:FALSE
 9.977706:31.239710:-900.000000
-61.377706:21.239710:-900.000000
+42.752706:21.239710:-900.000000
 PORT
 In:"0"
 PORT
@@ -77,7 +77,7 @@ ISEXEC:FALSE
 89.039803:33.317157:-900.000000
 140.439803:23.317157:-900.000000
 PORT
-In:"50"
+In:"100"
 PORT
 Label:"true"
 PORT
@@ -103,11 +103,13 @@ ISEXEC:FALSE
 -64.999436:26.385556:-900.000000
 -13.599436:16.385556:-900.000000
 PORT
+ChangeResolution:"true"
+PORT
 In:"100"
 PORT
 Label:"true"
 PORT
-Max:"2000"
+Max:"20000"
 PORT
 Min:"0"
 PORT

diff --git a/bbtk/bbs/boxes/Ruler01_Interface.bbs b/bbtk/bbs/boxes/Ruler01_Interface.bbs
index 70c0424e3003e7c3ff75a8d137e15a1f1a28f084..b6297b80f283f67b2dbea6d598cd190205b5e2b0 100644 (file)
--- a/bbtk/bbs/boxes/Ruler01_Interface.bbs
+++ b/bbtk/bbs/boxes/Ruler01_Interface.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
-# - /home/davila/Creatis/All/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Ruler01_Interface.bbs
+# - /home/davila/Creatis/creaTools/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Ruler01_Interface.bbs
 # ----------------------------------
 
 include std
@@ -30,7 +30,7 @@ new MultipleInputs Box02
   set Box02.BoxProcessMode "Reactive"
 
 new Slider Box03
-  set Box03.In "50"
+  set Box03.In "100"
   set Box03.Label "true"
   set Box03.Max "100"
   set Box03.Min "0"
@@ -41,9 +41,10 @@ new Div Box04
   set Box04.In2 "100"
 
 new Slider Box05
+  set Box05.ChangeResolution "true"
   set Box05.In "100"
   set Box05.Label "true"
-  set Box05.Max "2000"
+  set Box05.Max "20000"
   set Box05.Min "0"
   set Box05.ReactiveOnTrack "true"
   set Box05.Title "Size"

diff --git a/bbtk/bbs/boxes/Ruler01_XY.bbg b/bbtk/bbs/boxes/Ruler01_XY.bbg
index 0e717588d208b6c5429cd1038dbca44363ae48dd..bc8304e2107b815905336923b975db76b2162388 100644 (file)
--- 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/All/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Ruler01_XY.bbg
+# - /home/davila/Creatis/creaTools/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Ruler01_XY.bbg
 # ----------------------------------
 
 APP_START
@@ -40,7 +40,7 @@ COMPLEX_PORT
 Angle
 -60.078956:86.721371:-900.000000
 FIN_COMPLEX_PORT
-BOXES:21
+BOXES:20
 BOX
 vtk:ImageVtkProperties:Box00
 ISEXEC:FALSE
@@ -64,8 +64,8 @@ FIN_BOX
 BOX
 vtk:Transform:Box02
 ISEXEC:FALSE
--118.900212:-39.685355:-900.000000
--73.325212:-49.685355:-900.000000
+-114.952874:-33.183857:-900.000000
+-69.377874:-43.183857:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings:Box03
@@ -76,16 +76,16 @@ FIN_BOX
 BOX
 vtk:Transform:Box04
 ISEXEC:FALSE
--73.068217:-65.633767:-900.000000
--27.493217:-75.633767:-900.000000
+-69.817468:-65.633767:-900.000000
+-24.242468:-75.633767:-900.000000
 PORT
 RotateWXYZ:"45 0 0 1"
 FIN_BOX
 BOX
 std:ConcatStrings:Box05
 ISEXEC:FALSE
--153.864979:-17.023134:-900.000000
--108.289979:-27.023134:-900.000000
+-155.025961:-9.360655:-900.000000
+-109.450961:-19.360655:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings:Box06
@@ -100,38 +100,12 @@ FIN_BOX
 BOX
 vtk:UpdateRender:Box07
 ISEXEC:FALSE
-69.391355:-91.210314:-900.000000
-114.966355:-101.210314:-900.000000
+75.853379:-88.400738:-900.000000
+121.428379:-98.400738:-900.000000
 PORT
 Active:"true"
 FIN_BOX
 BOX
-vtk:Text3D:Box08
-ISEXEC:FALSE
-27.238555:-175.915958:-900.000000
-60.013555:-185.915958:-900.000000
-PORT
-Colour:"0 1 1"
-PORT
-In:"10 um  (286p)"
-PORT
-X:"0"
-PORT
-Y:"0"
-PORT
-Z:"900"
-FIN_BOX
-BOX
-vtk:Transform:Box09
-ISEXEC:FALSE
--103.931255:-82.682944:-900.000000
--58.356255:-92.682944:-900.000000
-PORT
-RotateWXYZ:"180 1 0 0"
-PORT
-Scale:"2 2 2"
-FIN_BOX
-BOX
 std:Mul:Box10
 ISEXEC:FALSE
 -62.766821:-15.289162:-900.000000
@@ -142,22 +116,14 @@ FIN_BOX
 BOX
 std:ConcatStrings:Box11
 ISEXEC:FALSE
--201.715114:-68.164625:-900.000000
--156.140114:-78.164625:-900.000000
+-197.036469:-67.729991:-900.000000
+-151.461469:-77.729991:-900.000000
 PORT
 In1:"0"
 PORT
 In2:" "
 FIN_BOX
 BOX
-std:Mul:Box12
-ISEXEC:FALSE
--117.111253:-102.949175:-900.000000
--84.336253:-112.949175:-900.000000
-PORT
-In2:"0.12"
-FIN_BOX
-BOX
 std:GetVectorFloatElement:Box14
 ISEXEC:FALSE
 -190.632636:10.428616:-900.000000
@@ -171,7 +137,7 @@ ISEXEC:FALSE
 -196.583892:-12.972041:-900.000000
 -163.808892:-22.972041:-900.000000
 PORT
-In1:"0.01"
+In1:"1"
 FIN_BOX
 BOX
 std:ConcatStrings:Box16
@@ -179,9 +145,11 @@ ISEXEC:FALSE
 -253.832558:-68.066067:-900.000000
 -208.257558:-78.066067:-900.000000
 PORT
-In2:" um ("
+In2:"u  ("
 PORT
-In4:"p)"
+In4:"p) "
+PORT
+In5:" ang="
 FIN_BOX
 BOX
 std:Mul:Box17
@@ -215,6 +183,20 @@ ISEXEC:FALSE
 27.050629:-105.869439:-900.000000
 72.625629:-115.869439:-900.000000
 FIN_BOX
+BOX
+vtk:Text2D:Box22
+ISEXEC:FALSE
+37.826404:-181.780179:-900.000000
+70.601404:-191.780179:-900.000000
+PORT
+Color:"0 1 1"
+FIN_BOX
+BOX
+std:MagicBox:Box23
+ISEXEC:FALSE
+-50.113589:33.218740:-900.000000
+-4.538589:23.218740:-900.000000
+FIN_BOX
 CONNECTIONS:35
 CONNECTION
 Box03:Out:Box02:Translate
@@ -232,12 +214,6 @@ CONNECTION
 Box06:Out:Box04:RotateWXYZ
 NumberOfControlPoints:0
 CONNECTION
-Box04:Out:Box09:In
-NumberOfControlPoints:0
-CONNECTION
-Box09:Out:Box08:Transform
-NumberOfControlPoints:0
-CONNECTION
 Box04:Out:Box01:Transform
 NumberOfControlPoints:0
 CONNECTION
@@ -247,18 +223,12 @@ CONNECTION
 Box11:Out:Box01:lstPointX
 NumberOfControlPoints:0
 CONNECTION
-Box12:Out:Box08:X
-NumberOfControlPoints:0
-CONNECTION
 Box00:Spacing:Box14:In
 NumberOfControlPoints:0
 CONNECTION
 Box14:Out:Box15:In2
 NumberOfControlPoints:0
 CONNECTION
-Box16:Out:Box08:In
-NumberOfControlPoints:0
-CONNECTION
 Box15:Out:Box17:In2
 NumberOfControlPoints:0
 CONNECTION
@@ -268,9 +238,6 @@ CONNECTION
 Box17:Out:Box16:In3
 NumberOfControlPoints:0
 CONNECTION
-Box17:Out:Box12:In1
-NumberOfControlPoints:0
-CONNECTION
 Box18:Out:Box17:In1
 NumberOfControlPoints:0
 CONNECTION
@@ -280,9 +247,6 @@ CONNECTION
 Box19:Out:Box07:Renderer
 NumberOfControlPoints:0
 CONNECTION
-Box19:Out:Box08:Renderer
-NumberOfControlPoints:0
-CONNECTION
 Box19:Out:Box01:Renderer
 NumberOfControlPoints:0
 CONNECTION
@@ -298,15 +262,9 @@ CONNECTION
 vtkRenderer:vtkRenderer:Box19:In
 NumberOfControlPoints:0
 CONNECTION
-Angle:Angle:Box10:In1
-NumberOfControlPoints:0
-CONNECTION
 BoxExecuteRuler:BoxExecuteRuler:Box20:In
 NumberOfControlPoints:0
 CONNECTION
-Box20:BoxChange:Box08:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
 Box20:BoxChange:Box07:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
@@ -316,9 +274,33 @@ CONNECTION
 OpacityRuler:OpacityRuler:Box26:In
 NumberOfControlPoints:0
 CONNECTION
-Box26:Out:Box08:Opacity
+Box26:Out:Box01:Opacity
 NumberOfControlPoints:0
 CONNECTION
-Box26:Out:Box01:Opacity
+Box19:Out:Box22:Renderer
+NumberOfControlPoints:0
+CONNECTION
+Box16:Out:Box22:In
+NumberOfControlPoints:0
+CONNECTION
+Box26:Out:Box22:Opacity
+NumberOfControlPoints:0
+CONNECTION
+Box20:BoxChange:Box22:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box03:Out:Box22:Point
+NumberOfControlPoints:0
+CONNECTION
+Box05:Out:Box22:Spacing
+NumberOfControlPoints:0
+CONNECTION
+Angle:Angle:Box23:In
+NumberOfControlPoints:0
+CONNECTION
+Box23:Out:Box10:In1
+NumberOfControlPoints:0
+CONNECTION
+Box23:Out:Box16:In6
 NumberOfControlPoints:0
 APP_END

diff --git a/bbtk/bbs/boxes/Ruler01_XY.bbs b/bbtk/bbs/boxes/Ruler01_XY.bbs
index 88cb2089a1e1bf2eed3a2e58e2fa14949fd2f0da..c34de9daaf94e4a167475ed99c29289197af3ea6 100644 (file)
--- 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/All/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Ruler01_XY.bbs
+# - /home/davila/Creatis/creaTools/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Ruler01_XY.bbs
 # ----------------------------------
 
 include std
@@ -40,17 +40,6 @@ new ConcatStrings Box06
 new UpdateRender Box07
   set Box07.Active "true"
 
-new Text3D Box08
-  set Box08.Colour "0 1 1"
-  set Box08.In "10 um  (286p)"
-  set Box08.X "0"
-  set Box08.Y "0"
-  set Box08.Z "900"
-
-new Transform Box09
-  set Box09.RotateWXYZ "180 1 0 0"
-  set Box09.Scale "2 2 2"
-
 new Mul Box10
   set Box10.In2 "-1"
 
@@ -58,18 +47,16 @@ new ConcatStrings Box11
   set Box11.In1 "0"
   set Box11.In2 " "
 
-new Mul Box12
-  set Box12.In2 "0.12"
-
 new GetVectorFloatElement Box14
   set Box14.I "0"
 
 new Div Box15
-  set Box15.In1 "0.01"
+  set Box15.In1 "1"
 
 new ConcatStrings Box16
-  set Box16.In2 " um ("
-  set Box16.In4 "p)"
+  set Box16.In2 "u  ("
+  set Box16.In4 "p) "
+  set Box16.In5 " ang="
 
 new Mul Box17
 
@@ -82,44 +69,49 @@ new MagicBox Box20
 
 new MagicBox Box26
 
+new Text2D Box22
+  set Box22.Color "0 1 1"
+
+new MagicBox Box23
+
 
 connect Box03.Out Box02.Translate
 connect Box00.Spacing Box05.In1
 connect Box05.Out Box02.Scale
 connect Box02.Out Box04.In
 connect Box06.Out Box04.RotateWXYZ
-connect Box04.Out Box09.In
-connect Box09.Out Box08.Transform
 connect Box04.Out Box01.Transform
 connect Box10.Out Box06.In1
 connect Box11.Out Box01.lstPointX
-connect Box12.Out Box08.X
 connect Box00.Spacing Box14.In
 connect Box14.Out Box15.In2
-connect Box16.Out Box08.In
 connect Box15.Out Box17.In2
 connect Box17.Out Box11.In3
 connect Box17.Out Box16.In3
-connect Box17.Out Box12.In1
 connect Box18.Out Box17.In1
 connect Box18.Out Box16.In1
 connect Box19.Out Box07.Renderer
-connect Box19.Out Box08.Renderer
 connect Box19.Out Box01.Renderer
 connect Box20.BoxChange Box01.BoxExecute
-connect Box20.BoxChange Box08.BoxExecute
 connect Box20.BoxChange Box07.BoxExecute
-connect Box26.Out Box08.Opacity
 connect Box26.Out Box01.Opacity
+connect Box19.Out Box22.Renderer
+connect Box16.Out Box22.In
+connect Box26.Out Box22.Opacity
+connect Box20.BoxChange Box22.BoxExecute
+connect Box03.Out Box22.Point
+connect Box05.Out Box22.Spacing
+connect Box23.Out Box10.In1
+connect Box23.Out Box16.In6
 
 # Complex input ports
 input SizeReal Box18.In " "
 input Point Box03.In1 " "
 input vtkRenderer Box19.In " "
-input Angle Box10.In1 " "
 input BoxExecuteRuler Box20.In " "
 input Image Box00.In " "
 input OpacityRuler Box26.In " "
+input Angle Box23.In " "
 
 # Complex output ports