]> SALOME platform Git repositories - modules/smesh.git/commitdiff
Salome HOME
*** empty log message ***
authorvsr <vsr@opencascade.com>
Thu, 20 Mar 2008 15:51:51 +0000 (15:51 +0000)
committervsr <vsr@opencascade.com>
Thu, 20 Mar 2008 15:51:51 +0000 (15:51 +0000)
src/StdMeshers/StdMeshers_Distribution.cxx
src/StdMeshers/StdMeshers_FaceSide.hxx
src/StdMeshers/StdMeshers_Hexa_3D.hxx
src/StdMeshers/StdMeshers_Penta_3D.hxx
src/StdMeshers/StdMeshers_Prism_3D.hxx
src/StdMeshers/StdMeshers_ProjectionUtils.hxx
src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
src/StdMeshers/StdMeshers_RadialPrism_3D.hxx

index fce8298f430ac1708e708921c5811f4d104f6d5b..84e99b20cb4d36bc7602a2c0a4d7e6e55ed84252 100644 (file)
@@ -41,6 +41,8 @@
 #include <Standard_ErrorHandler.hxx>
 #endif
 
+using namespace std;
+
 Function::Function( const int conv )
 : myConv( conv )
 {
index e34dfe51235aea00329542e008410156a0fe90cb..aa29e80a7b33c0944d082e8fa6897bd1dcab9033 100644 (file)
@@ -90,7 +90,7 @@ public:
    * \brief Wrap several edges. Edges must be properly ordered and oriented.
    */
   StdMeshers_FaceSide(const TopoDS_Face& theFace,
-                      list<TopoDS_Edge>& theEdges,
+                      std::list<TopoDS_Edge>& theEdges,
                       SMESH_Mesh*        theMesh,
                       const bool         theIsForward,
                       const bool         theIgnoreMediumNodes);
@@ -130,13 +130,13 @@ public:
     *
     * Missing nodes are allowed only on internal vertices
    */
-  const vector<UVPtStruct>& GetUVPtStruct(bool isXConst =0, double constValue =0) const;
+  const std::vector<UVPtStruct>& GetUVPtStruct(bool isXConst =0, double constValue =0) const;
   /*!
    * \brief Simulates detailed data on nodes
     * \param isXConst - true if normalized parameter X is constant
     * \param constValue - constant parameter value
    */
-  const vector<UVPtStruct>& SimulateUVPtStruct(int    nbSeg,
+  const std::vector<UVPtStruct>& SimulateUVPtStruct(int    nbSeg,
                                                bool   isXConst   = 0,
                                                double constValue = 0) const;
   /*!
@@ -194,15 +194,15 @@ public:
   
 
 protected:
-  vector<uvPtStruct>           myPoints, myFalsePoints;
-  vector<TopoDS_Edge>          myEdge;
-  vector<Handle(Geom2d_Curve)> myC2d;
-  vector<double>               myFirst, myLast;
-  vector<double>               myNormPar;
-  double                       myLength;
-  int                          myNbPonits, myNbSegments;
-  SMESH_Mesh*                  myMesh;
-  bool                         myMissingVertexNodes, myIgnoreMediumNodes;
+  std::vector<uvPtStruct>           myPoints, myFalsePoints;
+  std::vector<TopoDS_Edge>          myEdge;
+  std::vector<Handle(Geom2d_Curve)> myC2d;
+  std::vector<double>               myFirst, myLast;
+  std::vector<double>               myNormPar;
+  double                            myLength;
+  int                               myNbPonits, myNbSegments;
+  SMESH_Mesh*                       myMesh;
+  bool                              myMissingVertexNodes, myIgnoreMediumNodes;
 };
 
 
index 1f1c4042d1964bfd23b6c3cfa00d0a45bb1eb2b2..c05a94ae44a299debc18c48c1744426a38628ffa 100644 (file)
@@ -92,7 +92,7 @@ protected:
 
   int GetFaceIndex(SMESH_Mesh& aMesh,
                   const TopoDS_Shape& aShape,
-                  const vector<SMESH_subMesh*>& meshFaces,
+                  const std::vector<SMESH_subMesh*>& meshFaces,
                   const TopoDS_Vertex& V0,
                   const TopoDS_Vertex& V1,
                   const TopoDS_Vertex& V2,
index 90eab4c7433ab9ceafdd68f69ef14e32ae3f8111..100ddb45e0a17d90729f3e28deac10daef8f9bee 100644 (file)
@@ -97,7 +97,7 @@ protected:
   TopTools_IndexedMapOfOrientedShape myShapeIDMap;
   SMESH_Block                        myTBlock;
   TopoDS_Shape                       myEmptyShape;
-  vector<int>                        myIsEdgeForward;
+  std::vector<int>                   myIsEdgeForward;
   //
   int myErrorStatus;
 };
@@ -216,8 +216,8 @@ class STDMESHERS_EXPORT StdMeshers_Penta_3D {
 
     double SetHorizEdgeXYZ(const gp_XYZ&                  aBNXYZ,
                            const int                      aFaceID,
-                           vector<const SMDS_MeshNode*>*& aCol1,
-                           vector<const SMDS_MeshNode*>*& aCol2);
+                           std::vector<const SMDS_MeshNode*>*& aCol1,
+                           std::vector<const SMDS_MeshNode*>*& aCol2);
 
     void ShapeSupportID(const bool theIsUpperLayer,
                        const SMESH_Block::TShapeID theBNSSID,
@@ -256,14 +256,14 @@ class STDMESHERS_EXPORT StdMeshers_Penta_3D {
     void *                    myMesh;
     SMESH_ComputeErrorPtr     myErrorStatus;
     //
-    vector <StdMeshers_TNode> myTNodes;
+    std::vector <StdMeshers_TNode> myTNodes;
     int                       myISize;
     int                       myJSize;
     double                    myTol3D;        // Tolerance value     
     std::map < int, int >     myConnectingMap;
     //
-    vector<StdMeshers_IJNodeMap> myWallNodesMaps; // nodes on a face
-    vector<gp_XYZ>            myShapeXYZ; // point on each sub-shape
+    std::vector<StdMeshers_IJNodeMap> myWallNodesMaps; // nodes on a face
+    std::vector<gp_XYZ>               myShapeXYZ; // point on each sub-shape
 
     bool myCreateQuadratic;
     SMESH_MesherHelper* myTool; // tool building quadratic elements
index d6fab7b38dc0a096c9f94023d7ae39aedebe0577..db5fd52ec0909707cb11ff66776be25ca9691a3d 100644 (file)
@@ -242,9 +242,9 @@ private:
     BRepAdaptor_Surface             mySurface;
     TopoDS_Edge                     myBaseEdge;
     // first and last normalized params and orientaion for each component or it-self
-    vector< pair< double, double> > myParams;
+    std::vector< std::pair< double, double> > myParams;
     bool                            myIsForward;
-    vector< TSideFace* >            myComponents;
+    std::vector< TSideFace* >       myComponents;
     SMESH_MesherHelper *            myHelper;
   public:
     TSideFace( SMESH_MesherHelper* helper,
@@ -255,7 +255,7 @@ private:
                const double        first = 0.0,
                const double        last = 1.0);
     TSideFace( const std::vector< TSideFace* >&             components,
-               const std::vector< pair< double, double> > & params);
+               const std::vector< std::pair< double, double> > & params);
     TSideFace( const TSideFace& other );
     ~TSideFace();
     bool IsComplex() const
@@ -347,9 +347,9 @@ private:
   // container of 4 side faces
   TSideFace*                 mySide; 
   // node columns for each base edge
-  vector< TParam2ColumnMap > myParam2ColumnMaps;
+  std::vector< TParam2ColumnMap > myParam2ColumnMaps;
   // to find a column for a node by edge SMESHDS Index
-  map< int, pair< TParam2ColumnMap*, bool > > myShapeIndex2ColumnMap;
+  std::map< int, std::pair< TParam2ColumnMap*, bool > > myShapeIndex2ColumnMap;
 
   SMESH_ComputeErrorPtr myError;
   /*!
@@ -359,7 +359,7 @@ private:
     myError = SMESH_ComputeError::New(error,comment);
     return myError->IsOK();
   }
-  //vector< SMESH_subMesh* >           mySubMeshesVec; // submesh by in-block id
+  //std::vector< SMESH_subMesh* >           mySubMeshesVec; // submesh by in-block id
 };
 
 // =============================================
@@ -395,7 +395,7 @@ public:
     * \param nodeColumns - columns of nodes generated from nodes of a mesh face
     * \param helper - helper initialized by mesh and shape to add prisms to
    */
-  static void AddPrisms( vector<const TNodeColumn*> & nodeColumns,
+  static void AddPrisms( std::vector<const TNodeColumn*> & nodeColumns,
                          SMESH_MesherHelper*          helper);
 
 private:
@@ -430,7 +430,7 @@ private:
   StdMeshers_PrismAsBlock myBlock;
   SMESH_MesherHelper*     myHelper;
 
-  vector<gp_XYZ>            myShapeXYZ; // point on each sub-shape
+  std::vector<gp_XYZ>            myShapeXYZ; // point on each sub-shape
 
   // map of bottom nodes to the column of nodes above them
   // (the column includes the bottom node)
index 8d3939c2de3129343739fae5cb3f0d3cb3e9b8f6..3d5111508a1bd772dd92386a8bee13cfed8251ec 100644 (file)
@@ -87,8 +87,8 @@ class StdMeshers_ProjectionUtils
                                  TopoDS_Vertex         VV1[2],
                                  const TopoDS_Face&    face2,
                                  TopoDS_Vertex         VV2[2],
-                                 list< TopoDS_Edge > & edges1,
-                                 list< TopoDS_Edge > & edges2);
+                                 std::list< TopoDS_Edge > & edges1,
+                                 std::list< TopoDS_Edge > & edges2);
 
   /*!
    * \brief Insert vertex association defined by a hypothesis into a map
index 72b317be290a185a86f41ec699365858fbe68629..6e09e2fe53c4dd8f1988162b9b18a8e417be4de7 100644 (file)
@@ -47,7 +47,7 @@ enum TSideID { BOTTOM_SIDE=0, RIGHT_SIDE, TOP_SIDE, LEFT_SIDE, NB_SIDES };
 typedef uvPtStruct UVPtStruct;
 typedef struct faceQuadStruct
 {
-  vector< StdMeshers_FaceSide*> side;
+  std::vector< StdMeshers_FaceSide*> side;
   bool isEdgeOut[4]; // true, if an edge has more nodes, than the opposite
   UVPtStruct* uv_grid;
   ~faceQuadStruct();
index b7d7968021c9192ec5c7c45902a7a199ffe14f28..19d1664ec5fbf46c47b0521a67b04203c5039193 100644 (file)
@@ -54,8 +54,8 @@ public:
 
 protected:
 
-  typedef vector<const SMDS_MeshNode* >            TNodeColumn;
-  typedef map< const SMDS_MeshNode*, TNodeColumn > TNode2ColumnMap;
+  typedef std::vector<const SMDS_MeshNode* >            TNodeColumn;
+  typedef std::map< const SMDS_MeshNode*, TNodeColumn > TNode2ColumnMap;
 
   TNodeColumn* makeNodeColumn( TNode2ColumnMap&     n2ColMap,
                                const SMDS_MeshNode* outNode,
@@ -68,7 +68,7 @@ protected:
   const StdMeshers_NumberOfLayers*    myNbLayerHypo;
   const StdMeshers_LayerDistribution* myDistributionHypo;
   SMESH_MesherHelper*                 myHelper;
-  vector< double >                    myLayerPositions;
+  std::vector< double >               myLayerPositions;
 };
 
 #endif