]> Creatis software - creaMaracasVisu.git/commitdiff
#3490 MeshManager
authorEduardo DAVILA <davila@creatis.insa-lyon.fr>
Wed, 7 Sep 2022 13:22:10 +0000 (15:22 +0200)
committerEduardo DAVILA <davila@creatis.insa-lyon.fr>
Wed, 7 Sep 2022 13:22:10 +0000 (15:22 +0200)
bbtk/bbs/boxes/MeshContours_Interface.bbg
bbtk/bbs/boxes/MeshContours_Interface.bbs
bbtk/bbs/boxes/MeshContours_Widget.bbg
bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg
bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs
bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg
bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs
bbtk/bbs/boxes/PolyDataToActor_Widget.bbg
bbtk/bbs/boxes/PolyDataToActor_Widget.bbs
bbtk/src/bbcreaMaracasVisuwxPopupMenu.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx

index 1b28f61e38d6e13a1d6fa25b862d2c4c7031168d..5a84f43806d8b7c414623d1043a7855e6eaf38d8 100644 (file)
@@ -13,31 +13,31 @@ PACKAGENAME:creaMaracasVisu
 COMPLEXOUTPUTS:3
 COMPLEX_PORT
 Opacity1
--229.642629:-71.314940:-900.000000
+-78.427592:-20.488061:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 widget
--132.225769:-72.651819:-900.000000
+-69.516706:-21.006612:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 active
--209.533061:-72.181576:-900.000000
+-89.058002:-21.047792:-900.000000
 FIN_COMPLEX_PORT
 COMPLEXINPUTS:0
 BOXES:4
 BOX
 wx:LayoutLine:Box54
 ISEXEC:FALSE
--130.907608:-43.136885:-900.000000
--97.587608:-45.636885:-900.000000
+-70.227266:-8.900106:-900.000000
+-36.907266:-11.400106:-900.000000
 PORT
-Orientation:"H"
+Orientation:"V"
 FIN_BOX
 BOX
 wx:Slider:Box63
 ISEXEC:FALSE
--221.887211:1.371422:-900.000000
--192.087211:-1.128578:-900.000000
+-56.419817:21.711801:-900.000000
+-26.619817:19.211801:-900.000000
 PORT
 In:"100"
 PORT
@@ -52,18 +52,18 @@ FIN_BOX
 BOX
 std:Div:Box64
 ISEXEC:FALSE
--232.780146:-4.829327:-900.000000
--211.855146:-7.329327:-900.000000
+-75.435715:14.613059:-900.000000
+-54.510715:12.113059:-900.000000
 PORT
 In2:"100"
 FIN_BOX
 BOX
 wx:CheckBox:Box07
 ISEXEC:FALSE
--213.121534:-19.171013:-900.000000
--191.491534:-21.671013:-900.000000
+-86.093387:21.763572:-900.000000
+-64.463387:19.263572:-900.000000
 PORT
-In:"true"
+In:"false"
 PORT
 Title:"Contour"
 FIN_BOX
index c9bc1fb24473a726ec6e216a322e20d66a26f2d9..5c410f43a4d82d18d24bcd08344081ac95c1d583 100644 (file)
@@ -16,7 +16,7 @@ description "Description ??"
 category "<VOID>"
 
 new wx:LayoutLine Box54
-  set Box54.Orientation "H"
+  set Box54.Orientation "V"
 
 new wx:Slider Box63
   set Box63.In "100"
@@ -29,7 +29,7 @@ new std:Div Box64
   set Box64.In2 "100"
 
 new wx:CheckBox Box07
-  set Box07.In "true"
+  set Box07.In "false"
   set Box07.Title "Contour"
 
 
index 9a5bfbe9b181d2d873826f183a68fa139e53ecb3..23cdd6883bc08b42a87cfca449057bb28a392720 100644 (file)
@@ -13,91 +13,91 @@ PACKAGENAME:creaMaracasVisu
 COMPLEXOUTPUTS:1
 COMPLEX_PORT
 _widget
--226.358683:-167.194688:-900.000000
+-98.407711:-38.881249:-900.000000
 FIN_COMPLEX_PORT
 COMPLEXINPUTS:7
 COMPLEX_PORT
 _polydata
--204.209748:-41.725117:-900.000000
+-158.538863:31.493286:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 _execute
--252.934782:-41.055007:-900.000000
+-176.454173:31.800929:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 _wxvtkbaseview2D1
--165.709582:-40.841576:-900.000000
+-68.749568:36.001500:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 _wxvtkbaseview2D2
--128.008698:-40.200386:-900.000000
+-33.042254:40.086130:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 _wxvtkbaseview2D3
--99.282378:-41.122937:-900.000000
+-5.222103:41.882084:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 _wxvtkbaseview3D1
--39.056751:-38.543202:-900.000000
+19.481725:39.206043:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 colorMesh
--228.098376:-40.201658:-900.000000
+-168.291265:32.654278:-900.000000
 FIN_COMPLEX_PORT
 BOXES:9
 BOX
 std:MagicBox:Box36
 ISEXEC:FALSE
--257.508406:-57.109943:-900.000000
--235.908406:-59.609943:-900.000000
+-193.351687:20.820535:-900.000000
+-171.751687:18.320535:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box38
 ISEXEC:FALSE
--210.426867:-56.070795:-900.000000
--188.826867:-58.570795:-900.000000
+-146.270148:21.859683:-900.000000
+-124.670148:19.359683:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box45
 ISEXEC:FALSE
--163.657649:-55.200786:-900.000000
--142.057649:-57.700786:-900.000000
+-78.477824:27.079301:-900.000000
+-56.877824:24.579301:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box46
 ISEXEC:FALSE
--136.994614:-54.822401:-900.000000
--115.394614:-57.322401:-900.000000
+-46.559012:27.820153:-900.000000
+-24.959012:25.320153:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box47
 ISEXEC:FALSE
--106.546841:-55.065476:-900.000000
--84.946841:-57.565476:-900.000000
+-13.030267:27.758312:-900.000000
+8.569733:25.258312:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box51
 ISEXEC:FALSE
--44.013775:-53.213044:-900.000000
--22.413775:-55.713044:-900.000000
+12.893598:27.979641:-900.000000
+34.493598:25.479641:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:MeshContours_Interface:Box52
 ISEXEC:FALSE
--249.967757:-89.918024:-900.000000
--226.977757:-92.418024:-900.000000
+-104.618353:11.572832:-900.000000
+-81.628353:9.072832:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:MeshContours:Box53
 ISEXEC:FALSE
--189.405599:-116.987240:-900.000000
--167.390599:-119.487240:-900.000000
+-92.083118:-23.289432:-900.000000
+-70.068118:-25.789432:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box08
 ISEXEC:FALSE
--232.064268:-56.660352:-900.000000
--210.464268:-59.160352:-900.000000
+-167.907549:21.270126:-900.000000
+-146.307549:18.770126:-900.000000
 FIN_BOX
 CONNECTIONS:19
 CONNECTION
index df4ccc742ba81dab05ef83ee2aaf6677da979741..9c504d1e66985ff716d9415eef906422b23f341f 100644 (file)
@@ -10,19 +10,31 @@ AUTHOR:info-dev@creatis.insa-lyon.fr
 COMPLEXBOX:TRUE
 COMPLEXBOXNAME:Mesh_tool_ApplyPatch
 PACKAGENAME:creaMaracasVisu
-COMPLEXOUTPUTS:1
+COMPLEXOUTPUTS:5
 COMPLEX_PORT
 widget
--186.475040:-157.705758:-900.000000
+-180.910574:-184.919472:-900.000000
 FIN_COMPLEX_PORT
-COMPLEXINPUTS:11
 COMPLEX_PORT
-render
--32.390937:141.689813:-900.000000
+interactorStyleMaracas
+-307.873556:-187.172927:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
+interactorStyleMaracas2
+-300.133711:-186.364707:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+interactorStyleMaracas3
+-293.131686:-185.645050:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+interactorStyleMaracas4
+-285.985042:-186.124821:-900.000000
+FIN_COMPLEX_PORT
+COMPLEXINPUTS:10
+COMPLEX_PORT
 boxChange
--13.776500:138.843910:-900.000000
+-6.086529:137.355528:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 point
@@ -60,7 +72,7 @@ COMPLEX_PORT
 meshmanagermodel
 -150.374274:130.740991:-900.000000
 FIN_COMPLEX_PORT
-BOXES:47
+BOXES:69
 BOX
 creaMaracasVisu:ShowNPoints:showNpoints
 ISEXEC:FALSE
@@ -70,46 +82,48 @@ PORT
 Radio:"1"
 PORT
 Type:"4"
+PORT
+WinTitle:"1.1   Splines"
 FIN_BOX
 BOX
 creaVtk:CreateMeshFromPoints:Box04
 ISEXEC:FALSE
-31.252553:-1.141010:-900.000000
-54.107553:-3.641010:-900.000000
+36.572951:11.779111:-900.000000
+59.427951:9.279111:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ManualContourModel_Box:Box06
 ISEXEC:FALSE
-19.252527:28.454709:-900.000000
-42.462527:25.954709:-900.000000
+29.075845:30.364799:-900.000000
+52.285845:27.864799:-900.000000
 PORT
 DoubleContour:"1"
 PORT
 NbPoints:"100"
 PORT
-OpenClose:"true"
+OpenClose:"false"
 PORT
 OpenClose2:"false"
 FIN_BOX
 BOX
 wx:LayoutLine:Box08
 ISEXEC:FALSE
--187.811226:-145.775470:-900.000000
-33.320000:-148.275470:-900.000000
+-182.125107:-147.642582:-900.000000
+33.320000:-150.142582:-900.000000
 FIN_BOX
 BOX
 vtk:UpdateRender:Box11
 ISEXEC:FALSE
-50.398091:-54.711454:-900.000000
-72.423091:-57.211454:-900.000000
+14.791870:-74.810962:-900.000000
+36.816870:-77.310962:-900.000000
 PORT
 Active:"true"
 FIN_BOX
 BOX
 creaMaracasVisu:DrawAxisTree3D:Box30
 ISEXEC:FALSE
-66.830537:-0.099472:-900.000000
-89.010537:-2.599472:-900.000000
+53.253812:0.984257:-900.000000
+75.433812:-1.515743:-900.000000
 PORT
 Colour:"0 0 1"
 PORT
