#3558 ShowNPoints_Tools::LoadCollection

diff --git a/bbtk/bbs/boxes/FreePlane.bbg b/bbtk/bbs/boxes/FreePlane.bbg
index eb1ea4b271823d039a3044ebf54d7ab405c7795f..4b0868c711d33ed49ded106ef3bc79f7d8437825 100644 (file)
--- a/bbtk/bbs/boxes/FreePlane.bbg
+++ b/bbtk/bbs/boxes/FreePlane.bbg
@@ -1,5 +1,5 @@
 # ----------------------------------
-# - BBTKGEditor v 1.5 BBG BlackBox Diagram file
+# - BBTKGEditor v 1.6 BBG BlackBox Diagram file
 # - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/FreePlane.bbg
 # ----------------------------------
 
@@ -7,10 +7,11 @@ APP_START
 CATEGORY:<VOID>
 DESCRIPTION:Description ??
 AUTHOR:Author ??
+EXPORTFORMAT:0
 COMPLEXBOX:TRUE
 COMPLEXBOXNAME:FreePlane
 PACKAGENAME:creaMaracasVisu
-COMPLEXOUTPUTS:4
+COMPLEXOUTPUTS:5
 COMPLEX_PORT
 widgetOut
 -62.602729:-39.249279:-900.000000
@@ -27,6 +28,10 @@ COMPLEX_PORT
 boxChange
 -109.488119:-40.220094:-900.000000
 FIN_COMPLEX_PORT
+COMPLEX_PORT
+box_TransformWidget2
+-30.291440:-37.573030:-900.000000
+FIN_COMPLEX_PORT
 COMPLEXINPUTS:5
 COMPLEX_PORT
 possiblePoint
@@ -225,7 +230,7 @@ ISEXEC:FALSE
 PORT
 Active:"true"
 FIN_BOX
-CONNECTIONS:46
+CONNECTIONS:47
 CONNECTION
 Box02:Out:Box04:In
 NumberOfControlPoints:0
@@ -364,4 +369,7 @@ NumberOfControlPoints:0
 CONNECTION
 Box16:BoxChange:boxChange:boxChange
 NumberOfControlPoints:0
+CONNECTION
+Box16:Box_TransformWidget2:box_TransformWidget2:box_TransformWidget2
+NumberOfControlPoints:0
 APP_END

diff --git a/bbtk/bbs/boxes/FreePlane.bbs b/bbtk/bbs/boxes/FreePlane.bbs
index ebc297d1b4c17a2be8be54e4cab39d6b287f70f1..0e8eb482782732f4625410a7103e4f5526b89d32 100644 (file)
--- a/bbtk/bbs/boxes/FreePlane.bbs
+++ b/bbtk/bbs/boxes/FreePlane.bbs
@@ -1,5 +1,5 @@
 # ----------------------------------
-# - BBTKGEditor v 1.5 BBS BlackBox Script (Complex Box)
+# - BBTKGEditor v 1.6 BBS BlackBox Script (Complex Box)
 # - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/FreePlane.bbs
 # ----------------------------------
 
@@ -137,6 +137,7 @@ output widgetOut Box01.Widget " "
 output transform Box16.Out " "
 output actualPoint Box08.Out " "
 output boxChange Box16.BoxChange " "
+output box_TransformWidget2 Box16.Box_TransformWidget2 " "
 
 
 endefine

diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbg
index b6b701594770539dcb1f8c529c78f6174157ce79..b34127e74d7cdc4a3e3051ab5a2a0cb1a2027d23 100644 (file)
--- a/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbg
+++ b/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbg
@@ -1,5 +1,5 @@
 # ----------------------------------
-# - BBTKGEditor v 1.5 BBG BlackBox Diagram file
+# - BBTKGEditor v 1.6 BBG BlackBox Diagram file
 # - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbg
 # ----------------------------------
 
@@ -7,6 +7,7 @@ APP_START
 CATEGORY:demo
 DESCRIPTION:Show N Points
 AUTHOR:info-dev@creatis.insa-lyon.fr
+EXPORTFORMAT:0
 COMPLEXBOX:TRUE
 COMPLEXBOXNAME:Mesh_tool_ApplyCut
 PACKAGENAME:creaMaracasVisu
@@ -77,7 +78,7 @@ BOX
 creaMaracasVisu:ShowNPoints:showNpoints
 ISEXEC:FALSE
 65.325513:91.657411:-900.000000
-102.165513:89.157411:-900.000000
+87.175513:89.157411:-900.000000
 PORT
 Radio:"6"
 PORT
@@ -106,12 +107,14 @@ PORT
 OpenClose:"true"
 PORT
 OpenClose2:"false"
+PORT
+Param:"1"
 FIN_BOX
 BOX
 wx:LayoutLine:Box08
 ISEXEC:FALSE
 -182.125107:-147.642582:-900.000000
--148.805107:-150.142582:-900.000000
+33.320000:-150.142582:-900.000000
 FIN_BOX
 BOX
 vtk:UpdateRender:Box11
@@ -125,7 +128,7 @@ BOX
 creaMaracasVisu:DrawAxisTree3D:Box30
 ISEXEC:FALSE
 66.011927:-0.645212:-900.000000
-94.051927:-3.145212:-900.000000
+88.191927:-3.145212:-900.000000
 PORT
 Colour:"0 0 1"
 PORT
@@ -151,7 +154,7 @@ BOX
 creaMaracasVisu:wxPopupMenu:Box57
 ISEXEC:FALSE
 -291.724262:77.620511:-900.000000
--269.659262:75.120511:-900.000000
+17.480000:75.120511:-900.000000
 PORT
 WithCtrlKey:"true"
 FIN_BOX
@@ -159,7 +162,7 @@ BOX
 std:AddStringToVector:Box58
 ISEXEC:FALSE
 -351.818140:103.053652:-900.000000
--327.298140:100.553652:-900.000000
+24.520000:100.553652:-900.000000
 PORT
 In0:"+  Add point"
 PORT
@@ -185,19 +188,19 @@ BOX
 creaMaracasVisu:ShowNPoints_Tools:Box60
 ISEXEC:FALSE
 -268.618686:51.736786:-900.000000
--246.183686:49.236786:-900.000000
+13.960000:49.236786:-900.000000
 FIN_BOX
 BOX
 vtk:ImageVtkProperties:Box68
 ISEXEC:FALSE
 -103.142894:115.643157:-900.000000
--80.607894:113.143157:-900.000000
+18.480000:113.143157:-900.000000
 FIN_BOX
 BOX
 std:VectorFilterDouble:Box70
 ISEXEC:FALSE
 38.732936:52.596353:-900.000000
-65.012936:50.096353:-900.000000
+61.162936:50.096353:-900.000000
 PORT
 Type:"11"
 FIN_BOX
@@ -205,7 +208,7 @@ BOX
 creaVtk:BooleanOperationPolyDataFilter:Box77
 ISEXEC:FALSE
 -89.099426:-23.521803:-900.000000
--65.369426:-26.021803:-900.000000
+12.200000:-26.021803:-900.000000
 PORT
 BoxProcessMode:"Manual"
 PORT
@@ -215,7 +218,7 @@ BOX
 wx:ComboBox:Box78
 ISEXEC:FALSE
 -153.877713:-5.775167:-900.000000
--127.597713:-8.275167:-900.000000
+26.280000:-8.275167:-900.000000
 PORT
 In:"Union Intersection Difference"
 FIN_BOX
@@ -223,7 +226,7 @@ BOX
 wx:LayoutLine:Box79
 ISEXEC:FALSE
 -140.715014:-113.385703:-900.000000
--107.395014:-115.885703:-900.000000
+33.320000:-115.885703:-900.000000
 PORT
 Orientation:"H"
 PORT
@@ -233,7 +236,7 @@ BOX
 wx:CommandButton:Box80
 ISEXEC:FALSE
 -107.184095:21.801731:-900.000000
--84.909095:19.301731:-900.000000
+21.000000:19.301731:-900.000000
 PORT
 Label:"Run"
 FIN_BOX
@@ -241,13 +244,13 @@ BOX
 std:MagicBox:Box66
 ISEXEC:FALSE
 -19.613231:111.536176:-900.000000
-1.986769:109.036176:-900.000000
+8.680000:109.036176:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box67
 ISEXEC:FALSE
 -62.444052:190.944708:-900.000000
--40.844052:188.444708:-900.000000
+8.680000:188.444708:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:PolyDataToActor_Widget:Box48
@@ -259,7 +262,7 @@ BOX
 vtk:vtkImageDataPointerRelay:Box35
 ISEXEC:FALSE
 -102.009442:190.570103:-900.000000
--78.799442:188.070103:-900.000000
+6.920000:188.070103:-900.000000
 FIN_BOX
 BOX
 wx:Slider:Box34
@@ -283,7 +286,7 @@ BOX
 std:Div:Box36
 ISEXEC:FALSE
 -190.788172:-9.261990:-900.000000
--169.863172:-11.761990:-900.000000
+8.680000:-11.761990:-900.000000
 PORT
 In2:"100"
 FIN_BOX
@@ -291,7 +294,7 @@ BOX
 creaMaracasVisu:PolyDataToActor_Widget:Box37
 ISEXEC:FALSE
 -67.388857:-39.476785:-900.000000
--44.368857:-41.976785:-900.000000
+21.000000:-41.976785:-900.000000
 PORT
 color:"0 1 1"
 PORT
@@ -301,7 +304,7 @@ BOX
 wx:LayoutLine:Box38
 ISEXEC:FALSE
 -189.365895:-112.130065:-900.000000
--156.045895:-114.630065:-900.000000
+33.320000:-114.630065:-900.000000
 PORT
 Orientation:"H"
 PORT
@@ -311,19 +314,19 @@ BOX
 wx:LayoutTab:Box39
 ISEXEC:FALSE
 -191.762476:-120.265948:-900.000000
--158.442476:-122.765948:-900.000000
+33.320000:-122.765948:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box40
 ISEXEC:FALSE
 -144.699301:-119.796173:-900.000000
--111.379301:-122.296173:-900.000000
+33.320000:-122.296173:-900.000000
 FIN_BOX
 BOX
 wx:CommandButton:Box42
 ISEXEC:FALSE
 -91.903796:13.441695:-900.000000
--69.628796:10.941695:-900.000000
+21.000000:10.941695:-900.000000
 PORT
 Label:"Apply  (Magenta->To Red)"
 FIN_BOX
@@ -331,7 +334,7 @@ BOX
 wx:CommandButton:Box43
 ISEXEC:FALSE
 -85.356515:8.083838:-900.000000
