#3490 MeshManager

diff --git a/bbtk/bbs/appli/exampleMeshContours_Widget.bbg b/bbtk/bbs/appli/exampleMeshContours_Widget.bbg
index b6ccce150e03e9b055597ca75841302f4e29847b..1a9436c3b89c43d525adc8404cf2be46f6d0e2eb 100644 (file)
--- a/bbtk/bbs/appli/exampleMeshContours_Widget.bbg
+++ b/bbtk/bbs/appli/exampleMeshContours_Widget.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
-# - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /home/davila/Creatis/C12/creatools_source/creaMaracasVisu/bbtk/bbs/appli/exampleMeshContours_Widget.bbg
+# - BBTKGEditor v 1.5 BBG BlackBox Diagram file
+# - /Users/davila/Creatis/C22/creatools_source/creaMaracasVisu/bbtk/bbs/appli/exampleMeshContours_Widget.bbg
 # ----------------------------------
 
 APP_START
@@ -9,50 +9,50 @@ DESCRIPTION:Description ??
 AUTHOR:Author ??
 COMPLEXBOX:FALSE
 COMPLEXINPUTS:0
-BOXES:24
+BOXES:29
 BOX
 vtk:LoadHola:Box00
 ISEXEC:FALSE
-41.753243:164.219077:-900.000000
-77.303243:154.219077:-900.000000
+29.227270:49.265723:-900.000000
+50.777270:46.765723:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:Box01
 ISEXEC:FALSE
-46.202085:35.327152:-900.000000
-109.922085:25.327152:-900.000000
+32.341459:10.598146:-900.000000
+70.941459:8.098146:-900.000000
 FIN_BOX
 BOX
 creaVtk:OutputWindow:Box02
 ISEXEC:TRUE
-39.787895:-184.545777:-900.000000
-80.387895:-194.545777:-900.000000
+27.851526:-55.363733:-900.000000
+49.906526:-57.863733:-900.000000
 FIN_BOX
 BOX
 wx:LayoutSplit:Box03
 ISEXEC:TRUE
-97.223001:-183.795519:-900.000000
-136.303001:-193.795519:-900.000000
+68.056101:-55.138656:-900.000000
+90.816101:-57.638656:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
 BOX
 wx:LayoutLine:Box04
 ISEXEC:FALSE
--100.415389:-112.642064:-900.000000
--42.855389:-122.642064:-900.000000
+-70.290772:-33.792619:-900.000000
+-36.970772:-36.292619:-900.000000
 FIN_BOX
 BOX
 vtk:PolyDataToActor:Box06
 ISEXEC:FALSE
--12.906688:-9.541436:-900.000000
-32.333312:-19.541436:-900.000000
+-9.034682:-2.862431:-900.000000
+17.245318:-5.362431:-900.000000
 FIN_BOX
 BOX
 wx:Slider:Box07
 ISEXEC:FALSE
--99.730636:73.177947:-900.000000
--48.330636:63.177947:-900.000000
+-52.081203:36.317124:-900.000000
+-22.281203:33.817124:-900.000000
 PORT
 Label:"true"
 PORT
@@ -65,32 +65,32 @@ FIN_BOX
 BOX
 std:Div:Box08
 ISEXEC:FALSE
-6.164017:40.935396:-900.000000
-35.489017:30.935396:-900.000000
+4.314812:12.280619:-900.000000
+25.239812:9.780619:-900.000000
 PORT
 In2:"100"
 FIN_BOX
 BOX
 vtk:UpdateRender:Box09
 ISEXEC:FALSE
--16.666149:-114.681090:-900.000000
-23.658851:-124.681090:-900.000000
+-11.666304:-34.404327:-900.000000
+10.358696:-36.904327:-900.000000
 PORT
 Active:"true"
 FIN_BOX
 BOX
 creaVtk:PointPicker:Box10
 ISEXEC:FALSE
-42.793552:-43.061806:-900.000000
-79.743552:-53.061806:-900.000000
+29.955486:-12.918542:-900.000000
+51.650486:-15.418542:-900.000000
 PORT
 TypeEvent:"2"
 FIN_BOX
 BOX
 creaVtk:PlaneWidget:Box11
 ISEXEC:FALSE
--10.982291:-64.882180:-900.000000
-27.542709:-74.882180:-900.000000
+-7.687604:-19.464654:-900.000000
+14.157396:-21.964654:-900.000000
 PORT
 Active:"true"
 PORT
@@ -101,14 +101,14 @@ FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box12
 ISEXEC:FALSE
-39.801244:125.767709:-900.000000
-91.976244:115.767709:-900.000000
+27.860871:37.730313:-900.000000
+51.070871:35.230313:-900.000000
 FIN_BOX
 BOX
 wx:CheckBox:Box13
 ISEXEC:FALSE
--85.323644:15.751855:-900.000000
--48.998644:5.751855:-900.000000
+-62.868619:4.837773:-900.000000
+-41.238619:2.337773:-900.000000
 PORT
 In:"false"
 PORT
@@ -117,28 +117,28 @@ FIN_BOX
 BOX
 creaMaracasVisu:SetPosition:Box14
 ISEXEC:FALSE
-49.889747:-103.839314:-900.000000
-86.439747:-113.839314:-900.000000
+34.922823:-31.151794:-900.000000
+56.582823:-33.651794:-900.000000
 FIN_BOX
 BOX
 std:MathOperationVector:Box16
 ISEXEC:FALSE
-83.613689:-75.970874:-900.000000
-131.138689:-85.970874:-900.000000
+58.529582:-22.791262:-900.000000
+83.049582:-25.291262:-900.000000
 PORT
 Type:"3"
 FIN_BOX
 BOX
 vtk:ImageVtkProperties:Box17
 ISEXEC:FALSE
-85.277107:-54.156204:-900.000000
-130.627107:-64.156204:-900.000000
+59.693975:-16.246861:-900.000000
+82.228975:-18.746861:-900.000000
 FIN_BOX
 BOX
 wx:CheckBox:Box18
 ISEXEC:FALSE
--70.908661:-10.460208:-900.000000
--34.583661:-20.460208:-900.000000
+-40.995375:-4.821313:-900.000000
+-19.365375:-7.321313:-900.000000
 PORT
 In:"false"
 PORT
@@ -147,8 +147,8 @@ FIN_BOX
 BOX
 wx:ComboBox:Box19
 ISEXEC:FALSE
--126.349291:43.032686:-900.000000
--81.109291:33.032686:-900.000000
+-50.066385:11.787639:-900.000000
+-23.786385:9.287639:-900.000000
 PORT
 In:"Outline Wireframe Surface"
 PORT
@@ -157,20 +157,20 @@ FIN_BOX
 BOX
 std:MultipleInputs:Box20
 ISEXEC:FALSE
--71.597429:-38.406568:-900.000000
--31.897429:-48.406568:-900.000000
+-50.118200:-11.521970:-900.000000
+-28.148200:-14.021970:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:Box21
 ISEXEC:FALSE
--25.407295:-87.574080:-900.000000
-14.292705:-97.574080:-900.000000
+-17.785107:-26.272224:-900.000000
+4.184893:-28.772224:-900.000000
 FIN_BOX
 BOX
 creaVtk:ImageThreshold:Box65
 ISEXEC:FALSE
--179.529863:52.174605:-900.000000
--137.729863:42.174605:-900.000000
+-135.545976:28.220654:-900.000000
+-113.365976:25.720654:-900.000000
 PORT
 InValue:"255"
 PORT
@@ -183,8 +183,8 @@ FIN_BOX
 BOX
 vtk:ImageGaussianSmooth:Box66
 ISEXEC:FALSE
--181.359743:34.779658:-900.000000
--132.459743:24.779658:-900.000000
+-136.826892:23.002170:-900.000000
+-113.931892:20.502170:-900.000000
 PORT
 StdDevX:"3"
 PORT
@@ -195,18 +195,60 @@ FIN_BOX
 BOX
 vtk:MarchingCubes:Box67
 ISEXEC:FALSE
--192.302439:14.823947:-900.000000
--150.502439:4.823947:-900.000000
+-144.486779:17.015457:-900.000000
+-122.311779:14.515457:-900.000000
 PORT
 Value:"128"
 FIN_BOX
 BOX
 creaMaracasVisu:MeshContours_Widget:Box27
 ISEXEC:FALSE
--220.224552:-82.091612:-900.000000
--172.324552:-92.091612:-900.000000
+-46.871571:-23.970298:-900.000000
+-24.076571:-26.470298:-900.000000
 FIN_BOX
-CONNECTIONS:45
+BOX
+creaVtk:MeshReduction_DecimatePro:Box26
+ISEXEC:FALSE
+-138.960401:6.571018:-900.000000
+-115.465401:4.071018:-900.000000
+FIN_BOX
+BOX
+wx:ComboBox:Box28
+ISEXEC:FALSE
+-109.422525:34.540307:-900.000000
+-83.142525:32.040307:-900.000000
+PORT
+In:"0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1"
+PORT
+Selection:"10"
+PORT
+Title:"Decimate Optimization"
+FIN_BOX
+BOX
+wx:LayoutLine:Box29
+ISEXEC:FALSE
+-94.668891:-23.416167:-900.000000
+-61.348891:-25.916167:-900.000000
+PORT
+Orientation:"H"
+FIN_BOX
+BOX
+wx:ComboBox:Box30
+ISEXEC:FALSE
+-80.616423:37.874432:-900.000000
+-54.336423:35.374432:-900.000000
+PORT
+In:"Points Wireframe Surface"
+PORT
+Selection:"2"
+FIN_BOX
+BOX
+std:MultipleInputs:Box31
+ISEXEC:FALSE
+-43.887960:23.430851:-900.000000
+-21.917960:20.930851:-900.000000
+FIN_BOX
+CONNECTIONS:53
 CONNECTION
 Box01:Widget:Box03:Widget2
 NumberOfControlPoints:0
@@ -223,9 +265,6 @@ CONNECTION
 Box08:Out:Box06:Opacity
 NumberOfControlPoints:0
 CONNECTION
-Box07:BoxChange:Box06:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
 Box01:Renderer1:Box09:Renderer
 NumberOfControlPoints:0
 CONNECTION
@@ -247,9 +286,6 @@ CONNECTION
 Box13:Widget:Box04:Widget4
 NumberOfControlPoints:0
 CONNECTION
-Box07:Widget:Box04:Widget2
-NumberOfControlPoints:0
-CONNECTION
 Box13:Out:Box10:Active
 NumberOfControlPoints:0
 CONNECTION
@@ -319,12 +355,6 @@ CONNECTION
 Box66:Out:Box67:In
 NumberOfControlPoints:0
 CONNECTION
-Box67:Out:Box06:In
-NumberOfControlPoints:0
-CONNECTION
-Box67:Out:Box27:_polydata
-NumberOfControlPoints:0
-CONNECTION
 Box01:BoxChange:Box27:_execute
 NumberOfControlPoints:0
 CONNECTION
@@ -342,4 +372,40 @@ NumberOfControlPoints:0
 CONNECTION
 Box27:_widget:Box04:Widget8
 NumberOfControlPoints:0
+CONNECTION
+Box67:Out:Box26:In
+NumberOfControlPoints:0
+CONNECTION
+Box28:OutString:Box26:TargetReduction
+NumberOfControlPoints:0
+CONNECTION
+Box28:Widget:Box29:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box07:Widget:Box29:Widget4
+NumberOfControlPoints:0
+CONNECTION
+Box29:Widget:Box04:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box26:Out:Box06:In
+NumberOfControlPoints:0
+CONNECTION
+Box26:Out:Box27:_polydata
+NumberOfControlPoints:0
+CONNECTION
+Box30:Out:Box06:Representation
+NumberOfControlPoints:0
+CONNECTION
+Box30:Widget:Box29:Widget3
+NumberOfControlPoints:0
+CONNECTION
+Box30:BoxChange:Box31:In2
+NumberOfControlPoints:0
+CONNECTION
+Box07:BoxChange:Box31:In4
+NumberOfControlPoints:0
+CONNECTION
+Box31:BoxChange:Box06:BoxExecute
+NumberOfControlPoints:0
 APP_END

diff --git a/bbtk/bbs/appli/exampleMeshContours_Widget.bbs b/bbtk/bbs/appli/exampleMeshContours_Widget.bbs
index 4bfb5b239b9064cc49842971a86638bd73af8556..3dbf321c0851867d94c0c3aff8b551f487d15e97 100644 (file)
--- a/bbtk/bbs/appli/exampleMeshContours_Widget.bbs
+++ b/bbtk/bbs/appli/exampleMeshContours_Widget.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
-# - BBTKGEditor v 1.4 BBS BlackBox Script
-# - /home/davila/Creatis/C12/creatools_source/creaMaracasVisu/bbtk/bbs/appli/exampleMeshContours_Widget.bbs
+# - BBTKGEditor v 1.5 BBS BlackBox Script
+# - /Users/davila/Creatis/C22/creatools_source/creaMaracasVisu/bbtk/bbs/appli/exampleMeshContours_Widget.bbs
 # ----------------------------------
 
 # BBTK GEditor Script
@@ -92,6 +92,22 @@ new vtk:MarchingCubes Box67
 
 new creaMaracasVisu:MeshContours_Widget Box27
 
+new creaVtk:MeshReduction_DecimatePro Box26
+
+new wx:ComboBox Box28
+  set Box28.In "0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1"
+  set Box28.Selection "10"
+  set Box28.Title "Decimate Optimization"
+
+new wx:LayoutLine Box29
+  set Box29.Orientation "H"
+
+new wx:ComboBox Box30
+  set Box30.In "Points Wireframe Surface"
+  set Box30.Selection "2"
+
+new std:MultipleInputs Box31
+
 
 connect Box01.Widget Box03.Widget2
 
@@ -103,8 +119,6 @@ connect Box07.Out Box08.In1
 
 connect Box08.Out Box06.Opacity
 
-connect Box07.BoxChange Box06.BoxExecute
-
 connect Box01.Renderer1 Box09.Renderer
 
 connect Box01.Renderer1 Box10.Renderer
@@ -119,8 +133,6 @@ connect Box12.Out Box11.In
 
 connect Box13.Widget Box04.Widget4
 
-connect Box07.Widget Box04.Widget2
-
 connect Box13.Out Box10.Active
 
 connect Box01.wxVtkBaseView1 Box14.wxVtkBaseView
@@ -167,10 +179,6 @@ connect Box65.Out Box66.In
 
 connect Box66.Out Box67.In
 
-connect Box67.Out Box06.In
-
-connect Box67.Out Box27._polydata
-
 connect Box01.BoxChange Box27._execute
 
 connect Box01.wxVtkBaseView1 Box27._wxvtkbaseview3D1
@@ -183,6 +191,30 @@ connect Box01.wxVtkBaseView4 Box27._wxvtkbaseview2D3
 
 connect Box27._widget Box04.Widget8
 
+connect Box67.Out Box26.In
+
+connect Box28.OutString Box26.TargetReduction
+
+connect Box28.Widget Box29.Widget2
+
+connect Box07.Widget Box29.Widget4
+
+connect Box29.Widget Box04.Widget2
+
+connect Box26.Out Box06.In
+
+connect Box26.Out Box27._polydata
+
+connect Box30.Out Box06.Representation
+
+connect Box30.Widget Box29.Widget3
+
+connect Box30.BoxChange Box31.In2
+
+connect Box07.BoxChange Box31.In4
+
+connect Box31.BoxChange Box06.BoxExecute
+
 
 
 # Complex input ports

diff --git a/bbtk/bbs/boxes/MeshContours.bbg b/bbtk/bbs/boxes/MeshContours.bbg
index cfc167d39e019e145a60d388e411605f9d2ef75f..f19cee297cbcccae044ec03b9144811539cfa951 100644 (file)
--- a/bbtk/bbs/boxes/MeshContours.bbg
+++ b/bbtk/bbs/boxes/MeshContours.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
-# - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /home/davila/Creatis/C12/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/MeshContours.bbg
+# - BBTKGEditor v 1.5 BBG BlackBox Diagram file
+# - /Users/davila/Creatis/C22/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/MeshContours.bbg
 # ----------------------------------
 
 APP_START
@@ -11,63 +11,71 @@ COMPLEXBOX:TRUE
 COMPLEXBOXNAME:MeshContours
 PACKAGENAME:creaMaracasVisu
 COMPLEXOUTPUTS:0
-COMPLEXINPUTS:9
+COMPLEXINPUTS:11
 COMPLEX_PORT
 polydata
--329.802162:-44.982560:-900.000000
+-230.861513:-13.494768:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 execute
--282.941001:-44.500535:-900.000000
+-198.058701:-13.350160:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 wxvtkbaseview2D1
--192.110825:-45.883736:-900.000000
+-134.477577:-13.765121:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 wxvtkbaseview2D2
--153.842274:-46.344803:-900.000000
+-107.689592:-13.903441:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 wxvtkbaseview2D3
--131.711064:-46.805870:-900.000000
+-92.197745:-14.041761:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 wxvtkbaseview3D1
--16.213810:-45.376562:-900.000000
+-11.349667:-13.612969:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 opacity1
--481.199759:-51.531805:-900.000000
+-336.839831:-15.459541:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 opacity2
--445.697609:-53.560500:-900.000000
+-311.988326:-16.068150:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 opacity3
--405.630897:-56.603541:-900.000000
+-283.941628:-16.981062:-900.000000
 FIN_COMPLEX_PORT
-BOXES:28
+COMPLEX_PORT
+activeContour
+-160.803429:-14.929316:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+colorForMesh
+-46.834044:-8.364276:-900.000000
+FIN_COMPLEX_PORT
+BOXES:30
 BOX
 creaVtk:Cutter:Box22
 ISEXEC:FALSE
--247.405290:-314.719591:-900.000000
--215.205290:-324.719591:-900.000000
+-255.532958:-115.101695:-900.000000
+-234.317958:-117.601695:-900.000000
 FIN_BOX
 BOX
 creaVtk:Plane:Box23
 ISEXEC:FALSE
--244.019251:-296.725016:-900.000000
--212.294251:-306.725016:-900.000000
+-162.933164:-85.077349:-900.000000
+-141.768164:-87.577349:-900.000000
 PORT
 Normal:"0 0 1"
 FIN_BOX
 BOX
 vtk:PolyDataToActor:Box24
 ISEXEC:FALSE
--244.129567:-333.582002:-900.000000
--198.889567:-343.582002:-900.000000
+-256.153582:-145.843906:-900.000000
+-229.873582:-148.343906:-900.000000
 PORT
 Colour:"1 1 1"
 PORT
@@ -78,36 +86,36 @@ FIN_BOX
 BOX
 vtk:ImageVtkProperties:Box26
 ISEXEC:FALSE
