From 52fe1977e96677f9cf7c54cb55eb5b822a7b57fd Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Wed, 14 Sep 2022 16:39:07 +0200 Subject: [PATCH] MeshManager --- .../src/bbcreaVtkBooleanOperationPolyDataFilter.cxx | 12 ++++++------ bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget.cxx | 4 ++++ bbtk_creaVtk_PKG/src/bbcreaVtkPointPicker.cxx | 9 +++++++++ bbtk_creaVtk_PKG/src/bbcreaVtkPointPickerNearest.cxx | 10 ++-------- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkBooleanOperationPolyDataFilter.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkBooleanOperationPolyDataFilter.cxx index 564f379..175e435 100644 --- a/bbtk_creaVtk_PKG/src/bbcreaVtkBooleanOperationPolyDataFilter.cxx +++ b/bbtk_creaVtk_PKG/src/bbcreaVtkBooleanOperationPolyDataFilter.cxx @@ -115,12 +115,12 @@ printf("EED Warnning BooleanOperationPolyDataFilter::Process Put this code at t vtkPoints *points = booleanOperation->GetOutput()->GetPoints(); if (points!=NULL) { - vtkFillHolesFilter *fillHolesFilter = vtkFillHolesFilter::New(); - fillHolesFilter->SetInputData( booleanOperation->GetOutput() ); - fillHolesFilter->SetHoleSize(100000.0); - fillHolesFilter->Update(); - bbSetOutputOut( fillHolesFilter->GetOutput() ); -// bbSetOutputOut( booleanOperation->GetOutput() ); +// vtkFillHolesFilter *fillHolesFilter = vtkFillHolesFilter::New(); +// fillHolesFilter->SetInputData( booleanOperation->GetOutput() ); +// fillHolesFilter->SetHoleSize(100000.0); +// fillHolesFilter->Update(); +// bbSetOutputOut( fillHolesFilter->GetOutput() ); + bbSetOutputOut( booleanOperation->GetOutput() ); } else { bbSetOutputOut( NULL ); } // if points!=NULL diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget.cxx index f45306d..1698e71 100644 --- a/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget.cxx +++ b/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget.cxx @@ -74,14 +74,18 @@ void PlaneWidget::Process() // (the one provided in the attribute 'name' of the tag 'input') // * TYPE is the C++ type of the input/output // (the one provided in the attribute 'type' of the tag 'input') + printf("EED PlaneWidget::Process 1 \n"); if ((bbGetInputIn()==NULL) || (bbGetInputRenderer()==NULL)) { + printf("EED PlaneWidget::Process 2 \n"); bbSetOutputOut( NULL ); std::vector center; std::vector normal; bbSetOutputCenter( center ); bbSetOutputNormal( normal ); } else { + if (bbGetInputOrigin().size()==3) printf("EED PlaneWidget::Process 3 Origin %f, %f, %f \n", bbGetInputOrigin()[0], bbGetInputOrigin()[1], bbGetInputOrigin()[2] ); + else printf("EED PlaneWidget::Process 3 Origin -1 \n" ); _boxcreavtkplanewidget.SetActive( bbGetInputActive() ); _boxcreavtkplanewidget.SetImage( bbGetInputIn() ); _boxcreavtkplanewidget.SetResolution( bbGetInputResolution() ); diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkPointPicker.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkPointPicker.cxx index 3d71c08..f87ed20 100644 --- a/bbtk_creaVtk_PKG/src/bbcreaVtkPointPicker.cxx +++ b/bbtk_creaVtk_PKG/src/bbcreaVtkPointPicker.cxx @@ -81,6 +81,7 @@ void creaVtkCallbackPointPicker::Execute(vtkObject *caller, unsigned long, void* boxPointPicker->bbSetOutputNormal( lstNormal ); } // if dataarray } // if ClassName + printf("EED creaVtkCallbackPointPicker::Execute \n" ); boxPointPicker->bbSignalOutputModification(); } // if } // if Active @@ -177,6 +178,8 @@ void PointPicker::Process() // bbSetOutputOut( bbGetInputIn() ); // std::cout << "Output value = " < point; + point.push_back(20); + point.push_back(20); + point.push_back(20); + bbSetOutputPoint( point ); } //===== diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkPointPickerNearest.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkPointPickerNearest.cxx index fc2442a..99a8d6c 100644 --- a/bbtk_creaVtk_PKG/src/bbcreaVtkPointPickerNearest.cxx +++ b/bbtk_creaVtk_PKG/src/bbcreaVtkPointPickerNearest.cxx @@ -36,8 +36,6 @@ void PointPickerNearest::Process() std::vector lstNormal; std::vector refPoint = bbGetInputPoint(); - printf ("EED PointPickerNearest::Process 1\n"); - if ((bbGetInputActive()==true) && ( bbGetInputMesh()!=NULL) && (refPoint.size()==3) ) { double p[3]; @@ -65,7 +63,6 @@ void PointPickerNearest::Process() } // if distMax } // for i - printf ("EED PointPickerNearest::Process 3\n"); if (iBack>=0) { vtkPointData *pointdata = bbGetInputMesh()->GetPointData(); @@ -79,12 +76,10 @@ void PointPickerNearest::Process() printf("EED creaVtkCallbackPointPicker::Execute dataarray=%s n=%ld p=%ld\n", dataarray->GetName(),dataarray->GetNumberOfValues() ,polydata->GetNumberOfPoints() ); } // for i */ - printf ("EED PointPickerNearest::Process 4\n"); dataarray = pointdata->GetNormals(); if (dataarray!=NULL) { pValue = dataarray->GetTuple3( iBack ); - printf ("EED PointPickerNearest::Process 5\n"); lstNormal.push_back(pValue[0]); lstNormal.push_back(pValue[1]); lstNormal.push_back(pValue[2]); @@ -92,7 +87,6 @@ void PointPickerNearest::Process() } // if iBack bbSetOutputPointId( iBack ); bbSetOutputNormal( lstNormal ); - printf ("EED PointPickerNearest::Process 6 %ld\n", iBack); std::vector lstPointOut; if (iBack>=0){ points->GetPoint(iBack,p); @@ -102,6 +96,7 @@ void PointPickerNearest::Process() printf ("EED PointPickerNearest::Process 7 pointOut=%f %f %f\n", lstPointOut[0],lstPointOut[1],lstPointOut[2]); }// if iBack bbSetOutputPointOut( lstPointOut ); + bbSignalOutputModification(); } else { bbSetOutputPointId( -1 ); lstNormal.push_back(0); @@ -109,10 +104,9 @@ void PointPickerNearest::Process() lstNormal.push_back(2); bbSetOutputNormal( lstNormal ); bbSetOutputPointOut( bbGetInputPoint() ); + bbSignalOutputModification(); } - printf ("EED PointPickerNearest::Process END\n"); - } //===== // 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) -- 2.47.1