Fix of 0022497: EDF GEOM: Regression in 2D sketcher

This commit is contained in:
akl 2014-02-21 14:40:04 +04:00
parent a552a49fd7
commit 1ecb8ad04b

View File

@ -636,6 +636,7 @@ void Sketcher_Profile::ShapeFunctor::addSegmentLength( const TCollection_AsciiSt
void Sketcher_Profile::ShapeFunctor::addSegmentX( const TCollection_AsciiString& x, void Sketcher_Profile::ShapeFunctor::addSegmentX( const TCollection_AsciiString& x,
int CurrentIndex ) int CurrentIndex )
{ {
myMove = none;
myLength = x.RealValue(); myLength = x.RealValue();
if ( Abs( myDx ) < Precision::Confusion() ) { if ( Abs( myDx ) < Precision::Confusion() ) {
MESSAGE("profile : cannot intersect, arg "<<CurrentIndex-1); MESSAGE("profile : cannot intersect, arg "<<CurrentIndex-1);
@ -644,8 +645,6 @@ void Sketcher_Profile::ShapeFunctor::addSegmentX( const TCollection_AsciiString&
myLength = ( myLength - myX ) / myDx; myLength = ( myLength - myX ) / myDx;
if ( Abs( myLength ) > Precision::Confusion() ) if ( Abs( myLength ) > Precision::Confusion() )
myMove = line; myMove = line;
else
myMove = none;
} }
/*! /*!
@ -657,6 +656,7 @@ void Sketcher_Profile::ShapeFunctor::addSegmentX( const TCollection_AsciiString&
void Sketcher_Profile::ShapeFunctor::addSegmentY( const TCollection_AsciiString& y, void Sketcher_Profile::ShapeFunctor::addSegmentY( const TCollection_AsciiString& y,
int CurrentIndex ) int CurrentIndex )
{ {
myMove = none;
myLength = y.RealValue(); myLength = y.RealValue();
if ( Abs( myDy ) < Precision::Confusion() ) { if ( Abs( myDy ) < Precision::Confusion() ) {
MESSAGE("profile : cannot intersect, arg "<<CurrentIndex-1); MESSAGE("profile : cannot intersect, arg "<<CurrentIndex-1);
@ -665,8 +665,6 @@ void Sketcher_Profile::ShapeFunctor::addSegmentY( const TCollection_AsciiString&
myLength = ( myLength - myY ) / myDy; myLength = ( myLength - myY ) / myDy;
if ( Abs( myLength ) > Precision::Confusion() ) if ( Abs( myLength ) > Precision::Confusion() )
myMove = line; myMove = line;
else
myMove = none;
} }
/*! /*!