From dedc04f2699998fde1cb0baf7ec854da67c25e2b Mon Sep 17 00:00:00 2001 From: "eduardo.davila@creatis.insa-lyon.fr" Date: Wed, 29 May 2024 10:37:12 +0200 Subject: [PATCH] #3558 ShowNPoints_Tools::LoadCollection --- bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx | 16 +++++++++++++++- bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.h | 7 +++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx index fb3a57f..f0eb286 100644 --- a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx +++ b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx @@ -1086,6 +1086,16 @@ std::vector ShowNPoints_Tools::GetProjectionPointOnAxis(double pointToPr return result; } +void ShowNPoints_Tools::LoadCollection() +{ + WidgetShowNPoints* wsp = bbGetInputWidgetShowNPoints(); + if ((wsp!=NULL) && (bbGetInputParamsStr().size()==1)) + { + std::string filename = bbGetInputParamsStr()[0]; + wsp->OnLoadCollections_( filename ); + } +} + //===== // 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) @@ -1107,7 +1117,7 @@ void ShowNPoints_Tools::Process() // bbSetOutputOut( bbGetInputIn() ); // std::cout << "Output value = " <); + BBTK_DECLARE_INPUT(ParamsStr, std::vector); BBTK_DECLARE_OUTPUT(Out, std::vector); // BBTK_DECLARE_OUTPUT(Out,double); BBTK_PROCESS(Process); @@ -53,6 +54,7 @@ class bbcreaMaracasVisu_EXPORT ShowNPoints_Tools void JoinPoints(); void SetMesh(); void SeparateSplines(); + void LoadCollection(); std::vector GetProjectionPointOnAxis(double pointToProject[3], double originAxis[3], double axisDir[3]); std::vector>> GetOrderedPointsAroundPlane(std::vector planeOrigin, std::vector planeNormal, std::vector rotAxis, std::vector pX, std::vector pY, std::vector pZ); std::vector GetPlaneNormalFromPointsRefPoint(std::vector pointsX, std::vector pointsY, std::vector pointsZ, std::vector refPoint); @@ -70,9 +72,10 @@ 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 colletion 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",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 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)",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_OUTPUT(ShowNPoints_Tools, Out, "Output", std::vector, ""); // BBTK_OUTPUT(ShowNPoints_Tools,Out,"First output",double,""); BBTK_END_DESCRIBE_BLACK_BOX(ShowNPoints_Tools); -- 2.47.1