Merge remote-tracking branch 'Patrovite/master'

README.md

@@ -2,11 +2,9 @@
 
 Course Generator is a software which can estimate your time in road running races, trails, ultra trails or treks.
 
-![Course Generator Main window](http://i.imgur.com/7vHiVvo.png)
+![Course Generator Main window](https://imgur.com/4tM7kUR.png)
 
-## Status : Version 4.0.0 beta 7
-All features for this version has been implemented. The documentation is missing and some controls must be done in the translation.
-In this version the undo feature has been temporarily disabled.
+## Status : Version 4.0.0 (stable)
 
 ## History
 I created Course Generator in 2008 for my first 100 km ultra trail. Since then, I added a lot of features and it has been used by a lot of french ultra-runner. Up to the version 3.88 it has been written in C# and now java is used in order to be cross platform (Windows, Mac OS and Linux) and multilingual.
@@ -17,56 +15,54 @@ In order to works, Course Generator (also called CG) need a GPS file (GPX file)
 
 With Course Generator you can :
 
-* Estimate your time on each point of the track.
-* Set field type (the difficulty to the track: road, track...) of each point of the track
-* Set your health status and how it will evolve during the race
-* Set the station time (to eat, to drink, to sleep...)
-* Set the time limits on points of the track. CG will give you an alert if you are late
-* Set the recovery value after a rest
+* Estimate your time at each point of the track.
+* Set field type (the difficulty to the track: road, trail...) at each point of the track
+* Set your fatigue coefficient and how it will evolve during the race
+* Set the refueling time (to eat, to drink, to sleep...)
+* Set the cut-off time on points of the track. CG will give you give an alert if you are late
+* Set the recovery coefficient after a rest
 * Set a name and a comment for each position of the track
 * Take into account the effect of the night during
-* Take into account the effect of the elevation (over 1500m)
+* Take into account the effect of the altitude (over 1500m)
 * See your track on an OpenStreetMap map
-* Generate a mini road book where you will see the track profile and all the most important information of your race (position name, time, hour, elevation, ascend...)
+* Generate a mini road book where you will see the track profile and all the most important information of your race (position name, time, hour, altitude, elevation gain...)
 * Get statistics of your race
 * Analyze a race
 * Invert the track direction
-* Define a new start point for "looping track"
-* Insert an external track at the beginning or the end of a track
-* Extract and save a part of the track
+* Define a new start point for a "looping track"
+* Insert a track at the beginning or the end of another track
+* Extract a part of the track
 * Save all your specific settings in a CGX file (a Course Generator specific format)
 * Have offline maps (OpenStreetMap)
+* Use Metric or Imperial measure
+* Display the speed as speed or pace 
 
 
 ## How to run Course Generator - WINDOWS
 
 * You need a version 7 (minimum) of the java runtime environment (JRE)
 * Download the latest version from the [TechAndRun website](http://techandrun.com/course-generator/telechargement/)
-* Uncompress the archive in a directory (where you want),
-    * Content of the archive :
-        * \Help => Directory containing the manual
-        * course_generator.exe => Runtime for Windows
-        * course_generator.jar => Java runtime file. Necessary under Windows, Linux et MacOS
-* Execute "course_generator.exe"
+* Execute the installer
+* Execute "course_generator"
 * The first time you execute the program it will ask you if you want to install the standard curves. Answer "yes"
 * That's all. Enjoy ;)
 
 ## How to run Course Generator - LINUX
 * You need a version 7 (minimum) of the java runtime environment (JRE)
 * Download the latest version from the [TechAndRun website](http://techandrun.com/course-generator/telechargement/)
-* Uncompress the archive in a directory (where you want),
-    * Content of the archive :
-        * \Help => Directory containing the manual
-        * course_generator.exe => Runtime for Windows
-        * course_generator.jar => Java runtime file. Necessary under Windows, Linux et MacOS
-* Execute "course_generator.jar". "java -jarcourse_generator.jar" if the "jar" extension isn't associated to ja,
-
+* Uncompress the archive in a directory (where you want)
+* Give the execution right to "course_generator.sh"
+* Execute "course_generator.sh"
 * The first time you execute the program it will ask you if you want to install the standard curves. Answer "yes"
 * That's all. Enjoy ;)
 
+Note : Curves, log and tiles are store in "~/.course_generator".
+
 ## How to run Course Generator - MacOS
 I have no MacOS system but the installation is probably the same as LINUX.
 
+Note : Curves, log and tiles are store in "~/.course_generator".
+
 ## Some screenshoots
 Mini roadbook - Simple view
 ![Mini roadbook - simple view](http://i.imgur.com/QqeVisc.png)
@@ -80,8 +76,5 @@ Mini roadbook - Slope view
 Curves editor
 ![Curves editor](http://i.imgur.com/6YnDFUz.png)
 
-## Note
-Since version alpha 5, the course generator directory has been changed from "Course Generator" to ".course_generator".
-
 
 #### More information at [www.techandrun.com](http://www.techandrun.com)