From 6171943e84350719c7dfae2af1d2476f3df9abd1 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Thu, 15 Sep 2022 14:03:17 +0200 Subject: [PATCH] MeshManager --- bbtk_creaVtk_PKG/src/bbcreaVtkLinearExtrusionFilter.cxx | 2 -- bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget.cxx | 6 +----- bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget_Base.cxx | 6 +++++- bbtk_creaVtk_PKG/src/bbcreaVtkPointPicker.cxx | 1 - bbtk_creaVtk_PKG/src/bbcreaVtkPolyDataNormals.cxx | 2 -- lib/creaVtk/MeshManagerModel.cpp | 7 ------- lib/creaVtk/creaVtkPlaneWidget.cpp | 2 +- 7 files changed, 7 insertions(+), 19 deletions(-) diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkLinearExtrusionFilter.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkLinearExtrusionFilter.cxx index 2b39efe..0c16df8 100644 --- a/bbtk_creaVtk_PKG/src/bbcreaVtkLinearExtrusionFilter.cxx +++ b/bbtk_creaVtk_PKG/src/bbcreaVtkLinearExtrusionFilter.cxx @@ -29,8 +29,6 @@ void LinearExtrusionFilter::Process() // bbSetOutputOut( bbGetInputIn() ); // std::cout << "Output value = " <Delete(); diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget.cxx index 1698e71..d7ae9a4 100644 --- a/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget.cxx +++ b/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget.cxx @@ -12,6 +12,7 @@ void boxcreaVtkPlaneWidget::Execute() // virutal { std::vector center = _box->_boxcreavtkplanewidget.GetCenter(); std::vector normal = _box->_boxcreavtkplanewidget.GetNormal(); + SetNormalIn( normal ); double delta = 0.00000001; bool ok = false; @@ -47,7 +48,6 @@ void boxcreaVtkPlaneWidget::Execute() // virutal // _box->bbSignalOutputModification(std::string("Center")); // _box->bbSignalOutputModification(std::string("Normal")); _box->bbSignalOutputModification(); - } } @@ -74,18 +74,14 @@ 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/bbcreaVtkPlaneWidget_Base.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget_Base.cxx index de10767..029d552 100644 --- a/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget_Base.cxx +++ b/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget_Base.cxx @@ -29,17 +29,21 @@ void PlaneWidget_Base::Process() // bbSetOutputOut( bbGetInputIn() ); // std::cout << "Output value = " < origin = bbGetInputIn()->GetCenter(); std::vector normal = bbGetInputIn()->GetNormal(); origin[0] = origin[0] + normal[0]*bbGetInputParam(); origin[1] = origin[1] + normal[1]*bbGetInputParam(); origin[2] = origin[2] + normal[2]*bbGetInputParam(); bbGetInputIn()->SetOrigin(origin); +// bbGetInputIn()->SetNormalIn(normal); bbGetInputIn()->Process(); bbGetInputIn()->Execute(); - } + } // if Type == 1 + printf("EED PlaneWidget_Base::Process End \n"); } //===== diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkPointPicker.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkPointPicker.cxx index f87ed20..7bcdd93 100644 --- a/bbtk_creaVtk_PKG/src/bbcreaVtkPointPicker.cxx +++ b/bbtk_creaVtk_PKG/src/bbcreaVtkPointPicker.cxx @@ -81,7 +81,6 @@ 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 diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkPolyDataNormals.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkPolyDataNormals.cxx index e369989..c48f31c 100644 --- a/bbtk_creaVtk_PKG/src/bbcreaVtkPolyDataNormals.cxx +++ b/bbtk_creaVtk_PKG/src/bbcreaVtkPolyDataNormals.cxx @@ -36,8 +36,6 @@ void PolyDataNormals::Process() // bbSetOutputOut( bbGetInputIn() ); // std::cout << "Output value = " <Delete(); } // if _meshTemp = vtkPolyData::New(); - printf("EED MeshManagerModel::Process ResetMeshTemp_ 1\n"); _meshTemp->DeepCopy(_meshBase); - printf("EED MeshManagerModel::Process ResetMeshTemp_ 2\n"); } else { _meshTemp=NULL; } - printf("EED MeshManagerModel::Process ResetMeshTemp_ End\n"); } void MeshManagerModel::SetMeshBase(vtkPolyData* mesh) @@ -74,11 +70,8 @@ void MeshManagerModel::SetMeshMemoryMode(vtkPolyData* mesh) void MeshManagerModel::ResetMeshTemp() { - printf("EED MeshManagerModel::Process ResetMeshTemp 1\n"); ResetMeshTemp_(); - printf("EED MeshManagerModel::Process ResetMeshTemp 2\n"); RefreshOutputs(); - printf("EED MeshManagerModel::Process ResetMeshTemp 3\n"); } void MeshManagerModel::CopySetMeshBase(vtkPolyData* mesh) diff --git a/lib/creaVtk/creaVtkPlaneWidget.cpp b/lib/creaVtk/creaVtkPlaneWidget.cpp index 865343c..2081fb0 100644 --- a/lib/creaVtk/creaVtkPlaneWidget.cpp +++ b/lib/creaVtk/creaVtkPlaneWidget.cpp @@ -37,7 +37,7 @@ void creaVtkCallbackPlaneWidget::Execute(vtkObject *caller, unsigned long, void* { creavtkplanewidget->UpdatePlane(); creavtkplanewidget->Execute(); - } + } // if creavtkplanewidget != NULL } -- 2.45.1