X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Regular_1D.cxx;h=8e50b059ba88c416dbc24ed7be91199d7e6b5f79;hb=f31477795020e2cfc50d5b625579285c644a6a96;hp=9f588499f80a34f915e29c492ff3a51995e4422f;hpb=dfb859163ddda2baf35463a6d5718d05c9827853;p=modules%2Fsmesh.git

diff --git a/src/StdMeshers/StdMeshers_Regular_1D.cxx b/src/StdMeshers/StdMeshers_Regular_1D.cxx
index 9f588499f..8e50b059b 100644
--- a/src/StdMeshers/StdMeshers_Regular_1D.cxx
+++ b/src/StdMeshers/StdMeshers_Regular_1D.cxx
@@ -73,22 +73,24 @@ using namespace std;
 //=============================================================================
 
 StdMeshers_Regular_1D::StdMeshers_Regular_1D(int hypId, int studyId,
-	SMESH_Gen * gen):SMESH_1D_Algo(hypId, studyId, gen)
+        SMESH_Gen * gen):SMESH_1D_Algo(hypId, studyId, gen)
 {
-	MESSAGE("StdMeshers_Regular_1D::StdMeshers_Regular_1D");
-	_name = "Regular_1D";
-	_shapeType = (1 << TopAbs_EDGE);
-
-	_compatibleHypothesis.push_back("LocalLength");
-	_compatibleHypothesis.push_back("MaxLength");
-	_compatibleHypothesis.push_back("NumberOfSegments");
-	_compatibleHypothesis.push_back("StartEndLength");
-	_compatibleHypothesis.push_back("Deflection1D");
-	_compatibleHypothesis.push_back("Arithmetic1D");
-	_compatibleHypothesis.push_back("AutomaticLength");
-
-	_compatibleHypothesis.push_back("QuadraticMesh"); // auxiliary !!!
-	_compatibleHypothesis.push_back("Propagation"); // auxiliary !!!
+        MESSAGE("StdMeshers_Regular_1D::StdMeshers_Regular_1D");
+        _name = "Regular_1D";
+        _shapeType = (1 << TopAbs_EDGE);
+        _fpHyp = 0;
+
+        _compatibleHypothesis.push_back("LocalLength");
+        _compatibleHypothesis.push_back("MaxLength");
+        _compatibleHypothesis.push_back("NumberOfSegments");
+        _compatibleHypothesis.push_back("StartEndLength");
+        _compatibleHypothesis.push_back("Deflection1D");
+        _compatibleHypothesis.push_back("Arithmetic1D");
+        _compatibleHypothesis.push_back("FixedPoints1D");
+        _compatibleHypothesis.push_back("AutomaticLength");
+
+        _compatibleHypothesis.push_back("QuadraticMesh"); // auxiliary !!!
+        _compatibleHypothesis.push_back("Propagation"); // auxiliary !!!
 }
 
 //=============================================================================
@@ -218,6 +220,16 @@ bool StdMeshers_Regular_1D::CheckHypothesis
     aStatus = SMESH_Hypothesis::HYP_OK;
   }
 
+  else if (hypName == "FixedPoints1D") {
+    _fpHyp = dynamic_cast <const StdMeshers_FixedPoints1D*>(theHyp);
+    ASSERT(_fpHyp);
+    _hypType = FIXED_POINTS_1D;
+
+    _revEdgesIDs = _fpHyp->GetReversedEdges();
+
+    aStatus = SMESH_Hypothesis::HYP_OK;
+  }
+
   else if (hypName == "StartEndLength")
   {
     const StdMeshers_StartEndLength * hyp =
@@ -773,6 +785,62 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh &     theMesh,
     return true;
   }
 
