#include "HYDROData_Document.h"
#include "HYDROData_Iterator.h"
#include "HYDROData_Tool.h"
+#include "HYDROData_PolylineXY.h"
#include <BRepBuilderAPI_MakeEdge.hxx>
#include <BRepBuilderAPI_MakeWire.hxx>
+#include <BRepBuilderAPI_MakePolygon.hxx>
#include <gp_XY.hxx>
#include <gp_XYZ.hxx>
#include <OSD_File.hxx>
#include <OSD_Protection.hxx>
+#include <QColor>
#include <QStringList>
#define PYTHON_PROFILE_ID "KIND_PROFILE"
{
}
+QStringList HYDROData_Profile::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+{
+ QStringList aResList;
+
+ Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+ if ( aDocument.IsNull() )
+ return aResList;
+
+ QString aDocName = aDocument->GetDocPyName();
+ QString aProfileName = GetName();
+
+ aResList << QString( "%1 = %2.CreateObject( %3 );" )
+ .arg( aProfileName ).arg( aDocName ).arg( PYTHON_PROFILE_ID );
+ aResList << QString( "%1.SetName( \"%1\" );" ).arg( aProfileName );
+
+ return aResList;
+}
+
TopoDS_Shape HYDROData_Profile::GetTopShape() const
{
TopoDS_Wire aWire;
gp_XY aFirstPoint, aLastPoint;
- if ( !GetFirstPoint( aFirstPoint ) || !GetLastPoint( aLastPoint ) )
+ if ( !GetLeftPoint( aFirstPoint ) || !GetRightPoint( aLastPoint ) )
return aWire;
gp_Pnt aPnt1( aFirstPoint.X(), aFirstPoint.Y(), 0 );
return getShape3D();
}
-void HYDROData_Profile::UpdateShape3D()
+void HYDROData_Profile::Update()
{
- BRepBuilderAPI_MakeWire aMakeWire;
+ HYDROData_Object::Update();
- ProfilePoints aProfilePoints = GetProfilePoints();
- for ( int i = 1, n = aProfilePoints.Length(); i < n ; ++i )
+ TopoDS_Wire aWire;
+ Handle(HYDROData_ProfileUZ) aProfile = GetProfileUZ( false );
+ if ( !aProfile.IsNull() )
{
- ProfilePoint aFirstPoint = aProfilePoints.Value( i );
- ProfilePoint aSecPoint = aProfilePoints.Value( i + 1 );
-
- gp_Pnt aPnt1( aFirstPoint.X(), aFirstPoint.Y(), aFirstPoint.Z() );
- gp_Pnt aPnt2( aSecPoint.X(), aSecPoint.Y(), aSecPoint.Z() );
+ ProfilePoints aProfilePoints = GetProfilePoints();
+ HYDROData_IPolyline::SectionType aSectionType = aProfile->GetSectionType( 0 );
- BRepBuilderAPI_MakeEdge aMakeEdge( aPnt1, aPnt2 );
- TopoDS_Edge anEdge = aMakeEdge;
-
- aMakeWire.Add( anEdge );
+ aWire = HYDROData_PolylineXY::BuildWire( aSectionType, false, aProfilePoints );
}
-
- TopoDS_Wire aWire;
- if ( aMakeWire.IsDone() )
- aWire = aMakeWire;
-
SetShape3D( aWire );
}
-/**
- * Dump object to Python script representation.
- */
-QStringList HYDROData_Profile::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+QColor HYDROData_Profile::DefaultFillingColor()
{
- QStringList aResList;
+ return QColor( Qt::transparent );
+}
- Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
- if ( aDocument.IsNull() )
- return aResList;
-
- QString aDocName = aDocument->GetDocPyName();
- QString aProfileName = GetName();
+QColor HYDROData_Profile::DefaultBorderColor()
+{
+ return QColor( Qt::black );
+}
- aResList << QString( "%1 = %2.CreateObject( %3 );" )
- .arg( aProfileName ).arg( aDocName ).arg( PYTHON_PROFILE_ID );
- aResList << QString( "%1.SetName( \"%1\" );" ).arg( aProfileName );
+QColor HYDROData_Profile::getDefaultFillingColor() const
+{
+ return DefaultFillingColor();
+}
- return aResList;
+QColor HYDROData_Profile::getDefaultBorderColor() const
+{
+ return DefaultBorderColor();
}
bool HYDROData_Profile::IsValid() const
{
gp_XY aFirstPoint, aLastPoint;
- if ( !GetFirstPoint( aFirstPoint ) || !GetLastPoint( aLastPoint ) )
+ if ( !GetLeftPoint( aFirstPoint ) || !GetRightPoint( aLastPoint ) )
return false;
int aNbPoints = NbPoints();
return aNbPoints > 1;
}
-void HYDROData_Profile::SetFirstPoint( const gp_XY& thePoint )
+void HYDROData_Profile::SetLeftPoint( const gp_XY& thePoint )
{
TDF_Label aLabel = myLab.FindChild( DataTag_FirstPoint );
anArray->SetValue( 0, thePoint.X() );
anArray->SetValue( 1, thePoint.Y() );
+
+ SetToUpdate( true );
}
-bool HYDROData_Profile::GetFirstPoint( gp_XY& thePoint ) const
+bool HYDROData_Profile::GetLeftPoint( gp_XY& thePoint ) const
{
TDF_Label aLabel = myLab.FindChild( DataTag_FirstPoint, false );
if ( aLabel.IsNull() )
return true;
}
-void HYDROData_Profile::SetLastPoint( const gp_XY& thePoint )
+void HYDROData_Profile::SetRightPoint( const gp_XY& thePoint )
{
TDF_Label aLabel = myLab.FindChild( DataTag_LastPoint );
anArray->SetValue( 0, thePoint.X() );
anArray->SetValue( 1, thePoint.Y() );
+
+ SetToUpdate( true );
}
-bool HYDROData_Profile::GetLastPoint( gp_XY& thePoint ) const
+bool HYDROData_Profile::GetRightPoint( gp_XY& thePoint ) const
{
TDF_Label aLabel = myLab.FindChild( DataTag_LastPoint, false );
if ( aLabel.IsNull() )
return true;
}
+void HYDROData_Profile::Invalidate()
+{
+ TDF_Label aFirstLabel = myLab.FindChild( DataTag_FirstPoint, false );
+ if ( !aFirstLabel.IsNull() )
+ aFirstLabel.ForgetAllAttributes();
+
+ TDF_Label aLastLabel = myLab.FindChild( DataTag_LastPoint, false );
+ if ( !aLastLabel.IsNull() )
+ aLastLabel.ForgetAllAttributes();
+
+ SetToUpdate( true );
+}
+
Handle(HYDROData_ProfileUZ) HYDROData_Profile::GetProfileUZ( const bool theIsCreate ) const
{
Handle(HYDROData_ProfileUZ) aProfileUZ;
int HYDROData_Profile::NbPoints() const
{
Handle(HYDROData_ProfileUZ) aProfileUZ = GetProfileUZ( false );
- return aProfileUZ.IsNull() ? 0 : aProfileUZ->getNbPoints();
+ return aProfileUZ.IsNull() ? 0 : aProfileUZ->NbPoints();
}
void HYDROData_Profile::RemovePoints()
{
Handle(HYDROData_ProfileUZ) aProfileUZ = GetProfileUZ( false );
if ( !aProfileUZ.IsNull() )
- aProfileUZ->clear();
+ {
+ aProfileUZ->RemoveSections();
+ SetToUpdate( true );
+ }
}
-void HYDROData_Profile::SetParametricPoints( const CurveCreator::Coordinates& theCoords )
+void HYDROData_Profile::SetParametricPoints( const HYDROData_ProfileUZ::PointsList& thePoints )
{
RemovePoints();
Handle(HYDROData_ProfileUZ) aProfileUZ = GetProfileUZ();
-
- CurveCreator::Coordinates::const_iterator aBegIter = theCoords.begin();
- CurveCreator::Coordinates::const_iterator anEndIter = theCoords.end();
- while ( aBegIter != anEndIter )
+ for ( int i = 1, n = thePoints.Length(); i <= n ; ++i )
{
- const CurveCreator::TypeCoord& aCoordX = *aBegIter++;
- if ( aBegIter == anEndIter )
- break;
-
- const CurveCreator::TypeCoord& aCoordY = *aBegIter++;
-
- aProfileUZ->addPoint( aCoordX, aCoordY, 0 );
+ const HYDROData_ProfileUZ::Point& aPoint = thePoints.Value( i );
+ aProfileUZ->AddPoint( 0, aPoint );
}
+
+ SetToUpdate( true );
}
-CurveCreator::Coordinates HYDROData_Profile::GetParametricPoints() const
+HYDROData_ProfileUZ::PointsList HYDROData_Profile::GetParametricPoints() const
{
Handle(HYDROData_ProfileUZ) aProfileUZ = GetProfileUZ( false );
- return aProfileUZ.IsNull() ? CurveCreator::Coordinates() : aProfileUZ->getPoints();
+ return aProfileUZ.IsNull() ? HYDROData_ProfileUZ::PointsList() : aProfileUZ->GetPoints();
}
void HYDROData_Profile::SetProfilePoints( const ProfilePoints& thePoints )
double aDistance = gp_Pnt2d( aFirstPoint ).Distance( aPointXY );
- aProfileUZ->addPoint( 0, aDistance, aPoint.Z() );
+ HYDROData_ProfileUZ::Point aParPoint( aDistance, aPoint.Z() );
+ aProfileUZ->AddPoint( 0, aParPoint );
}
- SetFirstPoint( aFirstPoint );
- SetLastPoint( aLastPoint );
+ SetLeftPoint( aFirstPoint );
+ SetRightPoint( aLastPoint );
}
HYDROData_Profile::ProfilePoints HYDROData_Profile::GetProfilePoints() const
ProfilePoints aResPoints;
gp_XY aFirstPoint, aLastPoint;
- if ( !GetFirstPoint( aFirstPoint ) || !GetLastPoint( aLastPoint ) )
+ if ( !GetLeftPoint( aFirstPoint ) || !GetRightPoint( aLastPoint ) )
return aResPoints;
- CurveCreator::Coordinates aParametricPoints = GetParametricPoints();
- if ( aParametricPoints.size() < 4 )
+ HYDROData_ProfileUZ::PointsList aParametricPoints = GetParametricPoints();
+ if ( aParametricPoints.Length() < 2 )
return aResPoints;
- CurveCreator::Coordinates::const_iterator aBegIter = aParametricPoints.begin();
- CurveCreator::Coordinates::const_iterator anEndIter = aParametricPoints.end()--;
-
- gp_Pnt2d aFirstParPoint( *aBegIter++, *aBegIter++ );
- gp_Pnt2d aLastParPoint( *anEndIter--, *anEndIter );
+ const HYDROData_ProfileUZ::Point& aFirstParPoint = aParametricPoints.First();
+ const HYDROData_ProfileUZ::Point& aLastParPoint = aParametricPoints.Last();
double aGeoDistance = gp_Pnt2d( aFirstPoint ).Distance( aLastPoint );
double aParCommonDist = gp_Pnt2d( aFirstParPoint.X(), 0 ).Distance( gp_Pnt2d( aLastParPoint.X(), 0 ) );
aResPoints.Append( ProfilePoint( aFirstPoint.X(), aFirstPoint.Y(), aFirstParPoint.Y() ) );
// Compute all other points
- while ( aBegIter != anEndIter )
+ for ( int i = 2, n = aParametricPoints.Length(); i < n ; ++i )
{
- const CurveCreator::TypeCoord& aCoordU = *aBegIter++;
- if ( aBegIter == anEndIter )
- break;
+ const HYDROData_ProfileUZ::Point& aParPoint = aParametricPoints.Value( i );
- double aParPointDist = gp_Pnt2d( aFirstParPoint.X(), 0 ).Distance( gp_Pnt2d( aCoordU, 0 ) );
+ double aParPointDist = gp_Pnt2d( aFirstParPoint.X(), 0 ).Distance( gp_Pnt2d( aParPoint.X(), 0 ) );
double aParLen = ( aParPointDist / aParCommonDist ) * aGeoDistance;
double aParX = ( aFirstPoint.X() + aRatio * aLastPoint.X() ) / ( 1 + aRatio );
double aParY = ( aFirstPoint.Y() + aRatio * aLastPoint.Y() ) / ( 1 + aRatio );
-
- const CurveCreator::TypeCoord& aCoordZ = *aBegIter++;
-
- ProfilePoint aCompPoint( aParX, aParY, aCoordZ );
+ ProfilePoint aCompPoint( aParX, aParY, aParPoint.Y() );
aResPoints.Append( aCompPoint );
}
if ( !aFile.IsOpen() )
return false;
- bool aRes = true;
-
NCollection_Sequence<Handle(HYDROData_Profile)> aCreatedProfiles;
- while ( aRes && !aFile.IsAtEnd() )
+ Handle(HYDROData_Profile) aNewProfile;
+ while ( !aFile.IsAtEnd() )
{
- Handle(HYDROData_Profile) aNewProfile =
- Handle(HYDROData_Profile)::DownCast( theDoc->CreateObject( KIND_PROFILE ) );
+ if ( aNewProfile.IsNull() )
+ aNewProfile = Handle(HYDROData_Profile)::DownCast( theDoc->CreateObject( KIND_PROFILE ) );
- aRes = aNewProfile->ImportFromFile( aFile );
-
- aCreatedProfiles.Append( aNewProfile );
+ if ( aNewProfile->ImportFromFile( aFile ) )
+ {
+ aCreatedProfiles.Append( aNewProfile );
+ aNewProfile.Nullify();
+ }
}
+ if ( !aNewProfile.IsNull() )
+ aNewProfile->Remove();
+
// Close the file
aFile.Close();
- for ( int i = 1, n = aCreatedProfiles.Length(); i < n ; ++i )
+ for ( int i = 1, n = aCreatedProfiles.Length(); i <= n ; ++i )
{
Handle(HYDROData_Profile) aProfile = aCreatedProfiles.Value( i );
- if ( aRes )
- {
- QString aProfileName = HYDROData_Tool::GenerateObjectName( theDoc, "Profile" );
- aProfile->SetName( aProfileName );
- aProfile->SetFilePath( theFileName );
- }
- else
- {
- aProfile->Remove();
- }
+ QString aProfileName = HYDROData_Tool::GenerateObjectName( theDoc, "Profile" );
+ aProfile->SetName( aProfileName );
+
+ aProfile->SetFilePath( theFileName );
+
+ aProfile->SetBorderColor( HYDROData_Profile::DefaultBorderColor() );
}
- return aRes;
+ return !aCreatedProfiles.IsEmpty();
}
bool HYDROData_Profile::ImportFromFile( const TCollection_AsciiString& theFileName )
bool anIsParametric = false;
bool anIsGeoref = false;
- CurveCreator::Coordinates aPointsUZ;
- ProfilePoints aPointsXYZ;
+ HYDROData_ProfileUZ::PointsList aPointsUZ;
+ ProfilePoints aPointsXYZ;
double aPrevVal = -DBL_MAX;
while ( !theFile.IsAtEnd() )
aLine.LeftAdjust(); aLine.RightAdjust();
if ( aLine.IsEmpty() )
- continue;
+ {
+ if ( !anIsParametric && !anIsGeoref )
+ continue; // Definition is not started yet
+
+ break; // Next profile started
+ }
TCollection_AsciiString aValX = aLine.Token( " \t", 1 );
TCollection_AsciiString aValY = aLine.Token( " \t", 2 );
break;
}
- aPointsUZ.push_back( aCoordX );
- aPointsUZ.push_back( aCoordY );
+ HYDROData_ProfileUZ::Point aPoint( aCoordX, aCoordY );
+ aPointsUZ.Append( aPoint );
aPrevVal = aCoordX;
}
}
}
- aRes = aRes && ( anIsParametric && !aPointsUZ.empty() ||
+ aRes = aRes && ( anIsParametric && !aPointsUZ.IsEmpty() ||
anIsGeoref && !aPointsXYZ.IsEmpty() );
if ( aRes )
{
{
SetProfilePoints( aPointsXYZ );
}
+
+ Update();
}
return aRes;