@@ -118,64 +132,66 @@ FIN_BOX
 BOX
 std:MultipleInputs:Box31
 ISEXEC:FALSE
-5.423388:-28.995680:-900.000000
-27.393388:-31.495680:-900.000000
+21.957727:-67.075176:-900.000000
+43.927727:-69.575176:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ManualContourModel_Box:Box29
 ISEXEC:FALSE
-59.049338:28.545969:-900.000000
-82.259338:26.045969:-900.000000
+76.240145:29.637449:-900.000000
+99.450145:27.137449:-900.000000
 PORT
 NbPoints:"40"
 PORT
-OpenClose:"true"
+OpenClose:"false"
 PORT
 OpenClose2:"false"
 FIN_BOX
 BOX
 creaMaracasVisu:wxPopupMenu:Box57
 ISEXEC:FALSE
--264.745710:81.346668:-900.000000
-15.720000:78.846668:-900.000000
+-291.724262:77.620511:-900.000000
+17.480000:75.120511:-900.000000
 PORT
 WithCtrlKey:"true"
 FIN_BOX
 BOX
 std:AddStringToVector:Box58
 ISEXEC:FALSE
--291.352727:106.869911:-900.000000
-24.520000:104.369911:-900.000000
+-304.297403:100.641432:-900.000000
+24.520000:98.141432:-900.000000
 PORT
-In0:"Add point"
+In0:"+  Add point"
 PORT
-In1:"Insert point"
+In1:"(+)  Insert point"
 PORT
 In2:"Track point"
 PORT
-In3:"Set nearest point"
+In3:"Set Nearest point"
 PORT
-In4:"Erase point"
+In4:"-  Erase point"
 PORT
-In5:"Delete all points"
+In5:"--  Delete all points"
 PORT
 In6:"----------------------"
 PORT
-In7:"Insert group after"
+In7:"+>  Insert group after"
+PORT
+In8:"-  Delete group"
 PORT
-In8:"Delete group"
+In9:"Tool 4 points"
 FIN_BOX
 BOX
 creaMaracasVisu:ShowNPoints_Tools:Box60
 ISEXEC:FALSE
--255.324608:69.131932:-900.000000
-12.200000:66.631932:-900.000000
+-271.997629:60.063100:-900.000000
+12.200000:57.563100:-900.000000
 FIN_BOX
 BOX
 std:StringSelect:Box61
 ISEXEC:FALSE
--255.993648:76.032910:-900.000000
-24.520000:73.532910:-900.000000
+-269.928610:68.362614:-900.000000
+24.520000:65.862614:-900.000000
 PORT
 In0:"5"
 PORT
@@ -194,12 +210,14 @@ PORT
 In7:"100"
 PORT
 In8:"110"
+PORT
+In9:"200"
 FIN_BOX
 BOX
 vtk:ImageVtkProperties:Box68
 ISEXEC:FALSE
 -111.766259:110.196821:-900.000000
-16.720000:107.696821:-900.000000
+-89.231259:107.696821:-900.000000
 FIN_BOX
 BOX
 std:VectorFilterDouble:Box70
@@ -212,8 +230,8 @@ FIN_BOX
 BOX
 creaVtk:BooleanOperationPolyDataFilter:Box77
 ISEXEC:FALSE
--84.476321:-26.264040:-900.000000
-12.200000:-28.764040:-900.000000
+-85.337097:-56.984129:-900.000000
+12.200000:-59.484129:-900.000000
 PORT
 BoxProcessMode:"Manual"
 PORT
@@ -223,53 +241,51 @@ BOX
 wx:ComboBox:Box78
 ISEXEC:FALSE
 -153.877713:-5.775167:-900.000000
--127.597713:-8.275167:-900.000000
+26.280000:-8.275167:-900.000000
 PORT
 In:"Union Intersection Difference"
-PORT
-Title:"Mesh Operation"
 FIN_BOX
 BOX
 wx:LayoutLine:Box79
 ISEXEC:FALSE
--144.841026:-82.628158:-900.000000
-33.320000:-85.128158:-900.000000
+-144.033821:-109.706143:-900.000000
+33.320000:-112.206143:-900.000000
 PORT
 Orientation:"H"
 PORT
-WinTitle:"New Surface"
+WinTitle:"New Surface ( Magenta  =  Red+Yellow )"
 FIN_BOX
 BOX
 wx:CommandButton:Box80
 ISEXEC:FALSE
--95.971418:-0.590420:-900.000000
-21.000000:-3.090420:-900.000000
+-107.184095:21.801731:-900.000000
+21.000000:19.301731:-900.000000
 PORT
 Label:"Run"
 FIN_BOX
 BOX
 std:MagicBox:Box66
 ISEXEC:FALSE
--39.496513:124.163432:-900.000000
-8.680000:121.663432:-900.000000
+-56.713712:80.848585:-900.000000
+8.680000:78.348585:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box67
 ISEXEC:FALSE
 -67.526006:124.007723:-900.000000
-8.680000:121.507723:-900.000000
+-45.926006:121.507723:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:PolyDataToActor_Widget:Box48
 ISEXEC:FALSE
-13.436541:-16.292093:-900.000000
-36.456541:-18.792093:-900.000000
+21.246336:1.807717:-900.000000
+44.266336:-0.692283:-900.000000
 FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box35
 ISEXEC:FALSE
 -107.091396:123.633118:-900.000000
-6.920000:121.133118:-900.000000
+-83.881396:121.133118:-900.000000
 FIN_BOX
 BOX
 wx:Slider:Box34
@@ -287,7 +303,7 @@ Min:"0"
 PORT
 ReactiveOnTrack:"true"
 PORT
-Title:"Opacity Splines"
+Title:"Splines Opacity"
 FIN_BOX
 BOX
 std:Div:Box36
@@ -300,74 +316,64 @@ FIN_BOX
 BOX
 creaMaracasVisu:PolyDataToActor_Widget:Box37
 ISEXEC:FALSE
--62.146849:-38.004259:-900.000000
-8.680000:-40.504259:-900.000000
+-62.803645:-79.746907:-900.000000
+10.440000:-82.246907:-900.000000
 PORT
 color:"0 1 1"
 FIN_BOX
 BOX
 wx:LayoutLine:Box38
 ISEXEC:FALSE
--190.854929:-82.522396:-900.000000
-33.320000:-85.022396:-900.000000
+-186.054864:-109.780662:-900.000000
+33.320000:-112.280662:-900.000000
 PORT
 Orientation:"H"
 PORT
-WinTitle:"Interpolated Surface"
+WinTitle:"Interpolated Surface (Yellow)"
 FIN_BOX
 BOX
 wx:LayoutTab:Box39
 ISEXEC:FALSE
--192.270158:-93.367955:-900.000000
-33.320000:-95.867955:-900.000000
+-195.489774:-120.807458:-900.000000
+33.320000:-123.307458:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box40
 ISEXEC:FALSE
--149.066535:-91.692070:-900.000000
-33.320000:-94.192070:-900.000000
-FIN_BOX
-BOX
-wx:LayoutLine:Box41
-ISEXEC:FALSE
--161.409352:-134.537896:-900.000000
-33.320000:-137.037896:-900.000000
-PORT
-Orientation:"H"
-PORT
-WinTitle:"New Surface"
+-148.426599:-120.337683:-900.000000
+33.320000:-122.837683:-900.000000
 FIN_BOX
 BOX
 wx:CommandButton:Box42
 ISEXEC:FALSE
--117.665938:-115.252338:-900.000000
-21.000000:-117.752338:-900.000000
+-91.903796:13.441695:-900.000000
+21.000000:10.941695:-900.000000
 PORT
-Label:"Apply"
+Label:"Apply  (Magenta->To Red)"
 FIN_BOX
 BOX
 wx:CommandButton:Box43
 ISEXEC:FALSE
--69.629626:-115.035234:-900.000000
-21.000000:-117.535234:-900.000000
+-85.356515:8.083838:-900.000000
+21.000000:5.583838:-900.000000
 PORT
-Label:"Reset"
+Label:"Reset Tool"
 FIN_BOX
 BOX
 wx:LayoutLine:Box44
 ISEXEC:FALSE
--153.658490:-37.966354:-900.000000
-33.320000:-40.466354:-900.000000
+-154.036190:-43.432527:-900.000000
+33.320000:-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
--91.573378:-134.495402:-900.000000
-10.440000:-136.995402:-900.000000
+-85.991381:-134.296045:-900.000000
+10.440000:-136.796045:-900.000000
 PORT
 Tool:"30"
 FIN_BOX
@@ -375,7 +381,7 @@ BOX
 std:MagicBox:Box46
 ISEXEC:FALSE
 -137.131256:113.921532:-900.000000
-8.680000:111.421532:-900.000000
+-115.531256:111.421532:-900.000000
 FIN_BOX
 BOX
 wx:ComboBox:Box49
@@ -392,10 +398,12 @@ FIN_BOX
 BOX
 wx:LayoutLine:Box50
 ISEXEC:FALSE
--191.493902:-29.766595:-900.000000
--158.173902:-32.266595:-900.000000
+-57.295971:-56.374591:-900.000000
+33.320000:-58.874591:-900.000000
 PORT
 Orientation:"V"
+PORT
+WinTitle:"Config"
 FIN_BOX
 BOX
 std:MultipleInputs:Box51
@@ -414,30 +422,22 @@ FIN_BOX
 BOX
 std:MultipleInputs:Box53
 ISEXEC:FALSE
--94.857805:-12.097761:-900.000000
-21.000000:-14.597761:-900.000000
+-96.292390:-13.293248:-900.000000
+21.000000:-15.793248:-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
-wx:LayoutLine:Box59
-ISEXEC:FALSE
--178.438647:-71.791115:-900.000000
--145.118647:-74.291115:-900.000000
-PORT
-Orientation:"V"
+-56.758371:-149.042885:-900.000000
+21.000000:-151.542885:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:MeshContours_Widget:Box62
 ISEXEC:FALSE
--228.707140:-3.136982:-900.000000
-13.960000:-5.636982:-900.000000
+-6.827699:0.907483:-900.000000
+15.967301:-1.592517:-900.000000
 PORT
-colorMesh:"1 1 0"
+colorMesh:"0 0 1"
 FIN_BOX
 BOX
 std:MagicBox:Box63