+  case FIXED_POINTS_1D: {
+    const std::vector<double>& aPnts = _fpHyp->GetPoints();
+    const std::vector<int>& nbsegs = _fpHyp->GetNbSegments();
+    int i = 0;
+    TColStd_SequenceOfReal Params;
+    for(; i<aPnts.size(); i++) {
+      if( aPnts[i]<0.0001 || aPnts[i]>0.9999 ) continue;
+      int j=1;
+      bool IsExist = false;
+      for(; j<=Params.Length(); j++) {
+        if( fabs(aPnts[i]-Params.Value(j)) < 1e-4 ) {
+          IsExist = true;
+          break;
+        }
+        if( aPnts[i]<Params.Value(j) ) break;
+      }
+      if(!IsExist) Params.InsertBefore(j,aPnts[i]);
+    }
+    double pf, pl, par2, par1, psize;
+    if (theReverse) {
+      pf = l;
+      pl = f;
+    }
+    else {
+      pf = f;
+      pl = l;
+    }
+    psize = pl - pf;
+    par1 = pf;
+    //cout<<"aPnts.size() = "<<aPnts.size()<<"  Params.Length() = "
+    //    <<Params.Length()<<"   nbsegs.size() = "<<nbsegs.size()<<endl;
+    for(i=0; i<Params.Length(); i++) {
+      par2 = pf + Params.Value(i+1)*psize;
+      int nbseg = ( i > nbsegs.size()-1 ) ? nbsegs[0] : nbsegs[i];
+      double dp = (par2-par1)/nbseg;
+      int j = 1;
+      for(; j<=nbseg; j++) {
+        double param = par1 + dp*j;
+        theParams.push_back( param );
+      }
+      par1 = par2;
+    }
+    // add for last
+    int nbseg = ( nbsegs.size() > Params.Length() ) ? nbsegs[Params.Length()] : nbsegs[0];
+    double dp = (pl-par1)/nbseg;
+    int j = 1;
+    for(; j<nbseg; j++) {
+      double param = par1 + dp*j;
+      theParams.push_back( param );
+    }
+    if (theReverse) {
+      theParams.reverse(); // NPAL18025
+    }
+    return true;
+  }
+
   case DEFLECTION: {
 
     GCPnts_UniformDeflection Discret(theC3d, _value[ DEFLECTION_IND ], f, l, true);
@@ -828,14 +896,18 @@ bool StdMeshers_Regular_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & t
   {
     list< double > params;
     bool reversed = false;
-    if ( theMesh.GetShapeToMesh().ShapeType() >= TopAbs_WIRE )
+    if ( theMesh.GetShapeToMesh().ShapeType() >= TopAbs_WIRE ) {
       reversed = ( EE.Orientation() == TopAbs_REVERSED );
-    if ( !_mainEdge.IsNull() )
+    }
+    if ( !_mainEdge.IsNull() ) {
       reversed = ( _mainEdge.Orientation() == TopAbs_REVERSED );
+    }
     else if ( _revEdgesIDs.size() > 0 ) {
-      for ( int i = 0; i < _revEdgesIDs.size(); i++)
-	if ( _revEdgesIDs[i] == shapeID )
-	  reversed = !reversed;
+      for ( int i = 0; i < _revEdgesIDs.size(); i++) {
+        if ( _revEdgesIDs[i] == shapeID ) {
+          reversed = !reversed;
+        }
+      }
     }
 
     BRepAdaptor_Curve C3d( E );
@@ -954,8 +1026,8 @@ bool StdMeshers_Regular_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & t
 //=============================================================================
 
 bool StdMeshers_Regular_1D::Evaluate(SMESH_Mesh & theMesh,
-				     const TopoDS_Shape & theShape,
-				     MapShapeNbElems& aResMap)
+                                     const TopoDS_Shape & theShape,
+                                     MapShapeNbElems& aResMap)
 {
   if ( _hypType == NONE )
     return false;
@@ -975,8 +1047,8 @@ bool StdMeshers_Regular_1D::Evaluate(SMESH_Mesh & theMesh,
   ASSERT(!VFirst.IsNull());
   ASSERT(!VLast.IsNull());
 
-  std::vector<int> aVec(17);
-  for(int i=0; i<17; i++) aVec[i] = 0;
+  std::vector<int> aVec(SMDSEntity_Last);
+  for(int i=SMDSEntity_Node; i<SMDSEntity_Last; i++) aVec[i] = 0;
 
   if (!Curve.IsNull()) {
     list< double > params;
@@ -993,12 +1065,12 @@ bool StdMeshers_Regular_1D::Evaluate(SMESH_Mesh & theMesh,
     redistributeNearVertices( theMesh, C3d, length, params, VFirst, VLast );
 
     if(_quadraticMesh) {
-      aVec[0] = 2*params.size() + 1;
-      aVec[2] = params.size() + 1;
+      aVec[SMDSEntity_Node] = 2*params.size() + 1;
+      aVec[SMDSEntity_Quad_Edge] = params.size() + 1;
     }
     else {
-      aVec[0] = params.size();
-      aVec[1] = params.size() + 1;
+      aVec[SMDSEntity_Node] = params.size();
+      aVec[SMDSEntity_Edge] = params.size() + 1;
     }
     
   }
@@ -1006,12 +1078,12 @@ bool StdMeshers_Regular_1D::Evaluate(SMESH_Mesh & theMesh,
     //MESSAGE("************* Degenerated edge! *****************");
     // Edge is a degenerated Edge : We put n = 5 points on the edge.
     if(_quadraticMesh) {
-      aVec[0] = 11;
-      aVec[2] = 6;
+      aVec[SMDSEntity_Node] = 11;
+      aVec[SMDSEntity_Quad_Edge] = 6;
     }
     else {
-      aVec[0] = 5;
-      aVec[1] = 6;
+      aVec[SMDSEntity_Node] = 5;
+      aVec[SMDSEntity_Edge] = 6;
     }
   }