--63.081515:5.583838:-900.000000
+21.000000:5.583838:-900.000000
 PORT
 Label:"Reset Tool"
 FIN_BOX
@@ -349,7 +352,7 @@ BOX
 creaVtk:MeshManager_tool:Box45
 ISEXEC:FALSE
 -90.848443:-133.408000:-900.000000
--68.348443:-135.908000:-900.000000
+15.720000:-135.908000:-900.000000
 PORT
 Tool:"30"
 FIN_BOX
@@ -357,13 +360,13 @@ BOX
 std:MagicBox:Box46
 ISEXEC:FALSE
 -147.130406:191.398904:-900.000000
--125.530406:188.898904:-900.000000
+8.680000:188.898904:-900.000000
 FIN_BOX
 BOX
 wx:ComboBox:Box49
 ISEXEC:FALSE
 -188.003067:-15.129550:-900.000000
--161.723067:-17.629550:-900.000000
+26.280000:-17.629550:-900.000000
 PORT
 In:"25 50 100 150"
 PORT
@@ -385,13 +388,13 @@ BOX
 std:MultipleInputs:Box51
 ISEXEC:FALSE
 -92.949669:-148.627142:-900.000000
--70.979669:-151.127142:-900.000000
+21.000000:-151.127142:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ShowNPoints_Tools:Box52
 ISEXEC:FALSE
 -48.321002:-133.648902:-900.000000
--25.886002:-136.148902:-900.000000
+13.960000:-136.148902:-900.000000
 PORT
 Type:"120"
 FIN_BOX
@@ -399,19 +402,19 @@ BOX
 std:MultipleInputs:Box53
 ISEXEC:FALSE
 -96.292390:-13.293248:-900.000000
--74.322390:-15.793248:-900.000000
+21.000000:-15.793248:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:Box55
 ISEXEC:FALSE
 -54.535637:-149.462814:-900.000000
--32.565637:-151.962814:-900.000000
+21.000000:-151.962814:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:MeshContours_Widget:Box62
 ISEXEC:FALSE
 -225.142216:1.512919:-900.000000
--202.347216:-0.987081:-900.000000
+21.000000:-0.987081:-900.000000
 PORT
 colorMesh:"1 1 0"
 FIN_BOX
@@ -425,25 +428,25 @@ BOX
 std:MagicBox:Box64
 ISEXEC:FALSE
 -238.031872:191.267325:-900.000000
--216.431872:188.767325:-900.000000
+8.680000:188.767325:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box65
 ISEXEC:FALSE
 -215.214256:191.441400:-900.000000
--193.614256:188.941400:-900.000000
+8.680000:188.941400:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box69
 ISEXEC:FALSE
 -192.711554:191.615475:-900.000000
--171.111554:189.115475:-900.000000
+8.680000:189.115475:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box71
 ISEXEC:FALSE
 -268.277413:191.441400:-900.000000
--246.677413:188.941400:-900.000000
+8.680000:188.941400:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:MeshContours_Widget:Box72
@@ -483,13 +486,13 @@ BOX
 creaVtk:MeshManager:Box92
 ISEXEC:FALSE
 -56.608588:-81.789032:-900.000000
--34.578588:-84.289032:-900.000000
+14.960000:-84.289032:-900.000000
 FIN_BOX
 BOX
 creaVtk:MeshManager_tool:Box93
 ISEXEC:FALSE
 -61.627153:-92.643884:-900.000000
--39.127153:-95.143884:-900.000000
+15.720000:-95.143884:-900.000000
 PORT
 Tool:"35"
 FIN_BOX
@@ -497,25 +500,25 @@ BOX
 std:MagicBox:Box94
 ISEXEC:FALSE
 -70.989776:-33.864327:-900.000000
--49.389776:-36.364327:-900.000000
+8.680000:-36.364327:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:wxVtkBaseView_Info:Box96
 ISEXEC:FALSE
 -163.829238:146.383440:-900.000000
--134.789238:143.883440:-900.000000
+29.040000:143.883440:-900.000000
 FIN_BOX
 BOX
 creaVtk:PolyDataNormals:Box97
 ISEXEC:FALSE
 -88.026860:-72.332654:-900.000000
--65.731860:-74.832654:-900.000000
+12.200000:-74.832654:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box98
 ISEXEC:FALSE
 -143.911108:-17.437953:-900.000000
--110.591108:-19.937953:-900.000000
+33.320000:-19.937953:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -523,7 +526,7 @@ BOX
 std:AddStringToVector:Box99
 ISEXEC:FALSE
 -356.544913:110.563876:-900.000000
--332.024913:108.063876:-900.000000
+24.520000:108.063876:-900.000000
 PORT
 In0:"Auto Add Points (Start/Stop)"
 FIN_BOX
@@ -531,7 +534,7 @@ BOX
 std:VectorFilterString:Box100
 ISEXEC:FALSE
 -265.790737:67.872984:-900.000000
--237.750737:65.372984:-900.000000
+28.040000:65.372984:-900.000000
 PORT
 In0:"0  1  2   3   4   5   6   7   8      9       10"
 PORT
@@ -543,13 +546,13 @@ BOX
 std:ConcatStrings:Box101
 ISEXEC:FALSE
 -265.899318:61.380437:-900.000000
--243.139318:58.880437:-900.000000
+22.760000:58.880437:-900.000000
 FIN_BOX
 BOX
 wx:CheckBox:Box103
 ISEXEC:FALSE
 -7.317202:68.352288:-900.000000
-14.422798:65.852288:-900.000000
+21.000000:65.852288:-900.000000
 PORT
 In:"false"
 PORT
@@ -579,13 +582,13 @@ BOX
 std:AddStringToVector:Box113
 ISEXEC:FALSE
 -355.045399:94.990615:-900.000000
--330.525399:92.490615:-900.000000
+24.520000:92.490615:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings:Box114
 ISEXEC:FALSE
 -464.728425:29.536946:-900.000000
--441.968425:27.036946:-900.000000
+22.760000:27.036946:-900.000000
 PORT
 In2:" -1"
 FIN_BOX
@@ -593,7 +596,7 @@ BOX
 std:ConcatStrings:Box115
 ISEXEC:FALSE
 -432.344198:29.864985:-900.000000
--409.584198:27.364985:-900.000000
+22.760000:27.364985:-900.000000
 PORT
 In2:" 1"
 FIN_BOX
@@ -601,7 +604,7 @@ BOX
 wx:CommandButton:Box116
 ISEXEC:FALSE
 -472.775460:10.145161:-900.000000
--450.390460:7.645161:-900.000000
+21.000000:7.645161:-900.000000
 PORT
 Label:"-"
 FIN_BOX
@@ -609,7 +612,7 @@ BOX
 wx:CommandButton:Box117
 ISEXEC:FALSE
 -432.910292:9.836787:-900.000000
--410.525292:7.336787:-900.000000
+21.000000:7.336787:-900.000000
 PORT
 Label:"+"
 FIN_BOX
@@ -617,7 +620,7 @@ BOX
 creaMaracasVisu:ShowNPoints_Tools:Box118
 ISEXEC:FALSE
 -471.300578:-7.928308:-900.000000
--448.755578:-10.428308:-900.000000
+13.960000:-10.428308:-900.000000
 PORT
 BoxProcessMode:"Manual"
 PORT
@@ -627,7 +630,7 @@ BOX
 creaMaracasVisu:ShowNPoints_Tools:Box119
 ISEXEC:FALSE
 -434.200486:-9.777088:-900.000000
--411.655486:-12.277088:-900.000000
+13.960000:-12.277088:-900.000000
 PORT
 BoxProcessMode:"Manual"
 PORT
@@ -637,7 +640,7 @@ BOX
 wx:LayoutLine:Box120
 ISEXEC:FALSE
 -447.700334:-24.146328:-900.000000
--414.380334:-26.646328:-900.000000
+33.320000:-26.646328:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -665,7 +668,7 @@ BOX
 std:ConcatStrings:Box124
 ISEXEC:FALSE
 -352.818950:32.043657:-900.000000
--330.058950:29.543657:-900.000000
+22.760000:29.543657:-900.000000
 PORT
 In2:" 1"
 FIN_BOX
@@ -673,7 +676,7 @@ BOX
 wx:CommandButton:Box125
 ISEXEC:FALSE
 -397.658813:12.919589:-900.000000
--375.273813:10.419589:-900.000000
+21.000000:10.419589:-900.000000
 PORT
 Label:"-"
 FIN_BOX
@@ -681,7 +684,7 @@ BOX
 wx:CommandButton:Box126
 ISEXEC:FALSE
 -357.793645:12.611216:-900.000000
--335.408645:10.111216:-900.000000
+21.000000:10.111216:-900.000000
 PORT
 Label:"+"
 FIN_BOX
@@ -689,7 +692,7 @@ BOX
 creaMaracasVisu:ShowNPoints_Tools:Box127
 ISEXEC:FALSE
 -397.017991:-11.945508:-900.000000
--374.472991:-14.445508:-900.000000
+13.960000:-14.445508:-900.000000
 PORT
 BoxProcessMode:"Manual"
 PORT
@@ -699,7 +702,7 @@ BOX
 creaMaracasVisu:ShowNPoints_Tools:Box128
 ISEXEC:FALSE
 -359.083840:-12.364472:-900.000000
--336.538840:-14.864472:-900.000000
+13.960000:-14.864472:-900.000000
 PORT
 BoxProcessMode:"Manual"
 PORT
@@ -709,7 +712,7 @@ BOX
 std:GetVectorDoubleSubVector:Box130
 ISEXEC:FALSE
 -383.724561:42.940086:-900.000000
--360.264561:40.440086:-900.000000
+12.200000:40.440086:-900.000000
 PORT
 ErrorValue:"0"
 PORT
@@ -721,7 +724,7 @@ BOX
 wx:LayoutLine:Box131
 ISEXEC:FALSE
 -384.639381:-22.701742:-900.000000
--351.319381:-25.201742:-900.000000
+33.320000:-25.201742:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -729,7 +732,7 @@ BOX
 wx:OutputText:Box132
 ISEXEC:FALSE
 -422.764180:-37.645206:-900.000000
--400.984180:-40.145206:-900.000000
+19.240000:-40.145206:-900.000000
 PORT
 In:"Expand area"
 FIN_BOX
@@ -745,7 +748,7 @@ BOX
 wx:LayoutLine:Box135
 ISEXEC:FALSE
 97.947391:-26.661606:-900.000000
-131.267391:-29.161606:-900.000000
+119.717391:-29.161606:-900.000000
 PORT
 WinTitle:"Flat surface"
 FIN_BOX
@@ -761,7 +764,7 @@ BOX
 std:ConcatStrings:Box139
 ISEXEC:FALSE
 104.836384:20.027246:-900.000000
