0022743: EDF GEOM: Regression in MakePipeTShapeChamfer: Some faces are missing in...

[modules/geom.git] / src / SKETCHER / Sketcher_Profile.cxx

diff --git a/src/SKETCHER/Sketcher_Profile.cxx b/src/SKETCHER/Sketcher_Profile.cxx
index c9d161d38de4ad76bbe05a71b64ec389eee31128..1237bfd45602ba4fec4518a943d8fe5587b679d1 100644 (file)
--- a/src/SKETCHER/Sketcher_Profile.cxx
+++ b/src/SKETCHER/Sketcher_Profile.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -636,6 +636,7 @@ void Sketcher_Profile::ShapeFunctor::addSegmentLength( const TCollection_AsciiSt
 void Sketcher_Profile::ShapeFunctor::addSegmentX( const TCollection_AsciiString& x,
                                                   int CurrentIndex )
 {
+  myMove = none;
   myLength = x.RealValue();
   if ( Abs( myDx ) < Precision::Confusion() ) {
     MESSAGE("profile : cannot intersect, arg "<<CurrentIndex-1);
@@ -644,8 +645,6 @@ void Sketcher_Profile::ShapeFunctor::addSegmentX( const TCollection_AsciiString&
   myLength = ( myLength - myX ) / myDx;
   if ( Abs( myLength ) > Precision::Confusion() )
     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,
                                                   int CurrentIndex )
 {
+  myMove = none;
   myLength = y.RealValue();
   if ( Abs( myDy ) < Precision::Confusion() ) {
     MESSAGE("profile : cannot intersect, arg "<<CurrentIndex-1);
@@ -665,8 +665,6 @@ void Sketcher_Profile::ShapeFunctor::addSegmentY( const TCollection_AsciiString&
   myLength = ( myLength - myY ) / myDy;
   if ( Abs( myLength ) > Precision::Confusion() )
     myMove = line;
-  else
-    myMove = none;
 }
 
 /*!