#3495 ShowNPoints Automatic add points

diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbg
index b454d217872d1f60af0053bfec207493a8df9963..b9585d05008642ce2a0fefbe9f47bfc99baa1f11 100644 (file)
--- a/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbg
+++ b/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbg
@@ -57,7 +57,7 @@ BOX
 wx:LayoutLine:Box08
 ISEXEC:FALSE
 -191.490538:-129.735971:-900.000000
-33.320000:-132.235971:-900.000000
+-158.170538:-132.235971:-900.000000
 FIN_BOX
 BOX
 vtk:UpdateRender:Box11
@@ -71,13 +71,13 @@ BOX
 vtk:ImageVtkProperties:Box68
 ISEXEC:FALSE
 -262.018178:-23.411381:-900.000000
-16.720000:-25.911381:-900.000000
+-239.483178:-25.911381:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box79
 ISEXEC:FALSE
 -142.444548:-98.205267:-900.000000
-33.320000:-100.705267:-900.000000
+-109.124548:-100.705267:-900.000000
 PORT
 Orientation:"H"
 PORT
@@ -87,7 +87,7 @@ BOX
 wx:CommandButton:Box80
 ISEXEC:FALSE
 -101.602098:27.184371:-900.000000
-21.000000:24.684371:-900.000000
+-79.327098:24.684371:-900.000000
 PORT
 Label:"Run"
 FIN_BOX
@@ -101,13 +101,13 @@ BOX
 std:MagicBox:Box67
 ISEXEC:FALSE
 -67.526006:124.007723:-900.000000
-8.680000:121.507723:-900.000000
+-45.926006:121.507723:-900.000000
 FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box35
 ISEXEC:FALSE
 -107.091396:123.633118:-900.000000
-6.920000:121.133118:-900.000000
+-83.881396:121.133118:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:PolyDataToActor_Widget:Box37
@@ -129,7 +129,7 @@ BOX
 wx:CommandButton:Box42
 ISEXEC:FALSE
 -91.903796:13.441695:-900.000000
-21.000000:10.941695:-900.000000
+-69.628796:10.941695:-900.000000
 PORT
 Label:"Apply  (Magenta->To Red)"
 FIN_BOX
@@ -137,7 +137,7 @@ BOX
 wx:CommandButton:Box43
 ISEXEC:FALSE
 -80.312782:7.645253:-900.000000
-21.000000:5.145253:-900.000000
+-58.037782:5.145253:-900.000000
 PORT
 Label:"Reset Tool"
 FIN_BOX
@@ -145,7 +145,7 @@ BOX
 wx:LayoutLine:Box44
 ISEXEC:FALSE
 -122.128535:-44.031647:-900.000000
-33.320000:-46.531647:-900.000000
+-88.808535:-46.531647:-900.000000
 PORT
 Orientation:"V"
 PORT
@@ -155,7 +155,7 @@ BOX
 creaVtk:MeshManager_tool:Box45
 ISEXEC:FALSE
 -88.859950:-132.940417:-900.000000
-10.440000:-135.440417:-900.000000
+-66.359950:-135.440417:-900.000000
 PORT
 Tool:"30"
 FIN_BOX
@@ -163,13 +163,13 @@ BOX
 std:MagicBox:Box46
 ISEXEC:FALSE
 -139.784698:124.004612:-900.000000
-8.680000:121.504612:-900.000000
+-118.184698:121.504612:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:Box51
 ISEXEC:FALSE
 -92.949669:-148.627142:-900.000000
-21.000000:-151.127142:-900.000000
+-70.979669:-151.127142:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box63
@@ -181,25 +181,25 @@ BOX
 std:MagicBox:Box64
 ISEXEC:FALSE
 -243.113826:124.330340:-900.000000
-8.680000:121.830340:-900.000000
+-221.513826:121.830340:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box65
 ISEXEC:FALSE
 -220.296210:124.504415:-900.000000
-8.680000:122.004415:-900.000000
+-198.696210:122.004415:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box69
 ISEXEC:FALSE
 -197.793508:124.678490:-900.000000
-8.680000:122.178490:-900.000000
+-176.193508:122.178490:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box71
 ISEXEC:FALSE
 -273.359367:124.504415:-900.000000
-8.680000:122.004415:-900.000000
+-251.759367:122.004415:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:MeshContours_Widget:Box72
@@ -221,19 +221,19 @@ BOX
 wx:LayoutTab:Box82
 ISEXEC:FALSE
 -123.564121:-52.398946:-900.000000
-33.320000:-54.898946:-900.000000
+-90.244121:-54.898946:-900.000000
 FIN_BOX
 BOX
 wx:OutputText:Box84
 ISEXEC:FALSE
 -90.166444:-34.853291:-900.000000
-19.240000:-37.353291:-900.000000
+-68.496444:-37.353291:-900.000000
 FIN_BOX
 BOX
 creaVtk:MeshManager:Box92
 ISEXEC:FALSE
 -180.315243:-41.937258:-900.000000
-9.680000:-44.437258:-900.000000
+-158.285243:-44.437258:-900.000000
 FIN_BOX
 BOX
 creaVtk:MeshManager_tool:Box93
@@ -247,19 +247,19 @@ BOX
 creaMaracasVisu:wxVtkBaseView_Info:Box96
 ISEXEC:FALSE
 -6.504018:23.833007:-900.000000
-27.280000:21.333007:-900.000000
+20.775982:21.333007:-900.000000
 FIN_BOX
 BOX
 creaVtk:PolyDataToImageData:Box97
 ISEXEC:FALSE
 -251.393014:-39.330447:-900.000000
-10.440000:-41.830447:-900.000000
+-228.593014:-41.830447:-900.000000
 FIN_BOX
 BOX
 vtk:CreateImage:Box98
 ISEXEC:FALSE
 -259.705405:-31.233561:-900.000000
-12.200000:-33.733561:-900.000000
+-237.775405:-33.733561:-900.000000
 PORT
 OutputFormat:"VTK_UNSIGNED_CHAR"
 FIN_BOX
@@ -267,7 +267,7 @@ BOX
 vtk:ImageGaussianSmooth:Box99
 ISEXEC:FALSE
 -255.182927:-47.291143:-900.000000
-12.200000:-49.791143:-900.000000
+-232.287927:-49.791143:-900.000000
 PORT
 StdDevX:"1"
 PORT
@@ -279,7 +279,7 @@ BOX
 vtk:MarchingCubes:Box100
 ISEXEC:FALSE
 -251.360924:-55.324497:-900.000000
-13.960000:-57.824497:-900.000000
+-229.075924:-57.824497:-900.000000
 PORT
 BoxProcessMode:"Manual"
 PORT
@@ -297,7 +297,7 @@ BOX
 creaVtk:MeshManager_tool:Box47
 ISEXEC:FALSE
 -60.096172:-132.552191:-900.000000
-10.440000:-135.052191:-900.000000
+-37.596172:-135.052191:-900.000000
 PORT
 Tool:"35"
 FIN_BOX
@@ -305,7 +305,7 @@ BOX
 creaVtk:MeshManager_tool:Box48
 ISEXEC:FALSE
 -31.571613:-131.892967:-900.000000
-10.440000:-134.392967:-900.000000
+-9.071613:-134.392967:-900.000000
 PORT
 Tool:"35"
 FIN_BOX
