0022048: Visualization, AIS_InteractiveContext - single object selection should alway...

[occt.git] / src / CSLib / CSLib_Class2d.cxx

diff --git a/src/CSLib/CSLib_Class2d.cxx b/src/CSLib/CSLib_Class2d.cxx
old mode 100755 (executable)
new mode 100644 (file)
index 9208950..35e84cb
--- a/src/CSLib/CSLib_Class2d.cxx
+++ b/src/CSLib/CSLib_Class2d.cxx
@@ -1,11 +1,23 @@
-// File:       CSLib_Class2d.cxx
-// Created:    Wed Mar  8 15:06:24 1995
-// Author:     Laurent BUCHARD
-//             <lbr@mastox>
+// Created on: 1995-03-08
+// Created by: Laurent BUCHARD
+// Copyright (c) 1995-1999 Matra Datavision
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
 
 //#define No_Standard_OutOfRange
 
-#include <CSLib_Class2d.ixx>
+#include <CSLib_Class2d.hxx>
+#include <gp_Pnt2d.hxx>
 #include <Standard_ConstructionError.hxx>
 
 static inline 
@@ -83,8 +95,8 @@ void CSLib_Class2d::Destroy() {
   }
 }
 
-//-- Attention   Tableau de 0 ------> N + 1 
-//--                        P1 ..... Pn P1
+//-- Attention   Table of 0 ------> N + 1 
+//--                      P1 ..... Pn P1
 //--
 //--     1  2  3
 //--     4  0  5
@@ -119,7 +131,7 @@ Standard_Integer CSLib_Class2d::SiDans(const gp_Pnt2d& P) const
 
 
   Standard_Integer res = InternalSiDansOuOn(x,y);
-  if(res==-1) {     //-- on est peut etre ON 
+  if(res==-1) {    
     return 0;
   }
   if(Tolu || Tolv) {
@@ -148,7 +160,7 @@ Standard_Integer CSLib_Class2d::SiDans_OnMode(const gp_Pnt2d& P,
   aTolu=Tol; 
   aTolv=Tol; 
 
-  //-- ****** A FAIRE PLUS TARD, ESTIMER EN CHAQUE POINT la Tol2d en fct de la Tol3d *****
+  //-- ****** TO DO LATER, ESTIMATE AT EACH POINT Tol2d depending on Tol3d *****
   if(Umin<Umax && Vmin<Vmax) { 
     if(x<(Umin-aTolu) || (x>Umax+aTolu) || 
        (y<Vmin-aTolv) || (y>Vmax+aTolv)) {
@@ -212,7 +224,7 @@ Standard_Integer CSLib_Class2d::InternalSiDans(const Standard_Real Px,
 //modified by NIZNHY-PKV Fri Jan 15 09:03:48 2010f
 //=======================================================================
 //function : InternalSiDansOuOn
-//purpose  :  meme code que ci-dessus + test sur ON (return(-1) dans ce cas
+//purpose  : same code as above + test on ON (return(-1) in this case
 //=======================================================================
 Standard_Integer CSLib_Class2d::InternalSiDansOuOn(const Standard_Real Px,
                                                   const Standard_Real Py) const 
@@ -220,9 +232,8 @@ Standard_Integer CSLib_Class2d::InternalSiDansOuOn(const Standard_Real Px,
   Standard_Integer nbc, i, ip1, SH, NH, iRet;
   Standard_Real *Pnts2dX, *Pnts2dY;
   Standard_Real x, y, nx, ny, aX;
-  Standard_Real aYmin, aTol;
+  Standard_Real aYmin;
   //
-  aTol=(Tolu>Tolv)? Tolu : Tolv;
   nbc = 0;
   i   = 0;
   ip1 = 1;
@@ -290,9 +301,10 @@ Standard_Integer CSLib_Class2d::InternalSiDansOuOn(const Standard_Real Px,
 //=======================================================================
 const CSLib_Class2d& CSLib_Class2d::Copy(const CSLib_Class2d& ) const 
 { 
+#ifdef OCCT_DEBUG
   cerr<<"Copy not allowed in CSLib_Class2d"<<endl;
-  Standard_ConstructionError::Raise();
-  return *this;
+#endif
+  throw Standard_ConstructionError();
 }
 //=======================================================================
 //function : Transform2d