@@ -449,27 +449,213 @@ BOX
 std:MagicBox:Box64
 ISEXEC:FALSE
 -243.113826:124.330340:-900.000000
-8.680000:121.830340:-900.000000
+-221.513826:121.830340:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box65
 ISEXEC:FALSE
 -220.296210:124.504415:-900.000000
-8.680000:122.004415:-900.000000
+-198.696210:122.004415:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box69
 ISEXEC:FALSE
 -197.793508:124.678490:-900.000000
-8.680000:122.178490:-900.000000
+-176.193508:122.178490:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box71
 ISEXEC:FALSE
 -273.359367:124.504415:-900.000000
-8.680000:122.004415:-900.000000
+-251.759367:122.004415:-900.000000
+FIN_BOX
+BOX
+creaMaracasVisu:MeshContours_Widget:Box72
+ISEXEC:FALSE
+-191.950694:-87.321377:-900.000000
+13.960000:-89.821377:-900.000000
+PORT
+colorMesh:"0 1 1"
+FIN_BOX
+BOX
+wx:LayoutLine:Box81
+ISEXEC:FALSE
+-180.022846:-140.278086:-900.000000
+33.320000:-142.778086:-900.000000
+PORT
+WinTitle:"Step 1.   Surface"
+FIN_BOX
+BOX
+wx:LayoutTab:Box82
+ISEXEC:FALSE
+-153.588182:-50.941996:-900.000000
+33.320000:-53.441996:-900.000000
+FIN_BOX
+BOX
+wx:LayoutTab:Box86
+ISEXEC:FALSE
+-54.290640:-69.094847:-900.000000
+33.320000:-71.594847:-900.000000
+FIN_BOX
+BOX
+wx:OutputText:Box87
+ISEXEC:FALSE
+-35.032220:-44.152050:-900.000000
+19.240000:-46.652050:-900.000000
+FIN_BOX
+BOX
+wx:OutputText:Box88
+ISEXEC:FALSE
+-31.367033:-49.235762:-900.000000
+19.240000:-51.735762:-900.000000
+FIN_BOX
+BOX
+creaVtk:MeshManager:Box92
+ISEXEC:FALSE
+-48.235592:-73.814750:-900.000000
+9.680000:-76.314750:-900.000000
+FIN_BOX
+BOX
+creaVtk:MeshManager_tool:Box93
+ISEXEC:FALSE
+-61.627153:-92.643884:-900.000000
+10.440000:-95.143884:-900.000000
+PORT
+Tool:"35"
+FIN_BOX
+BOX
+std:MagicBox:Box94
+ISEXEC:FALSE
+-67.076676:-63.786058:-900.000000
+8.680000:-66.286058:-900.000000
+FIN_BOX
+BOX
+creaVtk:PolyDataNormals:Box95
+ISEXEC:FALSE
+116.738582:-18.405915:-900.000000
+139.033582:-20.905915:-900.000000
+PORT
+Type:"1"
+FIN_BOX
+BOX
+creaVtk:LinearExtrusionFilter:Box96
+ISEXEC:FALSE
+127.147426:-29.984265:-900.000000
+149.657426:-32.484265:-900.000000
+FIN_BOX
+BOX
+wx:SpinCtrl:Box97
+ISEXEC:FALSE
+61.957510:-28.253822:-900.000000
+83.317510:-30.753822:-900.000000
+PORT
+Max:"50"
+PORT
+Min:"-50"
+PORT
+Selected:"0"
+PORT
+Title:"Scalar Factor"
+FIN_BOX
+BOX
+creaMaracasVisu:PolyDataToActor_Widget:Box98
+ISEXEC:FALSE
+110.387131:-53.955143:-900.000000
+133.407131:-56.455143:-900.000000
+FIN_BOX
+BOX
+wx:Slider:Box99
+ISEXEC:FALSE
+70.913562:-8.032501:-900.000000
+92.068562:-10.532501:-900.000000
+PORT
+In:"100"
+PORT
+Label:"true"
+PORT
+Max:"200"
+PORT
+Min:"-200"
+PORT
+ReactiveOnTrack:"true"
+PORT
+Title:"Angle Correction"
+FIN_BOX
+BOX
+std:Div:Box100
+ISEXEC:FALSE
+70.931303:-12.936420:-900.000000
+91.966303:-15.436420:-900.000000
+PORT
+In2:"100"
+FIN_BOX
+BOX
+wx:LayoutLine:Box101
+ISEXEC:FALSE
+75.262796:-54.319784:-900.000000
+97.032796:-56.819784:-900.000000
+PORT
+Orientation:"V"
+FIN_BOX
+BOX
+wx:LayoutLine:Box102
+ISEXEC:FALSE
+82.113479:-63.996790:-900.000000
+103.883479:-66.496790:-900.000000
+PORT
+Orientation:"H"
+PORT
+WinTitle:"Extrusion"
+FIN_BOX
+BOX
+std:MultipleInputs:Box103
+ISEXEC:FALSE
+49.706682:-38.615295:-900.000000
+71.786682:-41.115295:-900.000000
+FIN_BOX
+BOX
+creaMaracasVisu:wxVtkBaseView_Info:Box105
+ISEXEC:FALSE
+-238.523609:87.781768:-900.000000
+18.480000:85.281768:-900.000000
+FIN_BOX
+BOX
+wx:LayoutTab:Box106
+ISEXEC:FALSE
+75.970731:-73.857697:-900.000000
+97.695731:-76.357697:-900.000000
+FIN_BOX
+BOX
+creaMaracasVisu:MeshContours_Widget:Box107
+ISEXEC:FALSE
+47.519737:-53.973462:-900.000000
+70.424737:-56.473462:-900.000000
+PORT
+colorMesh:"1 1 0"
 FIN_BOX
-CONNECTIONS:101
+BOX
+creaVtk:MeshReduction_DecimatePro:Box108
+ISEXEC:FALSE
+124.328231:-37.982124:-900.000000
+147.933231:-40.482124:-900.000000
+PORT
+TargetReduction:"0.8"
+FIN_BOX
+BOX
+std:MagicBox:Box109
+ISEXEC:FALSE
+135.305882:-44.175286:-900.000000
+157.015882:-46.675286:-900.000000
+FIN_BOX
+BOX
+creaVtk:MeshReduction_QuadricDecimation:Box110
+ISEXEC:FALSE
+159.883842:-36.905093:-900.000000
+184.148842:-39.405093:-900.000000
+PORT
+TargetReduction:"0.5"
+FIN_BOX
+CONNECTIONS:149
 CONNECTION
 Box06:LstContourPointsX:Box04:LstX
 NumberOfControlPoints:0
@@ -477,9 +663,6 @@ CONNECTION
 showNpoints:lstIndexs:Box06:LstIndexsIn
 NumberOfControlPoints:0
 CONNECTION
-showNpoints:Widget:Box08:Widget1
-NumberOfControlPoints:0
-CONNECTION
 Box06:LstContourPointsY:Box04:LstY
 NumberOfControlPoints:0
 CONNECTION
@@ -561,9 +744,6 @@ CONNECTION
 Box08:Widget:widget:widget
 NumberOfControlPoints:0
 CONNECTION
-render:render:Box66:In
-NumberOfControlPoints:0
-CONNECTION
 Box66:Out:Box11:Renderer
 NumberOfControlPoints:0
 CONNECTION
@@ -615,54 +795,24 @@ CONNECTION
 Box34:BoxChange:Box31:In2
 NumberOfControlPoints:0
 CONNECTION
-Box57:BoxChange:Box08:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
-Box04:Out:Box77:In2
-NumberOfControlPoints:0
-CONNECTION
 title:title:Box08:WinTitle
 NumberOfControlPoints:0
 CONNECTION
-Box77:Out:Box37:polydata
-NumberOfControlPoints:0
-CONNECTION
 Box66:Out:Box37:render
 NumberOfControlPoints:0
 CONNECTION
-Box37:widget:Box79:Widget5
-NumberOfControlPoints:0
-CONNECTION
 Box38:Widget:Box39:Widget2
 NumberOfControlPoints:0
 CONNECTION
-Box39:Widget:Box08:Widget4
-NumberOfControlPoints:0
-CONNECTION
 Box79:Widget:Box40:Widget2
 NumberOfControlPoints:0
 CONNECTION
-Box40:Widget:Box08:Widget6
-NumberOfControlPoints:0
-CONNECTION
-Box43:Widget:Box41:Widget4
-NumberOfControlPoints:0
-CONNECTION
-Box42:Widget:Box41:Widget2
-NumberOfControlPoints:0
-CONNECTION
-Box41:Widget:Box08:Widget8
-NumberOfControlPoints:0
-CONNECTION
 Box78:Widget:Box44:Widget2
 NumberOfControlPoints:0
 CONNECTION
 Box80:Widget:Box44:Widget5
 NumberOfControlPoints:0
 CONNECTION
-Box44:Widget:Box79:Widget2
-NumberOfControlPoints:0
-CONNECTION
 meshmanagermodel:meshmanagermodel:Box46:In
 NumberOfControlPoints:0
 CONNECTION
@@ -675,15 +825,6 @@ CONNECTION
 Box49:OutString:Box06:NbPoints
 NumberOfControlPoints:0
 CONNECTION
-Box49:Widget:Box50:Widget4
-NumberOfControlPoints:0
-CONNECTION
-Box34:Widget:Box50:Widget2
-NumberOfControlPoints:0
-CONNECTION
-Box50:Widget:Box38:Widget1
-NumberOfControlPoints:0
-CONNECTION
 Box42:BoxChange:Box51:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
@@ -714,18 +855,6 @@ CONNECTION
 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
@@ -771,6 +900,207 @@ CONNECTION
 Box71:Out:Box62:_wxvtkbaseview3D1
 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