@@ -410,9 +410,6 @@ CONNECTION
 Box42:Widget:Box44:Widget6
 NumberOfControlPoints:0
 CONNECTION
-Box43:Widget:Box44:Widget7
-NumberOfControlPoints:0
-CONNECTION
 Box71:Out:Box96:wxVtkBaseView
 NumberOfControlPoints:0
 CONNECTION
@@ -478,4 +475,7 @@ NumberOfControlPoints:0
 CONNECTION
 Box39:Out:Box93:Mesh
 NumberOfControlPoints:0
+CONNECTION
+Box43:Widget:Box44:Widget2
+NumberOfControlPoints:0
 APP_END

diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbs
index cc7948856fa3969f885c22c6f668c8ecb5c4cac5..7a5653b7fa53a94d7cbf8f9ff1b58bb04e89f253 100644 (file)
--- a/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbs
+++ b/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbs
@@ -135,7 +135,6 @@ connect Box92.MeshBase Box72._polydata
 connect Box92.MeshBase Box37.polydata
 connect Box81.Widget Box08.Widget2
 connect Box42.Widget Box44.Widget6
-connect Box43.Widget Box44.Widget7
 connect Box71.Out Box96.wxVtkBaseView
 connect Box96.vtkRenderer Box66.In
 connect Box37.widget Box79.Widget7
@@ -158,6 +157,7 @@ connect Box80.BoxChange Box100.BoxExecute
 connect Box37.boxchange Box11.BoxExecute
 connect Box41.Out Box39.In
 connect Box39.Out Box93.Mesh
+connect Box43.Widget Box44.Widget2
 
 # Complex input ports
 input mesh Box67.In " "

diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbg
index 2d6847c2c9458933b5fcce8536de12727b3f5613..b5eb6ae0d2d3a78cfd43d05e31bc195f6bead85a 100644 (file)
--- a/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbg
+++ b/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbg
@@ -132,16 +132,16 @@ FIN_BOX
 BOX
 wx:CommandButton:Box43
 ISEXEC:FALSE
--26.322909:-16.783959:-900.000000
--4.047909:-19.283959:-900.000000
+-81.165560:-32.420102:-900.000000
+-58.890560:-34.920102:-900.000000
 PORT
 Label:"Reset Tool"
 FIN_BOX
 BOX
 wx:LayoutLine:Box44
 ISEXEC:FALSE
--470.941518:-32.162426:-900.000000
--437.621518:-34.662426:-900.000000
+-115.630816:-43.110903:-900.000000
+-82.310816:-45.610903:-900.000000
 PORT
 Orientation:"V"
 PORT
@@ -247,7 +247,7 @@ ISEXEC:FALSE
 -437.135083:3.054068:-900.000000
 -407.335083:0.554068:-900.000000
 PORT
-In:"40"
+In:"20"
 PORT
 Label:"true"
 PORT
@@ -703,12 +703,6 @@ CONNECTION
 Box81:Widget:Box08:Widget2
 NumberOfControlPoints:0
 CONNECTION
-Box42:Widget:Box44:Widget6
-NumberOfControlPoints:0
-CONNECTION
-Box43:Widget:Box44:Widget7
-NumberOfControlPoints:0
-CONNECTION
 Box96:vtkRenderer:Box66:In
 NumberOfControlPoints:0
 CONNECTION
@@ -1057,18 +1051,24 @@ CONNECTION
 Box117:Box_ConcatStrings:ExportIsActive_concatstring_tool:ExportIsActive_concatstring_tool
 NumberOfControlPoints:0
 CONNECTION
-Box108:Widget:Box44:Widget1
+Box37:vtkprop3D:Box92:Prop3D
+NumberOfControlPoints:0
+CONNECTION
+Box97:BoxChange:Box59:In3
 NumberOfControlPoints:0
 CONNECTION
-Box49:Widget:Box44:Widget2
+Box56:Widget:Box44:Widget4
 NumberOfControlPoints:0
 CONNECTION
-Box56:Widget:Box44:Widget3
+Box49:Widget:Box44:Widget3
 NumberOfControlPoints:0
 CONNECTION
-Box37:vtkprop3D:Box92:Prop3D
+Box108:Widget:Box44:Widget2
 NumberOfControlPoints:0
 CONNECTION
-Box97:BoxChange:Box59:In3
+Box42:Widget:Box44:Widget6
+NumberOfControlPoints:0
+CONNECTION
+Box43:Widget:Box44:Widget1
 NumberOfControlPoints:0
 APP_END

diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs
index 9f6a427a982bb998e66b74bba787d1f1a2ccea02..75c8bc3471190b80521e8309ce4f972793e0847e 100644 (file)
--- a/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs
+++ b/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs
@@ -85,7 +85,7 @@ new creaVtk:MeshDeformation Box39
   set Box39.TypeIn "1"
 
 new wx:Slider Box49
-  set Box49.In "40"
+  set Box49.In "20"
   set Box49.Label "true"
   set Box49.Max "40"
   set Box49.Min "1"
@@ -244,8 +244,6 @@ connect Box72._widget Box79.Widget6
 connect Box44.Widget Box82.Widget2
 connect Box82.Widget Box79.Widget2
 connect Box81.Widget Box08.Widget2
-connect Box42.Widget Box44.Widget6
-connect Box43.Widget Box44.Widget7
 connect Box96.vtkRenderer Box66.In
 connect Box37.widget Box79.Widget7
 connect Box40.Widget Box81.Widget2
@@ -361,11 +359,13 @@ connect Box117.Out Box119.In
 connect Box119.Out Box118.In1
 connect Box50.Out Box118.In2
 connect Box118.Out Box39.Active
-connect Box108.Widget Box44.Widget1
-connect Box49.Widget Box44.Widget2
-connect Box56.Widget Box44.Widget3
 connect Box37.vtkprop3D Box92.Prop3D
 connect Box97.BoxChange Box59.In3
+connect Box56.Widget Box44.Widget4
+connect Box49.Widget Box44.Widget3
+connect Box108.Widget Box44.Widget2
+connect Box42.Widget Box44.Widget6
+connect Box43.Widget Box44.Widget1
 
 # Complex input ports
 input mesh Box67.In " "

diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg
index 78e77912870fe17ca8e16b028d08fc0bd8da63f5..f78012175a1f524a49faf9b9ba195d78482c4b35 100644 (file)
--- a/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg
+++ b/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg
@@ -72,12 +72,12 @@ COMPLEX_PORT
 meshmanagermodel
 -150.374274:130.740991:-900.000000
 FIN_COMPLEX_PORT
-BOXES:74
+BOXES:75
 BOX
 creaMaracasVisu:ShowNPoints:showNpoints
 ISEXEC:FALSE
 24.787568:83.025910:-900.000000
-46.637568:80.525910:-900.000000
+61.627568:80.525910:-900.000000
 PORT
 Radio:"2"
 PORT
@@ -95,7 +95,7 @@ BOX
 creaMaracasVisu:ManualContourModel_Box:Box06
 ISEXEC:FALSE
 29.075845:30.364799:-900.000000
-52.285845:27.864799:-900.000000
+53.595845:27.864799:-900.000000
 PORT
 DoubleContour:"1"
 PORT
@@ -123,7 +123,7 @@ BOX
 creaMaracasVisu:DrawAxisTree3D:Box30
 ISEXEC:FALSE
 53.253812:0.984257:-900.000000
