Salome HOME
Dump of profile is implemented.
[modules/hydro.git] / src / HYDROData / HYDROData_Stream.cxx
index 47ca38face542f0603ba8d6862118d94ed4441c5..312657aedf5f2144c7c2d00ddbb241df0cf15213 100644 (file)
@@ -6,6 +6,7 @@
 #include "HYDROData_Profile.h"
 #include "HYDROData_ShapesGroup.h"
 #include "HYDROData_ShapesTool.h"
+#include "HYDROData_IAltitudeObject.h"
 
 #include <TDataStd_RealArray.hxx>
 
@@ -67,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)
@@ -86,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;
 }
@@ -144,7 +135,200 @@ Handle(Geom_BSplineCurve) HYDROData_Stream::buildInterpolationCurve(
 void HYDROData_Stream::Update()
 {
   updateProfilesOrder();
-  updatePrs();
+  UpdatePrs();
+}
+
+void HYDROData_Stream::UpdatePrs()
+{
+  HYDROData_NaturalObject::Update();
+
+  Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
+  HYDROData_SequenceOfObjects aRefProfiles = GetProfiles();
+  if ( aHydAxis.IsNull() || aRefProfiles.Length() < 2 )
+    return; 
+  bool anIsFirst = true;
+  gp_Pnt aPrevFirstPoint, aPrevLastPoint;
+  Handle(TColgp_HArray1OfPnt) anArrayOfFPnt    = new TColgp_HArray1OfPnt(1, aRefProfiles.Length());
+  Handle(TColgp_HArray1OfPnt) anArrayOfLPnt    = new TColgp_HArray1OfPnt(1, aRefProfiles.Length());  
+  TopTools_Array1OfShape anArrOfProfiles(1, aRefProfiles.Length());
+  TopTools_Array1OfShape anArrOf2DProfiles(1, aRefProfiles.Length());
+
+  // Pre-processing
+  HYDROData_SequenceOfObjects::Iterator anIter( aRefProfiles );
+  for (int i=1 ; anIter.More(); anIter.Next(),i++ )
+  {
+    Handle(HYDROData_Profile) aProfile =
+      Handle(HYDROData_Profile)::DownCast( anIter.Value() );
+    if ( aProfile.IsNull() )
+      continue;    
+    const TopoDS_Shape& aProf3d = aProfile->GetShape3D();
+    gp_XY aPnt1, aPnt2;
+    if ( !aProfile->GetLeftPoint( aPnt1 ) || !aProfile->GetRightPoint( aPnt2 ) )
+      continue;
+    anArrOfProfiles.SetValue(i,aProfile->GetShape3D());//aProfile->GetTopShape();
+    anArrOf2DProfiles.SetValue(i,aProfile->GetTopShape());
+
+    gp_Pnt aCurFirstPoint( aPnt1.X(), aPnt1.Y(), 0 ), aCurFP;
+    gp_Pnt aCurLastPoint(  aPnt2.X(), aPnt2.Y(), 0 ), aCurLP;
+    TopoDS_Vertex aV1, aV2;
+    TopExp::Vertices(TopoDS::Wire(aProf3d), aV1, aV2);
+       gp_Pnt aP1 = BRep_Tool::Pnt(aV1);
+    if(aP1.X() == aPnt1.X() && aP1.Y() == aPnt1.Y())
+      aCurFP = aP1;
+    else
+      aCurLP = aP1;
+    aP1 = BRep_Tool::Pnt(aV2);
+    if(aP1.X() == aPnt2.X() && aP1.Y() == aPnt2.Y())
+      aCurLP = aP1;
+    else
+      aCurFP = aP1;
+    anArrayOfFPnt->SetValue(i,aCurFP);
+    anArrayOfLPnt->SetValue(i,aCurLP);
+  }
+
+  // Construct of the 3D presentation
+  Handle(Geom_BSplineCurve) aBSpline = buildInterpolationCurve (anArrayOfFPnt);
+  if(aBSpline.IsNull())
+    return;
+  TopoDS_Edge anEdgLeft, anEdgRight;
+  BRepBuilderAPI_MakeEdge aMakeEdge(aBSpline);
+  if(aMakeEdge.IsDone()) 
+    anEdgLeft = aMakeEdge.Edge();
+  if(anEdgLeft.IsNull())
+    return;
+  aBSpline.Nullify();
+  aBSpline = buildInterpolationCurve (anArrayOfLPnt);  
+  if(aBSpline.IsNull())
+    return; 
+  aMakeEdge.Init(aBSpline);
+  if(aMakeEdge.IsDone()) 
+    anEdgRight = aMakeEdge.Edge();
+  if(anEdgRight.IsNull())
+    return;
+  BRep_Builder aBB;
+  TopoDS_Compound aCmp;
+  aBB.MakeCompound(aCmp);
+  anIter.Init( aRefProfiles );
+  for (int i=1 ; i < anArrOfProfiles.Length() +1; i++ )  
+    aBB.Add(aCmp, anArrOfProfiles.Value(i));
+  aBB.Add(aCmp,anEdgLeft);
+  aBB.Add(aCmp,anEdgRight);
+  BRepCheck_Analyzer aCh(aCmp);
+  if(aCh.IsValid())
+    SetShape3D(aCmp);
+#ifdef DEB_UPDATE
+  else {
+    BRepTools::Write(aCmp, "str3d.brep");
+    SetShape3D(aCmp);
+  }
+#endif
+
+  // Construct the top presentation
+  for(int i=1;i<= anArrayOfLPnt->Length();i++) {
+      gp_Pnt aPnt = anArrayOfFPnt->Value(i);
+      aPnt.SetZ(.0); // make 2d
+      anArrayOfFPnt->SetValue(i, aPnt);
+      aPnt = anArrayOfLPnt->Value(i);
+      aPnt.SetZ(.0);
+      anArrayOfLPnt->SetValue(i, aPnt);
+  }
+  aBSpline.Nullify();
+  aBSpline = buildInterpolationCurve (anArrayOfFPnt);  
+  if(aBSpline.IsNull())
+    return; 
+  aMakeEdge.Init(aBSpline);
+  if(aMakeEdge.IsDone()) 
+      anEdgLeft = aMakeEdge.Edge();
+  aBSpline.Nullify();
+  aBSpline = buildInterpolationCurve (anArrayOfLPnt);  
+  if(aBSpline.IsNull())
+    return; 
+  aMakeEdge.Init(aBSpline);
+  if(aMakeEdge.IsDone()) 
+    anEdgRight = aMakeEdge.Edge();
+  if(anEdgRight.IsNull())
+    return;
+  BRepBuilderAPI_MakeEdge aMakeEdge2(anArrayOfFPnt->Value(1),anArrayOfLPnt->Value(1));
+  TopoDS_Edge aBotEdge, aTopEdge;
+  if(aMakeEdge2.IsDone()) 
+    aBotEdge = aMakeEdge2.Edge();
+  BRepBuilderAPI_MakeEdge aMakeEdge3(anArrayOfFPnt->Value(anArrayOfFPnt->Length()),anArrayOfLPnt->Value(anArrayOfLPnt->Length()));
+  if(aMakeEdge3.IsDone()) 
+    aTopEdge = aMakeEdge3.Edge();
+
+  // 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);
+  for(int i=1;i <= anArrOf2DProfiles.Length(); i++)
+    aBB.Add(aCmp,anArrOf2DProfiles.Value(i));
+  aCh.Init(aCmp);
+  if(aCh.IsValid())
+    SetTopShape(aCmp);
+#ifdef DEB_UPDATE
+  else {
+    BRepTools::Write(aCmp, "str2d.brep");
+    SetTopShape(aCmp);
+  }
+#endif 
+
+  // Create the stream groups
+  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
+  Handle(HYDROData_IAltitudeObject) anAltObj = GetAltitudeObject();
+  gp_XY aTestPnt( 5, 0 );
+  anAltObj->GetAltitudeForPoint( aTestPnt );
+  // End of test code
+
 }
 
 QColor HYDROData_Stream::DefaultFillingColor()
@@ -171,6 +355,51 @@ bool HYDROData_Stream::IsValidAsAxis( const Handle(HYDROData_PolylineXY)& theHyd
   return true;
 }
 
+TopoDS_Shape getShapeFromGroup( const HYDROData_SequenceOfObjects& theGroups,
+                                const int                          theGroupId )
+{
+  TopoDS_Shape aResShape;
+  if ( theGroups.Length() != 4 )
+    return aResShape;
+
+  Handle(HYDROData_ShapesGroup) aGroup =
+    Handle(HYDROData_ShapesGroup)::DownCast( theGroups.Value( theGroupId ) );
+  if ( aGroup.IsNull() )
+    return aResShape;
+
+  TopTools_SequenceOfShape aGroupShapes;
+  aGroup->GetShapes( aGroupShapes );
+
+  if ( !aGroupShapes.IsEmpty() )
+    aResShape = aGroupShapes.First();
+
+  return aResShape;
+}
+
+TopoDS_Shape HYDROData_Stream::GetLeftShape() const
+{
+  HYDROData_SequenceOfObjects aGroups = GetGroups();
+  return getShapeFromGroup( aGroups, 1 );
+}
+
+TopoDS_Shape HYDROData_Stream::GetRightShape() const
+{
+  HYDROData_SequenceOfObjects aGroups = GetGroups();
+  return getShapeFromGroup( aGroups, 2 );
+}
+
+TopoDS_Shape HYDROData_Stream::GetInletShape() const
+{
+  HYDROData_SequenceOfObjects aGroups = GetGroups();
+  return getShapeFromGroup( aGroups, 3 );
+}
+
+TopoDS_Shape HYDROData_Stream::GetOutletShape() const
+{
+  HYDROData_SequenceOfObjects aGroups = GetGroups();
+  return getShapeFromGroup( aGroups, 4 );
+}
+
 QColor HYDROData_Stream::getDefaultFillingColor() const
 {
   return DefaultFillingColor();
@@ -531,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;
@@ -774,150 +895,3 @@ void HYDROData_Stream::removeParameter( const int& theIndex )
 
   setParametersArray( aNewArr );
 }
-
-void HYDROData_Stream::updatePrs()
-{
-  HYDROData_NaturalObject::Update();
-
-  Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
-  HYDROData_SequenceOfObjects aRefProfiles = GetProfiles();
-  if ( aHydAxis.IsNull() || aRefProfiles.Length() < 2 )
-    return; 
-  bool anIsFirst = true;
-  gp_Pnt aPrevFirstPoint, aPrevLastPoint;
-  Handle(TColgp_HArray1OfPnt) anArrayOfFPnt    = new TColgp_HArray1OfPnt(1, aRefProfiles.Length());
-  Handle(TColgp_HArray1OfPnt) anArrayOfLPnt    = new TColgp_HArray1OfPnt(1, aRefProfiles.Length());  
-  TopTools_Array1OfShape anArrOfProfiles(1, aRefProfiles.Length());
-  TopTools_Array1OfShape anArrOf2DProfiles(1, aRefProfiles.Length());
-
-  // Pre-processing
-  HYDROData_SequenceOfObjects::Iterator anIter( aRefProfiles );
-  for (int i=1 ; anIter.More(); anIter.Next(),i++ )
-  {
-    Handle(HYDROData_Profile) aProfile =
-      Handle(HYDROData_Profile)::DownCast( anIter.Value() );
-    if ( aProfile.IsNull() )
-      continue;    
-    const TopoDS_Shape& aProf3d = aProfile->GetShape3D();
-    gp_XY aPnt1, aPnt2;
-    if ( !aProfile->GetLeftPoint( aPnt1 ) || !aProfile->GetRightPoint( aPnt2 ) )
-      continue;
-    anArrOfProfiles.SetValue(i,aProfile->GetShape3D());//aProfile->GetTopShape();
-    anArrOf2DProfiles.SetValue(i,aProfile->GetTopShape());
-
-    gp_Pnt aCurFirstPoint( aPnt1.X(), aPnt1.Y(), 0 ), aCurFP;
-    gp_Pnt aCurLastPoint(  aPnt2.X(), aPnt2.Y(), 0 ), aCurLP;
-    TopoDS_Vertex aV1, aV2;
-    TopExp::Vertices(TopoDS::Wire(aProf3d), aV1, aV2);
-       gp_Pnt aP1 = BRep_Tool::Pnt(aV1);
-    if(aP1.X() == aPnt1.X() && aP1.Y() == aPnt1.Y())
-      aCurFP = aP1;
-    else
-      aCurLP = aP1;
-    aP1 = BRep_Tool::Pnt(aV2);
-    if(aP1.X() == aPnt2.X() && aP1.Y() == aPnt2.Y())
-      aCurLP = aP1;
-    else
-      aCurFP = aP1;
-    anArrayOfFPnt->SetValue(i,aCurFP);
-    anArrayOfLPnt->SetValue(i,aCurLP);
-  }
-
-  // Construct of the 3D presentation
-  Handle(Geom_BSplineCurve) aBSpline = buildInterpolationCurve (anArrayOfFPnt);
-  if(aBSpline.IsNull())
-    return;
-  TopoDS_Edge anEdgLeft, anEdgRight;
-  BRepBuilderAPI_MakeEdge aMakeEdge(aBSpline);
-  if(aMakeEdge.IsDone()) 
-    anEdgLeft = aMakeEdge.Edge();
-  if(anEdgLeft.IsNull())
-    return;
-  aBSpline.Nullify();
-  aBSpline = buildInterpolationCurve (anArrayOfLPnt);  
-  if(aBSpline.IsNull())
-    return; 
-  aMakeEdge.Init(aBSpline);
-  if(aMakeEdge.IsDone()) 
-    anEdgRight = aMakeEdge.Edge();
-  if(anEdgRight.IsNull())
-    return;
-  BRep_Builder aBB;
-  TopoDS_Compound aCmp;
-  aBB.MakeCompound(aCmp);
-  anIter.Init( aRefProfiles );
-  for (int i=1 ; i < anArrOfProfiles.Length() +1; i++ )  
-    aBB.Add(aCmp, anArrOfProfiles.Value(i));
-  aBB.Add(aCmp,anEdgLeft);
-  aBB.Add(aCmp,anEdgRight);
-  BRepCheck_Analyzer aCh(aCmp);
-  if(aCh.IsValid())
-    SetShape3D(aCmp);
-#ifdef DEB_UPDATE
-  else {
-    BRepTools::Write(aCmp, "str3d.brep");
-    SetShape3D(aCmp);
-  }
-#endif
-
-  // Construct the top presentation
-  for(int i=1;i<= anArrayOfLPnt->Length();i++) {
-      gp_Pnt aPnt = anArrayOfFPnt->Value(i);
-      aPnt.SetZ(.0); // make 2d
-      anArrayOfFPnt->SetValue(i, aPnt);
-      aPnt = anArrayOfLPnt->Value(i);
-      aPnt.SetZ(.0);
-      anArrayOfLPnt->SetValue(i, aPnt);
-  }
-  aBSpline.Nullify();
-  aBSpline = buildInterpolationCurve (anArrayOfFPnt);  
-  if(aBSpline.IsNull())
-    return; 
-  aMakeEdge.Init(aBSpline);
-  if(aMakeEdge.IsDone()) 
-      anEdgLeft = aMakeEdge.Edge();
-  aBSpline.Nullify();
-  aBSpline = buildInterpolationCurve (anArrayOfLPnt);  
-  if(aBSpline.IsNull())
-    return; 
-  aMakeEdge.Init(aBSpline);
-  if(aMakeEdge.IsDone()) 
-    anEdgRight = aMakeEdge.Edge();
-  if(anEdgRight.IsNull())
-    return;
-  BRepBuilderAPI_MakeEdge aMakeEdge2(anArrayOfFPnt->Value(1),anArrayOfLPnt->Value(1));
-  TopoDS_Edge aBotEdge, aTopEdge;
-  if(aMakeEdge2.IsDone()) 
-    aBotEdge = aMakeEdge2.Edge();
-  BRepBuilderAPI_MakeEdge aMakeEdge3(anArrayOfFPnt->Value(anArrayOfFPnt->Length()),anArrayOfLPnt->Value(anArrayOfLPnt->Length()));
-  if(aMakeEdge3.IsDone()) 
-    aTopEdge = aMakeEdge3.Edge();
-
-  BRepBuilderAPI_MakeWire aMakeWire( aBotEdge, anEdgLeft, aTopEdge,anEdgRight);
-  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);
-  for(int i=1;i <= anArrOf2DProfiles.Length(); i++)
-    aBB.Add(aCmp,anArrOf2DProfiles.Value(i));
-  aCh.Init(aCmp);
-  if(aCh.IsValid())
-    SetTopShape(aCmp);
-#ifdef DEB_UPDATE
-  else {
-    BRepTools::Write(aCmp, "str2d.brep");
-    SetTopShape(aCmp);
-  }
-#endif 
-
-  // Create the stream groups
-  createGroupObjects();
-}
\ No newline at end of file