Salome HOME
Dump of profile is implemented.
[modules/hydro.git] / src / HYDROData / HYDROData_Stream.cxx
index 9aa3d2354deeac809724251d2732cfea92240dea..312657aedf5f2144c7c2d00ddbb241df0cf15213 100644 (file)
@@ -68,8 +68,6 @@
 #include <TCollection_AsciiString.hxx>
 #endif
 
-#define PYTHON_STREAM_ID "KIND_STREAM"
-
 typedef NCollection_DataMap<Standard_Real, Handle(HYDROData_Profile)> HYDROData_DataMapOfRealOfHDProfile;
 
 IMPLEMENT_STANDARD_HANDLE(HYDROData_Stream,HYDROData_NaturalObject)
@@ -87,22 +85,14 @@ HYDROData_Stream::~HYDROData_Stream()
 
 QStringList HYDROData_Stream::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
-  QStringList aResList;
-
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
-  if ( aDocument.IsNull() )
-    return aResList;
+  QStringList aResList = dumpObjectCreation( theTreatedObjects );
+  QString aName = GetName();
 
-  QString aDocName = aDocument->GetDocPyName();
-  QString aStreamName = GetName();
+  // TODO
 
-  aResList << QString( "%1 = %2.CreateObject( %3 );" )
-              .arg( aStreamName ).arg( aDocName ).arg( PYTHON_STREAM_ID );
-  aResList << QString( "%1.SetName( \"%2\" );" )
-              .arg( aStreamName ).arg( aStreamName );
   aResList << QString( "" );
-
-  // TODO
+  aResList << QString( "%1.Update();" ).arg( aName );
+  aResList << QString( "" );
 
   return aResList;
 }
@@ -267,15 +257,31 @@ void HYDROData_Stream::UpdatePrs()
   if(aMakeEdge3.IsDone()) 
     aTopEdge = aMakeEdge3.Edge();
 
-  BRepBuilderAPI_MakeWire aMakeWire( aBotEdge, anEdgLeft, aTopEdge,anEdgRight);
+  // Make wire for 2D presentation with updating of corresponding edges
+  BRepBuilderAPI_MakeWire aMakeWire;
+  
+  aMakeWire.Add( aBotEdge );
+  aBotEdge = aMakeWire.Edge();
+
+  aMakeWire.Add( anEdgLeft );
+  anEdgLeft = aMakeWire.Edge();
+
+  aMakeWire.Add( aTopEdge );
+  aTopEdge = aMakeWire.Edge();
+
+  aMakeWire.Add( anEdgRight );
+  anEdgRight = aMakeWire.Edge();
+
   TopoDS_Wire aSectProfileWire;
   if(aMakeWire.IsDone())
     aSectProfileWire = aMakeWire.Wire();
+
   BRepBuilderAPI_MakeFace aMakeFace( aSectProfileWire, Standard_True );
   TopoDS_Face aFace;
   aMakeFace.Build();
   if( aMakeFace.IsDone() )
     aFace = aMakeFace.Face();
+
   aCmp.Nullify();
   aBB.MakeCompound(aCmp);
   aBB.Add(aCmp,aFace);
@@ -292,7 +298,29 @@ void HYDROData_Stream::UpdatePrs()
 #endif 
 
   // Create the stream groups
-  createGroupObjects();
+  QString aLeftGroupName = GetName() + "_Left_Bank";
+
+  Handle(HYDROData_ShapesGroup) aLeftGroup = createGroupObject();
+  aLeftGroup->SetName( aLeftGroupName );
+  aLeftGroup->AddShape( anEdgLeft );
+
+  QString aRightGroupName = GetName() + "_Right_Bank";
+
+  Handle(HYDROData_ShapesGroup) aRightGroup = createGroupObject();
+  aRightGroup->SetName( aRightGroupName );
+  aRightGroup->AddShape( anEdgRight );
+
+  QString anInGroupName = GetName() + "_Inlet";
+
+  Handle(HYDROData_ShapesGroup) anInGroup = createGroupObject();
+  anInGroup->SetName( anInGroupName );
+  anInGroup->AddShape( aBotEdge );
+
+  QString anOutGroupName = GetName() + "_Outlet";
+
+  Handle(HYDROData_ShapesGroup) anOutGroup = createGroupObject();
+  anOutGroup->SetName( anOutGroupName );
+  anOutGroup->AddShape( aTopEdge );
 
   // This peace of code is for testing of functionality of altitude,
   // will be removed by adv when testing will be finished
@@ -732,114 +760,6 @@ void HYDROData_Stream::updateProfilesOrder()
 #endif
 }
 