-75.433812:-1.515743:-900.000000
+81.293812:-1.515743:-900.000000
 PORT
 Colour:"0 0 1"
 PORT
@@ -139,7 +139,7 @@ BOX
 creaMaracasVisu:ManualContourModel_Box:Box29
 ISEXEC:FALSE
 76.240145:29.637449:-900.000000
-99.450145:27.137449:-900.000000
+100.760145:27.137449:-900.000000
 PORT
 NbPoints:"40"
 PORT
@@ -151,7 +151,7 @@ BOX
 creaMaracasVisu:wxPopupMenu:Box57
 ISEXEC:FALSE
 -291.724262:77.620511:-900.000000
-17.480000:75.120511:-900.000000
+-269.659262:75.120511:-900.000000
 PORT
 WithCtrlKey:"true"
 FIN_BOX
@@ -159,7 +159,7 @@ BOX
 std:AddStringToVector:Box58
 ISEXEC:FALSE
 -304.297403:100.641432:-900.000000
-24.520000:98.141432:-900.000000
+-279.777403:98.141432:-900.000000
 PORT
 In0:"+  Add point"
 PORT
@@ -179,51 +179,25 @@ In7:"+>  Insert group after"
 PORT
 In8:"-  Delete group"
 PORT
-In9:"Tool - 4 points to surface"
+In9:"Tool - 3 points to surface"
 FIN_BOX
 BOX
 creaMaracasVisu:ShowNPoints_Tools:Box60
 ISEXEC:FALSE
 -271.997629:60.063100:-900.000000
-12.200000:57.563100:-900.000000
-FIN_BOX
-BOX
-std:StringSelect:Box61
-ISEXEC:FALSE
--331.944913:69.352894:-900.000000
-24.520000:66.852894:-900.000000
-PORT
-In0:"5"
-PORT
-In1:"10"
-PORT
-In2:"20"
-PORT
-In3:"30"
-PORT
-In4:"40"
-PORT
-In5:"50"
-PORT
-In6:"0"
-PORT
-In7:"100"
-PORT
-In8:"110"
-PORT
-In9:"200"
+-249.562629:57.563100:-900.000000
 FIN_BOX
 BOX
 vtk:ImageVtkProperties:Box68
 ISEXEC:FALSE
 -111.766259:110.196821:-900.000000
-16.720000:107.696821:-900.000000
+-89.231259:107.696821:-900.000000
 FIN_BOX
 BOX
 std:VectorFilterDouble:Box70
 ISEXEC:FALSE
 49.750242:60.953814:-900.000000
-72.180242:58.453814:-900.000000
+76.030242:58.453814:-900.000000
 PORT
 Type:"11"
 FIN_BOX
@@ -240,8 +214,8 @@ FIN_BOX
 BOX
 wx:ComboBox:Box78
 ISEXEC:FALSE
--153.505707:-32.466606:-900.000000
-26.280000:-34.966606:-900.000000
+-158.791094:0.609690:-900.000000
+-132.511094:-1.890310:-900.000000
 PORT
 In:"Union Intersection Difference"
 FIN_BOX
@@ -259,7 +233,7 @@ BOX
 wx:CommandButton:Box80
 ISEXEC:FALSE
 -107.307880:18.830890:-900.000000
-21.000000:16.330890:-900.000000
+-85.032880:16.330890:-900.000000
 PORT
 Label:"Run"
 FIN_BOX
@@ -267,13 +241,13 @@ BOX
 std:MagicBox:Box66
 ISEXEC:FALSE
 -56.713712:80.848585:-900.000000
-8.680000:78.348585:-900.000000
+-35.113712:78.348585:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box67
 ISEXEC:FALSE
 -67.526006:124.007723:-900.000000
-8.680000:121.507723:-900.000000
+-45.926006:121.507723:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:PolyDataToActor_Widget:Box48
@@ -285,13 +259,13 @@ BOX
 vtk:vtkImageDataPointerRelay:Box35
 ISEXEC:FALSE
 -107.091396:123.633118:-900.000000
-6.920000:121.133118:-900.000000
+-83.881396:121.133118:-900.000000
 FIN_BOX
 BOX
 wx:Slider:Box34
 ISEXEC:FALSE
 -191.390233:59.951574:-900.000000
-29.800000:57.451574:-900.000000
+-161.590233:57.451574:-900.000000
 PORT
 In:"50"
 PORT
@@ -309,7 +283,7 @@ BOX
 std:Div:Box36
 ISEXEC:FALSE
 -183.237285:54.115948:-900.000000
-8.680000:51.615948:-900.000000
+-162.312285:51.615948:-900.000000
 PORT
 In2:"100"
 FIN_BOX
@@ -349,7 +323,7 @@ BOX
 wx:CommandButton:Box42
 ISEXEC:FALSE
 -91.903796:13.441695:-900.000000
-21.000000:10.941695:-900.000000
+-69.628796:10.941695:-900.000000
 PORT
 Label:"Apply  (Magenta->To Red)"
 FIN_BOX
@@ -357,7 +331,7 @@ BOX
 wx:CommandButton:Box43
 ISEXEC:FALSE
 -85.356515:8.083838:-900.000000
-21.000000:5.583838:-900.000000
+-63.081515:5.583838:-900.000000
 PORT
 Label:"Reset Tool"
 FIN_BOX
@@ -383,13 +357,13 @@ BOX
 std:MagicBox:Box46
 ISEXEC:FALSE
 -137.131256:113.921532:-900.000000
-8.680000:111.421532:-900.000000
+-115.531256:111.421532:-900.000000
 FIN_BOX
 BOX
 wx:ComboBox:Box49
 ISEXEC:FALSE
 -175.088364:49.898793:-900.000000
-26.280000:47.398793:-900.000000
+-148.808364:47.398793:-900.000000
 PORT
 In:"25 50 100 150"
 PORT
@@ -417,7 +391,7 @@ BOX
 creaMaracasVisu:ShowNPoints_Tools:Box52
 ISEXEC:FALSE
 -48.321002:-133.648902:-900.000000
-12.200000:-136.148902:-900.000000
+-25.886002:-136.148902:-900.000000
 PORT
 Type:"120"
 FIN_BOX
@@ -425,7 +399,7 @@ BOX
 std:MultipleInputs:Box53
 ISEXEC:FALSE
 -96.292390:-13.293248:-900.000000
-21.000000:-15.793248:-900.000000
+-74.322390:-15.793248:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:Box55
@@ -451,25 +425,25 @@ BOX
 std:MagicBox:Box64
 ISEXEC:FALSE
 -243.113826:124.330340:-900.000000
-8.680000:121.830340:-900.000000
+-221.513826:121.830340:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box65
 ISEXEC:FALSE
 -220.296210:124.504415:-900.000000
-8.680000:122.004415:-900.000000
+-198.696210:122.004415:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box69
 ISEXEC:FALSE
 -197.793508:124.678490:-900.000000
-8.680000:122.178490:-900.000000
+-176.193508:122.178490:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box71
 ISEXEC:FALSE
 -273.359367:124.504415:-900.000000
-8.680000:122.004415:-900.000000
+-251.759367:122.004415:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:MeshContours_Widget:Box72
@@ -503,7 +477,7 @@ BOX
 wx:OutputText:Box87
 ISEXEC:FALSE
 -35.032220:-44.152050:-900.000000