+Box37:widget:Box79:Widget4
+NumberOfControlPoints:0
+CONNECTION
+Box62:_widget:Box38:Widget7
+NumberOfControlPoints:0
+CONNECTION
+Box39:Widget:Box81:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box44:Widget:Box82:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box82:Widget:Box79: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
+CONNECTION
+Box57:BoxChange:Box08:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box57:InteractorStyleMaracas:interactorStyleMaracas:interactorStyleMaracas
+NumberOfControlPoints:0
+CONNECTION
+Box57:InteractorStyleMaracas2:interactorStyleMaracas2:interactorStyleMaracas2
+NumberOfControlPoints:0
+CONNECTION
+Box57:InteractorStyleMaracas3:interactorStyleMaracas3:interactorStyleMaracas3
+NumberOfControlPoints:0
+CONNECTION
+Box57:InteractorStyleMaracas4:interactorStyleMaracas4:interactorStyleMaracas4
+NumberOfControlPoints:0
+CONNECTION
+Box92:MeshManagerModel:Box93:MeshManagerModel
+NumberOfControlPoints:0
+CONNECTION
+Box77:Out:Box93:Mesh
+NumberOfControlPoints:0
+CONNECTION
+Box77:BoxChange:Box93:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box92:MeshBase:Box72:_polydata
+NumberOfControlPoints:0
+CONNECTION
+Box92:MeshBase:Box37:polydata
+NumberOfControlPoints:0
+CONNECTION
+Box37:boxchange:Box72:_execute
+NumberOfControlPoints:0
+CONNECTION
+Box81:Widget:Box08:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box42:Widget:Box44:Widget6
+NumberOfControlPoints:0
+CONNECTION
+Box43:Widget:Box44:Widget7
+NumberOfControlPoints:0
+CONNECTION
+Box94:BoxChange:Box37:boxexecute
+NumberOfControlPoints:0
+CONNECTION
+Box77:BoxChange:Box94:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box04:Out:Box95:In
+NumberOfControlPoints:0
+CONNECTION
+Box95:Out:Box96:In
+NumberOfControlPoints:0
+CONNECTION
+Box99:Out:Box100:In1
+NumberOfControlPoints:0
+CONNECTION
+Box100:Out:Box95:Param
+NumberOfControlPoints:0
+CONNECTION
+Box97:Widget:Box101:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box99:Widget:Box101:Widget4
+NumberOfControlPoints:0
+CONNECTION
+Box97:Out:Box96:ScalarFactor
+NumberOfControlPoints:0
+CONNECTION
+Box97:BoxChange:Box103:In2
+NumberOfControlPoints:0
+CONNECTION
+Box99:BoxChange:Box103:In4
+NumberOfControlPoints:0
+CONNECTION
+Box103:BoxChange:Box98:boxexecute
+NumberOfControlPoints:0
+CONNECTION
+Box71:Out:Box105:wxVtkBaseView
+NumberOfControlPoints:0
+CONNECTION
+Box105:vtkRenderer:Box66:In
+NumberOfControlPoints:0
+CONNECTION
+Box98:boxchange:Box31:In6
+NumberOfControlPoints:0
+CONNECTION
+Box101:Widget:Box102:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box102:Widget:Box106:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box106:Widget:Box81:Widget3
+NumberOfControlPoints:0
+CONNECTION
+Box40:Widget:Box81:Widget6
+NumberOfControlPoints:0
+CONNECTION
+Box66:Out:Box98:render
+NumberOfControlPoints:0
+CONNECTION
 Box04:Out:Box62:_polydata
 NumberOfControlPoints:0
+CONNECTION
+Box64:Out:Box107:_wxvtkbaseview2D1
+NumberOfControlPoints:0
+CONNECTION
+Box65:Out:Box107:_wxvtkbaseview2D2
+NumberOfControlPoints:0
+CONNECTION
+Box69:Out:Box107:_wxvtkbaseview2D3
+NumberOfControlPoints:0
+CONNECTION
+Box71:Out:Box107:_wxvtkbaseview3D1
+NumberOfControlPoints:0
+CONNECTION
+Box107:_widget:Box102:Widget6
+NumberOfControlPoints:0
+CONNECTION
+Box103:BoxChange:Box107:_execute
+NumberOfControlPoints:0
+CONNECTION
+Box63:BoxChange:Box103:In1
+NumberOfControlPoints:0
+CONNECTION
+Box67:Out:Box60:Mesh
+NumberOfControlPoints:0
+CONNECTION
+Box96:Out:Box108:In
+NumberOfControlPoints:0
+CONNECTION
+Box109:Out:Box98:polydata
+NumberOfControlPoints:0
+CONNECTION
+Box109:Out:Box107:_polydata
+NumberOfControlPoints:0
+CONNECTION
+Box109:Out:Box77:In2
+NumberOfControlPoints:0
+CONNECTION
+Box96:Out:Box110:In
+NumberOfControlPoints:0
+CONNECTION
+Box72:_widget:Box79:Widget3
+NumberOfControlPoints:0
+CONNECTION
+Box98:widget:Box102:Widget8
+NumberOfControlPoints:0
+CONNECTION
+Box48:widget:Box38:Widget8
+NumberOfControlPoints:0
+CONNECTION
+Box108:Out:Box109:In
+NumberOfControlPoints:0
 APP_END
index b4d480c12e36c6381908a58b1e198227c8551ba4..5c850f67d19844a5eb18337f41bf6de89342f481 100644 (file)
@@ -21,13 +21,14 @@ 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 "100"
-  set Box06.OpenClose "true"
+  set Box06.OpenClose "false"
   set Box06.OpenClose2 "false"
 
 new wx:LayoutLine Box08
@@ -43,22 +44,23 @@ new std:MultipleInputs Box31
 
 new creaMaracasVisu:ManualContourModel_Box Box29
   set Box29.NbPoints "40"
-  set Box29.OpenClose "true"
+  set Box29.OpenClose "false"
   set Box29.OpenClose2 "false"
 
 new creaMaracasVisu:wxPopupMenu Box57
   set Box57.WithCtrlKey "true"
 
 new std:AddStringToVector Box58
-  set Box58.In0 "Add point"
-  set Box58.In1 "Insert point"
+  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.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"
+  set Box58.In7 "+>  Insert group after"
+  set Box58.In8 "-  Delete group"
+  set Box58.In9 "Tool 4 points"
 
 new creaMaracasVisu:ShowNPoints_Tools Box60
 
@@ -72,6 +74,7 @@ new std:StringSelect Box61
   set Box61.In6 "0"
   set Box61.In7 "100"
   set Box61.In8 "110"
+  set Box61.In9 "200"
 
 new vtk:ImageVtkProperties Box68
 
@@ -84,11 +87,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+Yellow )"
 
 new wx:CommandButton Box80
   set Box80.Label "Run"
@@ -107,7 +109,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,25 +119,21 @@ new creaMaracasVisu:PolyDataToActor_Widget Box37
 
 new wx:LayoutLine Box38
   set Box38.Orientation "H"
-  set Box38.WinTitle "Interpolated Surface"
+  set Box38.WinTitle "Interpolated Surface (Yellow)"
 
 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"
+  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 "30"
@@ -149,6 +147,7 @@ new wx:ComboBox Box49
 
 new wx:LayoutLine Box50
   set Box50.Orientation "V"
+  set Box50.WinTitle "Config"
 
 new std:MultipleInputs Box51
 
@@ -159,11 +158,8 @@ new std:MultipleInputs Box53
 
 new std:MultipleInputs Box55
 
-new wx:LayoutLine Box59
-  set Box59.Orientation "V"
-
 new creaMaracasVisu:MeshContours_Widget Box62
-  set Box62.colorMesh "1 1 0"
+  set Box62.colorMesh "0 0 1"
 
 new std:MagicBox Box63
 
@@ -175,10 +171,78 @@ new std:MagicBox Box69
 
 new std:MagicBox Box71
 
+new creaMaracasVisu:MeshContours_Widget Box72
+  set Box72.colorMesh "0 1 1"
+
+new wx:LayoutLine Box81
+  set Box81.WinTitle "Step 1.   Surface"
+
+new wx:LayoutTab Box82
+
+new wx:LayoutTab Box86
+
+new wx:OutputText Box87
+
+new wx:OutputText Box88
+
+new creaVtk:MeshManager Box92
+
+new creaVtk:MeshManager_tool Box93
+  set Box93.Tool "35"
+
+new std:MagicBox Box94
+
+new creaVtk:PolyDataNormals Box95
+  set Box95.Type "1"
+
+new creaVtk:LinearExtrusionFilter Box96
+
+new wx:SpinCtrl Box97
+  set Box97.Max "50"
+  set Box97.Min "-50"
+  set Box97.Selected "0"
+  set Box97.Title "Scalar Factor"
+
+new creaMaracasVisu:PolyDataToActor_Widget Box98
+
+new wx:Slider Box99
+  set Box99.In "100"
+  set Box99.Label "true"
+  set Box99.Max "200"
+  set Box99.Min "-200"
+  set Box99.ReactiveOnTrack "true"
+  set Box99.Title "Angle Correction"
+
+new std:Div Box100
+  set Box100.In2 "100"
+
+new wx:LayoutLine Box101
+  set Box101.Orientation "V"
+
+new wx:LayoutLine Box102
+  set Box102.Orientation "H"
+  set Box102.WinTitle "Extrusion"
+
+new std:MultipleInputs Box103
+
+new creaMaracasVisu:wxVtkBaseView_Info Box105
+
+new wx:LayoutTab Box106
+
+new creaMaracasVisu:MeshContours_Widget Box107
+  set Box107.colorMesh "1 1 0"
+
+new creaVtk:MeshReduction_DecimatePro Box108
+  set Box108.TargetReduction "0.8"
+
+new std:MagicBox Box109
+
+new creaVtk:MeshReduction_QuadricDecimation Box110
+  set Box110.TargetReduction "0.5"
+
 
 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
@@ -219,27 +283,14 @@ 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
@@ -250,10 +301,6 @@ 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
@@ -264,10 +311,72 @@ connect Box69.Out Box57.wxVtkBaseView4
 connect Box69.Out Box62._wxvtkbaseview2D3
 connect Box71.Out Box57.wxVtkBaseView
 connect Box71.Out Box62._wxvtkbaseview3D1
