#3503 Mesh_tool_ApplySurface

diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg
index 05b035d973efa3267bb2c270c51b41d2e3e1a7d2..2838285aa2ae3bfd3bb3d079dcc6377fdc49017d 100644 (file)
--- 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
-# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg
+# - /home/garzon/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg
 # ----------------------------------
 
 APP_START
@@ -72,7 +72,7 @@ COMPLEX_PORT
 meshmanagermodel
 -150.374274:130.740991:-900.000000
 FIN_COMPLEX_PORT
-BOXES:64
+BOXES:67
 BOX
 creaMaracasVisu:ShowNPoints:showNpoints
 ISEXEC:FALSE
@@ -538,18 +538,6 @@ ISEXEC:FALSE
 -243.139318:58.880437:-900.000000
 FIN_BOX
 BOX
-wx:CheckBox:Box102
-ISEXEC:FALSE
--64.336507:55.130855:-900.000000
--42.596507:52.630855:-900.000000
-PORT
-In:"true"
-PORT
-ReactiveOnKeystroke:"true"
-PORT
-Title:"Close Spline"
-FIN_BOX
-BOX
 wx:CheckBox:Box103
 ISEXEC:FALSE
 -8.508716:70.854467:-900.000000
@@ -592,18 +580,52 @@ PORT
 Title:"CloseSurface"
 FIN_BOX
 BOX
-wx:CheckBox:Box107
+wx:ComboBox:Box108
+ISEXEC:FALSE
+-63.731818:76.682466:-900.000000
+-37.451818:74.182466:-900.000000
+FIN_BOX
+BOX
+std:AddStringToVector:Box109
 ISEXEC:FALSE
--44.952539:60.554001:-900.000000
--23.212539:58.054001:-900.000000
+-61.619335:85.076488:-900.000000
+-37.099335:82.576488:-900.000000
 PORT
-In:"false"
+In0:"Close Spline 1"
 PORT
-ReactiveOnKeystroke:"true"
+In1:"Close Spline 2"
+PORT
+StringVector:"Patch"
+FIN_BOX
+BOX
+std:StringSelect:Box110
+ISEXEC:FALSE
+-65.551330:66.131420:-900.000000
+-41.031330:63.631420:-900.000000
+PORT
+In0:"false false"
+PORT
+In1:"true false"
+PORT
+In2:"false true"
+FIN_BOX
+BOX
+std:GetVectorStringElement:Box111
+ISEXEC:FALSE
+-80.209213:59.630223:-900.000000
+-57.144213:57.130223:-900.000000
 PORT
-Title:"Close Spline 2"
+I:"0"
 FIN_BOX
-CONNECTIONS:139
+BOX
+std:GetVectorStringElement:Box112
+ISEXEC:FALSE
+-50.087865:56.742292:-900.000000
+-27.022865:54.242292:-900.000000
+PORT
+I:"1"
+FIN_BOX
+CONNECTIONS:142
 CONNECTION
 Box06:LstContourPointsX:Box04:LstX
 NumberOfControlPoints:0
@@ -974,15 +996,6 @@ CONNECTION
 Box57:Out:Box100:sk1
 NumberOfControlPoints:0
 CONNECTION
-Box102:Widget:Box50:Widget5
-NumberOfControlPoints:0
-CONNECTION
-Box102:Out:Box06:OpenClose
-NumberOfControlPoints:0
-CONNECTION
-Box102:Out:Box29:OpenClose
-NumberOfControlPoints:0
-CONNECTION
 Box103:Out:Box104:Active
 NumberOfControlPoints:0
 CONNECTION
@@ -1013,12 +1026,30 @@ CONNECTION
 Box103:Widget:Box50:Widget8
 NumberOfControlPoints:0
 CONNECTION