-19.240000:-46.652050:-900.000000
+-13.362220:-46.652050:-900.000000
 FIN_BOX
 BOX
 wx:OutputText:Box88
@@ -515,13 +489,13 @@ BOX
 creaVtk:MeshManager:Box92
 ISEXEC:FALSE
 -48.235592:-73.814750:-900.000000
-9.680000:-76.314750:-900.000000
+-26.205592:-76.314750:-900.000000
 FIN_BOX
 BOX
 creaVtk:MeshManager_tool:Box93
 ISEXEC:FALSE
 -61.627153:-92.643884:-900.000000
-10.440000:-95.143884:-900.000000
+-39.127153:-95.143884:-900.000000
 PORT
 Tool:"35"
 FIN_BOX
@@ -546,20 +520,6 @@ ISEXEC:FALSE
 148.840445:-31.939611:-900.000000
 FIN_BOX
 BOX
-wx:SpinCtrl:Box97
-ISEXEC:FALSE
-61.957510:-28.253822:-900.000000
-83.317510:-30.753822:-900.000000
-PORT
-Max:"50"
-PORT
-Min:"-50"
-PORT
-Selected:"0"
-PORT
-Title:"Scalar Factor"
-FIN_BOX
-BOX
 creaMaracasVisu:PolyDataToActor_Widget:Box98
 ISEXEC:FALSE
 110.387131:-53.955143:-900.000000
@@ -569,7 +529,7 @@ BOX
 wx:Slider:Box99
 ISEXEC:FALSE
 70.913562:-8.032501:-900.000000
-92.068562:-10.532501:-900.000000
+100.713562:-10.532501:-900.000000
 PORT
 In:"100"
 PORT
@@ -595,7 +555,7 @@ BOX
 wx:LayoutLine:Box101
 ISEXEC:FALSE
 75.262796:-54.319784:-900.000000
-97.032796:-56.819784:-900.000000
+108.582796:-56.819784:-900.000000
 PORT
 Orientation:"V"
 FIN_BOX
@@ -603,7 +563,7 @@ BOX
 wx:LayoutLine:Box102
 ISEXEC:FALSE
 82.113479:-63.996790:-900.000000
-103.883479:-66.496790:-900.000000
+115.433479:-66.496790:-900.000000
 PORT
 Orientation:"H"
 PORT
@@ -619,19 +579,19 @@ BOX
 creaMaracasVisu:wxVtkBaseView_Info:Box105
 ISEXEC:FALSE
 -238.523609:87.781768:-900.000000
-27.280000:85.281768:-900.000000
+-211.243609:85.281768:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box106
 ISEXEC:FALSE
 75.970731:-73.857697:-900.000000
-97.695731:-76.357697:-900.000000
+109.290731:-76.357697:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:MeshContours_Widget:Box107
 ISEXEC:FALSE
-47.519737:-53.973462:-900.000000
-70.424737:-56.473462:-900.000000
+43.206179:-55.286284:-900.000000
+66.111179:-57.786284:-900.000000
 PORT
 colorMesh:"1 1 0"
 FIN_BOX
@@ -660,20 +620,22 @@ FIN_BOX
 BOX
 std:AddStringToVector:Box111
 ISEXEC:FALSE
--292.044479:93.098246:-900.000000
-24.520000:90.598246:-900.000000
+-301.046687:92.535608:-900.000000
+-276.526687:90.035608:-900.000000
 PORT
-In0:"Tool - Inverse Normals"
+In0:"Tool - 4 points to surface"
+PORT
+In1:"Tool - Inverse Normals"
 FIN_BOX
 BOX
 std:VectorFilterString:Box112
 ISEXEC:FALSE
--275.952424:71.064509:-900.000000
-28.040000:68.564509:-900.000000
+-276.139970:71.814693:-900.000000
+-248.099970:69.314693:-900.000000
 PORT
-In0:"0 1    2   3   4   5   6   7       8     9       10 "
+In0:"0 1    2   3   4   5   6   7   8       9     10     11     12"
 PORT
-In1:"5 10 20 30 40 50 0  100   110  200   210"
+In1:"1  5  10 20 30 40 50 0  100   110  190   200   210"
 PORT
 Type:"2"
 FIN_BOX
@@ -681,7 +643,7 @@ BOX
 std:ConcatStrings:Box114
 ISEXEC:FALSE
 -270.706221:65.761298:-900.000000
-22.760000:63.261298:-900.000000
+-247.946221:63.261298:-900.000000
 FIN_BOX
 BOX
 creaVtk:PolyDataNormals:Box115
@@ -695,7 +657,41 @@ ISEXEC:FALSE
 124.746890:-37.687211:-900.000000
 147.151890:-40.187211:-900.000000
 FIN_BOX
-CONNECTIONS:152
+BOX
+wx:LayoutLine:Box117
+ISEXEC:FALSE
+-148.731505:-22.769839:-900.000000
+-115.411505:-25.269839:-900.000000
+PORT
+Orientation:"H"
+FIN_BOX
+BOX
+wx:Slider:Box118
+ISEXEC:FALSE
+71.035157:-27.538758:-900.000000
+100.835157:-30.038758:-900.000000
+PORT
+In:"0"
+PORT
+Label:"true"
+PORT
+Max:"50"
+PORT
+Min:"-50"
+PORT
+ReactiveOnTrack:"true"
+PORT
+Title:"Extrusion"
+FIN_BOX
+BOX
+std:AddStringToVector:Box119
+ISEXEC:FALSE
+-303.988262:110.204806:-900.000000
+-279.468262:107.704806:-900.000000
+PORT
+In0:"Auto Add Points (Start/Stop)"
+FIN_BOX
+CONNECTIONS:154
 CONNECTION
 Box06:LstContourPointsX:Box04:LstX
 NumberOfControlPoints:0
@@ -838,12 +834,6 @@ CONNECTION
 Box79:Widget:Box40:Widget2
 NumberOfControlPoints:0
 CONNECTION
-Box78:Widget:Box44:Widget2
-NumberOfControlPoints:0
-CONNECTION
-Box80:Widget:Box44:Widget5
-NumberOfControlPoints:0
-CONNECTION
 meshmanagermodel:meshmanagermodel:Box46:In
 NumberOfControlPoints:0
 CONNECTION
@@ -1012,9 +1002,6 @@ CONNECTION
 Box42:Widget:Box44:Widget6
 NumberOfControlPoints:0
 CONNECTION
-Box43:Widget:Box44:Widget7
-NumberOfControlPoints:0
-CONNECTION
 Box94:BoxChange:Box37:boxexecute
 NumberOfControlPoints:0
 CONNECTION
@@ -1033,18 +1020,9 @@ CONNECTION
 Box100:Out:Box95:Param
 NumberOfControlPoints:0
 CONNECTION
-Box97:Widget:Box101:Widget2
-NumberOfControlPoints:0
-CONNECTION
 Box99:Widget:Box101:Widget4
 NumberOfControlPoints:0
 CONNECTION
-Box97:Out:Box96:ScalarFactor
-NumberOfControlPoints:0
-CONNECTION
-Box97:BoxChange:Box103:In2
-NumberOfControlPoints:0
-CONNECTION
 Box99:BoxChange:Box103:In4
 NumberOfControlPoints:0
 CONNECTION
