#include <BRepBuilderAPI_MakePolygon.hxx>
#include <BRepBuilderAPI_MakeFace.hxx>
#include <BRepOffsetAPI_NormalProjection.hxx>
+#include <BRepAdaptor_Curve.hxx>
+#ifndef LIGHT_MODE
#include <GEOMBase.h>
+#endif
#include <GeomAPI_ProjectPointOnCurve.hxx>
#include <GeomAdaptor_Curve.hxx>
#include <Geom_BSplineCurve.hxx>
#include <GCPnts_AbscissaPoint.hxx>
+#include <GCPnts_QuasiUniformDeflection.hxx>
#include <ImageComposer_MetaTypes.h>
#include <TColStd_ListIteratorOfListOfReal.hxx>
#include <TColStd_Array1OfReal.hxx>
+#include <TColgp_Array1OfPnt.hxx>
#include <TDataStd_AsciiString.hxx>
#include <TDataStd_BooleanList.hxx>
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_PolylineXY, HYDROData_IPolyline)
HYDROData_PolylineXY::HYDROData_PolylineXY()
-: HYDROData_IPolyline()
+: HYDROData_IPolyline(),
+ myIsInCustomFlag( false )
{
}
{
}
-QStringList HYDROData_PolylineXY::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+QStringList HYDROData_PolylineXY::DumpToPython( const QString& thePyScriptPath,
+ MapOfTreatedObjects& theTreatedObjects ) const
{
QStringList aResList = dumpObjectCreation( theTreatedObjects );
QString aPolylineName = GetObjPyName();
bool HYDROData_PolylineXY::ImportFromGeomIOR( const TCollection_AsciiString& theIOR )
{
+#ifdef LIGHT_MODE
+ return false;
+#else
if ( theIOR.IsEmpty() )
return false;
return false;
return ImportShape( aShape );
+#endif
}
void HYDROData_PolylineXY::SetGeomObjectEntry( const TCollection_AsciiString& theEntry )
return aRes;
}
-TopoDS_Shape HYDROData_PolylineXY::GetShape() const
-{
- return getPolylineShape();
-}
-
bool convertEdgeToSection( const TopoDS_Edge& theEdge,
NCollection_Sequence<TCollection_AsciiString>& theSectNames,
NCollection_Sequence<HYDROData_PolylineXY::SectionType>& theSectTypes,
NCollection_Sequence<bool>& theSectClosures,
NCollection_Sequence<HYDROData_PolylineXY::PointsList>& theSectPoints,
- const bool theIsCanBeClosed )
+ bool IsCanBeClosed,
+ bool IsInterpolationAllowed,
+ double theDeflection )
{
Standard_Real aFirst = 0.0, aLast = 0.0;
Handle(Geom_Curve) anEdgeGeomCurve = BRep_Tool::Curve( theEdge, aFirst, aLast );
HYDROData_PolylineXY::SectionType aSectionType = HYDROData_PolylineXY::SECTION_POLYLINE;
HYDROData_PolylineXY::PointsList aPointsList;
- if ( anEdgeGeomCurve->IsKind( STANDARD_TYPE(Geom_Line) ) )
+ if( anEdgeGeomCurve->IsKind( STANDARD_TYPE(Geom_Line) ) )
{
Handle(Geom_Line) aGeomLine = Handle(Geom_Line)::DownCast( anEdgeGeomCurve );
HYDROData_PolylineXY::Point aSectLastPoint( aLastPoint.X(), aLastPoint.Y() );
aPointsList.Append( aSectLastPoint );
}
- else if ( anEdgeGeomCurve->IsKind( STANDARD_TYPE(Geom_BSplineCurve) ) )
+ else if ( anEdgeGeomCurve->IsKind( STANDARD_TYPE(Geom_BSplineCurve) ) || IsInterpolationAllowed )
{
aSectionType = HYDROData_PolylineXY::SECTION_SPLINE;
- Handle(Geom_BSplineCurve) aGeomSpline =
- Handle(Geom_BSplineCurve)::DownCast( anEdgeGeomCurve );
+ BRepAdaptor_Curve anAdaptorCurve( theEdge );
+ GCPnts_QuasiUniformDeflection aDiscrete( anAdaptorCurve, theDeflection );
- int aNbKnots = aGeomSpline->NbKnots();
+ int aNbPoints = aDiscrete.NbPoints();
- TColStd_Array1OfReal aSplineKnots( 1, aNbKnots );
- aGeomSpline->Knots( aSplineKnots );
+ // Decrease the number of imported poles because of last one
+ // pole is the closing point which are the start point
+ if ( anIsEdgeClosed ) aNbPoints--;
- // 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 )
+ for ( int i = 1; i <= aNbPoints; ++i )
{
- const Standard_Real& aKnot = aSplineKnots.Value( i );
-
- gp_Pnt aPoint;
- aGeomSpline->D0( aKnot, aPoint );
+ const gp_Pnt& aPoint = aDiscrete.Value( i );
HYDROData_PolylineXY::Point aSectPoint( aPoint.X(), aPoint.Y() );
aPointsList.Append( aSectPoint );
return true;
}
-bool HYDROData_PolylineXY::ImportShape( const TopoDS_Shape& theShape )
+bool HYDROData_PolylineXY::ImportShape( const TopoDS_Shape& theShape,
+ bool IsInterpolationAllowed,
+ double theDeviation )
{
if ( theShape.IsNull() )
return false;
if ( theShape.ShapeType() == TopAbs_EDGE )
{
TopoDS_Edge anEdge = TopoDS::Edge( theShape );
- anIsCanBeImported = convertEdgeToSection( anEdge, aSectNames, aSectTypes, aSectClosures, aSectPoints, true );
+ anIsCanBeImported = convertEdgeToSection( anEdge, aSectNames, aSectTypes,
+ aSectClosures, aSectPoints, true, IsInterpolationAllowed, theDeviation );
}
else if ( theShape.ShapeType() == TopAbs_WIRE )
{
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 );
+ anIsCanBeImported = convertEdgeToSection( aWireEdge, aSectNames, aSectTypes,
+ aSectClosures, aSectPoints, false, IsInterpolationAllowed, theDeviation );
}
}
if( aProj.IsDone() )
aResult = aProj.Shape();
- setPolylineShape( aResult );
+ SetShape( aResult );
}
setEditable( anIsCanBeImported );
if ( thePoints.Size() > 1 )
{
- HYDROData_BSplineOperation aBSpline( thePoints, theIsClosed, LOCAL_SELECTION_TOLERANCE );
+ Handle(Geom_BSplineCurve) aCurve =
+ HYDROData_BSplineOperation::ComputeCurve( thePoints, theIsClosed, LOCAL_SELECTION_TOLERANCE );
- TopoDS_Edge anEdge = BRepBuilderAPI_MakeEdge( aBSpline.Curve() ).Edge();
+ TopoDS_Edge anEdge = BRepBuilderAPI_MakeEdge( aCurve ).Edge();
aMakeWire.Add( anEdge );
}
aMakeWire.Build();
}
else
{
- HYDROData_BSplineOperation aBSpline( thePoints, theIsClosed, LOCAL_SELECTION_TOLERANCE );
- aBSpline.ComputePath( thePath );
+ Handle(Geom_BSplineCurve) aCurve =
+ HYDROData_BSplineOperation::ComputeCurve( thePoints, theIsClosed, LOCAL_SELECTION_TOLERANCE );
+ HYDROData_BSplineOperation::ComputePath( aCurve, thePath );
}
}
if ( !IsEditable() )
{
// If polyline is not editable we no need to update it wire
- SetToUpdate( false );
+ ClearChanged();
return;
}
NCollection_Sequence<bool> aSectClosures;
GetSections( aSectNames, aSectTypes, aSectClosures );
- BRepBuilderAPI_MakeWire aMakeWire;
+ //BRepBuilderAPI_MakeWire aMakeWire;
TopTools_ListOfShape aSectionWiresList;
TopoDS_Wire aSectionWire = BuildWire( aSectionType, anIsSectionClosed, aPoints );
if ( !aSectionWire.IsNull() ) {
aSectionWiresList.Append( aSectionWire );
- aMakeWire.Add( aSectionWire );
+ //aMakeWire.Add( aSectionWire );
}
}
// all input wires in the <aSectionWiresList>
aBB.MakeCompound(aCmp);
if(aSeqEdges->Length() >1)
{
- ShapeAnalysis_FreeBounds::ConnectEdgesToWires(aSeqEdges,1E-5,Standard_False,aSeqWires);
+ ShapeAnalysis_FreeBounds::ConnectEdgesToWires( aSeqEdges, 1E-5, Standard_True, aSeqWires );
if( aSeqWires->Length()==1 )
aResult = aSeqWires->Value( 1 );
aResult = mkWire.Wire();
}
- setPolylineShape( aResult );
+ SetShape( aResult );
}
bool HYDROData_PolylineXY::IsHas2dPrs() const
aPointToTest = aPoint;
}
- HYDROData_BSplineOperation aBSpline( aPoints, anIsSectionClosed, LOCAL_SELECTION_TOLERANCE );
+ Handle(Geom_BSplineCurve) aCurve =
+ HYDROData_BSplineOperation::ComputeCurve( aPoints, anIsSectionClosed, LOCAL_SELECTION_TOLERANCE );
- Quantity_Parameter aFirstParam = aBSpline.Curve()->FirstParameter();
- Quantity_Parameter aSecondParam = aBSpline.Curve()->LastParameter();
+ Quantity_Parameter aFirstParam = aCurve->FirstParameter();
+ Quantity_Parameter aSecondParam = aCurve->LastParameter();
if ( thePointIndex != aSectNbPoints - 1 )
{
- GeomAPI_ProjectPointOnCurve aProject( aPointToTest, aBSpline.Curve() );
+ GeomAPI_ProjectPointOnCurve aProject( aPointToTest, aCurve );
aSecondParam = aProject.LowerDistanceParameter();
}
- GeomAdaptor_Curve anAdap( aBSpline.Curve() );
+ GeomAdaptor_Curve anAdap( aCurve );
aResDistance = GCPnts_AbscissaPoint::Length( anAdap, aFirstParam, aSecondParam );
}
aTypesList->Append( theSectionType );
aClosuresList->Append( theIsClosed );
- SetToUpdate( true );
+ Changed( Geom_2d );
}
TCollection_AsciiString HYDROData_PolylineXY::GetSectionName( const int theSectionIndex ) const
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
for ( int i = 0; aTypesIter.More(); aTypesIter.Next(), ++i )
aTypesList->Append( i == theSectionIndex ? theSectionType : aTypesIter.Value() );
- SetToUpdate( true );
+ Changed( Geom_2d );
}
bool HYDROData_PolylineXY::IsClosedSection( const int theSectionIndex ) const
for ( int i = 0; aClosuresIter.More(); aClosuresIter.Next(), ++i )
aClosuresList->Append( i == theSectionIndex ? theIsClosed : (bool)aClosuresIter.Value() );
- SetToUpdate( true );
+ Changed( Geom_2d );
}
void HYDROData_PolylineXY::GetSections( NCollection_Sequence<TCollection_AsciiString>& theSectNames,
theSectTypes.Clear();
theSectClosures.Clear();
+ if( IsCustom() )
+ {
+ const_cast<HYDROData_PolylineXY*>( this )->Interpolate();
+ }
+
Handle(TDataStd_ExtStringList) aNamesList;
Handle(TDataStd_IntegerList) aTypesList;
Handle(TDataStd_BooleanList) aClosuresList;
removePointsLists( theSectionIndex );
}
- SetToUpdate( true );
+ Changed( Geom_2d );
}
void HYDROData_PolylineXY::RemoveSections()
{
removeSectionsLists();
removePointsLists();
- SetToUpdate( true );
+ Changed( Geom_2d );
}
void HYDROData_PolylineXY::AddPoint( const int theSectionIndex,
}
}
- SetToUpdate( true );
+ Changed( Geom_2d );
}
void HYDROData_PolylineXY::SetPoint( const int theSectionIndex,
}
}
- SetToUpdate( true );
+ Changed( Geom_2d );
}
void HYDROData_PolylineXY::SetPoints( const int theSectionIndex,
}
}
- SetToUpdate( true );
+ Changed( Geom_2d );
}
-HYDROData_PolylineXY::PointsList HYDROData_PolylineXY::GetPoints( const int theSectionIndex ) const
+HYDROData_PolylineXY::PointsList HYDROData_PolylineXY::GetPoints( const int theSectionIndex, bool IsConvertToGlobal ) const
{
PointsList aResList;
+ if( IsCustom() )
+ {
+ const_cast<HYDROData_PolylineXY*>( this )->Interpolate();
+ }
+
Handle(TDataStd_RealList) aListX, aListY;
getPointsLists( theSectionIndex, aListX, aListY, false );
if ( aListX.IsNull() || aListY.IsNull() || aListX->IsEmpty() )
TColStd_ListIteratorOfListOfReal anIterX( aListX->List() );
TColStd_ListIteratorOfListOfReal anIterY( aListY->List() );
+ Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( myLab );
for ( ; anIterX.More() && anIterY.More(); anIterX.Next(), anIterY.Next() )
{
Point aPoint( anIterX.Value(), anIterY.Value() );
+ if (IsConvertToGlobal)
+ aDoc->Transform( aPoint, false );
aResList.Append( aPoint );
}
}
SetPoints( i, aPoints );
}
- SetToUpdate( true );
+ Changed( Geom_2d );
}
void HYDROData_PolylineXY::Transform( const QTransform& theTrsf )
Update();
}
+bool HYDROData_PolylineXY::IsCustom() const
+{
+ if( myIsInCustomFlag )
+ return false;
+
+ bool isNull = GetShape().IsNull();
+ int aNbPoints = 0;
+
+ HYDROData_PolylineXY* aThat = const_cast<HYDROData_PolylineXY*>( this );
+ aThat->myIsInCustomFlag = true;
+ for( int i=0, n=NbSections(); i<n; i++ )
+ aNbPoints += NbPoints( i );
+ aThat->myIsInCustomFlag = false;
+
+ return !isNull && aNbPoints == 0;
+}
+
+void HYDROData_PolylineXY::Interpolate()
+{
+ ImportShape( GetShape(), true );
+}