-void HYDROData_Stream::createGroupObjects()
-{
-  TopoDS_Shape aStreamShape = GetTopShape();
-  if ( aStreamShape.IsNull() )
-    return;
-
-  HYDROData_SequenceOfObjects aRefProfiles = GetProfiles();
-  if ( aRefProfiles.Length() < 2 )
-    return;
-
-  Handle(HYDROData_Profile) aFirstProfile =
-    Handle(HYDROData_Profile)::DownCast( aRefProfiles.First() );
-  Handle(HYDROData_Profile) aLastProfile =
-    Handle(HYDROData_Profile)::DownCast( aRefProfiles.Last() );
-  if ( aFirstProfile.IsNull() || aLastProfile.IsNull() )
-    return;
-
-  TopoDS_Shape aBotEdgeShape = aFirstProfile->GetTopShape();
-  TopoDS_Shape aTopEdgeShape = aLastProfile->GetTopShape();
-  if ( aBotEdgeShape.IsNull() || aBotEdgeShape.ShapeType() != TopAbs_WIRE ||
-       aTopEdgeShape.IsNull() || aTopEdgeShape.ShapeType() != TopAbs_WIRE )
-    return;
-
-  TopExp_Explorer aBotEdgeShapeExp( aBotEdgeShape, TopAbs_EDGE );
-  TopExp_Explorer aTopEdgeShapeExp( aTopEdgeShape, TopAbs_EDGE );
-  if ( !aBotEdgeShapeExp.More() || !aTopEdgeShapeExp.More() )
-    return;
-
-  TopoDS_Edge aBotEdge = TopoDS::Edge( aBotEdgeShapeExp.Current() );
-  TopoDS_Edge aTopEdge = TopoDS::Edge( aTopEdgeShapeExp.Current() );
-
-  TopoDS_Vertex aBotFirstVert, aBotLastVert, aTopFirstVert, aTopLastVert;
-  TopExp::Vertices( aBotEdge, aBotFirstVert, aBotLastVert, true );
-  TopExp::Vertices( aTopEdge, aTopFirstVert, aTopLastVert, true );
-
-  TopExp_Explorer aStreamFaceExp( aStreamShape, TopAbs_FACE );
-  if ( !aStreamFaceExp.More() )
-    return;
-
-  // Get only face because of 2d profile wires is in compound
-  TopoDS_Face aStreamFace = TopoDS::Face( aStreamFaceExp.Current() );
-  
-  TopTools_SequenceOfShape aStreamWires;
-  HYDROData_ShapesTool::ExploreShapeToShapes( aStreamFace, TopAbs_EDGE, aStreamWires );
-
-  bool anIsLeft = false;
-  bool anIsRight = false;
-
-  TopTools_SequenceOfShape aLeftEdges, aRightEdges;
-  for ( int i = 1, n = aStreamWires.Length(); i <= n; ++i )
-  {
-    TopoDS_Edge anEdge = TopoDS::Edge( aStreamWires.Value( i ) );
-    if ( HYDROData_ShapesTool::IsEdgesEquals( anEdge, aBotEdge ) || 
-         HYDROData_ShapesTool::IsEdgesEquals( anEdge, aTopEdge ) )
-    {
-      anIsLeft = false;
-      anIsRight = false;
-      continue;
-    }
-
-    if ( !anIsLeft && !anIsRight )
-    {
-      TopoDS_Vertex anEdgeFirstVert, anEdgeLastVert;
-      TopExp::Vertices( anEdge, anEdgeFirstVert, anEdgeLastVert, true );
-
-      anIsLeft = HYDROData_ShapesTool::IsVerticesEquals( anEdgeFirstVert, aBotFirstVert ) ||
-                 HYDROData_ShapesTool::IsVerticesEquals( anEdgeLastVert, aTopFirstVert );
-      
-      anIsRight = HYDROData_ShapesTool::IsVerticesEquals( anEdgeFirstVert, aTopLastVert ) ||
-                  HYDROData_ShapesTool::IsVerticesEquals( anEdgeLastVert, aBotLastVert );
-    }
-
-    if ( anIsLeft )
-    {
-      aLeftEdges.Append( anEdge );
-    }
-    else if ( anIsRight )
-    {
-      aRightEdges.Append( anEdge );
-    }
-  }
-
-  // Create edges groups
-  QString aLeftGroupName = GetName() + "_Left_Bank";
-
-  Handle(HYDROData_ShapesGroup) aLeftGroup = createGroupObject();
-  aLeftGroup->SetName( aLeftGroupName );
-  aLeftGroup->SetShapes( aLeftEdges );
-
-  QString aRightGroupName = GetName() + "_Right_Bank";
-
-  Handle(HYDROData_ShapesGroup) aRightGroup = createGroupObject();
-  aRightGroup->SetName( aRightGroupName );
-  aRightGroup->SetShapes( aRightEdges );
-
-  QString anInGroupName = GetName() + "_Inlet";
-
-  Handle(HYDROData_ShapesGroup) anInGroup = createGroupObject();
-  anInGroup->SetName( anInGroupName );
-  anInGroup->AddShape( aBotEdge );
-
-  QString anOutGroupName = GetName() + "_Outlet";
-
-  Handle(HYDROData_ShapesGroup) anOutGroup = createGroupObject();
-  anOutGroup->SetName( anOutGroupName );
-  anOutGroup->AddShape( aTopEdge );
-}
-
 ObjectKind HYDROData_Stream::getAltitudeObjectType() const
 {
   return KIND_STREAM_ALTITUDE;