@@ -1152,4 +1130,28 @@ NumberOfControlPoints:0
 CONNECTION
 Box115:Out:Box93:Mesh
 NumberOfControlPoints:0
+CONNECTION
+Box43:Widget:Box44:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box78:Widget:Box117:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box80:Widget:Box117:Widget4
+NumberOfControlPoints:0
+CONNECTION
+Box117:Widget:Box44:Widget3
+NumberOfControlPoints:0
+CONNECTION
+Box118:Widget:Box101:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box118:Out:Box96:ScalarFactor
+NumberOfControlPoints:0
+CONNECTION
+Box118:BoxChange:Box103:In3
+NumberOfControlPoints:0
+CONNECTION
+Box119:Out:Box58:StringVector
+NumberOfControlPoints:0
 APP_END

diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs
index 5c556b620940053caf15c686ec2ff54690002ded..4178e0e001c176e03a8dcd2fb036eae52c659bbf 100644 (file)
--- a/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs
+++ b/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs
@@ -60,22 +60,10 @@ new std:AddStringToVector Box58
   set Box58.In6 "----------------------"
   set Box58.In7 "+>  Insert group after"
   set Box58.In8 "-  Delete group"
-  set Box58.In9 "Tool - 4 points to surface"
+  set Box58.In9 "Tool - 3 points to surface"
 
 new creaMaracasVisu:ShowNPoints_Tools Box60
 
-new std:StringSelect Box61
-  set Box61.In0 "5"
-  set Box61.In1 "10"
-  set Box61.In2 "20"
-  set Box61.In3 "30"
-  set Box61.In4 "40"
-  set Box61.In5 "50"
-  set Box61.In6 "0"
-  set Box61.In7 "100"
-  set Box61.In8 "110"
-  set Box61.In9 "200"
-
 new vtk:ImageVtkProperties Box68
 
 new std:VectorFilterDouble Box70
@@ -198,12 +186,6 @@ new creaVtk:PolyDataNormals Box95
 
 new creaVtk:LinearExtrusionFilter Box96
 
-new wx:SpinCtrl Box97
-  set Box97.Max "50"
-  set Box97.Min "-50"
-  set Box97.Selected "0"
-  set Box97.Title "Scalar Factor"
-
 new creaMaracasVisu:PolyDataToActor_Widget Box98
 
 new wx:Slider Box99
@@ -242,11 +224,12 @@ new creaVtk:MeshReduction_QuadricDecimation Box110
   set Box110.TargetReduction "0.5"
 
 new std:AddStringToVector Box111
-  set Box111.In0 "Tool - Inverse Normals"
+  set Box111.In0 "Tool - 4 points to surface"
+  set Box111.In1 "Tool - Inverse Normals"
 
 new std:VectorFilterString Box112
-  set Box112.In0 "0 1    2   3   4   5   6   7       8     9       10 "
-  set Box112.In1 "5 10 20 30 40 50 0  100   110  200   210"
+  set Box112.In0 "0 1    2   3   4   5   6   7   8       9     10     11     12"
+  set Box112.In1 "1  5  10 20 30 40 50 0  100   110  190   200   210"
   set Box112.Type "2"
 
 new std:ConcatStrings Box114
@@ -255,6 +238,20 @@ new creaVtk:PolyDataNormals Box115
 
 new creaVtk:PolyDataNormals Box116
 
+new wx:LayoutLine Box117
+  set Box117.Orientation "H"
+
+new wx:Slider Box118
+  set Box118.In "0"
+  set Box118.Label "true"
+  set Box118.Max "50"
+  set Box118.Min "-50"
+  set Box118.ReactiveOnTrack "true"
+  set Box118.Title "Extrusion"
+
+new std:AddStringToVector Box119
+  set Box119.In0 "Auto Add Points (Start/Stop)"
+
 
 connect Box06.LstContourPointsX Box04.LstX
 connect showNpoints.lstIndexs Box06.LstIndexsIn
@@ -298,8 +295,6 @@ connect Box34.BoxChange Box31.In2
 connect Box66.Out Box37.render
 connect Box38.Widget Box39.Widget2
 connect Box79.Widget Box40.Widget2
-connect Box78.Widget Box44.Widget2
-connect Box80.Widget Box44.Widget5
 connect Box46.Out Box45.MeshManagerModel
 connect Box49.OutString Box06.NbPoints
 connect Box42.BoxChange Box51.BoxExecute
@@ -346,17 +341,13 @@ connect Box92.MeshBase Box37.polydata
 connect Box37.boxchange Box72._execute
 connect Box81.Widget Box08.Widget2
 connect Box42.Widget Box44.Widget6
-connect Box43.Widget Box44.Widget7
 connect Box94.BoxChange Box37.boxexecute
 connect Box77.BoxChange Box94.BoxExecute
 connect Box04.Out Box95.In
 connect Box95.Out Box96.In
 connect Box99.Out Box100.In1
 connect Box100.Out Box95.Param
-connect Box97.Widget Box101.Widget2
 connect Box99.Widget Box101.Widget4
-connect Box97.Out Box96.ScalarFactor
-connect Box97.BoxChange Box103.In2
 connect Box99.BoxChange Box103.In4
 connect Box103.BoxChange Box98.boxexecute
 connect Box71.Out Box105.wxVtkBaseView
@@ -393,6 +384,14 @@ connect Box115.Out Box45.Mesh
 connect Box96.Out Box116.In
 connect Box116.Out Box109.In
 connect Box115.Out Box93.Mesh
+connect Box43.Widget Box44.Widget1
+connect Box78.Widget Box117.Widget2
+connect Box80.Widget Box117.Widget4
+connect Box117.Widget Box44.Widget3
+connect Box118.Widget Box101.Widget1
+connect Box118.Out Box96.ScalarFactor
+connect Box118.BoxChange Box103.In3
+connect Box119.Out Box58.StringVector
 
 # Complex input ports
 input point showNpoints.In " "

diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg
index 5122a066b42364d05ce70f48ef19dcbe83ce5479..0622cf74fc071d3db6b0d2df0bc7313df24a1395 100644 (file)
--- a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg
+++ b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg
@@ -72,12 +72,12 @@ COMPLEX_PORT
 meshmanagermodel
 -150.374274:130.740991:-900.000000
 FIN_COMPLEX_PORT
-BOXES:57
+BOXES:60
 BOX
 creaMaracasVisu:ShowNPoints:showNpoints
 ISEXEC:FALSE
 24.787568:83.025910:-900.000000
-46.637568:80.525910:-900.000000
+61.627568:80.525910:-900.000000
 PORT
 Radio:"2"
 PORT
@@ -95,7 +95,7 @@ BOX
 creaMaracasVisu:ManualContourModel_Box:Box06
 ISEXEC:FALSE
 29.075845:30.364799:-900.000000
-52.285845:27.864799:-900.000000
+53.595845:27.864799:-900.000000
 PORT
 DoubleContour:"1"
 PORT
@@ -109,7 +109,7 @@ BOX
 wx:LayoutLine:Box08
 ISEXEC:FALSE
 -182.125107:-147.642582:-900.000000
-33.320000:-150.142582:-900.000000
+-148.805107:-150.142582:-900.000000
 FIN_BOX
 BOX
 vtk:UpdateRender:Box11
