IMPLEMENT_STANDARD_RTTIEXT( HYDROData_DTM, HYDROData_Bathymetry )
-HYDROData_DTM::CurveUZ::CurveUZ( double theXCurv )
- : myXcurv( theXCurv )
+HYDROData_DTM::CurveUZ::CurveUZ( double theXCurv, const gp_Vec2d& theProfileDir )
+ : myXcurv( theXCurv ), myProfileDir( theProfileDir )
{
}
return myXcurv;
}
+gp_Vec2d HYDROData_DTM::CurveUZ::ProfileDir() const
+{
+ return myProfileDir;
+}
+
HYDROData_DTM::CurveUZ HYDROData_DTM::CurveUZ::operator + ( const CurveUZ& c ) const
{
- HYDROData_DTM::CurveUZ res( Xcurv() + c.Xcurv() );
+ HYDROData_DTM::CurveUZ res( Xcurv() + c.Xcurv(), ProfileDir() + c.ProfileDir() );
size_t n = size();
res.reserve( n );
for( int i=0; i<n; i++ )
HYDROData_DTM::CurveUZ HYDROData_DTM::CurveUZ::operator * ( double d ) const
{
- HYDROData_DTM::CurveUZ res( Xcurv()*d );
+ HYDROData_DTM::CurveUZ res( Xcurv()*d, ProfileDir()*d );
size_t n = size();
res.reserve( n );
for( int i=0; i<n; i++ )
myDirs.clear();
}
-TopoDS_Edge HYDROData_DTM::Bank::createEdge( bool is3d ) const
+TopoDS_Edge HYDROData_DTM::Bank::createEdge3d() const
{
size_t n = myPoints.size();
+ if( n<2 )
+ return TopoDS_Edge();
+
Handle_Geom_BSplineCurve aCurve;
Handle(TColgp_HArray1OfPnt) points = new TColgp_HArray1OfPnt( 1, (int)n );
for( size_t i = 1; i <= n; i++ )
{
gp_Pnt aPnt = myPoints[i-1];
- if( !is3d )
- aPnt.SetZ( 0.0 );
gp_Vec aVec = myDirs[i-1];
- if( !is3d )
- aVec.SetZ( 0.0 );
points->SetValue( (int)i, aPnt );
tangents.SetValue( (int)i, aVec );
flags->SetValue( (int)i, Standard_True );
std::vector<Handle_Geom2d_Curve> HYDROData_DTM::ProfileToParametric(
const Handle_HYDROData_Profile& theProfile,
- double& theUMin, double& theUMax )
+ double& theUMin, double& theUMax, gp_Vec2d& theDir )
{
std::vector<Handle_Geom2d_Curve> curves;
// Transformation of the coordinate systems
gp_Pnt aLowest;
- gp_Vec2d aDir;
double zmin, zmax;
- GetProperties( theProfile, aLowest, aDir, false, zmin, zmax );
+ GetProperties( theProfile, aLowest, theDir, false, zmin, zmax );
gp_Ax3 aStd3d( gp_Pnt( 0, 0, 0 ), gp_Dir( 0, 0, 1 ), gp_Dir( 1, 0, 0 ) );
- gp_Ax3 aLocal( aLowest, gp_Dir( 0, 0, 1 ), gp_Dir( aDir.X(), aDir.Y(), 0 ) );
+ gp_Ax3 aLocal( aLowest, gp_Dir( 0, 0, 1 ), gp_Dir( theDir.X(), theDir.Y(), 0 ) );
gp_Trsf aTransf;
aTransf.SetTransformation( aStd3d, aLocal );
}
-double CalcGC( const std::vector<gp_Pnt2d>& intersections )
-{
- double u = 0;
- size_t n = intersections.size();
- for( size_t i = 0; i < n; i++ )
- {
- u += intersections[i].X();
- }
- u /= n;
- return u;
-}
-
-double CalcWidth( const std::vector<gp_Pnt2d>& intersections )
+bool CalcMidWidth( const std::vector<gp_Pnt2d>& intersections, double& theMid, double& theWid )
{
double umin = std::numeric_limits<double>::max(),
umax = -umin;
size_t n = intersections.size();
if( n <= 1 )
- return 0;
+ return false;
for( size_t i = 0; i < n; i++ )
{
if( u>umax )
umax = u;
}
- return umax-umin;
+ theMid = ( umin+umax )/2;
+ theWid = umax-umin;
+ return true;
}
void HYDROData_DTM::ProfileDiscretization( const Handle_HYDROData_Profile& theProfile,
aUMax = -aUMin,
aVMax = 1000000;
- std::vector<Handle_Geom2d_Curve> curves = ProfileToParametric( theProfile, aUMin, aUMax );
+ gp_Vec2d aProfileDir;
+ std::vector<Handle_Geom2d_Curve> curves = ProfileToParametric( theProfile, aUMin, aUMax, aProfileDir );
size_t n = curves.size();
if( n==0 )
curves.push_back( aT2 );
int psize = ( int )( ( theMaxZ-theMinZ ) / theDDZ + 1 );
- theMidPointCurve = CurveUZ( theXCurv );
+ theMidPointCurve = CurveUZ( theXCurv, aProfileDir );
theMidPointCurve.reserve( psize );
- theWidthCurve = CurveUZ( theXCurv );
+ theWidthCurve = CurveUZ( theXCurv, aProfileDir );
theWidthCurve.reserve( psize );
n = curves.size();
if( intersections.size() >= 2 )
{
- double u_mid = CalcGC( intersections );
+ double u_mid, u_wid;
+ if( !CalcMidWidth( intersections, u_mid, u_wid ) )
+ continue;
+
PointUZ p_mid;
p_mid.U = u_mid;
p_mid.Z = z;
theMidPointCurve.push_back( p_mid );
- double u_wid = CalcWidth( intersections );
PointUZ p_wid;
p_wid.U = u_wid;
p_wid.Z = z;
if( isAddSecond )
theInterpolation.push_back( theCurveB );
}
-
+#include <BRepLib_MakeEdge2d.hxx>
void HYDROData_DTM::CurveTo3D( const Handle_Geom2d_BSplineCurve& theHydraulicAxis,
const CurveUZ& theMidCurve, const CurveUZ& theWidthCurve,
AltitudePoints& thePoints,
Bank* theLeft, Bank* theRight, double dz )
{
Geom2dAdaptor_Curve anAdaptor( theHydraulicAxis );
+ TopoDS_Edge E2d = BRepLib_MakeEdge2d(theHydraulicAxis).Edge();
GCPnts_AbscissaPoint ap( anAdaptor, theMidCurve.Xcurv(), anAdaptor.FirstParameter() );
double aParam = ap.Parameter();
gp_Pnt2d point;
- gp_Vec2d tangent, profile_dir;
- anAdaptor.D1( aParam, point, tangent );
- profile_dir.SetCoord( tangent.Y(), -tangent.X() );
+ anAdaptor.D0( aParam, point );
+ gp_Vec2d profile_dir = theMidCurve.ProfileDir();
+ gp_Dir tangent_n( -profile_dir.Y(), profile_dir.X(), dz );
profile_dir.Normalize();
- gp_Dir tangent_n( tangent.X(), tangent.Y(), dz );
-
+
size_t n = theMidCurve.size();
double min_param = 1E+15;
double max_param = -1E+15;
double param1 = theMidCurve[i].U - theWidthCurve[i].U / 2;
double param2 = theMidCurve[i].U + theWidthCurve[i].U / 2;
- gp_Pnt2d p1 = point.Translated( param1 * profile_dir / 2 );
- gp_Pnt2d p2 = point.Translated( param2 * profile_dir / 2 );
+ gp_Pnt2d p1 = point.Translated( param1 * profile_dir);
+ gp_Pnt2d p2 = point.Translated( param2 * profile_dir);
double z = theMidCurve[i].Z;
if( theLeft )
{
- gp_Pnt2d left2d = point.Translated( min_param * profile_dir / 2 );
+ gp_Pnt2d left2d = point.Translated( min_param * profile_dir );
gp_Pnt left( left2d.X(), left2d.Y(), z1 );
theLeft->push_back( left, tangent_n );
}
if( theRight )
{
- gp_Pnt2d right2d = point.Translated( max_param * profile_dir / 2 );
+ gp_Pnt2d right2d = point.Translated( max_param * profile_dir );
gp_Pnt right( right2d.X(), right2d.Y(), z2 );
theRight->push_back( right, tangent_n );
}
return b;
}
+#include <BRepLib_MakeWire.hxx>
+
HYDROData_Bathymetry::AltitudePoints HYDROData_DTM::Interpolate
( const Handle_Geom2d_BSplineCurve& theHydraulicAxis,
const Handle_HYDROData_Profile& theProfileA,
double zmin = max( zminA, zminB );
double zmax = max( zmaxA, zmaxB );
- CurveUZ midA(0), midB(0);
- CurveUZ widA(0), widB(0);
+ CurveUZ midA(0, gp_Vec2d()), midB(0, gp_Vec2d());
+ CurveUZ widA(0, gp_Vec2d()), widB(0, gp_Vec2d());
ProfileDiscretization( theProfileA, theXCurvA, zmin, zmax, theDDZ, midA, widA );
ProfileDiscretization( theProfileB, theXCurvB, zmin, zmax, theDDZ, midB, widB );
for( size_t i=0; i<p; i++ )
CurveTo3D( theHydraulicAxis, mid[i], wid[i], points, theLeft, theRight, dz );
+ BRepLib_MakeWire WM;
+ for (int i =0; i < theLeft->myPoints.size() - 1; i++)
+ WM.Add(BRepLib_MakeEdge(theLeft->myPoints[i], theLeft->myPoints[i+1]).Edge());
+ TopoDS_Wire W = WM.Wire();
return points;
}
for( size_t i=0, n1=n-1; i<n1; i++ )
{
double aDistance = distances[i+1]-distances[i];
- aNbStepsComplete += ( int(aDistance/theSpatialStep) + 1 );
+ aNbStepsComplete += ( int(aDistance/theSpatialStep) /*+ 1*/ );
}
if( theLeft )
theLeft->reserve( aNbStepsComplete );
for( size_t i=0, n1=n-1; i<n1; i++ )
{
double aDistance = distances[i+1]-distances[i];
- int aNbSteps = int(aDistance/theSpatialStep) + 1;
+ int aNbSteps = int(aDistance/theSpatialStep) /*+ 1*/;
bool isAddSecond = i==n1-1;
AltitudePoints local_points = Interpolate( aHydraulicAxis, theProfiles[i], distances[i],
}
return points;
}
+
+void HYDROData_DTM::CreateBankShapes( TopoDS_Edge& theLeft, TopoDS_Edge& theRight ) const
+{
+ theLeft = myLeft.createEdge3d();
+ theRight = myRight.createEdge3d();
+}