--189.676792:-246.603108:-900.000000
--144.326792:-256.603108:-900.000000
+-131.630613:-71.885173:-900.000000
+-109.095613:-74.385173:-900.000000
 FIN_BOX
 BOX
 std:MathOperationVector:Box27
 ISEXEC:FALSE
--181.297642:-274.381908:-900.000000
--133.772642:-284.381908:-900.000000
+-126.908349:-79.359456:-900.000000
+-102.388349:-81.859456:-900.000000
 PORT
 Type:"2"
 FIN_BOX
 BOX
 creaVtk:Cutter:Box29
 ISEXEC:FALSE
--183.389764:-378.839398:-900.000000
--151.189764:-388.839398:-900.000000
+-166.789353:-115.030874:-900.000000
+-145.574353:-117.530874:-900.000000
 FIN_BOX
 BOX
 creaVtk:Plane:Box30
 ISEXEC:FALSE
--178.356096:-360.177356:-900.000000
--146.631096:-370.177356:-900.000000
+-129.774462:-91.701560:-900.000000
+-108.609462:-94.201560:-900.000000
 PORT
 Normal:"1 0 0"
 FIN_BOX
 BOX
 vtk:PolyDataToActor:Box31
 ISEXEC:FALSE
--176.224636:-397.243412:-900.000000
--130.984636:-407.243412:-900.000000
+-169.851083:-142.025927:-900.000000
+-143.571083:-144.525927:-900.000000
 PORT
 Colour:"1 1 1"
 PORT
@@ -118,22 +126,22 @@ FIN_BOX
 BOX
 creaVtk:Cutter:Box32
 ISEXEC:FALSE
--133.844696:-481.865111:-900.000000
--101.644696:-491.865111:-900.000000
+-93.691287:-144.559533:-900.000000
+-72.476287:-147.059533:-900.000000
 FIN_BOX
 BOX
 creaVtk:Plane:Box33
 ISEXEC:FALSE
--128.665621:-464.732319:-900.000000
--96.940621:-474.732319:-900.000000
+-88.686880:-131.539384:-900.000000
+-67.521880:-134.039384:-900.000000
 PORT
 Normal:"0 1 0"
 FIN_BOX
 BOX
 vtk:PolyDataToActor:Box34
 ISEXEC:FALSE
--136.755060:-499.565110:-900.000000
--91.515060:-509.565110:-900.000000
+-95.567784:-153.601058:-900.000000
+-69.287784:-156.101058:-900.000000
 PORT
 Colour:"1 1 1"
 PORT
@@ -144,44 +152,44 @@ FIN_BOX
 BOX
 creaMaracasVisu:wxVtkBaseView_Info:Box35
 ISEXEC:FALSE
--198.686835:-217.770457:-900.000000
--152.536835:-227.770457:-900.000000
+-139.080784:-47.612451:-900.000000
+-116.465784:-50.112451:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box36
 ISEXEC:FALSE
--285.279264:-185.960556:-900.000000
--249.204264:-195.960556:-900.000000
+-200.267056:-23.399171:-900.000000
+-178.667056:-25.899171:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box38
 ISEXEC:FALSE
--359.010673:-194.365199:-900.000000
--322.935673:-204.365199:-900.000000
+-251.307471:-58.309560:-900.000000
+-229.707471:-60.809560:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:wxVtkBaseView_Info:Box39
 ISEXEC:FALSE
--145.604047:-218.713305:-900.000000
--99.454047:-228.713305:-900.000000
+-103.447021:-49.610017:-900.000000
+-80.832021:-52.110017:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:wxVtkBaseView_Info:Box40
 ISEXEC:FALSE
--90.867006:-218.000038:-900.000000
--44.717006:-228.000038:-900.000000
+-69.513133:-46.919231:-900.000000
+-46.898133:-49.419231:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:wxVtkBaseView_Info:Box44
 ISEXEC:FALSE
--15.480580:-218.151121:-900.000000
-30.669420:-228.151121:-900.000000
+-11.979547:-46.964556:-900.000000
+10.635453:-49.464556:-900.000000
 FIN_BOX
 BOX
 vtk:PolyDataToActor:Box48
 ISEXEC:FALSE
--69.448369:-332.269693:-900.000000
--24.208369:-342.269693:-900.000000
+-15.713558:-152.281987:-900.000000
+10.566442:-154.781987:-900.000000
 PORT
 Colour:"1 1 1"
 PORT
@@ -192,8 +200,8 @@ FIN_BOX
 BOX
 vtk:PolyDataToActor:Box49
 ISEXEC:FALSE
--55.414551:-397.146594:-900.000000
--10.174551:-407.146594:-900.000000
+-7.268940:-159.136559:-900.000000
+19.011060:-161.636559:-900.000000
 PORT
 Colour:"1 1 1"
 PORT
@@ -204,8 +212,8 @@ FIN_BOX
 BOX
 vtk:PolyDataToActor:Box50
 ISEXEC:FALSE
--13.433459:-501.870542:-900.000000
-31.806541:-511.870542:-900.000000
+-2.705157:-164.548716:-900.000000
+23.574843:-167.048716:-900.000000
 PORT
 Colour:"1 1 1"
 PORT
@@ -216,60 +224,72 @@ FIN_BOX
 BOX
 std:MultipleInputs:Box55
 ISEXEC:FALSE
--283.794462:-250.737893:-900.000000
--244.094462:-260.737893:-900.000000
+-191.492204:-71.150959:-900.000000
+-169.522204:-73.650959:-900.000000
 FIN_BOX
 BOX
 vtk:UpdateRender:Box57
 ISEXEC:FALSE
-24.184279:-549.517113:-900.000000
-64.509279:-559.517113:-900.000000
+-2.561576:-184.701895:-900.000000
+19.463424:-187.201895:-900.000000
 PORT
 Active:"true"
 FIN_BOX
 BOX
 vtk:UpdateRender:Box58
 ISEXEC:FALSE
--167.061526:-546.390058:-900.000000
--126.736526:-556.390058:-900.000000
+-73.806243:-181.922347:-900.000000
+-51.781243:-184.422347:-900.000000
 PORT
 Active:"true"
 FIN_BOX
 BOX
 vtk:UpdateRender:Box59
 ISEXEC:FALSE
--230.444173:-546.555779:-900.000000
--190.119173:-556.555779:-900.000000
+-170.765522:-180.588872:-900.000000
+-148.740522:-183.088872:-900.000000
 PORT
 Active:"true"
 FIN_BOX
 BOX
 vtk:UpdateRender:Box60
 ISEXEC:FALSE
--307.079885:-544.911699:-900.000000
--266.754885:-554.911699:-900.000000
+-253.791671:-181.469186:-900.000000
+-231.766671:-183.969186:-900.000000
 PORT
 Active:"true"
 FIN_BOX
 BOX
 std:MagicBox:Box68
 ISEXEC:FALSE
--501.310032:-199.111688:-900.000000
--465.235032:-209.111688:-900.000000
+-350.917022:-59.733506:-900.000000
+-329.317022:-62.233506:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box69
 ISEXEC:FALSE
--410.305732:-194.326895:-900.000000
--374.230732:-204.326895:-900.000000
+-287.214012:-58.298068:-900.000000
+-265.614012:-60.798068:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box70
 ISEXEC:FALSE
--454.716776:-196.135359:-900.000000
--418.641776:-206.135359:-900.000000
+-318.301743:-58.840608:-900.000000
+-296.701743:-61.340608:-900.000000
+FIN_BOX
+BOX
+std:MagicBox:Box46
+ISEXEC:FALSE
+-167.099860:-23.964075:-900.000000
+-145.499860:-26.464075:-900.000000
+FIN_BOX
+BOX
+std:MagicBox:Box47
+ISEXEC:FALSE
+-38.591456:-70.028246:-900.000000
+-16.991456:-72.528246:-900.000000
 FIN_BOX
-CONNECTIONS:61
+CONNECTIONS:72
 CONNECTION
 Box23:Out:Box22:ImplicitFunction
 NumberOfControlPoints:0
@@ -298,9 +318,6 @@ CONNECTION
 Box27:Out:Box30:Origin
 NumberOfControlPoints:0
 CONNECTION
-Box24:BoxChange:Box29:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
 Box33:Out:Box32:ImplicitFunction
 NumberOfControlPoints:0
 CONNECTION
@@ -310,9 +327,6 @@ CONNECTION
 Box32:Out:Box34:In
 NumberOfControlPoints:0
 CONNECTION
-Box31:BoxChange:Box32:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
 Box27:Out:Box33:Origin
 NumberOfControlPoints:0
 CONNECTION
@@ -453,4 +467,43 @@ NumberOfControlPoints:0
 CONNECTION
 opacity1:opacity1:Box68:In
 NumberOfControlPoints:0
+CONNECTION
+Box55:BoxChange:Box29:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box55:BoxChange:Box32:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+activeContour:activeContour:Box46:In
+NumberOfControlPoints:0
+CONNECTION
+Box46:Out:Box29:Active
+NumberOfControlPoints:0
+CONNECTION
+Box46:Out:Box32:Active
+NumberOfControlPoints:0
+CONNECTION
+Box46:Out:Box22:Active
+NumberOfControlPoints:0
+CONNECTION
+colorForMesh:colorForMesh:Box47:In
+NumberOfControlPoints:0
+CONNECTION
+Box47:Out:Box24:Colour
+NumberOfControlPoints:0
+CONNECTION
+Box47:Out:Box31:Colour
+NumberOfControlPoints:0
+CONNECTION
+Box47:Out:Box34:Colour
+NumberOfControlPoints:0
+CONNECTION
+Box47:Out:Box48:Colour
+NumberOfControlPoints:0
+CONNECTION
+Box47:Out:Box49:Colour
+NumberOfControlPoints:0
+CONNECTION
+Box47:Out:Box50:Colour
+NumberOfControlPoints:0
 APP_END

diff --git a/bbtk/bbs/boxes/MeshContours.bbs b/bbtk/bbs/boxes/MeshContours.bbs
index acb14991ff2c45594e52ba31f7a1f5879da18e1b..9dd4dccc3bce10e21ed8d00c8f3135aca0a32bcf 100644 (file)
--- a/bbtk/bbs/boxes/MeshContours.bbs
+++ b/bbtk/bbs/boxes/MeshContours.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
-# - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
-# - /home/davila/Creatis/C12/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/MeshContours.bbs
+# - BBTKGEditor v 1.5 BBS BlackBox Script (Complex Box)
+# - /Users/davila/Creatis/C22/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/MeshContours.bbs
 # ----------------------------------
 
 include std
@@ -99,6 +99,10 @@ new std:MagicBox Box69
 
 new std:MagicBox Box70
 
+new std:MagicBox Box46
+
+new std:MagicBox Box47
+
 
 connect Box23.Out Box22.ImplicitFunction
 connect Box22.BoxChange Box24.BoxExecute
@@ -109,11 +113,9 @@ connect Box30.Out Box29.ImplicitFunction
 connect Box29.BoxChange Box31.BoxExecute
 connect Box29.Out Box31.In
 connect Box27.Out Box30.Origin
-connect Box24.BoxChange Box29.BoxExecute
 connect Box33.Out Box32.ImplicitFunction
 connect Box32.BoxChange Box34.BoxExecute
 connect Box32.Out Box34.In
-connect Box31.BoxChange Box32.BoxExecute
 connect Box27.Out Box33.Origin
 connect Box35.Image Box26.In
 connect Box35.vtkRenderer Box24.Renderer
@@ -152,6 +154,17 @@ connect Box70.Out Box31.Opacity
 connect Box70.Out Box49.Opacity
 connect Box69.Out Box34.Opacity
 connect Box69.Out Box50.Opacity
+connect Box55.BoxChange Box29.BoxExecute
+connect Box55.BoxChange Box32.BoxExecute
+connect Box46.Out Box29.Active
+connect Box46.Out Box32.Active
+connect Box46.Out Box22.Active
+connect Box47.Out Box24.Colour
+connect Box47.Out Box31.Colour
+connect Box47.Out Box34.Colour
+connect Box47.Out Box48.Colour
+connect Box47.Out Box49.Colour
+connect Box47.Out Box50.Colour
 
 # Complex input ports
 input polydata Box38.In " "
@@ -163,6 +176,8 @@ input wxvtkbaseview3D1 Box44.wxVtkBaseView " "
 input opacity2 Box70.In " "
 input opacity3 Box69.In " "
 input opacity1 Box68.In " "
+input activeContour Box46.In " "
+input colorForMesh Box47.In " "
 
 # Complex output ports
 

diff --git a/bbtk/bbs/boxes/MeshContours_Interface.bbg b/bbtk/bbs/boxes/MeshContours_Interface.bbg
index da9883619317f1e8592c0ea114b7b1f9440ab7b1..1b28f61e38d6e13a1d6fa25b862d2c4c7031168d 100644 (file)
--- a/bbtk/bbs/boxes/MeshContours_Interface.bbg
+++ b/bbtk/bbs/boxes/MeshContours_Interface.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
-# - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /home/davila/Creatis/C12/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/MeshContours_Interface.bbg
+# - BBTKGEditor v 1.5 BBG BlackBox Diagram file
+# - /Users/davila/Creatis/C22/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/MeshContours_Interface.bbg
 # ----------------------------------
 
 APP_START
@@ -10,62 +10,34 @@ AUTHOR:Author ??
 COMPLEXBOX:TRUE
 COMPLEXBOXNAME:MeshContours_Interface
 PACKAGENAME:creaMaracasVisu
-COMPLEXOUTPUTS:4
+COMPLEXOUTPUTS:3
 COMPLEX_PORT
 Opacity1
--496.860236:-143.627044:-900.000000
+-229.642629:-71.314940:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
-Opacity2
--426.838604:-146.231308:-900.000000
-FIN_COMPLEX_PORT
-COMPLEX_PORT
-Opacity3
--359.903575:-139.752793:-900.000000
+widget
+-132.225769:-72.651819:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
-widget
--300.364859:-138.911326:-900.000000
+active
+-209.533061:-72.181576:-900.000000
 FIN_COMPLEX_PORT
 COMPLEXINPUTS:0
-BOXES:7
-BOX
-wx:Slider:Box52
-ISEXEC:FALSE
--372.649098:-11.421759:-900.000000
--321.249098:-21.421759:-900.000000
-PORT
-In:"100"
-PORT
-Label:"true"
-PORT
-Max:"100"
-PORT
-ReactiveOnTrack:"true"
-PORT
-Title:"Contour opacity yz"
-FIN_BOX
-BOX
-std:Div:Box53
-ISEXEC:FALSE
--358.008670:-95.848698:-900.000000
--328.683670:-105.848698:-900.000000
-PORT
-In2:"100"
-FIN_BOX
+BOXES:4
 BOX
 wx:LayoutLine:Box54
 ISEXEC:FALSE
--302.207152:-90.511220:-900.000000
--244.647152:-100.511220:-900.000000
+-130.907608:-43.136885:-900.000000
+-97.587608:-45.636885:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
 BOX
-wx:Slider:Box61
+wx:Slider:Box63
 ISEXEC:FALSE
--426.226259:-12.253582:-900.000000
--374.826259:-22.253582:-900.000000
+-221.887211:1.371422:-900.000000
+-192.087211:-1.128578:-900.000000
 PORT
 In:"100"
 PORT
@@ -75,69 +47,43 @@ Max:"100"
 PORT
 ReactiveOnTrack:"true"
 PORT
-Title:"Contour opacity xz"
+Title:"Contour opacity "
 FIN_BOX
 BOX
-std:Div:Box62
+std:Div:Box64
 ISEXEC:FALSE
--428.097940:-94.461629:-900.000000
--398.772940:-104.461629:-900.000000
+-232.780146:-4.829327:-900.000000
+-211.855146:-7.329327:-900.000000
 PORT
 In2:"100"
 FIN_BOX
 BOX
-wx:Slider:Box63
+wx:CheckBox:Box07
 ISEXEC:FALSE
--481.862971:-11.506564:-900.000000
--430.462971:-21.506564:-900.000000
+-213.121534:-19.171013:-900.000000
+-191.491534:-21.671013:-900.000000
 PORT
-In:"100"
+In:"true"
 PORT
-Label:"true"
-PORT
-Max:"100"
-PORT
-ReactiveOnTrack:"true"
-PORT
-Title:"Contour opacity xy"
-FIN_BOX
-BOX
-std:Div:Box64
-ISEXEC:FALSE
--495.507061:-98.049345:-900.000000
--466.182061:-108.049345:-900.000000
-PORT
-In2:"100"
+Title:"Contour"
 FIN_BOX
-CONNECTIONS:10
-CONNECTION
-Box52:Out:Box53:In1
-NumberOfControlPoints:0
-CONNECTION
-Box61:Out:Box62:In1
-NumberOfControlPoints:0
-CONNECTION
-Box61:Widget:Box54:Widget2
-NumberOfControlPoints:0
+CONNECTIONS:6
 CONNECTION
 Box63:Out:Box64:In1
 NumberOfControlPoints:0
 CONNECTION
-Box63:Widget:Box54:Widget1
-NumberOfControlPoints:0
-CONNECTION
-Box52:Widget:Box54:Widget3
+Box64:Out:Opacity1:Opacity1
 NumberOfControlPoints:0
 CONNECTION
-Box64:Out:Opacity1:Opacity1
+Box54:Widget:widget:widget
 NumberOfControlPoints:0
 CONNECTION
-Box62:Out:Opacity2:Opacity2
+Box07:Widget:Box54:Widget3
 NumberOfControlPoints:0
 CONNECTION
-Box53:Out:Opacity3:Opacity3
+Box07:Out:active:active
 NumberOfControlPoints:0
 CONNECTION
-Box54:Widget:widget:widget
+Box63:Widget:Box54:Widget6
 NumberOfControlPoints:0
 APP_END

diff --git a/bbtk/bbs/boxes/MeshContours_Interface.bbs b/bbtk/bbs/boxes/MeshContours_Interface.bbs
index b2d169f1280861316cfbd93e7491afb4f38008dc..c9bc1fb24473a726ec6e216a322e20d66a26f2d9 100644 (file)
--- a/bbtk/bbs/boxes/MeshContours_Interface.bbs
+++ b/bbtk/bbs/boxes/MeshContours_Interface.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
-# - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
-# - /home/davila/Creatis/C12/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/MeshContours_Interface.bbs
+# - BBTKGEditor v 1.5 BBS BlackBox Script (Complex Box)
+# - /Users/davila/Creatis/C22/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/MeshContours_Interface.bbs
 # ----------------------------------
 
 include std
@@ -15,54 +15,34 @@ description "Description ??"
 
 category "<VOID>"
 