@@ -123,7 +123,7 @@ BOX
 creaMaracasVisu:DrawAxisTree3D:Box30
 ISEXEC:FALSE
 66.011927:-0.645212:-900.000000
-88.191927:-3.145212:-900.000000
+94.051927:-3.145212:-900.000000
 PORT
 Colour:"0 0 1"
 PORT
@@ -139,7 +139,7 @@ BOX
 creaMaracasVisu:ManualContourModel_Box:Box29
 ISEXEC:FALSE
 76.240145:29.637449:-900.000000
-99.450145:27.137449:-900.000000
+100.760145:27.137449:-900.000000
 PORT
 NbPoints:"40"
 PORT
@@ -151,7 +151,7 @@ BOX
 creaMaracasVisu:wxPopupMenu:Box57
 ISEXEC:FALSE
 -291.724262:77.620511:-900.000000
-17.480000:75.120511:-900.000000
+-269.659262:75.120511:-900.000000
 PORT
 WithCtrlKey:"true"
 FIN_BOX
@@ -159,7 +159,7 @@ BOX
 std:AddStringToVector:Box58
 ISEXEC:FALSE
 -304.297403:100.641432:-900.000000
-24.520000:98.141432:-900.000000
+-279.777403:98.141432:-900.000000
 PORT
 In0:"+  Add point"
 PORT
@@ -184,46 +184,20 @@ FIN_BOX
 BOX
 creaMaracasVisu:ShowNPoints_Tools:Box60
 ISEXEC:FALSE
--271.997629:60.063100:-900.000000
-12.200000:57.563100:-900.000000
-FIN_BOX
-BOX
-std:StringSelect:Box61
-ISEXEC:FALSE
--269.755079:70.260206:-900.000000
-24.520000:67.760206:-900.000000
-PORT
-In0:"5"
-PORT
-In1:"10"
-PORT
-In2:"20"
-PORT
-In3:"30"
-PORT
-In4:"40"
-PORT
-In5:"50"
-PORT
-In6:"0"
-PORT
-In7:"100"
-PORT
-In8:"110"
-PORT
-In9:"210"
+-271.434991:53.686536:-900.000000
+-248.999991:51.186536:-900.000000
 FIN_BOX
 BOX
 vtk:ImageVtkProperties:Box68
 ISEXEC:FALSE
 -111.766259:110.196821:-900.000000
-16.720000:107.696821:-900.000000
+-89.231259:107.696821:-900.000000
 FIN_BOX
 BOX
 std:VectorFilterDouble:Box70
 ISEXEC:FALSE
 49.750242:60.953814:-900.000000
-72.180242:58.453814:-900.000000
+76.030242:58.453814:-900.000000
 PORT
 Type:"11"
 FIN_BOX
@@ -231,7 +205,7 @@ BOX
 creaVtk:BooleanOperationPolyDataFilter:Box77
 ISEXEC:FALSE
 -85.849843:-22.221970:-900.000000
-12.200000:-24.721970:-900.000000
+-62.119843:-24.721970:-900.000000
 PORT
 BoxProcessMode:"Manual"
 PORT
@@ -241,7 +215,7 @@ BOX
 wx:ComboBox:Box78
 ISEXEC:FALSE
 -153.877713:-5.775167:-900.000000
-26.280000:-8.275167:-900.000000
+-127.597713:-8.275167:-900.000000
 PORT
 In:"Union Intersection Difference"
 FIN_BOX
@@ -249,7 +223,7 @@ BOX
 wx:LayoutLine:Box79
 ISEXEC:FALSE
 -144.841026:-82.628158:-900.000000
-33.320000:-85.128158:-900.000000
+-111.521026:-85.128158:-900.000000
 PORT
 Orientation:"H"
 PORT
@@ -267,13 +241,13 @@ BOX
 std:MagicBox:Box66
 ISEXEC:FALSE
 -148.055989:80.219744:-900.000000
-8.680000:77.719744:-900.000000
+-126.455989:77.719744:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box67
 ISEXEC:FALSE
 -67.526006:124.007723:-900.000000
-8.680000:121.507723:-900.000000
+-45.926006:121.507723:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:PolyDataToActor_Widget:Box48
@@ -285,13 +259,13 @@ BOX
 vtk:vtkImageDataPointerRelay:Box35
 ISEXEC:FALSE
 -107.091396:123.633118:-900.000000
-6.920000:121.133118:-900.000000
+-83.881396:121.133118:-900.000000
 FIN_BOX
 BOX
 wx:Slider:Box34
 ISEXEC:FALSE
 -198.941120:-3.426364:-900.000000
-29.800000:-5.926364:-900.000000
+-169.141120:-5.926364:-900.000000
 PORT
 In:"50"
 PORT
@@ -309,7 +283,7 @@ BOX
 std:Div:Box36
 ISEXEC:FALSE
 -190.788172:-9.261990:-900.000000
-8.680000:-11.761990:-900.000000
+-169.863172:-11.761990:-900.000000
 PORT
 In2:"100"
 FIN_BOX
@@ -327,7 +301,7 @@ BOX
 wx:LayoutLine:Box38
 ISEXEC:FALSE
 -190.854929:-82.522396:-900.000000
-33.320000:-85.022396:-900.000000
+-157.534929:-85.022396:-900.000000
 PORT
 Orientation:"H"
 PORT
@@ -337,19 +311,19 @@ BOX
 wx:LayoutTab:Box39
 ISEXEC:FALSE
 -195.888488:-89.508403:-900.000000
-33.320000:-92.008403:-900.000000
+-162.568488:-92.008403:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box40
 ISEXEC:FALSE
 -148.825313:-89.038628:-900.000000
-33.320000:-91.538628:-900.000000
+-115.505313:-91.538628:-900.000000
 FIN_BOX
 BOX
 wx:CommandButton:Box42
 ISEXEC:FALSE
 -91.903796:13.441695:-900.000000
-21.000000:10.941695:-900.000000
+-69.628796:10.941695:-900.000000
 PORT
 Label:"Apply  (Magenta->To Red)"
 FIN_BOX
@@ -357,7 +331,7 @@ BOX
 wx:CommandButton:Box43
 ISEXEC:FALSE
 -85.356515:8.083838:-900.000000
-21.000000:5.583838:-900.000000
+-63.081515:5.583838:-900.000000
 PORT
 Label:"Reset Tool"
 FIN_BOX
@@ -375,7 +349,7 @@ BOX
 creaVtk:MeshManager_tool:Box45
 ISEXEC:FALSE
 -90.848443:-133.408000:-900.000000
-10.440000:-135.908000:-900.000000
+-68.348443:-135.908000:-900.000000
 PORT
 Tool:"30"
 FIN_BOX
@@ -383,7 +357,7 @@ BOX
 std:MagicBox:Box46
 ISEXEC:FALSE
 -137.131256:113.921532:-900.000000
-8.680000:111.421532:-900.000000
+-115.531256:111.421532:-900.000000
 FIN_BOX
 BOX
 wx:ComboBox:Box49
@@ -401,7 +375,7 @@ BOX
 wx:LayoutLine:Box50
 ISEXEC:FALSE
 -57.295971:-56.374591:-900.000000
-33.320000:-58.874591:-900.000000
+-23.975971:-58.874591:-900.000000
 PORT
 Orientation:"V"
 PORT
