Porting to windows after merge with Salome 3.2.7

diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
index 69ca7fadf3a45f0130c9d598e92f3771810951f9..387a860dff887a4bd1af89e497bde8abcf74b264 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
@@ -170,6 +170,9 @@ void NETGENPlugin_Mesher::PrepareOCCgeometry(netgen::OCCGeometry& occgeo,
   occgeo.shape = shape;
   occgeo.changed = 1;
   occgeo.BuildFMap();
+  //amv for test
+  occgeo.amv_test();
+  
   BRepTools::Clean (shape);
   BRepMesh_IncrementalMesh::BRepMesh_IncrementalMesh (shape, 0.01, true);
   Bnd_Box bb;
@@ -433,7 +436,7 @@ bool NETGENPlugin_Mesher::Compute()
     // create tetrahedra
     for (i = 1; i <= nbVol/* && isOK*/; ++i)
     {
-      const netgen::Element& elem = ngMesh->VolumeElement(i);
+      const netgen::Element& elem = ngMesh->VolumeElement(i);      
       int aSolidInd = elem.GetIndex();
       TopoDS_Solid aSolid;
       if (aSolidInd > 0 && aSolidInd <= occgeo.somap.Extent())

diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.hxx b/src/NETGENPlugin/NETGENPlugin_Mesher.hxx
index 572000fd769507ac1f074ef83cfcb36f32949c89..7795e6bb859c7882f8178a587085f9deaf898155 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Mesher.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_Mesher.hxx
@@ -30,6 +30,7 @@
 #define _NETGENPlugin_Mesher_HXX_
 
 #include "NETGENPlugin_Defs.hxx"
+#include "StdMeshers_FaceSide.hxx"
 
 class SMESH_Mesh;
 class SMESHDS_Mesh;

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
index 1143aa5988a10ce4718833d9eda187dfeb0de7d6..a474e036b136b22274d0ed90ba4a9364a2e4ec65 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
@@ -55,9 +55,10 @@ namespace nglib {
 #define OCCGEOMETRY
 #include <occgeom.hpp>
 #include <meshing.hpp>
+//#include <meshtype.hpp>
 namespace netgen {
   extern int OCCGenerateMesh (OCCGeometry&, Mesh*&, int, int, char*);
-  extern MeshingParameters mparam;
+  /*extern*/ MeshingParameters mparam;
 }
 
 using namespace std;
@@ -266,7 +267,7 @@ static TError AddSegmentsToMesh(netgen::Mesh&                    ngMesh,
     seg.p2 = firstPointID;
   }
 
-  ngMesh.CalcSurfacesOfNode();
+  ngMesh.CalcSurfacesOfNode();  
 
   return TError();
 }

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx
index 31d53eb1a2f9a0afee10964632fb935b77bb31e9..f77a3d988efcd7c57b40c24de52d9ffd0dc91e44 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx
@@ -27,11 +27,26 @@
 #include "SMESH_2D_Algo.hxx"
 #include "SMESH_Mesh.hxx"
 
+/*#define OCCGEOMETRY
+#include <occgeom.hpp>
+#include <meshing.hpp>//amv*/
+
 class StdMeshers_MaxElementArea;
 class StdMeshers_LengthFromEdges;
 class StdMeshers_QuadranglePreference;
 //class NETGENPlugin_Hypothesis;
 
+/*namespace netgen {
+  class OCCGeometry;
+}*/
+/*namespace netgen {
+  class OCCGeometry;
+  extern int OCCGenerateMesh (OCCGeometry&, Mesh*&, int, int, char*);
+  extern MeshingParameters mparam;
+}*/
+
+//using namespace netgen;
+
 /*!
  * \brief Mesher generating 2D elements on a geometrical face taking
  * into account pre-existing nodes on face boundaries
@@ -53,6 +68,12 @@ public:
   virtual bool Compute(SMESH_Mesh&         aMesh,
                        const TopoDS_Shape& aShape);
 
+  /*static TError AddSegmentsToMesh(netgen::Mesh&                    ngMesh,
+                                OCCGeometry&                     geom,
+                                const TSideVector&               wires,
+                                SMESH_MesherHelper&              helper,
+                                vector< const SMDS_MeshNode* > & nodeVec); //amv*/
+
 protected:
   const StdMeshers_MaxElementArea*       _hypMaxElementArea;
   const StdMeshers_LengthFromEdges*      _hypLengthFromEdges;