-new wx:Slider Box52
-  set Box52.In "100"
-  set Box52.Label "true"
-  set Box52.Max "100"
-  set Box52.ReactiveOnTrack "true"
-  set Box52.Title "Contour opacity yz"
-
-new std:Div Box53
-  set Box53.In2 "100"
-
 new wx:LayoutLine Box54
   set Box54.Orientation "H"
 
-new wx:Slider Box61
-  set Box61.In "100"
-  set Box61.Label "true"
-  set Box61.Max "100"
-  set Box61.ReactiveOnTrack "true"
-  set Box61.Title "Contour opacity xz"
-
-new std:Div Box62
-  set Box62.In2 "100"
-
 new wx:Slider Box63
   set Box63.In "100"
   set Box63.Label "true"
   set Box63.Max "100"
   set Box63.ReactiveOnTrack "true"
-  set Box63.Title "Contour opacity xy"
+  set Box63.Title "Contour opacity "
 
 new std:Div Box64
   set Box64.In2 "100"
 
+new wx:CheckBox Box07
+  set Box07.In "true"
+  set Box07.Title "Contour"
+
 
-connect Box52.Out Box53.In1
-connect Box61.Out Box62.In1
-connect Box61.Widget Box54.Widget2
 connect Box63.Out Box64.In1
-connect Box63.Widget Box54.Widget1
-connect Box52.Widget Box54.Widget3
+connect Box07.Widget Box54.Widget3
+connect Box63.Widget Box54.Widget6
 
 # Complex input ports
 
 # Complex output ports
 output Opacity1 Box64.Out " "
-output Opacity2 Box62.Out " "
-output Opacity3 Box53.Out " "
 output widget Box54.Widget " "
+output active Box07.Out " "
 
 
 endefine

diff --git a/bbtk/bbs/boxes/MeshContours_Widget.bbg b/bbtk/bbs/boxes/MeshContours_Widget.bbg
index 0419e1afb0308ba4808fe14c80823231dee001a1..9a5bfbe9b181d2d873826f183a68fa139e53ecb3 100644 (file)
--- a/bbtk/bbs/boxes/MeshContours_Widget.bbg
+++ b/bbtk/bbs/boxes/MeshContours_Widget.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
-# - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /home/davila/Creatis/C12/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/MeshContours_Widget.bbg
+# - BBTKGEditor v 1.5 BBG BlackBox Diagram file
+# - /Users/davila/Creatis/C22/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/MeshContours_Widget.bbg
 # ----------------------------------
 
 APP_START
@@ -13,83 +13,93 @@ PACKAGENAME:creaMaracasVisu
 COMPLEXOUTPUTS:1
 COMPLEX_PORT
 _widget
--321.352542:-403.575031:-900.000000
+-226.358683:-167.194688:-900.000000
 FIN_COMPLEX_PORT
-COMPLEXINPUTS:6
+COMPLEXINPUTS:7
 COMPLEX_PORT
 _polydata
--291.728211:-139.083723:-900.000000
+-204.209748:-41.725117:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 _execute
--361.335403:-136.850022:-900.000000
+-252.934782:-41.055007:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 _wxvtkbaseview2D1
--236.727974:-136.138587:-900.000000
+-165.709582:-40.841576:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 _wxvtkbaseview2D2
--182.869569:-134.001287:-900.000000
+-128.008698:-40.200386:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 _wxvtkbaseview2D3
--141.831968:-137.076456:-900.000000
+-99.282378:-41.122937:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 _wxvtkbaseview3D1
--55.795358:-128.477339:-900.000000
+-39.056751:-38.543202:-900.000000
 FIN_COMPLEX_PORT
-BOXES:8
+COMPLEX_PORT
+colorMesh
+-228.098376:-40.201658:-900.000000
+FIN_COMPLEX_PORT
+BOXES:9
 BOX
 std:MagicBox:Box36
 ISEXEC:FALSE
--367.869151:-190.366478:-900.000000
--331.794151:-200.366478:-900.000000
+-257.508406:-57.109943:-900.000000
+-235.908406:-59.609943:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box38
 ISEXEC:FALSE
--300.609810:-186.902651:-900.000000
--264.534810:-196.902651:-900.000000
+-210.426867:-56.070795:-900.000000
+-188.826867:-58.570795:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box45
 ISEXEC:FALSE
--233.796642:-184.002621:-900.000000
--197.721642:-194.002621:-900.000000
+-163.657649:-55.200786:-900.000000
+-142.057649:-57.700786:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box46
 ISEXEC:FALSE
--195.706592:-182.741336:-900.000000
--159.631592:-192.741336:-900.000000
+-136.994614:-54.822401:-900.000000
+-115.394614:-57.322401:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box47
 ISEXEC:FALSE
--152.209773:-183.551587:-900.000000
--116.134773:-193.551587:-900.000000
+-106.546841:-55.065476:-900.000000
+-84.946841:-57.565476:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box51
 ISEXEC:FALSE
--62.876822:-177.376815:-900.000000
--26.801822:-187.376815:-900.000000
+-44.013775:-53.213044:-900.000000
+-22.413775:-55.713044:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:MeshContours_Interface:Box52
 ISEXEC:FALSE
--361.466973:-269.135505:-900.000000
--311.666973:-279.135505:-900.000000
+-249.967757:-89.918024:-900.000000
+-226.977757:-92.418024:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:MeshContours:Box53
 ISEXEC:FALSE
--270.243259:-342.894019:-900.000000
--230.143259:-352.894019:-900.000000
+-189.405599:-116.987240:-900.000000
+-167.390599:-119.487240:-900.000000
+FIN_BOX
+BOX
+std:MagicBox:Box08
+ISEXEC:FALSE
+-232.064268:-56.660352:-900.000000
+-210.464268:-59.160352:-900.000000
 FIN_BOX
-CONNECTIONS:16
+CONNECTIONS:19
 CONNECTION
 _polydata:_polydata:Box38:In
 NumberOfControlPoints:0
@@ -112,12 +122,6 @@ CONNECTION
 Box52:Opacity1:Box53:opacity1
 NumberOfControlPoints:0
 CONNECTION
-Box52:Opacity2:Box53:opacity2
-NumberOfControlPoints:0
-CONNECTION
-Box52:Opacity3:Box53:opacity3
-NumberOfControlPoints:0
-CONNECTION
 Box38:Out:Box53:polydata
 NumberOfControlPoints:0
 CONNECTION
@@ -138,4 +142,19 @@ NumberOfControlPoints:0
 CONNECTION
 Box36:BoxChange:Box53:execute
 NumberOfControlPoints:0
+CONNECTION
+Box52:Opacity1:Box53:opacity2
+NumberOfControlPoints:0
+CONNECTION
+Box52:Opacity1:Box53:opacity3
+NumberOfControlPoints:0
+CONNECTION
+Box52:active:Box53:activeContour
+NumberOfControlPoints:0
+CONNECTION
+Box08:Out:Box53:colorForMesh
+NumberOfControlPoints:0
+CONNECTION
+colorMesh:colorMesh:Box08:In
+NumberOfControlPoints:0
 APP_END

diff --git a/bbtk/bbs/boxes/MeshContours_Widget.bbs b/bbtk/bbs/boxes/MeshContours_Widget.bbs
index 1ec714016ee4d4992f73c9faa7884cd4211eb275..a8a3a585bbaf79744fb0b7a995e6cf2193dcd4d1 100644 (file)
--- a/bbtk/bbs/boxes/MeshContours_Widget.bbs
+++ b/bbtk/bbs/boxes/MeshContours_Widget.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
-# - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
-# - /home/davila/Creatis/C12/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/MeshContours_Widget.bbs
+# - BBTKGEditor v 1.5 BBS BlackBox Script (Complex Box)
+# - /Users/davila/Creatis/C22/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/MeshContours_Widget.bbs
 # ----------------------------------
 
 include std
@@ -31,16 +31,20 @@ new creaMaracasVisu:MeshContours_Interface Box52
 
 new creaMaracasVisu:MeshContours Box53
 
+new std:MagicBox Box08
+
 
 connect Box52.Opacity1 Box53.opacity1
-connect Box52.Opacity2 Box53.opacity2
-connect Box52.Opacity3 Box53.opacity3
 connect Box38.Out Box53.polydata
 connect Box45.Out Box53.wxvtkbaseview2D1
 connect Box46.Out Box53.wxvtkbaseview2D2
 connect Box47.Out Box53.wxvtkbaseview2D3
 connect Box51.Out Box53.wxvtkbaseview3D1
 connect Box36.BoxChange Box53.execute
+connect Box52.Opacity1 Box53.opacity2
+connect Box52.Opacity1 Box53.opacity3
+connect Box52.active Box53.activeContour
+connect Box08.Out Box53.colorForMesh
 
 # Complex input ports
 input _polydata Box38.In " "
@@ -49,6 +53,7 @@ input _wxvtkbaseview2D2 Box46.In " "
 input _wxvtkbaseview2D3 Box47.In " "
 input _wxvtkbaseview3D1 Box51.In " "
 input _execute Box36.In " "
+input colorMesh Box08.In " "
 
 # Complex output ports
 output _widget Box52.widget " "

diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg
index 0072cddca162c49f1691fecbb816c9b9cff4da4e..df4ccc742ba81dab05ef83ee2aaf6677da979741 100644 (file)
--- a/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg
+++ b/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg
@@ -10,22 +10,62 @@ AUTHOR:info-dev@creatis.insa-lyon.fr
 COMPLEXBOX:TRUE
 COMPLEXBOXNAME:Mesh_tool_ApplyPatch
 PACKAGENAME:creaMaracasVisu
-COMPLEXOUTPUTS:0
-COMPLEXINPUTS:0
-BOXES:42
-BOX
-creaMaracasVisu:ViewerNV:viewer
-ISEXEC:FALSE
--51.927252:127.201185:-900.000000
--13.327252:124.701185:-900.000000
-PORT
-nTypeView:"6 1 2 0"
-FIN_BOX
+COMPLEXOUTPUTS:1
+COMPLEX_PORT
+widget
+-186.475040:-157.705758:-900.000000
+FIN_COMPLEX_PORT
+COMPLEXINPUTS:11
+COMPLEX_PORT
+render
+-32.390937:141.689813:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+boxChange
+-13.776500:138.843910:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+point
+8.392837:138.613226:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+wxvtkbaseview1
+-268.019084:133.379456:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+mesh
+-59.814076:140.655693:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+image
+-96.062149:138.883434:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+wxvtkbaseview2
+-231.668448:132.854505:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+wxvtkbaseview3
+-216.690458:133.262996:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+wxvtkbaseview4
+-193.414893:132.224675:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+title
+-167.581636:131.715380:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+meshmanagermodel
+-150.374274:130.740991:-900.000000
+FIN_COMPLEX_PORT
+BOXES:47
 BOX
 creaMaracasVisu:ShowNPoints:showNpoints
 ISEXEC:FALSE
--6.717198:104.115466:-900.000000
-30.122802:101.615466:-900.000000
+24.787568:83.025910:-900.000000
+46.637568:80.525910:-900.000000
 PORT
 Radio:"1"
 PORT
@@ -34,8 +74,8 @@ FIN_BOX
 BOX
 creaVtk:CreateMeshFromPoints:Box04
 ISEXEC:FALSE
-14.941523:23.144302:-900.000000
-37.796523:20.644302:-900.000000
+31.252553:-1.141010:-900.000000
+54.107553:-3.641010:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ManualContourModel_Box:Box06
@@ -45,625 +85,692 @@ ISEXEC:FALSE
 PORT
 DoubleContour:"1"
 PORT
-NbPoints:"35"
+NbPoints:"100"
 PORT
-OpenClose:"false"
+OpenClose:"true"
 PORT
 OpenClose2:"false"
 FIN_BOX
 BOX
-vtk:PolyDataToActor:Box07
-ISEXEC:FALSE
--12.145985:-25.968604:-900.000000
-14.134015:-28.468604:-900.000000
-PORT
-Representation:"2"
-FIN_BOX
-BOX
 wx:LayoutLine:Box08
 ISEXEC:FALSE
--188.455064:-60.870548:-900.000000
--155.135064:-63.370548:-900.000000
+-187.811226:-145.775470:-900.000000
+33.320000:-148.275470:-900.000000
 FIN_BOX
 BOX
 vtk:UpdateRender:Box11
 ISEXEC:FALSE
-50.176358:-56.928782:-900.000000
-72.201358:-59.428782:-900.000000
+50.398091:-54.711454:-900.000000
+72.423091:-57.211454:-900.000000
 PORT
 Active:"true"
 FIN_BOX
 BOX
-std:MultipleInputs:Box12
+creaMaracasVisu:DrawAxisTree3D:Box30
 ISEXEC:FALSE
--37.317574:-28.102008:-900.000000
--15.347574:-30.602008:-900.000000
+66.830537:-0.099472:-900.000000
+89.010537:-2.599472:-900.000000
+PORT
+Colour:"0 0 1"
+PORT
+LineWidth:"2"
 FIN_BOX
 BOX
-vtk:ImageVtkProperties:Box24
+std:MultipleInputs:Box31
 ISEXEC:FALSE
-69.921631:96.534291:-900.000000
-92.456631:94.034291:-900.000000
+5.423388:-28.995680:-900.000000
+27.393388:-31.495680:-900.000000
 FIN_BOX
 BOX
-creaMaracasVisu:DrawAxisTree3D:Box30
+creaMaracasVisu:ManualContourModel_Box:Box29
 ISEXEC:FALSE
-16.764574:-27.952113:-900.000000
-38.944574:-30.452113:-900.000000
+59.049338:28.545969:-900.000000
+82.259338:26.045969:-900.000000
 PORT
-LineWidth:"2"
+NbPoints:"40"
+PORT
+OpenClose:"true"
+PORT
+OpenClose2:"false"
 FIN_BOX
 BOX
-std:MultipleInputs:Box31
+creaMaracasVisu:wxPopupMenu:Box57
 ISEXEC:FALSE
--2.201770:-42.067380:-900.000000
-19.768230:-44.567380:-900.000000
+-264.745710:81.346668:-900.000000
+15.720000:78.846668:-900.000000
+PORT
+WithCtrlKey:"true"
 FIN_BOX
 BOX
-wx:Slider:Box33
+std:AddStringToVector:Box58
 ISEXEC:FALSE
--105.299156:41.777774:-900.000000
--75.499156:39.277774:-900.000000
+-291.352727:106.869911:-900.000000
+24.520000:104.369911:-900.000000
 PORT
-In:"20"
+In0:"Add point"
 PORT
-Label:"true"
+In1:"Insert point"
 PORT
-Max:"100"
+In2:"Track point"
 PORT
-Min:"0"
+In3:"Set nearest point"
 PORT
-ReactiveOnTrack:"true"
+In4:"Erase point"
+PORT
+In5:"Delete all points"
+PORT
+In6:"----------------------"
+PORT
+In7:"Insert group after"
 PORT
-Title:"Transparence"
+In8:"Delete group"
 FIN_BOX
 BOX
-std:Div:Box34
+creaMaracasVisu:ShowNPoints_Tools:Box60
 ISEXEC:FALSE
--98.507819:36.469875:-900.000000
--77.582819:33.969875:-900.000000
-PORT
-In2:"100"
+-255.324608:69.131932:-900.000000
+12.200000:66.631932:-900.000000
 FIN_BOX
 BOX
-creaMaracasVisu:ManualContourModel_Box:Box29
+std:StringSelect:Box61
 ISEXEC:FALSE
-53.431094:26.008698:-900.000000
-77.951094:23.508698:-900.000000
+-255.993648:76.032910:-900.000000
+24.520000:73.532910:-900.000000
 PORT
-NbPoints:"40"
+In0:"5"
 PORT
-OpenClose:"false"
+In1:"10"
 PORT
-OpenClose2:"false"
-FIN_BOX
-BOX
-vtk:PolyDataToActor:Box44
-ISEXEC:FALSE
--2.734854:-2.467921:-900.000000
-26.280000:-4.967921:-900.000000
+In2:"20"
 PORT
-Opacity:"1"
+In3:"30"
 PORT
-Representation:"1"
-FIN_BOX
-BOX
-creaVtk:PolyDataNormals:Box54
-ISEXEC:FALSE
-6.372876:14.024026:-900.000000
-28.667876:11.524026:-900.000000
+In4:"40"
+PORT
+In5:"50"
+PORT
+In6:"0"
+PORT
+In7:"100"
 PORT
-Type:"1"
+In8:"110"
 FIN_BOX
 BOX
-creaVtk:LinearExtrusionFilter:Box46
+vtk:ImageVtkProperties:Box68
 ISEXEC:FALSE
--4.214533:6.833499:-900.000000
-18.295467:4.333499:-900.000000
+-111.766259:110.196821:-900.000000
+16.720000:107.696821:-900.000000
 FIN_BOX
 BOX
-wx:LayoutLine:Box52
+std:VectorFilterDouble:Box70
 ISEXEC:FALSE
--104.391715:18.113210:-900.000000
--71.071715:15.613210:-900.000000
+49.750242:60.953814:-900.000000
+72.180242:58.453814:-900.000000
 PORT
-Orientation:"H"
+Type:"11"
 FIN_BOX
 BOX
-wx:SpinCtrl:Box53
+creaVtk:BooleanOperationPolyDataFilter:Box77
 ISEXEC:FALSE
--93.127181:29.387590:-900.000000
--68.607181:26.887590:-900.000000
-PORT
-Max:"50"
+-84.476321:-26.264040:-900.000000
+12.200000:-28.764040:-900.000000
 PORT
-Min:"-50"
+BoxProcessMode:"Manual"
 PORT
-Selected:"0"
-PORT
-Title:"Scalar Factor"
+ReorientDifferenceCells:"false"
 FIN_BOX
 BOX
-wx:Slider:Box55
+wx:ComboBox:Box78
 ISEXEC:FALSE
--130.647634:50.601616:-900.000000
--100.847634:48.101616:-900.000000
-PORT
-In:"100"
+-153.877713:-5.775167:-900.000000
+-127.597713:-8.275167:-900.000000
 PORT
-Max:"200"
+In:"Union Intersection Difference"
 PORT
-Min:"-200"
+Title:"Mesh Operation"
+FIN_BOX
+BOX
+wx:LayoutLine:Box79
+ISEXEC:FALSE
+-144.841026:-82.628158:-900.000000
+33.320000:-85.128158:-900.000000
 PORT
-ReactiveOnTrack:"true"
+Orientation:"H"
 PORT
-Title:"Angle Correction"
+WinTitle:"New Surface"
 FIN_BOX
 BOX
-std:Div:Box56
+wx:CommandButton:Box80
 ISEXEC:FALSE
