From: Paul RASCLE <paul.rascle@edf.fr>
Date: Fri, 29 Apr 2016 10:09:21 +0000 (+0200)
Subject: z interpolation on Delaunay triangulation: cleaning
X-Git-Tag: v1.6~113^2~17
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=75a0f3bc6510ae5f28c5f18f47486ffb399b103e;p=modules%2Fhydro.git

z interpolation on Delaunay triangulation: cleaning
---

diff --git a/src/HYDROData/HYDROData_Bathymetry.cxx b/src/HYDROData/HYDROData_Bathymetry.cxx
index d3a6d844..05fd2701 100644
--- a/src/HYDROData/HYDROData_Bathymetry.cxx
+++ b/src/HYDROData/HYDROData_Bathymetry.cxx
@@ -40,8 +40,6 @@
 #include <vtkPolyData.h>
 #include <vtkSmartPointer.h>
 #include <vtkIdList.h>
-#include <vtkInformation.h>
-#include <vtkExecutive.h>
 
 #include <iostream>
 
@@ -63,53 +61,13 @@ std::map<int, HYDROData_QuadtreeNode*> HYDROData_Bathymetry::myQuadtrees;
 std::map<int, vtkPolyData*> HYDROData_Bathymetry::myDelaunay2D;
 
 
-hydroDelaunay2D* hydroDelaunay2D::New()
-{
-  DEBTRACE("hydroDelaunay2D::New()");
-  return new hydroDelaunay2D();
-}
-hydroDelaunay2D::hydroDelaunay2D() :
-    vtkDelaunay2D()
-{
-  DEBTRACE("hydroDelaunay2D");
-}
-
-hydroDelaunay2D::~hydroDelaunay2D()
-{
-  DEBTRACE("~hydroDelaunay2D");
-}
-
-int hydroDelaunay2D::RequestData(vtkInformation *request , vtkInformationVector **inv, vtkInformationVector *outv)
-{
-  DEBTRACE("hydroDelaunay2D::RequestData");
-  vtkDelaunay2D::RequestData(request, inv, outv);
-}
-
-int hydroDelaunay2D::ProcessRequest(vtkInformation *request , vtkInformationVector **inv, vtkInformationVector *outv)
-{
-  DEBTRACE("hydroDelaunay2D::ProcessRequest");
-  vtkDelaunay2D::ProcessRequest(request, inv, outv);
-}
-
-
 HYDROData_Bathymetry::HYDROData_Bathymetry()
 : HYDROData_IAltitudeObject()
 {
-  //DEBTRACE("HYDROData_Bathymetry constructor start " << this);
-//  if (! myQuadtree)
-//    myQuadtree = new HYDROData_QuadtreeNode(0, 30, 5, 0.);
-  //DEBTRACE("HYDROData_Bathymetry constructor end   " << this);
 }
 
 HYDROData_Bathymetry::~HYDROData_Bathymetry()
 {
-  //DEBTRACE("HYDROData_Bathymetry destructor start " << this);
-//  if (myQuadtree)
-//    delete myQuadtree;
-//	Nodes_3D::iterator it = myListOfNodes.begin();
-//	for( ; it != myListOfNodes.end(); ++it)
-//		delete *it;
-//    myListOfNodes.clear();
 }
 
 QStringList HYDROData_Bathymetry::DumpToPython( const QString& thePyScriptPath,
@@ -247,11 +205,9 @@ vtkPolyData* HYDROData_Bathymetry::GetVtkDelaunay2D() const
       TDF_Label aLabel = myLab.FindChild(DataTag_AltitudePoints, false);
       if (aLabel.IsNull())
         return 0;
-      DEBTRACE("---");
       Handle(TDataStd_RealArray) aCoordsArray;
       if (!aLabel.FindAttribute(TDataStd_RealArray::GetID(), aCoordsArray))
         return 0;
-      DEBTRACE("---");
 
       vtkPoints *points = vtkPoints::New();
       points->Allocate(aCoordsArray->Upper() +1);
@@ -269,39 +225,12 @@ vtkPolyData* HYDROData_Bathymetry::GetVtkDelaunay2D() const
       profile->SetPoints(points);
       DEBTRACE("Number of Points: "<< points->GetNumberOfPoints());
 
-      hydroDelaunay2D* delaunay2D = hydroDelaunay2D::New();
-      delaunay2D->GetInputPortInformation(0)->Print(std::cerr);
-      DEBTRACE("set the input data");
+      vtkDelaunay2D* delaunay2D = vtkDelaunay2D::New();
       delaunay2D->SetInputData(profile);
-      delaunay2D->GetInputPortInformation(0)->Print(std::cerr);
-      delaunay2D->GetOutputPortInformation(0)->Print(std::cerr);
-      DEBTRACE("---");
-      delaunay2D->GetOutputInformation(0)->Print(std::cerr);
-      delaunay2D->GetExecutive()->GetOutputInformation(0)->Print(std::cerr);
-      DEBTRACE("---");
-      vtkInformationVector** inv = delaunay2D->GetExecutive()->GetInputInformation();
-      vtkInformationVector* outv = delaunay2D->GetExecutive()->GetOutputInformation();
-      delaunay2D->GetExecutive()->GetInputInformation(0,0)->Print(std::cerr);
-      delaunay2D->GetExecutive()->GetOutputInformation(0)->Print(std::cerr);
-      vtkInformation* request = vtkInformation::New();
-
-      //delaunay2D->ProcessRequest(request, inv,outv);
-
-      delaunay2D->GetOutputPortInformation(0)->Print(std::cerr);
-      delaunay2D->GetExecutive()->GetInputInformation(0,0)->Print(std::cerr);
-      delaunay2D->GetExecutive()->GetOutputInformation(0)->Print(std::cerr);
-
-      DEBTRACE("---");
       delaunay2D->Update();
-
-      DEBTRACE("---");
-      delaunay2D->UpdateDataObject();
-
       vtkPolyData* data = delaunay2D->GetOutput();
-
       data->BuildLinks();
       myDelaunay2D[labkey] = data;
-      DEBTRACE("---");
       return data;
     }
   else
diff --git a/src/HYDROData/HYDROData_Bathymetry.h b/src/HYDROData/HYDROData_Bathymetry.h
index e2828c85..1d4493b2 100644
--- a/src/HYDROData/HYDROData_Bathymetry.h
+++ b/src/HYDROData/HYDROData_Bathymetry.h
@@ -24,18 +24,6 @@
 #include <vtkPolyData.h>
 #include <vtkIdList.h>
 
-#include <vtkDelaunay2D.h>
-class hydroDelaunay2D: public vtkDelaunay2D
-{
-public:
-  static hydroDelaunay2D *New();
-  virtual int ProcessRequest(vtkInformation*, vtkInformationVector**,  vtkInformationVector*);
-protected:
-  hydroDelaunay2D();
-  ~hydroDelaunay2D();
-  virtual int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *);
-};
-
 class QFile;
 class gp_XYZ;
 class gp_XY;