From: eap <eap@opencascade.com>
Date: Fri, 22 Dec 2017 17:26:12 +0000 (+0300)
Subject: Use float to store parameters on shape of nodes
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7d38b59de5b3050f5529fd66f6e797df4713c8a5;p=modules%2Fsmesh.git

Use float to store parameters on shape of nodes
---

diff --git a/src/SMDS/SMDS_ElementFactory.cxx b/src/SMDS/SMDS_ElementFactory.cxx
index c7337ff5a..a6d61e849 100644
--- a/src/SMDS/SMDS_ElementFactory.cxx
+++ b/src/SMDS/SMDS_ElementFactory.cxx
@@ -43,25 +43,26 @@ namespace
 
   struct _EdgePosition : public SMDS_EdgePosition
   {
-    double* myUParameter;
+    TParam* myUParameter;
 
-    _EdgePosition( double* aUParam ) : myUParameter( aUParam ) {}
-    virtual void   SetUParameter(double aUparam) { *myUParameter = aUparam; }
-    virtual double GetUParameter() const { return myUParameter[0]; }
-    virtual const double* GetParameters() const { return myUParameter; }
+    _EdgePosition( TParam* aUParam ) : myUParameter( aUParam )
+    { SMDS_EdgePosition::SetUParameter( aUParam[0]); }
+    virtual void   SetUParameter(double aUparam)
+    { *myUParameter = (TParam) aUparam; SMDS_EdgePosition::SetUParameter( aUparam ); }
   };
+
   struct _FacePosition : public SMDS_FacePosition
   {
-    double* myParameter;
-
-    _FacePosition(double* aParam) : myParameter( aParam ) {}
-    virtual void SetUParameter(double aUparam) { myParameter[0] = aUparam; }
-    virtual void SetVParameter(double aVparam) { myParameter[1] = aVparam; }
-    virtual void SetParameters(double aUparam, double aVparam)
-    { myParameter[0] = aUparam; myParameter[1] = aVparam; }
-    virtual double GetUParameter() const { return myParameter[0]; }
-    virtual double GetVParameter() const { return myParameter[1]; }
-    virtual const double* GetParameters() const { return myParameter; }
+    TParam* myParameter;
+
+    _FacePosition(TParam* aParam) : myParameter( aParam )
+    { SMDS_FacePosition::SetParameters( aParam[0], aParam[1] ); }
+    virtual void SetUParameter(double aUparam)
+    { myParameter[0] = (TParam) aUparam; SMDS_FacePosition::SetUParameter( aUparam ); }
+    virtual void SetVParameter(double aVparam)
+    { myParameter[1] = (TParam) aVparam; SMDS_FacePosition::SetVParameter( aVparam ); }
+    virtual void SetParameters(double aU, double aV)
+    { myParameter[0] = aU; myParameter[1] = aV; SMDS_FacePosition::SetParameters( aU, aV ); }
   };
 }
 
@@ -411,8 +412,8 @@ void SMDS_NodeFactory::Compact( std::vector<int>& theVtkIDsOldToNew )
         if ( shapeDim == 2 || shapeDim == 1 )
         {
           int iChunkOld = oldID / theChunkSize;
-          double* oldPos = myChunks[ iChunkOld ].GetPositionPtr( oldNode );
-          double* newPos = myChunks[ iChunk    ].GetPositionPtr( newNode, /*allocate=*/true );
+          TParam* oldPos = myChunks[ iChunkOld ].GetPositionPtr( oldNode );
+          TParam* newPos = myChunks[ iChunk    ].GetPositionPtr( newNode, /*allocate=*/true );
           if ( oldPos )
           {
             newPos[0] = oldPos[0];
@@ -671,7 +672,7 @@ void SMDS_ElementChunk::SetShapeID( const SMDS_MeshElement* e, int shapeID ) con
   if ( oldShapeID == shapeID ) return;
 
   if ( const SMDS_MeshNode* n = dynamic_cast< const SMDS_MeshNode* >( e ))
-    if ( double* uv = me->GetPositionPtr( n ))
+    if ( TParam* uv = me->GetPositionPtr( n ))
     {
       uv[0] = 0.;
       uv[1] = 0.;
@@ -773,14 +774,14 @@ void SMDS_ElementChunk::SetPosition( const SMDS_MeshNode* n, const SMDS_Position
   switch ( shapeDim ) {
   case 2:
   {
-    double* uv = GetPositionPtr( n, /*allocate=*/true );
-    uv[0] = pos->GetParameters()[0];
-    uv[1] = pos->GetParameters()[1];
+    TParam* uv = GetPositionPtr( n, /*allocate=*/true );
+    uv[0] = (TParam) pos->GetParameters()[0];
+    uv[1] = (TParam) pos->GetParameters()[1];
     break;
   }
   case 1:
   {
-    GetPositionPtr( n, /*allocate=*/true )[0] = pos->GetParameters()[0];
+    GetPositionPtr( n, /*allocate=*/true )[0] = (TParam) pos->GetParameters()[0];
     break;
   }
   }
@@ -792,7 +793,7 @@ void SMDS_ElementChunk::SetPosition( const SMDS_MeshNode* n, const SMDS_Position
  */
 //================================================================================
 
-double* SMDS_ElementChunk::GetPositionPtr( const SMDS_MeshElement* n, bool allocate )
+TParam* SMDS_ElementChunk::GetPositionPtr( const SMDS_MeshElement* n, bool allocate )
 {
   if ( myPositions.empty() && !allocate )
     return 0;
@@ -833,7 +834,7 @@ void SMDS_ElementChunk::Compact()
     {
       int nbNodes = (it-1)->my1st;
       myPositions.resize( nbNodes * 2 );
-      std::vector<double> newPos( myPositions.begin(), myPositions.end() );
+      std::vector<TParam> newPos( myPositions.begin(), myPositions.end() );
       myPositions.swap( newPos );
     }
   }
diff --git a/src/SMDS/SMDS_ElementFactory.hxx b/src/SMDS/SMDS_ElementFactory.hxx
index 836364507..b25b635c8 100644
--- a/src/SMDS/SMDS_ElementFactory.hxx
+++ b/src/SMDS/SMDS_ElementFactory.hxx
@@ -347,6 +347,7 @@ typedef _Range< bool > _UsedRange;    // range of used elements
 typedef _RangeSet< _ShapeIDRange > TSubIDRangeSet;
 typedef _RangeSet< _UsedRange >    TUsedRangeSet;
 typedef boost::dynamic_bitset<>    TBitSet;
+typedef float                       TParam;
 
 //------------------------------------------------------------------------------------
 /*!
@@ -364,7 +365,7 @@ class SMDS_ElementChunk
   TSubIDRangeSet       mySubIDRanges; // ranges of elements on the same sub-shape
   int                  myMinSubID;    // min sub-shape ID
   int                  myMaxSubID;    // max sub-shape ID
-  std::vector<double> myPositions;   // UV parameters on shape: 2*param_t per an element
+  std::vector<TParam>  myPositions;   // UV parameters on shape: 2*param_t per an element
 
 public:
 
@@ -396,7 +397,7 @@ public:
   int Get1stID() const { return my1stID; }
 
   //! Return pointer to on-shape-parameters of a node
-  double* GetPositionPtr( const SMDS_MeshElement* node, bool allocate=false );
+  TParam* GetPositionPtr( const SMDS_MeshElement* node, bool allocate=false );
 
   //! Return ranges of used/non-used elements
   const TUsedRangeSet&  GetUsedRanges() const { return myUsedRanges; }