-127.596384:17.527246:-900.000000
+126.916384:17.527246:-900.000000
 PORT
 In2:" -1"
 FIN_BOX
@@ -769,7 +772,7 @@ BOX
 std:ConcatStrings:Box140
 ISEXEC:FALSE
 142.295507:22.734142:-900.000000
-165.055507:20.234142:-900.000000
+164.375507:20.234142:-900.000000
 PORT
 In2:" 1"
 FIN_BOX
@@ -813,7 +816,7 @@ BOX
 wx:LayoutLine:Box145
 ISEXEC:FALSE
 123.020932:-16.234652:-900.000000
-156.340932:-18.734652:-900.000000
+144.790932:-18.734652:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -839,7 +842,7 @@ BOX
 wx:LayoutLine:Box148
 ISEXEC:FALSE
 156.874712:-31.926957:-900.000000
-190.194712:-34.426957:-900.000000
+178.644712:-34.426957:-900.000000
 PORT
 WinTitle:"Volume"
 FIN_BOX
@@ -863,7 +866,7 @@ BOX
 std:ConcatStrings:Box162
 ISEXEC:FALSE
 170.601359:19.037925:-900.000000
-193.361359:16.537925:-900.000000
+192.681359:16.537925:-900.000000
 PORT
 In2:" -1"
 FIN_BOX
@@ -871,7 +874,7 @@ BOX
 std:ConcatStrings:Box163
 ISEXEC:FALSE
 208.060481:21.744821:-900.000000
-230.820481:19.244821:-900.000000
+230.140481:19.244821:-900.000000
 PORT
 In2:" 1"
 FIN_BOX
@@ -915,7 +918,7 @@ BOX
 wx:LayoutLine:Box168
 ISEXEC:FALSE
 186.402880:-15.599182:-900.000000
-219.722880:-18.099182:-900.000000
+208.172880:-18.099182:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -935,7 +938,7 @@ BOX
 wx:LayoutTab:Box184
 ISEXEC:FALSE
 72.294626:-57.981082:-900.000000
-105.614626:-60.481082:-900.000000
+94.019626:-60.481082:-900.000000
 PORT
 WinTitle:"Tool"
 FIN_BOX
@@ -943,7 +946,7 @@ BOX
 std:StringSelect:Box185
 ISEXEC:FALSE
 51.782029:38.833179:-900.000000
-76.302029:36.333179:-900.000000
+73.652029:36.333179:-900.000000
 PORT
 In0:"true"
 PORT
@@ -957,7 +960,7 @@ BOX
 wx:LayoutLine:Box187
 ISEXEC:FALSE
 278.482885:-29.312772:-900.000000
-311.802885:-31.812772:-900.000000
+300.252885:-31.812772:-900.000000
 PORT
 WinTitle:"Patch"
 FIN_BOX
@@ -1013,7 +1016,7 @@ BOX
 wx:LayoutLine:Box195
 ISEXEC:FALSE
 312.802450:-6.420662:-900.000000
-346.122450:-8.920662:-900.000000
+334.572450:-8.920662:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -1029,7 +1032,7 @@ BOX
 std:ConcatStrings:Box199
 ISEXEC:FALSE
 357.794032:32.699874:-900.000000
-380.554032:30.199874:-900.000000
+379.874032:30.199874:-900.000000
 PORT
 In2:" -1"
 FIN_BOX
@@ -1037,7 +1040,7 @@ BOX
 std:ConcatStrings:Box200
 ISEXEC:FALSE
 385.947432:33.047573:-900.000000
-408.707432:30.547573:-900.000000
+408.027432:30.547573:-900.000000
 PORT
 In2:" 1"
 FIN_BOX
@@ -1081,7 +1084,7 @@ BOX
 wx:LayoutLine:Box205
 ISEXEC:FALSE
 375.299418:-7.573093:-900.000000
-408.619418:-10.073093:-900.000000
+397.069418:-10.073093:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -1125,7 +1128,7 @@ BOX
 std:ConcatStrings:Box211
 ISEXEC:FALSE
 233.257446:22.881650:-900.000000
-256.017446:20.381650:-900.000000
+255.337446:20.381650:-900.000000
 PORT
 In2:" -1"
 FIN_BOX
@@ -1133,7 +1136,7 @@ BOX
 std:ConcatStrings:Box212
 ISEXEC:FALSE
 270.716569:25.588546:-900.000000
-293.476569:23.088546:-900.000000
+292.796569:23.088546:-900.000000
 PORT
 In2:" 1"
 FIN_BOX
@@ -1177,7 +1180,7 @@ BOX
 wx:LayoutLine:Box217
 ISEXEC:FALSE
 251.441994:-13.380248:-900.000000
-284.761994:-15.880248:-900.000000
+273.211994:-15.880248:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -1197,7 +1200,7 @@ BOX
 std:ConcatStrings:Box227
 ISEXEC:FALSE
 145.371679:57.840527:-900.000000
-168.131679:55.340527:-900.000000
+167.451679:55.340527:-900.000000
 PORT
 In1:"300"
 FIN_BOX
@@ -1221,7 +1224,7 @@ BOX
 wx:LayoutLine:Box222
 ISEXEC:FALSE
 -268.992908:-80.599530:-900.000000
--235.672908:-83.099530:-900.000000
+33.320000:-83.099530:-900.000000
 PORT
 Orientation:"V"
 PORT
@@ -1261,7 +1264,7 @@ BOX
 wx:OutputText:Box230
 ISEXEC:FALSE
 -205.396557:-31.822846:-900.000000
--183.616557:-34.322846:-900.000000
+19.240000:-34.322846:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box231
@@ -1283,19 +1286,19 @@ BOX
 wx:LayoutTab:Box234
 ISEXEC:FALSE
 -252.747178:-90.038623:-900.000000
--219.427178:-92.538623:-900.000000
+33.320000:-92.538623:-900.000000
 FIN_BOX
 BOX
 wx:OutputText:Box235
 ISEXEC:FALSE
 -260.792650:-72.045510:-900.000000
--239.012650:-74.545510:-900.000000
+19.240000:-74.545510:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box236
 ISEXEC:FALSE
 -231.469157:-80.892071:-900.000000
--198.149157:-83.392071:-900.000000
+33.320000:-83.392071:-900.000000
 PORT
 Orientation:"V"
 PORT
@@ -1305,7 +1308,7 @@ BOX
 wx:OutputText:Box237
 ISEXEC:FALSE
 -214.516357:-72.312285:-900.000000
--192.736357:-74.812285:-900.000000
+19.240000:-74.812285:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ShowNPoints_Tools:Box238
@@ -1323,7 +1326,7 @@ BOX
 std:VectorFilterDouble:Box239
 ISEXEC:FALSE
 67.977472:28.319012:-900.000000
-94.257472:25.819012:-900.000000
+90.517472:25.819012:-900.000000
 PORT
 Type:"14"
 FIN_BOX
@@ -1331,13 +1334,13 @@ BOX
 creaMaracasVisu:InteractorStyleMaracas_Model:Box240
 ISEXEC:FALSE
 -318.796469:-24.457869:-900.000000
--295.081469:-26.957869:-900.000000
+13.960000:-26.957869:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings:Box241
 ISEXEC:FALSE
 104.361113:166.981758:-900.000000
-127.121113:164.481758:-900.000000
+126.441113:164.481758:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings_tool:Box242
@@ -1349,7 +1352,7 @@ BOX
 std:StringSelect:Box243
 ISEXEC:FALSE
 77.057189:166.884604:-900.000000
-101.577189:164.384604:-900.000000
+98.927189:164.384604:-900.000000
 PORT
 In0:"0"
 PORT
@@ -1365,25 +1368,25 @@ BOX
 std:ConcatStrings:Box245
 ISEXEC:FALSE
 -313.000327:60.169389:-900.000000
--290.240327:57.669389:-900.000000
+22.760000:57.669389:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box246
 ISEXEC:FALSE
 -378.475392:187.401740:-900.000000
--356.765392:184.901740:-900.000000
+8.680000:184.901740:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box247
 ISEXEC:FALSE
 -354.710232:187.449642:-900.000000
--333.000232:184.949642:-900.000000
+8.680000:184.949642:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box248
 ISEXEC:FALSE
 -330.666067:187.311541:-900.000000
--308.956067:184.811541:-900.000000
+8.680000:184.811541:-900.000000
 FIN_BOX
 CONNECTIONS:280
 CONNECTION

diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbs
index 831c615c75fb42459fb27c177ea9aac71465b488..9bc5a489e29824543e2430aa1167b4a7fbc6c242 100644 (file)
--- a/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbs
+++ b/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbs
@@ -1,5 +1,5 @@
 # ----------------------------------
-# - BBTKGEditor v 1.5 BBS BlackBox Script (Complex Box)
+# - BBTKGEditor v 1.6 BBS BlackBox Script (Complex Box)
 # - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbs
 # ----------------------------------
 
@@ -31,6 +31,7 @@ new creaMaracasVisu:ManualContourModel_Box Box06
   set Box06.NbPoints "100"
   set Box06.OpenClose "true"
   set Box06.OpenClose2 "false"
+  set Box06.Param "1"
 
 new wx:LayoutLine Box08
 

diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg
index 392cf41bbcf610b86fb621fb71a8e0c7492743ed..c58305d682b69bf56e7558e1038478fa06b63654 100644 (file)
--- a/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg
+++ b/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg
@@ -1,5 +1,5 @@
 # ----------------------------------
-# - BBTKGEditor v 1.5 BBG BlackBox Diagram file
+# - BBTKGEditor v 1.6 BBG BlackBox Diagram file
 # - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg
 # ----------------------------------
 
@@ -7,6 +7,7 @@ APP_START
 CATEGORY:demo
 DESCRIPTION:Show N Points
 AUTHOR:info-dev@creatis.insa-lyon.fr
+EXPORTFORMAT:0
 COMPLEXBOX:TRUE
 COMPLEXBOXNAME:Mesh_tool_ApplyPatch
 PACKAGENAME:creaMaracasVisu
@@ -72,7 +73,7 @@ COMPLEX_PORT
 freeplane_transform
 -320.924223:169.055148:-900.000000
 FIN_COMPLEX_PORT
-BOXES:104
+BOXES:103
 BOX
 creaMaracasVisu:ShowNPoints:showNpoints
 ISEXEC:FALSE
@@ -94,8 +95,8 @@ FIN_BOX
 BOX
 creaMaracasVisu:ManualContourModel_Box:Box06
 ISEXEC:FALSE
