From 3f7942238283deeee804cc405c22c64d8a785300 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Tue, 4 Oct 2022 14:26:43 +0200 Subject: [PATCH] #3493 MeshManager --- ...bcreaVtkBooleanOperationPolyDataFilter.cxx | 4 -- .../src/bbcreaVtkMeshDeformation.cxx | 46 +++++++++---------- .../src/bbcreaVtkPlaneWidget_Base.cxx | 3 -- .../src/bbcreaVtkPointPickerNearest.cxx | 8 +--- 4 files changed, 25 insertions(+), 36 deletions(-) diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkBooleanOperationPolyDataFilter.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkBooleanOperationPolyDataFilter.cxx index 175e435..7a2d956 100644 --- a/bbtk_creaVtk_PKG/src/bbcreaVtkBooleanOperationPolyDataFilter.cxx +++ b/bbtk_creaVtk_PKG/src/bbcreaVtkBooleanOperationPolyDataFilter.cxx @@ -38,10 +38,6 @@ void BooleanOperationPolyDataFilter::Process() // bbSetOutputOut( bbGetInputIn() ); // std::cout << "Output value = " <GetPoint( bbGetInputEdgeId() , pb ); - if (EdgeIdBack!=bbGetInputEdgeId() ) + points->GetPoint( bbGetInputEdgeId() , pb ); + if (EdgeIdBack!=bbGetInputEdgeId() ) + { + EdgeIdBack = bbGetInputEdgeId(); + displcement_x = 0; + displcement_y = 0; + displcement_z = 0; + voiIdPoints.clear(); + for ( i=0 ; iGetPoint(i,p); + if ( (p[0]>(pb[0]-sx)) && (p[0]<(pb[0]+sx)) && + (p[1]>(pb[1]-sy)) && (p[1]<(pb[1]+sy)) && + (p[2]>(pb[2]-sz)) && (p[2]<(pb[2]+sz)) ) { - points->GetPoint(i,p); - if ( (p[0]>(pb[0]-sx)) && (p[0]<(pb[0]+sx)) && - (p[1]>(pb[1]-sy)) && (p[1]<(pb[1]+sy)) && - (p[2]>(pb[2]-sz)) && (p[2]<(pb[2]+sz)) ) - { - voiIdPoints.push_back( i ); - } // if - } // for i - } // back + voiIdPoints.push_back( i ); + } // if + } // for i + } // back if ( !((displcement_x==0) &&(displcement_y==0) && (displcement_z==0)) ) { diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget_Base.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget_Base.cxx index 029d552..79f8639 100644 --- a/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget_Base.cxx +++ b/bbtk_creaVtk_PKG/src/bbcreaVtkPlaneWidget_Base.cxx @@ -29,10 +29,8 @@ 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(); @@ -43,7 +41,6 @@ void PlaneWidget_Base::Process() bbGetInputIn()->Process(); bbGetInputIn()->Execute(); } // if Type == 1 - printf("EED PlaneWidget_Base::Process End \n"); } //===== diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkPointPickerNearest.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkPointPickerNearest.cxx index 99a8d6c..12ea924 100644 --- a/bbtk_creaVtk_PKG/src/bbcreaVtkPointPickerNearest.cxx +++ b/bbtk_creaVtk_PKG/src/bbcreaVtkPointPickerNearest.cxx @@ -31,8 +31,6 @@ void PointPickerNearest::Process() // * TYPE is the C++ type of the input/output // (the one provided in the attribute 'type' of the tag 'input') - printf ("EED PointPickerNearest::Process Start\n"); - std::vector lstNormal; std::vector refPoint = bbGetInputPoint(); @@ -46,7 +44,6 @@ void PointPickerNearest::Process() vtkPoints *points = bbGetInputMesh()->GetPoints(); long size = points->GetNumberOfPoints(); double border = bbGetInputBorder() * bbGetInputBorder(); - printf ("EED PointPickerNearest::Process 2\n"); for ( i=0 ; iGetPoint(i,p); @@ -88,12 +85,12 @@ void PointPickerNearest::Process() bbSetOutputPointId( iBack ); bbSetOutputNormal( lstNormal ); std::vector lstPointOut; - if (iBack>=0){ + if (iBack>=0) + { points->GetPoint(iBack,p); lstPointOut.push_back(p[0]); lstPointOut.push_back(p[1]); lstPointOut.push_back(p[2]); - printf ("EED PointPickerNearest::Process 7 pointOut=%f %f %f\n", lstPointOut[0],lstPointOut[1],lstPointOut[2]); }// if iBack bbSetOutputPointOut( lstPointOut ); bbSignalOutputModification(); @@ -106,7 +103,6 @@ void PointPickerNearest::Process() 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.45.1