@@ -411,13 +385,13 @@ BOX
 std:MultipleInputs:Box51
 ISEXEC:FALSE
 -92.949669:-148.627142:-900.000000
-21.000000:-151.127142:-900.000000
+-70.979669:-151.127142:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ShowNPoints_Tools:Box52
 ISEXEC:FALSE
 -48.321002:-133.648902:-900.000000
-12.200000:-136.148902:-900.000000
+-25.886002:-136.148902:-900.000000
 PORT
 Type:"120"
 FIN_BOX
@@ -431,13 +405,13 @@ BOX
 std:MultipleInputs:Box55
 ISEXEC:FALSE
 -54.535637:-149.462814:-900.000000
-21.000000:-151.962814:-900.000000
+-32.565637:-151.962814:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:MeshContours_Widget:Box62
 ISEXEC:FALSE
 -228.707140:-3.136982:-900.000000
-13.960000:-5.636982:-900.000000
+-205.912140:-5.636982:-900.000000
 PORT
 colorMesh:"1 1 0"
 FIN_BOX
@@ -451,25 +425,25 @@ BOX
 std:MagicBox:Box64
 ISEXEC:FALSE
 -243.113826:124.330340:-900.000000
-8.680000:121.830340:-900.000000
+-221.513826:121.830340:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box65
 ISEXEC:FALSE
 -220.296210:124.504415:-900.000000
-8.680000:122.004415:-900.000000
+-198.696210:122.004415:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box69
 ISEXEC:FALSE
 -197.793508:124.678490:-900.000000
-8.680000:122.178490:-900.000000
+-176.193508:122.178490:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box71
 ISEXEC:FALSE
 -273.359367:124.504415:-900.000000
-8.680000:122.004415:-900.000000
+-251.759367:122.004415:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:MeshContours_Widget:Box72
@@ -483,7 +457,7 @@ BOX
 wx:LayoutLine:Box81
 ISEXEC:FALSE
 -184.734921:-96.564525:-900.000000
-33.320000:-99.064525:-900.000000
+-151.414921:-99.064525:-900.000000
 PORT
 WinTitle:"Step 1.   Surface"
 FIN_BOX
@@ -503,7 +477,7 @@ BOX
 wx:LayoutTab:Box86
 ISEXEC:FALSE
 -57.013911:-62.286670:-900.000000
-33.320000:-64.786670:-900.000000
+-23.693911:-64.786670:-900.000000
 FIN_BOX
 BOX
 wx:OutputText:Box87
@@ -515,19 +489,19 @@ BOX
 wx:OutputText:Box88
 ISEXEC:FALSE
 -31.367033:-49.235762:-900.000000
-19.240000:-51.735762:-900.000000
+-9.697033:-51.735762:-900.000000
 FIN_BOX
 BOX
 creaVtk:MeshManager:Box92
 ISEXEC:FALSE
 -56.608588:-81.789032:-900.000000
-9.680000:-84.289032:-900.000000
+-34.578588:-84.289032:-900.000000
 FIN_BOX
 BOX
 creaVtk:MeshManager_tool:Box93
 ISEXEC:FALSE
 -61.627153:-92.643884:-900.000000
-10.440000:-95.143884:-900.000000
+-39.127153:-95.143884:-900.000000
 PORT
 Tool:"35"
 FIN_BOX
@@ -541,15 +515,49 @@ BOX
 creaMaracasVisu:wxVtkBaseView_Info:Box96
 ISEXEC:FALSE
 -157.021318:90.558496:-900.000000
-27.280000:88.058496:-900.000000
+-129.741318:88.058496:-900.000000
 FIN_BOX
 BOX
 creaVtk:PolyDataNormals:Box97
 ISEXEC:FALSE
 -88.026860:-72.332654:-900.000000
-12.200000:-74.832654:-900.000000
+-65.731860:-74.832654:-900.000000
 FIN_BOX
-CONNECTIONS:122
+BOX
+wx:LayoutLine:Box98
+ISEXEC:FALSE
+-143.911108:-17.437953:-900.000000
+-110.591108:-19.937953:-900.000000
+PORT
+Orientation:"H"
+FIN_BOX
+BOX
+std:AddStringToVector:Box99
+ISEXEC:FALSE
+-309.024176:108.151656:-900.000000
+-284.504176:105.651656:-900.000000
+PORT
+In0:"Auto Add Points (Start/Stop)"
+FIN_BOX
+BOX
+std:VectorFilterString:Box100
+ISEXEC:FALSE
+-265.790737:67.872984:-900.000000
+-237.750737:65.372984:-900.000000
+PORT
+In0:"0  1  2   3   4   5   6   7   8      9       10 "
+PORT
+In1:"1  5 10 20 30 40 50 0  100   110   210"
+PORT
+Type:"2"
+FIN_BOX
+BOX
+std:ConcatStrings:Box101
+ISEXEC:FALSE
+-265.899318:61.380437:-900.000000
+-243.139318:58.880437:-900.000000
+FIN_BOX
+CONNECTIONS:125
 CONNECTION
 Box06:LstContourPointsX:Box04:LstX
 NumberOfControlPoints:0
@@ -590,12 +598,6 @@ CONNECTION
 Box58:Out:Box57:In
 NumberOfControlPoints:0
 CONNECTION
-Box57:Out:Box61:In
-NumberOfControlPoints:0
-CONNECTION
-Box61:Out:Box60:Type
-NumberOfControlPoints:0
-CONNECTION
 showNpoints:WidgetShowNPoints:Box60:WidgetShowNPoints
 NumberOfControlPoints:0
 CONNECTION
@@ -704,12 +706,6 @@ CONNECTION
 Box79:Widget:Box40:Widget2
 NumberOfControlPoints:0
 CONNECTION
-Box78:Widget:Box44:Widget2
-NumberOfControlPoints:0
-CONNECTION
-Box80:Widget:Box44:Widget5
-NumberOfControlPoints:0
-CONNECTION
 meshmanagermodel:meshmanagermodel:Box46:In
 NumberOfControlPoints:0
 CONNECTION
@@ -887,9 +883,6 @@ CONNECTION
 Box42:Widget:Box44:Widget6
 NumberOfControlPoints:0
 CONNECTION
-Box43:Widget:Box44:Widget7
-NumberOfControlPoints:0
-CONNECTION
 Box94:BoxChange:Box37:boxexecute
 NumberOfControlPoints:0
 CONNECTION
@@ -916,4 +909,28 @@ NumberOfControlPoints:0
 CONNECTION
 Box97:Out:Box93:Mesh
 NumberOfControlPoints:0
+CONNECTION
+Box43:Widget:Box44:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box78:Widget:Box98:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box80:Widget:Box98:Widget4
+NumberOfControlPoints:0
+CONNECTION
+Box98:Widget:Box44:Widget3
+NumberOfControlPoints:0
+CONNECTION
+Box99:Out:Box58:StringVector
+NumberOfControlPoints:0
+CONNECTION
+Box100:Out1:Box101:In1
+NumberOfControlPoints:0
+CONNECTION
+Box101:Out:Box60:Type
+NumberOfControlPoints:0
+CONNECTION
+Box57:Out:Box100:sk1
+NumberOfControlPoints:0
 APP_END

diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs
index 079f9ba8a7a4a1ba29c1805f6308c1eca9c2a437..377a0556d55ce5fad1e62a2257132b877ac6db0b 100644 (file)
--- a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs
+++ b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs
@@ -64,18 +64,6 @@ new std:AddStringToVector Box58
 
 new creaMaracasVisu:ShowNPoints_Tools Box60
 
-new std:StringSelect Box61
-  set Box61.In0 "5"
-  set Box61.In1 "10"
-  set Box61.In2 "20"
-  set Box61.In3 "30"
-  set Box61.In4 "40"
-  set Box61.In5 "50"
-  set Box61.In6 "0"
-  set Box61.In7 "100"
-  set Box61.In8 "110"
-  set Box61.In9 "210"
-
 new vtk:ImageVtkProperties Box68
 
 new std:VectorFilterDouble Box70
@@ -199,6 +187,19 @@ new creaMaracasVisu:wxVtkBaseView_Info Box96
 
 new creaVtk:PolyDataNormals Box97
 
+new wx:LayoutLine Box98
+  set Box98.Orientation "H"
+
+new std:AddStringToVector Box99
+  set Box99.In0 "Auto Add Points (Start/Stop)"
+
+new std:VectorFilterString Box100
+  set Box100.In0 "0  1  2   3   4   5   6   7   8      9       10 "
+  set Box100.In1 "1  5 10 20 30 40 50 0  100   110   210"
+  set Box100.Type "2"
+
+new std:ConcatStrings Box101
+
 
 connect Box06.LstContourPointsX Box04.LstX
 connect showNpoints.lstIndexs Box06.LstIndexsIn
@@ -213,8 +214,6 @@ connect Box29.LstContourPointsZ Box30.lstPointZ
 connect Box29.LstIndexsOut Box30.lstIndexs
 connect Box31.BoxChange Box11.BoxExecute
 connect Box58.Out Box57.In
-connect Box57.Out Box61.In
-connect Box61.Out Box60.Type
 connect showNpoints.WidgetShowNPoints Box60.WidgetShowNPoints
 connect Box57.BoxChange Box60.BoxExecute
 connect Box68.Spacing Box60.Spacing
@@ -246,8 +245,6 @@ connect Box04.Out Box77.In2
 connect Box66.Out Box37.render
 connect Box38.Widget Box39.Widget2
 connect Box79.Widget Box40.Widget2
-connect Box78.Widget Box44.Widget2
-connect Box80.Widget Box44.Widget5
 connect Box46.Out Box45.MeshManagerModel
 connect Box49.OutString Box06.NbPoints
 connect Box42.BoxChange Box51.BoxExecute
@@ -297,7 +294,6 @@ connect Box92.MeshBase Box37.polydata
 connect Box37.boxchange Box72._execute
 connect Box81.Widget Box08.Widget2
 connect Box42.Widget Box44.Widget6
-connect Box43.Widget Box44.Widget7
 connect Box94.BoxChange Box37.boxexecute
 connect Box77.BoxChange Box94.BoxExecute
 connect Box71.Out Box96.wxVtkBaseView
@@ -307,6 +303,14 @@ connect Box48.widget Box38.Widget8
 connect Box77.Out Box97.In
 connect Box97.Out Box45.Mesh
 connect Box97.Out Box93.Mesh
+connect Box43.Widget Box44.Widget1
+connect Box78.Widget Box98.Widget2
+connect Box80.Widget Box98.Widget4
+connect Box98.Widget Box44.Widget3
+connect Box99.Out Box58.StringVector
+connect Box100.Out1 Box101.In1
+connect Box101.Out Box60.Type
+connect Box57.Out Box100.sk1
 
 # Complex input ports
 input point showNpoints.In " "

diff --git a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx
index 621fe74a0a7f70bbee6c96f09bb52326ab622334..3d4a11b2b1dcb965b720ea046f29a80e162fc46b 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx
+++ b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx
@@ -29,7 +29,12 @@ void ShowNPoints_Tools::NearestPointToMesh( vtkPoints *points,vtkStaticPointLoca
     pM[2] = pM[2] / spc[2];
 }
 
-void ShowNPoints_Tools::CreatePatch01()
+void ShowNPoints_Tools::CreatePatch_3points()
+{
+    
+}
+
+void ShowNPoints_Tools::CreatePatch_4points()
 {
     WidgetShowNPoints* wsp = bbGetInputWidgetShowNPoints();
     
@@ -228,7 +233,7 @@ void ShowNPoints_Tools::CreatePatch01()
         wsp->SetOutputBox();
         wsp->UndoRedo_SaveCollection();
     } else {
-            printf("EED ShowNPoints_Tools::CreatePatch01  Warning patch not apply. Need juste one group with four points\n");
+            printf("EED ShowNPoints_Tools::CreatePatch_4points  Warning patch not apply. Need juste one group with four points\n");
     } // if
 }
 
@@ -257,6 +262,11 @@ void ShowNPoints_Tools::Process()
 
     if (bbGetInputWidgetShowNPoints()!=NULL)
     {
+        if (bbGetInputType()==1)
+        {
+            bbGetInputWidgetShowNPoints()->OnAutoAddPoints_tool();
+        } // if Type
+
         if (bbGetInputType()==5)
         {
             bbGetInputWidgetShowNPoints()->OnAddPoint_();
@@ -293,9 +303,13 @@ void ShowNPoints_Tools::Process()
         {
             bbGetInputWidgetShowNPoints()->OnResetCollections_();
         } // if Type
+        if (bbGetInputType()==190)
+        {
+            CreatePatch_3points();
+        } // if Type
         if (bbGetInputType()==200)
         {
-            CreatePatch01();
+            CreatePatch_4points();
         } // if Type
         if (bbGetInputType()==210)
         {

diff --git a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.h b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.h
index cb62f883b029b5472dfc9cdcfffa6ef29ef5350a..54f6b5d8279c41070de5f42d4e39c26ffe7d5b1d 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.h
+++ b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.h
@@ -33,7 +33,8 @@ class bbcreaMaracasVisu_EXPORT ShowNPoints_Tools
   BBTK_PROCESS(Process);
   void Process();
     
-    void CreatePatch01();
+    void CreatePatch_3points();
+    void CreatePatch_4points();
     void NearestPointToMesh( vtkPoints *points, vtkStaticPointLocator   *pointLocator, double *spc , double *p , double *pM   );
 
 //===== 
@@ -49,7 +50,7 @@ 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 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_1 - Create Mesh (based with one group and 4 points)",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 colletion  190:Tool 3 points to surface - Create Mesh (based with one group and 3 points)   200:Tool 4 points to surface - Create Mesh (based with one group and 4 points)",int,"");
 //  BBTK_OUTPUT(ShowNPoints_Tools,Out,"First output",double,"");
 BBTK_END_DESCRIBE_BLACK_BOX(ShowNPoints_Tools);
 //===== 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx
index 9b3a9436578a893008143d6a6e1ea2f52164562c..400838ca3ab105621afcf0a2640473793513696e 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx
@@ -612,8 +612,8 @@ void WidgetShowNPoints::AutoAddPoints()
 //------------------------------------------------------------------------
 void WidgetShowNPoints::OnAutoAddPoints_tool()
 {
+    StopTrackPoint();
     cbAutoAddPoints->SetValue( !cbAutoAddPoints->GetValue() );
-    OnTrackPoint_();
 }
 
 //------------------------------------------------------------------------