-36.048489:25.206269:-900.000000
-60.568489:22.706269:-900.000000
+38.838235:26.859452:-900.000000
+63.358235:24.359452:-900.000000
 PORT
 DoubleContour:"1"
 PORT
@@ -104,6 +105,8 @@ PORT
 OpenClose:"false"
 PORT
 OpenClose2:"false"
+PORT
+Param:"1"
 FIN_BOX
 BOX
 wx:LayoutLine:Box08
@@ -122,8 +125,8 @@ FIN_BOX
 BOX
 creaMaracasVisu:DrawAxisTree3D:Box30
 ISEXEC:FALSE
-71.029541:7.424668:-900.000000
-99.069541:4.924668:-900.000000
+70.194402:4.919252:-900.000000
+98.234402:2.419252:-900.000000
 PORT
 Colour:"0 0 1"
 PORT
@@ -138,10 +141,8 @@ FIN_BOX
 BOX
 creaMaracasVisu:ManualContourModel_Box:Box29
 ISEXEC:FALSE
-78.902612:24.978132:-900.000000
-103.422612:22.478132:-900.000000
-PORT
-NbPoints:"40"
+82.521546:30.545723:-900.000000
+107.041546:28.045723:-900.000000
 PORT
 OpenClose:"false"
 PORT
@@ -348,10 +349,10 @@ FIN_BOX
 BOX
 wx:ComboBox:Box49
 ISEXEC:FALSE
--175.088364:49.898793:-900.000000
--148.808364:47.398793:-900.000000
+66.266698:78.015127:-900.000000
+92.546698:75.515127:-900.000000
 PORT
-In:"25 50 100 150"
+In:"25 50 100 150 200 250 300"
 PORT
 Selection:"0"
 PORT
@@ -360,8 +361,8 @@ FIN_BOX
 BOX
 wx:LayoutLine:Box50
 ISEXEC:FALSE
--57.295971:-56.374591:-900.000000
--23.975971:-58.874591:-900.000000
+-51.792162:-57.763371:-900.000000
+-18.472162:-60.263371:-900.000000
 PORT
 Orientation:"V"
 PORT
@@ -446,8 +447,8 @@ FIN_BOX
 BOX
 wx:LayoutTab:Box86
 ISEXEC:FALSE
--54.290640:-69.094847:-900.000000
--20.970640:-71.594847:-900.000000
+-54.012260:-67.981329:-900.000000
+-20.692260:-70.481329:-900.000000
 FIN_BOX
 BOX
 wx:OutputText:Box87
@@ -894,20 +895,10 @@ ISEXEC:FALSE
 -304.362857:157.685314:-900.000000
 FIN_BOX
 BOX
-wx:LayoutLine:Box160
-ISEXEC:FALSE
-134.964613:21.874211:-900.000000
-168.284613:19.374211:-900.000000
-PORT
-Orientation:"H"
-PORT
-WinTitle:"Conf"
-FIN_BOX
-BOX
 wx:CheckBox:Box161
 ISEXEC:FALSE
-139.524925:32.934718:-900.000000
-161.264925:30.434718:-900.000000
+138.922076:52.079722:-900.000000
+160.662076:49.579722:-900.000000
 PORT
 Title:"Close Spline"
 FIN_BOX
@@ -1516,15 +1507,15 @@ CONNECTION
 Box151:Out:Box107:active_widget
 NumberOfControlPoints:0
 CONNECTION
-Box160:Widget:Box106:Widget3
+Box161:Out:Box06:OpenClose
 NumberOfControlPoints:0
 CONNECTION
-Box161:Widget:Box160:Widget2
+Box161:Out:Box29:OpenClose
 NumberOfControlPoints:0
 CONNECTION
-Box161:Out:Box06:OpenClose
+Box49:OutString:Box29:NbPoints
 NumberOfControlPoints:0
 CONNECTION
-Box161:Out:Box29:OpenClose
+Box161:Widget:Box50:Widget1
 NumberOfControlPoints:0
 APP_END

diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs
index 9bed0b97b85e2f1831963f1251ee8b192eae3904..de10a8205c855cad3c1393f7ebf07d7dc2ee4937 100644 (file)
--- a/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs
+++ b/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs
@@ -1,5 +1,5 @@
 # ----------------------------------
-# - BBTKGEditor v 1.5 BBS BlackBox Script (Complex Box)
+# - BBTKGEditor v 1.6 BBS BlackBox Script (Complex Box)
 # - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs
 # ----------------------------------
 
@@ -30,6 +30,7 @@ new creaMaracasVisu:ManualContourModel_Box Box06
   set Box06.NbPoints "100"
   set Box06.OpenClose "false"
   set Box06.OpenClose2 "false"
+  set Box06.Param "1"
 
 new wx:LayoutLine Box08
 
@@ -43,7 +44,6 @@ new creaMaracasVisu:DrawAxisTree3D Box30
 new std:MultipleInputs Box31
 
 new creaMaracasVisu:ManualContourModel_Box Box29
-  set Box29.NbPoints "40"
   set Box29.OpenClose "false"
   set Box29.OpenClose2 "false"
 
@@ -125,7 +125,7 @@ new creaVtk:MeshManager_tool Box45
 new std:MagicBox Box46
 
 new wx:ComboBox Box49
-  set Box49.In "25 50 100 150"
+  set Box49.In "25 50 100 150 200 250 300"
   set Box49.Selection "0"
   set Box49.Title "Number of Points"
 
@@ -326,10 +326,6 @@ new std:MagicBox Box158
 
 new std:MagicBox Box159
 
-new wx:LayoutLine Box160
-  set Box160.Orientation "H"
-  set Box160.WinTitle "Conf"
-
 new wx:CheckBox Box161
   set Box161.Title "Close Spline"
 
@@ -520,10 +516,10 @@ connect Box159.Out Box72.Freeplane_transform
 connect Box159.Out Box107.Freeplane_transform
 connect Box151.Out Box72.active_widget
 connect Box151.Out Box107.active_widget
-connect Box160.Widget Box106.Widget3
-connect Box161.Widget Box160.Widget2
 connect Box161.Out Box06.OpenClose
 connect Box161.Out Box29.OpenClose
+connect Box49.OutString Box29.NbPoints
+connect Box161.Widget Box50.Widget1
 
 # Complex input ports
 input mesh Box67.In " "

diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbg
index 8996230429b79de4f012561e61a1b026c98f6074..26c53a51fa18bfbb08d6a6e664c7a198bc2f878a 100644 (file)
--- a/bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbg
+++ b/bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbg
@@ -1,5 +1,5 @@
 # ----------------------------------
-# - BBTKGEditor v 1.5 BBG BlackBox Diagram file
+# - BBTKGEditor v 1.6 BBG BlackBox Diagram file
 # - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbg
 # ----------------------------------
 
@@ -7,6 +7,7 @@ APP_START
 CATEGORY:demo
 DESCRIPTION:Show N Points
 AUTHOR:info-dev@creatis.insa-lyon.fr
+EXPORTFORMAT:0
 COMPLEXBOX:TRUE
 COMPLEXBOXNAME:Mesh_tool_ApplyPatchSimple
 PACKAGENAME:creaMaracasVisu
@@ -104,6 +105,8 @@ PORT
 OpenClose:"false"
 PORT
 OpenClose2:"false"
+PORT
+Param:"1"
 FIN_BOX
 BOX
 wx:LayoutLine:Box08

diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbs
index 5093660aeca1112d941e815320a95db96389024a..1fc101cb928b3e31802adfd61881d0c9dbff742a 100644 (file)
--- a/bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbs
+++ b/bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbs
@@ -1,5 +1,5 @@
 # ----------------------------------
-# - BBTKGEditor v 1.5 BBS BlackBox Script (Complex Box)
+# - BBTKGEditor v 1.6 BBS BlackBox Script (Complex Box)
 # - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbs
 # ----------------------------------
 
@@ -30,6 +30,7 @@ new creaMaracasVisu:ManualContourModel_Box Box06
   set Box06.NbPoints "100"
   set Box06.OpenClose "false"
   set Box06.OpenClose2 "false"
+  set Box06.Param "1"
 
 new wx:LayoutLine Box08
 

diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg
index 19933eabf6dc3eaef7c789c345ace6d1d2054362..a5bef2db90756ee7572dbba528636adbd4ab8c73 100644 (file)
--- a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg
+++ b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg
@@ -1,5 +1,5 @@
 # ----------------------------------
-# - BBTKGEditor v 1.5 BBG BlackBox Diagram file
+# - BBTKGEditor v 1.6 BBG BlackBox Diagram file
 # - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg
 # ----------------------------------
 
@@ -7,6 +7,7 @@ APP_START
 CATEGORY:demo
 DESCRIPTION:Show N Points
 AUTHOR:info-dev@creatis.insa-lyon.fr
+EXPORTFORMAT:0
 COMPLEXBOX:TRUE
 COMPLEXBOXNAME:Mesh_tool_ApplySurface
 PACKAGENAME:creaMaracasVisu
@@ -77,7 +78,7 @@ BOX
 creaMaracasVisu:ShowNPoints:showNpoints
 ISEXEC:FALSE
 26.647528:81.320946:-900.000000
-63.487528:78.820946:-900.000000
+48.497528:78.820946:-900.000000
 PORT
 Radio:"6"
 PORT
@@ -105,7 +106,7 @@ BOX
 wx:LayoutLine:Box08
 ISEXEC:FALSE
 -182.125107:-147.642582:-900.000000
--148.805107:-150.142582:-900.000000
+33.320000:-150.142582:-900.000000
 FIN_BOX
 BOX
 vtk:UpdateRender:Box11
@@ -119,7 +120,7 @@ BOX
 creaMaracasVisu:DrawAxisTree3D:Box30
 ISEXEC:FALSE
 66.011927:-0.645212:-900.000000
-94.051927:-3.145212:-900.000000
+88.191927:-3.145212:-900.000000
 PORT
 Colour:"0 0 1"
 PORT
@@ -143,7 +144,7 @@ BOX
 creaMaracasVisu:wxPopupMenu:Box57
 ISEXEC:FALSE
 -292.747240:80.007460:-900.000000
--270.682240:77.507460:-900.000000
+17.480000:77.507460:-900.000000
 PORT
 WithCtrlKey:"true"
 FIN_BOX
@@ -151,7 +152,7 @@ BOX
 std:AddStringToVector:Box58
 ISEXEC:FALSE
 -320.426360:96.890512:-900.000000
--295.906360:94.390512:-900.000000
+24.520000:94.390512:-900.000000
 PORT
 In0:"+  Add point"
 PORT
@@ -177,19 +178,19 @@ BOX
 creaMaracasVisu:ShowNPoints_Tools:Box60
 ISEXEC:FALSE
 -348.434487:40.648315:-900.000000
