X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_PolylineXY.cxx;h=d418144a2e1865ef4b2fa25d71411bc399ed1274;hb=4a4e234c1bde9db8ac7e1020842ab355e03335b0;hp=06ea1bbced9f51ecdc0b6ef79ab27c1bbaec59d9;hpb=272fe04d70fa64f4fe1a271ef46614f71432502b;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_PolylineXY.cxx b/src/HYDROData/HYDROData_PolylineXY.cxx index 06ea1bbc..d418144a 100755 --- a/src/HYDROData/HYDROData_PolylineXY.cxx +++ b/src/HYDROData/HYDROData_PolylineXY.cxx @@ -9,6 +9,7 @@ #include #include #include +#include #include #include @@ -55,8 +56,6 @@ static const Standard_GUID GUID_IS_UNEDITABLE("e5799736-9030-4051-91a4-2e58321fa153"); -#define PYTHON_POLYLINEXY_ID "KIND_POLYLINEXY" - const double LOCAL_SELECTION_TOLERANCE = 0.0001; TCollection_AsciiString getUniqueSectionName( const NCollection_Sequence& theNamesSeq ) @@ -107,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; @@ -135,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; } @@ -326,49 +319,37 @@ TopoDS_Wire HYDROData_PolylineXY::BuildWire( const SectionType& const bool& theIsClosed, const NCollection_Sequence& thePoints ) { - BRepBuilderAPI_MakeWire aMakeWire; - + TopoDS_Wire aWire; if( theType == SECTION_POLYLINE ) { - for( int i = 1, n = thePoints.Size(); i <= n; ++i ) + BRepBuilderAPI_MakePolygon aMakeWire; + for ( int i = 1, n = thePoints.Length(); i <= n ; ++i ) { - const gp_XYZ& aFirstPoint = thePoints.Value( i ); - - gp_XYZ aLastPoint; - if ( i == n ) - { - if( theIsClosed ) - aLastPoint = thePoints.Value( 1 ); - else - break; - } - else - { - aLastPoint = thePoints.Value( i + 1 ); - } - - gp_Pnt aPnt1( aFirstPoint.X(), aFirstPoint.Y(), aFirstPoint.Z() ); - gp_Pnt aPnt2( aLastPoint.X(), aLastPoint.Y(), aLastPoint.Z() ); - - if ( aPnt1.IsEqual( aPnt2, LOCAL_SELECTION_TOLERANCE ) ) - continue; - - TopoDS_Edge anEdge = BRepBuilderAPI_MakeEdge( aPnt1, aPnt2 ).Edge(); - aMakeWire.Add( anEdge ); + 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 ) { - HYDROData_BSplineOperation aBSpline( thePoints, theIsClosed, LOCAL_SELECTION_TOLERANCE ); + BRepBuilderAPI_MakeWire aMakeWire; - TopoDS_Edge anEdge = BRepBuilderAPI_MakeEdge( aBSpline.Curve() ).Edge(); - aMakeWire.Add( anEdge ); - } + if ( thePoints.Size() > 1 ) + { + HYDROData_BSplineOperation aBSpline( thePoints, theIsClosed, LOCAL_SELECTION_TOLERANCE ); - TopoDS_Wire aWire; - aMakeWire.Build(); - if ( aMakeWire.IsDone() ) - aWire = aMakeWire; + TopoDS_Edge anEdge = BRepBuilderAPI_MakeEdge( aBSpline.Curve() ).Edge(); + aMakeWire.Add( anEdge ); + } + aMakeWire.Build(); + if ( aMakeWire.IsDone() ) + aWire = aMakeWire; + } return aWire; }