X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2FGpsPruner.java;h=7a172a4a64ceeb0a2576de987a4240b3018cc423;hb=1ee49ae3c8ef3aa2e63eadd458531e5f8bd4f92c;hp=eafbf1977de170622e3a8ae3fb1290a59bc126ae;hpb=52bf9e8686c916be37a26a0b75340393d4478b05;p=GpsPrune.git

diff --git a/tim/prune/GpsPruner.java b/tim/prune/GpsPruner.java
index eafbf19..7a172a4 100644
--- a/tim/prune/GpsPruner.java
+++ b/tim/prune/GpsPruner.java
@@ -4,30 +4,39 @@ import java.awt.event.WindowAdapter;
 import java.awt.BorderLayout;
 import java.awt.event.WindowEvent;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.util.Locale;
+import java.util.ArrayList;
 import javax.swing.JFrame;
 import javax.swing.JSplitPane;
 import javax.swing.JToolBar;
 import javax.swing.WindowConstants;
 
+import tim.prune.config.Config;
+import tim.prune.config.ConfigException;
 import tim.prune.gui.DetailsDisplay;
 import tim.prune.gui.IconManager;
 import tim.prune.gui.MenuManager;
 import tim.prune.gui.ProfileChart;
 import tim.prune.gui.SelectorDisplay;
 import tim.prune.gui.StatusBar;
+import tim.prune.gui.Viewport;
 import tim.prune.gui.map.MapCanvas;
 
 /**
- * Tool to visualize, edit and prune GPS data
+ * Prune is a tool to visualize, edit, convert and prune GPS data
  * Please see the included readme.txt or http://activityworkshop.net
- * This software is copyright activityworkshop.net and made available through the Gnu GPL
+ * This software is copyright activityworkshop.net 2006-2010 and made available through the Gnu GPL version 2.
+ * For license details please see the included license.txt.
+ * GpsPruner is the main entry point to the application, including initialisation and launch
  */
 public class GpsPruner
 {
-	// Final build of version 6
-	public static final String VERSION_NUMBER = "6";
-	public static final String BUILD_NUMBER = "117";
+	/** Version number of application, used in about screen and for version check */
+	public static final String VERSION_NUMBER = "9";
+	/** Build number, just used for about screen */
+	public static final String BUILD_NUMBER = "176";
+	/** Static reference to App object */
 	private static App APP = null;
 
 
@@ -38,31 +47,46 @@ public class GpsPruner
 	public static void main(String[] args)
 	{
 		Locale locale = null;
+		String localeCode = null;
 		String langFilename = null;
 		String configFilename = null;
+		ArrayList<File> dataFiles = new ArrayList<File>();
 		boolean showUsage = false;
 		for (int i=0; i<args.length; i++)
 		{
-			if (args[i].startsWith("--locale="))
+			String arg = args[i];
+			if (arg.startsWith("--locale="))
 			{
-				locale = getLanguage(args[i].substring(9));
+				localeCode = arg.substring(9);
+				locale = getLanguage(localeCode);
 			}
-			else if (args[i].startsWith("--lang="))
+			else if (arg.startsWith("--lang="))
 			{
-				locale = getLanguage(args[i].substring(7));
+				localeCode = arg.substring(7);
+				locale = getLanguage(localeCode);
 			}
-			else if (args[i].startsWith("--langfile="))
+			else if (arg.startsWith("--langfile="))
 			{
-				langFilename = args[i].substring(11);
+				langFilename = arg.substring(11);
 			}
-			else if (args[i].startsWith("--configfile="))
+			else if (arg.startsWith("--configfile="))
 			{
-				configFilename = args[i].substring(13);
+				configFilename = arg.substring(13);
+			}
+			else if (arg.startsWith("--help")) {
+				showUsage = true;
 			}
 			else
 			{
-				System.out.println("Unknown parameter '" + args[i] + "'.");
-				showUsage = true;
+				// Check if a data file has been given
+				File f = new File(arg);
+				if (f.exists() && f.canRead()) {
+					dataFiles.add(f);
+				}
+				else {
+					System.out.println("Unknown parameter '" + arg + "'.");
+					showUsage = true;
+				}
 			}
 		}
 		if (showUsage) {
@@ -84,18 +108,36 @@ public class GpsPruner
 		catch (ConfigException ce) {
 			System.err.println("Failed to load config file: " + configFilename);
 		}
-		// Set locale according to Config's language property
-		String langCode = Config.getLanguageCode();
-		if (locale == null && langCode != null) {
-			Locale configLocale = getLanguage(langCode);
-			if (configLocale != null) {locale = configLocale;}
+		boolean overrideLang = (locale != null);
+		if (overrideLang) {
+			// Make sure Config holds chosen language
+			Config.setConfigString(Config.KEY_LANGUAGE_CODE, localeCode);
+		}
+		else {
+			// Set locale according to Config's language property
+			String configLang = Config.getConfigString(Config.KEY_LANGUAGE_CODE);
+			if (configLang != null) {
+				Locale configLocale = getLanguage(configLang);
+				if (configLocale != null) {locale = configLocale;}
+			}
 		}
 		I18nManager.init(locale);
-		if (langFilename != null) {
-			I18nManager.addLanguageFile(langFilename);
+		// Load the external language file, either from config file or from command line params
+		if (langFilename == null && !overrideLang) {
+			// If langfilename is blank on command line parameters then don't use setting from config
+			langFilename = Config.getConfigString(Config.KEY_LANGUAGE_FILE);
+		}
+		if (langFilename != null && !langFilename.equals("")) {
+			try {
+				I18nManager.addLanguageFile(langFilename);
+				Config.setConfigString(Config.KEY_LANGUAGE_FILE, langFilename);
+			}
+			catch (FileNotFoundException fnfe) {
+				System.err.println("Failed to load language file: " + langFilename);
+			}
 		}
 		// Set up the window and go
-		launch();
+		launch(dataFiles);
 	}
 
 
@@ -122,14 +164,15 @@ public class GpsPruner
 
 	/**
 	 * Launch the main application
+	 * @param inDataFiles list of data files to load on startup
 	 */
-	private static void launch()
+	private static void launch(ArrayList<File> inDataFiles)
 	{
 		JFrame frame = new JFrame("Prune");
 		APP = new App(frame);
 
 		// make menu
-		MenuManager menuManager = new MenuManager(frame, APP, APP.getTrackInfo());
+		MenuManager menuManager = new MenuManager(APP, APP.getTrackInfo());
 		frame.setJMenuBar(menuManager.createMenuBar());
 		APP.setMenuManager(menuManager);
 		UpdateMessageBroker.addSubscriber(menuManager);
@@ -143,6 +186,8 @@ public class GpsPruner
 		UpdateMessageBroker.addSubscriber(rightPanel);
 		MapCanvas mapDisp = new MapCanvas(APP, APP.getTrackInfo());
 		UpdateMessageBroker.addSubscriber(mapDisp);
+		Viewport viewport = new Viewport(mapDisp);
+		APP.setViewport(viewport);
 		ProfileChart profileDisp = new ProfileChart(APP.getTrackInfo());
 		UpdateMessageBroker.addSubscriber(profileDisp);
 		StatusBar statusBar = new StatusBar();
@@ -179,8 +224,11 @@ public class GpsPruner
 		// finish off and display frame
 		frame.pack();
 		frame.setSize(650, 450);
-		frame.show();
+		frame.setVisible(true);
 		// Set position of map/profile splitter
 		midPane.setDividerLocation(0.75);
+
+		// Finally, give the files to load to the App
+		APP.loadDataFiles(inDataFiles);
 	}
 }