--325.999487:38.148315:-900.000000
+13.960000:38.148315:-900.000000
 FIN_BOX
 BOX
 vtk:ImageVtkProperties:Box68
 ISEXEC:FALSE
 -102.915963:102.233618:-900.000000
--80.380963:99.733618:-900.000000
+18.480000:99.733618:-900.000000
 FIN_BOX
 BOX
 std:VectorFilterDouble:Box70
 ISEXEC:FALSE
 49.750242:60.953814:-900.000000
-76.030242:58.453814:-900.000000
+72.180242:58.453814:-900.000000
 PORT
 Type:"11"
 FIN_BOX
@@ -197,7 +198,7 @@ BOX
 creaVtk:BooleanOperationPolyDataFilter:Box77
 ISEXEC:FALSE
 -87.603116:-25.092238:-900.000000
--63.873116:-27.592238:-900.000000
+12.200000:-27.592238:-900.000000
 PORT
 BoxProcessMode:"Manual"
 PORT
@@ -207,7 +208,7 @@ BOX
 wx:ComboBox:Box78
 ISEXEC:FALSE
 -150.912071:6.911190:-900.000000
--124.632071:4.411190:-900.000000
+26.280000:4.411190:-900.000000
 PORT
 In:"Union Intersection Difference Replace"
 FIN_BOX
@@ -215,7 +216,7 @@ BOX
 wx:LayoutLine:Box79
 ISEXEC:FALSE
 -143.046813:-112.731071:-900.000000
--109.726813:-115.231071:-900.000000
+33.320000:-115.231071:-900.000000
 PORT
 Orientation:"H"
 PORT
@@ -233,13 +234,13 @@ BOX
 std:MagicBox:Box66
 ISEXEC:FALSE
 -381.548793:71.104531:-900.000000
--359.948793:68.604531:-900.000000
+8.680000:68.604531:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box67
 ISEXEC:FALSE
 -67.526006:124.007723:-900.000000
--45.926006:121.507723:-900.000000
+8.680000:121.507723:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:PolyDataToActor_Widget:Box48
@@ -251,13 +252,13 @@ BOX
 vtk:vtkImageDataPointerRelay:Box35
 ISEXEC:FALSE
 -107.091396:123.633118:-900.000000
--83.881396:121.133118:-900.000000
+6.920000:121.133118:-900.000000
 FIN_BOX
 BOX
 wx:Slider:Box34
 ISEXEC:FALSE
 -194.856368:10.189476:-900.000000
--165.056368:7.689476:-900.000000
+29.800000:7.689476:-900.000000
 PORT
 In:"50"
 PORT
@@ -275,7 +276,7 @@ BOX
 std:Div:Box36
 ISEXEC:FALSE
 -190.788172:-9.261990:-900.000000
--169.863172:-11.761990:-900.000000
+8.680000:-11.761990:-900.000000
 PORT
 In2:"100"
 FIN_BOX
@@ -293,7 +294,7 @@ BOX
 wx:LayoutLine:Box38
 ISEXEC:FALSE
 -189.060716:-112.625309:-900.000000
--155.740716:-115.125309:-900.000000
+33.320000:-115.125309:-900.000000
 PORT
 Orientation:"H"
 PORT
@@ -303,13 +304,13 @@ BOX
 wx:LayoutTab:Box39
 ISEXEC:FALSE
 -194.094275:-119.611316:-900.000000
--160.774275:-122.111316:-900.000000
+33.320000:-122.111316:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box40
 ISEXEC:FALSE
 -147.031100:-119.141541:-900.000000
--113.711100:-121.641541:-900.000000
+33.320000:-121.641541:-900.000000
 FIN_BOX
 BOX
 wx:CommandButton:Box42
@@ -323,7 +324,7 @@ BOX
 wx:CommandButton:Box43
 ISEXEC:FALSE
 -85.356515:8.083838:-900.000000
--63.081515:5.583838:-900.000000
+21.000000:5.583838:-900.000000
 PORT
 Label:"Reset Tool"
 FIN_BOX
@@ -331,7 +332,7 @@ BOX
 wx:LayoutLine:Box44
 ISEXEC:FALSE
 -154.036190:-43.432527:-900.000000
--120.716190:-45.932527:-900.000000
+33.320000:-45.932527:-900.000000
 PORT
 Orientation:"V"
 PORT
@@ -341,7 +342,7 @@ BOX
 creaVtk:MeshManager_tool:Box45
 ISEXEC:FALSE
 -90.848443:-133.408000:-900.000000
--68.348443:-135.908000:-900.000000
+15.720000:-135.908000:-900.000000
 PORT
 Tool:"30"
 FIN_BOX
@@ -349,13 +350,13 @@ BOX
 std:MagicBox:Box46
 ISEXEC:FALSE
 -137.131256:113.921532:-900.000000
--115.531256:111.421532:-900.000000
+8.680000:111.421532:-900.000000
 FIN_BOX
 BOX
 wx:ComboBox:Box49
 ISEXEC:FALSE
 -182.639251:-13.479145:-900.000000
--156.359251:-15.979145:-900.000000
+26.280000:-15.979145:-900.000000
 PORT
 In:"25 50 100 150"
 PORT
@@ -367,7 +368,7 @@ BOX
 wx:LayoutLine:Box50
 ISEXEC:FALSE
 -11.437173:-67.034258:-900.000000
-21.882827:-69.534258:-900.000000
+33.320000:-69.534258:-900.000000
 PORT
 Orientation:"V"
 PORT
@@ -377,13 +378,13 @@ BOX
 std:MultipleInputs:Box51
 ISEXEC:FALSE
 -92.949669:-148.627142:-900.000000
--70.979669:-151.127142:-900.000000
+21.000000:-151.127142:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ShowNPoints_Tools:Box52
 ISEXEC:FALSE
 -48.321002:-133.648902:-900.000000
--25.886002:-136.148902:-900.000000
+13.960000:-136.148902:-900.000000
 PORT
 Type:"120"
 FIN_BOX
@@ -391,19 +392,19 @@ BOX
 std:MultipleInputs:Box53
 ISEXEC:FALSE
 -96.292390:-13.293248:-900.000000
--74.322390:-15.793248:-900.000000
+21.000000:-15.793248:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:Box55
 ISEXEC:FALSE
 -54.535637:-149.462814:-900.000000
--32.565637:-151.962814:-900.000000
+21.000000:-151.962814:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:MeshContours_Widget:Box62
 ISEXEC:FALSE
 -232.400613:-9.330453:-900.000000
--209.605613:-11.830453:-900.000000
+21.000000:-11.830453:-900.000000
 PORT
 colorMesh:"1 1 0"
 FIN_BOX
@@ -417,31 +418,31 @@ BOX
 std:MagicBox:Box64
 ISEXEC:FALSE
 -243.113826:124.330340:-900.000000
--221.513826:121.830340:-900.000000
+8.680000:121.830340:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box65
 ISEXEC:FALSE
 -220.296210:124.504415:-900.000000
--198.696210:122.004415:-900.000000
+8.680000:122.004415:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box69
 ISEXEC:FALSE
 -197.793508:124.678490:-900.000000
--176.193508:122.178490:-900.000000
+8.680000:122.178490:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box71
 ISEXEC:FALSE
 -273.359367:124.504415:-900.000000
--251.759367:122.004415:-900.000000
+8.680000:122.004415:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:MeshContours_Widget:Box72
 ISEXEC:FALSE
 -292.263718:-49.372271:-900.000000
--269.468718:-51.872271:-900.000000
+21.000000:-51.872271:-900.000000
 PORT
 colorMesh:"0 1 1"
 FIN_BOX
@@ -449,7 +450,7 @@ BOX
 wx:LayoutLine:Box81
 ISEXEC:FALSE
 -182.940708:-126.667438:-900.000000
--149.620708:-129.167438:-900.000000
+33.320000:-129.167438:-900.000000
 PORT
 WinTitle:"Step 1.   Surface"
 FIN_BOX
@@ -457,7 +458,7 @@ BOX
 wx:LayoutTab:Box82
 ISEXEC:FALSE
 -141.270402:-52.730092:-900.000000
--107.950402:-55.230092:-900.000000
+33.320000:-55.230092:-900.000000
 FIN_BOX
 BOX
 wx:OutputText:Box84
@@ -475,13 +476,13 @@ BOX
 creaVtk:MeshManager:Box92
 ISEXEC:FALSE
 -52.296905:-77.931211:-900.000000
--30.266905:-80.431211:-900.000000
+14.960000:-80.431211:-900.000000
 FIN_BOX
 BOX
 creaVtk:MeshManager_tool:Box93
 ISEXEC:FALSE
 -55.273094:-98.771012:-900.000000
--32.773094:-101.271012:-900.000000
+15.720000:-101.271012:-900.000000
 PORT
 BoxProcessMode:"Manual"
 PORT
@@ -491,7 +492,7 @@ BOX
 creaMaracasVisu:wxVtkBaseView_Info:Box96
 ISEXEC:FALSE
 -360.168851:83.553409:-900.000000
--331.128851:81.053409:-900.000000
+29.040000:81.053409:-900.000000
 FIN_BOX
 BOX
 creaVtk:PolyDataNormals:Box97
@@ -503,7 +504,7 @@ BOX
 wx:LayoutLine:Box98
 ISEXEC:FALSE
 -143.911108:-17.437953:-900.000000
--110.591108:-19.937953:-900.000000
+33.320000:-19.937953:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -511,7 +512,7 @@ BOX
 std:AddStringToVector:Box99
 ISEXEC:FALSE
 -300.772152:108.901840:-900.000000
--276.252152:106.401840:-900.000000
+24.520000:106.401840:-900.000000
 PORT
 In0:"Auto Add Points (Start/Stop)"
 FIN_BOX
@@ -567,7 +568,7 @@ BOX
 wx:CheckBox:Box106
 ISEXEC:FALSE
 -27.858197:70.649950:-900.000000
--6.118197:68.149950:-900.000000
+21.000000:68.149950:-900.000000
 PORT
 In:"true"
 PORT
@@ -579,13 +580,13 @@ BOX
 wx:ComboBox:Box108
 ISEXEC:FALSE
 135.425863:49.171195:-900.000000
-161.705863:46.671195:-900.000000
+157.250863:46.671195:-900.000000
 FIN_BOX
 BOX
 std:AddStringToVector:Box109
 ISEXEC:FALSE
 -61.619335:85.076488:-900.000000
--37.099335:82.576488:-900.000000
+24.520000:82.576488:-900.000000
 PORT
 In0:"Close Spline 1"
 PORT
