From 06daae5761809d42de746305efb8bb3abfb97e43 Mon Sep 17 00:00:00 2001 From: "eduardo.davila@creatis.insa-lyon.fr" Date: Sun, 3 Aug 2025 15:36:36 +0200 Subject: [PATCH] #3581 Options ShowNPoint tools --- .../bbcreaMaracasVisuShowNPoints_Tools.cxx | 10 +++++++ bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.h | 4 +-- .../wxWindows/widgets/WidgetShowNPoints.cxx | 26 ++++++++++++------- .../wxWindows/widgets/WidgetShowNPoints.h | 1 + 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx index fcca0ce..cf789b8 100644 --- a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx +++ b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx @@ -1151,6 +1151,16 @@ void ShowNPoints_Tools::Process() { bbGetInputWidgetShowNPoints()->OnSetPoint_(); } // if Type + if (bbGetInputType()==35) + { + printf("EED ShowNPoints_Tools::Process 35 size %d", bbGetInputParamsStr().size() ); + if (bbGetInputParamsStr().size()==1) + { + printf("EED ShowNPoints_Tools::Process 35 s:>%s<", bbGetInputParamsStr()[1].c_str() ); + std::string label = bbGetInputParamsStr()[1]; + bbGetInputWidgetShowNPoints()->OnRenamePoint_( label ); + } + } // if Type if (bbGetInputType()==40) { bbGetInputWidgetShowNPoints()->OnErasePoint_(); diff --git a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.h b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.h index a52ce96..72c1c8c 100644 --- a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.h +++ b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.h @@ -73,9 +73,9 @@ BBTK_CATEGORY("empty"); BBTK_INPUT(ShowNPoints_Tools,WidgetShowNPoints,"WidgetShowNPoints",WidgetShowNPoints*,""); BBTK_INPUT(ShowNPoints_Tools,Spacing,"(default [1,1,1] )Spacing",std::vector,""); BBTK_INPUT(ShowNPoints_Tools,Mesh,"Mesh en format vtkPolyData ",vtkPolyData*,""); - BBTK_INPUT(ShowNPoints_Tools,Type,"(default 0) 0:Nothing 1:Auto add poits 5:Add Point 10:Insert Point 20:TrackPoint 30:Set nearest point 40:Erase point 50:Deleta all points 100:Insert group after 110:Delete group 120:Reset collection 200:Tool 3 or 4 points to patch surface - Create Mesh (based on 1 group and 3 or 4 points) 205:Tool 3 or 4 points to volume surface - Create Mesh (based on 1 group and 3 or 4 points) 210: Invert points 220: Move patch center (param is the step ex [-1] or [1]) 230: Move point in normal of surface (Params [-1] or [1]) 235: ChangeCurrentPoint (Params [-1] or [1]) 240: Join all start-end points to the start-end points on selected spline 250: Set Mesh SPC (Params: [0]:Patch [1]:CloseSpline1 [2]:CloseSpline2) 300: Create expanded surface 310: Create wide expanded surface 320: Expand Surface, 330: Widen surface, 340: Expand patch, 400: Separate and Order Splines given a rotation origin, 500:Load collection (ParamStr filenaname.xls 501:Save collection (ParamStr filenaname.xls)",int,""); + BBTK_INPUT(ShowNPoints_Tools,Type,"(default 0) 0:Nothing 1:Auto add poits 5:Add Point 10:Insert Point 20:TrackPoint 30:Set nearest point 35:Set Label to actual point 40:Erase point 50:Deleta all points 100:Insert group after 110:Delete group 120:Reset collection 200:Tool 3 or 4 points to patch surface - Create Mesh (based on 1 group and 3 or 4 points) 205:Tool 3 or 4 points to volume surface - Create Mesh (based on 1 group and 3 or 4 points) 210: Invert points 220: Move patch center (param is the step ex [-1] or [1]) 230: Move point in normal of surface (Params [-1] or [1]) 235: ChangeCurrentPoint (Params [-1] or [1]) 240: Join all start-end points to the start-end points on selected spline 250: Set Mesh SPC (Params: [0]:Patch [1]:CloseSpline1 [2]:CloseSpline2) 300: Create expanded surface 310: Create wide expanded surface 320: Expand Surface, 330: Widen surface, 340: Expand patch, 400: Separate and Order Splines given a rotation origin, 500:Load collection (ParamStr filenaname.xls 501:Save collection (ParamStr filenaname.xls)",int,""); BBTK_INPUT(ShowNPoints_Tools, Params,"Optional params for the tools, required for 200: normal and direction, 320: centroid and direction, 330: normal and direction, 340: centroid and direction, 400: reference point", std::vector,""); -BBTK_INPUT(ShowNPoints_Tools, ParamsStr,"Optional params for the tools, required for 500:filename.xls", std::vector,""); +BBTK_INPUT(ShowNPoints_Tools, ParamsStr,"Optional params for the tools, required for 35:New Label 500:filename.xls", std::vector,""); BBTK_OUTPUT(ShowNPoints_Tools, Out, "Output", std::vector, ""); // BBTK_OUTPUT(ShowNPoints_Tools,Out,"First output",double,""); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx index 40d7ec0..b326037 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx @@ -1108,21 +1108,27 @@ void WidgetShowNPoints::StopTrackPoint( ) } //------------------------------------------------------------------------ - void WidgetShowNPoints::OnRenamePoint(wxCommandEvent& event) - { - int id = GetModelShowNPoints()->RenamePoint( (const char*) ( textCtrl->GetValue().mb_str() ) ); - if (id>=0) - { + void WidgetShowNPoints::OnRenamePoint_(std::string label) + { + int id = GetModelShowNPoints()->RenamePoint( label ); + if (id>=0) + { // EED 2022-05-19 - //lstActorsText[id]->SetInput( (const char*) ( textCtrl->GetValue().mb_str() ) ); - //renderer->GetRenderWindow()->Render(); + //lstActorsText[id]->SetInput( (const char*) ( textCtrl->GetValue().mb_str() ) ); + //renderer->GetRenderWindow()->Render(); UndoRedo_SaveCollection(); //A - GetViewShowNPoints()->lstActorsText[id]->SetInput( (const char*) ( textCtrl->GetValue().mb_str() ) ); + GetViewShowNPoints()->lstActorsText[id]->SetInput( label.c_str() ); GetViewShowNPoints()->Render(); SetOutputBox(); UndoRedo_SaveCollection(); //B - } // if id - } + } // if id + } + +//------------------------------------------------------------------------ + void WidgetShowNPoints::OnRenamePoint(wxCommandEvent& event) + { + OnRenamePoint_( (const char*) ( textCtrl->GetValue().mb_str() ) ); + } //------------------------------------------------------------------------ bool WidgetShowNPoints::ErasePoint(int id) diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.h index 79c111a..251130f 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.h @@ -42,6 +42,7 @@ class WidgetShowNPoints : public wxPanel void StopTrackPoint(); void DetectCollectionActive(); + void OnRenamePoint_(std::string label); void OnRenamePoint(wxCommandEvent& event); void OnErasePoint_(); void OnErasePoint(wxCommandEvent& event); -- 2.51.0