Bump version number after correction of B&C 2002 data, minor change t…

…o the way version number if reported, update 'about' text. (cherry picked from commit 054e18c)
sj · Jun 11, 2015 · 9b104f9 · 9b104f9
1 parent 0524a9b
commit 9b104f9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/Eclipse-C++/src/main.cpp b/Eclipse-C++/src/main.cpp
@@ -130,7 +130,7 @@ int main(int argc, char* argv[]) {
 
 	if (cmdline_params_values.count("version") > 0){
 		// Print version and exit
-		PaleoLatitude::printVersion();
+		cout << "PaleoLatitude " + PaleoLatitude::getVersion() << endl;
 		exit(0);
 	}
 

diff --git a/Eclipse-C++/src/paleo_latitude/PaleoLatitude.cpp b/Eclipse-C++/src/paleo_latitude/PaleoLatitude.cpp
@@ -393,8 +393,8 @@ double PaleoLatitude::_rad2deg(const double& rad){
 	return rad * (180.0 / M_PI);
 }
 
-void PaleoLatitude::printVersion(){
-	cout << "PaleoLatitude " << PALEOLATITUDE_VERSION << endl;
+string PaleoLatitude::getVersion(){
+	return PALEOLATITUDE_VERSION;
 }
 
 void PaleoLatitude::printAbout() {
@@ -406,8 +406,7 @@ void PaleoLatitude::printAbout() {
 	cout << "  Douwe J.J. van Hinsbergen, Lennart V. de Groot, Sebastiaan J. van Schaik," << endl;
 	cout << "  Appy Sluijs, Peter K. Bijl, Wim Spakman, Cor G. Langereis, Henk Brinkhuis:" << endl;
 	cout << "  A Paleolatitude Calculator for Paleoclimate Studies" << endl;
-	cout << "  In: PLOS ONE, 2014 (under review)" << endl << endl; // TODO
-	// TODO: doi URL?
+	cout << "  In: PLoS ONE, 2015 (http://doi.org/10.1371/journal.pone.0126946)." << endl << endl;
 }
 
 string PaleoLatitude::PaleoLatitudeEntry::to_string() {

diff --git a/Eclipse-C++/src/paleo_latitude/PaleoLatitude.h b/Eclipse-C++/src/paleo_latitude/PaleoLatitude.h
@@ -33,7 +33,7 @@
 
 #include "PLPlate.h"
 
-#define PALEOLATITUDE_VERSION 1.1
+#define PALEOLATITUDE_VERSION "1.2"
 
 using namespace std;
 namespace bnu = boost::numeric::ublas;
@@ -132,9 +132,9 @@ class PaleoLatitude {
 	static void printAbout();
 
 	/**
-	 * Prints the version number of the model to stdout
+	 * Returns the version number of the model
 	 */
-	static void printVersion();
+	static string getVersion();
 
 private:
 	PLPolarWanderPaths* _pwp = NULL;