--135.591575:39.350118:-900.000000
--114.666575:36.850118:-900.000000
+-95.971418:-0.590420:-900.000000
+21.000000:-3.090420:-900.000000
 PORT
-In2:"100"
+Label:"Run"
 FIN_BOX
 BOX
-creaMaracasVisu:wxPopupMenu:Box57
+std:MagicBox:Box66
 ISEXEC:FALSE
--145.164439:72.322879:-900.000000
--123.099439:69.822879:-900.000000
+-39.496513:124.163432:-900.000000
+8.680000:121.663432:-900.000000
 FIN_BOX
 BOX
-std:AddStringToVector:Box58
+std:MagicBox:Box67
 ISEXEC:FALSE
--148.505973:79.782632:-900.000000
--123.985973:77.282632:-900.000000
-PORT
-In0:"Insert point"
-PORT
-In1:"Track point"
-PORT
-In2:"Set nearest point"
-PORT
-In3:"Erase point"
-PORT
-In4:"Delete all points"
-PORT
-In5:"----------------------"
-PORT
-In6:"Insert group after"
-PORT
-In7:"Delete group"
-PORT
-In8:"----------------------"
-PORT
-In9:"Tools_1 - Create Mesh"
+-67.526006:124.007723:-900.000000
+8.680000:121.507723:-900.000000
 FIN_BOX
 BOX
-std:MultipleInputs:Box59
-ISEXEC:TRUE
--170.041455:41.083203:-900.000000
--148.071455:38.583203:-900.000000
+creaMaracasVisu:PolyDataToActor_Widget:Box48
+ISEXEC:FALSE
+13.436541:-16.292093:-900.000000
+36.456541:-18.792093:-900.000000
 FIN_BOX
 BOX
-creaMaracasVisu:ShowNPoints_Tools:Box60
+vtk:vtkImageDataPointerRelay:Box35
 ISEXEC:FALSE
--150.080943:58.090407:-900.000000
--127.645943:55.590407:-900.000000
+-107.091396:123.633118:-900.000000
+6.920000:121.133118:-900.000000
 FIN_BOX
 BOX
-std:StringSelect:Box61
+wx:Slider:Box34
 ISEXEC:FALSE
--146.978300:65.015550:-900.000000
--122.458300:62.515550:-900.000000
-PORT
-In0:"10"
+-198.941120:-3.426364:-900.000000
+29.800000:-5.926364:-900.000000
 PORT
-In1:"20"
-PORT
-In2:"30"
+In:"50"
 PORT
-In3:"40"
+Label:"true"
 PORT
-In4:"50"
+Max:"100"
 PORT
-In5:"0"
+Min:"0"
 PORT
-In6:"100"
+ReactiveOnTrack:"true"
 PORT
-In7:"110"
+Title:"Opacity Splines"
+FIN_BOX
+BOX
+std:Div:Box36
+ISEXEC:FALSE
+-190.788172:-9.261990:-900.000000
+8.680000:-11.761990:-900.000000
 PORT
-In8:"0"
+In2:"100"
+FIN_BOX
+BOX
+creaMaracasVisu:PolyDataToActor_Widget:Box37
+ISEXEC:FALSE
+-62.146849:-38.004259:-900.000000
+8.680000:-40.504259:-900.000000
 PORT
-In9:"200"
+color:"0 1 1"
 FIN_BOX
 BOX
-vtk:MarchingCubes:Box62
+wx:LayoutLine:Box38
 ISEXEC:FALSE
--84.596119:131.437277:-900.000000
--62.421119:128.937277:-900.000000
+-190.854929:-82.522396:-900.000000
+33.320000:-85.022396:-900.000000
 PORT
-ComputeNormalsOn:"true"
+Orientation:"H"
 PORT
-Value:"128"
+WinTitle:"Interpolated Surface"
 FIN_BOX
 BOX
-vtk:ImageVtkProperties:Box68
+wx:LayoutTab:Box39
 ISEXEC:FALSE
--176.216684:65.628179:-900.000000
--153.681684:63.128179:-900.000000
+-192.270158:-93.367955:-900.000000
+33.320000:-95.867955:-900.000000
 FIN_BOX
 BOX
-std:VectorFilterDouble:Box70
+wx:LayoutTab:Box40
 ISEXEC:FALSE
-49.750242:60.953814:-900.000000
-72.180242:58.453814:-900.000000
-PORT
-Type:"11"
+-149.066535:-91.692070:-900.000000
+33.320000:-94.192070:-900.000000
 FIN_BOX
 BOX
-wx:CheckBox:Box75
+wx:LayoutLine:Box41
 ISEXEC:FALSE
--172.755005:81.034010:-900.000000
--151.125005:78.534010:-900.000000
+-161.409352:-134.537896:-900.000000
+33.320000:-137.037896:-900.000000
 PORT
-In:"false"
+Orientation:"H"
 PORT
-Title:"Open Contour"
+WinTitle:"New Surface"
 FIN_BOX
 BOX
-wx:LayoutLine:Box76
+wx:CommandButton:Box42
 ISEXEC:FALSE
--183.086203:9.129439:-900.000000
--149.766203:6.629439:-900.000000
+-117.665938:-115.252338:-900.000000
+21.000000:-117.752338:-900.000000
 PORT
-Orientation:"H"
+Label:"Apply"
 FIN_BOX
 BOX
-creaVtk:BooleanOperationPolyDataFilter:Box77
+wx:CommandButton:Box43
 ISEXEC:FALSE
--54.733805:-49.459889:-900.000000
-12.200000:-51.959889:-900.000000
+-69.629626:-115.035234:-900.000000
+21.000000:-117.535234:-900.000000
 PORT
-ReorientDifferenceCells:"false"
+Label:"Reset"
 FIN_BOX
 BOX
-wx:ComboBox:Box78
+wx:LayoutLine:Box44
 ISEXEC:FALSE
--135.889322:-2.796967:-900.000000
--109.609322:-5.296967:-900.000000
+-153.658490:-37.966354:-900.000000
+33.320000:-40.466354:-900.000000
 PORT
-In:"Union Intersection Difference"
+Orientation:"V"
 PORT
-Title:"Mesh Operation"
+WinTitle:"New Surface"
 FIN_BOX
 BOX
-wx:LayoutLine:Box79
+creaVtk:MeshManager_tool:Box45
 ISEXEC:FALSE
--134.770074:-30.418324:-900.000000
--101.450074:-32.918324:-900.000000
+-91.573378:-134.495402:-900.000000
+10.440000:-136.995402:-900.000000
 PORT
-Orientation:"H"
+Tool:"30"
 FIN_BOX
 BOX
-wx:CommandButton:Box80
+std:MagicBox:Box46
 ISEXEC:FALSE
--145.308344:-14.036797:-900.000000
--123.033344:-16.536797:-900.000000
-PORT
-Label:"Run"
+-137.131256:113.921532:-900.000000
+8.680000:111.421532:-900.000000
 FIN_BOX
 BOX
-vtk:PolyDataToActor:Box81
+wx:ComboBox:Box49
 ISEXEC:FALSE
--58.957040:-57.864779:-900.000000
-26.280000:-60.364779:-900.000000
+-182.639251:-13.479145:-900.000000
+26.280000:-15.979145:-900.000000
 PORT
-Colour:"0 1 1"
+In:"25 50 100 150"
 PORT
-Opacity:"1"
+Selection:"1"
+PORT
+Title:"Number of Points"
 FIN_BOX
 BOX
-vtk:UpdateRender:Box82
+wx:LayoutLine:Box50
 ISEXEC:FALSE
--49.304721:-69.858094:-900.000000
-8.680000:-72.358094:-900.000000
+-191.493902:-29.766595:-900.000000
+-158.173902:-32.266595:-900.000000
 PORT
-Active:"true"
+Orientation:"V"
 FIN_BOX
 BOX
-wx:Slider:Box83
+std:MultipleInputs:Box51
 ISEXEC:FALSE
--123.116389:-8.832696:-900.000000
--93.316389:-11.332696:-900.000000
-PORT
-In:"50"
-PORT
-Label:"true"
-PORT
-Max:"100"
-PORT
-Min:"0"
-PORT
-ReactiveOnTrack:"true"
+-92.949669:-148.627142:-900.000000
+21.000000:-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
 PORT
-Title:"Opacity Mesh"
+Type:"120"
+FIN_BOX
+BOX
+std:MultipleInputs:Box53
+ISEXEC:FALSE
+-94.857805:-12.097761:-900.000000
+21.000000:-14.597761:-900.000000
+FIN_BOX
+BOX
+std:MultipleInputs:Box55
+ISEXEC:FALSE
+-56.216962:-150.487985:-900.000000
+21.000000:-152.987985:-900.000000
 FIN_BOX
 BOX
-std:Div:Box84
+wx:LayoutLine:Box59
 ISEXEC:FALSE
--122.177246:-17.910716:-900.000000
--101.252246:-20.410716:-900.000000
+-178.438647:-71.791115:-900.000000
+-145.118647:-74.291115:-900.000000
 PORT
-In2:"100"
+Orientation:"V"
 FIN_BOX
 BOX
-creaVtk:MeshReduction_DecimatePro:Box87
+creaMaracasVisu:MeshContours_Widget:Box62
 ISEXEC:FALSE
--65.417333:-18.820284:-900.000000
--41.922333:-21.320284:-900.000000
+-228.707140:-3.136982:-900.000000
+13.960000:-5.636982:-900.000000
 PORT
-TargetReduction:"0.5"
+colorMesh:"1 1 0"
 FIN_BOX
 BOX
-creaVtk:PolyDataNormals:Box92
+std:MagicBox:Box63
 ISEXEC:FALSE
--65.860710:-27.289395:-900.000000
--43.565710:-29.789395:-900.000000
+-8.402303:123.950335:-900.000000
+13.197697:121.450335:-900.000000
 FIN_BOX
 BOX
-creaVtk:MeshReduction_QuadricDecimation:Box95
+std:MagicBox:Box64
 ISEXEC:FALSE
--76.233428:-13.081710:-900.000000
--52.078428:-15.581710:-900.000000
-PORT
-TargetReduction:"0.5"
+-243.113826:124.330340:-900.000000
+8.680000:121.830340:-900.000000
+FIN_BOX
+BOX
+std:MagicBox:Box65
+ISEXEC:FALSE
+-220.296210:124.504415:-900.000000
+8.680000:122.004415:-900.000000
+FIN_BOX
+BOX
+std:MagicBox:Box69
+ISEXEC:FALSE
+-197.793508:124.678490:-900.000000
+8.680000:122.178490:-900.000000
 FIN_BOX
-CONNECTIONS:82
+BOX
+std:MagicBox:Box71
+ISEXEC:FALSE
+-273.359367:124.504415:-900.000000
+8.680000:122.004415:-900.000000
+FIN_BOX
+CONNECTIONS:101
 CONNECTION
-viewer:Renderer1:showNpoints:Renderer
+Box06:LstContourPointsX:Box04:LstX
 NumberOfControlPoints:0
 CONNECTION
-viewer:Point:showNpoints:In
+showNpoints:lstIndexs:Box06:LstIndexsIn
 NumberOfControlPoints:0
 CONNECTION
-viewer:BoxChange:showNpoints:BoxExecute
+showNpoints:Widget:Box08:Widget1
 NumberOfControlPoints:0
 CONNECTION
-Box06:LstContourPointsX:Box04:LstX
+Box06:LstContourPointsY:Box04:LstY
 NumberOfControlPoints:0
 CONNECTION
-showNpoints:lstIndexs:Box06:LstIndexsIn
+Box06:LstContourPointsZ:Box04:LstZ
 NumberOfControlPoints:0
 CONNECTION
-showNpoints:Widget:Box08:Widget1
+Box06:LstIndexsOut:Box04:LstIndexs
 NumberOfControlPoints:0
 CONNECTION
-Box04:Out:Box07:In
+Box30:BoxChange:Box31:In4
 NumberOfControlPoints:0
 CONNECTION
-viewer:Renderer1:Box07:Renderer
+showNpoints:lstIndexs:Box29:LstIndexsIn
 NumberOfControlPoints:0
 CONNECTION
-Box06:LstContourPointsY:Box04:LstY
+Box29:LstContourPointsX:Box30:lstPointX
 NumberOfControlPoints:0
 CONNECTION
-Box06:LstContourPointsZ:Box04:LstZ
+Box29:LstContourPointsY:Box30:lstPointY
 NumberOfControlPoints:0
 CONNECTION
-Box06:LstIndexsOut:Box04:LstIndexs
+Box29:LstContourPointsZ:Box30:lstPointZ
 NumberOfControlPoints:0
 CONNECTION
-viewer:Renderer1:Box11:Renderer
+Box29:LstIndexsOut:Box30:lstIndexs
 NumberOfControlPoints:0
 CONNECTION
-showNpoints:BoxChange:Box12:In2
+Box31:BoxChange:Box11:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-viewer:Renderer1:Box30:Renderer
+Box58:Out:Box57:In
 NumberOfControlPoints:0
 CONNECTION
-Box12:BoxChange:Box31:BoxExecute
+Box57:Out:Box61:In
 NumberOfControlPoints:0
 CONNECTION
-Box07:BoxChange:Box31:In2
+Box61:Out:Box60:Type
 NumberOfControlPoints:0
 CONNECTION
-Box30:BoxChange:Box31:In4
+showNpoints:WidgetShowNPoints:Box60:WidgetShowNPoints
 NumberOfControlPoints:0
 CONNECTION
-Box33:Out:Box34:In1
+Box57:BoxChange:Box60:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-Box34:Out:Box30:Opacity
+Box68:Spacing:Box60:Spacing
 NumberOfControlPoints:0
 CONNECTION
-Box33:BoxChange:Box12:In3
+showNpoints:lstPointsX:Box70:In0
 NumberOfControlPoints:0
 CONNECTION
-showNpoints:lstIndexs:Box29:LstIndexsIn
+showNpoints:lstPointsY:Box70:In1
 NumberOfControlPoints:0
 CONNECTION
-Box29:LstContourPointsX:Box30:lstPointX
+showNpoints:lstPointsZ:Box70:In2
 NumberOfControlPoints:0
 CONNECTION
-Box29:LstContourPointsY:Box30:lstPointY
+Box70:Out0:Box06:LstControlPointsX
 NumberOfControlPoints:0
 CONNECTION
-Box29:LstContourPointsZ:Box30:lstPointZ
+Box70:Out1:Box06:LstControlPointsY
 NumberOfControlPoints:0
 CONNECTION
-Box29:LstIndexsOut:Box30:lstIndexs
+Box70:Out2:Box06:LstControlPointsZ
 NumberOfControlPoints:0
 CONNECTION
-Box44:BoxChange:Box31:In3
+Box70:Out0:Box29:LstControlPointsX
 NumberOfControlPoints:0
 CONNECTION
-viewer:Renderer1:Box44:Renderer
+Box70:Out1:Box29:LstControlPointsY
 NumberOfControlPoints:0
 CONNECTION
-Box34:Out:Box44:Opacity
+Box70:Out2:Box29:LstControlPointsZ
 NumberOfControlPoints:0
 CONNECTION
-Box04:Out:Box54:In
+Box78:Out:Box77:Operation
 NumberOfControlPoints:0
 CONNECTION
-Box33:BoxChange:Box46:BoxExecute
+Box08:Widget:widget:widget
 NumberOfControlPoints:0
 CONNECTION
-Box31:BoxChange:Box11:BoxExecute
+render:render:Box66:In
 NumberOfControlPoints:0
 CONNECTION
-Box54:Out:Box46:In
+Box66:Out:Box11:Renderer
 NumberOfControlPoints:0
 CONNECTION
-Box46:Out:Box44:In
+Box66:Out:Box30:Renderer
 NumberOfControlPoints:0
 CONNECTION
-Box54:MeanNormal:Box46:Direction
+point:point:showNpoints:In
 NumberOfControlPoints:0
 CONNECTION
-Box33:Widget:Box52:Widget2
+Box66:Out:showNpoints:Renderer
 NumberOfControlPoints:0
 CONNECTION
-Box52:Widget:Box08:Widget5
+mesh:mesh:Box67:In
 NumberOfControlPoints:0
 CONNECTION
-Box53:Widget:Box52:Widget3
+Box67:Out:Box77:In1
 NumberOfControlPoints:0
 CONNECTION
-Box53:BoxChange:Box12:In5
+Box04:Out:Box48:polydata
 NumberOfControlPoints:0
 CONNECTION
-Box53:Out:Box46:ScalarFactor
+Box66:Out:Box48:render
 NumberOfControlPoints:0
 CONNECTION
-Box55:Out:Box56:In1
+showNpoints:BoxChange:Box31:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-Box55:Widget:Box52:Widget4
+Box48:boxchange:Box31:In1
 NumberOfControlPoints:0
 CONNECTION
-Box56:Out:Box54:Param
+image:image:Box35:In
 NumberOfControlPoints:0
 CONNECTION
-Box55:BoxChange:Box12:In7
+Box35:Out:Box68:In
 NumberOfControlPoints:0
 CONNECTION
-viewer:wxVtkBaseView1:Box57:wxVtkBaseView
+Box68:Spacing:Box70:k1
 NumberOfControlPoints:0
 CONNECTION
-Box58:Out:Box57:In
+Box35:Out:showNpoints:Image
 NumberOfControlPoints:0
 CONNECTION
-Box57:BoxChange:Box59:In2
+Box34:Out:Box36:In1
 NumberOfControlPoints:0
 CONNECTION
-Box57:Out:Box61:In
+Box36:Out:Box30:Opacity
 NumberOfControlPoints:0
 CONNECTION
-Box61:Out:Box60:Type
+Box34:BoxChange:Box31:In2
 NumberOfControlPoints:0
 CONNECTION
-showNpoints:WidgetShowNPoints:Box60:WidgetShowNPoints
+Box57:BoxChange:Box08:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-Box57:BoxChange:Box60:BoxExecute
+Box04:Out:Box77:In2
 NumberOfControlPoints:0
 CONNECTION
-Box62:Out:Box60:Mesh
+title:title:Box08:WinTitle
 NumberOfControlPoints:0
 CONNECTION
-Box68:Spacing:Box60:Spacing
+Box77:Out:Box37:polydata
 NumberOfControlPoints:0
 CONNECTION
-Box24:Spacing:Box70:k1
+Box66:Out:Box37:render
 NumberOfControlPoints:0
 CONNECTION
-showNpoints:lstPointsX:Box70:In0
+Box37:widget:Box79:Widget5
 NumberOfControlPoints:0
 CONNECTION
-showNpoints:lstPointsY:Box70:In1
+Box38:Widget:Box39:Widget2
 NumberOfControlPoints:0
 CONNECTION
