From 9b745fa3de3d74b231e63a95dc135b6f511363ac Mon Sep 17 00:00:00 2001
From: Eduardo DAVILA <davila@creatis.insa-lyon.fr>
Date: Thu, 30 Mar 2023 14:47:59 +0200
Subject: [PATCH] #3503 Mesh_tool_ApplySurface

---
 bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg | 132 ++++++++++++----------
 bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs |  19 ++--
 2 files changed, 81 insertions(+), 70 deletions(-)

diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg
index 97c235b..05b035d 100644
--- a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg
+++ b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.5 BBG BlackBox Diagram file
-# - /home/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg
+# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg
 # ----------------------------------
 
 APP_START
@@ -77,7 +77,7 @@ 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
@@ -100,14 +100,12 @@ PORT
 DoubleContour:"1"
 PORT
 NbPoints:"100"
-PORT
-OpenClose2:"false"
 FIN_BOX
 BOX
 wx:LayoutLine:Box08
 ISEXEC:FALSE
 -182.125107:-147.642582:-900.000000
--67.477639:-150.142582:-900.000000
+-148.805107:-150.142582:-900.000000
 FIN_BOX
 BOX
 vtk:UpdateRender:Box11
@@ -121,7 +119,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
@@ -140,14 +138,12 @@ ISEXEC:FALSE
 100.760145:27.137449:-900.000000
 PORT
 NbPoints:"40"
-PORT
-OpenClose2:"false"
 FIN_BOX
 BOX
 creaMaracasVisu:wxPopupMenu:Box57
 ISEXEC:FALSE
 -291.724262:77.620511:-900.000000
--91.924723:75.120511:-900.000000
+-269.659262:75.120511:-900.000000
 PORT
 WithCtrlKey:"true"
 FIN_BOX
@@ -155,7 +151,7 @@ BOX
 std:AddStringToVector:Box58
 ISEXEC:FALSE
 -304.297403:100.641432:-900.000000
--85.911256:98.141432:-900.000000
+-279.777403:98.141432:-900.000000
 PORT
 In0:"+  Add point"
 PORT
@@ -181,19 +177,19 @@ BOX
 creaMaracasVisu:ShowNPoints_Tools:Box60
 ISEXEC:FALSE
 -271.434991:53.686536:-900.000000
--95.625442:51.186536:-900.000000
+-248.999991:51.186536:-900.000000
 FIN_BOX
 BOX
 vtk:ImageVtkProperties:Box68
 ISEXEC:FALSE
 -111.766259:110.196821:-900.000000
--78.471190: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
@@ -211,7 +207,7 @@ BOX
 wx:ComboBox:Box78
 ISEXEC:FALSE
 -153.877713:-5.775167:-900.000000
--72.227681:-8.275167:-900.000000
+-127.597713:-8.275167:-900.000000
 PORT
 In:"Union Intersection Difference"
 FIN_BOX
@@ -219,7 +215,7 @@ BOX
 wx:LayoutLine:Box79
 ISEXEC:FALSE
 -144.841026:-82.628158:-900.000000
--64.477004:-85.128158:-900.000000
+-111.521026:-85.128158:-900.000000
 PORT
 Orientation:"H"
 PORT
@@ -229,7 +225,7 @@ BOX
 wx:CommandButton:Box80
 ISEXEC:FALSE
 -107.184095:21.801731:-900.000000
--73.875334:19.301731:-900.000000
+-84.909095:19.301731:-900.000000
 PORT
 Label:"Refresh"
 FIN_BOX
@@ -237,7 +233,7 @@ BOX
 std:MagicBox:Box66
 ISEXEC:FALSE
 -148.055989:80.219744:-900.000000
--89.432861:77.719744:-900.000000
+-126.455989:77.719744:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box67
@@ -261,7 +257,7 @@ BOX
 wx:Slider:Box34
 ISEXEC:FALSE
 -198.941120:-3.426364:-900.000000
--72.261064:-5.926364:-900.000000
+-169.141120:-5.926364:-900.000000
 PORT
 In:"50"
 PORT
@@ -279,7 +275,7 @@ BOX
 std:Div:Box36
 ISEXEC:FALSE
 -190.788172:-9.261990:-900.000000
--92.749352:-11.761990:-900.000000
+-169.863172:-11.761990:-900.000000
 PORT
 In2:"100"
 FIN_BOX
