-// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// 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
#include <GeomAPI_Interpolate.hxx>
#include <Geom_BSplineCurve.hxx>
-#include <TopTools_Array1OfShape.hxx>
+#include <TopTools_HArray1OfShape.hxx>
#include <SortTools_QuickSortOfReal.hxx>
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 = dumpObjectCreation( theTreatedObjects );
QString aName = GetObjPyName();
Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
- setPythonReferenceObject( theTreatedObjects, aResList, aHydAxis, "SetHydraulicAxis" );
+ 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( theTreatedObjects, aResList, aProfile, "AddProfile" );
+ setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aProfile, "AddProfile" );
}
- // Create bottom polyline if exists
+ // Set bottom polyline if exists
const Handle(HYDROData_Polyline3D) aBottomPolyline = GetBottomPolyline();
if ( !aBottomPolyline.IsNull() ) {
- aResList << QString( "%1.GenerateBottomPolyline();" ).arg( aName );
+ setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aBottomPolyline, "SetBottomPolyline" );
}
aResList << QString( "" );
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 )
{
if ( theHydAxis.IsNull() || theProfiles.Length() < 2 )
return false;
- gp_Pnt aPrevFirstPoint, aPrevLastPoint;
Handle(TColgp_HArray1OfPnt) anArrayOfFPnt = new TColgp_HArray1OfPnt(1, theProfiles.Length());
Handle(TColgp_HArray1OfPnt) anArrayOfLPnt = new TColgp_HArray1OfPnt(1, theProfiles.Length());
- TopTools_Array1OfShape anArrOfProfiles(1, theProfiles.Length());
- TopTools_Array1OfShape anArrOf2DProfiles(1, theProfiles.Length());
+ Handle(TopTools_HArray1OfShape) anArrOfProfiles = new TopTools_HArray1OfShape(1, theProfiles.Length());
+ Handle(TopTools_HArray1OfShape) anArrOf2DProfiles = new TopTools_HArray1OfShape(1, theProfiles.Length());
// Pre-processing
HYDROData_SequenceOfObjects::Iterator anIter( theProfiles );
if ( !aProfile->GetLeftPoint( aPnt1, false ) || !aProfile->GetRightPoint( aPnt2, false ) )
continue;
- anArrOfProfiles.SetValue(i,aProfile->GetShape3D());//aProfile->GetTopShape();
- anArrOf2DProfiles.SetValue(i,aProfile->GetTopShape());
+ 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;
+ gp_Pnt aCurFP, aCurLP;
TopoDS_Vertex aV1, aV2;
TopExp::Vertices(TopoDS::Wire(aProf3d), aV1, aV2);
gp_Pnt aP1 = BRep_Tool::Pnt(aV1);
anArrayOfLPnt->SetValue(i,aCurLP);
}
- // Construct of the 3D presentation
- Handle(Geom_BSplineCurve) aBSpline = buildInterpolationCurve (anArrayOfFPnt);
- if(aBSpline.IsNull())
- return false;
-
- TopoDS_Edge anEdgLeft, anEdgRight;
-
- BRepBuilderAPI_MakeEdge aMakeEdge(aBSpline);
- if(aMakeEdge.IsDone())
- anEdgLeft = aMakeEdge.Edge();
-
- if(anEdgLeft.IsNull())
- return false;
-
- aBSpline.Nullify();
- aBSpline = buildInterpolationCurve (anArrayOfLPnt);
- if(aBSpline.IsNull())
- return false;
-
- aMakeEdge.Init(aBSpline);
- if(aMakeEdge.IsDone())
- anEdgRight = aMakeEdge.Edge();
-
- if(anEdgRight.IsNull())
- return false;
-
- BRep_Builder aBB;
- TopoDS_Compound aCmp;
- aBB.MakeCompound(aCmp);
- anIter.Init( theProfiles );
- 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())
- thePrs.myPrs3D = aCmp;
-#ifdef DEB_UPDATE
- else {
- BRepTools::Write(aCmp, "str3d.brep");
- thePrs.myPrs3D = 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 false;
-
- aMakeEdge.Init(aBSpline);
- if(aMakeEdge.IsDone())
- anEdgLeft = aMakeEdge.Edge();
-
- aBSpline.Nullify();
- aBSpline = buildInterpolationCurve (anArrayOfLPnt);
- if(aBSpline.IsNull())
- return false;
-
- aMakeEdge.Init(aBSpline);
- if(aMakeEdge.IsDone())
- anEdgRight = aMakeEdge.Edge();
- if(anEdgRight.IsNull())
- return false;
-
- 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 );
- thePrs.myInlet = aMakeWire.Edge();
-
- aMakeWire.Add( anEdgLeft );
- thePrs.myLeftBank = aMakeWire.Edge();
-
- aMakeWire.Add( aTopEdge );
- thePrs.myOutlet = aMakeWire.Edge();
-
- aMakeWire.Add( anEdgRight );
- thePrs.myRightBank = 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())
- thePrs.myPrs2D = aCmp;
-#ifdef DEB_UPDATE
- else {
- BRepTools::Write(aCmp, "str2d.brep");
- thePrs.myPrs2D = aCmp;
- }
-#endif
-
- return true;
+ return CreatePresentations( anArrayOfFPnt, anArrayOfLPnt, anArrOfProfiles, anArrOf2DProfiles, thePrs );
}
void HYDROData_Stream::UpdatePrs()
anOutGroup->AddShape( aResultPrs.myOutlet );
}
-QColor HYDROData_Stream::DefaultFillingColor()
+QColor HYDROData_Stream::DefaultFillingColor() const
{
return QColor( Qt::green );
}
-QColor HYDROData_Stream::DefaultBorderColor()
+QColor HYDROData_Stream::DefaultBorderColor() const
{
return QColor( Qt::transparent );
}
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 );
+ return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 1);
}
TopoDS_Shape HYDROData_Stream::GetRightShape() const
{
HYDROData_SequenceOfObjects aGroups = GetGroups();
- return getShapeFromGroup( aGroups, 2 );
+ return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 2);
}
TopoDS_Shape HYDROData_Stream::GetInletShape() const
{
HYDROData_SequenceOfObjects aGroups = GetGroups();
- return getShapeFromGroup( aGroups, 3 );
+ return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 3);
}
TopoDS_Shape HYDROData_Stream::GetOutletShape() const
{
HYDROData_SequenceOfObjects aGroups = GetGroups();
- return getShapeFromGroup( aGroups, 4 );
-}
-
-QColor HYDROData_Stream::getDefaultFillingColor() const
-{
- return DefaultFillingColor();
-}
-
-QColor HYDROData_Stream::getDefaultBorderColor() const
-{
- return DefaultBorderColor();
+ return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 4);
}
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,
insertProfileInToOrder( theProfile, aProfileIndex );
// Indicate model of the need to update the stream presentation
- SetToUpdate( true );
+ Changed( Geom_3d );
return true;
}
SetReferenceObjects( theProfiles, DataTag_Profile );
if ( anIsToUpdate )
- SetToUpdate( true );
+ Changed( Geom_3d );
}
return true;
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,
aProfileUZ->RemoveSection( 0 );
- // Fill 2D polyline
- for ( int i = 1; i <= aNbBottomPoints; i++ ) {
- const HYDROData_Profile::ProfilePoint& aBottomPoint = aBottomPoints.Value( i );
- aPolylineXY->AddPoint( 0, HYDROData_PolylineXY::Point( aBottomPoint.X(), aBottomPoint.Y() ) );
- }
-
- // Calculate profile UZ points
-
- // First point
- const HYDROData_Profile::ProfilePoint& aFirstBottomPoint = aBottomPoints.First();
- aProfileUZ->AddPoint( 0, HYDROData_ProfileUZ::Point( 0, aFirstBottomPoint.Z() ) );
-
- // Intermediate points
- double aPolylineCommonDist = aPolylineXY->GetDistance( 0, aPolylineXY->NbPoints( 0 ) - 1 );
-
- for ( int i = 2, aNbPoints = aBottomPoints.Size(); i < aNbPoints; i++ ) {
- const HYDROData_Profile::ProfilePoint& aBottomPoint = aBottomPoints.Value( i );
-
- double aDistance = aPolylineXY->GetDistance( 0, i - 1 );
-
- Standard_Real anU = aDistance; // = ( aDistance / aPolylineCommonDist ) * aPolylineCommonDist;
- aProfileUZ->AddPoint( 0, HYDROData_ProfileUZ::Point( anU, aBottomPoint.Z() ) );
- }
-
- // Last point
- const HYDROData_Profile::ProfilePoint& aLastBottomPoint = aBottomPoints.Last();
- aProfileUZ->AddPoint( 0, HYDROData_ProfileUZ::Point( aPolylineCommonDist, aLastBottomPoint.Z() ) );
+ aProfileUZ->CalculateAndAddPoints(aBottomPoints, aPolylineXY);
return true;
}
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
for ( int aProfileInd = 0; aProfileInd < theInterpolator->GetCalculatedProfilesNumber(); aProfileInd++ ) {
// Get calculated point coordinates
- std::vector<double> aResultCoords = theInterpolator->GetResultProfile( aProfileInd );
- div_t aDiv = std::div( aResultCoords.size(), 3 );
- if ( aDiv.rem != 0 ) {
+ HYDROData_Profile::ProfilePoints aResultPoints = theInterpolator->GetResultProfilePoints( aProfileInd );
+ if ( aResultPoints.IsEmpty() ) {
isOK = false;
continue;
}
-
+
// Create profile object
Handle(HYDROData_Profile) aProfile =
Handle(HYDROData_Profile)::DownCast( aDocument->CreateObject( KIND_PROFILE ) );
aProfile->SetName( aName );
// Fill the profile with points
- HYDROData_Profile::ProfilePoints aProfilePoints;
+ aProfile->SetProfilePoints( aResultPoints );
+
+ // Add profile to the stream
+ bool isAdded = AddProfile( aProfile );
+ if ( !isAdded ) {
+ aProfile->Remove();
+ }
+ else
+ aProfile->Update();
+ }
- int aPointsNb = aDiv.quot;
- for ( int aPointInd = 0; aPointInd <= aPointsNb - 1; aPointInd++ ) {
- int anXindex = aPointInd * 3;
- double anX = aResultCoords[ anXindex ];
- double anY = aResultCoords[ anXindex + 1 ];
- double aZ = aResultCoords[ anXindex + 2 ];
+ 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;
+ }
- aProfilePoints.Append( gp_XYZ( anX, anY, aZ ) );
+ // 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();
+ }
}
+ }
+}
- aProfile->SetProfilePoints( aProfilePoints );
+bool HYDROData_Stream::CreatePresentations( const Handle(TColgp_HArray1OfPnt) theArrayOfFPnt,
+ const Handle(TColgp_HArray1OfPnt) theArrayOfLPnt,
+ const Handle(TopTools_HArray1OfShape) theArrOfProfiles,
+ const Handle(TopTools_HArray1OfShape) theArrOf2DProfiles,
+ PrsDefinition& thePrs )
+{
+ if ( theArrayOfFPnt.IsNull() || theArrayOfLPnt.IsNull() || theArrOfProfiles.IsNull() ) {
+ return false;
+ }
- // Add profile to the stream
- isOK = AddProfile( aProfile ) && isOK;
+ if ( theArrayOfFPnt->Length() != theArrayOfLPnt->Length() ) {
+ return false;
}
+
+ // Construct of the 3D presentation
+ Handle(Geom_BSplineCurve) aBSpline = buildInterpolationCurve (theArrayOfFPnt);
+ if(aBSpline.IsNull())
+ return false;
- return isOK;
+ TopoDS_Edge anEdgLeft, anEdgRight;
+
+ BRepBuilderAPI_MakeEdge aMakeEdge(aBSpline);
+ if(aMakeEdge.IsDone())
+ anEdgLeft = aMakeEdge.Edge();
+
+ if(anEdgLeft.IsNull())
+ return false;
+
+ aBSpline.Nullify();
+ aBSpline = buildInterpolationCurve (theArrayOfLPnt);
+ if(aBSpline.IsNull())
+ return false;
+
+ aMakeEdge.Init(aBSpline);
+ if(aMakeEdge.IsDone())
+ anEdgRight = aMakeEdge.Edge();
+
+ if(anEdgRight.IsNull())
+ return false;
+
+ BRep_Builder aBB;
+ TopoDS_Compound aCmp;
+ aBB.MakeCompound(aCmp);
+ for (int i=1 ; i < theArrOfProfiles->Length() +1; i++ )
+ aBB.Add(aCmp, theArrOfProfiles->Value(i));
+
+ aBB.Add(aCmp,anEdgLeft);
+ aBB.Add(aCmp,anEdgRight);
+ BRepCheck_Analyzer aCh(aCmp);
+ if(aCh.IsValid())
+ thePrs.myPrs3D = aCmp;
+#ifdef DEB_UPDATE
+ else {
+ BRepTools::Write(aCmp, "str3d.brep");
+ thePrs.myPrs3D = aCmp;
+ }
+#endif
+
+ // Construct the top presentation
+ int aNbPoints = theArrayOfFPnt->Length();
+ Handle(TColgp_HArray1OfPnt) anArrayOfFPnt = new TColgp_HArray1OfPnt(1, aNbPoints);
+ Handle(TColgp_HArray1OfPnt) anArrayOfLPnt = new TColgp_HArray1OfPnt(1, aNbPoints);
+ for( int i=1; i <= aNbPoints; i++ ) {
+ gp_Pnt aPnt = theArrayOfFPnt->Value(i);
+ aPnt.SetZ(.0); // make 2d
+ anArrayOfFPnt->SetValue(i, aPnt);
+ aPnt = theArrayOfLPnt->Value(i);
+ aPnt.SetZ(.0);
+ anArrayOfLPnt->SetValue(i, aPnt);
+ }
+
+ aBSpline.Nullify();
+ aBSpline = buildInterpolationCurve (anArrayOfFPnt);
+ if(aBSpline.IsNull())
+ return false;
+
+ aMakeEdge.Init(aBSpline);
+ if(aMakeEdge.IsDone())
+ anEdgLeft = aMakeEdge.Edge();
+
+ aBSpline.Nullify();
+ aBSpline = buildInterpolationCurve (anArrayOfLPnt);
+ if(aBSpline.IsNull())
+ return false;
+
+ aMakeEdge.Init(aBSpline);
+ if(aMakeEdge.IsDone())
+ anEdgRight = aMakeEdge.Edge();
+ if(anEdgRight.IsNull())
+ return false;
+
+ 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 );
+ thePrs.myInlet = aMakeWire.Edge();
+
+ aMakeWire.Add( anEdgLeft );
+ thePrs.myLeftBank = aMakeWire.Edge();
+
+ aMakeWire.Add( aTopEdge );
+ thePrs.myOutlet = aMakeWire.Edge();
+
+ aMakeWire.Add( anEdgRight );
+ thePrs.myRightBank = 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();
+
+ TopoDS_Shape aPrs2D;
+
+ if ( !theArrOf2DProfiles.IsNull() ) {
+ aCmp.Nullify();
+ aBB.MakeCompound(aCmp);
+ aBB.Add(aCmp,aFace);
+ for(int i=1;i <= theArrOf2DProfiles->Length(); i++)
+ aBB.Add(aCmp, theArrOf2DProfiles->Value(i));
+
+ aPrs2D = aCmp;
+ } else {
+ aPrs2D = aFace;
+ }
+
+ aCh.Init(aPrs2D);
+ if(aCh.IsValid())
+ thePrs.myPrs2D = aPrs2D;
+#ifdef DEB_UPDATE
+ else {
+ BRepTools::Write(aPrs2D, "str2d.brep");
+ thePrs.myPrs2D = aPrs2D;
+ }
+#endif
+
+ return true;
}
\ No newline at end of file