-showNpoints:lstPointsZ:Box70:In2
+Box39:Widget:Box08:Widget4
 NumberOfControlPoints:0
 CONNECTION
-Box70:Out0:Box06:LstControlPointsX
+Box79:Widget:Box40:Widget2
 NumberOfControlPoints:0
 CONNECTION
-Box70:Out1:Box06:LstControlPointsY
+Box40:Widget:Box08:Widget6
 NumberOfControlPoints:0
 CONNECTION
-Box70:Out2:Box06:LstControlPointsZ
+Box43:Widget:Box41:Widget4
 NumberOfControlPoints:0
 CONNECTION
-Box70:Out0:Box29:LstControlPointsX
+Box42:Widget:Box41:Widget2
 NumberOfControlPoints:0
 CONNECTION
-Box70:Out1:Box29:LstControlPointsY
+Box41:Widget:Box08:Widget8
 NumberOfControlPoints:0
 CONNECTION
-Box70:Out2:Box29:LstControlPointsZ
+Box78:Widget:Box44:Widget2
 NumberOfControlPoints:0
 CONNECTION
-Box75:Out:Box06:OpenClose
+Box80:Widget:Box44:Widget5
 NumberOfControlPoints:0
 CONNECTION
-Box75:Widget:Box76:Widget3
+Box44:Widget:Box79:Widget2
 NumberOfControlPoints:0
 CONNECTION
-Box76:Widget:Box08:Widget3
+meshmanagermodel:meshmanagermodel:Box46:In
 NumberOfControlPoints:0
 CONNECTION
-Box78:Widget:Box79:Widget1
+Box46:Out:Box45:MeshManagerModel
 NumberOfControlPoints:0
 CONNECTION
-Box80:Widget:Box79:Widget3
+Box77:Out:Box45:Mesh
 NumberOfControlPoints:0
 CONNECTION
-Box79:Widget:Box08:Widget9
+Box49:OutString:Box06:NbPoints
 NumberOfControlPoints:0
 CONNECTION
-Box80:BoxChange:Box77:BoxExecute
+Box49:Widget:Box50:Widget4
 NumberOfControlPoints:0
 CONNECTION
-Box77:Out:Box81:In
+Box34:Widget:Box50:Widget2
 NumberOfControlPoints:0
 CONNECTION
-viewer:Renderer1:Box81:Renderer
+Box50:Widget:Box38:Widget1
 NumberOfControlPoints:0
 CONNECTION
-Box81:BoxChange:Box82:BoxExecute
+Box42:BoxChange:Box51:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-viewer:Renderer1:Box82:Renderer
+Box45:BoxChange:Box51:In2
 NumberOfControlPoints:0
 CONNECTION
-Box83:Out:Box84:In1
+Box52:BoxChange:Box51:In4
 NumberOfControlPoints:0
 CONNECTION
-Box84:Out:Box81:Opacity
+showNpoints:WidgetShowNPoints:Box52:WidgetShowNPoints
 NumberOfControlPoints:0
 CONNECTION
-Box83:Widget:Box79:Widget4
+Box80:BoxChange:Box53:In2
 NumberOfControlPoints:0
 CONNECTION
-Box62:Out:Box87:In
+Box53:BoxChange:Box77:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-Box92:Out:Box77:In1
+Box42:BoxChange:Box53:In3
 NumberOfControlPoints:0
 CONNECTION
-Box62:Out:Box95:In
+Box43:BoxChange:Box55:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-Box95:Out:Box92:In
+Box52:BoxChange:Box55:In2
 NumberOfControlPoints:0
 CONNECTION
-Box78:Out:Box77:Operation
+Box43:BoxChange:Box53:In6
+NumberOfControlPoints:0
+CONNECTION
+Box77:BoxChange:Box37:boxexecute
+NumberOfControlPoints:0
+CONNECTION
+Box48:widget:Box59:Widget4
+NumberOfControlPoints:0
+CONNECTION
+Box59:Widget:Box38:Widget4
+NumberOfControlPoints:0
+CONNECTION
+Box62:_widget:Box59:Widget2
+NumberOfControlPoints:0
+CONNECTION
+boxChange:boxChange:Box63:In
+NumberOfControlPoints:0
+CONNECTION
+Box63:BoxChange:showNpoints:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box63:BoxChange:Box62:_execute
+NumberOfControlPoints:0
+CONNECTION
+wxvtkbaseview2:wxvtkbaseview2:Box64:In
+NumberOfControlPoints:0
+CONNECTION
+Box64:Out:Box57:wxVtkBaseView2
+NumberOfControlPoints:0
+CONNECTION
+Box64:Out:Box62:_wxvtkbaseview2D1
+NumberOfControlPoints:0
+CONNECTION
+Box65:Out:Box57:wxVtkBaseView3
+NumberOfControlPoints:0
+CONNECTION
+Box65:Out:Box62:_wxvtkbaseview2D2
+NumberOfControlPoints:0
+CONNECTION
+wxvtkbaseview3:wxvtkbaseview3:Box65:In
+NumberOfControlPoints:0
+CONNECTION
+wxvtkbaseview4:wxvtkbaseview4:Box69:In
+NumberOfControlPoints:0
+CONNECTION
+Box69:Out:Box57:wxVtkBaseView4
+NumberOfControlPoints:0
+CONNECTION
+Box69:Out:Box62:_wxvtkbaseview2D3
+NumberOfControlPoints:0
+CONNECTION
+wxvtkbaseview1:wxvtkbaseview1:Box71:In
+NumberOfControlPoints:0
+CONNECTION
+Box71:Out:Box57:wxVtkBaseView
+NumberOfControlPoints:0
+CONNECTION
+Box71:Out:Box62:_wxvtkbaseview3D1
 NumberOfControlPoints:0
 CONNECTION
-Box46:Out:Box77:In2
+Box04:Out:Box62:_polydata
 NumberOfControlPoints:0
 APP_END

diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs
index ba0585dd63104125cddd3ec6fb7e0bc9b61a308d..b4d480c12e36c6381908a58b1e198227c8551ba4 100644 (file)
--- a/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs
+++ b/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs
@@ -7,8 +7,8 @@ include std
 include itkvtk
 include creaMaracasVisu
 include creaVtk
-include vtk
 include wx
+include vtk
 include std
 
 define Mesh_tool_ApplyPatch creaMaracasVisu
@@ -18,9 +18,6 @@ description "Show N Points"
 
 category "demo"
 
-new creaMaracasVisu:ViewerNV viewer
-  set viewer.nTypeView "6 1 2 0"
-
 new creaMaracasVisu:ShowNPoints showNpoints
   set showNpoints.Radio "1"
   set showNpoints.Type "4"
@@ -29,118 +26,60 @@ new creaVtk:CreateMeshFromPoints Box04
 
 new creaMaracasVisu:ManualContourModel_Box Box06
   set Box06.DoubleContour "1"
-  set Box06.NbPoints "35"
-  set Box06.OpenClose "false"
+  set Box06.NbPoints "100"
+  set Box06.OpenClose "true"
   set Box06.OpenClose2 "false"
 
-new vtk:PolyDataToActor Box07
-  set Box07.Representation "2"
-
 new wx:LayoutLine Box08
 
 new vtk:UpdateRender Box11
   set Box11.Active "true"
 
-new std:MultipleInputs Box12
-
-new vtk:ImageVtkProperties Box24
-
 new creaMaracasVisu:DrawAxisTree3D Box30
+  set Box30.Colour "0 0 1"
   set Box30.LineWidth "2"
 
 new std:MultipleInputs Box31
 
-new wx:Slider Box33
-  set Box33.In "20"
-  set Box33.Label "true"
-  set Box33.Max "100"
-  set Box33.Min "0"
-  set Box33.ReactiveOnTrack "true"
-  set Box33.Title "Transparence"
-
-new std:Div Box34
-  set Box34.In2 "100"
-
 new creaMaracasVisu:ManualContourModel_Box Box29
   set Box29.NbPoints "40"
-  set Box29.OpenClose "false"
+  set Box29.OpenClose "true"
   set Box29.OpenClose2 "false"
 
-new vtk:PolyDataToActor Box44
-  set Box44.Opacity "1"
-  set Box44.Representation "1"
-
-new creaVtk:PolyDataNormals Box54
-  set Box54.Type "1"
-
-new creaVtk:LinearExtrusionFilter Box46
-
-new wx:LayoutLine Box52
-  set Box52.Orientation "H"
-
-new wx:SpinCtrl Box53
-  set Box53.Max "50"
-  set Box53.Min "-50"
-  set Box53.Selected "0"
-  set Box53.Title "Scalar Factor"
-
-new wx:Slider Box55
-  set Box55.In "100"
-  set Box55.Max "200"
-  set Box55.Min "-200"
-  set Box55.ReactiveOnTrack "true"
-  set Box55.Title "Angle Correction"
-
-new std:Div Box56
-  set Box56.In2 "100"
-
 new creaMaracasVisu:wxPopupMenu Box57
+  set Box57.WithCtrlKey "true"
 
 new std:AddStringToVector Box58
-  set Box58.In0 "Insert point"
-  set Box58.In1 "Track point"
-  set Box58.In2 "Set nearest point"
-  set Box58.In3 "Erase point"
-  set Box58.In4 "Delete all points"
-  set Box58.In5 "----------------------"
-  set Box58.In6 "Insert group after"
-  set Box58.In7 "Delete group"
-  set Box58.In8 "----------------------"
-  set Box58.In9 "Tools_1 - Create Mesh"
-
-new std:MultipleInputs Box59
+  set Box58.In0 "Add point"
+  set Box58.In1 "Insert point"
+  set Box58.In2 "Track point"
+  set Box58.In3 "Set nearest point"
+  set Box58.In4 "Erase point"
+  set Box58.In5 "Delete all points"
+  set Box58.In6 "----------------------"
+  set Box58.In7 "Insert group after"
+  set Box58.In8 "Delete group"
 
 new creaMaracasVisu:ShowNPoints_Tools Box60
 
 new std:StringSelect Box61
-  set Box61.In0 "10"
-  set Box61.In1 "20"
-  set Box61.In2 "30"
-  set Box61.In3 "40"
-  set Box61.In4 "50"
-  set Box61.In5 "0"
-  set Box61.In6 "100"
-  set Box61.In7 "110"
-  set Box61.In8 "0"
-  set Box61.In9 "200"
-
-new vtk:MarchingCubes Box62
-  set Box62.ComputeNormalsOn "true"
-  set Box62.Value "128"
+  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"
 
 new vtk:ImageVtkProperties Box68
 
 new std:VectorFilterDouble Box70
   set Box70.Type "11"
 
-new wx:CheckBox Box75
-  set Box75.In "false"
-  set Box75.Title "Open Contour"
-
-new wx:LayoutLine Box76
-  set Box76.Orientation "H"
-
 new creaVtk:BooleanOperationPolyDataFilter Box77
+  set Box77.BoxProcessMode "Manual"
   set Box77.ReorientDifferenceCells "false"
 
 new wx:ComboBox Box78
@@ -149,90 +88,113 @@ new wx:ComboBox Box78
 
 new wx:LayoutLine Box79
   set Box79.Orientation "H"
+  set Box79.WinTitle "New Surface"
 
 new wx:CommandButton Box80
   set Box80.Label "Run"
 
-new vtk:PolyDataToActor Box81
-  set Box81.Colour "0 1 1"
-  set Box81.Opacity "1"
+new std:MagicBox Box66
+
+new std:MagicBox Box67
+
+new creaMaracasVisu:PolyDataToActor_Widget Box48
+
+new vtk:vtkImageDataPointerRelay Box35
+
+new wx:Slider Box34
+  set Box34.In "50"
+  set Box34.Label "true"
+  set Box34.Max "100"
+  set Box34.Min "0"
+  set Box34.ReactiveOnTrack "true"
+  set Box34.Title "Opacity Splines"
+
+new std:Div Box36
+  set Box36.In2 "100"
+
+new creaMaracasVisu:PolyDataToActor_Widget Box37
+  set Box37.color "0 1 1"
+
+new wx:LayoutLine Box38
+  set Box38.Orientation "H"
+  set Box38.WinTitle "Interpolated Surface"
+
+new wx:LayoutTab Box39
+
+new wx:LayoutTab Box40
+
+new wx:LayoutLine Box41
+  set Box41.Orientation "H"
+  set Box41.WinTitle "New Surface"
+
+new wx:CommandButton Box42
+  set Box42.Label "Apply"
+
+new wx:CommandButton Box43
+  set Box43.Label "Reset"
+
+new wx:LayoutLine Box44
+  set Box44.Orientation "V"
+  set Box44.WinTitle "New Surface"
+
+new creaVtk:MeshManager_tool Box45
+  set Box45.Tool "30"
+
+new std:MagicBox Box46
+
+new wx:ComboBox Box49
+  set Box49.In "25 50 100 150"
+  set Box49.Selection "1"
+  set Box49.Title "Number of Points"
+
+new wx:LayoutLine Box50
+  set Box50.Orientation "V"
+
+new std:MultipleInputs Box51
+
+new creaMaracasVisu:ShowNPoints_Tools Box52
+  set Box52.Type "120"
+
+new std:MultipleInputs Box53
+
+new std:MultipleInputs Box55
+
+new wx:LayoutLine Box59
+  set Box59.Orientation "V"
 
-new vtk:UpdateRender Box82
-  set Box82.Active "true"
+new creaMaracasVisu:MeshContours_Widget Box62
+  set Box62.colorMesh "1 1 0"
 
-new wx:Slider Box83
-  set Box83.In "50"
-  set Box83.Label "true"
-  set Box83.Max "100"
-  set Box83.Min "0"
-  set Box83.ReactiveOnTrack "true"
-  set Box83.Title "Opacity Mesh"
+new std:MagicBox Box63
 
-new std:Div Box84
-  set Box84.In2 "100"
+new std:MagicBox Box64
 
-new creaVtk:MeshReduction_DecimatePro Box87
-  set Box87.TargetReduction "0.5"
+new std:MagicBox Box65
 
-new creaVtk:PolyDataNormals Box92
+new std:MagicBox Box69
 
-new creaVtk:MeshReduction_QuadricDecimation Box95
-  set Box95.TargetReduction "0.5"
+new std:MagicBox Box71
 
 
-connect viewer.Renderer1 showNpoints.Renderer
-connect viewer.Point showNpoints.In
-connect viewer.BoxChange showNpoints.BoxExecute
 connect Box06.LstContourPointsX Box04.LstX
 connect showNpoints.lstIndexs Box06.LstIndexsIn
 connect showNpoints.Widget Box08.Widget1
-connect Box04.Out Box07.In
-connect viewer.Renderer1 Box07.Renderer
 connect Box06.LstContourPointsY Box04.LstY
 connect Box06.LstContourPointsZ Box04.LstZ
 connect Box06.LstIndexsOut Box04.LstIndexs
-connect viewer.Renderer1 Box11.Renderer
-connect showNpoints.BoxChange Box12.In2
-connect viewer.Renderer1 Box30.Renderer
-connect Box12.BoxChange Box31.BoxExecute
-connect Box07.BoxChange Box31.In2
 connect Box30.BoxChange Box31.In4
-connect Box33.Out Box34.In1
-connect Box34.Out Box30.Opacity
-connect Box33.BoxChange Box12.In3
 connect showNpoints.lstIndexs Box29.LstIndexsIn
 connect Box29.LstContourPointsX Box30.lstPointX
 connect Box29.LstContourPointsY Box30.lstPointY
 connect Box29.LstContourPointsZ Box30.lstPointZ
 connect Box29.LstIndexsOut Box30.lstIndexs
-connect Box44.BoxChange Box31.In3
-connect viewer.Renderer1 Box44.Renderer
-connect Box34.Out Box44.Opacity
-connect Box04.Out Box54.In
-connect Box33.BoxChange Box46.BoxExecute
 connect Box31.BoxChange Box11.BoxExecute
-connect Box54.Out Box46.In
-connect Box46.Out Box44.In
-connect Box54.MeanNormal Box46.Direction
-connect Box33.Widget Box52.Widget2
-connect Box52.Widget Box08.Widget5
-connect Box53.Widget Box52.Widget3
-connect Box53.BoxChange Box12.In5
-connect Box53.Out Box46.ScalarFactor
-connect Box55.Out Box56.In1
-connect Box55.Widget Box52.Widget4
-connect Box56.Out Box54.Param
-connect Box55.BoxChange Box12.In7
-connect viewer.wxVtkBaseView1 Box57.wxVtkBaseView
 connect Box58.Out Box57.In
-connect Box57.BoxChange Box59.In2
 connect Box57.Out Box61.In
 connect Box61.Out Box60.Type
 connect showNpoints.WidgetShowNPoints Box60.WidgetShowNPoints
 connect Box57.BoxChange Box60.BoxExecute
-connect Box62.Out Box60.Mesh
 connect Box68.Spacing Box60.Spacing
-connect Box24.Spacing Box70.k1
 connect showNpoints.lstPointsX Box70.In0
 connect showNpoints.lstPointsY Box70.In1
 connect showNpoints.lstPointsZ Box70.In2
@@ -242,31 +204,83 @@ connect Box70.Out2 Box06.LstControlPointsZ
 connect Box70.Out0 Box29.LstControlPointsX
 connect Box70.Out1 Box29.LstControlPointsY
 connect Box70.Out2 Box29.LstControlPointsZ
-connect Box75.Out Box06.OpenClose
-connect Box75.Widget Box76.Widget3
-connect Box76.Widget Box08.Widget3
-connect Box78.Widget Box79.Widget1
-connect Box80.Widget Box79.Widget3
-connect Box79.Widget Box08.Widget9
-connect Box80.BoxChange Box77.BoxExecute
-connect Box77.Out Box81.In
-connect viewer.Renderer1 Box81.Renderer
-connect Box81.BoxChange Box82.BoxExecute
-connect viewer.Renderer1 Box82.Renderer
-connect Box83.Out Box84.In1
-connect Box84.Out Box81.Opacity
-connect Box83.Widget Box79.Widget4
-connect Box62.Out Box87.In
-connect Box92.Out Box77.In1
-connect Box62.Out Box95.In
-connect Box95.Out Box92.In
 connect Box78.Out Box77.Operation