@@ -297,7 +293,7 @@ BOX
 wx:LayoutLine:Box38
 ISEXEC:FALSE
 -190.854929:-82.522396:-900.000000
--68.109352:-85.022396:-900.000000
+-157.534929:-85.022396:-900.000000
 PORT
 Orientation:"H"
 PORT
@@ -307,13 +303,13 @@ BOX
 wx:LayoutTab:Box39
 ISEXEC:FALSE
 -195.888488:-89.508403:-900.000000
--68.504172:-92.008403:-900.000000
+-162.568488:-92.008403:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box40
 ISEXEC:FALSE
 -148.825313:-89.038628:-900.000000
--64.792861:-91.538628:-900.000000
+-115.505313:-91.538628:-900.000000
 FIN_BOX
 BOX
 wx:CommandButton:Box42
@@ -335,7 +331,7 @@ BOX
 wx:LayoutLine:Box44
 ISEXEC:FALSE
 -154.036190:-43.432527:-900.000000
--65.266645:-45.932527:-900.000000
+-120.716190:-45.932527:-900.000000
 PORT
 Orientation:"V"
 PORT
@@ -353,13 +349,13 @@ BOX
 std:MagicBox:Box46
 ISEXEC:FALSE
 -137.131256:113.921532:-900.000000
--88.564256:111.421532:-900.000000
+-115.531256:111.421532:-900.000000
 FIN_BOX
 BOX
 wx:ComboBox:Box49
 ISEXEC:FALSE
 -182.639251:-13.479145:-900.000000
--74.517639:-15.979145:-900.000000
+-156.359251:-15.979145:-900.000000
 PORT
 In:"25 50 100 150"
 PORT
@@ -371,7 +367,7 @@ BOX
 wx:LayoutLine:Box50
 ISEXEC:FALSE
 -57.295971:-56.374591:-900.000000
--35.635971:-58.874591:-900.000000
+-23.975971:-58.874591:-900.000000
 PORT
 Orientation:"V"
 PORT
@@ -395,7 +391,7 @@ BOX
 std:MultipleInputs:Box53
 ISEXEC:FALSE
 -96.292390:-13.293248:-900.000000
--73.006729:-15.793248:-900.000000
+-74.322390:-15.793248:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:Box55
@@ -407,7 +403,7 @@ BOX
 creaMaracasVisu:MeshContours_Widget:Box62
 ISEXEC:FALSE
 -228.707140:-3.136982:-900.000000
--90.469987:-5.636982:-900.000000
+-205.912140:-5.636982:-900.000000
 PORT
 colorMesh:"1 1 0"
 FIN_BOX
@@ -421,31 +417,31 @@ BOX
 std:MagicBox:Box64
 ISEXEC:FALSE
 -243.113826:124.330340:-900.000000
--96.934448:121.830340:-900.000000
+-221.513826:121.830340:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box65
 ISEXEC:FALSE
 -220.296210:124.504415:-900.000000
--95.118274:122.004415:-900.000000
+-198.696210:122.004415:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box69
 ISEXEC:FALSE
 -197.793508:124.678490:-900.000000
--93.302100:122.178490:-900.000000
+-176.193508:122.178490:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box71
 ISEXEC:FALSE
 -273.359367:124.504415:-900.000000
--99.303370:122.004415:-900.000000
+-251.759367:122.004415:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:MeshContours_Widget:Box72
 ISEXEC:FALSE
 -180.819147:-56.018495:-900.000000
--86.679711:-58.518495:-900.000000
+-158.024147:-58.518495:-900.000000
 PORT
 colorMesh:"0 1 1"
 FIN_BOX
@@ -453,7 +449,7 @@ BOX
 wx:LayoutLine:Box81
 ISEXEC:FALSE
 -184.734921:-96.564525:-900.000000
--67.635567:-99.064525:-900.000000
+-151.414921:-99.064525:-900.000000
 PORT
 WinTitle:"Step 1.   Surface"
 FIN_BOX
@@ -461,25 +457,19 @@ BOX
 wx:LayoutTab:Box82
 ISEXEC:FALSE
 -142.286608:-51.350487:-900.000000
