X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Frs_math.h;h=4f8f87483ce2f47d39c5fe2bd1ce1e4dc444407d;hb=27d4a138d23453e93a833e9347444b828a971cb4;hp=d30912d60f2f5058880e432b448d947592b2bbfd;hpb=16ce54abf01ca3032e42a5bb11a4afcf9014dcca;p=architektonas diff --git a/src/base/rs_math.h b/src/base/rs_math.h index d30912d..4f8f874 100644 --- a/src/base/rs_math.h +++ b/src/base/rs_math.h @@ -1,29 +1,3 @@ -/**************************************************************************** -** $Id: rs_math.h 2392 2005-05-17 13:52:38Z andrew $ -** -** Copyright (C) 2001-2003 RibbonSoft. All rights reserved. -** -** This file is part of the qcadlib Library project. -** -** This file may be distributed and/or modified under the terms of the -** GNU General Public License version 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. -** -** Licensees holding valid qcadlib Professional Edition licenses may use -** this file in accordance with the qcadlib Commercial License -** Agreement provided with the Software. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -** See http://www.ribbonsoft.com for further details. -** -** Contact info@ribbonsoft.com if any conditions of this licensing are -** not clear to you. -** -**********************************************************************/ - #ifndef RS_MATH_H #define RS_MATH_H @@ -33,22 +7,12 @@ //#define _MT //#endif -#include -#include #include -#ifndef RS_NO_FPARSER -#include "fparser.h" -#endif - -#include "rs.h" - #define ARAD 57.29577951308232 #define RS_TOLERANCE 1.0e-10 #define RS_TOLERANCE_ANGLE 1.0e-8 -//typedef unsigned int uint; - /** * Math functions. */ @@ -57,9 +21,6 @@ class RS_Math public: static int round(double v); static double pow(double x, double y); - - //static double abs(double v); - //static int abs(int v); static double rad2deg(double a); static double deg2rad(double a); static double rad2gra(double a); @@ -72,11 +33,7 @@ public: static bool isSameDirection(double dir1, double dir2, double tol); static double eval(const QString & expr, double def = 0.0); static bool cmpDouble(double v1, double v2, double tol = 0.001); - - // Keep that in the header file for dynamic inclusion/exclusion. - // (JLH: What kind of boneheaded crappy justification is that??!!??!!?) static double eval(const QString & expr, bool * ok); - static QString doubleToString(double value, double prec); static QString doubleToString(double value, int prec);