-connect Box46.Out Box77.In2
+connect Box66.Out Box11.Renderer
+connect Box66.Out Box30.Renderer
+connect Box66.Out showNpoints.Renderer
+connect Box67.Out Box77.In1
+connect Box04.Out Box48.polydata
+connect Box66.Out Box48.render
+connect showNpoints.BoxChange Box31.BoxExecute
+connect Box48.boxchange Box31.In1
+connect Box35.Out Box68.In
+connect Box68.Spacing Box70.k1
+connect Box35.Out showNpoints.Image
+connect Box34.Out Box36.In1
+connect Box36.Out Box30.Opacity
+connect Box34.BoxChange Box31.In2
+connect Box57.BoxChange Box08.BoxExecute
+connect Box04.Out Box77.In2
+connect Box77.Out Box37.polydata
+connect Box66.Out Box37.render
+connect Box37.widget Box79.Widget5
+connect Box38.Widget Box39.Widget2
+connect Box39.Widget Box08.Widget4
+connect Box79.Widget Box40.Widget2
+connect Box40.Widget Box08.Widget6
+connect Box43.Widget Box41.Widget4
+connect Box42.Widget Box41.Widget2
+connect Box41.Widget Box08.Widget8
+connect Box78.Widget Box44.Widget2
+connect Box80.Widget Box44.Widget5
+connect Box44.Widget Box79.Widget2
+connect Box46.Out Box45.MeshManagerModel
+connect Box77.Out Box45.Mesh
+connect Box49.OutString Box06.NbPoints
+connect Box49.Widget Box50.Widget4
+connect Box34.Widget Box50.Widget2
+connect Box50.Widget Box38.Widget1
+connect Box42.BoxChange Box51.BoxExecute
+connect Box45.BoxChange Box51.In2
+connect Box52.BoxChange Box51.In4
+connect showNpoints.WidgetShowNPoints Box52.WidgetShowNPoints
+connect Box80.BoxChange Box53.In2
+connect Box53.BoxChange Box77.BoxExecute
+connect Box42.BoxChange Box53.In3
+connect Box43.BoxChange Box55.BoxExecute
+connect Box52.BoxChange Box55.In2
+connect Box43.BoxChange Box53.In6
+connect Box77.BoxChange Box37.boxexecute
+connect Box48.widget Box59.Widget4
+connect Box59.Widget Box38.Widget4
+connect Box62._widget Box59.Widget2
+connect Box63.BoxChange showNpoints.BoxExecute
+connect Box63.BoxChange Box62._execute
+connect Box64.Out Box57.wxVtkBaseView2
+connect Box64.Out Box62._wxvtkbaseview2D1
+connect Box65.Out Box57.wxVtkBaseView3
+connect Box65.Out Box62._wxvtkbaseview2D2
+connect Box69.Out Box57.wxVtkBaseView4
+connect Box69.Out Box62._wxvtkbaseview2D3
+connect Box71.Out Box57.wxVtkBaseView
+connect Box71.Out Box62._wxvtkbaseview3D1
+connect Box04.Out Box62._polydata
 
 # Complex input ports
+input render Box66.In " "
+input point showNpoints.In " "
+input mesh Box67.In " "
+input image Box35.In " "
+input title Box08.WinTitle " "
+input meshmanagermodel Box46.In " "
+input boxChange Box63.In " "
+input wxvtkbaseview2 Box64.In " "
+input wxvtkbaseview3 Box65.In " "
+input wxvtkbaseview4 Box69.In " "
+input wxvtkbaseview1 Box71.In " "
 
 # Complex output ports
+output widget Box08.Widget " "
 
-exec Box59
 
 endefine

diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg
index a79b7a69acf950988f7637653e9510b627957291..070eb2831f62b510364b7683ed1e79768ebd428b 100644 (file)
--- a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg
+++ b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg
@@ -13,7 +13,7 @@ PACKAGENAME:creaMaracasVisu
 COMPLEXOUTPUTS:1
 COMPLEX_PORT
 widget
--185.515637:-154.347846:-900.000000
+-180.910574:-184.919472:-900.000000
 FIN_COMPLEX_PORT
 COMPLEXINPUTS:11
 COMPLEX_PORT
@@ -22,7 +22,7 @@ render
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 boxChange
--13.776500:138.843910:-900.000000
+-6.086529:137.355528:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 point
@@ -30,7 +30,7 @@ point
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 wxvtkbaseview1
--256.052318:132.277254:-900.000000
+-268.019084:133.379456:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 mesh
@@ -50,7 +50,7 @@ wxvtkbaseview3
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 wxvtkbaseview4
--194.359638:132.854505:-900.000000
+-193.414893:132.224675:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 title
@@ -60,7 +60,7 @@ COMPLEX_PORT
 meshmanagermodel
 -150.374274:130.740991:-900.000000
 FIN_COMPLEX_PORT
-BOXES:35
+BOXES:57
 BOX
 creaMaracasVisu:ShowNPoints:showNpoints
 ISEXEC:FALSE
@@ -70,6 +70,8 @@ PORT
 Radio:"1"
 PORT
 Type:"4"
+PORT
+WinTitle:"1.1   Splines"
 FIN_BOX
 BOX
 creaVtk:CreateMeshFromPoints:Box04
@@ -80,12 +82,12 @@ FIN_BOX
 BOX
 creaMaracasVisu:ManualContourModel_Box:Box06
 ISEXEC:FALSE
-19.252527:28.454709:-900.000000
-43.772527:25.954709:-900.000000
+29.075845:30.364799:-900.000000
+53.595845:27.864799:-900.000000
 PORT
 DoubleContour:"1"
 PORT
-NbPoints:"35"
+NbPoints:"100"
 PORT
 OpenClose:"true"
 PORT
@@ -94,8 +96,8 @@ FIN_BOX
 BOX
 wx:LayoutLine:Box08
 ISEXEC:FALSE
--187.091673:-141.817931:-900.000000
--153.771673:-144.317931:-900.000000
+-183.272879:-168.695106:-900.000000
+-149.952879:-171.195106:-900.000000
 FIN_BOX
 BOX
 vtk:UpdateRender:Box11
@@ -108,8 +110,8 @@ FIN_BOX
 BOX
 creaMaracasVisu:DrawAxisTree3D:Box30
 ISEXEC:FALSE
-66.830537:-0.099472:-900.000000
-94.870537:-2.599472:-900.000000
+66.011927:-0.645212:-900.000000
+94.051927:-3.145212:-900.000000
 PORT
 Colour:"0 0 1"
 PORT
@@ -124,8 +126,8 @@ FIN_BOX
 BOX
 creaMaracasVisu:ManualContourModel_Box:Box29
 ISEXEC:FALSE
-59.049338:28.545969:-900.000000
-83.569338:26.045969:-900.000000
+76.240145:29.637449:-900.000000
+100.760145:27.137449:-900.000000
 PORT
 NbPoints:"40"
 PORT
@@ -212,8 +214,8 @@ FIN_BOX
 BOX
 creaVtk:BooleanOperationPolyDataFilter:Box77
 ISEXEC:FALSE
--81.271858:-21.560635:-900.000000
--57.541858:-24.060635:-900.000000
+-84.476321:-26.264040:-900.000000
+-60.746321:-28.764040:-900.000000
 PORT
 BoxProcessMode:"Manual"
 PORT
@@ -226,8 +228,6 @@ ISEXEC:FALSE
 -127.597713:-8.275167:-900.000000
 PORT
 In:"Union Intersection Difference"
-PORT
-Title:"Mesh Operation"
 FIN_BOX
 BOX
 wx:LayoutLine:Box79
@@ -237,13 +237,13 @@ ISEXEC:FALSE
 PORT
 Orientation:"H"
 PORT
-WinTitle:"New Surface"
+WinTitle:"New Surface ( Magenta  =  Red+Yelow )"
 FIN_BOX
 BOX
 wx:CommandButton:Box80
 ISEXEC:FALSE
--93.628284:-4.957775:-900.000000
--71.353284:-7.457775:-900.000000
+-107.452047:-5.305678:-900.000000
+-85.177047:-7.805678:-900.000000
 PORT
 Label:"Run"
 FIN_BOX
@@ -274,8 +274,8 @@ FIN_BOX
 BOX
 wx:Slider:Box34
 ISEXEC:FALSE
--191.557215:-82.602633:-900.000000
--161.757215:-85.102633:-900.000000
+-198.941120:-3.426364:-900.000000
+-169.141120:-5.926364:-900.000000
 PORT
 In:"50"
 PORT
@@ -287,39 +287,39 @@ Min:"0"
 PORT
 ReactiveOnTrack:"true"
 PORT
-Title:"Opacity Splines"
+Title:"Splines Opacity"
 FIN_BOX
 BOX
 std:Div:Box36
 ISEXEC:FALSE
--189.085872:-88.665523:-900.000000
--168.160872:-91.165523:-900.000000
+-190.788172:-9.261990:-900.000000
+-169.863172:-11.761990:-900.000000
 PORT
 In2:"100"
 FIN_BOX
 BOX
 creaMaracasVisu:PolyDataToActor_Widget:Box37
 ISEXEC:FALSE
--79.919475:-35.929691:-900.000000
--56.899475:-38.429691:-900.000000
+-62.146849:-38.004259:-900.000000
+-39.126849:-40.504259:-900.000000
 PORT
 color:"0 1 1"
 FIN_BOX
 BOX
 wx:LayoutLine:Box38
 ISEXEC:FALSE
--191.115189:-97.487359:-900.000000
--157.795189:-99.987359:-900.000000
+-190.854929:-82.522396:-900.000000
+-157.534929:-85.022396:-900.000000
 PORT
 Orientation:"H"
 PORT
-WinTitle:"Interpolated Surface"
+WinTitle:"Interpolated Surface (Yelow)"
 FIN_BOX
 BOX
 wx:LayoutTab:Box39
 ISEXEC:FALSE
--192.009898:-106.771357:-900.000000
--158.689898:-109.271357:-900.000000
+-192.270158:-93.367955:-900.000000
+-158.950158:-95.867955:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box40
@@ -330,46 +330,44 @@ FIN_BOX
 BOX
 wx:LayoutLine:Box41
 ISEXEC:FALSE
--139.293876:-129.639404:-900.000000
--105.973876:-132.139404:-900.000000
+-133.181463:-130.594259:-900.000000
+-99.861463:-133.094259:-900.000000
 PORT
 Orientation:"H"
-PORT
-WinTitle:"New Surface"
 FIN_BOX
 BOX
 wx:CommandButton:Box42
 ISEXEC:FALSE
--133.798351:-105.618129:-900.000000
--111.523351:-108.118129:-900.000000
+-117.665938:-115.252338:-900.000000
+-95.390938:-117.752338:-900.000000
 PORT
-Label:"Apply"
+Label:"Apply  ( Magenta -> To Red)"
 FIN_BOX
 BOX
 wx:CommandButton:Box43
 ISEXEC:FALSE
--108.369154:-105.228826:-900.000000
--86.094154:-107.728826:-900.000000
+-69.629626:-115.035234:-900.000000
+-47.354626:-117.535234:-900.000000
 PORT
-Label:"Reset"
+Label:"Reset Tool"
 FIN_BOX
 BOX
 wx:LayoutLine:Box44
 ISEXEC:FALSE
--153.658490:-37.966354:-900.000000
--120.338490:-40.466354:-900.000000
+-154.036190:-43.432527:-900.000000
+-120.716190:-45.932527:-900.000000
 PORT
 Orientation:"V"
 PORT
-WinTitle:"New Surface"
+WinTitle:"1.2   Mesh Action"
 FIN_BOX
 BOX
 creaVtk:MeshManager_tool:Box45
 ISEXEC:FALSE
--104.441668:-121.362132:-900.000000
--81.941668:-123.862132:-900.000000
+-91.573378:-134.495402:-900.000000
+-69.073378:-136.995402:-900.000000
 PORT
-Tool:"3"
+Tool:"30"
 FIN_BOX
 BOX
 std:MagicBox:Box46
@@ -378,14 +376,166 @@ ISEXEC:FALSE
 -115.531256:111.421532:-900.000000
 FIN_BOX
 BOX
-creaVtk:MeshManager_tool:Box47
+wx:ComboBox:Box49
+ISEXEC:FALSE
+-182.639251:-13.479145:-900.000000
+-156.359251:-15.979145:-900.000000
+PORT
+In:"25 50 100 150"
+PORT
+Selection:"1"
+PORT
+Title:"Number of Points"
+FIN_BOX
+BOX
+wx:LayoutLine:Box50
+ISEXEC:FALSE
+-57.295971:-56.374591:-900.000000
+-23.975971:-58.874591:-900.000000
+PORT
+Orientation:"V"
+PORT
+WinTitle:"Config"
+FIN_BOX
+BOX
+std:MultipleInputs:Box51
 ISEXEC:FALSE
--70.871863:-121.548692:-900.000000
--48.371863:-124.048692:-900.000000
+-92.949669:-148.627142:-900.000000
+-70.979669:-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
 PORT
-Tool:"4"
+Type:"120"
 FIN_BOX
-CONNECTIONS:79
+BOX
+std:MultipleInputs:Box53
+ISEXEC:FALSE
+-94.857805:-12.097761:-900.000000
+-72.887805:-14.597761:-900.000000
+FIN_BOX
+BOX
+std:MultipleInputs:Box55
+ISEXEC:FALSE
+-56.216962:-150.487985:-900.000000
+-34.246962:-152.987985:-900.000000
+FIN_BOX
+BOX
+creaMaracasVisu:MeshContours_Widget:Box62
+ISEXEC:FALSE
+-228.707140:-3.136982:-900.000000
+-205.912140:-5.636982:-900.000000
+PORT
+colorMesh:"1 1 0"
+FIN_BOX
+BOX
+std:MagicBox:Box63
+ISEXEC:FALSE
+-8.402303:123.950335:-900.000000
+13.197697:121.450335:-900.000000
+FIN_BOX
+BOX
+std:MagicBox:Box64
+ISEXEC:FALSE
+-243.113826:124.330340:-900.000000
+-221.513826:121.830340:-900.000000
+FIN_BOX
+BOX
+std:MagicBox:Box65
+ISEXEC:FALSE
+-220.296210:124.504415:-900.000000
+-198.696210:122.004415:-900.000000
+FIN_BOX
+BOX
+std:MagicBox:Box69
+ISEXEC:FALSE
+-197.793508:124.678490:-900.000000
+-176.193508:122.178490:-900.000000
+FIN_BOX
+BOX
+std:MagicBox:Box71
+ISEXEC:FALSE
+-273.359367:124.504415:-900.000000
+-251.759367:122.004415:-900.000000
+FIN_BOX
+BOX
+creaMaracasVisu:MeshContours_Widget:Box72
+ISEXEC:FALSE
+-254.811809:-43.192382:-900.000000
+-232.016809:-45.692382:-900.000000
+PORT
+colorMesh:"0 1 1"
+FIN_BOX
+BOX
+wx:LayoutLine:Box74
+ISEXEC:FALSE
+-137.945645:-140.591346:-900.000000
+-104.625645:-143.091346:-900.000000
+PORT
+Orientation:"V"
+PORT
+WinTitle:"Step 2.   Apply"
+FIN_BOX
+BOX
+wx:LayoutTab:Box76
+ISEXEC:FALSE
+-172.432410:-150.170211:-900.000000
+-139.112410:-152.670211:-900.000000
+FIN_BOX
+BOX
+wx:LayoutLine:Box81
+ISEXEC:FALSE
+-187.629585:-135.160048:-900.000000
+-154.309585:-137.660048:-900.000000
+PORT
+WinTitle:"Step 1.   Surface"
+FIN_BOX
+BOX
+wx:LayoutTab:Box82
+ISEXEC:FALSE
+-142.286608:-51.350487:-900.000000
+-108.966608:-53.850487:-900.000000
+FIN_BOX
+BOX
+wx:OutputText:Box83
+ISEXEC:FALSE
+-131.708614:-34.245646:-900.000000
+-110.038614:-36.745646:-900.000000
+FIN_BOX
+BOX
+wx:OutputText:Box84
+ISEXEC:FALSE
+-127.611417:-38.148449:-900.000000
+-105.941417:-40.648449:-900.000000
+FIN_BOX
+BOX
+wx:OutputText:Box85
+ISEXEC:FALSE
+-145.099904:-118.194407:-900.000000
+-123.429904:-120.694407:-900.000000
+FIN_BOX
+BOX
+wx:LayoutTab:Box86
+ISEXEC:FALSE
+-56.537338:-70.143306:-900.000000
+-23.217338:-72.643306:-900.000000
+FIN_BOX
+BOX
+wx:OutputText:Box87
+ISEXEC:FALSE
+-35.032220:-44.152050:-900.000000
+-13.362220:-46.652050:-900.000000
+FIN_BOX
+BOX
+wx:OutputText:Box88
+ISEXEC:FALSE
+-31.367033:-49.235762:-900.000000
+-9.697033:-51.735762:-900.000000
+FIN_BOX
+CONNECTIONS:117
 CONNECTION
 Box06:LstContourPointsX:Box04:LstX
 NumberOfControlPoints:0
@@ -393,9 +543,6 @@ CONNECTION
 showNpoints:lstIndexs:Box06:LstIndexsIn
 NumberOfControlPoints:0
 CONNECTION
-showNpoints:Widget:Box08:Widget1
-NumberOfControlPoints:0
-CONNECTION
 Box06:LstContourPointsY:Box04:LstY
 NumberOfControlPoints:0
 CONNECTION
@@ -471,9 +618,6 @@ CONNECTION
 Box70:Out2:Box29:LstControlPointsZ
 NumberOfControlPoints:0
 CONNECTION
-Box80:BoxChange:Box77:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
 Box78:Out:Box77:Operation
 NumberOfControlPoints:0
 CONNECTION
@@ -489,18 +633,12 @@ CONNECTION
 Box66:Out:Box30:Renderer
 NumberOfControlPoints:0
 CONNECTION
-boxChange:boxChange:showNpoints:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
 point:point:showNpoints:In
 NumberOfControlPoints:0
 CONNECTION
 Box66:Out:showNpoints:Renderer
 NumberOfControlPoints:0
 CONNECTION
-wxvtkbaseview1:wxvtkbaseview1:Box57:wxVtkBaseView
-NumberOfControlPoints:0
-CONNECTION
 mesh:mesh:Box67:In
 NumberOfControlPoints:0
 CONNECTION
@@ -540,87 +678,213 @@ CONNECTION
 Box34:BoxChange:Box31:In2
 NumberOfControlPoints:0
 CONNECTION
-wxvtkbaseview2:wxvtkbaseview2:Box57:wxVtkBaseView2
+Box57:BoxChange:Box08:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-wxvtkbaseview3:wxvtkbaseview3:Box57:wxVtkBaseView3
+Box04:Out:Box77:In2
 NumberOfControlPoints:0
 CONNECTION
-wxvtkbaseview4:wxvtkbaseview4:Box57:wxVtkBaseView4
+title:title:Box08:WinTitle
 NumberOfControlPoints:0
 CONNECTION