+connect Box71.Out Box72._wxvtkbaseview3D1
+connect Box64.Out Box72._wxvtkbaseview2D1
+connect Box65.Out Box72._wxvtkbaseview2D2
+connect Box69.Out Box72._wxvtkbaseview2D3
+connect Box37.widget Box79.Widget4
+connect Box62._widget Box38.Widget7
+connect Box39.Widget Box81.Widget2
+connect Box44.Widget Box82.Widget2
+connect Box82.Widget Box79.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
+connect Box57.BoxChange Box08.BoxExecute
+connect Box92.MeshManagerModel Box93.MeshManagerModel
+connect Box77.Out Box93.Mesh
+connect Box77.BoxChange Box93.BoxExecute
+connect Box92.MeshBase Box72._polydata
+connect Box92.MeshBase Box37.polydata
+connect Box37.boxchange Box72._execute
+connect Box81.Widget Box08.Widget2
+connect Box42.Widget Box44.Widget6
+connect Box43.Widget Box44.Widget7
+connect Box94.BoxChange Box37.boxexecute
+connect Box77.BoxChange Box94.BoxExecute
+connect Box04.Out Box95.In
+connect Box95.Out Box96.In
+connect Box99.Out Box100.In1
+connect Box100.Out Box95.Param
+connect Box97.Widget Box101.Widget2
+connect Box99.Widget Box101.Widget4
+connect Box97.Out Box96.ScalarFactor
+connect Box97.BoxChange Box103.In2
+connect Box99.BoxChange Box103.In4
+connect Box103.BoxChange Box98.boxexecute
+connect Box71.Out Box105.wxVtkBaseView
+connect Box105.vtkRenderer Box66.In
+connect Box98.boxchange Box31.In6
+connect Box101.Widget Box102.Widget2
+connect Box102.Widget Box106.Widget2
+connect Box106.Widget Box81.Widget3
+connect Box40.Widget Box81.Widget6
+connect Box66.Out Box98.render
 connect Box04.Out Box62._polydata
+connect Box64.Out Box107._wxvtkbaseview2D1
+connect Box65.Out Box107._wxvtkbaseview2D2
+connect Box69.Out Box107._wxvtkbaseview2D3
+connect Box71.Out Box107._wxvtkbaseview3D1
+connect Box107._widget Box102.Widget6
+connect Box103.BoxChange Box107._execute
+connect Box63.BoxChange Box103.In1
+connect Box67.Out Box60.Mesh
+connect Box96.Out Box108.In
+connect Box109.Out Box98.polydata
+connect Box109.Out Box107._polydata
+connect Box109.Out Box77.In2
+connect Box96.Out Box110.In
+connect Box72._widget Box79.Widget3
+connect Box98.widget Box102.Widget8
+connect Box48.widget Box38.Widget8
+connect Box108.Out Box109.In
 
 # Complex input ports
-input render Box66.In " "
 input point showNpoints.In " "
 input mesh Box67.In " "
 input image Box35.In " "
@@ -281,6 +390,10 @@ input wxvtkbaseview1 Box71.In " "
 
 # Complex output ports
 output widget Box08.Widget " "
+output interactorStyleMaracas Box57.InteractorStyleMaracas " "
+output interactorStyleMaracas2 Box57.InteractorStyleMaracas2 " "
+output interactorStyleMaracas3 Box57.InteractorStyleMaracas3 " "
+output interactorStyleMaracas4 Box57.InteractorStyleMaracas4 " "
 
 
 endefine
index d18a32fb7c99164e4f0fd79f1ae1d5c5536fd67e..73e77861433079f09e6a14fe18c81c57352e46c5 100644 (file)
@@ -31,11 +31,7 @@ COMPLEX_PORT
 interactorStyleMaracas4
 -285.985042:-186.124821:-900.000000
 FIN_COMPLEX_PORT
-COMPLEXINPUTS:13
-COMPLEX_PORT
-render
--32.390937:141.689813:-900.000000
-FIN_COMPLEX_PORT
+COMPLEXINPUTS:10
 COMPLEX_PORT
 boxChange
 -6.086529:137.355528:-900.000000
@@ -76,20 +72,12 @@ COMPLEX_PORT
 meshmanagermodel
 -150.374274:130.740991:-900.000000
 FIN_COMPLEX_PORT
-COMPLEX_PORT
-ActiveTool
--316.945584:134.382008:-900.000000
-FIN_COMPLEX_PORT
-COMPLEX_PORT
-ExecPopupMenuBox
--291.151968:133.699669:-900.000000
-FIN_COMPLEX_PORT
-BOXES:61
+BOXES:56
 BOX
 creaMaracasVisu:ShowNPoints:showNpoints
 ISEXEC:FALSE
 24.787568:83.025910:-900.000000
-61.627568:80.525910:-900.000000
+46.637568:80.525910:-900.000000
 PORT
 Radio:"1"
 PORT
@@ -107,7 +95,7 @@ BOX
 creaMaracasVisu:ManualContourModel_Box:Box06
 ISEXEC:FALSE
 29.075845:30.364799:-900.000000
-53.595845:27.864799:-900.000000
+52.285845:27.864799:-900.000000
 PORT
 DoubleContour:"1"
 PORT
@@ -120,8 +108,8 @@ FIN_BOX
 BOX
 wx:LayoutLine:Box08
 ISEXEC:FALSE
--181.825547:-146.743903:-900.000000
--148.505547:-149.243903:-900.000000
+-182.125107:-147.642582:-900.000000
+33.320000:-150.142582:-900.000000
 FIN_BOX
 BOX
 vtk:UpdateRender:Box11
@@ -135,7 +123,7 @@ BOX
 creaMaracasVisu:DrawAxisTree3D:Box30
 ISEXEC:FALSE
 66.011927:-0.645212:-900.000000
-94.051927:-3.145212:-900.000000
+88.191927:-3.145212:-900.000000
 PORT
 Colour:"0 0 1"
 PORT
@@ -151,7 +139,7 @@ BOX
 creaMaracasVisu:ManualContourModel_Box:Box29
 ISEXEC:FALSE
 76.240145:29.637449:-900.000000
-100.760145:27.137449:-900.000000
+99.450145:27.137449:-900.000000
 PORT
 NbPoints:"40"
 PORT
@@ -162,46 +150,46 @@ FIN_BOX
 BOX
 creaMaracasVisu:wxPopupMenu:Box57
 ISEXEC:FALSE
--262.817491:81.208938:-900.000000
--240.752491:78.708938:-900.000000
+-291.724262:77.620511:-900.000000
+17.480000:75.120511:-900.000000
 PORT
 WithCtrlKey:"true"
 FIN_BOX
 BOX
 std:AddStringToVector:Box58
 ISEXEC:FALSE
--300.509619:94.660721:-900.000000
--275.989619:92.160721:-900.000000
+-304.297403:100.641432:-900.000000
+24.520000:98.141432:-900.000000
 PORT
-In0:"Add point"
+In0:"+  Add point"
 PORT
-In1:"Insert point"
+In1:"(+)  Insert point"
 PORT
 In2:"Track point"
 PORT
-In3:"Set nearest point"
+In3:"Set Nearest point"
 PORT
-In4:"Erase point"
+In4:"-  Erase point"
 PORT
-In5:"Delete all points"
+In5:"--  Delete all points"
 PORT
 In6:"----------------------"
 PORT
-In7:"Insert group after"
+In7:"+>  Insert group after"
 PORT
-In8:"Delete group"
+In8:"Delete group"
 FIN_BOX
 BOX
 creaMaracasVisu:ShowNPoints_Tools:Box60
 ISEXEC:FALSE
--255.052281:65.047026:-900.000000
--232.617281:62.547026:-900.000000
+-271.997629:60.063100:-900.000000
+12.200000:57.563100:-900.000000
 FIN_BOX
 BOX
 std:StringSelect:Box61
 ISEXEC:FALSE
--257.219120:75.352092:-900.000000
--232.699120:72.852092:-900.000000
+-269.579256:64.985526:-900.000000
+24.520000:62.485526:-900.000000
 PORT
 In0:"5"
 PORT
@@ -225,21 +213,21 @@ BOX
 vtk:ImageVtkProperties:Box68
 ISEXEC:FALSE
 -111.766259:110.196821:-900.000000
--89.231259:107.696821:-900.000000
+16.720000:107.696821:-900.000000
 FIN_BOX
 BOX
 std:VectorFilterDouble:Box70
 ISEXEC:FALSE
 49.750242:60.953814:-900.000000
-76.030242:58.453814:-900.000000
+72.180242:58.453814:-900.000000
 PORT
 Type:"11"
 FIN_BOX
 BOX
 creaVtk:BooleanOperationPolyDataFilter:Box77
 ISEXEC:FALSE
--85.374508:-27.219172:-900.000000
--61.644508:-29.719172:-900.000000
+-85.973628:-27.668512:-900.000000
+12.200000:-30.168512:-900.000000
 PORT
 BoxProcessMode:"Manual"
 PORT
@@ -249,7 +237,7 @@ BOX
 wx:ComboBox:Box78
 ISEXEC:FALSE
 -153.877713:-5.775167:-900.000000
--127.597713:-8.275167:-900.000000
+26.280000:-8.275167:-900.000000
 PORT
 In:"Union Intersection Difference"
 FIN_BOX
@@ -257,7 +245,7 @@ BOX
 wx:LayoutLine:Box79
 ISEXEC:FALSE
 -144.841026:-82.628158:-900.000000
--111.521026:-85.128158:-900.000000
+33.320000:-85.128158:-900.000000
 PORT
 Orientation:"H"
 PORT
@@ -266,16 +254,16 @@ FIN_BOX
 BOX
 wx:CommandButton:Box80
 ISEXEC:FALSE
--106.734755:-4.110191:-900.000000
--84.459755:-6.610191:-900.000000
+-107.184095:21.801731:-900.000000
+21.000000:19.301731:-900.000000
 PORT
 Label:"Run"
 FIN_BOX
 BOX
 std:MagicBox:Box66
 ISEXEC:FALSE
--39.496513:124.163432:-900.000000
--17.896513:121.663432:-900.000000
+-148.055989:80.219744:-900.000000
+8.680000:77.719744:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box67
@@ -299,7 +287,7 @@ BOX
 wx:Slider:Box34
 ISEXEC:FALSE
 -198.941120:-3.426364:-900.000000
--169.141120:-5.926364:-900.000000
+29.800000:-5.926364:-900.000000
 PORT
 In:"50"
 PORT
@@ -317,15 +305,15 @@ BOX
 std:Div:Box36
 ISEXEC:FALSE
 -190.788172:-9.261990:-900.000000
--169.863172:-11.761990:-900.000000
+8.680000:-11.761990:-900.000000
 PORT
 In2:"100"
 FIN_BOX
 BOX
 creaMaracasVisu:PolyDataToActor_Widget:Box37
 ISEXEC:FALSE