@@ -597,7 +598,7 @@ BOX
 std:StringSelect:Box110
 ISEXEC:FALSE
 -65.551330:66.131420:-900.000000
--41.031330:63.631420:-900.000000
+24.520000:63.631420:-900.000000
 PORT
 In0:"false false"
 PORT
@@ -617,7 +618,7 @@ BOX
 std:GetVectorStringElement:Box112
 ISEXEC:FALSE
 -50.087865:56.742292:-900.000000
--27.022865:54.242292:-900.000000
+10.440000:54.242292:-900.000000
 PORT
 I:"1"
 FIN_BOX
@@ -631,7 +632,7 @@ BOX
 wx:LayoutLine:Box114
 ISEXEC:FALSE
 -115.788886:-43.199453:-900.000000
--82.468886:-45.699453:-900.000000
+33.320000:-45.699453:-900.000000
 PORT
 Orientation:"V"
 PORT
@@ -641,7 +642,7 @@ BOX
 std:AddStringToVector:Box115
 ISEXEC:FALSE
 -303.164612:89.794401:-900.000000
--278.644612:87.294401:-900.000000
+24.520000:87.294401:-900.000000
 PORT
 In0:"Tool - Inverse Normals"
 PORT
@@ -671,7 +672,7 @@ BOX
 wx:OutputText:Box131
 ISEXEC:FALSE
 -4.444858:-53.549638:-900.000000
-17.335142:-56.049638:-900.000000
+19.240000:-56.049638:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ShowNPoints_Tools:Box132
@@ -687,7 +688,7 @@ BOX
 std:ConcatStrings:Box120
 ISEXEC:FALSE
 134.627918:41.900202:-900.000000
-157.387918:39.400202:-900.000000
+156.707918:39.400202:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box122
@@ -699,7 +700,7 @@ BOX
 wx:LayoutLine:Box123
 ISEXEC:FALSE
 -124.678268:-98.617918:-900.000000
--91.358268:-101.117918:-900.000000
+33.320000:-101.117918:-900.000000
 PORT
 Orientation:"V"
 PORT
@@ -709,7 +710,7 @@ BOX
 wx:LayoutTab:Box124
 ISEXEC:FALSE
 -17.303165:-81.933059:-900.000000
-16.016835:-84.433059:-900.000000
+33.320000:-84.433059:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box125
@@ -725,7 +726,7 @@ BOX
 wx:LayoutLine:Box126
 ISEXEC:FALSE
 -179.812141:-71.797263:-900.000000
--146.492141:-74.297263:-900.000000
+33.320000:-74.297263:-900.000000
 PORT
 Orientation:"V"
 PORT
@@ -735,7 +736,7 @@ BOX
 wx:LayoutTab:Box128
 ISEXEC:FALSE
 -125.937402:-105.186652:-900.000000
--92.617402:-107.686652:-900.000000
+33.320000:-107.686652:-900.000000
 FIN_BOX
 BOX
 wx:OutputText:Box129
@@ -763,13 +764,13 @@ BOX
 wx:LayoutTab:Box136
 ISEXEC:FALSE
 -252.330390:-98.316800:-900.000000
--219.010390:-100.816800:-900.000000
+33.320000:-100.816800:-900.000000
 FIN_BOX
 BOX
 wx:OutputText:Box137
 ISEXEC:FALSE
 -202.528742:-78.471524:-900.000000
--180.748742:-80.971524:-900.000000
+19.240000:-80.971524:-900.000000
 FIN_BOX
 BOX
 wx:OutputText:Box139
@@ -781,7 +782,7 @@ BOX
 std:VectorFilterDouble:Box140
 ISEXEC:FALSE
 87.289087:26.966402:-900.000000
-113.569087:24.466402:-900.000000
+109.829087:24.466402:-900.000000
 PORT
 Type:"14"
 FIN_BOX
@@ -789,19 +790,19 @@ BOX
 std:MagicBox:Box141
 ISEXEC:FALSE
 -379.690365:113.117077:-900.000000
--357.980365:110.617077:-900.000000
+8.680000:110.617077:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box142
 ISEXEC:FALSE
 -353.346525:113.061609:-900.000000
--331.636525:110.561609:-900.000000
+8.680000:110.561609:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings:Box143
 ISEXEC:FALSE
 -382.419742:97.623864:-900.000000
--359.659742:95.123864:-900.000000
+22.760000:95.123864:-900.000000
 PORT
 In2:"  "
 PORT
@@ -813,7 +814,7 @@ BOX
 creaVtk:TransformVector:Box144
 ISEXEC:FALSE
 -387.593536:106.615574:-900.000000
--365.273536:104.115574:-900.000000
+12.200000:104.115574:-900.000000
 PORT
 InX:"0"
 PORT
@@ -831,7 +832,7 @@ BOX
 std:ConcatStrings:Box146
 ISEXEC:FALSE
 45.583120:115.261182:-900.000000
-68.343120:112.761182:-900.000000
+67.663120:112.761182:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings_tool:Box147
@@ -843,7 +844,7 @@ BOX
 std:StringSelect:Box148
 ISEXEC:FALSE
 -13.448146:107.009497:-900.000000
-11.071854:104.509497:-900.000000
+24.520000:104.509497:-900.000000
 PORT
 In0:"0"
 PORT
@@ -853,7 +854,7 @@ BOX
 std:ConcatStrings:Box149
 ISEXEC:FALSE
 -377.523367:63.561263:-900.000000
--354.763367:61.061263:-900.000000
+22.760000:61.061263:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:InteractorStyleMaracas_Model:Box150
@@ -865,7 +866,7 @@ BOX
 std:MagicBox:Box158
 ISEXEC:FALSE
 -403.731557:113.420656:-900.000000
--382.021557:110.920656:-900.000000
+8.680000:110.920656:-900.000000
 FIN_BOX
 CONNECTIONS:201
 CONNECTION

diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs
index 4da8e0ad978d07ed0c88c072d6a87248733ad1dd..c8d4aeabf57f18b0c328a8c69418918f9a89f865 100644 (file)
--- a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs
+++ b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs
@@ -1,5 +1,5 @@
 # ----------------------------------
-# - BBTKGEditor v 1.5 BBS BlackBox Script (Complex Box)
+# - BBTKGEditor v 1.6 BBS BlackBox Script (Complex Box)
 # - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs
 # ----------------------------------
 

diff --git a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx
index fb3a57ff4d4bbd2133e626af984f541d21c5e591..f0eb286efc5c17116cb8308038c225492190662b 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx
+++ b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx
@@ -1086,6 +1086,16 @@ std::vector<double> ShowNPoints_Tools::GetProjectionPointOnAxis(double pointToPr
        return result;
 }
 
+void ShowNPoints_Tools::LoadCollection()
+{
+    WidgetShowNPoints* wsp = bbGetInputWidgetShowNPoints();
+    if ((wsp!=NULL) && (bbGetInputParamsStr().size()==1))
+    {
+        std::string filename = bbGetInputParamsStr()[0];
+        wsp->OnLoadCollections_( filename );
+    }
+}
+
 
 //=====
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
@@ -1107,7 +1117,7 @@ void ShowNPoints_Tools::Process()
 
 //    bbSetOutputOut( bbGetInputIn() );
 //    std::cout << "Output value = " <<bbGetOutputOut() << std::endl;
-
+    
     if (bbGetInputWidgetShowNPoints()!=NULL)
     {
         if (bbGetInputType()==1)
@@ -1207,6 +1217,10 @@ void ShowNPoints_Tools::Process()
         {
                SeparateSplines();
         } // if Type
+        if(bbGetInputType()==500)
+        {
+            LoadCollection();
+        } // if Type
     } // if bbGetInputWidgetShowNPoints
 }
 //===== 

diff --git a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.h b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.h
index b521f6b88c8bc83ed6fceb6ab3b4630b84e90589..580f6cce322b64f6d21b051eb24a861d879c869b 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.h
+++ b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.h
@@ -31,6 +31,7 @@ class bbcreaMaracasVisu_EXPORT ShowNPoints_Tools
     BBTK_DECLARE_INPUT(Mesh,vtkPolyData*);
     BBTK_DECLARE_INPUT(Type,int);
     BBTK_DECLARE_INPUT(Params, std::vector<double>);
+    BBTK_DECLARE_INPUT(ParamsStr, std::vector<std::string>);
     BBTK_DECLARE_OUTPUT(Out, std::vector<double>);
 //  BBTK_DECLARE_OUTPUT(Out,double);
   BBTK_PROCESS(Process);
@@ -53,6 +54,7 @@ class bbcreaMaracasVisu_EXPORT ShowNPoints_Tools
     void JoinPoints();
     void SetMesh();
     void SeparateSplines();
+    void LoadCollection();
     std::vector<double> GetProjectionPointOnAxis(double pointToProject[3], double originAxis[3], double axisDir[3]);
     std::vector<std::vector<std::vector<double>>> GetOrderedPointsAroundPlane(std::vector<double> planeOrigin, std::vector<double> planeNormal,  std::vector<double> rotAxis, std::vector<double> pX, std::vector<double> pY, std::vector<double> pZ);
     std::vector<double> GetPlaneNormalFromPointsRefPoint(std::vector<double> pointsX, std::vector<double> pointsY, std::vector<double> pointsZ, std::vector<double> refPoint);
@@ -70,9 +72,10 @@ BBTK_CATEGORY("empty");
   BBTK_INPUT(ShowNPoints_Tools,WidgetShowNPoints,"WidgetShowNPoints",WidgetShowNPoints*,"");
   BBTK_INPUT(ShowNPoints_Tools,Spacing,"(default [1,1,1] )Spacing",std::vector<double>,"");
   BBTK_INPUT(ShowNPoints_Tools,Mesh,"Mesh en format vtkPolyData ",vtkPolyData*,"");