-Box57:BoxChange:Box08:BoxExecute
+Box77:Out:Box37:polydata
 NumberOfControlPoints:0
 CONNECTION
-Box04:Out:Box77:In2
+Box66:Out:Box37:render
 NumberOfControlPoints:0
 CONNECTION
-title:title:Box08:WinTitle
+Box38:Widget:Box39:Widget2
 NumberOfControlPoints:0
 CONNECTION
-Box77:Out:Box37:polydata
+Box79:Widget:Box40:Widget2
 NumberOfControlPoints:0
 CONNECTION
-Box66:Out:Box37:render
+Box43:Widget:Box41:Widget4
 NumberOfControlPoints:0
 CONNECTION
-Box37:widget:Box79:Widget5
+Box42:Widget:Box41:Widget2
 NumberOfControlPoints:0
 CONNECTION
-Box48:widget:Box38:Widget2
+Box78:Widget:Box44:Widget2
 NumberOfControlPoints:0
 CONNECTION
-Box38:Widget:Box39:Widget2
+Box80:Widget:Box44:Widget5
 NumberOfControlPoints:0
 CONNECTION
-Box39:Widget:Box08:Widget4
+meshmanagermodel:meshmanagermodel:Box46:In
 NumberOfControlPoints:0
 CONNECTION
-Box79:Widget:Box40:Widget2
+Box46:Out:Box45:MeshManagerModel
 NumberOfControlPoints:0
 CONNECTION
-Box40:Widget:Box08:Widget6
+Box77:Out:Box45:Mesh
 NumberOfControlPoints:0
 CONNECTION
-Box43:Widget:Box41:Widget4
+Box49:OutString:Box06:NbPoints
 NumberOfControlPoints:0
 CONNECTION
-Box42:Widget:Box41:Widget2
+Box42:BoxChange:Box51:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-Box41:Widget:Box08:Widget8
+Box45:BoxChange:Box51:In2
 NumberOfControlPoints:0
 CONNECTION
-Box34:Widget:Box38:Widget1
+Box52:BoxChange:Box51:In4
 NumberOfControlPoints:0
 CONNECTION
-Box78:Widget:Box44:Widget2
+showNpoints:WidgetShowNPoints:Box52:WidgetShowNPoints
 NumberOfControlPoints:0
 CONNECTION
-Box80:Widget:Box44:Widget5
+Box80:BoxChange:Box53:In2
 NumberOfControlPoints:0
 CONNECTION
-Box44:Widget:Box79:Widget2
+Box53:BoxChange:Box77:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-Box80:BoxChange:Box37:boxexecute
+Box42:BoxChange:Box53:In3
 NumberOfControlPoints:0
 CONNECTION
-meshmanagermodel:meshmanagermodel:Box46:In
+Box43:BoxChange:Box55:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-Box46:Out:Box45:MeshManagerModel
+Box52:BoxChange:Box55:In2
 NumberOfControlPoints:0
 CONNECTION
-Box46:Out:Box47:MeshManagerModel
+Box43:BoxChange:Box53:In6
 NumberOfControlPoints:0
 CONNECTION
-Box42:BoxChange:Box45:BoxExecute
+Box77:BoxChange:Box37:boxexecute
 NumberOfControlPoints:0
 CONNECTION
-Box43:BoxChange:Box47:BoxExecute
+boxChange:boxChange:Box63:In
 NumberOfControlPoints:0
 CONNECTION
-Box77:Out:Box45:Mesh
+Box63:BoxChange:showNpoints:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box63:BoxChange:Box62:_execute
+NumberOfControlPoints:0
+CONNECTION
+wxvtkbaseview2:wxvtkbaseview2:Box64:In
+NumberOfControlPoints:0
+CONNECTION
+Box64:Out:Box57:wxVtkBaseView2
+NumberOfControlPoints:0
+CONNECTION
+Box64:Out:Box62:_wxvtkbaseview2D1
+NumberOfControlPoints:0
+CONNECTION
+Box65:Out:Box57:wxVtkBaseView3
+NumberOfControlPoints:0
+CONNECTION
+Box65:Out:Box62:_wxvtkbaseview2D2
+NumberOfControlPoints:0
+CONNECTION
+wxvtkbaseview3:wxvtkbaseview3:Box65:In
+NumberOfControlPoints:0
+CONNECTION
+wxvtkbaseview4:wxvtkbaseview4:Box69:In
+NumberOfControlPoints:0
+CONNECTION
+Box69:Out:Box57:wxVtkBaseView4
+NumberOfControlPoints:0
+CONNECTION
+Box69:Out:Box62:_wxvtkbaseview2D3
+NumberOfControlPoints:0
+CONNECTION
+wxvtkbaseview1:wxvtkbaseview1:Box71:In
+NumberOfControlPoints:0
+CONNECTION
+Box71:Out:Box57:wxVtkBaseView
+NumberOfControlPoints:0
+CONNECTION
+Box71:Out:Box62:_wxvtkbaseview3D1
+NumberOfControlPoints:0
+CONNECTION
+Box04:Out:Box62:_polydata
+NumberOfControlPoints:0
+CONNECTION
+Box71:Out:Box72:_wxvtkbaseview3D1
+NumberOfControlPoints:0
+CONNECTION
+Box64:Out:Box72:_wxvtkbaseview2D1
+NumberOfControlPoints:0
+CONNECTION
+Box65:Out:Box72:_wxvtkbaseview2D2
+NumberOfControlPoints:0
+CONNECTION
+Box69:Out:Box72:_wxvtkbaseview2D3
+NumberOfControlPoints:0
+CONNECTION
+Box63:BoxChange:Box72:_execute
+NumberOfControlPoints:0
+CONNECTION
+Box77:Out:Box72:_polydata
+NumberOfControlPoints:0
+CONNECTION
+Box41:Widget:Box74:Widget5
+NumberOfControlPoints:0
+CONNECTION
+Box72:_widget:Box79:Widget6
+NumberOfControlPoints:0
+CONNECTION
+Box37:widget:Box79:Widget4
+NumberOfControlPoints:0
+CONNECTION
+Box48:widget:Box38:Widget4
+NumberOfControlPoints:0
+CONNECTION
+Box62:_widget:Box38:Widget7
+NumberOfControlPoints:0
+CONNECTION
+Box39:Widget:Box81:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box40:Widget:Box81:Widget4
+NumberOfControlPoints:0
+CONNECTION
+Box81:Widget:Box76:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box74:Widget:Box76:Widget5
+NumberOfControlPoints:0
+CONNECTION
+Box76:Widget:Box08:Widget3
+NumberOfControlPoints:0
+CONNECTION
+Box44:Widget:Box82:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box82:Widget:Box79:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box83:Widget:Box44:Widget8
+NumberOfControlPoints:0
+CONNECTION
+Box84:Widget:Box44:Widget9
+NumberOfControlPoints:0
+CONNECTION
+Box85:Widget:Box74:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box86:Widget:Box38:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box50:Widget:Box86:Widget4
+NumberOfControlPoints:0
+CONNECTION
+showNpoints:Widget:Box86:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box87:Widget:Box50:Widget8
+NumberOfControlPoints:0
+CONNECTION
+Box88:Widget:Box50:Widget9
+NumberOfControlPoints:0
+CONNECTION
+Box49:Widget:Box50:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box34:Widget:Box50:Widget4
 NumberOfControlPoints:0
 APP_END

diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs
index 946c78732a1edf8f2bde68728dd397eee2d903de..bd4dd908911655fd0533d4d1d6f4a3c8c7e63b65 100644 (file)
--- a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs
+++ b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs
@@ -21,12 +21,13 @@ category "demo"
 new creaMaracasVisu:ShowNPoints showNpoints
   set showNpoints.Radio "1"
   set showNpoints.Type "4"
+  set showNpoints.WinTitle "1.1   Splines"
 
 new creaVtk:CreateMeshFromPoints Box04
 
 new creaMaracasVisu:ManualContourModel_Box Box06
   set Box06.DoubleContour "1"
-  set Box06.NbPoints "35"
+  set Box06.NbPoints "100"
   set Box06.OpenClose "true"
   set Box06.OpenClose2 "false"
 
@@ -84,11 +85,10 @@ new creaVtk:BooleanOperationPolyDataFilter Box77
 
 new wx:ComboBox Box78
   set Box78.In "Union Intersection Difference"
-  set Box78.Title "Mesh Operation"
 
 new wx:LayoutLine Box79
   set Box79.Orientation "H"
-  set Box79.WinTitle "New Surface"
+  set Box79.WinTitle "New Surface ( Magenta  =  Red+Yelow )"
 
 new wx:CommandButton Box80
   set Box80.Label "Run"
@@ -107,7 +107,7 @@ new wx:Slider Box34
   set Box34.Max "100"
   set Box34.Min "0"
   set Box34.ReactiveOnTrack "true"
-  set Box34.Title "Opacity Splines"
+  set Box34.Title "Splines Opacity"
 
 new std:Div Box36
   set Box36.In2 "100"
@@ -117,7 +117,7 @@ new creaMaracasVisu:PolyDataToActor_Widget Box37
 
 new wx:LayoutLine Box38
   set Box38.Orientation "H"
-  set Box38.WinTitle "Interpolated Surface"
+  set Box38.WinTitle "Interpolated Surface (Yelow)"
 
 new wx:LayoutTab Box39
 
@@ -125,30 +125,82 @@ new wx:LayoutTab Box40
 
 new wx:LayoutLine Box41
   set Box41.Orientation "H"
-  set Box41.WinTitle "New Surface"
 
 new wx:CommandButton Box42
-  set Box42.Label "Apply"
+  set Box42.Label "Apply  ( Magenta -> To Red)"
 
 new wx:CommandButton Box43
-  set Box43.Label "Reset"
+  set Box43.Label "Reset Tool"
 
 new wx:LayoutLine Box44
   set Box44.Orientation "V"
-  set Box44.WinTitle "New Surface"
+  set Box44.WinTitle "1.2   Mesh Action"
 
 new creaVtk:MeshManager_tool Box45
-  set Box45.Tool "3"
+  set Box45.Tool "30"
 
 new std:MagicBox Box46
 
-new creaVtk:MeshManager_tool Box47
-  set Box47.Tool "4"
+new wx:ComboBox Box49
+  set Box49.In "25 50 100 150"
+  set Box49.Selection "1"
+  set Box49.Title "Number of Points"
+
+new wx:LayoutLine Box50
+  set Box50.Orientation "V"
+  set Box50.WinTitle "Config"
+
+new std:MultipleInputs Box51
+
+new creaMaracasVisu:ShowNPoints_Tools Box52
+  set Box52.Type "120"
+
+new std:MultipleInputs Box53
+
+new std:MultipleInputs Box55
+
+new creaMaracasVisu:MeshContours_Widget Box62
+  set Box62.colorMesh "1 1 0"
+
+new std:MagicBox Box63
+
+new std:MagicBox Box64
+
+new std:MagicBox Box65
+
+new std:MagicBox Box69
+
+new std:MagicBox Box71
+
+new creaMaracasVisu:MeshContours_Widget Box72
+  set Box72.colorMesh "0 1 1"
+
+new wx:LayoutLine Box74
+  set Box74.Orientation "V"
+  set Box74.WinTitle "Step 2.   Apply"
+
+new wx:LayoutTab Box76
+
+new wx:LayoutLine Box81
+  set Box81.WinTitle "Step 1.   Surface"
+
+new wx:LayoutTab Box82
+
+new wx:OutputText Box83
+
+new wx:OutputText Box84
+
+new wx:OutputText Box85
+
+new wx:LayoutTab Box86
+
+new wx:OutputText Box87
+
+new wx:OutputText Box88
 
 
 connect Box06.LstContourPointsX Box04.LstX
 connect showNpoints.lstIndexs Box06.LstIndexsIn
-connect showNpoints.Widget Box08.Widget1
 connect Box06.LstContourPointsY Box04.LstY
 connect Box06.LstContourPointsZ Box04.LstZ
 connect Box06.LstIndexsOut Box04.LstIndexs
@@ -174,7 +226,6 @@ connect Box70.Out2 Box06.LstControlPointsZ
 connect Box70.Out0 Box29.LstControlPointsX
 connect Box70.Out1 Box29.LstControlPointsY
 connect Box70.Out2 Box29.LstControlPointsZ
-connect Box80.BoxChange Box77.BoxExecute
 connect Box78.Out Box77.Operation
 connect Box66.Out Box11.Renderer
 connect Box66.Out Box30.Renderer
@@ -194,38 +245,78 @@ connect Box57.BoxChange Box08.BoxExecute
 connect Box04.Out Box77.In2
 connect Box77.Out Box37.polydata
 connect Box66.Out Box37.render
-connect Box37.widget Box79.Widget5
-connect Box48.widget Box38.Widget2
 connect Box38.Widget Box39.Widget2
-connect Box39.Widget Box08.Widget4
 connect Box79.Widget Box40.Widget2
-connect Box40.Widget Box08.Widget6
 connect Box43.Widget Box41.Widget4
 connect Box42.Widget Box41.Widget2
-connect Box41.Widget Box08.Widget8
-connect Box34.Widget Box38.Widget1
 connect Box78.Widget Box44.Widget2
 connect Box80.Widget Box44.Widget5
-connect Box44.Widget Box79.Widget2
-connect Box80.BoxChange Box37.boxexecute
 connect Box46.Out Box45.MeshManagerModel
-connect Box46.Out Box47.MeshManagerModel
-connect Box42.BoxChange Box45.BoxExecute
-connect Box43.BoxChange Box47.BoxExecute
 connect Box77.Out Box45.Mesh
+connect Box49.OutString Box06.NbPoints
+connect Box42.BoxChange Box51.BoxExecute
+connect Box45.BoxChange Box51.In2
+connect Box52.BoxChange Box51.In4
+connect showNpoints.WidgetShowNPoints Box52.WidgetShowNPoints
+connect Box80.BoxChange Box53.In2
+connect Box53.BoxChange Box77.BoxExecute
+connect Box42.BoxChange Box53.In3
+connect Box43.BoxChange Box55.BoxExecute
+connect Box52.BoxChange Box55.In2
+connect Box43.BoxChange Box53.In6
+connect Box77.BoxChange Box37.boxexecute
+connect Box63.BoxChange showNpoints.BoxExecute
+connect Box63.BoxChange Box62._execute
+connect Box64.Out Box57.wxVtkBaseView2
+connect Box64.Out Box62._wxvtkbaseview2D1
+connect Box65.Out Box57.wxVtkBaseView3
+connect Box65.Out Box62._wxvtkbaseview2D2
+connect Box69.Out Box57.wxVtkBaseView4
+connect Box69.Out Box62._wxvtkbaseview2D3
+connect Box71.Out Box57.wxVtkBaseView
+connect Box71.Out Box62._wxvtkbaseview3D1
+connect Box04.Out Box62._polydata
+connect Box71.Out Box72._wxvtkbaseview3D1
+connect Box64.Out Box72._wxvtkbaseview2D1
+connect Box65.Out Box72._wxvtkbaseview2D2
+connect Box69.Out Box72._wxvtkbaseview2D3
+connect Box63.BoxChange Box72._execute
+connect Box77.Out Box72._polydata
+connect Box41.Widget Box74.Widget5
+connect Box72._widget Box79.Widget6
+connect Box37.widget Box79.Widget4
+connect Box48.widget Box38.Widget4
+connect Box62._widget Box38.Widget7
+connect Box39.Widget Box81.Widget2
+connect Box40.Widget Box81.Widget4
+connect Box81.Widget Box76.Widget2
+connect Box74.Widget Box76.Widget5
+connect Box76.Widget Box08.Widget3
+connect Box44.Widget Box82.Widget2
+connect Box82.Widget Box79.Widget2
+connect Box83.Widget Box44.Widget8
+connect Box84.Widget Box44.Widget9
+connect Box85.Widget Box74.Widget2
+connect Box86.Widget Box38.Widget2
+connect Box50.Widget Box86.Widget4
+connect showNpoints.Widget Box86.Widget2
+connect Box87.Widget Box50.Widget8
+connect Box88.Widget Box50.Widget9
+connect Box49.Widget Box50.Widget2
+connect Box34.Widget Box50.Widget4
 
 # Complex input ports
 input render Box66.In " "
-input boxChange showNpoints.BoxExecute " "
 input point showNpoints.In " "
-input wxvtkbaseview1 Box57.wxVtkBaseView " "
 input mesh Box67.In " "
 input image Box35.In " "
-input wxvtkbaseview2 Box57.wxVtkBaseView2 " "
-input wxvtkbaseview3 Box57.wxVtkBaseView3 " "
-input wxvtkbaseview4 Box57.wxVtkBaseView4 " "
 input title Box08.WinTitle " "
 input meshmanagermodel Box46.In " "
+input boxChange Box63.In " "
+input wxvtkbaseview2 Box64.In " "
+input wxvtkbaseview3 Box65.In " "
+input wxvtkbaseview4 Box69.In " "
+input wxvtkbaseview1 Box71.In " "
 
 # Complex output ports
 output widget Box08.Widget " "

diff --git a/bbtk/bbs/boxes/PolyDataToActor_Widget.bbg b/bbtk/bbs/boxes/PolyDataToActor_Widget.bbg
index 0d20df404bae0f5ef4621a36b5b2170d0595c909..d811a2c8520bf213aee835ff89457ed1f186a3bc 100644 (file)
--- a/bbtk/bbs/boxes/PolyDataToActor_Widget.bbg
+++ b/bbtk/bbs/boxes/PolyDataToActor_Widget.bbg
@@ -41,7 +41,7 @@ BOX
 wx:LayoutLine:Box04
 ISEXEC:FALSE
 -4.766527:-48.767110:-900.000000
-28.553473:-51.267110:-900.000000
+33.320000:-51.267110:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -49,7 +49,7 @@ BOX
 vtk:PolyDataToActor:Box09
 ISEXEC:FALSE
 45.132224:-46.323772:-900.000000
-71.412224:-48.823772:-900.000000
+67.372224:-48.823772:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box10
@@ -81,7 +81,7 @@ Min:"0"
 PORT
 ReactiveOnTrack:"true"
 PORT
-Title:"Opacity base mesh"
+Title:"Mesh Opacity"
 FIN_BOX
 BOX
 std:Div:Box14
@@ -95,7 +95,7 @@ BOX
 wx:ComboBox:Box15
 ISEXEC:FALSE
 55.700791:-9.704871:-900.000000
-81.980791:-12.204871:-900.000000
+77.415791:-12.204871:-900.000000
 PORT
 In:"Points WireFrame Surface"
 PORT