--64.319076:-53.850487:-900.000000
+-108.966608:-53.850487:-900.000000
 FIN_BOX
 BOX
 wx:OutputText:Box84
 ISEXEC:FALSE
 -127.611417:-38.148449:-900.000000
--77.214615:-40.648449:-900.000000
+-105.941417:-40.648449:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box86
 ISEXEC:FALSE
 -57.013911:-62.286670:-900.000000
--35.398911:-64.786670:-900.000000
-FIN_BOX
-BOX
-wx:OutputText:Box88
-ISEXEC:FALSE
--31.367033:-49.235762:-900.000000
--9.697033:-51.735762:-900.000000
+-23.693911:-64.786670:-900.000000
 FIN_BOX
 BOX
 creaVtk:MeshManager:Box92
@@ -505,7 +495,7 @@ BOX
 creaMaracasVisu:wxVtkBaseView_Info:Box96
 ISEXEC:FALSE
 -157.021318:90.558496:-900.000000
--71.543537:88.058496:-900.000000
+-129.741318:88.058496:-900.000000
 FIN_BOX
 BOX
 creaVtk:PolyDataNormals:Box97
@@ -517,7 +507,7 @@ BOX
 wx:LayoutLine:Box98
 ISEXEC:FALSE
 -143.911108:-17.437953:-900.000000
--64.398040:-19.937953:-900.000000
+-110.591108:-19.937953:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -525,7 +515,7 @@ BOX
 std:AddStringToVector:Box99
 ISEXEC:FALSE
 -309.024176:108.151656:-900.000000
--86.306076:105.651656:-900.000000
+-284.504176:105.651656:-900.000000
 PORT
 In0:"Auto Add Points (Start/Stop)"
 FIN_BOX
@@ -533,7 +523,7 @@ BOX
 std:VectorFilterString:Box100
 ISEXEC:FALSE
 -265.790737:67.872984:-900.000000
--79.311657:65.372984:-900.000000
+-237.750737:65.372984:-900.000000
 PORT
 In0:"0  1  2   3   4   5   6   7   8      9       10 "
 PORT
@@ -545,25 +535,25 @@ BOX
 std:ConcatStrings:Box101
 ISEXEC:FALSE
 -265.899318:61.380437:-900.000000
--84.591657:58.880437:-900.000000
+-243.139318:58.880437:-900.000000
 FIN_BOX
 BOX
 wx:CheckBox:Box102
 ISEXEC:FALSE
--52.607147:51.862017:-900.000000
--30.867147:49.362017:-900.000000
+-64.336507:55.130855:-900.000000
+-42.596507:52.630855:-900.000000
 PORT
 In:"true"
 PORT
 ReactiveOnKeystroke:"true"
 PORT
-Title:"Close "
+Title:"Close Spline"
 FIN_BOX
 BOX
 wx:CheckBox:Box103
 ISEXEC:FALSE
--32.928859:47.395747:-900.000000
--11.188859:44.895747:-900.000000
+-8.508716:70.854467:-900.000000
+13.231284:68.354467:-900.000000
 PORT
 In:"false"
 PORT
@@ -592,8 +582,8 @@ FIN_BOX
 BOX
 wx:CheckBox:Box106
 ISEXEC:FALSE
--17.803540:53.620811:-900.000000
-3.936460:51.120811:-900.000000
+-30.494323:65.542456:-900.000000
+-8.754323:63.042456:-900.000000
 PORT
 In:"true"
 PORT
@@ -601,7 +591,19 @@ ReactiveOnKeystroke:"true"
 PORT
 Title:"CloseSurface"
 FIN_BOX
-CONNECTIONS:137
+BOX
+wx:CheckBox:Box107
+ISEXEC:FALSE
+-44.952539:60.554001:-900.000000
+-23.212539:58.054001:-900.000000
+PORT
+In:"false"
+PORT
+ReactiveOnKeystroke:"true"
+PORT
+Title:"Close Spline 2"
+FIN_BOX
+CONNECTIONS:139
 CONNECTION
 Box06:LstContourPointsX:Box04:LstX
 NumberOfControlPoints:0
@@ -879,9 +881,6 @@ CONNECTION
 showNpoints:Widget:Box86:Widget2
 NumberOfControlPoints:0
 CONNECTION
-Box88:Widget:Box50:Widget9
-NumberOfControlPoints:0
-CONNECTION
 Box49:Widget:Box50:Widget2
 NumberOfControlPoints:0
 CONNECTION