-  BBTK_INPUT(ShowNPoints_Tools,Type,"(default 0) 0:Nothing 1:Auto add poits   5:Add Point  10:Insert Point  20:TrackPoint  30:Set nearest point  40:Erase point  50:Deleta all points  100:Insert  group after   110:Delete group  120:Reset colletion  200:Tool 3 or 4 points to patch surface - Create Mesh (based on 1 group and 3 or 4 points)   205:Tool 3 or 4 points to volume surface - Create Mesh (based on 1 group and 3 or 4 points)   210: Invert points   220: Move patch center (param is the step ex [-1] or [1])      230: Move point in normal of surface (Params [-1] or [1])       235: ChangeCurrentPoint (Params [-1] or [1])  240: Join all start-end points to the start-end points on selected spline  250: Set Mesh SPC (Params: [0]:Patch [1]:CloseSpline1 [2]:CloseSpline2)   300: Create expanded surface   310: Create wide expanded surface     320: Expand Surface,   330: Widen surface,   340: Expand patch,   400: Separate and Order Splines given a rotation origin",int,"");
+  BBTK_INPUT(ShowNPoints_Tools,Type,"(default 0) 0:Nothing 1:Auto add poits   5:Add Point  10:Insert Point  20:TrackPoint  30:Set nearest point  40:Erase point  50:Deleta all points  100:Insert  group after   110:Delete group  120:Reset collection  200:Tool 3 or 4 points to patch surface - Create Mesh (based on 1 group and 3 or 4 points)   205:Tool 3 or 4 points to volume surface - Create Mesh (based on 1 group and 3 or 4 points)   210: Invert points  220: Move patch center (param is the step ex [-1] or [1])      230: Move point in normal of surface (Params [-1] or [1])       235: ChangeCurrentPoint (Params [-1] or [1])  240: Join all start-end points to the start-end points on selected spline  250: Set Mesh SPC (Params: [0]:Patch [1]:CloseSpline1 [2]:CloseSpline2)   300: Create expanded surface   310: Create wide expanded surface     320: Expand Surface,   330: Widen surface,   340: Expand patch,   400: Separate and Order Splines given a rotation origin,   500:Load collection (ParamStr filenaname.xls)",int,"");
   BBTK_INPUT(ShowNPoints_Tools, Params,"Optional params for the tools, required for 200: normal and direction, 320: centroid and direction, 330: normal and direction, 340: centroid and direction,    400: reference point", std::vector<double>,"");
-  
+BBTK_INPUT(ShowNPoints_Tools, ParamsStr,"Optional params for the tools, required for 500:filename.xls", std::vector<std::string>,"");
+
   BBTK_OUTPUT(ShowNPoints_Tools, Out, "Output", std::vector<double>, "");
 //  BBTK_OUTPUT(ShowNPoints_Tools,Out,"First output",double,"");
 BBTK_END_DESCRIBE_BLACK_BOX(ShowNPoints_Tools);

diff --git a/bbtk/src/bbcreaMaracasVisuTransformWidget2.cxx b/bbtk/src/bbcreaMaracasVisuTransformWidget2.cxx
index 2bb4f19f95aac03c2fbe00c7ee3c06316fd4ebf8..f35942cd1b635d59484e907cfba91c3a827ba274 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuTransformWidget2.cxx
+++ b/bbtk/src/bbcreaMaracasVisuTransformWidget2.cxx
@@ -39,7 +39,9 @@ public:
     void OnRadioButtonZ(wxEvent& event);
     void OnRadioButtonN(wxEvent& event);
     void OnSave(wxCommandEvent& event);
+    void Save(std::string filename);
     void OnLoad(wxCommandEvent& event);
+    void Load(std::string filename);
     void OnReset(wxCommandEvent& event);
     void OnMoveDown(wxCommandEvent& event);
     void OnMoveUp(wxCommandEvent& event);
@@ -405,6 +407,26 @@ void TransformWidgetPanel::OnMemory(wxCommandEvent& event)
     mMemoryMatrix->DeepCopy( t->GetMatrix() );
 }
 
+void TransformWidgetPanel::Save(std::string filename)
+{
+    FILE *ff;
+    ff = fopen( filename.c_str() , "w+" );
+    if (ff!=NULL)
+    {
+        fprintf(ff,"ActualPoint:\n");
+        fprintf(ff,"%f  %f  %f\n",mActualPoint[0], mActualPoint[1], mActualPoint[2] );
+        vtkMatrix4x4 *m = t->GetMatrix();
+        fprintf(ff,"Transform:\n");
+        fprintf(ff,"%f  %f  %f  %f  \n",m->GetElement(0,0), m->GetElement(1,0), m->GetElement(2,0), m->GetElement(3,0) );
+        fprintf(ff,"%f  %f  %f  %f  \n",m->GetElement(0,1), m->GetElement(1,1), m->GetElement(2,1), m->GetElement(3,1) );
+        fprintf(ff,"%f  %f  %f  %f  \n",m->GetElement(0,2), m->GetElement(1,2), m->GetElement(2,2), m->GetElement(3,2) );
+        fprintf(ff,"%f  %f  %f  %f\n\n",m->GetElement(0,3), m->GetElement(1,3), m->GetElement(2,3), m->GetElement(3,3) );
+        fclose(ff);
+    } else {   // else ff
+        printf("TransformWidgetPanel::OnSave  ...Error... creating file \n");
+    } //ff
+}
+
 void TransformWidgetPanel::OnSave(wxCommandEvent& event)
 {
     wxFileDialog* FD = new wxFileDialog( 0,
@@ -421,29 +443,63 @@ void TransformWidgetPanel::OnSave(wxCommandEvent& event)
     if (FD->GetReturnCode()==wxID_OK)
     {
         std::string filename= (const char*) ( FD->GetPath().mb_str() );
-        FILE *ff;
-        ff = fopen( filename.c_str() , "w+" );
-        if (ff!=NULL)
-        {
-            fprintf(ff,"ActualPoint:\n");
-            fprintf(ff,"%f  %f  %f\n",mActualPoint[0], mActualPoint[1], mActualPoint[2] );
-            vtkMatrix4x4 *m = t->GetMatrix();
-            fprintf(ff,"Transform:\n");
-            fprintf(ff,"%f  %f  %f  %f  \n",m->GetElement(0,0), m->GetElement(1,0), m->GetElement(2,0), m->GetElement(3,0) );
-            fprintf(ff,"%f  %f  %f  %f  \n",m->GetElement(0,1), m->GetElement(1,1), m->GetElement(2,1), m->GetElement(3,1) );
-            fprintf(ff,"%f  %f  %f  %f  \n",m->GetElement(0,2), m->GetElement(1,2), m->GetElement(2,2), m->GetElement(3,2) );
-            fprintf(ff,"%f  %f  %f  %f\n\n",m->GetElement(0,3), m->GetElement(1,3), m->GetElement(2,3), m->GetElement(3,3) );
-            fclose(ff);
-        } else {   // else ff
-            printf("TransformWidgetPanel::OnSave  ...Error... creating file \n");
-        } //ff
+        Save( filename );
     }     // dialog box
 }
 
+void TransformWidgetPanel::Load(std::string filename)
+{
+    FILE *ff;
+    ff = fopen( filename.c_str() , "r" );
+    if (ff!=NULL)
+    {
+        char tmpStr[128];
+        float t0,t1,t2,t3;
+        fscanf(ff,"%s\n",tmpStr);  // ActualPoint:
+        fscanf(ff,"%f  %f  %f\n",&t0,&t1,&t2);
+        mActualPoint[0]=t0;
+        mActualPoint[1]=t1;
+        mActualPoint[2]=t2;
+
+        vtkMatrix4x4 *m = t->GetMatrix();
+        fscanf(ff,"%s\n",tmpStr); // Transform:
+        fscanf(ff,"%f %f  %f %f\n",&t0,&t1,&t2,&t3);
+        m->SetElement(0,0,t0);
+        m->SetElement(1,0,t1);
+        m->SetElement(2,0,t2);
+        m->SetElement(3,0,t3);
+        fscanf(ff,"%f %f  %f %f\n",&t0,&t1,&t2,&t3);
+        m->SetElement(0,1,t0);
+        m->SetElement(1,1,t1);
+        m->SetElement(2,1,t2);
+        m->SetElement(3,1,t3);
+        fscanf(ff,"%f %f  %f %f\n",&t0,&t1,&t2,&t3);
+        m->SetElement(0,2,t0);
+        m->SetElement(1,2,t1);
+        m->SetElement(2,2,t2);
+        m->SetElement(3,2,t3);
+        fscanf(ff,"%f %f  %f %f\n",&t0,&t1,&t2,&t3);
+        m->SetElement(0,3,t0);
+        m->SetElement(1,3,t1);
+        m->SetElement(2,3,t2);
+        m->SetElement(3,3,t3);
+        t->Update();
+
+        mBox->bbSetOutputActualPoint( mActualPoint );
+        mBox->bbSignalOutputModification(std::string("ActualPoint"));
+        mBox->bbSetOutputOut( t );
+        mBox->bbSignalOutputModification(std::string("Out"));
+
+        fclose(ff);
+    } else {   // else ff
+        printf("TransformWidgetPanel::OnLoad  ...Error... reading file \n");
+    } //ff
+}
+
 void TransformWidgetPanel::OnLoad(wxCommandEvent& event)
 {
     wxFileDialog* FD = new wxFileDialog( 0,
-                                         _T("Load groups of points .."),
+                                         _T("Load configuration.."),
                                          _T(""),
                                          _T(""),
                                          _T("(*.fpConf)|*.fpConf"),
@@ -456,53 +512,8 @@ void TransformWidgetPanel::OnLoad(wxCommandEvent& event)
     if (FD->GetReturnCode()==wxID_OK)
     {
         std::string filename= (const char*) ( FD->GetPath().mb_str() );
-        FILE *ff;
-        ff = fopen( filename.c_str() , "r" );
-        if (ff!=NULL)
-        {
-            char tmpStr[128];
-            float t0,t1,t2,t3;
-            fscanf(ff,"%s\n",tmpStr);  // ActualPoint:
-            fscanf(ff,"%f  %f  %f\n",&t0,&t1,&t2);
-            mActualPoint[0]=t0;
-            mActualPoint[1]=t1;
-            mActualPoint[2]=t2;
-
-            vtkMatrix4x4 *m = t->GetMatrix();
-            fscanf(ff,"%s\n",tmpStr); // Transform:
-            fscanf(ff,"%f %f  %f %f\n",&t0,&t1,&t2,&t3);
-            m->SetElement(0,0,t0);
-            m->SetElement(1,0,t1);
-            m->SetElement(2,0,t2);
-            m->SetElement(3,0,t3);
-            fscanf(ff,"%f %f  %f %f\n",&t0,&t1,&t2,&t3);
-            m->SetElement(0,1,t0);
-            m->SetElement(1,1,t1);
-            m->SetElement(2,1,t2);
-            m->SetElement(3,1,t3);
-            fscanf(ff,"%f %f  %f %f\n",&t0,&t1,&t2,&t3);
-            m->SetElement(0,2,t0);
-            m->SetElement(1,2,t1);
-            m->SetElement(2,2,t2);
-            m->SetElement(3,2,t3);
-            fscanf(ff,"%f %f  %f %f\n",&t0,&t1,&t2,&t3);
-            m->SetElement(0,3,t0);
-            m->SetElement(1,3,t1);
-            m->SetElement(2,3,t2);
-            m->SetElement(3,3,t3);
-            t->Update();
-
-            mBox->bbSetOutputActualPoint( mActualPoint );
-            mBox->bbSignalOutputModification(std::string("ActualPoint"));
-            mBox->bbSetOutputOut( t );
-            mBox->bbSignalOutputModification(std::string("Out"));
-
-            fclose(ff);
-        } else {   // else ff
-            printf("TransformWidgetPanel::OnLoad  ...Error... reading file \n");
-        } //ff
+        Load( filename );
     }     // dialog box
-
 }
 
 
@@ -555,6 +566,22 @@ BBTK_BLACK_BOX_IMPLEMENTATION(TransformWidget2,bbtk::WxBlackBox);
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
 //===== 
+
+//------------------------------------------------------
+void TransformWidget2::Save(std::string filename)
+{
+    TransformWidgetPanel *w = (TransformWidgetPanel*) bbGetOutputWidget( );
+    w->Save(filename);
+}
+
+//------------------------------------------------------
+void TransformWidget2::Load(std::string filename)
+{
+    TransformWidgetPanel *w = (TransformWidgetPanel*) bbGetOutputWidget( );
+    w->Load(filename);
+}
+
+//------------------------------------------------------
 void TransformWidget2::Process()
 {
     TransformWidgetPanel *w = (TransformWidgetPanel*) bbGetOutputWidget( );
@@ -563,6 +590,7 @@ void TransformWidget2::Process()
     {
         firsttime=false;
         w->_OnSetPoint();
+        bbSetOutputBox_TransformWidget2(this);
     }// if
 }
 
@@ -582,6 +610,7 @@ void TransformWidget2::bbUserSetDefaultValues()
 {
     firsttime=true;
     bbSetInputType(1);
+    bbSetOutputBox_TransformWidget2(NULL);
 }
 
 //===== 

diff --git a/bbtk/src/bbcreaMaracasVisuTransformWidget2.h b/bbtk/src/bbcreaMaracasVisuTransformWidget2.h
index 1e2e884c3e7e276023f1dfa6768d3eacdfd8985f..f77236d88368ec0b39e2710dde697d3675d0741d 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuTransformWidget2.h
+++ b/bbtk/src/bbcreaMaracasVisuTransformWidget2.h
@@ -25,7 +25,10 @@ class bbcreaMaracasVisu_EXPORT TransformWidget2
     BBTK_DECLARE_INPUT(PossiblePoint,std::vector< double >);
     BBTK_DECLARE_OUTPUT(Out,vtkLinearTransform *);
     BBTK_DECLARE_OUTPUT(ActualPoint,std::vector< double >);
+    BBTK_DECLARE_OUTPUT(Box_TransformWidget2,TransformWidget2*);
     BBTK_PROCESS(Process);
+    void Save(std::string filename);
+    void Load(std::string filename);
     void Process();
     BBTK_CREATE_WIDGET(CreateWidget);
     void CreateWidget(wxWindow*);
@@ -44,6 +47,7 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(TransformWidget2,bbtk::WxBlackBox);
     BBTK_INPUT(TransformWidget2,PossiblePoint,"Potential Point [x y z]",std::vector<double>,"");
     BBTK_OUTPUT(TransformWidget2,Out,"vtkTransform result",vtkLinearTransform *,"");
     BBTK_OUTPUT(TransformWidget2,ActualPoint,"Origin [x,y,z]",std::vector<double>,"");
+    BBTK_OUTPUT(TransformWidget2,Box_TransformWidget2,"bbtk box TransformWidget2",TransformWidget2*,"");
 BBTK_END_DESCRIBE_BLACK_BOX(TransformWidget2);
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)

diff --git a/bbtk/src/bbcreaMaracasVisuTransformWidget2_tool.cxx b/bbtk/src/bbcreaMaracasVisuTransformWidget2_tool.cxx
new file mode 100644 (file)
index 0000000..ed2c15d
--- /dev/null
+++ b/bbtk/src/bbcreaMaracasVisuTransformWidget2_tool.cxx
@@ -0,0 +1,86 @@
+//===== 
+// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
+//===== 
+#include "bbcreaMaracasVisuTransformWidget2_tool.h"
+#include "bbcreaMaracasVisuPackage.h"
+namespace bbcreaMaracasVisu
+{
+
+BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,TransformWidget2_tool)
+BBTK_BLACK_BOX_IMPLEMENTATION(TransformWidget2_tool,bbtk::AtomicBlackBox);
+//===== 
+// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
+//===== 
+void TransformWidget2_tool::Process()
+{
+
+// THE MAIN PROCESSING METHOD BODY
+//   Here we simply set the input 'In' value to the output 'Out'
+//   And print out the output value
+// INPUT/OUTPUT ACCESSORS ARE OF THE FORM :
+//    void bbSet{Input|Output}NAME(const TYPE&)
+//    const TYPE& bbGet{Input|Output}NAME() const 
+//    Where :
+//    * NAME is the name of the input/output
+//      (the one provided in the attribute 'name' of the tag 'input')
+//    * TYPE is the C++ type of the input/output
+//      (the one provided in the attribute 'type' of the tag 'input')
+//    bbSetOutputOut( bbGetInputIn() );
+//    std::cout << "Output value = " <<bbGetOutputOut() << std::endl;
+  
+    if (bbGetInputType()==1)
+    {
+        if (bbGetInputParam01().size()==1)
+        {
+            bbGetInputBox_TransformWidget2()->Save( bbGetInputParam01()[0] );
+        }
+    } // Type 1 Save
+    if (bbGetInputType()==2)
+    {
+        if (bbGetInputParam01().size()==1)
+        {
+            bbGetInputBox_TransformWidget2()->Load( bbGetInputParam01()[0] );
+        }
+    } // Type 2 Load
+
+}
+//===== 
+// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
+//===== 
+void TransformWidget2_tool::bbUserSetDefaultValues()
+{
+
+//  SET HERE THE DEFAULT INPUT/OUTPUT VALUES OF YOUR BOX 
+//    Here we initialize the input 'In' to 0
+   bbSetInputType(0);
+  
+}
+//===== 
+// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
+//===== 
+void TransformWidget2_tool::bbUserInitializeProcessing()
+{
+
+//  THE INITIALIZATION METHOD BODY :
+//    Here does nothing 
+//    but this is where you should allocate the internal/output pointers 
+//    if any 
+
+  
+}
+//===== 
+// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
+//===== 
+void TransformWidget2_tool::bbUserFinalizeProcessing()
+{
+
+//  THE FINALIZATION METHOD BODY :
+//    Here does nothing 
+//    but this is where you should desallocate the internal/output pointers 
+//    if any
+  
+}
+}
+// EO namespace bbcreaMaracasVisu
+
+