-Box107:Widget:Box50:Widget6
+Box109:Out:Box108:In
+NumberOfControlPoints:0
+CONNECTION
+Box108:Out:Box110:In
+NumberOfControlPoints:0
+CONNECTION
+Box110:Out:Box111:In
+NumberOfControlPoints:0
+CONNECTION
+Box110:Out:Box112:In
+NumberOfControlPoints:0
+CONNECTION
+Box108:Widget:Box50:Widget5
+NumberOfControlPoints:0
+CONNECTION
+Box111:Out:Box06:OpenClose
+NumberOfControlPoints:0
+CONNECTION
+Box112:Out:Box06:OpenClose2
 NumberOfControlPoints:0
 CONNECTION
-Box107:Out:Box06:OpenClose2
+Box112:Out:Box29:OpenClose2
 NumberOfControlPoints:0
 CONNECTION
-Box107:Out:Box29:OpenClose2
+Box111:Out:Box29:OpenClose
 NumberOfControlPoints:0
 APP_END

diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs
index b8e9bb1622aecd919505aa979e46d9db01658001..86f8581020e2a9be33d023c4be874082496c1171 100644 (file)
--- 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)
-# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs
+# - /home/garzon/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs
 # ----------------------------------
 
 include std
@@ -192,11 +192,6 @@ new std:VectorFilterString Box100
 
 new std:ConcatStrings Box101
 
-new wx:CheckBox Box102
-  set Box102.In "true"
-  set Box102.ReactiveOnKeystroke "true"
-  set Box102.Title "Close Spline"
-
 new wx:CheckBox Box103
   set Box103.In "false"
   set Box103.ReactiveOnKeystroke "true"
@@ -214,10 +209,23 @@ 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"
+new wx:ComboBox Box108
+
+new std:AddStringToVector Box109
+  set Box109.In0 "Close Spline 1"
+  set Box109.In1 "Close Spline 2"
+  set Box109.StringVector "Patch"
+
+new std:StringSelect Box110
+  set Box110.In0 "false false"
+  set Box110.In1 "true false"
+  set Box110.In2 "false true"
+
+new std:GetVectorStringElement Box111
+  set Box111.I "0"
+
+new std:GetVectorStringElement Box112
+  set Box112.I "1"
 
 
 connect Box06.LstContourPointsX Box04.LstX
@@ -328,9 +336,6 @@ connect Box99.Out Box58.StringVector
 connect Box100.Out1 Box101.In1
 connect Box101.Out Box60.Type
 connect Box57.Out Box100.sk1
-connect Box102.Widget Box50.Widget5
-connect Box102.Out Box06.OpenClose
-connect Box102.Out Box29.OpenClose
 connect Box103.Out Box104.Active
 connect Box66.Out Box104.Renderer
 connect Box103.BoxChange Box104.BoxExecute
@@ -341,9 +346,15 @@ 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
+connect Box109.Out Box108.In
+connect Box108.Out Box110.In
+connect Box110.Out Box111.In
+connect Box110.Out Box112.In
+connect Box108.Widget Box50.Widget5
+connect Box111.Out Box06.OpenClose
+connect Box112.Out Box06.OpenClose2
+connect Box112.Out Box29.OpenClose2
+connect Box111.Out Box29.OpenClose
 
 # Complex input ports
 input point showNpoints.In " "

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ModelShowNPoints.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ModelShowNPoints.cxx
index a66c92d6be55c1fa9316a09aa42dfb007c4a72eb..baac364a80e62d4610c0b82ee387a9d15b921240 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ModelShowNPoints.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ModelShowNPoints.cxx
@@ -284,7 +284,6 @@ int ModelShowNPoints::ReadPoints_(FILE* ff)
     {
         fscanf(ff,"%lf%lf%lf%f%s",&x,&y,&z,&value,chartmp );  // x,y,z,value,label
         if (strcmp(chartmp,"<_VOID_>")==0) { strcpy(chartmp,""); }
-        cout << x << " " << y << " " << z << " " << value << endl;
         AddPoint(x,y,z, chartmp );
     }
     return size;