From 043ad5f6e44170fbd8e67868bdb6861e48a544b2 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Wed, 26 Jul 2023 08:36:38 +0200 Subject: [PATCH] #3515 bbcreaVtkPlaneWidget_Base Set origin with no Box action --- bbtk_creaVtk_PKG/.DS_Store | Bin 8196 -> 8196 bytes bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget.cxx | 2 +- .../src/bbcreaVtkPlaneWidget_Base.cxx | 2 +- .../src/bbcreaVtkPlaneWidget_Base.h | 2 +- lib/creaVtk/vtkPolyDataBooleanFilter.cxx | 12 ++++++++---- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/bbtk_creaVtk_PKG/.DS_Store b/bbtk_creaVtk_PKG/.DS_Store index 16c062dcddc78d583b5c1028b262979d0412882c..0c08dcd2d661ecd0e30bdbcabd354fd1d3a3f328 100644 GIT binary patch delta 124 zcmZp1XmOa}&&atkU^hP_=VTrM3BeSGe1_zt^5TM|octsP28QjEO$7?o#H*`K%q?^j z%*<+a6sj$a40IGMj7@55IXOg?^{s>AvvYFu@;fJ=7mye00%~Gr02@;lT$GoSpO+34 X*(@i(#=e=PRvZ)TVH# center = _box->_boxcreavtkplanewidget.GetCenter(); std::vector normal = _box->_boxcreavtkplanewidget.GetNormal(); diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget_Base.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget_Base.cxx index cbc406f..2eb006a 100644 --- a/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget_Base.cxx +++ b/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget_Base.cxx @@ -51,7 +51,7 @@ void PlaneWidget_Base::Process() { bbGetInputIn()->SetOrigin(bbGetInputParamVector()); bbGetInputIn()->Process(); - bbGetInputIn()->Execute(); +//EED bbGetInputIn()->Execute(); } // if Type == 3 } diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget_Base.h b/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget_Base.h index 5d8616b..4d0283e 100644 --- a/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget_Base.h +++ b/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget_Base.h @@ -41,7 +41,7 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(PlaneWidget_Base,bbtk::AtomicBlackBox); BBTK_INPUT(PlaneWidget_Base,In,"Base creaVtkPlaneWidget ", creaVtkPlaneWidget* ,""); BBTK_INPUT(PlaneWidget_Base,Type,"(default 0) 0:nothing 1:Move Normal Direction (Param=step) 2:Set Normal (ParamVector=Normal) 3:Set Origin (ParamVector=Origin)", int ,""); BBTK_INPUT(PlaneWidget_Base,Param,"Type=1 step ", double ,""); - BBTK_INPUT(PlaneWidget_Base,ParamVector,"Type=2 Set normal, Type=3 Set origin", std::vector ,""); + BBTK_INPUT(PlaneWidget_Base,ParamVector,"Type=2 Set normal, Type=3 Set origin of the plane with no Box action", std::vector ,""); // BBTK_OUTPUT(PlaneWidget_Base,Out,"First output",double,""); BBTK_END_DESCRIBE_BLACK_BOX(PlaneWidget_Base); //===== diff --git a/lib/creaVtk/vtkPolyDataBooleanFilter.cxx b/lib/creaVtk/vtkPolyDataBooleanFilter.cxx index ea6a9a2..467190b 100644 --- a/lib/creaVtk/vtkPolyDataBooleanFilter.cxx +++ b/lib/creaVtk/vtkPolyDataBooleanFilter.cxx @@ -2951,7 +2951,8 @@ void Merger::MergeGroup (const GroupType &group, PolysType &merged) { } } - WriteVTK("linesA.vtk", linesA); + //EED 2023-07-24 +// WriteVTK("linesA.vtk", linesA); vtkSmartPointer bspTreeA = vtkSmartPointer::New(); bspTreeA->SetDataSet(linesA); @@ -3166,7 +3167,8 @@ void Merger::MergeGroup (const GroupType &group, PolysType &merged) { std::cout << connected; - WriteVTK("linesB.vtk", linesB); +//EED 2023-07-24 +// WriteVTK("linesB.vtk", linesB); // stage 1 @@ -3209,7 +3211,8 @@ void Merger::MergeGroup (const GroupType &group, PolysType &merged) { PolysType newPolysA; GetPolys(refPts, {polyA}, newPolysA); - WritePolys("merged_stage1.vtk", newPolysA); + //EED 2023-07-24 +// WritePolys("merged_stage1.vtk", newPolysA); // stage 2 @@ -3277,7 +3280,8 @@ void Merger::MergeGroup (const GroupType &group, PolysType &merged) { PolysType newPolysB; GetPolys(refPts, splitted, newPolysB); - WritePolys("merged_stage2.vtk", newPolysB); + //EED 2023-07-24 +// WritePolys("merged_stage2.vtk", newPolysB); std::move(newPolysB.begin(), newPolysB.end(), std::back_inserter(merged)); -- 2.45.1