X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_RadialQuadrangle_1D2D.cxx;h=740eebaeb0279b0b98428d54417830ce71b94968;hb=265fc676f541f36cc21363d41067bbccddfef684;hp=e96c2a7ee2e5634d1ebce13c0baa8541f8d0d37d;hpb=385d4cede5f752d0eec26c306f3b5e14511e2a3d;p=modules%2Fsmesh.git

diff --git a/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx b/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx
index e96c2a7ee..740eebaeb 100644
--- a/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx
+++ b/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx
@@ -163,38 +163,45 @@ namespace
       static TEdgeMarker theEdgeMarker;
       return &theEdgeMarker;
     }
-    //! Clear face sumbesh if something happens on edges
+    //! Clear edge sumbesh if something happens on face
     void ProcessEvent(const int          event,
                       const int          eventType,
-                      SMESH_subMesh*     edgeSubMesh,
-                      EventListenerData* data,
+                      SMESH_subMesh*     faceSubMesh,
+                      EventListenerData* edgesHolder,
                       const SMESH_Hypothesis*  /*hyp*/)
     {
-      if ( data && !data->mySubMeshes.empty() && eventType == SMESH_subMesh::ALGO_EVENT)
+      if ( edgesHolder && eventType == SMESH_subMesh::ALGO_EVENT)
       {
-        ASSERT( data->mySubMeshes.front() != edgeSubMesh );
-        SMESH_subMesh* faceSubMesh = data->mySubMeshes.front();
-        faceSubMesh->ComputeStateEngine( SMESH_subMesh::CLEAN );
+        std::list<SMESH_subMesh*>::iterator smIt = edgesHolder->mySubMeshes.begin();
+        for ( ; smIt != edgesHolder->mySubMeshes.end(); ++smIt )
+        {
+          SMESH_subMesh* edgeSM = *smIt;
+          edgeSM->ComputeStateEngine( SMESH_subMesh::CLEAN );
+        }
       }
     }