@@ -990,9 +989,6 @@ CONNECTION
 Box66:Out:Box104:Renderer
 NumberOfControlPoints:0
 CONNECTION
-Box103:Widget:Box50:Widget6
-NumberOfControlPoints:0
-CONNECTION
 Box103:BoxChange:Box104:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
@@ -1013,4 +1009,16 @@ NumberOfControlPoints:0
 CONNECTION
 Box106:BoxChange:Box31:In7
 NumberOfControlPoints:0
+CONNECTION
+Box103:Widget:Box50:Widget8
+NumberOfControlPoints:0
+CONNECTION
+Box107:Widget:Box50:Widget6
+NumberOfControlPoints:0
+CONNECTION
+Box107:Out:Box06:OpenClose2
+NumberOfControlPoints:0
+CONNECTION
+Box107:Out:Box29:OpenClose2
+NumberOfControlPoints:0
 APP_END
diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs
index 056b417..b8e9bb1 100644
--- a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs
+++ b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.5 BBS BlackBox Script (Complex Box)
-# - /home/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs
+# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs
 # ----------------------------------
 
 include std
@@ -28,7 +28,6 @@ new creaVtk:CreateMeshFromPoints Box04
 new creaMaracasVisu:ManualContourModel_Box Box06
   set Box06.DoubleContour "1"
   set Box06.NbPoints "100"
-  set Box06.OpenClose2 "false"
 
 new wx:LayoutLine Box08
 
@@ -43,7 +42,6 @@ new std:MultipleInputs Box31
 
 new creaMaracasVisu:ManualContourModel_Box Box29
   set Box29.NbPoints "40"
-  set Box29.OpenClose2 "false"
 
 new creaMaracasVisu:wxPopupMenu Box57
   set Box57.WithCtrlKey "true"
@@ -170,8 +168,6 @@ new wx:OutputText Box84
 
 new wx:LayoutTab Box86
 
-new wx:OutputText Box88
-
 new creaVtk:MeshManager Box92
 
 new creaVtk:MeshManager_tool Box93
@@ -199,7 +195,7 @@ new std:ConcatStrings Box101
 new wx:CheckBox Box102
   set Box102.In "true"
   set Box102.ReactiveOnKeystroke "true"
-  set Box102.Title "Close "
+  set Box102.Title "Close Spline"
 
 new wx:CheckBox Box103
   set Box103.In "false"
@@ -218,6 +214,11 @@ new wx:CheckBox Box106
   set Box106.ReactiveOnKeystroke "true"
   set Box106.Title "CloseSurface"
 
+new wx:CheckBox Box107
+  set Box107.In "false"
+  set Box107.ReactiveOnKeystroke "true"
+  set Box107.Title "Close Spline 2"
+
 
 connect Box06.LstContourPointsX Box04.LstX
 connect showNpoints.lstIndexs Box06.LstIndexsIn
@@ -300,7 +301,6 @@ connect Box84.Widget Box44.Widget9
 connect Box86.Widget Box38.Widget2
 connect Box50.Widget Box86.Widget4
 connect showNpoints.Widget Box86.Widget2
-connect Box88.Widget Box50.Widget9
 connect Box49.Widget Box50.Widget2
 connect Box34.Widget Box50.Widget4
 connect Box57.BoxChange Box08.BoxExecute
@@ -333,7 +333,6 @@ connect Box102.Out Box06.OpenClose
 connect Box102.Out Box29.OpenClose
 connect Box103.Out Box104.Active
 connect Box66.Out Box104.Renderer
-connect Box103.Widget Box50.Widget6
 connect Box103.BoxChange Box104.BoxExecute
 connect Box104.BoxChange Box31.In6
 connect Box04.Out Box105.In
@@ -341,6 +340,10 @@ connect Box105.Out Box104.In
 connect Box106.Widget Box50.Widget7
 connect Box106.Out Box04.CloseSurface
 connect Box106.BoxChange Box31.In7
+connect Box103.Widget Box50.Widget8
+connect Box107.Widget Box50.Widget6
+connect Box107.Out Box06.OpenClose2
+connect Box107.Out Box29.OpenClose2
 
 # Complex input ports
 input point showNpoints.In " "
-- 
2.45.1