--70.983574:-39.626565:-900.000000
--47.963574:-42.126565:-900.000000
+-67.388857:-39.476785:-900.000000
+10.440000:-41.976785:-900.000000
 PORT
 color:"0 1 1"
 FIN_BOX
@@ -333,7 +321,7 @@ BOX
 wx:LayoutLine:Box38
 ISEXEC:FALSE
 -190.854929:-82.522396:-900.000000
--157.534929:-85.022396:-900.000000
+33.320000:-85.022396:-900.000000
 PORT
 Orientation:"H"
 PORT
@@ -343,35 +331,27 @@ BOX
 wx:LayoutTab:Box39
 ISEXEC:FALSE
 -195.888488:-89.508403:-900.000000
--162.568488:-92.008403:-900.000000
+33.320000:-92.008403:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box40
 ISEXEC:FALSE
 -148.825313:-89.038628:-900.000000
--115.505313:-91.538628:-900.000000
-FIN_BOX
-BOX
-wx:LayoutLine:Box41
-ISEXEC:FALSE
--132.457797:-123.598821:-900.000000
--99.137797:-126.098821:-900.000000
-PORT
-Orientation:"H"
+33.320000:-91.538628:-900.000000
 FIN_BOX
 BOX
 wx:CommandButton:Box42
 ISEXEC:FALSE
--117.665938:-114.769894:-900.000000
--95.390938:-117.269894:-900.000000
+-91.903796:13.441695:-900.000000
+21.000000:10.941695:-900.000000
 PORT
-Label:"Apply  ( Magenta -> To Red)"
+Label:"Apply  (Magenta->To Red)"
 FIN_BOX
 BOX
 wx:CommandButton:Box43
 ISEXEC:FALSE
--69.629626:-115.035234:-900.000000
--47.354626:-117.535234:-900.000000
+-85.356515:8.083838:-900.000000
+21.000000:5.583838:-900.000000
 PORT
 Label:"Reset Tool"
 FIN_BOX
@@ -379,7 +359,7 @@ BOX
 wx:LayoutLine:Box44
 ISEXEC:FALSE
 -154.036190:-43.432527:-900.000000
--120.716190:-45.932527:-900.000000
+33.320000:-45.932527:-900.000000
 PORT
 Orientation:"V"
 PORT
@@ -389,7 +369,7 @@ BOX
 creaVtk:MeshManager_tool:Box45
 ISEXEC:FALSE
 -91.573378:-134.495402:-900.000000
--69.073378:-136.995402:-900.000000
+10.440000:-136.995402:-900.000000
 PORT
 Tool:"30"
 FIN_BOX
@@ -397,13 +377,13 @@ BOX
 std:MagicBox:Box46
 ISEXEC:FALSE
 -137.131256:113.921532:-900.000000
--115.531256:111.421532:-900.000000
+8.680000:111.421532:-900.000000
 FIN_BOX
 BOX
 wx:ComboBox:Box49
 ISEXEC:FALSE
 -182.639251:-13.479145:-900.000000
--156.359251:-15.979145:-900.000000
+26.280000:-15.979145:-900.000000
 PORT
 In:"25 50 100 150"
 PORT
@@ -415,7 +395,7 @@ BOX
 wx:LayoutLine:Box50
 ISEXEC:FALSE
 -57.295971:-56.374591:-900.000000
--23.975971:-58.874591:-900.000000
+33.320000:-58.874591:-900.000000
 PORT
 Orientation:"V"
 PORT
@@ -425,13 +405,13 @@ BOX
 std:MultipleInputs:Box51
 ISEXEC:FALSE
 -92.949669:-148.627142:-900.000000
--70.979669:-151.127142:-900.000000
+21.000000:-151.127142:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ShowNPoints_Tools:Box52
 ISEXEC:FALSE
 -48.321002:-133.648902:-900.000000
--25.886002:-136.148902:-900.000000
+12.200000:-136.148902:-900.000000
 PORT
 Type:"120"
 FIN_BOX
@@ -439,19 +419,19 @@ BOX
 std:MultipleInputs:Box53
 ISEXEC:FALSE
 -96.292390:-13.293248:-900.000000
--74.322390:-15.793248:-900.000000
+21.000000:-15.793248:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:Box55
 ISEXEC:FALSE
 -55.260572:-155.987226:-900.000000
--33.290572:-158.487226:-900.000000
+21.000000:-158.487226:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:MeshContours_Widget:Box62
 ISEXEC:FALSE
 -228.707140:-3.136982:-900.000000
--205.912140:-5.636982:-900.000000
+13.960000:-5.636982:-900.000000
 PORT
 colorMesh:"1 1 0"
 FIN_BOX
@@ -494,26 +474,10 @@ PORT
 colorMesh:"0 1 1"
 FIN_BOX
 BOX
-wx:LayoutLine:Box74
-ISEXEC:FALSE
--142.287641:-131.666131:-900.000000
--108.967641:-134.166131:-900.000000
-PORT
-Orientation:"V"
-PORT
-WinTitle:"Step 2.   Apply"
-FIN_BOX
-BOX
-wx:LayoutTab:Box76
-ISEXEC:FALSE
--172.673632:-139.797664:-900.000000
--139.353632:-142.297664:-900.000000
-FIN_BOX
-BOX
 wx:LayoutLine:Box81
 ISEXEC:FALSE
 -184.734921:-96.564525:-900.000000
--151.414921:-99.064525:-900.000000
+33.320000:-99.064525:-900.000000
 PORT
 WinTitle:"Step 1.   Surface"
 FIN_BOX
@@ -521,71 +485,59 @@ 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
+33.320000:-53.850487:-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.823570:-111.198969:-900.000000
--124.153570:-113.698969:-900.000000
+19.240000:-40.648449:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box86
 ISEXEC:FALSE
--56.537338:-70.143306:-900.000000
--23.217338:-72.643306:-900.000000
+-57.013911:-62.286670:-900.000000
+33.320000:-64.786670:-900.000000
 FIN_BOX
 BOX
 wx:OutputText:Box87
 ISEXEC:FALSE
 -35.032220:-44.152050:-900.000000
--13.362220:-46.652050:-900.000000
+19.240000:-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
-BOX
-std:MagicBox:Box89
-ISEXEC:FALSE
--331.175148:121.706470:-900.000000
--309.575148:119.206470:-900.000000
-FIN_BOX
-BOX
-std:MagicBox:Box90
-ISEXEC:FALSE
--298.351639:123.000593:-900.000000
--276.751639:120.500593:-900.000000
+19.240000:-51.735762:-900.000000
 FIN_BOX
 BOX
 creaVtk:MeshManager:Box92
 ISEXEC:FALSE
 -56.608588:-81.789032:-900.000000
--34.578588:-84.289032:-900.000000
+9.680000:-84.289032:-900.000000
 FIN_BOX
 BOX
 creaVtk:MeshManager_tool:Box93
 ISEXEC:FALSE
 -61.627153:-92.643884:-900.000000
--39.127153:-95.143884:-900.000000
+10.440000:-95.143884:-900.000000
 PORT
 Tool:"35"
 FIN_BOX
-CONNECTIONS:126
+BOX
+std:MagicBox:Box94
+ISEXEC:FALSE
+-48.337114:-27.303720:-900.000000
+8.680000:-29.803720:-900.000000
+FIN_BOX
+BOX
+creaMaracasVisu:wxVtkBaseView_Info:Box96
+ISEXEC:FALSE
+-157.021318:90.558496:-900.000000
+18.480000:88.058496:-900.000000
+FIN_BOX
+CONNECTIONS:121
 CONNECTION
 Box06:LstContourPointsX:Box04:LstX
 NumberOfControlPoints:0
@@ -674,9 +626,6 @@ CONNECTION
 Box08:Widget:widget:widget
 NumberOfControlPoints:0
 CONNECTION
-render:render:Box66:In
-NumberOfControlPoints:0
-CONNECTION
 Box66:Out:Box11:Renderer
 NumberOfControlPoints:0
 CONNECTION
@@ -743,12 +692,6 @@ CONNECTION
 Box79:Widget:Box40:Widget2
 NumberOfControlPoints:0
 CONNECTION
-Box43:Widget:Box41:Widget4
-NumberOfControlPoints:0
-CONNECTION
-Box42:Widget:Box41:Widget2
-NumberOfControlPoints:0
-CONNECTION
 Box78:Widget:Box44:Widget2
 NumberOfControlPoints:0
 CONNECTION
@@ -857,18 +800,9 @@ CONNECTION
 Box69:Out:Box72:_wxvtkbaseview2D3
 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
@@ -878,30 +812,15 @@ 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
@@ -923,15 +842,6 @@ CONNECTION
 Box34:Widget:Box50:Widget4
 NumberOfControlPoints:0
 CONNECTION
-ActiveTool:ActiveTool:Box89:In
-NumberOfControlPoints:0
-CONNECTION
-ExecPopupMenuBox:ExecPopupMenuBox:Box90:In
-NumberOfControlPoints:0
-CONNECTION
-Box89:Out:Box57:Active
-NumberOfControlPoints:0
-CONNECTION
 Box57:BoxChange:Box08:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
@@ -964,4 +874,31 @@ NumberOfControlPoints:0
 CONNECTION
 Box37:boxchange:Box72:_execute
 NumberOfControlPoints:0
+CONNECTION
+Box81:Widget:Box08:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box42:Widget:Box44:Widget6
+NumberOfControlPoints:0
+CONNECTION
+Box43:Widget:Box44:Widget7
+NumberOfControlPoints:0
+CONNECTION
+Box94:BoxChange:Box37:boxexecute
+NumberOfControlPoints:0
+CONNECTION
+Box77:BoxChange:Box94:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box71:Out:Box96:wxVtkBaseView
+NumberOfControlPoints:0
+CONNECTION
+Box96:vtkRenderer:Box66:In
+NumberOfControlPoints:0
+CONNECTION
+Box37:widget:Box79:Widget7
+NumberOfControlPoints:0
+CONNECTION
+Box48:widget:Box38:Widget8
+NumberOfControlPoints:0
 APP_END
index 9a0eb7e2b6105816c2fe5a0610b64f5751a5347f..b47594fbfb980dbc8d9ce6418346bbe444236c2e 100644 (file)
@@ -51,15 +51,15 @@ new creaMaracasVisu:wxPopupMenu Box57
   set Box57.WithCtrlKey "true"
 
 new std:AddStringToVector Box58