-  };
-
-  //================================================================================
-  /*!
-   * \brief Mark an edge as computed by StdMeshers_RadialQuadrangle_1D2D
-   */
-  //================================================================================
-
-  void markEdgeAsComputedByMe(const TopoDS_Edge& edge, SMESH_subMesh* faceSubMesh)
-  {
-    if ( SMESH_subMesh* edgeSM = faceSubMesh->GetFather()->GetSubMeshContaining( edge ))
+    //! Store edge SMESH_subMesh'es computed by the algo
+    static void markEdge( const TopoDS_Edge& edge, SMESH_subMesh* faceSM )
     {
-      if ( !edgeSM->GetEventListenerData( TEdgeMarker::getListener() ))
-        faceSubMesh->SetEventListener( TEdgeMarker::getListener(),
-                                       SMESH_subMeshEventListenerData::MakeData(faceSubMesh),
-                                       edgeSM);
+      if ( SMESH_subMesh* edgeSM = faceSM->GetFather()->GetSubMeshContaining( edge ))
+      {
+        EventListenerData* edgesHolder = faceSM->GetEventListenerData( getListener() );
+        if ( edgesHolder )
+        {
+          std::list<SMESH_subMesh*>::iterator smIt = std::find( edgesHolder->mySubMeshes.begin(),
+                                                                edgesHolder->mySubMeshes.end(),
+                                                                edgeSM );
+          if ( smIt == edgesHolder->mySubMeshes.end() )
+            edgesHolder->mySubMeshes.push_back( edgeSM );
+        }
+        else
+        {
+          edgesHolder = SMESH_subMeshEventListenerData::MakeData( edgeSM );
+          faceSM->SetEventListener( TEdgeMarker::getListener(), edgesHolder, faceSM );
+        }
+      }
     }
-  }
+  };
 
   //================================================================================
   /*!
@@ -219,12 +226,19 @@ namespace
     if ( nbWire > 2 || nbEdgesInWire.front() < 1 ) return 0;
 
     // remove degenerated EDGEs
+    TopTools_MapOfShape degenVV;
     list<TopoDS_Edge>::iterator edge = edges.begin();
     while ( edge != edges.end() )
       if ( SMESH_Algo::isDegenerated( *edge ))
+      {
+        degenVV.Add( SMESH_MesherHelper::IthVertex( 0, *edge ));
+        degenVV.Add( SMESH_MesherHelper::IthVertex( 1, *edge ));
         edge = edges.erase( edge );
+      }
       else
+      {
         ++edge;
+      }
     int nbEdges = edges.size();
 
     // find VERTEXes between continues EDGEs
@@ -320,9 +334,25 @@ namespace
       double len1 = (++l2i)->first;
       double len2 = (++l2i)->first;
       if ( len1 - len0 > len2 - len1 )
-        deviation2sideInd.insert( make_pair( 0., len2sideInd.begin()->second ));
+        deviation2sideInd.insert( std::make_pair( 0., len2sideInd.begin()->second ));
       else
-        deviation2sideInd.insert( make_pair( 0., len2sideInd.rbegin()->second ));
+        deviation2sideInd.insert( std::make_pair( 0., len2sideInd.rbegin()->second ));
+    }
+
+    double minDevi = deviation2sideInd.begin()->first;
+    int   iMinCurv = deviation2sideInd.begin()->second;
+    if ( sides.size() == 3 && degenVV.Size() == 1 &&
+         minDevi / sides[ iMinCurv ]->Length() > 1e-3 )
+    {
+      // a triangle with curved sides and a degenerated EDGE (IPAL54585);
+      // use a side opposite to the degenerated EDGE as an elliptic one
+      for ( size_t iS = 0; iS < sides.size(); ++iS )
+        if ( degenVV.Contains( sides[ iS ]->FirstVertex() ))
+        {
+          deviation2sideInd.clear();
+          deviation2sideInd.insert( std::make_pair( 0.,( iS + 1 ) % sides.size() ));
+          break;
+        }
     }
 
     int iCirc = deviation2sideInd.rbegin()->second; 
@@ -744,18 +774,30 @@ protected:
  * \brief Allow algo to do something after persistent restoration
  * \param subMesh - restored submesh
  *
- * call markEdgeAsComputedByMe()
+ * call TEdgeMarker::markEdge()
  */
 //=======================================================================
 
 void StdMeshers_RadialQuadrangle_1D2D::SubmeshRestored(SMESH_subMesh* faceSubMesh)
 {
   if ( !faceSubMesh->IsEmpty() )
+    SetEventListener( faceSubMesh );
+}
+
+//=======================================================================
+/*!
+ * \brief Sets event listener to a submesh
+ * \param subMesh - submesh where algo is set
+ *
+ * This method is called when a submesh gets HYP_OK algo_state.
+ */
+//=======================================================================
+
+void StdMeshers_RadialQuadrangle_1D2D::SetEventListener(SMESH_subMesh* faceSubMesh)
+{
+  for ( TopExp_Explorer e( faceSubMesh->GetSubShape(), TopAbs_EDGE ); e.More(); e.Next() )
   {
-    for ( TopExp_Explorer e( faceSubMesh->GetSubShape(), TopAbs_EDGE ); e.More(); e.Next() )
-    {
-      markEdgeAsComputedByMe( TopoDS::Edge( e.Current() ), faceSubMesh );
-    }
+    TEdgeMarker::markEdge( TopoDS::Edge( e.Current() ), faceSubMesh );
   }
 }
 
@@ -963,7 +1005,7 @@ bool StdMeshers_RadialQuadrangle_1D2D::Compute(SMESH_Mesh&         aMesh,
 
   list< TopoDS_Edge >::iterator ee = emptyEdges.begin();
   for ( ; ee != emptyEdges.end(); ++ee )
-    markEdgeAsComputedByMe( *ee, aMesh.GetSubMesh( F ));
+    TEdgeMarker::markEdge( *ee, aMesh.GetSubMesh( F ));
 
   circSide->GetUVPtStruct(); // let sides take into account just computed nodes
   linSide1->GetUVPtStruct();
@@ -975,6 +1017,7 @@ bool StdMeshers_RadialQuadrangle_1D2D::Compute(SMESH_Mesh&         aMesh,
   quad->side[1] = linSide1;
   quad->side[2] = StdMeshers_FaceSide::New( circSide.get(), centerNode, &centerUV );
   quad->side[3] = linSide2;
+  quad->face    = F;
 
   myQuadList.push_back( quad );
 
@@ -985,6 +1028,12 @@ bool StdMeshers_RadialQuadrangle_1D2D::Compute(SMESH_Mesh&         aMesh,
   else
     ok = StdMeshers_Quadrangle_2D::computeTriangles( aMesh, F, quad );
 
+  if ( helper.HasDegeneratedEdges() )
+  {
+    StdMeshers_Quadrangle_2D::myNeedSmooth = true;
+    StdMeshers_Quadrangle_2D::smooth( quad );
+  }
+
   StdMeshers_Quadrangle_2D::myHelper = 0;
 
   return ok;