@@ -107,7 +107,7 @@ BOX
 std:MultipleInputs:Box08
 ISEXEC:FALSE
 -27.821638:-25.674906:-900.000000
--5.851638:-28.174906:-900.000000
+21.000000:-28.174906:-900.000000
 FIN_BOX
 CONNECTIONS:16
 CONNECTION

diff --git a/bbtk/bbs/boxes/PolyDataToActor_Widget.bbs b/bbtk/bbs/boxes/PolyDataToActor_Widget.bbs
index 3bf46bbd465a4c83c08ac2d375cf8d67f6ada62a..814cc92e6beaa87eda1fd0a797bceafc35867570 100644 (file)
--- a/bbtk/bbs/boxes/PolyDataToActor_Widget.bbs
+++ b/bbtk/bbs/boxes/PolyDataToActor_Widget.bbs
@@ -32,7 +32,7 @@ new wx:Slider Box13
   set Box13.Max "100"
   set Box13.Min "0"
   set Box13.ReactiveOnTrack "true"
-  set Box13.Title "Opacity base mesh"
+  set Box13.Title "Mesh Opacity"
 
 new std:Div Box14
   set Box14.In2 "100"

diff --git a/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx b/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx
index 4cbce728c44f5617225f33242a73909ddf36c00d..79631deb2a81406922df6965f301a5c138d0fe70 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx
+++ b/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx
@@ -847,19 +847,41 @@ void ManualContourModel_Box::Process()
                lstInconsistentContourID.clear();
 
                // First Step  Spline Interpolation
+        
+        std::vector<int>     lstIndexsIn = bbGetInputLstIndexsIn();
+        std::vector<int>     lstIndexsOut;
+        std::vector<double>  lstOutX;
+        std::vector<double>  lstOutY;
+        std::vector<double>  lstOutZ;
+
                std::vector<double> lstInX = bbGetInputLstControlPointsX();
                std::vector<double> lstInY = bbGetInputLstControlPointsY();
                std::vector<double> lstInZ = bbGetInputLstControlPointsZ();
+        
+        bool ok_abortMethod = false;
                if ( (lstInX.size()!=lstInY.size()) || (lstInY.size()!=lstInZ.size()) ) 
                { 
+            ok_abortMethod=true;
                        printf("Warnning !!  .. ManualContourModel_Box: The list X Y Z, no have the same number of elements \n");
-                       return;
                }
-               std::vector<int>        lstIndexsIn = bbGetInputLstIndexsIn();
-               std::vector<int>        lstIndexsOut;
-               std::vector<double> lstOutX;
-               std::vector<double> lstOutY;
-               std::vector<double> lstOutZ;
+
+        if ( (lstInX.size()==0) && (lstInY.size()==0) && (lstInZ.size()==0) )
+        {
+            ok_abortMethod=true;
+            printf("Warnning !!  .. ManualContourModel_Box: The lists X Y Z, are empty \n");
+        }
+
+        if (ok_abortMethod==true)
+        {
+            bbSetOutputLstContourPointsX( lstOutX );
+            bbSetOutputLstContourPointsY( lstOutY );
+            bbSetOutputLstContourPointsZ( lstOutZ );
+            bbSetOutputLstIndexsOut( lstIndexsOut );
+            return;
+        } // if 
+        
+        
+        
                if (bbGetInputLstIndexsIn().size()==0)
                {
                        lstIndexsIn.push_back( lstInX.size() );
@@ -988,6 +1010,7 @@ void ManualContourModel_Box::Process()
                } // if DoubleContour 
        } // if Active
 }
+
 //===== 
 // 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)
 //===== 
@@ -1002,6 +1025,7 @@ void ManualContourModel_Box::bbUserSetDefaultValues()
    bbSetInputOpenClose2(false);
    bbSetInputNbPoints(100); 
 }
+
 //===== 
 // 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)
 //===== 
@@ -1012,6 +1036,7 @@ void ManualContourModel_Box::bbUserInitializeProcessing()
 //    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)
 //===== 
@@ -1022,6 +1047,7 @@ void ManualContourModel_Box::bbUserFinalizeProcessing()
 //    but this is where you should desallocate the internal/output pointers 
 //    if any 
 }
+
 } // EO namespace bbcreaMaracasVisu
 
 

diff --git a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx
index d7c1013dc29224864a06ceb95eb9dbe5b891614b..ec39f2613d6ff2b6e910f3e3832a1a941245e1b2 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx
+++ b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx
@@ -171,6 +171,10 @@ void ShowNPoints_Tools::Process()
         {
             bbGetInputWidgetShowNPoints()->OnDeleteCollection_();
         } // if Type
+        if (bbGetInputType()==120)
+        {
+            bbGetInputWidgetShowNPoints()->OnResetCollections_();
+        } // if Type
         if (bbGetInputType()==200)
         {
             CreatePatch01();

diff --git a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.h b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.h
index 2d8a34abb5c7636debf7627a4762ebd361adae38..cb62f883b029b5472dfc9cdcfffa6ef29ef5350a 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.h
+++ b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.h
@@ -49,7 +49,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  200:Tool_1 - Create Mesh (based with one group and 4 points)",int,"");
+  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_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 56ac7412ba078a32378a51b79294043619deef76..6d88bb906e40acd3ff77c0c400fe5cbf03ab5260 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx
@@ -62,18 +62,24 @@
           txtNrCollections                      = new wxStaticText(panel2,-1, _T("1   /  1 "));
           wxButton *btnBackCollection           = new wxButton( panel2, -1, _T("<"));
           wxButton *btnNextCollection           = new wxButton( panel2, -1, _T(">"));
-          wxButton *btnInsertCollectionBefore   = new wxButton( panel2, -1, _T("Insert Group Before"));
-          wxButton *btnInsertCollectionAfter    = new wxButton( panel2, -1, _T("Insert Group After"));
-          wxButton *btnDeleteCollection         = new wxButton( panel2, -1, _T("Delete Group "));
-          wxButton *btnSaveCollection           = new wxButton( panel2, -1, _T("Save Groups"));
-          wxButton *btnLoadCollection           = new wxButton( panel2, -1, _T("Load Groups"));
-
+          wxButton *btnInsertCollectionBefore   = new wxButton( panel2, -1, _T("+ <"));
+          wxButton *btnInsertCollectionAfter    = new wxButton( panel2, -1, _T("+ >"));
+          wxButton *btnDeleteCollection         = new wxButton( panel2, -1, _T("Delete"));
+          wxButton *btnSaveCollection           = new wxButton( panel2, -1, _T("Save"));
+          wxButton *btnLoadCollection           = new wxButton( panel2, -1, _T("Load"));
+          wxButton *btnResetCollection          = new wxButton( panel2, -1, _T("Reset"));
           wxFlexGridSizer *sizer1               = new wxFlexGridSizer(1);
           wxFlexGridSizer *sizer2               = new wxFlexGridSizer(2);
-          wxStaticText* txOpacity               = new wxStaticText(panel2, -1, wxString(_T("  Points Opacity  ")));
-          sdrOpacity                            = new wxSlider(panel2, -1, 0, 0, 100, wxDefaultPosition, wxDefaultSize, wxSL_LABELS);
-          wxStaticText* txRadio                 = new wxStaticText(panel2, -1, wxString(_T("  Points Radius  ")));
-          sdrRadio                              = new wxSlider(panel2, -1, 0, 1, 50, wxDefaultPosition, wxDefaultSize, wxSL_LABELS);
+          wxFlexGridSizer *sizer3               = new wxFlexGridSizer(3);
+          wxFlexGridSizer *sizer4               = new wxFlexGridSizer(3);
+          wxFlexGridSizer *sizer5               = new wxFlexGridSizer(2);
+          wxStaticText* txOpacity               = new wxStaticText(panel2, -1, wxString(_T("Opacity")));
+        
+          wxSize sizeSlider;
+          sizeSlider.Set( 120  ,  -1 );
+          sdrOpacity                            = new wxSlider(panel2, -1, 0, 0, 100, wxDefaultPosition, sizeSlider, wxSL_LABELS);
+          wxStaticText* txRadio                 = new wxStaticText(panel2, -1, wxString(_T("Radius  ")));
+          sdrRadio                              = new wxSlider(panel2, -1, 0, 1, 50, wxDefaultPosition, sizeSlider, wxSL_LABELS);
 
           Connect(btnBackCollection->GetId()        , wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction) & WidgetShowNPoints::OnBackCollection           );
           Connect(btnNextCollection->GetId()        , wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction) & WidgetShowNPoints::OnNextCollection           );
@@ -84,29 +90,34 @@
           Connect(sdrRadio->GetId()                 , wxEVT_COMMAND_SLIDER_UPDATED, (wxObjectEventFunction) &WidgetShowNPoints::UpdatePoints                );
           Connect(btnSaveCollection->GetId()        , wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction) & WidgetShowNPoints::OnSaveCollections          );
           Connect(btnLoadCollection->GetId()        , wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction) & WidgetShowNPoints::OnLoadCollections          );
+          Connect(btnResetCollection->GetId()       , wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction) & WidgetShowNPoints::OnResetCollections         );
 
         
           sizer2->Add( btnBackCollection );
           sizer2->Add( btnNextCollection );
+          sizer3->Add( btnInsertCollectionBefore );
+          sizer3->Add( btnInsertCollectionAfter );
+          sizer3->Add( btnDeleteCollection );
+          sizer4->Add( btnSaveCollection );
+          sizer4->Add( btnLoadCollection );
+          sizer4->Add( btnResetCollection );
+          sizer5->Add( txRadio ,wxGROW );
+          sizer5->Add( txOpacity ,wxGROW );
+          sizer5->Add( sdrRadio ,wxGROW );
+          sizer5->Add( sdrOpacity ,wxGROW );
 
           sizer1->Add( txtNrCollections );
           sizer1->Add( sizer2 );
-          sizer1->Add( btnInsertCollectionBefore );
-          sizer1->Add( btnInsertCollectionAfter );
-          sizer1->Add( btnDeleteCollection );
-        
-          sizer1->Add( txOpacity );
-          sizer1->Add( sdrOpacity );
-          sizer1->Add( txRadio );
-          sizer1->Add( sdrRadio );
+          sizer1->Add( sizer3 );
+          sizer1->Add( sizer4 );
+          sizer1->Add( sizer5 ,wxGROW );
 
-          sizer1->Add( btnSaveCollection );
-          sizer1->Add( btnLoadCollection );
+    
           MNPsizer                        = sizer1;
           panel2->SetSizer( MNPsizer );
           panel2->SetAutoLayout(true);
           panel2->Layout();
-          bookGroupManager->AddPage(panel2 , _T("Groupts") );
+          bookGroupManager->AddPage(panel2 , _T("Groups") );
     } // if mtype 4
 
        if ( (mtype==0) || (mtype==3) || (mtype==4) )
@@ -114,14 +125,14 @@
                // Widget interface
                askPointLabel                                   = new wxStaticText(panel, -1, _T("Point label :")); // JPR
                textCtrl                                                = new wxTextCtrl(panel, -1);
-               wxButton    *btnAddPoint                = new wxButton( panel, -1, _T("Add Point"));
-               wxButton    *btnInsertPoint             = new wxButton( panel, -1, _T("Insert Point"));//CFT
-               wxButton    *btnSetPositionPoint= new wxButton( panel, -1, _T("Set nearest point"));
-                     cbTrackPoint       = new wxCheckBox(panel,-1, _T("Track Point") );
-        wxButton    *btnRenamePoint            = new wxButton( panel, -1, _T("Rename point"));
-               wxButton    *btnEraseLastPoint  = new wxButton( panel, -1, _T("Erase Last point"));
-               wxButton    *btnErasePoint              = new wxButton( panel, -1, _T("Erase point"));
-               wxButton    *btnDeleteAllPoints = new wxButton( panel, -1, _T("Delete all points"));
+               wxButton    *btnAddPoint                = new wxButton( panel, -1, _T("Add"));
+               wxButton    *btnInsertPoint             = new wxButton( panel, -1, _T("Insert"));//CFT
+               wxButton    *btnSetPositionPoint= new wxButton( panel, -1, _T("Set nearest"));
+                     cbTrackPoint       = new wxCheckBox(panel,-1, _T("Track") );
+        wxButton    *btnRenamePoint            = new wxButton( panel, -1, _T("Rename"));
+        wxButton    *btnErasePoint      = new wxButton( panel, -1, _T("Erase"));
+               wxButton    *btnEraseLastPoint  = new wxButton( panel, -1, _T("Erase Last"));
+               wxButton    *btnDeleteAllPoints = new wxButton( panel, -1, _T("Erase all"));
                wxButton    *btnSavePoints              = NULL;
                wxButton    *btnLoadPoints              = NULL;
                if ( mtype==0 )
@@ -143,7 +154,7 @@
             txRadio           = new wxStaticText(panel, -1, wxString(_T("  Points Radius  ")));
             sdrRadio          = new wxSlider(panel, -1, 0, 1, 50, wxDefaultPosition, wxDefaultSize, wxSL_LABELS);
             //NTU: Slider events
-            Connect(sdrOpacity->GetId()            , wxEVT_COMMAND_SLIDER_UPDATED    , (wxObjectEventFunction) &WidgetShowNPoints::UpdatePoints);
+            Connect(sdrOpacity->GetId()          , wxEVT_COMMAND_SLIDER_UPDATED    , (wxObjectEventFunction) &WidgetShowNPoints::UpdatePoints);
             Connect(sdrRadio->GetId()            , wxEVT_COMMAND_SLIDER_UPDATED    , (wxObjectEventFunction) &WidgetShowNPoints::UpdatePoints);
         } // if mtype 0 3
 
@@ -157,32 +168,46 @@
         Connect(cbTrackPoint->GetId()       , wxEVT_CHECKBOX  , (wxObjectEventFunction) &WidgetShowNPoints::OnTrackPoint);
 
 
-        wxFlexGridSizer *sizer1 = new wxFlexGridSizer(1);
-               sizer1->Add(askPointLabel); // JPR
-               sizer1->Add(textCtrl);
-               sizer1->Add(btnAddPoint);
-               sizer1->Add(btnInsertPoint);//CFT
-        sizer1->Add(cbTrackPoint);
-               sizer1->Add(btnSetPositionPoint);
-               sizer1->Add(btnRenamePoint);
-               sizer1->Add(btnErasePoint);
-               sizer1->Add(btnEraseLastPoint);
-               sizer1->Add(btnDeleteAllPoints);
-               sizer1->Add(txtNrPoints);
+        wxFlexGridSizer *sizer0 = new wxFlexGridSizer(1);
+        wxFlexGridSizer *sizer1 = new wxFlexGridSizer(2);
+        wxFlexGridSizer *sizer2 = new wxFlexGridSizer(2);
+        wxFlexGridSizer *sizer3 = new wxFlexGridSizer(2);
+        wxFlexGridSizer *sizer4 = new wxFlexGridSizer(2);
+
+        sizer1->Add(textCtrl);
+        sizer1->Add(btnRenamePoint);
+        sizer2->Add(btnAddPoint);
+        sizer2->Add(btnInsertPoint);//CFT
+        sizer3->Add(cbTrackPoint);
+        sizer3->Add(btnSetPositionPoint);
+        sizer4->Add(btnErasePoint);
+        sizer4->Add(btnEraseLastPoint);
+        sizer4->Add(btnDeleteAllPoints);
+
+               sizer0->Add(askPointLabel); // JPR
+        sizer0->Add(sizer1);
+        sizer0->Add(sizer2);
+               sizer0->Add(sizer3);
+        sizer0->Add(sizer4);
+               sizer0->Add(txtNrPoints);
         
         if ( (mtype==0) || (mtype==3) )
         {
-            sizer1->Add(txOpacity);
-            sizer1->Add(sdrOpacity,1,wxGROW );
-            sizer1->Add(txRadio);
-            sizer1->Add(sdrRadio,1,wxGROW );
+            wxFlexGridSizer *sizer5 = new wxFlexGridSizer(2);
+            sizer5->Add(txRadio);
+            sizer5->Add(txOpacity);
+            sizer5->Add(sdrRadio,1,wxGROW );
+            sizer5->Add(sdrOpacity,1,wxGROW );
+            sizer0->Add(sizer5);
         }  // if mtype 0 3
         if ( mtype==0 )
                {
-                       sizer1->Add(btnSavePoints);
-                       sizer1->Add(btnLoadPoints);
+            wxFlexGridSizer *sizer6 = new wxFlexGridSizer(2);
+                       sizer6->Add(btnSavePoints);
+                       sizer6->Add(btnLoadPoints);
+            sizer0->Add(sizer6);
                } // if mtype 0
-               sizer = sizer1;
+               sizer = sizer0;
        }
 
          if (mtype==1)
@@ -203,10 +228,10 @@
           wxFlexGridSizer *sizer1            = new wxFlexGridSizer(1);
                  sizer1->Add(btnSetPositionPoint);
                  sizer1->Add(txtNrPoints);
-                 sizer1->Add(txOpacity);
-                 sizer1->Add(sdrOpacity,1,wxGROW );
                  sizer1->Add(txRadio);
                  sizer1->Add(sdrRadio,1,wxGROW );
+          sizer1->Add(txOpacity);
+          sizer1->Add(sdrOpacity,1,wxGROW );
                  sizer = sizer1;
          }
     
@@ -946,6 +971,26 @@ void WidgetShowNPoints::OnDeleteCollection(wxCommandEvent &event)
     OnDeleteCollection_();
 }
 
+//------------------------------------------------------------------------
+void WidgetShowNPoints::OnResetCollections_()
+{
+    printf("EED WidgetShowNPoints::OnResetCollections_  \n");
+    int i,size=lstModelShowNPoints.size();
+    for (i=0;i<size;i++)
+    {
+        DeleteCollection_();
+    }
+    RefreshCollectionText();
+    RefreshColourCollection();
+    StopTrackPoint();
+}
+
+//------------------------------------------------------------------------
+void WidgetShowNPoints::OnResetCollections(wxCommandEvent &event)
+{
+    OnResetCollections_();
+}
+
 //------------------------------------------------------------------------
 void WidgetShowNPoints::OnBackCollection(wxCommandEvent &event)
 {

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.h
index 2bcbd563dda4aecfe5389e58802ee877600c2e60..8fed9e769df8a40f46bcb5dfd7170739a320ae6a 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.h
@@ -52,6 +52,8 @@ class WidgetShowNPoints : public wxPanel
       void OnNextCollection(wxCommandEvent &event);
       void OnSaveCollections(wxCommandEvent &event);
       void OnLoadCollections(wxCommandEvent &event);
+      void OnResetCollections(wxCommandEvent &event);
+      void OnResetCollections_();
 
       void RefreshCollectionText();
       void RefreshColourCollection();