-  set Box58.In0 "Add point"
-  set Box58.In1 "Insert point"
+  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.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"
+  set Box58.In7 "+>  Insert group after"
+  set Box58.In8 "Delete group"
 
 new creaMaracasVisu:ShowNPoints_Tools Box60
 
@@ -123,11 +123,8 @@ new wx:LayoutTab Box39
 
 new wx:LayoutTab Box40
 
-new wx:LayoutLine Box41
-  set Box41.Orientation "H"
-
 new wx:CommandButton Box42
-  set Box42.Label "Apply  ( Magenta -> To Red)"
+  set Box42.Label "Apply  (Magenta->To Red)"
 
 new wx:CommandButton Box43
   set Box43.Label "Reset Tool"
@@ -175,38 +172,28 @@ 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
 
-new std:MagicBox Box89
-
-new std:MagicBox Box90
-
 new creaVtk:MeshManager Box92
 
 new creaVtk:MeshManager_tool Box93
   set Box93.Tool "35"
 
+new std:MagicBox Box94
+
+new creaMaracasVisu:wxVtkBaseView_Info Box96
+
 
 connect Box06.LstContourPointsX Box04.LstX
 connect showNpoints.lstIndexs Box06.LstIndexsIn
@@ -254,8 +241,6 @@ connect Box04.Out Box77.In2
 connect Box66.Out Box37.render
 connect Box38.Widget Box39.Widget2
 connect Box79.Widget Box40.Widget2
-connect Box43.Widget Box41.Widget4
-connect Box42.Widget Box41.Widget2
 connect Box78.Widget Box44.Widget2
 connect Box80.Widget Box44.Widget5
 connect Box46.Out Box45.MeshManagerModel
@@ -286,21 +271,13 @@ connect Box71.Out Box72._wxvtkbaseview3D1
 connect Box64.Out Box72._wxvtkbaseview2D1
 connect Box65.Out Box72._wxvtkbaseview2D2
 connect Box69.Out Box72._wxvtkbaseview2D3
-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
@@ -308,7 +285,6 @@ connect Box87.Widget Box50.Widget8
 connect Box88.Widget Box50.Widget9
 connect Box49.Widget Box50.Widget2
 connect Box34.Widget Box50.Widget4
-connect Box89.Out Box57.Active
 connect Box57.BoxChange Box08.BoxExecute
 connect Box92.MeshManagerModel Box93.MeshManagerModel
 connect Box77.Out Box93.Mesh
@@ -316,9 +292,17 @@ connect Box77.BoxChange Box93.BoxExecute
 connect Box92.MeshBase Box72._polydata
 connect Box92.MeshBase Box37.polydata
 connect Box37.boxchange Box72._execute
+connect Box81.Widget Box08.Widget2
+connect Box42.Widget Box44.Widget6
+connect Box43.Widget Box44.Widget7
+connect Box94.BoxChange Box37.boxexecute
+connect Box77.BoxChange Box94.BoxExecute
+connect Box71.Out Box96.wxVtkBaseView
+connect Box96.vtkRenderer Box66.In
+connect Box37.widget Box79.Widget7
+connect Box48.widget Box38.Widget8
 
 # Complex input ports
-input render Box66.In " "
 input point showNpoints.In " "
 input mesh Box67.In " "
 input image Box35.In " "
@@ -329,8 +313,6 @@ input wxvtkbaseview2 Box64.In " "
 input wxvtkbaseview3 Box65.In " "
 input wxvtkbaseview4 Box69.In " "
 input wxvtkbaseview1 Box71.In " "
-input ActiveTool Box89.In " "
-input ExecPopupMenuBox Box90.In " "
 
 # Complex output ports
 output widget Box08.Widget " "
index d811a2c8520bf213aee835ff89457ed1f186a3bc..7cc889c0472ee591256d4ee63c6c7507a5cad2c9 100644 (file)
@@ -19,10 +19,10 @@ COMPLEX_PORT
 boxchange
 48.028303:-85.261950:-900.000000
 FIN_COMPLEX_PORT
-COMPLEXINPUTS:4
+COMPLEXINPUTS:5
 COMPLEX_PORT
 render
-89.850563:10.360805:-900.000000
+67.330358:11.206273:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 polydata
@@ -36,14 +36,18 @@ COMPLEX_PORT
 boxexecute
 -29.195546:6.611932:-900.000000
 FIN_COMPLEX_PORT
+COMPLEX_PORT
+scalarvisibility
+90.426694:9.453874:-900.000000
+FIN_COMPLEX_PORT
 BOXES:8
 BOX
 wx:LayoutLine:Box04
 ISEXEC:FALSE
 -4.766527:-48.767110:-900.000000
-33.320000:-51.267110:-900.000000
+28.553473:-51.267110:-900.000000
 PORT
-Orientation:"H"
+Orientation:"V"
 FIN_BOX
 BOX
 vtk:PolyDataToActor:Box09
@@ -54,14 +58,14 @@ FIN_BOX
 BOX
 std:MagicBox:Box10
 ISEXEC:FALSE
-91.397041:-6.745021:-900.000000
-112.997041:-9.245021:-900.000000
+60.960177:-0.673020:-900.000000
+82.560177:-3.173020:-900.000000
 FIN_BOX
 BOX
 vtk:UpdateRender:Box11
 ISEXEC:FALSE
-67.749276:-53.635754:-900.000000
-89.774276:-56.135754:-900.000000
+74.359302:-58.093679:-900.000000
+96.384302:-60.593679:-900.000000
 PORT
 Active:"true"
 FIN_BOX
@@ -69,7 +73,7 @@ BOX
 wx:Slider:Box13
 ISEXEC:FALSE
 -13.704404:-6.213707:-900.000000
-16.095596:-8.713707:-900.000000
+29.800000:-8.713707:-900.000000
 PORT
 In:"50"
 PORT
@@ -94,8 +98,8 @@ FIN_BOX
 BOX
 wx:ComboBox:Box15
 ISEXEC:FALSE
-55.700791:-9.704871:-900.000000
-77.415791:-12.204871:-900.000000
+22.112635:-19.005024:-900.000000
+43.827635:-21.505024:-900.000000
 PORT
 In:"Points WireFrame Surface"
 PORT
@@ -109,7 +113,7 @@ ISEXEC:FALSE
 -27.821638:-25.674906:-900.000000
 21.000000:-28.174906:-900.000000
 FIN_BOX
-CONNECTIONS:16
+CONNECTIONS:17
 CONNECTION
 Box10:Out:Box11:Renderer
 NumberOfControlPoints:0
@@ -158,4 +162,7 @@ NumberOfControlPoints:0
 CONNECTION
 Box08:BoxChange:Box09:BoxExecute
 NumberOfControlPoints:0
+CONNECTION
+scalarvisibility:scalarvisibility:Box09:ScalarVisibility
+NumberOfControlPoints:0
 APP_END
index 814cc92e6beaa87eda1fd0a797bceafc35867570..3c66262eea21056f1f4a68bbc4f48cd443994b11 100644 (file)
@@ -17,7 +17,7 @@ description "Description ??"
 category "<VOID>"
 
 new wx:LayoutLine Box04
-  set Box04.Orientation "H"
+  set Box04.Orientation "V"
 
 new vtk:PolyDataToActor Box09
 
@@ -61,6 +61,7 @@ input render Box10.In " "
 input polydata Box09.In " "
 input color Box09.Colour " "
 input boxexecute Box08.In3 " "
+input scalarvisibility Box09.ScalarVisibility " "
 
 # Complex output ports
 output widget Box04.Widget " "
index 657e07d9a257450e3c8fd3528865acc98c701030..6e36f0487e4e382024be5223e9449dcdfc1da028 100644 (file)
@@ -134,7 +134,6 @@ void wxPopupMenu::Process()
 //    bbSetOutputOut( bbGetInputIn() );
 //    std::cout << "Output value = " <<bbGetOutputOut() << std::endl;
     
-    printf("EED wxPopupMenu::Process Start \n");
     if (firsttime==true)
     {
         firsttime=false;
@@ -184,8 +183,6 @@ void wxPopupMenu::Process()
     if (popupmenuinteractor4!=NULL) { popupmenuinteractor4->SetActive(  bbGetInputActive() ); }
 
     bbSetOutputOut(-1);
-    printf("EED wxPopupMenu::Process End \n");
-
 }
 
 //===== 
index 462b1f47d1afbbacb54be1786d9bf5083291830f..9c73b0023e33ef7f72afd92f9ca0c2a30041b5f7 100644 (file)
@@ -1,11 +1,8 @@
 
-
 #include "vtkSphereSource.h"
 #include "vtkRenderer.h"
 #include "vtkTextActor3D.h"
 
-
-
 #include <wx/button.h>
 #include <wx/sizer.h>
 #include <wx/filedlg.h>
@@ -14,7 +11,6 @@
 
 #include "WidgetShowNPoints.h"
 
-
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
     wxPanel*    panelParent         = this;
     wxSizer*    sizer                          = NULL;
     wxSizer*    MNPsizer            = NULL;
-
     wxNotebook* bookSetPoints       = NULL;
     wxNotebook* bookGroupManager    = NULL;
     wxPanel*    panel               = NULL;
     wxPanel*    panel2              = NULL;
                 txtNrCollections    = NULL;
-
       bookSetPoints     = new wxNotebook(panelParent,
                           -1,
                           wxDefaultPosition,
       panel  = new wxPanel(bookSetPoints);
       txtNrCollections = NULL;
 
+      wxSize sizeButton;
+      sizeButton.Set( 45  ,  -1 );
+      wxSize sizeSlider;
+      sizeSlider.Set( 90  ,  -1 );
+
     // Group Manager
     if (mtype==4)
     {
                               wxNB_TOP );
           panel2  = new wxPanel(bookGroupManager);
           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("+ <"));
