0023315: Duplicate comarison in an if-clause ib Prs2d_ToleranceFrame.cxx

[occt.git] / src / Prs2d / Prs2d_ToleranceFrame.cxx

diff --git a/src/Prs2d/Prs2d_ToleranceFrame.cxx b/src/Prs2d/Prs2d_ToleranceFrame.cxx
index e1c58dc..15b383a 100755 (executable)
--- a/src/Prs2d/Prs2d_ToleranceFrame.cxx
+++ b/src/Prs2d/Prs2d_ToleranceFrame.cxx
@@ -1,3 +1,20 @@
+// Copyright (c) 1999-2012 OPEN CASCADE SAS
+//
+// The content of this file is subject to the Open CASCADE Technology Public
+// License Version 6.5 (the "License"). You may not use the content of this file
+// except in compliance with the License. Please obtain a copy of the License
+// at http://www.opencascade.org and read it completely before using this file.
+//
+// The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
+// main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
+//
+// The Original Code and all software distributed under the License is
+// distributed on an "AS IS" basis, without warranty of any kind, and the
+// Initial Developer hereby disclaims all such warranties, including without
+// limitation, any warranties of merchantability, fitness for a particular
+// purpose or non-infringement. Please see the License for the specific terms
+// and conditions governing the rights and limitations under the License.
+
 #include <Prs2d_ToleranceFrame.ixx>
 #include <Prs2d_Tolerance.hxx>
 #include <Prs2d_Straightness.hxx>
@@ -49,7 +66,7 @@ Prs2d_ToleranceFrame::Prs2d_ToleranceFrame( const Handle(Graphic2d_GraphicObject
     gp_Pnt2d Pnt0 = PntP.Translated( theV1 );
     gp_Vec2d theVecG( Pnt0, gp_Pnt2d( Pnt0.X() + 1.0, Pnt0.Y() ) );
     theVecG.Rotate( myAngle );
-    gp_Vec2d theVecV = theVecG.Rotated( Standard_PI / 2 );
+    gp_Vec2d theVecV = theVecG.Rotated( M_PI / 2 );
     theVecG.Normalize();
     theVecV.Normalize();
 
@@ -175,7 +192,7 @@ void Prs2d_ToleranceFrame::Draw( const Handle(Graphic2d_Drawer)& aDrawer ) {
     
     //------------additional text's cells
 
-    if ( myTolTxt.Length() || myTxt1.Length() || myTxt1.Length() ) {
+    if ( myTolTxt.Length() || myTxt1.Length() || myTxt2.Length() ) {
       gp_Pnt2d PntP( myX, myY );
       gp_Vec2d theV1( gp_Pnt2d( myX, myY - myHeight/2 ), PntP );
       theV1.Rotate( myAngle );
@@ -187,7 +204,7 @@ void Prs2d_ToleranceFrame::Draw( const Handle(Graphic2d_Drawer)& aDrawer ) {
       theVecT.Normalize();
       gp_Vec2d theVecG( Pnt0, gp_Pnt2d( Pnt0.X() + 1.0, Pnt0.Y() ) );
       theVecG.Rotate( myAngle );
-      gp_Vec2d theVecV = theVecG.Rotated( Standard_PI / 2 );
+      gp_Vec2d theVecV = theVecG.Rotated( M_PI / 2 );
       theVecG.Normalize();
       theVecV.Normalize();