diff --git a/bbtk/src/bbcreaMaracasVisuTransformWidget2_tool.h b/bbtk/src/bbcreaMaracasVisuTransformWidget2_tool.h
new file mode 100644 (file)
index 0000000..e314c80
--- /dev/null
+++ b/bbtk/src/bbcreaMaracasVisuTransformWidget2_tool.h
@@ -0,0 +1,53 @@
+//===== 
+// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
+//===== 
+#ifndef __bbcreaMaracasVisuTransformWidget2_tool_h_INCLUDED__
+#define __bbcreaMaracasVisuTransformWidget2_tool_h_INCLUDED__
+
+#include "bbcreaMaracasVisu_EXPORT.h"
+#include "bbtkAtomicBlackBox.h"
+#include "iostream"
+
+#include "bbcreaMaracasVisuTransformWidget2.h"
+
+
+namespace bbcreaMaracasVisu
+{
+
+class bbcreaMaracasVisu_EXPORT TransformWidget2_tool
+ : 
+   public bbtk::AtomicBlackBox
+{
+  BBTK_BLACK_BOX_INTERFACE(TransformWidget2_tool,bbtk::AtomicBlackBox);
+//===== 
+// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
+//===== 
+  BBTK_DECLARE_INPUT(Type,int);
+    BBTK_DECLARE_INPUT(Param01,std::vector<std::string>);
+    BBTK_DECLARE_INPUT(Box_TransformWidget2,TransformWidget2*);
+//  BBTK_DECLARE_OUTPUT(Out,double);
+  BBTK_PROCESS(Process);
+  void Process();
+//===== 
+// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
+//===== 
+};
+
+BBTK_BEGIN_DESCRIBE_BLACK_BOX(TransformWidget2_tool,bbtk::AtomicBlackBox);
+  BBTK_NAME("TransformWidget2_tool");
+  BBTK_AUTHOR("InfoDev");
+  BBTK_DESCRIPTION("No Description.");
+  BBTK_CATEGORY("empty");
+  BBTK_INPUT(TransformWidget2_tool,Type,"(default 0)  0:Nothing 1:Save file configuration 2:Load file configuration",int,"");
+  BBTK_INPUT(TransformWidget2_tool,Param01,"1:[FileName_save] 2:[FileName_load]",std::vector<std::string>,"");
+  BBTK_INPUT(TransformWidget2_tool,Box_TransformWidget2,"bbtk Box TransformWidget2",TransformWidget2*,"");
+//  BBTK_OUTPUT(TransformWidget2_tool,Out,"First output",double,"");
+BBTK_END_DESCRIBE_BLACK_BOX(TransformWidget2_tool);
+//===== 
+// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
+//===== 
+}
+// EO namespace bbcreaMaracasVisu
+
+#endif // __bbcreaMaracasVisuTransformWidget2_tool_h_INCLUDED__
+

diff --git a/bbtk/src/bbmaracasvisuSliderMinMax.cxx b/bbtk/src/bbmaracasvisuSliderMinMax.cxx
index e9cc90a0f2234b1a5b7a6efe6196d2c7fd4534cb..6b432f44a4ffd72c96f2429c94b5bead59b9cb3b 100644 (file)
--- a/bbtk/src/bbmaracasvisuSliderMinMax.cxx
+++ b/bbtk/src/bbmaracasvisuSliderMinMax.cxx
@@ -110,12 +110,13 @@ void SliderMinMax::Process()
        if (mwxwidget!=NULL)
        {
                mwxwidget -> setRepresentedValues( bbGetInputInMin(), bbGetInputInMax() );
-               if (firsttime==true)
-               {
-                       firsttime=false;
+//             if (firsttime==true)
+//             {
+//                     firsttime=false;
                        mwxwidget -> SetStart(bbGetInputInMinShow());
-                       mwxwidget -> SetEnd(bbGetInputInMaxShow());  
-               }
+                       mwxwidget -> SetEnd(bbGetInputInMaxShow());
+//             }
+
                bbSetOutputOutStart(mwxwidget->GetStart());
                bbSetOutputOutEnd(mwxwidget->GetEnd());
                bbSetOutputOutActual(mwxwidget->GetActual());