-          wxButton *btnInsertCollectionAfter    = new wxButton( panel2, -1, _T("+ >"));
-          wxButton *btnDeleteCollection         = new wxButton( panel2, -1, _T("Delete"));
-          wxButton *btnResetCollection          = new wxButton( panel2, -1, _T("Reset"));
-          wxButton *btnSaveCollection           = new wxButton( panel2, -1, _T("Save"));
-          wxButton *btnLoadCollection           = new wxButton( panel2, -1, _T("Load"));
+          wxButton *btnBackCollection           = new wxButton( panel2, -1, _T("<")     ,   wxDefaultPosition, sizeButton );
+          wxButton *btnNextCollection           = new wxButton( panel2, -1, _T(">")     ,   wxDefaultPosition, sizeButton );
+          wxButton *btnInsertCollectionBefore   = new wxButton( panel2, -1, _T("+<")    ,   wxDefaultPosition, sizeButton );
+          wxButton *btnInsertCollectionAfter    = new wxButton( panel2, -1, _T("+>")    ,   wxDefaultPosition, sizeButton );
+          wxButton *btnDeleteCollection         = new wxButton( panel2, -1, _T("-")     ,   wxDefaultPosition, sizeButton );
+          wxButton *btnResetCollection          = new wxButton( panel2, -1, _T("--")    ,   wxDefaultPosition, sizeButton );
+          wxButton *btnSaveCollection           = new wxButton( panel2, -1, _T("Save")  ,   wxDefaultPosition, sizeButton );
+          wxButton *btnLoadCollection           = new wxButton( panel2, -1, _T("Load")  ,   wxDefaultPosition, sizeButton );
           wxFlexGridSizer *sizer1               = new wxFlexGridSizer(1);
           wxFlexGridSizer *sizer2               = new wxFlexGridSizer(2);
           wxFlexGridSizer *sizer3               = new wxFlexGridSizer(3);
           wxFlexGridSizer *sizer4               = new wxFlexGridSizer(3);
-          wxFlexGridSizer *sizer5               = new wxFlexGridSizer(2);
+          wxFlexGridSizer *sizer5               = new wxFlexGridSizer(1);
           wxFlexGridSizer *sizer6               = new wxFlexGridSizer(2);
         wxStaticText* txOpacity               = new wxStaticText(panel2, -1, wxString(_T("Opacity")));
//         wxStaticText* txOpacity               = new wxStaticText(panel2, -1, wxString(_T("Op:")));
         
-          wxSize sizeSlider;
-          sizeSlider.Set( 90  ,  -1 );
+          btnInsertCollectionBefore   -> SetToolTip( _T("+  Add group before") );
+          btnInsertCollectionAfter    -> SetToolTip( _T("+>  Add group after") );
+          btnDeleteCollection         -> SetToolTip( _T("-  Erase group") );
+          btnResetCollection          -> SetToolTip( _T("-- Reset : Erase all groups") );
+
           sdrOpacity                            = new wxSlider(panel2, -1, 0, 0, 100, wxDefaultPosition, sizeSlider, wxSL_LABELS);
-          wxStaticText* txRadio                 = new wxStaticText(panel2, -1, wxString(_T("Radius  ")));
+//          wxStaticText* txRadio                 = new wxStaticText(panel2, -1, wxString(_T("R:")));
           sdrRadio                              = new wxSlider(panel2, -1, 0, 1, 50, wxDefaultPosition, sizeSlider, wxSL_LABELS);
 
+          sdrRadio                    -> SetToolTip( _T("Radio") );
+          sdrOpacity                  -> SetToolTip( _T("Opacity") );
+
+        
           Connect(btnBackCollection->GetId()        , wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction) & WidgetShowNPoints::OnBackCollection           );
           Connect(btnNextCollection->GetId()        , wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction) & WidgetShowNPoints::OnNextCollection           );
           Connect(btnInsertCollectionBefore->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction) & WidgetShowNPoints::OnInsertCollectionBefore   );
@@ -92,7 +98,6 @@
           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( btnInsertCollectionAfter );
           sizer4->Add( btnLoadCollection );
           sizer4->Add( btnSaveCollection );
-          sizer5->Add( txRadio ,wxGROW );
-          sizer5->Add( txOpacity ,wxGROW );
+//          sizer5->Add( txRadio ,wxGROW );
           sizer5->Add( sdrRadio ,wxGROW );
+//          sizer5->Add( txOpacity ,wxGROW );
           sizer5->Add( sdrOpacity ,wxGROW );
           sizer6->Add( btnDeleteCollection );
           sizer6->Add( btnResetCollection );
           sizer1->Add( sizer4 );
           sizer1->Add( sizer5 ,wxGROW );
 
-    
           MNPsizer                        = sizer1;
           panel2->SetSizer( MNPsizer );
           panel2->SetAutoLayout(true);
        {
                // Widget interface
 //             askPointLabel                                   = new wxStaticText(panel, -1, _T("Label:")); // JPR
-               textCtrl                                                = new wxTextCtrl(panel, -1);
-               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"));
+               textCtrl                                                = new wxTextCtrl(panel, -1, wxEmptyString   ,    wxDefaultPosition, sizeButton);
+               wxButton    *btnAddPoint                = new wxButton( panel, -1, _T("+")          ,   wxDefaultPosition, sizeButton );
+               wxButton    *btnInsertPoint             = new wxButton( panel, -1, _T("(+)")        ,   wxDefaultPosition, sizeButton );//CFT
+               wxButton    *btnSetPositionPoint= new wxButton( panel, -1, _T("Set")        ,   wxDefaultPosition, sizeButton );
+                     cbTrackPoint       = new wxCheckBox(panel,-1, _T("Tra.")       ,   wxDefaultPosition, sizeButton );
+        wxButton    *btnRenamePoint            = new wxButton( panel, -1, _T("Ren.")       ,   wxDefaultPosition, sizeButton );
+        wxButton    *btnErasePoint      = new wxButton( panel, -1, _T("-")          ,   wxDefaultPosition, sizeButton );
+               wxButton    *btnEraseLastPoint  = new wxButton( panel, -1, _T("- lst")      ,   wxDefaultPosition, sizeButton );
+               wxButton    *btnDeleteAllPoints = new wxButton( panel, -1, _T("--")         ,   wxDefaultPosition, sizeButton );
                wxButton    *btnSavePoints              = NULL;
                wxButton    *btnLoadPoints              = NULL;
+                
+        btnAddPoint         -> SetToolTip( _T("+  Add point")          );
+        btnInsertPoint      -> SetToolTip( _T("(-)  Insert point")       );
+        btnErasePoint       -> SetToolTip( _T("-  Erase point")        );
+        btnEraseLastPoint   -> SetToolTip( _T("- lst  Erase last point")   );
+        btnDeleteAllPoints  -> SetToolTip( _T("-- Erase all points")   );
+        
                if ( mtype==0 )
                {
                        btnSavePoints                           = new wxButton( panel, -1, _T("Save points"));
         sizer1->Add(btnRenamePoint);
         sizer2->Add(btnAddPoint);
         sizer2->Add(btnInsertPoint);//CFT
-        sizer3->Add(cbTrackPoint);
         sizer3->Add(btnSetPositionPoint);
+        sizer3->Add(cbTrackPoint);
         sizer4->Add(btnErasePoint);
         sizer4->Add(btnEraseLastPoint);
         sizer4->Add(btnDeleteAllPoints);
@@ -455,16 +466,19 @@ void WidgetShowNPoints::AddVtkPoint()
 //------------------------------------------------------------------------
 void WidgetShowNPoints::AddPoint(int x, int y, int z, std::string label)
 {
+    printf("EED WidgetShowNPoints::OnAddPoint2 Start\n");
        GetModelShowNPoints()->AddPoint(x,y,z, label );
     // EED 2022-05-19
     //AddVtkPoint();
     //RefreshPoint(lstActorsSphere.size()-1);
     GetViewShowNPoints()->AddPoint();
+    printf("EED WidgetShowNPoints::OnAddPoint2 End\n");
 }
 
 //------------------------------------------------------------------------
 void WidgetShowNPoints::InsertPoint(int x, int y, int z, std::string label)//CFT
 {
+    printf("EED WidgetShowNPoints::InsertPoint2 Start\n");
     // EED 2022-05-19
        //if ( GetModelShowNPoints()->InsertPoint(x,y,z,label) != -1 )
        //{
@@ -480,11 +494,13 @@ void WidgetShowNPoints::InsertPoint(int x, int y, int z, std::string label)//CFT
         AddPoint(x,y,z,label);
     }
     GetViewShowNPoints()->RefreshPoints();
+    printf("EED WidgetShowNPoints::InsertPoint2 End\n");
 }
 
 //------------------------------------------------------------------------
 void WidgetShowNPoints::OnInsertPoint_()
 {
+    printf("EED WidgetShowNPoints::InsertPoint_ Start\n");
     // EED 2022-05-19
     //if (this->renderer==NULL)
     if (GetViewShowNPoints()->renderer==NULL)
@@ -500,6 +516,7 @@ void WidgetShowNPoints::OnInsertPoint_()
     } else {//mpoint.size
         printf("creaMaracasVisu::ShowNPoints (not match point) \n");
     }
+    printf("EED WidgetShowNPoints::InsertPoint_ End\n");
 }
 
 
@@ -507,6 +524,7 @@ void WidgetShowNPoints::OnInsertPoint_()
 //------------------------------------------------------------------------
 void WidgetShowNPoints::OnAddPoint_()
 {      
+    printf("EED WidgetShowNPoints::OnAddPoint_ Start\n");
     // EED 2022-05-19
        //if (this->renderer==NULL)
     if (GetViewShowNPoints()->renderer==NULL)
@@ -525,12 +543,15 @@ void WidgetShowNPoints::OnAddPoint_()
        } else {//mpoint.size
                printf("creaMaracasVisu::ShowNPoints (not match point) \n");
        }
+    printf("EED WidgetShowNPoints::OnAddPoint_ End\n");
 }
 
 //------------------------------------------------------------------------
 void WidgetShowNPoints::OnAddPoint (wxCommandEvent& event)
 {
+    printf("EED WidgetShowNPoints::OnAddPoint Start\n");
     OnAddPoint_();
+    printf("EED WidgetShowNPoints::OnAddPoint End\n");
 }
 
 //------------------------------------------------------------------------
@@ -545,7 +566,7 @@ void WidgetShowNPoints::OnInsertPoint (wxCommandEvent& event)//CFT
        {
 //EED          renderer->GetRenderWindow()->Render();
                wxString strTmp;
-               strTmp.Printf(_T("Nbr of points: %d"), GetModelShowNPoints()->GetLstPointsSize() );
+               strTmp.Printf(_T("Nbr pnts: %d"), GetModelShowNPoints()->GetLstPointsSize() );
                txtNrPoints->SetLabel( strTmp );
                //--BBTK