+// 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 <BRep_Builder.hxx>
-#include <BRepBuilderAPI_MakeEdge.hxx>
-#include <BRepBuilderAPI_MakeWire.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
+#include <TDataStd_RealArray.hxx>
+
+#include <Precision.hxx>
+
+#include <NCollection_DataMap.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 <TopoDS.hxx>
#include <TopoDS_Wire.hxx>
#include <TopoDS_Shell.hxx>
#include <TopoDS_Face.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Vertex.hxx>
+#include <TopExp.hxx>
+#include <TopExp_Explorer.hxx>
+
+#include <Bnd_Box.hxx>
+#include <BRep_Builder.hxx>
+#include <BRepBuilderAPI_MakeEdge.hxx>
+#include <BRepBuilderAPI_MakeWire.hxx>
+#include <BRepBuilderAPI_MakeFace.hxx>
+
+#include <BRepBndLib.hxx>
+#include <BRepProj_Projection.hxx>
+#include <BRepExtrema_ExtCC.hxx>
+#include <BRepCheck_Analyzer.hxx>
+
+#include <gp.hxx>
+#include <gp_Ax1.hxx>
+#include <gp_Ax2.hxx>
+#include <gp_Ax3.hxx>
+#include <gp_Vec.hxx>
+#include <gp_Pnt.hxx>
+#include <gp_Pln.hxx>
+
+#include <GeomAPI_Interpolate.hxx>
+#include <Geom_BSplineCurve.hxx>
+
+#include <TopTools_HArray1OfShape.hxx>
+
+#include <SortTools_QuickSortOfReal.hxx>
+
+#include <QColor>
#include <QStringList>
-#define PYTHON_STREAM_ID "KIND_STREAM"
+//#define DEB_STREAM 1
+#ifdef DEB_STREAM
+//#define DEB_HASINT 1
+//#define DEB_UPDATE 1
+#include <BRepTools.hxx>
+#include <TCollection_AsciiString.hxx>
+#endif
+
+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( "" );
-
- // TODO
+ aResList << QString( "%1.Update();" ).arg( aName );
+ aResList << QString( "" );
return aResList;
}
-TopoDS_Shape HYDROData_Stream::GetTopShape() const
+HYDROData_SequenceOfObjects HYDROData_Stream::GetAllReferenceObjects() const
{
- return getTopShape();
+ HYDROData_SequenceOfObjects aResSeq = HYDROData_Object::GetAllReferenceObjects();
+
+ Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
+ if ( !aHydAxis.IsNull() )
+ aResSeq.Append( aHydAxis );
+
+ HYDROData_SequenceOfObjects aSeqOfProfiles = GetProfiles();
+ aResSeq.Append( aSeqOfProfiles );
+
+ return aResSeq;
}
-TopoDS_Shape HYDROData_Stream::GetShape3D() const
+Handle(Geom_BSplineCurve) HYDROData_Stream::buildInterpolationCurve(
+ const Handle(TColgp_HArray1OfPnt)& theArrayOfPnt )
{
- return getShape3D();
+ Handle(Geom_BSplineCurve) aBSpline;
+ GeomAPI_Interpolate anInterpolator (theArrayOfPnt, Standard_False, 1.0e-5);
+ anInterpolator.Perform() ;
+ if (anInterpolator.IsDone())
+ aBSpline = anInterpolator.Curve();
+ return aBSpline;
}
void HYDROData_Stream::Update()
{
- removeTopShape();
- removeShape3D();
+ updateProfilesOrder();
- Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
- HYDROData_SequenceOfObjects aRefProfiles = GetProfiles();
- if ( aHydAxis.IsNull() || aRefProfiles.IsEmpty() )
- return;
+ // 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();
+ }
+ }
- TopoDS_Shell a2dShell;
- BRep_Builder a2dShellBuilder;
- a2dShellBuilder.MakeShell( a2dShell );
+ UpdatePrs();
+}
- bool anIsFirst = true;
- gp_Pnt aPrevFirstPoint, aPrevLastPoint;
-
- // Construct the top presentation
- HYDROData_SequenceOfObjects::Iterator anIter( aRefProfiles );
- for ( ; anIter.More(); anIter.Next() )
+bool HYDROData_Stream::IsHas2dPrs() const
+{
+ return true;
+}
+
+bool HYDROData_Stream::CreatePresentations( const Handle(HYDROData_PolylineXY)& theHydAxis,
+ const HYDROData_SequenceOfObjects& theProfiles,
+ PrsDefinition& thePrs )
+{
+ if ( theHydAxis.IsNull() || theProfiles.Length() < 2 )
+ return false;
+
+ Handle(TColgp_HArray1OfPnt) anArrayOfFPnt = new TColgp_HArray1OfPnt(1, theProfiles.Length());
+ Handle(TColgp_HArray1OfPnt) anArrayOfLPnt = new TColgp_HArray1OfPnt(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 );
+ 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->GetFirstPoint( aPnt1 ) || !aProfile->GetLastPoint( aPnt2 ) )
+ if ( !aProfile->GetLeftPoint( aPnt1, false ) || !aProfile->GetRightPoint( aPnt2, false ) )
continue;
-
- gp_Pnt aCurFirstPoint( aPnt1.X(), aPnt1.Y(), 0 );
- gp_Pnt aCurLastPoint( aPnt2.X(), aPnt2.Y(), 0 );
- if ( anIsFirst )
- {
- aPrevFirstPoint = aCurFirstPoint;
- aPrevLastPoint = aCurLastPoint;
- anIsFirst = false;
- continue;
- }
+ anArrOfProfiles->SetValue(i,aProfile->GetShape3D());//aProfile->GetTopShape();
+ anArrOf2DProfiles->SetValue(i,aProfile->GetTopShape());
+
+ gp_Pnt aCurFP, 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);
+ }
- BRepBuilderAPI_MakeEdge aFirstEdge( aPrevFirstPoint, aPrevLastPoint );
- BRepBuilderAPI_MakeEdge aSecondEdge( aPrevLastPoint, aCurLastPoint );
- BRepBuilderAPI_MakeEdge aThirdEdge( aCurLastPoint, aCurFirstPoint );
- BRepBuilderAPI_MakeEdge aFourthEdge( aCurFirstPoint, aPrevFirstPoint );
+ return CreatePresentations( anArrayOfFPnt, anArrayOfLPnt, anArrOfProfiles, anArrOf2DProfiles, thePrs );
+}
- BRepBuilderAPI_MakeWire aMakeWire( aFirstEdge.Edge(), aSecondEdge.Edge(),
- aThirdEdge.Edge(), aFourthEdge.Edge() );
-
- TopoDS_Wire aSectProfileWire = aMakeWire.Wire();
-
- BRepBuilderAPI_MakeFace aMakeFace( aSectProfileWire, Standard_True );
- aMakeFace.Build();
- if( aMakeFace.IsDone() )
- {
- a2dShellBuilder.Add( a2dShell, aMakeFace.Face() );
- }
+void HYDROData_Stream::UpdatePrs()
+{
+ HYDROData_NaturalObject::Update();
- aPrevFirstPoint = aCurFirstPoint;
- aPrevLastPoint = aCurLastPoint;
- }
+ Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
+ HYDROData_SequenceOfObjects aRefProfiles = GetProfiles();
+
+ PrsDefinition aResultPrs;
+ if ( !CreatePresentations( aHydAxis, aRefProfiles, 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";
- SetTopShape( a2dShell );
+ Handle(HYDROData_ShapesGroup) aRightGroup = createGroupObject();
+ aRightGroup->SetName( aRightGroupName );
+ aRightGroup->AddShape( aResultPrs.myRightBank );
- // Construct the 3D presentation
- /// TODO
+ 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 );
}
-bool HYDROData_Stream::SetHydraulicAxis( const Handle(HYDROData_PolylineXY)& theAxis )
+QColor HYDROData_Stream::DefaultFillingColor() const
{
- Handle(HYDROData_PolylineXY) aPrevAxis = GetHydraulicAxis();
+ return QColor( Qt::green );
+}
- if ( theAxis.IsNull() )
- {
- RemoveHydraulicAxis();
- return !aPrevAxis.IsNull();
- }
+QColor HYDROData_Stream::DefaultBorderColor() const
+{
+ return QColor( Qt::transparent );
+}
- if ( IsEqual( aPrevAxis, theAxis ) )
+bool HYDROData_Stream::IsValidAsAxis( const Handle(HYDROData_PolylineXY)& theHydAxis )
+{
+ if ( theHydAxis.IsNull() )
return false;
- TopoDS_Wire aHydraulicWire = TopoDS::Wire( theAxis->GetShape() );
- if ( aHydraulicWire.IsNull() )
- return false; // The polyline must be a single wire
+ TopoDS_Shape aHydraulicShape = theHydAxis->GetShape();
+ if ( aHydraulicShape.IsNull() ||
+ aHydraulicShape.ShapeType() != TopAbs_WIRE ||
+ BRep_Tool::IsClosed( aHydraulicShape ) )
+ return false; // The polyline must be a single not closed wire
+
+ return true;
+}
+
+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
+{
+ HYDROData_SequenceOfObjects aGroups = GetGroups();
+ return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 4);
+}
+
+bool HYDROData_Stream::SetHydraulicAxis( const Handle(HYDROData_PolylineXY)& theAxis )
+{
+ if ( !IsValidAsAxis( theAxis ) )
+ return false;
+
+ Handle(HYDROData_PolylineXY) aPrevAxis = GetHydraulicAxis();
+ if ( IsEqual( aPrevAxis, theAxis ) )
+ return true;
SetReferenceObject( theAxis, DataTag_HydraulicAxis );
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
+bool HYDROData_Stream::HasIntersection( const Handle(HYDROData_Profile)& theProfile,
+ const TopoDS_Face& thePlane,
+ Standard_Real& theOutPar ) const
{
Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
- if ( theProfile.IsNull() || aHydAxis.IsNull() )
+ return HasIntersection( aHydAxis, theProfile, thePlane, theOutPar );
+}
+
+bool HYDROData_Stream::HasIntersection( const Handle(HYDROData_PolylineXY)& theHydAxis,
+ const Handle(HYDROData_Profile)& theProfile,
+ const TopoDS_Face& thePlane,
+ Standard_Real& theOutPar )
+{
+ if ( theProfile.IsNull() || !IsValidAsAxis( theHydAxis ) )
return false;
- TopoDS_Wire aHydraulicWire = TopoDS::Wire( aHydAxis->GetShape() );
+ TopoDS_Wire aHydraulicWire = TopoDS::Wire( theHydAxis->GetShape() ); //guide line
TopoDS_Wire aProfileWire = TopoDS::Wire( theProfile->GetTopShape() );
if ( aHydraulicWire.IsNull() || aProfileWire.IsNull() )
return false;
- // TODO
-
- return true;
+ BRepProj_Projection aProjector (aProfileWire, thePlane, gp::OZ().Direction());
+ if(!aProjector.IsDone())
+ return false;
+ TopoDS_Shape aPrjProfile = aProjector.Shape();
+ if(aPrjProfile.IsNull())
+ return false;
+ TopoDS_Vertex aV1, aV2;
+ if(aPrjProfile.ShapeType() == TopAbs_EDGE)
+ TopExp::Vertices(TopoDS::Edge(aPrjProfile), aV1, aV2);
+ else if(aPrjProfile.ShapeType() == TopAbs_WIRE)
+ TopExp::Vertices(TopoDS::Wire(aPrjProfile), aV1, aV2);
+ else if(aPrjProfile.ShapeType() == TopAbs_COMPOUND){
+ TopExp_Explorer anExp(aPrjProfile, TopAbs_WIRE);
+ if(anExp.More()) {
+ TopExp::Vertices(TopoDS::Wire(anExp.Current()), aV1, aV2);
+ } else {
+ anExp.Init(aPrjProfile, TopAbs_EDGE);
+ if(anExp.More()) {
+ TopExp::Vertices(TopoDS::Edge(anExp.Current()), aV1, aV2);
+ }
+ }
+ }
+ if(aV1.IsNull() || aV2.IsNull())
+ return false;
+ gp_Pnt aPnt1 = BRep_Tool::Pnt(aV1);
+ gp_Pnt aPnt2 = BRep_Tool::Pnt(aV2);
+ aPnt1.SetZ(0.0);
+ aPnt2.SetZ(0.0);
+ BRepBuilderAPI_MakeEdge aMk(aPnt1, aPnt2);
+ if(!aMk.IsDone())
+ return false;
+ const TopoDS_Edge& anEdg2 = aMk.Edge();//Section edge
+ Standard_Integer aNum(0);
+
+ TopExp_Explorer anExplo(aHydraulicWire, TopAbs_EDGE);
+ for(;anExplo.More();anExplo.Next()) aNum++;
+ // check for self-intersection
+ const Standard_Real SquareTolerance = Precision::Confusion()*Precision::Confusion();
+ Standard_Boolean hasInt(false);
+ Standard_Real aSqDist(DBL_MAX);
+ Standard_Integer anIndx(0);
+ BRepExtrema_ExtCC aCC;
+ aCC.Initialize(anEdg2);
+ 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());
+ if(anEdg1.IsNull())
+ continue;
+ Standard_Boolean hasSol(false);
+ aCC.Perform(anEdg1);
+ if(aCC.IsDone()) {
+ // find minimal dist
+ for(Standard_Integer i=1; i<= aCC.NbExt();i++)
+ if(aCC.SquareDistance(i) < aSqDist) {
+ aSqDist = aCC.SquareDistance(i);
+ anIndx = i;
+ hasSol = true;
+ }
+ }
+ if(hasSol) {
+ if(aSqDist <= SquareTolerance) { // hasInt
+ const gp_Pnt& aPnt = aCC.PointOnE1(anIndx);
+ if(aNum > 1) {
+ TopExp::Vertices(anEdg1, aV1, aV2, Standard_True);
+ theOutPar += BRep_Tool::Pnt(aV1).Distance(aPnt);
+ } else {
+ Standard_Real aPar = aCC.ParameterOnE1(anIndx);
+ theOutPar = aPar;
+ }
+ hasInt = true;
+ break;
+ } else {
+ // no ints-n
+ if(aNum > 1) {
+ TopExp::Vertices(anEdg1, aV1, aV2);
+ theOutPar += BRep_Tool::Pnt(aV1).Distance(BRep_Tool::Pnt(aV2));
+ }
+ }
+ } else if(aNum > 1) {
+ TopExp::Vertices(anEdg1, aV1, aV2);
+ theOutPar += BRep_Tool::Pnt(aV1).Distance(BRep_Tool::Pnt(aV2));
+ }
+ }
+ if(hasInt)
+ return true;
+ return false;
}
bool HYDROData_Stream::AddProfile( const Handle(HYDROData_Profile)& theProfile )
{
if ( theProfile.IsNull() )
- return false;
+ return false;
- if ( HasReference( theProfile, DataTag_Profile ) || !HasIntersection( theProfile ) )
- return false; // Object is already in reference list or it has no intersection
+ Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
+ if ( aHydAxis.IsNull() )
+ return false;
+
+ TopoDS_Face aPlane;
+ if(!BuildFace(aHydAxis, aPlane))
+ return false;
- insertProfileInToOrder( theProfile );
+ Standard_Real aPar(.0);
+ if ( HasReference( theProfile, DataTag_Profile ) || !HasIntersection( theProfile, aPlane, aPar ) )
+ return false; // Object is already in reference list or it has no intersection
+
+ int aProfileIndex = insertParameter( aPar );
+ insertProfileInToOrder( theProfile, aProfileIndex );
// 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 ) )
+ 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 );
+ }
return true;
}
bool HYDROData_Stream::RemoveProfile( const Handle(HYDROData_Profile)& theProfile )
{
- if ( theProfile.IsNull() || !HasReference( theProfile, DataTag_Profile ) )
+ if ( theProfile.IsNull() )
+ return false;
+
+ int aProfileIndex = -1;
+
+ HYDROData_SequenceOfObjects aRefProfiles = GetProfiles();
+ HYDROData_SequenceOfObjects::Iterator anIter( aRefProfiles );
+ for ( int i = 0 ; anIter.More(); anIter.Next(), ++i )
+ {
+ Handle(HYDROData_Profile) aProfile =
+ Handle(HYDROData_Profile)::DownCast( anIter.Value() );
+ if ( aProfile.IsNull() )
+ continue;
+
+ if ( IsEqual( theProfile, aProfile ) )
+ {
+ aProfileIndex = i;
+ break;
+ }
+ }
+
+ if ( aProfileIndex == -1 )
return false;
RemoveReferenceObject( theProfile->Label(), DataTag_Profile );
+ // Remove parameter for removed 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 )
+void HYDROData_Stream::insertProfileInToOrder( const Handle(HYDROData_Profile)& theProfile,
+ const int theBeforeIndex )
{
Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
if ( theProfile.IsNull() || aHydAxis.IsNull() )
if ( aHydraulicWire.IsNull() || aProfileWire.IsNull() )
return;
- // TODO
- AddReferenceObject( theProfile, DataTag_Profile ); // temporary for testing only
+ if ( theBeforeIndex == -1 )
+ AddReferenceObject( theProfile, DataTag_Profile );
+ else
+ InsertReferenceObject( theProfile, DataTag_Profile, theBeforeIndex );
+}
+
+bool HYDROData_Stream::BuildFace( const Handle(HYDROData_PolylineXY)& theHydAxis,
+ 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;
}
void HYDROData_Stream::updateProfilesOrder()
Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
if ( aHydAxis.IsNull() )
+ return;
+
+ TopoDS_Face aPlane;
+ if ( !BuildFace( aHydAxis, aPlane ) )
return;
+ Standard_Real aPar( .0 );
+
+#ifdef DEB_HASINT
+ BRep_Builder aBB;
+ TopoDS_Compound aCmp;
+ aBB.MakeCompound(aCmp);
+#endif
+
+ HYDROData_DataMapOfRealOfHDProfile aDM;
+ TColStd_ListOfReal aList;
HYDROData_SequenceOfObjects::Iterator anIter( aRefProfiles );
- for ( ; anIter.More(); anIter.Next() )
+ for (int i = 1 ; anIter.More(); anIter.Next(), i++ )
{
Handle(HYDROData_Profile) aProfile =
Handle(HYDROData_Profile)::DownCast( anIter.Value() );
- if ( aProfile.IsNull() || !HasIntersection( aProfile ) )
+#ifdef DEB_HASINT
+ TopoDS_Wire aProfileWire = TopoDS::Wire( aProfile->GetTopShape() );
+ aBB.Add( aCmp, aProfileWire );
+#endif
+ if ( aProfile.IsNull() || !HasIntersection( aProfile, aPlane, aPar ) )
continue;
+
+ aDM.Bind( aPar, aProfile );
+ aList.Append( aPar );
+ }
+
+ if ( aList.IsEmpty() )
+ return;
- insertProfileInToOrder( aProfile );
+ TColStd_Array1OfReal anArr( 1, aList.Extent() );
+
+ TColStd_ListIteratorOfListOfReal it( aList );
+ for ( int j = 1; it.More(); it.Next(), j++ )
+ anArr( j ) = it.Value();
+
+ // sorting
+ if ( aList.Extent() > 1 )
+ {
+ TCollection_CompareOfReal Compar;
+ SortTools_QuickSortOfReal::Sort( anArr, Compar );
+
+ for (int j = 1; j <= anArr.Length(); j++) {
+ const Standard_Real aKey = anArr(j);
+ const Handle(HYDROData_Profile)& aProfile = aDM.Find(aKey);
+ insertProfileInToOrder( aProfile );
+ }
+ } else if ( aList.Extent() == 1 ) {
+ const Standard_Real aKey = aList.Last();
+ const Handle(HYDROData_Profile)& aProfile = aDM.Find(aKey);
+ insertProfileInToOrder( aProfile );
+ }
+
+ setParametersArray( anArr );
+
+#ifdef DEB_HASINT
+ TopoDS_Wire aHydraulicWire = TopoDS::Wire( aHydAxis->GetShape() );
+ BRepTools::Write(aHydraulicWire, "Path.brep");
+ BRepTools::Write(aCmp, "Prof.brep");
+#endif
+}
+
+ObjectKind HYDROData_Stream::getAltitudeObjectType() const
+{
+ return KIND_STREAM_ALTITUDE;
+}
+
+void HYDROData_Stream::setParametersArray( const TColStd_Array1OfReal& theArray )
+{
+ if ( theArray.Length() == 0 )
+ {
+ removeParametersArray();
+ return;
+ }
+
+ TDF_Label aLabel = myLab.FindChild( DataTag_ParamsArray );
+
+ Handle(TDataStd_RealArray) aParamsArray =
+ TDataStd_RealArray::Set( aLabel, theArray.Lower(), theArray.Upper() );
+
+ for ( int i = theArray.Lower(), n = theArray.Upper(); i <= n; ++i )
+ {
+ const Standard_Real& aParam = theArray( i );
+ aParamsArray->SetValue( i, aParam );
+ }
+}
+
+TColStd_Array1OfReal* HYDROData_Stream::getParametersArray() const
+{
+ TColStd_Array1OfReal* anArray = NULL;
+
+ TDF_Label aLabel = myLab.FindChild( DataTag_ParamsArray, false );
+ if ( !aLabel.IsNull() )
+ {
+ Handle(TDataStd_RealArray) aParamsArray;
+ if ( aLabel.FindAttribute( TDataStd_RealArray::GetID(), aParamsArray ) )
+ {
+ anArray = new TColStd_Array1OfReal( aParamsArray->Lower(), aParamsArray->Upper() );
+ for ( int i = aParamsArray->Lower(), n = aParamsArray->Upper(); i <= n; ++i )
+ {
+ const Standard_Real& aParam = aParamsArray->Value( i );
+ anArray->SetValue( i, aParam );
+ }
+ }
+ }
+
+ return anArray;
+}
+
+void HYDROData_Stream::removeParametersArray()
+{
+ TDF_Label aLabel = myLab.FindChild( DataTag_ParamsArray, false );
+ if ( !aLabel.IsNull() )
+ aLabel.ForgetAllAttributes();
+}
+
+int HYDROData_Stream::insertParameter( const Standard_Real& theParam )
+{
+ int aResIndex = -1;
+
+ TColStd_Array1OfReal* anArr = getParametersArray();
+ if ( anArr )
+ {
+ aResIndex = 0;
+
+ TColStd_Array1OfReal aNewArr( anArr->Lower(), anArr->Upper() + 1 );
+
+ bool isInserted = false;
+ for ( int i = anArr->Lower(), j = i, n = anArr->Upper(); i <= n; ++i, ++j )
+ {
+ const Standard_Real& aStoredParam = anArr->Value( i );
+ if ( !isInserted )
+ {
+ if ( theParam > aStoredParam )
+ {
+ aResIndex++;
+ }
+ else
+ {
+ aNewArr( j ) = theParam;
+ isInserted = true;
+ ++j;
+ }
+ }
+
+ aNewArr( j ) = aStoredParam;
+ }
+
+ if ( !isInserted )
+ {
+ aResIndex = -1;
+ aNewArr( aNewArr.Upper() ) = theParam;
+ }
+
+ setParametersArray( aNewArr );
+ delete anArr;
+ }
+ else
+ {
+ TColStd_Array1OfReal aNewArr( 1, 1 );
+ aNewArr.SetValue( 1, theParam );
+ setParametersArray( aNewArr );
+ }
+
+ return aResIndex;
+}
+
+void HYDROData_Stream::removeParameter( const int& theIndex )
+{
+ TDF_Label aLabel = myLab.FindChild( DataTag_ParamsArray, false );
+ if ( aLabel.IsNull() )
+ return;
+
+ Handle(TDataStd_RealArray) aParamsArray;
+ if ( !aLabel.FindAttribute( TDataStd_RealArray::GetID(), aParamsArray ) )
+ return;
+
+ if ( aParamsArray->Length() == 1 )
+ {
+ removeParametersArray();
+ return;
+ }
+
+ TColStd_Array1OfReal aNewArr( aParamsArray->Lower(), aParamsArray->Upper() - 1 );
+
+ for ( int i = aParamsArray->Lower(), j = i, k = 0, n = aParamsArray->Upper(); i <= n; ++i, ++k )
+ {
+ const Standard_Real& aStoredParam = aParamsArray->Value( i );
+ if ( k == theIndex )
+ continue;
+
+ aNewArr.SetValue( j, aStoredParam );
+ ++j;
+ }
+
+ setParametersArray( aNewArr );
+}
+
+bool HYDROData_Stream::GenerateBottomPolyline()
+{
+ // Get the document
+ Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+ if ( aDocument.IsNull() ) {
+ return false;
+ }
+
+ // 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() );
+ }
+
+ 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;
+ }
+
+ // 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
+ aProfile->Update();
+ }
+
+ 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;
+ }
+
+ // 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();
+ }
+ }
+ }
+}
+
+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;
+ }
+
+ if ( theArrayOfFPnt->Length() != theArrayOfLPnt->Length() ) {
+ return false;
+ }
+
+ // Construct of the 3D presentation
+ Handle(Geom_BSplineCurve) aBSpline = buildInterpolationCurve (theArrayOfFPnt);
+ 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 (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
