+// Copyright (C) 2014-2015 EDF-R&D
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
#include "HYDROData_Stream.h"
#include "HYDROData_Document.h"
#include "HYDROData_PolylineXY.h"
+#include "HYDROData_Polyline3D.h"
#include "HYDROData_Profile.h"
#include "HYDROData_ShapesGroup.h"
#include "HYDROData_ShapesTool.h"
+#include "HYDROData_IAltitudeObject.h"
+#include "HYDROData_IProfilesInterpolator.h"
+#include "HYDROData_Tool.h"
+#include "HYDROData_DTM.h"
+#include <HYDROData_Bathymetry.h>
#include <TDataStd_RealArray.hxx>
#include <TColStd_Array1OfReal.hxx>
#include <TColStd_ListOfReal.hxx>
#include <TColStd_ListIteratorOfListOfReal.hxx>
-#include <TCollection_CompareOfReal.hxx>
#include <TColgp_Array1OfPnt.hxx>
#include <TColgp_HArray1OfPnt.hxx>
#include <GeomAPI_Interpolate.hxx>
#include <Geom_BSplineCurve.hxx>
-#include <TopTools_Array1OfShape.hxx>
-
-#include <SortTools_QuickSortOfReal.hxx>
+#include <TopTools_HArray1OfShape.hxx>
+#include <TopTools_IndexedMapOfOrientedShape.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TopTools_SequenceOfShape.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
#include <QColor>
#include <QStringList>
+#include <QVector>
//#define DEB_STREAM 1
#ifdef DEB_STREAM
#include <TCollection_AsciiString.hxx>
#endif
-#define PYTHON_STREAM_ID "KIND_STREAM"
+#include <assert.h>
typedef NCollection_DataMap<Standard_Real, Handle(HYDROData_Profile)> HYDROData_DataMapOfRealOfHDProfile;
-IMPLEMENT_STANDARD_HANDLE(HYDROData_Stream,HYDROData_NaturalObject)
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Stream,HYDROData_NaturalObject)
HYDROData_Stream::HYDROData_Stream()
-: HYDROData_NaturalObject()
+: HYDROData_NaturalObject( Geom_3d )
{
}
{
}
-QStringList HYDROData_Stream::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+QStringList HYDROData_Stream::DumpToPython( const QString& thePyScriptPath,
+ MapOfTreatedObjects& theTreatedObjects ) const
{
- QStringList aResList;
+ QStringList aResList = dumpObjectCreation( theTreatedObjects );
+ QString aName = GetObjPyName();
- Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
- if ( aDocument.IsNull() )
- return aResList;
+ Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
+ setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aHydAxis, "SetHydraulicAxis" );
+
+ HYDROData_SequenceOfObjects aSeqOfProfiles = GetProfiles();
+ for ( int i = 1, aNb = aSeqOfProfiles.Size(); i <= aNb; ++i )
+ {
+ const Handle(HYDROData_Entity) aProfile = aSeqOfProfiles.Value( i );
+ setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aProfile, "AddProfile" );
+ }
- QString aDocName = aDocument->GetDocPyName();
- QString aStreamName = GetName();
+ // Set bottom polyline if exists
+ const Handle(HYDROData_Polyline3D) aBottomPolyline = GetBottomPolyline();
+ if ( !aBottomPolyline.IsNull() ) {
+ setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aBottomPolyline, "SetBottomPolyline" );
+ }
- 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( "" );
+ QString aDDZs = QString::number( GetDDZ(), 'f', 3 );
+ QString aSSteps = QString::number( GetSpatialStep(), 'f', 3 );
+ aResList << QString( "%1.SetDDZ( %2 )" ).arg( aName ).arg( aDDZs );
+ aResList << QString( "%1.SetSpatialStep( %2 )" ).arg( aName ).arg( aSSteps );
- // TODO
+ aResList << QString( "" );
+ aResList << QString( "%1.Update()" ).arg( aName );
+ aResList << QString( "" );
return aResList;
}
return aResSeq;
}
-TopoDS_Shape HYDROData_Stream::GetTopShape() const
-{
- return getTopShape();
-}
-
-TopoDS_Shape HYDROData_Stream::GetShape3D() const
-{
- return getShape3D();
-}
-
Handle(Geom_BSplineCurve) HYDROData_Stream::buildInterpolationCurve(
const Handle(TColgp_HArray1OfPnt)& theArrayOfPnt )
{
void HYDROData_Stream::Update()
{
- updateProfilesOrder();
- updatePrs();
+ if (!GetHydraulicAxis().IsNull())
+ updateProfilesOrder();
+
+ // Update bottom polyline if exists
+ const Handle(HYDROData_Polyline3D) aBottomPolyline = GetBottomPolyline();
+ if ( !aBottomPolyline.IsNull() ) {
+ if ( GenerateBottomPolyline() ) {
+ Handle(HYDROData_PolylineXY) aPolylineXY = aBottomPolyline->GetPolylineXY();
+ if ( !aPolylineXY.IsNull() ) {
+ aPolylineXY->Update();
+ }
+ aBottomPolyline->Update();
+ }
+ }
+
+ Handle(HYDROData_DTM) dtm = DTM();
+ dtm->Update();
+ UpdatePrs( dtm );
+
+ HYDROData_NaturalObject::Update();
+}
+
+bool HYDROData_Stream::IsHas2dPrs() const
+{
+ return true;
+}
+
+bool HYDROData_Stream::CreatePresentations( const Handle(HYDROData_DTM)& theDTM,
+ PrsDefinition& thePrs )
+{
+ if ( theDTM.IsNull() )
+ return false;
+
+ HYDROData_SequenceOfObjects profiles = theDTM->GetProfiles();
+ if( profiles.Length() < 2 )
+ return false;
+
+ TopoDS_Shape Out3dPres;
+ TopoDS_Shape Out2dPres;
+ TopoDS_Shape OutLeftB;
+ TopoDS_Shape OutRightB;
+ TopoDS_Shape OutInlet;
+ TopoDS_Shape OutOutlet;
+
+ theDTM->GetPresentationShapes(Out3dPres, Out2dPres, OutLeftB, OutRightB, OutInlet, OutOutlet);
+
+ thePrs.myInlet = OutInlet;
+ thePrs.myOutlet = OutOutlet;
+ thePrs.myLeftBank = OutLeftB;
+ thePrs.myRightBank = OutRightB;
+ thePrs.myPrs2D = Out2dPres;
+ thePrs.myPrs3D = Out3dPres;
+ /*std::vector<TopoDS_Wire> profiles3d;
+ profiles3d.reserve(profiles.Length());
+
+ // Pre-processing
+ HYDROData_SequenceOfObjects::Iterator anIter( profiles );
+ 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& aProfileShape = aProfile->GetShape3D();
+ //TopExp_Explorer exp(aProfileShape, TopAbs_EDGE);
+ profiles3d.push_back( TopoDS::Wire(aProfileShape) );
+ }*/
+
+ return true;
}
-QColor HYDROData_Stream::DefaultFillingColor()
+void HYDROData_Stream::UpdatePrs( const Handle(HYDROData_DTM)& theDTM )
+{
+ HYDROData_NaturalObject::Update();
+
+ PrsDefinition aResultPrs;
+ if ( !CreatePresentations( theDTM, aResultPrs ) )
+ return;
+
+ SetShape3D( aResultPrs.myPrs3D );
+ SetTopShape( aResultPrs.myPrs2D );
+
+ // Create the stream groups
+ QString aLeftGroupName = GetName() + "_Left_Bank";
+
+ Handle(HYDROData_ShapesGroup) aLeftGroup = createGroupObject();
+ aLeftGroup->SetName( aLeftGroupName );
+ aLeftGroup->AddShape( aResultPrs.myLeftBank );
+
+ QString aRightGroupName = GetName() + "_Right_Bank";
+
+ Handle(HYDROData_ShapesGroup) aRightGroup = createGroupObject();
+ aRightGroup->SetName( aRightGroupName );
+ aRightGroup->AddShape( aResultPrs.myRightBank );
+
+ QString anInGroupName = GetName() + "_Inlet";
+
+ Handle(HYDROData_ShapesGroup) anInGroup = createGroupObject();
+ anInGroup->SetName( anInGroupName );
+ anInGroup->AddShape( aResultPrs.myInlet );
+
+ QString anOutGroupName = GetName() + "_Outlet";
+
+ Handle(HYDROData_ShapesGroup) anOutGroup = createGroupObject();
+ anOutGroup->SetName( anOutGroupName );
+ anOutGroup->AddShape( aResultPrs.myOutlet );
+}
+
+QColor HYDROData_Stream::DefaultFillingColor() const
{
return QColor( Qt::green );
}
-QColor HYDROData_Stream::DefaultBorderColor()
+QColor HYDROData_Stream::DefaultBorderColor() const
{
return QColor( Qt::transparent );
}
bool HYDROData_Stream::IsValidAsAxis( const Handle(HYDROData_PolylineXY)& theHydAxis )
{
if ( theHydAxis.IsNull() )
- return false;
+ return true;
TopoDS_Shape aHydraulicShape = theHydAxis->GetShape();
if ( aHydraulicShape.IsNull() ||
return true;
}
-QColor HYDROData_Stream::getDefaultFillingColor() const
+TopoDS_Shape HYDROData_Stream::GetLeftShape() const
+{
+ HYDROData_SequenceOfObjects aGroups = GetGroups();
+ return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 1);
+}
+
+TopoDS_Shape HYDROData_Stream::GetRightShape() const
+{
+ HYDROData_SequenceOfObjects aGroups = GetGroups();
+ return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 2);
+}
+
+TopoDS_Shape HYDROData_Stream::GetInletShape() const
+{
+ HYDROData_SequenceOfObjects aGroups = GetGroups();
+ return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 3);
+}
+
+TopoDS_Shape HYDROData_Stream::GetOutletShape() const
{
- return DefaultFillingColor();
+ HYDROData_SequenceOfObjects aGroups = GetGroups();
+ return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 4);
}
-QColor HYDROData_Stream::getDefaultBorderColor() const
+Handle(HYDROData_DTM) HYDROData_Stream::DTM() const
{
- return DefaultBorderColor();
+ const_cast<HYDROData_Stream*>( this )->checkAndSetAltitudeObject();
+ return Handle(HYDROData_DTM)::DownCast( GetAltitudeObject() );
+}
+
+double HYDROData_Stream::GetDDZ() const
+{
+ return DTM()->GetDDZ();
+}
+
+void HYDROData_Stream::SetDDZ( double theDDZ )
+{
+ DTM()->SetDDZ( theDDZ );
+ Changed( Geom_3d );
+}
+
+double HYDROData_Stream::GetSpatialStep() const
+{
+ return DTM()->GetSpatialStep();
+}
+
+void HYDROData_Stream::SetSpatialStep( double theSpatialStep )
+{
+ DTM()->SetSpatialStep( theSpatialStep );
+ Changed( Geom_3d );
}
bool HYDROData_Stream::SetHydraulicAxis( const Handle(HYDROData_PolylineXY)& theAxis )
updateProfilesOrder();
// Indicate model of the need to update the stream presentation
- SetToUpdate( true );
+ Changed( Geom_3d );
return true;
}
RemoveProfiles();
// Indicate model of the need to update the stream presentation
- SetToUpdate( true );
+ Changed( Geom_3d );
+}
+
+bool HYDROData_Stream::HasIntersection( const Handle(HYDROData_Profile)& theProfile,
+ const TopoDS_Face& thePlane,
+ Standard_Real& theOutPar ) const
+{
+ Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
+ return HasIntersection( aHydAxis, theProfile, thePlane, theOutPar );
}
+#include <BRepAlgo_NormalProjection.hxx>
+
bool HYDROData_Stream::HasIntersection( const Handle(HYDROData_PolylineXY)& theHydAxis,
- const Handle(HYDROData_Profile)& theProfile,
- const TopoDS_Face& thePlane,
- Standard_Real& outPar)
+ const Handle(HYDROData_Profile)& theProfile,
+ const TopoDS_Face& thePlane,
+ Standard_Real& theOutPar )
{
- if ( theProfile.IsNull() || !IsValidAsAxis( theHydAxis ) )
+ if ( theProfile.IsNull() /*|| !IsValidAsAxis( theHydAxis )*/ )
return false;
+ if (theHydAxis.IsNull())
+ return true; //empty h_axis; its's OK
+
TopoDS_Wire aHydraulicWire = TopoDS::Wire( theHydAxis->GetShape() ); //guide line
TopoDS_Wire aProfileWire = TopoDS::Wire( theProfile->GetTopShape() );
- if ( aHydraulicWire.IsNull() || aProfileWire.IsNull() )
+ if ( aProfileWire.IsNull() )
return false;
- BRepProj_Projection aProjector (aProfileWire, thePlane, gp::OZ().Direction());
- if(!aProjector.IsDone())
+ //BRepProj_Projection aProjector (aProfileWire, thePlane, gp::OZ().Direction());
+ BRepAlgo_NormalProjection nproj(thePlane);
+ nproj.Add(aProfileWire);
+ nproj.SetDefaultParams();
+ nproj.Build();
+ if(!nproj.IsDone())
return false;
- TopoDS_Shape aPrjProfile = aProjector.Shape();
+ TopoDS_Shape aPrjProfile = nproj.Projection();
if(aPrjProfile.IsNull())
return false;
TopoDS_Vertex aV1, aV2;
Standard_Integer anIndx(0);
BRepExtrema_ExtCC aCC;
aCC.Initialize(anEdg2);
- outPar = 0.0;
+ theOutPar = 0.0;
anExplo.Init(aHydraulicWire, TopAbs_EDGE);
for(Standard_Integer j=1;anExplo.More();anExplo.Next(),j++) {
const TopoDS_Edge& anEdg1 = TopoDS::Edge(anExplo.Current());
const gp_Pnt& aPnt = aCC.PointOnE1(anIndx);
if(aNum > 1) {
TopExp::Vertices(anEdg1, aV1, aV2, Standard_True);
- outPar += BRep_Tool::Pnt(aV1).Distance(aPnt);
+ theOutPar += BRep_Tool::Pnt(aV1).Distance(aPnt);
} else {
Standard_Real aPar = aCC.ParameterOnE1(anIndx);
- outPar = aPar;
+ theOutPar = aPar;
}
hasInt = true;
break;
// no ints-n
if(aNum > 1) {
TopExp::Vertices(anEdg1, aV1, aV2);
- outPar += BRep_Tool::Pnt(aV1).Distance(BRep_Tool::Pnt(aV2));
+ theOutPar += BRep_Tool::Pnt(aV1).Distance(BRep_Tool::Pnt(aV2));
}
}
} else if(aNum > 1) {
TopExp::Vertices(anEdg1, aV1, aV2);
- outPar += BRep_Tool::Pnt(aV1).Distance(BRep_Tool::Pnt(aV2));
+ theOutPar += BRep_Tool::Pnt(aV1).Distance(BRep_Tool::Pnt(aV2));
}
}
if(hasInt)
return false;
}
-bool HYDROData_Stream::HasIntersection( const Handle(HYDROData_Profile)& theProfile, const TopoDS_Face& thePlane,
- Standard_Real& outPar ) const
-{
- Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
-
- return HasIntersection( aHydAxis, theProfile, thePlane, outPar );
-}
-
-
bool HYDROData_Stream::AddProfile( const Handle(HYDROData_Profile)& theProfile )
{
if ( theProfile.IsNull() )
return false;
- Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
- if ( aHydAxis.IsNull() )
- return false;
+ // Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
+ // if ( aHydAxis.IsNull() )
+ // return false;
TopoDS_Face aPlane;
- if(!BuildFace(aHydAxis, aPlane))
- return false;
+ BuildRefFace( aPlane );
Standard_Real aPar(.0);
if ( HasReference( theProfile, DataTag_Profile ) || !HasIntersection( theProfile, aPlane, aPar ) )
int aProfileIndex = insertParameter( aPar );
insertProfileInToOrder( theProfile, aProfileIndex );
+
+ DTM()->SetProfiles( GetProfiles() );
// Indicate model of the need to update the stream presentation
- SetToUpdate( true );
+ Changed( Geom_3d );
return true;
}
+bool HYDROData_Stream::SetProfiles( const HYDROData_SequenceOfObjects& theProfiles,
+ const bool& theIsToOrder )
+{
+ if ( theIsToOrder )
+ {
+ for ( int i = 1; i <= theProfiles.Length(); ++i )
+ {
+ Handle(HYDROData_Profile) aProfile =
+ Handle(HYDROData_Profile)::DownCast( theProfiles.Value( i ) );
+ if ( aProfile.IsNull() )
+ continue;
+
+ if ( !AddProfile( aProfile ) )
+ {
+ DTM()->SetProfiles( HYDROData_SequenceOfObjects() );
+ return false;
+ }
+ }
+ }
+ else // Just store the sequence of objects as is
+ {
+ bool anIsToUpdate = true;
+
+ HYDROData_SequenceOfObjects anOldProfiles = GetProfiles();
+ if ( anOldProfiles.Length() == theProfiles.Length() )
+ {
+ anIsToUpdate = false;
+
+ for ( int i = 1; i <= theProfiles.Length(); ++i )
+ {
+ Handle(HYDROData_Entity) anOldProfile = anOldProfiles.Value( i );
+ Handle(HYDROData_Entity) aNewProfile = theProfiles.Value( i );
+ if ( !IsEqual( anOldProfile, aNewProfile ) )
+ {
+ anIsToUpdate = true;
+ break;
+ }
+ }
+ }
+
+ SetReferenceObjects( theProfiles, DataTag_Profile );
+
+ if ( anIsToUpdate )
+ Changed( Geom_3d );
+ }
+
+ DTM()->SetProfiles( GetProfiles() );
+ return true;
+}
+
HYDROData_SequenceOfObjects HYDROData_Stream::GetProfiles() const
{
return GetReferenceObjects( DataTag_Profile );
removeParameter( aProfileIndex );
// Indicate model of the need to update the stream presentation
- SetToUpdate( true );
+ Changed( Geom_3d );
return true;
}
void HYDROData_Stream::RemoveProfiles()
{
- bool anIsToUpdate = IsMustBeUpdated() || NbReferenceObjects( DataTag_Profile ) > 0;
-
ClearReferenceObjects( DataTag_Profile );
// Remove the parameters array
removeParametersArray();
// Indicate model of the need to update the stream presentation
- SetToUpdate( anIsToUpdate );
+ Changed( Geom_3d );
}
void HYDROData_Stream::insertProfileInToOrder( const Handle(HYDROData_Profile)& theProfile,
const int theBeforeIndex )
{
- Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
- if ( theProfile.IsNull() || aHydAxis.IsNull() )
+ //Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
+ if ( theProfile.IsNull() )
return;
- TopoDS_Wire aHydraulicWire = TopoDS::Wire( aHydAxis->GetShape() );
+ //TopoDS_Wire aHydraulicWire = TopoDS::Wire( aHydAxis->GetShape() );
TopoDS_Wire aProfileWire = TopoDS::Wire( theProfile->GetTopShape() );
- if ( aHydraulicWire.IsNull() || aProfileWire.IsNull() )
+ if ( aProfileWire.IsNull() )
return;
if ( theBeforeIndex == -1 )
InsertReferenceObject( theProfile, DataTag_Profile, theBeforeIndex );
}
-bool HYDROData_Stream::BuildFace( const Handle(HYDROData_PolylineXY)& theHydAxis,
- TopoDS_Face& thePlane ) const
+void HYDROData_Stream::BuildRefFace( TopoDS_Face& thePlane )
{
- if ( !IsValidAsAxis( theHydAxis ) )
- return false;
-
- TopoDS_Wire aHydraulicWire = TopoDS::Wire( theHydAxis->GetShape() );
-
- gp_Ax2 aX2(gp::XOY());
- gp_Ax3 aX3(aX2);
- gp_Pln aPln(aX3);
- Bnd_Box B;
- BRepBndLib::Add(aHydraulicWire,B);
- Standard_Real axmin,aymin,azmin,axmax,aymax,azmax;
- B.Get(axmin,aymin,azmin,axmax,aymax,azmax);
- BRepBuilderAPI_MakeFace aMkr(aPln, axmin-500., axmax+500., aymin-500., aymax+500.); // to be tuned later according max/ Profile deviation
- if(!aMkr.IsDone() || aMkr.Shape().IsNull()) return false;
- thePlane = TopoDS::Face(aMkr.Shape());
- return true;
+ thePlane = BRepBuilderAPI_MakeFace(gp_Pln(gp_Pnt(0,0,0),gp_Dir(0,0,1))).Face();
}
void HYDROData_Stream::updateProfilesOrder()
return;
TopoDS_Face aPlane;
- if ( !BuildFace( aHydAxis, aPlane ) )
- return;
+ BuildRefFace( aPlane );
Standard_Real aPar( .0 );
continue;
aDM.Bind( aPar, aProfile );
- aList.Append( aPar );
+ aList.Append( aPar );
}
if ( aList.IsEmpty() )
return;
- TColStd_Array1OfReal anArr( 1, aList.Extent() );
+ QVector<double> anArr( aList.Extent() );
TColStd_ListIteratorOfListOfReal it( aList );
for ( int j = 1; it.More(); it.Next(), j++ )
- anArr( j ) = it.Value();
+ anArr[j-1] = it.Value();
// sorting
if ( aList.Extent() > 1 )
{
- TCollection_CompareOfReal Compar;
- SortTools_QuickSortOfReal::Sort( anArr, Compar );
+ //TCollection_CompareOfReal Compar;
+ //SortTools_QuickSortOfReal::Sort( anArr, Compar );
+ std::sort( anArr.begin(), anArr.end() );
- for (int j = 1; j <= anArr.Length(); j++) {
- const Standard_Real aKey = anArr(j);
+ for (int j = 1; j <= anArr.size(); j++) {
+ const Standard_Real aKey = anArr[j-1];
const Handle(HYDROData_Profile)& aProfile = aDM.Find(aKey);
insertProfileInToOrder( aProfile );
}
#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;
+ return KIND_DTM;
}
-void HYDROData_Stream::setParametersArray( const TColStd_Array1OfReal& theArray )
+void HYDROData_Stream::setParametersArray( const QVector<double>& theArray )
{
- if ( theArray.Length() == 0 )
+ if ( theArray.size() == 0 )
{
removeParametersArray();
return;
TDF_Label aLabel = myLab.FindChild( DataTag_ParamsArray );
+ int n = theArray.size();
Handle(TDataStd_RealArray) aParamsArray =
- TDataStd_RealArray::Set( aLabel, theArray.Lower(), theArray.Upper() );
-
- for ( int i = theArray.Lower(), n = theArray.Upper(); i <= n; ++i )
+ TDataStd_RealArray::Set( aLabel, 1, n );
+ for ( int i = 0; i < n; ++i )
{
- const Standard_Real& aParam = theArray( i );
- aParamsArray->SetValue( i, aParam );
+ const Standard_Real& aParam = theArray[i];
+ aParamsArray->SetValue( i+1, aParam );
}
}
{
aResIndex = 0;
- TColStd_Array1OfReal aNewArr( anArr->Lower(), anArr->Upper() + 1 );
+ QVector<double> aNewArr( anArr->Upper() );
bool isInserted = false;
for ( int i = anArr->Lower(), j = i, n = anArr->Upper(); i <= n; ++i, ++j )
}
else
{
- aNewArr( j ) = theParam;
+ aNewArr[j-1] = theParam;
isInserted = true;
++j;
}
}
- aNewArr( j ) = aStoredParam;
+ aNewArr[j-1] = aStoredParam;
}
if ( !isInserted )
{
aResIndex = -1;
- aNewArr( aNewArr.Upper() ) = theParam;
+ aNewArr[aNewArr.size()-1] = theParam;
}
setParametersArray( aNewArr );
}
else
{
- TColStd_Array1OfReal aNewArr( 1, 1 );
- aNewArr.SetValue( 1, theParam );
+ QVector<double> aNewArr( 1 );
+ aNewArr[0] = theParam;
setParametersArray( aNewArr );
}
return;
}
- TColStd_Array1OfReal aNewArr( aParamsArray->Lower(), aParamsArray->Upper() - 1 );
+ QVector<double> aNewArr( aParamsArray->Upper() - 2 );
for ( int i = aParamsArray->Lower(), j = i, k = 0, n = aParamsArray->Upper(); i <= n; ++i, ++k )
{
if ( k == theIndex )
continue;
- aNewArr.SetValue( j, aStoredParam );
+ aNewArr[j-1] = aStoredParam;
++j;
}
setParametersArray( aNewArr );
}
-void HYDROData_Stream::updatePrs()
+bool HYDROData_Stream::GenerateBottomPolyline()
{
- HYDROData_NaturalObject::Update();
+ // Get the document
+ Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+ if ( aDocument.IsNull() ) {
+ return false;
+ }
- 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());
+ // Collect bottom points ( one bottom point from each profile of the stream )
+ HYDROData_Profile::ProfilePoints aBottomPoints;
+
+ HYDROData_SequenceOfObjects aSeqOfProfiles = GetProfiles();
+ for ( int i = 1, aNb = aSeqOfProfiles.Size(); i <= aNb; i++ ) {
+ const Handle(HYDROData_Profile) aProfile =
+ Handle(HYDROData_Profile)::DownCast( aSeqOfProfiles.Value( i ) );
+ if ( aProfile.IsNull() ) {
+ continue;
+ }
+
+ aBottomPoints.Append( aProfile->GetBottomPoint() );
+ }
- // 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 ) )
+ int aNbBottomPoints = aBottomPoints.Size();
+
+ if ( aNbBottomPoints < 2 ) {
+ return false;
+ }
+
+ // Create bottom polyline object if the stream doesn't contain it yet
+ Handle(HYDROData_Polyline3D) aBottom = GetBottomPolyline();
+ if ( aBottom.IsNull() ) {
+ aBottom = Handle(HYDROData_Polyline3D)::DownCast( aDocument->CreateObject( KIND_POLYLINE ) );
+ QString aBaseName = GetName() + "_bottom";
+ QString aName = HYDROData_Tool::GenerateObjectName( aDocument, aBaseName, QStringList(), true );
+ aBottom->SetName( aName );
+
+ SetReferenceObject( aBottom, DataTag_BottomPolyline );
+ }
+
+ // Create 2D polyline if the bottom polyline doesn't contain it yet
+ Handle(HYDROData_PolylineXY) aPolylineXY = aBottom->GetPolylineXY();
+ if ( aPolylineXY.IsNull() ) {
+ aPolylineXY = Handle(HYDROData_PolylineXY)::DownCast( aDocument->CreateObject( KIND_POLYLINEXY ) );
+ QString aBaseName = GetName() + "_bottom_2d";
+ QString aName = HYDROData_Tool::GenerateObjectName( aDocument, aBaseName, QStringList(), true );
+ aPolylineXY->SetName( aName );
+ aBottom->SetPolylineXY( aPolylineXY, false );
+ }
+
+ aPolylineXY->RemoveSections();
+ aPolylineXY->AddSection( "", HYDROData_PolylineXY::SECTION_SPLINE, false );
+
+ // Create profile if the bottom polyline doesn't contain it yet
+ Handle(HYDROData_ProfileUZ) aProfileUZ = aBottom->GetProfileUZ();
+ if ( aProfileUZ.IsNull() ) {
+ Handle(HYDROData_Profile) aProfile =
+ Handle(HYDROData_Profile)::DownCast( aDocument->CreateObject( KIND_PROFILE ) );
+ QString aBaseName = GetName() + "_bottom_profile";
+ QString aName = HYDROData_Tool::GenerateObjectName( aDocument, aBaseName, QStringList(), true );
+ aProfile->SetName( aName );
+ aProfileUZ = aProfile->GetProfileUZ( true );
+ aBottom->SetProfileUZ( aProfileUZ );
+ }
+
+ aProfileUZ->RemoveSection( 0 );
+
+ aProfileUZ->CalculateAndAddPoints(aBottomPoints, aPolylineXY);
+
+ return true;
+}
+
+Handle(HYDROData_Polyline3D) HYDROData_Stream::GetBottomPolyline() const
+{
+ return Handle(HYDROData_Polyline3D)::DownCast(
+ GetReferenceObject( DataTag_BottomPolyline ) );
+}
+
+bool HYDROData_Stream::SetBottomPolyline( const Handle(HYDROData_Polyline3D)& theBottom )
+{
+ if ( theBottom.IsNull() ) {
+ return false;
+ }
+
+ SetReferenceObject( theBottom, DataTag_BottomPolyline );
+
+ return true;
+}
+
+bool HYDROData_Stream::Interpolate( HYDROData_IProfilesInterpolator* theInterpolator )
+{
+ // Get the document
+ Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+ if ( aDocument.IsNull() ) {
+ return false;
+ }
+
+ if ( theInterpolator->GetCalculatedProfilesNumber() < 1 ) {
+ theInterpolator->Calculate();
+ }
+
+ if ( theInterpolator->GetErrorCode() != OK ) {
+ return false;
+ }
+
+ bool isOK = true;
+
+ for ( int aProfileInd = 0; aProfileInd < theInterpolator->GetCalculatedProfilesNumber(); aProfileInd++ ) {
+ // Get calculated point coordinates
+ HYDROData_Profile::ProfilePoints aResultPoints = theInterpolator->GetResultProfilePoints( aProfileInd );
+ if ( aResultPoints.IsEmpty() ) {
+ isOK = false;
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;
+ }
+
+ // Create profile object
+ Handle(HYDROData_Profile) aProfile =
+ Handle(HYDROData_Profile)::DownCast( aDocument->CreateObject( KIND_PROFILE ) );
+ QString aBaseName = GetName() + "_interp_profile";
+ QString aName = HYDROData_Tool::GenerateObjectName( aDocument, aBaseName );
+ aProfile->SetName( aName );
+
+ // Fill the profile with points
+ aProfile->SetProfilePoints( aResultPoints );
+
+ // Add profile to the stream
+ bool isAdded = AddProfile( aProfile );
+ if ( !isAdded ) {
+ aProfile->Remove();
+ }
else
- aCurFP = aP1;
- anArrayOfFPnt->SetValue(i,aCurFP);
- anArrayOfLPnt->SetValue(i,aCurLP);
+ aProfile->Update();
}
- // 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())
+ if ( isOK )
+ Update();
+
+ return isOK;
+}
+
+void HYDROData_Stream::CopyTo( const Handle(HYDROData_Entity)& theDestination,
+ bool isGenerateNewName ) const
+{
+ // Get the document
+ Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+ if ( aDocument.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);
}
+
+ // Call base method
+ HYDROData_Entity::CopyTo( theDestination, isGenerateNewName );
+
+ Handle(HYDROData_Stream) aStreamCopy =
+ Handle(HYDROData_Stream)::DownCast( theDestination );
+
+ // Copy bottom polyline if exists
+ if ( !aStreamCopy.IsNull() ) {
+ const Handle(HYDROData_Polyline3D) aBottom = GetBottomPolyline();
+ if ( !aBottom.IsNull() ) {
+ aStreamCopy->ClearReferenceObjects( DataTag_BottomPolyline );
+ aStreamCopy->GenerateBottomPolyline();
+ const Handle(HYDROData_Polyline3D) aBottomCopy = aStreamCopy->GetBottomPolyline();
+ if ( !aBottomCopy.IsNull() && !aBottomCopy->GetPolylineXY().IsNull() ) {
+ aBottomCopy->GetPolylineXY()->Update();
+ aBottomCopy->Update();
+ }
+ }
+ }
+}
+void HYDROData_Stream::CreatePresentations( const Handle(TColgp_HArray1OfPnt) theArrayOfFPnt,
+ const Handle(TColgp_HArray1OfPnt) theArrayOfLPnt,
+ const Handle(TopTools_HArray1OfShape) theArrOfProfiles,
+ PrsDefinition& thePrs )
+{
+
+ HYDROData_Bathymetry::AltitudePoints left;
+ for (int i = theArrayOfLPnt->Lower(); i <= theArrayOfLPnt->Upper(); i++)
+ {
+ left.push_back(HYDROData_Bathymetry::AltitudePoint(theArrayOfLPnt->Value(i).X(),
+ theArrayOfLPnt->Value(i).Y(),
+ theArrayOfLPnt->Value(i).Z()));
+ }
+
+ HYDROData_Bathymetry::AltitudePoints right;
+ for (int i = theArrayOfFPnt->Lower(); i <= theArrayOfFPnt->Upper(); i++)
+ {
+ right.push_back(HYDROData_Bathymetry::AltitudePoint(theArrayOfFPnt->Value(i).X(),
+ theArrayOfFPnt->Value(i).Y(),
+ theArrayOfFPnt->Value(i).Z()));
+ }
+
+ std::vector<HYDROData_Bathymetry::AltitudePoints> dummy;
+ TopTools_IndexedMapOfOrientedShape ll = HYDROData_DTM::Create3DShape(left, right, dummy);
+
+ TopoDS_Shape LB, RB, IL, OL;
+
+ if (!ll.IsEmpty())
+ {
+ TopAbs_ShapeEnum ll1_sht = ll(1).ShapeType();
+ TopAbs_ShapeEnum ll2_sht = ll(2).ShapeType();
+ if ((ll1_sht == TopAbs_WIRE || ll1_sht == TopAbs_EDGE) &&
+ (ll2_sht == TopAbs_WIRE || ll2_sht == TopAbs_EDGE))
+ {
+ LB = ll(1);
+ RB = ll(2);
+ }
+ }
+
+ IL = TopoDS::Wire(theArrOfProfiles->Value(theArrOfProfiles->Lower())); //TODO check that
+ OL = TopoDS::Wire(theArrOfProfiles->Value(theArrOfProfiles->Upper()));
+
+ //make new compound so it's shapes will be in known order to build correct projection
+ BRep_Builder BB;
+ TopoDS_Compound newCmp;
+ BB.MakeCompound(newCmp);
+ BB.Add(newCmp, LB);
+ BB.Add(newCmp, IL);
+ BB.Add(newCmp, OL);
+ BB.Add(newCmp, RB);
+
+ thePrs.myPrs3D = newCmp;
+
+ TopTools_SequenceOfShape LS;
+ //HYDROData_DTM::Get2dFaceFrom3dPres( newCmp, TopoDS::Face(thePrs.myPrs2D), &LS, ind );
+
+ HYDROData_DTM::GetPlanarFaceFromBanks(TopoDS::Edge(LB), TopoDS::Edge(RB), TopoDS::Face(thePrs.myPrs2D), &LS);
+
+#ifndef NDEBUG
+ TopTools_IndexedMapOfShape EE;
+ TopExp::MapShapes(thePrs.myPrs2D, TopAbs_EDGE, EE);
+ int noncontNb = 0;
+ for (int i = 1; i <= 4; i++)
+ {
+ TopoDS_Shape W = LS(i);
+ TopTools_IndexedMapOfShape EW;
+ TopExp::MapShapes(W, TopAbs_EDGE, EW);
+ for (int k = 1; k <= EW.Extent(); k++)
+ noncontNb += !EE.Contains(EW(k));
+ }
+ //noncontNb > 0 => some problem with edge history
+ assert(noncontNb == 0);
#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
+ thePrs.myLeftBank = LS(1);
+ thePrs.myInlet = LS(2);
+ thePrs.myOutlet = LS(3);
+ thePrs.myRightBank = LS(4);
- // Create the stream groups
- createGroupObjects();
-}
\ No newline at end of file
+}
