X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_PolylineXY.cxx;h=d418144a2e1865ef4b2fa25d71411bc399ed1274;hb=4a4e234c1bde9db8ac7e1020842ab355e03335b0;hp=b20f1bd8717e1fce598ba5a731723a7ba67f1342;hpb=aab4319f1f8306683e93dbd71ac7a02c0437fac6;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_PolylineXY.cxx b/src/HYDROData/HYDROData_PolylineXY.cxx index b20f1bd8..d418144a 100755 --- a/src/HYDROData/HYDROData_PolylineXY.cxx +++ b/src/HYDROData/HYDROData_PolylineXY.cxx @@ -3,14 +3,20 @@ #include "HYDROData_BSplineOperation.h" #include "HYDROData_Document.h" +#include "HYDROData_ShapesTool.h" #include "HYDROData_Tool.h" #include #include #include +#include +#include +#include #include #include +#include +#include #include @@ -18,6 +24,7 @@ #include #include +#include #include @@ -27,18 +34,63 @@ #include #include +#include + #include #include #include #include #include +#include +#include #include +#include +#include +#include +#include +#include #include #include -#define PYTHON_POLYLINEXY_ID "KIND_POLYLINEXY" +static const Standard_GUID GUID_IS_UNEDITABLE("e5799736-9030-4051-91a4-2e58321fa153"); + +const double LOCAL_SELECTION_TOLERANCE = 0.0001; + +TCollection_AsciiString getUniqueSectionName( const NCollection_Sequence& theNamesSeq ) +{ + NCollection_Map aNamesMap; + + for ( int i = 1, n = theNamesSeq.Size(); i <= n; ++i ) + { + const TCollection_AsciiString& aSectName = theNamesSeq.Value( i ); + aNamesMap.Add( aSectName ); + } + + TCollection_AsciiString aResName; + + int aPrefIdx = 1; + do + { + aResName = TCollection_AsciiString( "Section_" ) + aPrefIdx; + ++aPrefIdx; + } + while ( aNamesMap.Contains( aResName ) ); + + return aResName; +} + +TCollection_AsciiString getUniqueSectionName( const Handle(TDataStd_ExtStringList)& theNamesList ) +{ + NCollection_Sequence aNamesSeq; + + TDataStd_ListIteratorOfListOfExtendedString aNamesIter( theNamesList->List() ); + for ( ; aNamesIter.More(); aNamesIter.Next() ) + aNamesSeq.Append( aNamesIter.Value() ); + + return getUniqueSectionName( aNamesSeq ); +} IMPLEMENT_STANDARD_HANDLE(HYDROData_PolylineXY, HYDROData_IPolyline) IMPLEMENT_STANDARD_RTTIEXT(HYDROData_PolylineXY, HYDROData_IPolyline) @@ -54,18 +106,8 @@ HYDROData_PolylineXY::~HYDROData_PolylineXY() QStringList HYDROData_PolylineXY::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const { - QStringList aResList; - - Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab ); - if ( aDocument.IsNull() ) - return aResList; - - QString aDocName = aDocument->GetDocPyName(); - QString aPolylineName = GetName(); - - aResList << QString( "%1 = %2.CreateObject( %3 );" ) - .arg( aPolylineName ).arg( aDocName ).arg( PYTHON_POLYLINEXY_ID ); - aResList << QString( "%1.SetName( \"%1\" );" ).arg( aPolylineName ); + QStringList aResList = dumpObjectCreation( theTreatedObjects ); + QString aPolylineName = GetObjPyName(); // Set polilyne data NCollection_Sequence aSectNames; @@ -82,16 +124,20 @@ QStringList HYDROData_PolylineXY::DumpToPython( MapOfTreatedObjects& theTreatedO aResList << QString( "%1.AddSection( \"%2\", %3, %4 );" ).arg( aPolylineName ) .arg( aSectName.ToCString() ).arg( aSectType ).arg( aSectClosure ); - HYDROData_PolylineXY::PointsList aSectPointsList = GetPoints( i ); + HYDROData_IPolyline::PointsList aSectPointsList = GetPoints( i - 1 ); for ( int k = 1, aNbPoints = aSectPointsList.Size(); k <= aNbPoints; ++k ) { const Point& aSectPoint = aSectPointsList.Value( k ); - aResList << QString( "%1.AddPoint( %2, QPointF( %3, %4 ) );" ).arg( aPolylineName ) + aResList << QString( "%1.AddPoint( %2, gp_XY( %3, %4 ) );" ).arg( aPolylineName ) .arg( i - 1 ).arg( aSectPoint.X() ).arg( aSectPoint.Y() ); } } + aResList << QString( "" ); + aResList << QString( "%1.Update();" ).arg( aPolylineName ); + aResList << QString( "" ); + return aResList; } @@ -105,55 +151,205 @@ QVariant HYDROData_PolylineXY::GetDataVariant() return aVarData; } -TopoDS_Shape HYDROData_PolylineXY::GetShape() +QColor HYDROData_PolylineXY::DefaultWireColor() +{ + return QColor( Qt::red ); +} + +TopoDS_Shape HYDROData_PolylineXY::GetShape() const { return getPolylineShape(); } -TopoDS_Wire HYDROData_PolylineXY::BuildWire( const SectionType& theType, - const bool& theIsClosed, - const NCollection_Sequence& thePoints ) +bool convertEdgeToSection( const TopoDS_Edge& theEdge, + NCollection_Sequence& theSectNames, + NCollection_Sequence& theSectTypes, + NCollection_Sequence& theSectClosures, + NCollection_Sequence& theSectPoints, + const bool theIsCanBeClosed ) { - BRepBuilderAPI_MakeWire aMakeWire; - - if( theType == SECTION_POLYLINE ) + Standard_Real aFirst = 0.0, aLast = 0.0; + Handle(Geom_Curve) anEdgeGeomCurve = BRep_Tool::Curve( theEdge, aFirst, aLast ); + if ( anEdgeGeomCurve.IsNull() ) + return false; + + TCollection_AsciiString aSectName = getUniqueSectionName( theSectNames ); + bool anIsEdgeClosed = anEdgeGeomCurve->IsClosed(); + + HYDROData_PolylineXY::SectionType aSectionType = HYDROData_PolylineXY::SECTION_POLYLINE; + HYDROData_PolylineXY::PointsList aPointsList; + + if ( anEdgeGeomCurve->IsKind( STANDARD_TYPE(Geom_Line) ) ) { - for( int i = 1, n = thePoints.Size(); i <= n; ++i ) + Handle(Geom_Line) aGeomLine = Handle(Geom_Line)::DownCast( anEdgeGeomCurve ); + + gp_Pnt aFirstPoint, aLastPoint; + aGeomLine->D0( aFirst, aFirstPoint ); + aGeomLine->D0( aLast, aLastPoint ); + + HYDROData_PolylineXY::Point aSectFirstPoint( aFirstPoint.X(), aFirstPoint.Y() ); + aPointsList.Append( aSectFirstPoint ); + + HYDROData_PolylineXY::Point aSectLastPoint( aLastPoint.X(), aLastPoint.Y() ); + aPointsList.Append( aSectLastPoint ); + } + else if ( anEdgeGeomCurve->IsKind( STANDARD_TYPE(Geom_BSplineCurve) ) ) + { + aSectionType = HYDROData_PolylineXY::SECTION_SPLINE; + + Handle(Geom_BSplineCurve) aGeomSpline = + Handle(Geom_BSplineCurve)::DownCast( anEdgeGeomCurve ); + + int aNbKnots = aGeomSpline->NbKnots(); + + TColStd_Array1OfReal aSplineKnots( 1, aNbKnots ); + aGeomSpline->Knots( aSplineKnots ); + + // Decrease the number of imported knots because of last one + // knot is the closing point which are the start point + if ( anIsEdgeClosed ) aNbKnots--; + + for ( int i = 1; i <= aNbKnots; ++i ) { - const gp_XYZ& aFirstPoint = thePoints.Value( i ); + const Standard_Real& aKnot = aSplineKnots.Value( i ); - gp_XYZ aLastPoint; - if ( i == n ) - { - if( theIsClosed ) - aLastPoint = thePoints.Value( 1 ); - else - break; - } - else - { - aLastPoint = thePoints.Value( i + 1 ); - } + gp_Pnt aPoint; + aGeomSpline->D0( aKnot, aPoint ); - gp_Pnt aPnt1( aFirstPoint.X(), aFirstPoint.Y(), aFirstPoint.Z() ); - gp_Pnt aPnt2( aLastPoint.X(), aLastPoint.Y(), aLastPoint.Z() ); + HYDROData_PolylineXY::Point aSectPoint( aPoint.X(), aPoint.Y() ); + aPointsList.Append( aSectPoint ); + } + } + else + { + // Other curve types are not supported + return false; + } - TopoDS_Edge anEdge = BRepBuilderAPI_MakeEdge( aPnt1, aPnt2 ).Edge(); - aMakeWire.Add( anEdge ); + if ( aPointsList.IsEmpty() ) + return false; + + theSectNames.Append( aSectName ); + theSectTypes.Append( aSectionType ); + theSectClosures.Append( anIsEdgeClosed ); + theSectPoints.Append( aPointsList ); + + return true; +} + +bool HYDROData_PolylineXY::ImportShape( const TopoDS_Shape& theShape ) +{ + if ( theShape.IsNull() ) + return false; + + RemoveSections(); + + bool anIsCanBeImported = false; + + NCollection_Sequence aSectNames; + NCollection_Sequence aSectTypes; + NCollection_Sequence aSectClosures; + NCollection_Sequence aSectPoints; + + if ( theShape.ShapeType() == TopAbs_EDGE ) + { + TopoDS_Edge anEdge = TopoDS::Edge( theShape ); + anIsCanBeImported = convertEdgeToSection( anEdge, aSectNames, aSectTypes, aSectClosures, aSectPoints, true ); + } + else if ( theShape.ShapeType() == TopAbs_WIRE ) + { + TopTools_SequenceOfShape anEdges; + HYDROData_ShapesTool::ExploreShapeToShapes( theShape, TopAbs_EDGE, anEdges ); + + anIsCanBeImported = !anEdges.IsEmpty(); + for ( int i = 1, n = anEdges.Length(); i <= n && anIsCanBeImported; ++i ) + { + TopoDS_Edge aWireEdge = TopoDS::Edge( anEdges.Value( i ) ); + anIsCanBeImported = convertEdgeToSection( aWireEdge, aSectNames, aSectTypes, aSectClosures, aSectPoints, false ); } } - else //if( theType == PolylineSection::SECTION_SPLINE ) + + if ( anIsCanBeImported ) { - HYDROData_BSplineOperation aBSpline( thePoints, theIsClosed ); + for ( int i = 1, n = aSectNames.Length(); i <= n; ++i ) + { + const TCollection_AsciiString& aSectName = aSectNames.Value( i ); + const SectionType& aSectType = aSectTypes.Value( i ); + bool anIsSectionClosed = aSectClosures.Value( i ); + const PointsList& aSectPointsList = aSectPoints( i ); - TopoDS_Edge anEdge = BRepBuilderAPI_MakeEdge( aBSpline.Curve() ).Edge(); - aMakeWire.Add( anEdge ); + AddSection( aSectName, aSectType, anIsSectionClosed ); + SetPoints( i - 1, aSectPointsList ); + } } + else + { + TopoDS_Shape aShape = theShape; + + if ( theShape.ShapeType() == TopAbs_EDGE ) + { + // We make the wire from incoming edge because of other algorithms + // are waiting at least the wire from polyline + TopoDS_Edge anEdge = TopoDS::Edge( theShape ); + BRepBuilderAPI_MakeWire aMakeWire( anEdge ); + aMakeWire.Build(); + if ( aMakeWire.IsDone() ) + aShape = aMakeWire.Wire(); + } + + gp_Pln aPlane( gp_Pnt( 0, 0, 0 ), gp_Dir( 0, 0, 1 ) ); + BRepBuilderAPI_MakeFace aMakeFace( aPlane ); + aMakeFace.Build(); + BRepOffsetAPI_NormalProjection aProj( aMakeFace.Face() ); + aProj.Add( aShape ); + aProj.Build(); + TopoDS_Shape aResult; + if( aProj.IsDone() ) + aResult = aProj.Shape(); + + setPolylineShape( aResult ); + } + + setEditable( anIsCanBeImported ); + + return true; +} +TopoDS_Wire HYDROData_PolylineXY::BuildWire( const SectionType& theType, + const bool& theIsClosed, + const NCollection_Sequence& thePoints ) +{ TopoDS_Wire aWire; - aMakeWire.Build(); - if ( aMakeWire.IsDone() ) - aWire = aMakeWire; + if( theType == SECTION_POLYLINE ) + { + BRepBuilderAPI_MakePolygon aMakeWire; + for ( int i = 1, n = thePoints.Length(); i <= n ; ++i ) + { + gp_XYZ aPoint = thePoints.Value( i ); + gp_Pnt aPnt( aPoint.X(), aPoint.Y(), aPoint.Z() ); + aMakeWire.Add( aPnt ); + } + if( theIsClosed ) + aMakeWire.Close(); + + if ( aMakeWire.IsDone() ) + aWire = aMakeWire.Wire(); + } + else //if( theType == PolylineSection::SECTION_SPLINE ) + { + BRepBuilderAPI_MakeWire aMakeWire; + + if ( thePoints.Size() > 1 ) + { + HYDROData_BSplineOperation aBSpline( thePoints, theIsClosed, LOCAL_SELECTION_TOLERANCE ); + + TopoDS_Edge anEdge = BRepBuilderAPI_MakeEdge( aBSpline.Curve() ).Edge(); + aMakeWire.Add( anEdge ); + } + aMakeWire.Build(); + if ( aMakeWire.IsDone() ) + aWire = aMakeWire; + } return aWire; } @@ -183,13 +379,22 @@ void HYDROData_PolylineXY::BuildPainterPath( QPainterPath& } else { - HYDROData_BSplineOperation aBSpline( thePoints, theIsClosed ); + HYDROData_BSplineOperation aBSpline( thePoints, theIsClosed, LOCAL_SELECTION_TOLERANCE ); aBSpline.ComputePath( thePath ); } } void HYDROData_PolylineXY::Update() { + if ( !IsEditable() ) + { + // If polyline is not editable we no need to update it wire + SetToUpdate( false ); + return; + } + + HYDROData_IPolyline::Update(); + NCollection_Sequence aSectNames; NCollection_Sequence aSectTypes; NCollection_Sequence aSectClosures; @@ -219,51 +424,93 @@ void HYDROData_PolylineXY::Update() } TopoDS_Wire aSectionWire = BuildWire( aSectionType, anIsSectionClosed, aPoints ); - aSectionWiresList.Append( aSectionWire ); - aMakeWire.Add( aSectionWire ); + if ( !aSectionWire.IsNull() ) { + aSectionWiresList.Append( aSectionWire ); + aMakeWire.Add( aSectionWire ); + } } - - TopoDS_Shape aShape; - - if ( aMakeWire.IsDone() ) +// all input wires in the + Handle(TopTools_HSequenceOfShape) aSeqWires = new TopTools_HSequenceOfShape; + Handle(TopTools_HSequenceOfShape) aSeqEdges = new TopTools_HSequenceOfShape; + TopTools_ListIteratorOfListOfShape it(aSectionWiresList); + for(;it.More();it.Next()) { - aShape = aMakeWire.Shape(); + TopExp_Explorer it2(it.Value(), TopAbs_EDGE); + for(;it2.More();it2.Next()) + aSeqEdges->Append(it2.Current()); } - else if ( !aSectionWiresList.IsEmpty() ) + + BRep_Builder aBB; + TopoDS_Compound aCmp; + TopoDS_Shape aResult; + aBB.MakeCompound(aCmp); + if(aSeqEdges->Length() >1) { - // build compound - TopoDS_Compound aCompound; - - BRep_Builder aBuilder; - aBuilder.MakeCompound( aCompound ); - - TopTools_ListIteratorOfListOfShape anIter( aSectionWiresList ); - for ( ; anIter.More(); anIter.Next() ) + ShapeAnalysis_FreeBounds::ConnectEdgesToWires(aSeqEdges,1E-5,Standard_False,aSeqWires); + + if( aSeqWires->Length()==1 ) + aResult = aSeqWires->Value( 1 ); + else { - aBuilder.Add( aCompound, anIter.Value() ); + for (Standard_Integer i = 1; i <= aSeqWires->Length();i++) + { + const TopoDS_Shape& aS1 = aSeqWires->Value(i); + aBB.Add(aCmp, aS1); + } + aResult = aCmp; } - - aShape = aCompound; } + else if (aSeqEdges->Length() == 1) + { + BRepBuilderAPI_MakeWire mkWire (TopoDS::Edge(aSeqEdges->Value(1))); + if (mkWire.IsDone()) + aResult = mkWire.Wire(); + } + + setPolylineShape( aResult ); +} - setPolylineShape( aShape ); +bool HYDROData_PolylineXY::IsEditable() const +{ + return !myLab.IsAttribute( GUID_IS_UNEDITABLE ); +} + +void HYDROData_PolylineXY::setEditable( const bool theIsEditable ) +{ + if ( !theIsEditable ) + TDataStd_UAttribute::Set( myLab, GUID_IS_UNEDITABLE ); + else + myLab.ForgetAttribute( GUID_IS_UNEDITABLE ); } /** * Returns true if polyline is closed */ -bool HYDROData_PolylineXY::IsClosed() const +bool HYDROData_PolylineXY::IsClosed( const bool theIsSimpleCheck ) const { - NCollection_Sequence aSectNames; - NCollection_Sequence aSectTypes; - NCollection_Sequence aSectClosures; - GetSections( aSectNames, aSectTypes, aSectClosures ); - if( aSectNames.IsEmpty() ) - return false; + bool anIsClosed = false; + + TopoDS_Shape aShape = GetShape(); + if ( aShape.IsNull() ) + return anIsClosed; - bool anIsClosed = true; - for( int i = 1, n = aSectClosures.Size(); i <= n && anIsClosed; ++i ) - anIsClosed = anIsClosed && aSectClosures.Value( i ); + TopTools_SequenceOfShape aWires; + HYDROData_ShapesTool::ExploreShapeToShapes( aShape, TopAbs_WIRE, aWires ); + + int aNbWires = aWires.Length(); + if ( theIsSimpleCheck ) + { + anIsClosed = aNbWires > 0; + for ( int i = 1; i <= aNbWires && anIsClosed; ++i ) + { + const TopoDS_Shape& aWire = aWires.Value( i ); + anIsClosed = BRep_Tool::IsClosed( aWire ); + } + } + else + { + anIsClosed = aNbWires == 1 && BRep_Tool::IsClosed( aWires.First() ); + } return anIsClosed; } @@ -294,6 +541,9 @@ double HYDROData_PolylineXY::GetDistance( const int theSectionIndex, const Point& aSectPoint = aSectPointsList.Value( i ); aResDistance += gp_Pnt2d( aPrevPoint ).Distance( aSectPoint ); aPrevPoint = aSectPoint; + + if ( thePointIndex == i - 1 ) + break; } } else @@ -313,7 +563,7 @@ double HYDROData_PolylineXY::GetDistance( const int theSectionIndex, aPointToTest = aPoint; } - HYDROData_BSplineOperation aBSpline( aPoints, anIsSectionClosed ); + HYDROData_BSplineOperation aBSpline( aPoints, anIsSectionClosed, LOCAL_SELECTION_TOLERANCE ); Quantity_Parameter aFirstParam = aBSpline.Curve()->FirstParameter(); Quantity_Parameter aSecondParam = aBSpline.Curve()->LastParameter(); @@ -342,27 +592,6 @@ int HYDROData_PolylineXY::NbSections() const return !aClosuresList.IsNull() ? aClosuresList->Extent() : 0; } -TCollection_ExtendedString getUniqueSectionName( const Handle(TDataStd_ExtStringList)& theNamesList ) -{ - NCollection_Map aNamesMap; - - TDataStd_ListIteratorOfListOfExtendedString aNamesIter( theNamesList->List() ); - for ( ; aNamesIter.More(); aNamesIter.Next() ) - aNamesMap.Add( aNamesIter.Value() ); - - TCollection_ExtendedString aResName; - - int aPrefIdx = 1; - do - { - aResName = "Section_" + aPrefIdx; - ++aPrefIdx; - } - while ( aNamesMap.Contains( aResName ) ); - - return aResName; -} - void HYDROData_PolylineXY::AddSection( const TCollection_AsciiString& theSectName, const SectionType theSectionType, const bool theIsClosed ) @@ -379,6 +608,8 @@ void HYDROData_PolylineXY::AddSection( const TCollection_AsciiString& theSectNam aNamesList->Append( aSectName ); aTypesList->Append( theSectionType ); aClosuresList->Append( theIsClosed ); + + SetToUpdate( true ); } TCollection_AsciiString HYDROData_PolylineXY::GetSectionName( const int theSectionIndex ) const @@ -422,6 +653,8 @@ void HYDROData_PolylineXY::SetSectionName( const int theSec TDataStd_ListIteratorOfListOfExtendedString aNamesIter( anOldNamesList ); for ( int i = 0; aNamesIter.More(); aNamesIter.Next(), ++i ) aNamesList->Append( i == theSectionIndex ? aNewSectName : aNamesIter.Value() ); + + SetToUpdate( true ); } HYDROData_PolylineXY::SectionType HYDROData_PolylineXY::GetSectionType( const int theSectionIndex ) const @@ -458,6 +691,8 @@ void HYDROData_PolylineXY::SetSectionType( const int theSectionIndex, TColStd_ListIteratorOfListOfInteger aTypesIter( anOldTypesList ); for ( int i = 0; aTypesIter.More(); aTypesIter.Next(), ++i ) aTypesList->Append( i == theSectionIndex ? theSectionType : aTypesIter.Value() ); + + SetToUpdate( true ); } bool HYDROData_PolylineXY::IsClosedSection( const int theSectionIndex ) const @@ -494,6 +729,8 @@ void HYDROData_PolylineXY::SetSectionClosed( const int theSectionIndex, TDataStd_ListIteratorOfListOfByte aClosuresIter( anOldClosuresList ); for ( int i = 0; aClosuresIter.More(); aClosuresIter.Next(), ++i ) aClosuresList->Append( i == theSectionIndex ? theIsClosed : (bool)aClosuresIter.Value() ); + + SetToUpdate( true ); } void HYDROData_PolylineXY::GetSections( NCollection_Sequence& theSectNames, @@ -574,12 +811,15 @@ void HYDROData_PolylineXY::RemoveSection( const int theSectionIndex ) // Remove points that belongs to removed section removePointsLists( theSectionIndex ); } + + SetToUpdate( true ); } void HYDROData_PolylineXY::RemoveSections() { removeSectionsLists(); removePointsLists(); + SetToUpdate( true ); } void HYDROData_PolylineXY::AddPoint( const int theSectionIndex, @@ -624,6 +864,8 @@ void HYDROData_PolylineXY::AddPoint( const int theSectionIndex, aListY->Append( aCoordY ); } } + + SetToUpdate( true ); } void HYDROData_PolylineXY::SetPoint( const int theSectionIndex, @@ -673,6 +915,25 @@ void HYDROData_PolylineXY::SetPoint( const int theSectionIndex, aListY->Append( aCoordY ); } } + + SetToUpdate( true ); +} + +void HYDROData_PolylineXY::SetPoints( const int theSectionIndex, + const PointsList& thePoints ) +{ + Handle(TDataStd_RealList) aListX, aListY; + getPointsLists( theSectionIndex, aListX, aListY ); + + aListX->Clear(); + aListY->Clear(); + + for ( int i = 1, n = thePoints.Length(); i <= n; ++i ) + { + const Point& aPoint = thePoints.Value( i ); + aListX->Append( aPoint.X() ); + aListY->Append( aPoint.Y() ); + } } void HYDROData_PolylineXY::RemovePoint( const int theSectionIndex, @@ -710,6 +971,8 @@ void HYDROData_PolylineXY::RemovePoint( const int theSectionIndex, aListY->Append( anIterY.Value() ); } } + + SetToUpdate( true ); } HYDROData_PolylineXY::PointsList HYDROData_PolylineXY::GetPoints( const int theSectionIndex ) const