From 8aae2470c5914f88bac3338c76878dc28228e9c1 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Thu, 5 Apr 2007 19:07:37 +0000 Subject: [PATCH] added: macro: TTCALC_PRERELEASE_VER git-svn-id: svn://ttmath.org/publicrep/ttcalc/trunk@31 e52654a7-88a9-db11-a3e9-0013d4bc506e --- help/arithmetic_functions.html | 12 +++++++++--- src/compileconfig.h | 6 +++++- src/languages.cpp | 8 ++++---- src/mainwindow.cpp | 4 +++- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/help/arithmetic_functions.html b/help/arithmetic_functions.html index 1b46197..cc19737 100644 --- a/help/arithmetic_functions.html +++ b/help/arithmetic_functions.html @@ -31,6 +31,7 @@ + @@ -114,9 +115,14 @@ degtorad(12; 30; 0)=0.218166...
This function converts radians into degrees
e.g. radtodeg(pi)=180
sqrt(x)
-
Sqrt returns the square root of x
e.g. sqrt(9)=3
-If you want to calculate another kind of roots for example the cube root use the powering instead e.g. -the cube root of 8 is 8^(1/3)=2
+
Sqrt returns the square root of x
e.g. sqrt(9)=3
+ +
root(x ; n)
+
The nth root of a 'x', 'n' must be integer and not negative, if 'n' is zero the result is one, +if 'x' is zero the result is zero and we assume that the root(0;0) is not defined, e.g.
+root(8;3)=2
+root(-8;3)=-2 +
factorial(x)
The factorial function
e.g. factorial(6)=1*2*3*4*5*6=720
diff --git a/src/compileconfig.h b/src/compileconfig.h index 8475b3d..0e5cea3 100644 --- a/src/compileconfig.h +++ b/src/compileconfig.h @@ -49,10 +49,14 @@ /*! the version of the application + + TTCALC_PRERELEASE_VER is either zero or one + if zero that means this is the release version of the program */ #define TTCALC_MAJOR_VER 0 #define TTCALC_MINOR_VER 8 -#define TTCALC_REVISION_VER 0 +#define TTCALC_REVISION_VER 1 +#define TTCALC_PRERELEASE_VER 1 diff --git a/src/languages.cpp b/src/languages.cpp index d41f5ec..8003826 100644 --- a/src/languages.cpp +++ b/src/languages.cpp @@ -273,12 +273,12 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(cant_create_main_window, "I could not create the main window of the application"); InsertGuiPair(cant_init_common_controls,"I could not initialize the common controls (InitCommonControlsEx)"); InsertGuiPair(about_text, - "Mathematical calculator TTCalc %d.%d.%d\r\n" + "Mathematical calculator TTCalc %d.%d.%d%s\r\n" "Author: Tomasz Sowa\r\n" "Contact: t.sowa@slimaczek.pl\r\n" "Licence: (New) BSD licence\r\n" "Project page: http://sourceforge.net/projects/ttcalc\r\n" - "Bignum library: TTMath %d.%d.%d\r\n" + "Bignum library: TTMath %d.%d.%d%s\r\n" "Programming language: C++\r\n" "Compiler: %s\r\n" "\r\n" @@ -381,12 +381,12 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(cant_create_main_window, "Nie udało się utworzyć głównego okna aplikacji"); InsertGuiPair(cant_init_common_controls,"Nie udało się zainicjalizować obsługi Common Controls (InitCommonControlsEx)"); InsertGuiPair(about_text, - "Kalkulator matematyczny TTCalc %d.%d.%d\r\n" + "Kalkulator matematyczny TTCalc %d.%d.%d%s\r\n" "Autor: Tomasz Sowa\r\n" "Kontakt: t.sowa@slimaczek.pl\r\n" "Licencja: (New) BSD\r\n" "Strona projektu: http://sourceforge.net/projects/ttcalc\r\n" - "Biblioteka dużych liczb: TTMath %d.%d.%d\r\n" + "Biblioteka dużych liczb: TTMath %d.%d.%d%s\r\n" "Język programowania: C++\r\n" "Kompilator: %s\r\n" "\r\n" diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 01ea5ff..807eddc 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1031,8 +1031,10 @@ char compiler[30]; sprintf( buffer, GetPrgRes()->GetLanguages()->GuiMessage(Languages::about_text), - TTCALC_MAJOR_VER, TTCALC_MINOR_VER, TTCALC_REVISION_VER, + TTCALC_MAJOR_VER, TTCALC_MINOR_VER, TTCALC_REVISION_VER, + (TTCALC_PRERELEASE_VER!=0)? " (prerelease)" : "", TTMATH_MAJOR_VER, TTMATH_MINOR_VER, TTMATH_REVISION_VER, + (TTMATH_PRERELEASE_VER!=0)? " (prerelease)" : "", compiler); }