From 5865452b3736c9eab2e7088ceced8d0f047e64e3 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Fri, 16 Jun 2023 17:10:18 +0200 Subject: [PATCH] 3517 ShowNPoints actual Point --- bbtk/bbs/boxes/MeshContours.bbg | 44 +++- bbtk/bbs/boxes/MeshContours.bbs | 10 +- bbtk/bbs/boxes/MeshContours_Interface.bbg | 34 ++- bbtk/bbs/boxes/MeshContours_Interface.bbs | 9 +- bbtk/bbs/boxes/MeshContours_Widget.bbg | 7 +- bbtk/bbs/boxes/MeshContours_Widget.bbs | 1 + bbtk/bbs/boxes/Mesh_Application.bbg | 229 +++++++++--------- bbtk/bbs/boxes/Mesh_Application.bbs | 62 ++--- bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg | 162 +++++++++++-- bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs | 53 +++- bbtk/bbs/boxes/PolyDataToActor_Widget.bbg | 12 +- bbtk/bbs/boxes/PolyDataToActor_Widget.bbs | 4 +- .../bbcreaMaracasVisuShowNPoints_Tools.cxx | 63 ++++- bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.h | 1 + .../wxWindows/widgets/ModelShowNPoints.cxx | 25 +- .../wxWindows/widgets/ModelShowNPoints.h | 7 +- .../wxWindows/widgets/ViewShowNPoints.cxx | 11 +- .../wxWindows/widgets/ViewShowNPoints.h | 2 + .../wxWindows/widgets/WidgetShowNPoints.cxx | 52 +++- .../wxWindows/widgets/WidgetShowNPoints.h | 28 +-- 20 files changed, 569 insertions(+), 247 deletions(-) diff --git a/bbtk/bbs/boxes/MeshContours.bbg b/bbtk/bbs/boxes/MeshContours.bbg index f19cee2..2a16b40 100644 --- a/bbtk/bbs/boxes/MeshContours.bbg +++ b/bbtk/bbs/boxes/MeshContours.bbg @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.5 BBG BlackBox Diagram file -# - /Users/davila/Creatis/C22/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/MeshContours.bbg +# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/MeshContours.bbg # ---------------------------------- APP_START @@ -11,7 +11,7 @@ COMPLEXBOX:TRUE COMPLEXBOXNAME:MeshContours PACKAGENAME:creaMaracasVisu COMPLEXOUTPUTS:0 -COMPLEXINPUTS:11 +COMPLEXINPUTS:12 COMPLEX_PORT polydata -230.861513:-13.494768:-900.000000 @@ -56,7 +56,11 @@ COMPLEX_PORT colorForMesh -46.834044:-8.364276:-900.000000 FIN_COMPLEX_PORT -BOXES:30 +COMPLEX_PORT +lineWidth +-68.621610:-10.973579:-900.000000 +FIN_COMPLEX_PORT +BOXES:31 BOX creaVtk:Cutter:Box22 ISEXEC:FALSE @@ -153,7 +157,7 @@ BOX creaMaracasVisu:wxVtkBaseView_Info:Box35 ISEXEC:FALSE -139.080784:-47.612451:-900.000000 --116.465784:-50.112451:-900.000000 +-111.800784:-50.112451:-900.000000 FIN_BOX BOX std:MagicBox:Box36 @@ -171,19 +175,19 @@ BOX creaMaracasVisu:wxVtkBaseView_Info:Box39 ISEXEC:FALSE -103.447021:-49.610017:-900.000000 --80.832021:-52.110017:-900.000000 +-76.167021:-52.110017:-900.000000 FIN_BOX BOX creaMaracasVisu:wxVtkBaseView_Info:Box40 ISEXEC:FALSE -69.513133:-46.919231:-900.000000 --46.898133:-49.419231:-900.000000 +-42.233133:-49.419231:-900.000000 FIN_BOX BOX creaMaracasVisu:wxVtkBaseView_Info:Box44 ISEXEC:FALSE -11.979547:-46.964556:-900.000000 -10.635453:-49.464556:-900.000000 +15.300453:-49.464556:-900.000000 FIN_BOX BOX vtk:PolyDataToActor:Box48 @@ -289,7 +293,13 @@ ISEXEC:FALSE -38.591456:-70.028246:-900.000000 -16.991456:-72.528246:-900.000000 FIN_BOX -CONNECTIONS:72 +BOX +std:MagicBox:Box51 +ISEXEC:FALSE +-64.634469:-27.918927:-900.000000 +-43.034469:-30.418927:-900.000000 +FIN_BOX +CONNECTIONS:78 CONNECTION Box23:Out:Box22:ImplicitFunction NumberOfControlPoints:0 @@ -506,4 +516,22 @@ NumberOfControlPoints:0 CONNECTION Box47:Out:Box50:Colour NumberOfControlPoints:0 +CONNECTION +lineWidth:lineWidth:Box51:In +NumberOfControlPoints:0 +CONNECTION +Box51:Out:Box24:LineWidth +NumberOfControlPoints:0 +CONNECTION +Box51:Out:Box31:LineWidth +NumberOfControlPoints:0 +CONNECTION +Box51:Out:Box34:LineWidth +NumberOfControlPoints:0 +CONNECTION +Box51:Out:Box50:LineWidth +NumberOfControlPoints:0 +CONNECTION +Box51:Out:Box49:LineWidth +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/MeshContours.bbs b/bbtk/bbs/boxes/MeshContours.bbs index 9dd4dcc..d537a38 100644 --- a/bbtk/bbs/boxes/MeshContours.bbs +++ b/bbtk/bbs/boxes/MeshContours.bbs @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.5 BBS BlackBox Script (Complex Box) -# - /Users/davila/Creatis/C22/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/MeshContours.bbs +# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/MeshContours.bbs # ---------------------------------- include std @@ -103,6 +103,8 @@ new std:MagicBox Box46 new std:MagicBox Box47 +new std:MagicBox Box51 + connect Box23.Out Box22.ImplicitFunction connect Box22.BoxChange Box24.BoxExecute @@ -165,6 +167,11 @@ connect Box47.Out Box34.Colour connect Box47.Out Box48.Colour connect Box47.Out Box49.Colour connect Box47.Out Box50.Colour +connect Box51.Out Box24.LineWidth +connect Box51.Out Box31.LineWidth +connect Box51.Out Box34.LineWidth +connect Box51.Out Box50.LineWidth +connect Box51.Out Box49.LineWidth # Complex input ports input polydata Box38.In " " @@ -178,6 +185,7 @@ input opacity3 Box69.In " " input opacity1 Box68.In " " input activeContour Box46.In " " input colorForMesh Box47.In " " +input lineWidth Box51.In " " # Complex output ports diff --git a/bbtk/bbs/boxes/MeshContours_Interface.bbg b/bbtk/bbs/boxes/MeshContours_Interface.bbg index b196e4e..f886295 100644 --- a/bbtk/bbs/boxes/MeshContours_Interface.bbg +++ b/bbtk/bbs/boxes/MeshContours_Interface.bbg @@ -10,7 +10,7 @@ AUTHOR:Author ?? COMPLEXBOX:TRUE COMPLEXBOXNAME:MeshContours_Interface PACKAGENAME:creaMaracasVisu -COMPLEXOUTPUTS:2 +COMPLEXOUTPUTS:3 COMPLEX_PORT widget -69.516706:-21.006612:-900.000000 @@ -19,15 +19,19 @@ COMPLEX_PORT active -89.058002:-21.047792:-900.000000 FIN_COMPLEX_PORT +COMPLEX_PORT +LineWidth +-24.040895:-23.017879:-900.000000 +FIN_COMPLEX_PORT COMPLEXINPUTS:0 -BOXES:2 +BOXES:3 BOX wx:LayoutLine:Box54 ISEXEC:FALSE --70.227266:-8.900106:-900.000000 --36.907266:-11.400106:-900.000000 +-75.444652:-2.045893:-900.000000 +-42.124652:-4.545893:-900.000000 PORT -Orientation:"V" +Orientation:"H" FIN_BOX BOX wx:CheckBox:Box07 @@ -39,7 +43,19 @@ In:"false" PORT Title:"Contour" FIN_BOX -CONNECTIONS:3 +BOX +wx:ComboBox:Box02 +ISEXEC:FALSE +-59.846484:20.664940:-900.000000 +-33.566484:18.164940:-900.000000 +PORT +In:"0.5 1.0 1.5 2.0 2.5" +PORT +Selection:"1" +PORT +Title:"Line width " +FIN_BOX +CONNECTIONS:5 CONNECTION Box54:Widget:widget:widget NumberOfControlPoints:0 @@ -49,4 +65,10 @@ NumberOfControlPoints:0 CONNECTION Box07:Out:active:active NumberOfControlPoints:0 +CONNECTION +Box02:Widget:Box54:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box02:OutString:LineWidth:LineWidth +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/MeshContours_Interface.bbs b/bbtk/bbs/boxes/MeshContours_Interface.bbs index 9f0e319..59d28ca 100644 --- a/bbtk/bbs/boxes/MeshContours_Interface.bbs +++ b/bbtk/bbs/boxes/MeshContours_Interface.bbs @@ -15,20 +15,27 @@ description "Description ??" category "" new wx:LayoutLine Box54 - set Box54.Orientation "V" + set Box54.Orientation "H" new wx:CheckBox Box07 set Box07.In "false" set Box07.Title "Contour" +new wx:ComboBox Box02 + set Box02.In "0.5 1.0 1.5 2.0 2.5" + set Box02.Selection "1" + set Box02.Title "Line width " + connect Box07.Widget Box54.Widget3 +connect Box02.Widget Box54.Widget4 # Complex input ports # Complex output ports output widget Box54.Widget " " output active Box07.Out " " +output LineWidth Box02.OutString " " endefine diff --git a/bbtk/bbs/boxes/MeshContours_Widget.bbg b/bbtk/bbs/boxes/MeshContours_Widget.bbg index ee9c057..54ac950 100644 --- a/bbtk/bbs/boxes/MeshContours_Widget.bbg +++ b/bbtk/bbs/boxes/MeshContours_Widget.bbg @@ -95,7 +95,7 @@ BOX creaMaracasVisu:MeshContours:Box53 ISEXEC:FALSE -81.898085:-25.835690:-900.000000 --59.883085:-28.335690:-900.000000 +-59.138085:-28.335690:-900.000000 FIN_BOX BOX std:MagicBox:Box08 @@ -111,7 +111,7 @@ ISEXEC:FALSE PORT In1:"1" FIN_BOX -CONNECTIONS:20 +CONNECTIONS:21 CONNECTION _polydata:_polydata:Box38:In NumberOfControlPoints:0 @@ -172,4 +172,7 @@ NumberOfControlPoints:0 CONNECTION Box09:Out:Box53:opacity3 NumberOfControlPoints:0 +CONNECTION +Box52:LineWidth:Box53:lineWidth +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/MeshContours_Widget.bbs b/bbtk/bbs/boxes/MeshContours_Widget.bbs index 5095836..5de0324 100644 --- a/bbtk/bbs/boxes/MeshContours_Widget.bbs +++ b/bbtk/bbs/boxes/MeshContours_Widget.bbs @@ -48,6 +48,7 @@ connect Box08.Out Box53.colorForMesh connect Box09.Out Box53.opacity1 connect Box09.Out Box53.opacity2 connect Box09.Out Box53.opacity3 +connect Box52.LineWidth Box53.lineWidth # Complex input ports input _polydata Box38.In " " diff --git a/bbtk/bbs/boxes/Mesh_Application.bbg b/bbtk/bbs/boxes/Mesh_Application.bbg index 5424f3e..acbe428 100644 --- a/bbtk/bbs/boxes/Mesh_Application.bbg +++ b/bbtk/bbs/boxes/Mesh_Application.bbg @@ -103,7 +103,7 @@ ISEXEC:FALSE -96.149542:-151.649281:-900.000000 -73.389542:-154.149281:-900.000000 PORT -Proportion:"5" +Proportion:"2" FIN_BOX BOX wx:LayoutTab:Box12 @@ -142,12 +142,10 @@ FIN_BOX BOX wx:LayoutLine:Box22 ISEXEC:FALSE --100.046840:-134.742726:-900.000000 --66.726840:-137.242726:-900.000000 +-97.560494:-121.427293:-900.000000 +-64.240494:-123.927293:-900.000000 PORT Orientation:"H" -PORT -WinTitle:"Final Surface (Red)" FIN_BOX BOX std:StringSelect:Box23 @@ -198,8 +196,8 @@ FIN_BOX BOX wx:RadioButton:Box27 ISEXEC:FALSE --138.054594:54.648057:-900.000000 --101.214594:52.148057:-900.000000 +-136.423491:61.172469:-900.000000 +-99.583491:58.672469:-900.000000 PORT In0:"Red" PORT @@ -210,8 +208,8 @@ FIN_BOX BOX std:MultipleInputs:Box28 ISEXEC:FALSE --155.246087:44.364360:-900.000000 --133.276087:41.864360:-900.000000 +-163.039135:42.008322:-900.000000 +-141.069135:39.508322:-900.000000 FIN_BOX BOX std:StringSelect:Box29 @@ -260,6 +258,8 @@ wx:LayoutLine:Box34 ISEXEC:FALSE -208.241265:-123.706763:-900.000000 -174.921265:-126.206763:-900.000000 +PORT +Orientation:"H" FIN_BOX BOX creaMaracasVisu:Mesh_tool_ApplyPatch:Box38 @@ -279,7 +279,7 @@ I:"3" FIN_BOX BOX creaMaracasVisu:InteractorStyleMaracas_Model:Box40 -ISEXEC:FALSE +ISEXEC:TRUE 0.663111:-61.902197:-900.000000 24.268111:-64.402197:-900.000000 FIN_BOX @@ -350,8 +350,8 @@ FIN_BOX BOX wx:LayoutLine:Box53 ISEXEC:FALSE --190.138796:-112.361388:-900.000000 --156.818796:-114.861388:-900.000000 +-274.774920:-87.894842:-900.000000 +-241.454920:-90.394842:-900.000000 PORT Orientation:"H" FIN_BOX @@ -510,76 +510,58 @@ FIN_BOX BOX wx:ComboBox:Box79 ISEXEC:FALSE --85.589848:-67.299862:-900.000000 --59.309848:-69.799862:-900.000000 +-27.870668:-72.011937:-900.000000 +-1.590668:-74.511937:-900.000000 PORT In:"mesh-0" FIN_BOX BOX -wx:LayoutLine:Box80 -ISEXEC:FALSE --79.472229:-115.939174:-900.000000 --46.152229:-118.439174:-900.000000 -PORT -Orientation:"V" -PORT -WinTitle:"Mesh Config" -FIN_BOX -BOX creaVtk:MeshManager_tool:Box81 ISEXEC:FALSE --84.539369:-82.007375:-900.000000 --62.039369:-84.507375:-900.000000 +-27.269529:-86.719450:-900.000000 +-4.769529:-89.219450:-900.000000 PORT Tool:"60" FIN_BOX BOX wx:CommandButton:Box82 ISEXEC:FALSE --54.104969:-68.146929:-900.000000 --31.829969:-70.646929:-900.000000 +8.420647:-70.684200:-900.000000 +30.695647:-73.184200:-900.000000 PORT Label:"Delete" FIN_BOX BOX creaVtk:MeshManager_tool:Box83 ISEXEC:FALSE --53.174681:-82.171509:-900.000000 --30.674681:-84.671509:-900.000000 +-58.792925:-83.258911:-900.000000 +-36.292925:-85.758911:-900.000000 PORT BoxProcessMode:"Manual" PORT Tool:"70" FIN_BOX BOX -wx:LayoutLine:Box84 -ISEXEC:FALSE --35.086647:-98.966020:-900.000000 --1.766647:-101.466020:-900.000000 -PORT -Orientation:"H" -FIN_BOX -BOX wx:CommandButton:Box85 ISEXEC:FALSE --22.542057:-68.700255:-900.000000 --0.267057:-71.200255:-900.000000 +26.107950:-69.858054:-900.000000 +48.382950:-72.358054:-900.000000 PORT Label:"Undo" FIN_BOX BOX wx:CommandButton:Box86 ISEXEC:FALSE -3.778195:-69.777846:-900.000000 -26.053195:-72.277846:-900.000000 +51.080183:-72.133884:-900.000000 +73.355183:-74.633884:-900.000000 PORT Label:"Redo" FIN_BOX BOX creaVtk:MeshManager_tool:Box87 ISEXEC:FALSE --25.023634:-81.643019:-900.000000 --2.523634:-84.143019:-900.000000 +22.278354:-83.999057:-900.000000 +44.778354:-86.499057:-900.000000 PORT BoxProcessMode:"Manual" PORT @@ -588,34 +570,26 @@ FIN_BOX BOX creaVtk:MeshManager_tool:Box88 ISEXEC:FALSE -3.922083:-81.574295:-900.000000 -26.422083:-84.074295:-900.000000 +51.224071:-83.930333:-900.000000 +73.724071:-86.430333:-900.000000 PORT BoxProcessMode:"Manual" PORT Tool:"20" FIN_BOX BOX -wx:LayoutLine:Box89 -ISEXEC:FALSE --76.520810:-98.890592:-900.000000 --43.200810:-101.390592:-900.000000 -PORT -Orientation:"H" -FIN_BOX -BOX creaVtk:PolyDataConnectivityFilter:Box90 ISEXEC:FALSE -37.254790:-70.800712:-900.000000 -60.424790:-73.300712:-900.000000 +-62.604963:-86.749275:-900.000000 +-39.434963:-89.249275:-900.000000 PORT Type:"1" FIN_BOX BOX creaVtk:MeshManager_tool:Box91 ISEXEC:FALSE -63.294257:-84.265994:-900.000000 -85.794257:-86.765994:-900.000000 +-67.375220:-91.515341:-900.000000 +-44.875220:-94.015341:-900.000000 PORT BoxProcessMode:"Manual" PORT @@ -624,20 +598,12 @@ FIN_BOX BOX wx:CommandButton:Box92 ISEXEC:FALSE -35.604734:-79.716817:-900.000000 -57.879734:-82.216817:-900.000000 +-67.335991:-70.655133:-900.000000 +-45.060991:-73.155133:-900.000000 PORT Label:"Split Meshes" FIN_BOX BOX -wx:LayoutLine:Box93 -ISEXEC:FALSE -11.116893:-92.602027:-900.000000 -44.436893:-95.102027:-900.000000 -PORT -Orientation:"H" -FIN_BOX -BOX vtk:AppendPolyData:Box94 ISEXEC:FALSE -45.393590:-134.654487:-900.000000 @@ -655,7 +621,41 @@ ISEXEC:FALSE 332.054005:75.644815:-900.000000 353.654005:73.144815:-900.000000 FIN_BOX -CONNECTIONS:199 +BOX +wx:LayoutLine:Box97 +ISEXEC:FALSE +-6.713577:-110.628162:-900.000000 +26.606423:-113.128162:-900.000000 +PORT +Orientation:"H" +FIN_BOX +BOX +wx:LayoutLine:Box98 +ISEXEC:FALSE +-88.847724:-135.992073:-900.000000 +-55.527724:-138.492073:-900.000000 +PORT +Orientation:"V" +PORT +WinTitle:"Final Surface (Red)" +FIN_BOX +BOX +wx:LayoutLine:Box99 +ISEXEC:FALSE +-216.714240:-107.013976:-900.000000 +-183.394240:-109.513976:-900.000000 +FIN_BOX +BOX +wx:ComboBox:Box100 +ISEXEC:FALSE +-191.967568:54.056410:-900.000000 +-165.687568:51.556410:-900.000000 +PORT +In:"Red JET B&W" +PORT +Title:"Surface Texture" +FIN_BOX +CONNECTIONS:198 CONNECTION Box08:MeshBase:Box15:polydata NumberOfControlPoints:0 @@ -717,18 +717,9 @@ CONNECTION Box07:Out:Box26:Image NumberOfControlPoints:0 CONNECTION -Box27:BoxChange:Box28:In2 -NumberOfControlPoints:0 -CONNECTION -Box27:Out:Box29:In -NumberOfControlPoints:0 -CONNECTION Box29:Out:Box15:scalarvisibility NumberOfControlPoints:0 CONNECTION -Box27:Out:Box30:In1 -NumberOfControlPoints:0 -CONNECTION Box30:Out:Box26:ColorType NumberOfControlPoints:0 CONNECTION @@ -750,9 +741,6 @@ CONNECTION Box31:BoxChange:Box26:BoxExecute NumberOfControlPoints:0 CONNECTION -Box27:Widget:Box34:Widget2 -NumberOfControlPoints:0 -CONNECTION Box34:Widget:Box22:Widget2 NumberOfControlPoints:0 CONNECTION @@ -795,9 +783,6 @@ CONNECTION Box15:widget:Box22:Widget6 NumberOfControlPoints:0 CONNECTION -Box22:Widget:Box20:Widget2 -NumberOfControlPoints:0 -CONNECTION Box07:Out:Box46:image NumberOfControlPoints:0 CONNECTION @@ -864,12 +849,6 @@ CONNECTION Box12:BoxChange:Box57:BoxExecute NumberOfControlPoints:0 CONNECTION -Box53:Widget:Box34:Widget6 -NumberOfControlPoints:0 -CONNECTION -Box54:Widget:Box34:Widget4 -NumberOfControlPoints:0 -CONNECTION Box48:BoxChange:Box59:BoxExecute NumberOfControlPoints:0 CONNECTION @@ -1164,9 +1143,6 @@ CONNECTION Box08:MeshNames:Box79:In NumberOfControlPoints:0 CONNECTION -Box80:Widget:Box20:Widget4 -NumberOfControlPoints:0 -CONNECTION Box08:BoxChange:Box79:BoxExecute NumberOfControlPoints:0 CONNECTION @@ -1185,12 +1161,6 @@ CONNECTION Box08:MeshManagerModel:Box83:MeshManagerModel NumberOfControlPoints:0 CONNECTION -Box85:Widget:Box84:Widget2 -NumberOfControlPoints:0 -CONNECTION -Box86:Widget:Box84:Widget4 -NumberOfControlPoints:0 -CONNECTION Box85:BoxChange:Box87:BoxExecute NumberOfControlPoints:0 CONNECTION @@ -1203,54 +1173,81 @@ CONNECTION Box08:MeshManagerModel:Box88:MeshManagerModel NumberOfControlPoints:0 CONNECTION -Box79:Widget:Box89:Widget2 +Box90:Out:Box91:Meshes NumberOfControlPoints:0 CONNECTION -Box89:Widget:Box80:Widget2 +Box08:MeshManagerModel:Box91:MeshManagerModel NumberOfControlPoints:0 CONNECTION -Box84:Widget:Box80:Widget4 +Box08:MeshTemp:Box90:In NumberOfControlPoints:0 CONNECTION -Box90:Out:Box91:Meshes +Box92:BoxChange:Box91:BoxExecute NumberOfControlPoints:0 CONNECTION -Box08:MeshManagerModel:Box91:MeshManagerModel +Box08:AllPolyDatas:Box94:InVector NumberOfControlPoints:0 CONNECTION -Box08:MeshTemp:Box90:In +Box94:Out:MeshOut:MeshOut NumberOfControlPoints:0 CONNECTION -Box92:BoxChange:Box91:BoxExecute +Box08:MeshSelection:Box79:Selection NumberOfControlPoints:0 CONNECTION -Box93:Widget:Box89:Widget3 +BaseImageFileName_ExMa:BaseImageFileName_ExMa:Box95:In NumberOfControlPoints:0 CONNECTION -Box92:Widget:Box93:Widget2 +OutDir_ExMa:OutDir_ExMa:Box96:In NumberOfControlPoints:0 CONNECTION -Box82:Widget:Box93:Widget4 +Box95:Out:Box73:BaseImageFileName NumberOfControlPoints:0 CONNECTION -Box08:AllPolyDatas:Box94:InVector +Box96:Out:Box73:OutDir NumberOfControlPoints:0 CONNECTION -Box94:Out:MeshOut:MeshOut +Box97:Widget:Box98:Widget3 NumberOfControlPoints:0 CONNECTION -Box08:MeshSelection:Box79:Selection +Box98:Widget:Box20:Widget1 NumberOfControlPoints:0 CONNECTION -BaseImageFileName_ExMa:BaseImageFileName_ExMa:Box95:In +Box82:Widget:Box97:Widget5 NumberOfControlPoints:0 CONNECTION -OutDir_ExMa:OutDir_ExMa:Box96:In +Box85:Widget:Box97:Widget7 NumberOfControlPoints:0 CONNECTION -Box95:Out:Box73:BaseImageFileName +Box86:Widget:Box97:Widget8 NumberOfControlPoints:0 CONNECTION -Box96:Out:Box73:OutDir +Box22:Widget:Box98:Widget5 +NumberOfControlPoints:0 +CONNECTION +Box54:Widget:Box99:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box53:Widget:Box99:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box99:Widget:Box34:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box100:BoxChange:Box28:In1 +NumberOfControlPoints:0 +CONNECTION +Box100:Out:Box30:In1 +NumberOfControlPoints:0 +CONNECTION +Box100:Out:Box29:In +NumberOfControlPoints:0 +CONNECTION +Box100:Widget:Box34:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box92:Widget:Box97:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box79:Widget:Box97:Widget3 NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_Application.bbs b/bbtk/bbs/boxes/Mesh_Application.bbs index 6e018ce..fa5ff67 100644 --- a/bbtk/bbs/boxes/Mesh_Application.bbs +++ b/bbtk/bbs/boxes/Mesh_Application.bbs @@ -31,7 +31,7 @@ new creaMaracasVisu:Mesh_tool_ApplySurface Box10 set Box10.title "Surface" new wx:LayoutSplit Box11 - set Box11.Proportion "5" + set Box11.Proportion "2" new wx:LayoutTab Box12 @@ -47,7 +47,6 @@ new wx:LayoutTab Box20 new wx:LayoutLine Box22 set Box22.Orientation "H" - set Box22.WinTitle "Final Surface (Red)" new std:StringSelect Box23 set Box23.In0 "false false false false false false" @@ -92,6 +91,7 @@ new std:GetVectorDoubleElement Box33 set Box33.I "0" new wx:LayoutLine Box34 + set Box34.Orientation "H" new creaMaracasVisu:Mesh_tool_ApplyPatch Box38 set Box38.title "Patch" @@ -186,10 +186,6 @@ new creaMaracasVisu:InteractorStyleMaracas_Model Box76 new wx:ComboBox Box79 set Box79.In "mesh-0" -new wx:LayoutLine Box80 - set Box80.Orientation "V" - set Box80.WinTitle "Mesh Config" - new creaVtk:MeshManager_tool Box81 set Box81.Tool "60" @@ -200,9 +196,6 @@ new creaVtk:MeshManager_tool Box83 set Box83.BoxProcessMode "Manual" set Box83.Tool "70" -new wx:LayoutLine Box84 - set Box84.Orientation "H" - new wx:CommandButton Box85 set Box85.Label "Undo" @@ -217,9 +210,6 @@ new creaVtk:MeshManager_tool Box88 set Box88.BoxProcessMode "Manual" set Box88.Tool "20" -new wx:LayoutLine Box89 - set Box89.Orientation "H" - new creaVtk:PolyDataConnectivityFilter Box90 set Box90.Type "1" @@ -230,15 +220,25 @@ new creaVtk:MeshManager_tool Box91 new wx:CommandButton Box92 set Box92.Label "Split Meshes" -new wx:LayoutLine Box93 - set Box93.Orientation "H" - new vtk:AppendPolyData Box94 new std:MagicBox Box95 new std:MagicBox Box96 +new wx:LayoutLine Box97 + set Box97.Orientation "H" + +new wx:LayoutLine Box98 + set Box98.Orientation "V" + set Box98.WinTitle "Final Surface (Red)" + +new wx:LayoutLine Box99 + +new wx:ComboBox Box100 + set Box100.In "Red JET B&W" + set Box100.Title "Surface Texture" + connect Box08.MeshBase Box15.polydata connect Box08.MeshTemp Box10.mesh @@ -260,10 +260,7 @@ connect Box24.Out Box25.Active connect Box12.BoxChange Box25.BoxExecute connect Box08.MeshBase Box26.Mesh connect Box07.Out Box26.Image -connect Box27.BoxChange Box28.In2 -connect Box27.Out Box29.In connect Box29.Out Box15.scalarvisibility -connect Box27.Out Box30.In1 connect Box30.Out Box26.ColorType connect Box31.WindowColorLevel Box32.In connect Box31.WindowColorLevel Box33.In @@ -271,7 +268,6 @@ connect Box33.Out Box26.ColorWindow connect Box32.Out Box26.ColorLevel connect Box28.BoxChange Box31.BoxExecute connect Box31.BoxChange Box26.BoxExecute -connect Box27.Widget Box34.Widget2 connect Box34.Widget Box22.Widget2 connect Box07.Out Box38.image connect Box08.MeshTemp Box38.mesh @@ -286,7 +282,6 @@ connect Box38.interactorStyleMaracas3 Box40.InteractorStyleMaracas3 connect Box38.interactorStyleMaracas4 Box40.InteractorStyleMaracas4 connect Box17._widget Box22.Widget4 connect Box15.widget Box22.Widget6 -connect Box22.Widget Box20.Widget2 connect Box07.Out Box46.image connect Box08.MeshTemp Box46.mesh connect Box08.MeshManagerModel Box46.meshmanagermodel @@ -309,8 +304,6 @@ connect Box47.ExportIsActive_concatstring_tool Box57.Box_ConcatString connect Box23.Out Box58.In connect Box58.Out Box57.In1 connect Box12.BoxChange Box57.BoxExecute -connect Box53.Widget Box34.Widget6 -connect Box54.Widget Box34.Widget4 connect Box48.BoxChange Box59.BoxExecute connect Box60.Out Box59.Point connect Box48.Center Box60.In0 @@ -399,33 +392,39 @@ connect Box74.interactorStyleMaracas4 Box76.InteractorStyleMaracas4 connect Box12.BoxChange Box76.BoxExecute connect Box56.Out Box08.Mesh connect Box08.MeshNames Box79.In -connect Box80.Widget Box20.Widget4 connect Box08.BoxChange Box79.BoxExecute connect Box79.OutString Box81.StringParam connect Box08.MeshManagerModel Box81.MeshManagerModel connect Box79.BoxChange Box81.BoxExecute connect Box82.BoxChange Box83.BoxExecute connect Box08.MeshManagerModel Box83.MeshManagerModel -connect Box85.Widget Box84.Widget2 -connect Box86.Widget Box84.Widget4 connect Box85.BoxChange Box87.BoxExecute connect Box86.BoxChange Box88.BoxExecute connect Box08.MeshManagerModel Box87.MeshManagerModel connect Box08.MeshManagerModel Box88.MeshManagerModel -connect Box79.Widget Box89.Widget2 -connect Box89.Widget Box80.Widget2 -connect Box84.Widget Box80.Widget4 connect Box90.Out Box91.Meshes connect Box08.MeshManagerModel Box91.MeshManagerModel connect Box08.MeshTemp Box90.In connect Box92.BoxChange Box91.BoxExecute -connect Box93.Widget Box89.Widget3 -connect Box92.Widget Box93.Widget2 -connect Box82.Widget Box93.Widget4 connect Box08.AllPolyDatas Box94.InVector connect Box08.MeshSelection Box79.Selection connect Box95.Out Box73.BaseImageFileName connect Box96.Out Box73.OutDir +connect Box97.Widget Box98.Widget3 +connect Box98.Widget Box20.Widget1 +connect Box82.Widget Box97.Widget5 +connect Box85.Widget Box97.Widget7 +connect Box86.Widget Box97.Widget8 +connect Box22.Widget Box98.Widget5 +connect Box54.Widget Box99.Widget2 +connect Box53.Widget Box99.Widget4 +connect Box99.Widget Box34.Widget4 +connect Box100.BoxChange Box28.In1 +connect Box100.Out Box30.In1 +connect Box100.Out Box29.In +connect Box100.Widget Box34.Widget2 +connect Box92.Widget Box97.Widget1 +connect Box79.Widget Box97.Widget3 # Complex input ports input MeshIn Box56.In " " @@ -444,5 +443,6 @@ input OutDir_ExMa Box96.In " " output WidgetOut Box11.Widget " " output MeshOut Box94.Out " " +exec Box40 endefine diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg index 6993ce1..48bb2dd 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg +++ b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.5 BBG BlackBox Diagram file -# - /home/garzon/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg +# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg # ---------------------------------- APP_START @@ -72,7 +72,7 @@ COMPLEX_PORT meshmanagermodel -150.374274:130.740991:-900.000000 FIN_COMPLEX_PORT -BOXES:76 +BOXES:86 BOX creaMaracasVisu:ShowNPoints:showNpoints ISEXEC:FALSE @@ -538,8 +538,8 @@ FIN_BOX BOX wx:CheckBox:Box103 ISEXEC:FALSE --8.508716:70.854467:-900.000000 -13.231284:68.354467:-900.000000 +-4.060253:69.042130:-900.000000 +17.679747:66.542130:-900.000000 PORT In:"false" PORT @@ -568,8 +568,8 @@ FIN_BOX BOX wx:CheckBox:Box106 ISEXEC:FALSE --30.494323:65.542456:-900.000000 --8.754323:63.042456:-900.000000 +-27.858197:70.649950:-900.000000 +-6.118197:68.149950:-900.000000 PORT In:"true" PORT @@ -672,8 +672,8 @@ FIN_BOX BOX wx:LayoutLine:Box118 ISEXEC:FALSE -101.734821:-52.151474:-900.000000 -135.054821:-54.651474:-900.000000 +94.757325:-47.167548:-900.000000 +128.077325:-49.667548:-900.000000 PORT Orientation:"H" FIN_BOX @@ -700,14 +700,96 @@ FIN_BOX BOX wx:LayoutLine:Box121 ISEXEC:FALSE -76.461485:-66.685249:-900.000000 -109.781485:-69.185249:-900.000000 +100.845652:-78.053543:-900.000000 +134.165652:-80.553543:-900.000000 PORT Orientation:"V" PORT WinTitle:"1.1 Splines" FIN_BOX -CONNECTIONS:159 +BOX +creaMaracasVisu:ShowNPoints_Tools:Box122 +ISEXEC:FALSE +165.760712:-38.975325:-900.000000 +188.305712:-41.475325:-900.000000 +PORT +BoxProcessMode:"Manual" +PORT +Params:"-1" +PORT +Type:"235" +FIN_BOX +BOX +wx:CommandButton:Box123 +ISEXEC:FALSE +183.417828:-15.486335:-900.000000 +205.802828:-17.986335:-900.000000 +PORT +Label:"<" +FIN_BOX +BOX +wx:LayoutLine:Box124 +ISEXEC:FALSE +167.780189:-48.474560:-900.000000 +201.100189:-50.974560:-900.000000 +PORT +Orientation:"H" +FIN_BOX +BOX +wx:CommandButton:Box125 +ISEXEC:FALSE +213.626968:-15.674057:-900.000000 +236.011968:-18.174057:-900.000000 +PORT +Label:">" +FIN_BOX +BOX +creaMaracasVisu:ShowNPoints_Tools:Box126 +ISEXEC:FALSE +201.397560:-38.846935:-900.000000 +223.942560:-41.346935:-900.000000 +PORT +BoxProcessMode:"Manual" +PORT +Params:"1" +PORT +Type:"235" +FIN_BOX +BOX +wx:LayoutLine:Box127 +ISEXEC:FALSE +-46.207243:29.221590:-900.000000 +-12.887243:26.721590:-900.000000 +PORT +Orientation:"H" +FIN_BOX +BOX +wx:OutputText:Box128 +ISEXEC:FALSE +120.937187:-68.167658:-900.000000 +142.717187:-70.667658:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box129 +ISEXEC:FALSE +125.385650:-72.286605:-900.000000 +147.165650:-74.786605:-900.000000 +FIN_BOX +BOX +wx:LayoutLine:Box130 +ISEXEC:FALSE +108.922083:-61.432768:-900.000000 +142.242083:-63.932768:-900.000000 +PORT +Orientation:"V" +FIN_BOX +BOX +wx:OutputText:Box131 +ISEXEC:FALSE +-17.624192:-45.101554:-900.000000 +4.155808:-47.601554:-900.000000 +FIN_BOX +CONNECTIONS:171 CONNECTION Box06:LstContourPointsX:Box04:LstX NumberOfControlPoints:0 @@ -1078,18 +1160,12 @@ CONNECTION Box105:Out:Box104:In NumberOfControlPoints:0 CONNECTION -Box106:Widget:Box50:Widget7 -NumberOfControlPoints:0 -CONNECTION Box106:Out:Box04:CloseSurface NumberOfControlPoints:0 CONNECTION Box106:BoxChange:Box31:In7 NumberOfControlPoints:0 CONNECTION -Box103:Widget:Box50:Widget8 -NumberOfControlPoints:0 -CONNECTION Box109:Out:Box108:In NumberOfControlPoints:0 CONNECTION @@ -1102,9 +1178,6 @@ CONNECTION Box110:Out:Box112:In NumberOfControlPoints:0 CONNECTION -Box108:Widget:Box50:Widget5 -NumberOfControlPoints:0 -CONNECTION Box111:Out:Box06:OpenClose NumberOfControlPoints:0 CONNECTION @@ -1180,9 +1253,54 @@ CONNECTION showNpoints:Widget:Box121:Widget1 NumberOfControlPoints:0 CONNECTION -Box118:Widget:Box121:Widget2 +Box121:Widget:Box86:Widget2 NumberOfControlPoints:0 CONNECTION -Box121:Widget:Box86:Widget2 +Box123:BoxChange:Box122:BoxExecute +NumberOfControlPoints:0 +CONNECTION +Box123:Widget:Box124:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box125:Widget:Box124:Widget3 +NumberOfControlPoints:0 +CONNECTION +Box125:BoxChange:Box126:BoxExecute +NumberOfControlPoints:0 +CONNECTION +showNpoints:WidgetShowNPoints:Box122:WidgetShowNPoints +NumberOfControlPoints:0 +CONNECTION +showNpoints:WidgetShowNPoints:Box126:WidgetShowNPoints +NumberOfControlPoints:0 +CONNECTION +Box108:Widget:Box127:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box127:Widget:Box50:Widget6 +NumberOfControlPoints:0 +CONNECTION +Box118:Widget:Box130:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box124:Widget:Box130:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box130:Widget:Box121:Widget3 +NumberOfControlPoints:0 +CONNECTION +Box106:Widget:Box127:Widget5 +NumberOfControlPoints:0 +CONNECTION +Box103:Widget:Box50:Widget7 +NumberOfControlPoints:0 +CONNECTION +Box131:Widget:Box50:Widget9 +NumberOfControlPoints:0 +CONNECTION +Box129:Widget:Box121:Widget9 +NumberOfControlPoints:0 +CONNECTION +Box128:Widget:Box121:Widget8 NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs index bbfe251..9548fea 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.5 BBS BlackBox Script (Complex Box) -# - /home/garzon/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs +# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs # ---------------------------------- include std @@ -259,6 +259,37 @@ new wx:LayoutLine Box121 set Box121.Orientation "V" set Box121.WinTitle "1.1 Splines" +new creaMaracasVisu:ShowNPoints_Tools Box122 + set Box122.BoxProcessMode "Manual" + set Box122.Params "-1" + set Box122.Type "235" + +new wx:CommandButton Box123 + set Box123.Label "<" + +new wx:LayoutLine Box124 + set Box124.Orientation "H" + +new wx:CommandButton Box125 + set Box125.Label ">" + +new creaMaracasVisu:ShowNPoints_Tools Box126 + set Box126.BoxProcessMode "Manual" + set Box126.Params "1" + set Box126.Type "235" + +new wx:LayoutLine Box127 + set Box127.Orientation "H" + +new wx:OutputText Box128 + +new wx:OutputText Box129 + +new wx:LayoutLine Box130 + set Box130.Orientation "V" + +new wx:OutputText Box131 + connect Box06.LstContourPointsX Box04.LstX connect showNpoints.lstIndexs Box06.LstIndexsIn @@ -368,15 +399,12 @@ connect Box103.BoxChange Box104.BoxExecute connect Box104.BoxChange Box31.In6 connect Box04.Out Box105.In connect Box105.Out Box104.In -connect Box106.Widget Box50.Widget7 connect Box106.Out Box04.CloseSurface connect Box106.BoxChange Box31.In7 -connect Box103.Widget Box50.Widget8 connect Box109.Out Box108.In connect Box108.Out Box110.In connect Box110.Out Box111.In connect Box110.Out Box112.In -connect Box108.Widget Box50.Widget5 connect Box111.Out Box06.OpenClose connect Box112.Out Box06.OpenClose2 connect Box112.Out Box29.OpenClose2 @@ -402,8 +430,23 @@ connect Box68.Spacing Box120.Spacing connect Box105.Out Box116.Mesh connect Box105.Out Box120.Mesh connect showNpoints.Widget Box121.Widget1 -connect Box118.Widget Box121.Widget2 connect Box121.Widget Box86.Widget2 +connect Box123.BoxChange Box122.BoxExecute +connect Box123.Widget Box124.Widget2 +connect Box125.Widget Box124.Widget3 +connect Box125.BoxChange Box126.BoxExecute +connect showNpoints.WidgetShowNPoints Box122.WidgetShowNPoints +connect showNpoints.WidgetShowNPoints Box126.WidgetShowNPoints +connect Box108.Widget Box127.Widget2 +connect Box127.Widget Box50.Widget6 +connect Box118.Widget Box130.Widget2 +connect Box124.Widget Box130.Widget4 +connect Box130.Widget Box121.Widget3 +connect Box106.Widget Box127.Widget5 +connect Box103.Widget Box50.Widget7 +connect Box131.Widget Box50.Widget9 +connect Box129.Widget Box121.Widget9 +connect Box128.Widget Box121.Widget8 # Complex input ports input point showNpoints.In " " diff --git a/bbtk/bbs/boxes/PolyDataToActor_Widget.bbg b/bbtk/bbs/boxes/PolyDataToActor_Widget.bbg index 543007b..dda266c 100644 --- a/bbtk/bbs/boxes/PolyDataToActor_Widget.bbg +++ b/bbtk/bbs/boxes/PolyDataToActor_Widget.bbg @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.5 BBG BlackBox Diagram file -# - /home/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/PolyDataToActor_Widget.bbg +# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/PolyDataToActor_Widget.bbg # ---------------------------------- APP_START @@ -59,13 +59,13 @@ ISEXEC:FALSE -16.179920:-48.062580:-900.000000 17.140080:-50.562580:-900.000000 PORT -Orientation:"V" +Orientation:"H" FIN_BOX BOX vtk:PolyDataToActor:Box09 ISEXEC:FALSE 30.477991:-46.605584:-900.000000 -56.757991:-49.105584:-900.000000 +52.717991:-49.105584:-900.000000 FIN_BOX BOX std:MagicBox:Box10 @@ -85,7 +85,7 @@ BOX wx:Slider:Box13 ISEXEC:FALSE -10.463564:-2.972867:-900.000000 -19.336436:-5.472867:-900.000000 +29.800000:-5.472867:-900.000000 PORT In:"50" PORT @@ -111,7 +111,7 @@ BOX wx:ComboBox:Box15 ISEXEC:FALSE 22.112635:-19.005024:-900.000000 -48.392635:-21.505024:-900.000000 +43.827635:-21.505024:-900.000000 PORT In:"Points WireFrame Surface" PORT @@ -123,7 +123,7 @@ BOX std:MultipleInputs:Box08 ISEXEC:FALSE -36.135097:-21.729535:-900.000000 --14.165097:-24.229535:-900.000000 +21.000000:-24.229535:-900.000000 FIN_BOX CONNECTIONS:20 CONNECTION diff --git a/bbtk/bbs/boxes/PolyDataToActor_Widget.bbs b/bbtk/bbs/boxes/PolyDataToActor_Widget.bbs index 3829044..64737be 100644 --- a/bbtk/bbs/boxes/PolyDataToActor_Widget.bbs +++ b/bbtk/bbs/boxes/PolyDataToActor_Widget.bbs @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.5 BBS BlackBox Script (Complex Box) -# - /home/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/PolyDataToActor_Widget.bbs +# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/PolyDataToActor_Widget.bbs # ---------------------------------- include std @@ -17,7 +17,7 @@ description "Description ??" category "" new wx:LayoutLine Box04 - set Box04.Orientation "V" + set Box04.Orientation "H" new vtk:PolyDataToActor Box09 diff --git a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx index 968542a..27ebbf9 100644 --- a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx +++ b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx @@ -182,6 +182,35 @@ void ShowNPoints_Tools::InitCreateVolumeSurface_Points() wsp->InsertPoint(pC3[0] ,pC3[1], pC3[2],""); + + // Add points to the other Groups + std::vector pointStart; + pointStart.push_back( pC1[0] ); + pointStart.push_back( pC1[1] ); + pointStart.push_back( pC1[2] ); + std::vector pointEnd; + pointEnd.push_back( pC3[0] ); + pointEnd.push_back( pC3[1] ); + pointEnd.push_back( pC3[2] ); + + printf("EED ShowNPoints_Tools::InitCreateVolumeSurface_Points 1\n"); + wsp->SetActualCollection(0); + printf("EED ShowNPoints_Tools::InitCreateVolumeSurface_Points 2\n"); + wsp->SetReferencePoint(pointStart); + printf("EED ShowNPoints_Tools::InitCreateVolumeSurface_Points 3\n"); + wsp->OnInsertPoint_(); + printf("EED ShowNPoints_Tools::InitCreateVolumeSurface_Points 4\n"); + wsp->SetReferencePoint(pointEnd); + printf("EED ShowNPoints_Tools::InitCreateVolumeSurface_Points 5\n"); + wsp->OnInsertPoint_(); + printf("EED ShowNPoints_Tools::InitCreateVolumeSurface_Points 6\n"); + + wsp->SetActualCollection(2); + wsp->SetReferencePoint(pointStart); + wsp->OnInsertPoint_(); + wsp->SetReferencePoint(pointEnd); + wsp->OnInsertPoint_(); + // --- Finish --- wsp->SetOutputBox(); wsp->UndoRedo_SaveCollection(); @@ -741,7 +770,9 @@ void ShowNPoints_Tools::MovePointInNormal() pointLocator->SetDataSet( bbGetInputMesh() ); pointLocator->BuildLocator(); - int idControlPoint = wsp->GetModelShowNPoints()->GetNearestPoint(); +// int idControlPoint = wsp->GetModelShowNPoints()->GetNearestPoint(); + int idControlPoint = wsp->GetModelShowNPoints()->GetIdCurrentPoint(); + if(idControlPoint >= 0){ wsp->GetModelShowNPoints()->GetIdPoint(idControlPoint, &x, &y, &z); p[0] = x * spc[0]; @@ -758,9 +789,25 @@ void ShowNPoints_Tools::MovePointInNormal() wsp->GetViewShowNPoints()->RefreshPoint(idControlPoint); wsp->SetOutputBox(); wsp->UndoRedo_SaveCollection(); - } - - } + } // if idControlPoint + } //wsp +} + +void ShowNPoints_Tools::ChangeCurrentPoint() +{ + if(bbGetInputParams()[0] != -1 && bbGetInputParams()[0] != 1){ + printf("PG ShowNPoints_Tools::MovePointInNormal No direction provided, must be 1 or -1"); + return; + } // if Params + int step=bbGetInputParams()[0]; + WidgetShowNPoints *wsp = bbGetInputWidgetShowNPoints(); + int idControlPoint = wsp->GetModelShowNPoints()->GetIdCurrentPoint() + step; + int size=wsp->GetModelShowNPoints()->GetLstPointsSize(); + if (idControlPoint<0) { idControlPoint = size-1; } + if (idControlPoint>=size ) { idControlPoint = 0; } + wsp->GetModelShowNPoints()->SetIdCurrentPoint( idControlPoint ); + wsp->RefreshCollectionText(); + wsp->RefreshColourCollection(); } void ShowNPoints_Tools::JoinPoints() @@ -786,8 +833,9 @@ void ShowNPoints_Tools::JoinPoints() } wsp->SetOutputBox(); wsp->UndoRedo_SaveCollection(); - } + } // if Size } + //===== // 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) //===== @@ -872,6 +920,11 @@ void ShowNPoints_Tools::Process() { MovePointInNormal(); } // if Type + if(bbGetInputType()==235) + { + ChangeCurrentPoint(); + } // if Type + if(bbGetInputType()==240) { JoinPoints(); diff --git a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.h b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.h index 0b5f0c1..24d45b7 100644 --- a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.h +++ b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.h @@ -42,6 +42,7 @@ class bbcreaMaracasVisu_EXPORT ShowNPoints_Tools void CreatePatch_Points(std::vector lstX, std::vector lstY, std::vector lstZ); void NearestPointToMesh( vtkPoints *points, vtkStaticPointLocator *pointLocator, double *spc , double *p , double *pM ); void MovePatchCenter(); + void ChangeCurrentPoint(); void CreateExpandedSurface(); void CreateWideExpandedSurface(); void ExpandSurfaceArea(); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ModelShowNPoints.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ModelShowNPoints.cxx index 6deb8ae..5bbc223 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ModelShowNPoints.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ModelShowNPoints.cxx @@ -8,7 +8,7 @@ ModelShowNPoints::ModelShowNPoints() { firsttime=true; - currentPoint = -1; + idCurrentPoint = -1; } //---------------------------------------------------------------------- @@ -71,11 +71,11 @@ void ModelShowNPoints::SetReferencePoint(std::vector ppoint) mReferencePoint = ppoint; if(lstPointsX.size() > 0){ int idPoint = IdInsidePoint(); - if(idPoint == -1 && currentPoint >= 0 && currentPoint < lstPointsX.size()){ - currentPoint = currentPoint; + if(idPoint == -1 && idCurrentPoint >= 0 && idCurrentPoint < lstPointsX.size()){ + idCurrentPoint = idCurrentPoint; } else{ - currentPoint = idPoint; + idCurrentPoint = idPoint; } } } @@ -439,7 +439,20 @@ void ModelShowNPoints::InversLstPoints() } //---------------------------------------------------------------------- -int ModelShowNPoints::GetCurrentPoint() +int ModelShowNPoints::GetIdCurrentPoint() { - return currentPoint; + return idCurrentPoint; +} + +//---------------------------------------------------------------------- +void ModelShowNPoints::SetIdCurrentPoint(int idPoint) +{ + if (GetLstPointsSize()==0) + { + idCurrentPoint=-1; + } else { + idCurrentPoint=idPoint; + if (idCurrentPoint<0) {idCurrentPoint=0;} + if (idCurrentPoint>=GetLstPointsSize() ) {idCurrentPoint=GetLstPointsSize()-1; } + } // if Size==0 } diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ModelShowNPoints.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ModelShowNPoints.h index b4d2591..966d5ca 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ModelShowNPoints.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ModelShowNPoints.h @@ -47,8 +47,9 @@ class ModelShowNPoints void SetFirstTime(bool value); bool GetFirstTime(); void InversLstPoints(); - int GetCurrentPoint(); - + int GetIdCurrentPoint(); + void SetIdCurrentPoint(int idPoint); + private: std::vector lstPointsX; std::vector lstPointsY; @@ -58,7 +59,7 @@ class ModelShowNPoints double mradio; vtkImageData *mimage; bool firsttime; - int currentPoint; + int idCurrentPoint; }; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ViewShowNPoints.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ViewShowNPoints.cxx index 008f5cf..61e53d9 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ViewShowNPoints.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ViewShowNPoints.cxx @@ -8,6 +8,7 @@ ViewShowNPoints::ViewShowNPoints(ModelShowNPoints* modelShowNPoints) { renderer = NULL; mmodelShowNPoints = modelShowNPoints; + ratioRadio = 0; } //---------------------------------------------------------------------- @@ -17,7 +18,7 @@ ViewShowNPoints::~ViewShowNPoints() //------------------------------------------------------------------------ - + void ViewShowNPoints::RefreshPoint(int id) { double spc[3]; @@ -25,11 +26,11 @@ void ViewShowNPoints::RefreshPoint(int id) GetModelShowNPoints()->GetIdPoint(id,&x,&y,&z); GetModelShowNPoints()->GetImage()->GetSpacing(spc); std::string label = GetModelShowNPoints()->GetIdLabel(id); - double radio = GetModelShowNPoints()->GetRadio(); + double radio = GetModelShowNPoints()->GetRadio() * ratioRadio; lstActorsSphere[id]->SetPosition( spc[0]*x , spc[1]*y , spc[2]*z ); - lstActorsSphere[id]->GetProperty()->SetColor( mcolour[0] , mcolour[1] , mcolour[2] ); lstActorsSphere[id]->GetProperty()->SetOpacity( mopacity ); lstSourceSphere[id]->SetRadius( radio ); + lstActorsSphere[id]->GetProperty()->SetColor( mcolour[0] , mcolour[1] , mcolour[2] ); //EED 2017-01-01 Migration VTK7 #if VTK_MAJOR_VERSION <= 5 // .. @@ -62,8 +63,8 @@ void ViewShowNPoints::AddVtkPoint() { // Sphere vtkSphereSource *vtksphere = vtkSphereSource::New(); - vtksphere->SetThetaResolution (10); - vtksphere->SetPhiResolution (10); + vtksphere->SetThetaResolution (8); + vtksphere->SetPhiResolution (8); vtksphere->SetRadius( 1 ); //NTU: For updating points lstSourceSphere.push_back(vtksphere); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ViewShowNPoints.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ViewShowNPoints.h index d70292c..468c53e 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ViewShowNPoints.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ViewShowNPoints.h @@ -22,6 +22,7 @@ class ViewShowNPoints ModelShowNPoints* GetModelShowNPoints(); void SetModelShowNPoints(ModelShowNPoints* modelShowNPoints); void RefreshPoint(int id); + void RefreshEachPoint(); void RefreshPoints(); void AddVtkPoint(); @@ -34,6 +35,7 @@ class ViewShowNPoints std::vector lstSourceSphere; std::vector mcolour; double mopacity; + double ratioRadio; vtkRenderer* renderer; private: ModelShowNPoints* mmodelShowNPoints; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx index d2dc044..43c15a0 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx @@ -973,6 +973,23 @@ void WidgetShowNPoints::SetReferencePoint(std::vector point) } // for i } +//------------------------------------------------------------------------ +void WidgetShowNPoints::SetActualCollection( int actual ) +{ + if (actual<0) + { + actual=0; + } // if actual<0 + + if (actual>lstModelShowNPoints.size()-1 ) + { + actual=lstModelShowNPoints.size()-1; + } // if actual<0 + + mActualCollection=actual; +} + + //------------------------------------------------------------------------ void WidgetShowNPoints::SetInitLstPoints( std::vector initLstPointsX, std::vector initLstPointsY, std::vector initLstPointsZ, std::vector initLstLabels, std::vector initLstIndexs ) { @@ -1268,19 +1285,40 @@ void WidgetShowNPoints::RefreshColourCollection() colourAll.push_back(1); colourAll.push_back(0); colourAll.push_back(0); - std::vector colourActual; - colourActual.push_back(1); - colourActual.push_back(1); - colourActual.push_back(0); - SetColour( colourAll ); // For all collections + std::vector colourActualGroup; + colourActualGroup.push_back(1); + colourActualGroup.push_back(1); + colourActualGroup.push_back(0); + + // For all collections + SetColour( colourAll ); int i,size=lstViewShowNPoints.size(); for (i=0;i mcolour = colourAll; // All collection + lstViewShowNPoints[i] -> mcolour = colourAll; + lstViewShowNPoints[i] -> ratioRadio = 1; lstViewShowNPoints[i]->RefreshEachPoint(); } // for i - lstViewShowNPoints[mActualCollection] -> mcolour = colourActual; // Actual collection + + // Actual collection + lstViewShowNPoints[mActualCollection] -> mcolour = colourActualGroup; + lstViewShowNPoints[mActualCollection] -> ratioRadio = 1.1; lstViewShowNPoints[mActualCollection] -> RefreshEachPoint(); + + //Actual Point + int curPnt = lstModelShowNPoints[mActualCollection] -> GetIdCurrentPoint(); + size=lstModelShowNPoints[mActualCollection]->GetLstPointsSize(); + if ((curPnt>=0) && (curPnt colourActualPoint; + colourActualPoint.push_back(0); + colourActualPoint.push_back(0); + colourActualPoint.push_back(1); + double radio = GetModelShowNPoints()->GetRadio(); + lstViewShowNPoints[mActualCollection] -> mcolour = colourActualPoint; + lstViewShowNPoints[mActualCollection]->RefreshPoint( curPnt ); + lstViewShowNPoints[mActualCollection] -> mcolour = colourActualGroup; + } lstViewShowNPoints[mActualCollection] -> renderer->GetRenderWindow()->Render(); } diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.h index 30c3863..9a6ab0d 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.h @@ -71,7 +71,8 @@ class WidgetShowNPoints : public wxPanel void GetCollectionPoint(int idCol,int idPoint, double *pPoint); void SetCollectionPoint(int idCol, int idPoint, std::vector modPoint); - + void SetActualCollection( int actual ); + void OnUndo(wxCommandEvent &event); void OnRedo(wxCommandEvent &event); void UndoRedo_SaveCollection(); @@ -112,29 +113,15 @@ class WidgetShowNPoints : public wxPanel virtual void SetOutputBox(); void ErasePoint(int id); - std::vector GetLstPointsX(); - std::vector GetLstPointsY(); - std::vector GetLstPointsZ(); - std::vector GetLstLabels(); - std::vector GetLstIndexs(); - - + std::vector GetLstPointsX(); + std::vector GetLstPointsY(); + std::vector GetLstPointsZ(); + std::vector GetLstLabels(); + std::vector GetLstIndexs(); protected: - private: - - // EED 2022-05-19 - //vtkRenderer *renderer; - //std::vector lstActorsSphere;//NTU changed from prop3D to Actor - //std::vector lstActorsText; - //std::vector lstSourceSphere; - //std::vector mcolour; - //ModelShowNPoints* mmodelShowNPoints; - //double mopacity; std::vector lstViewShowNPoints; - - //NTU: For updating points wxStaticText * askPointLabel; wxTextCtrl * textCtrl; @@ -148,7 +135,6 @@ class WidgetShowNPoints : public wxPanel std::vector lstModelShowNPoints; int mtype; int mActualCollection; -// bool trackPointFlag; int idTrack; int idUndoRedo; int maxUndoRedo; -- 2.45.1