X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fconfig%2FConfig.java;h=ad3cc9c20169aa98ba781193721d9f5e31cbb0cf;hb=a6197ddcaac11c0b943183da7d46169742d024af;hp=5a95bebdebc62d52c6da4f52ec7391026781c206;hpb=4d5796d02a15808311c09448d79e6e7d1de9d636;p=GpsPrune.git diff --git a/tim/prune/config/Config.java b/tim/prune/config/Config.java index 5a95beb..ad3cc9c 100644 --- a/tim/prune/config/Config.java +++ b/tim/prune/config/Config.java @@ -7,6 +7,9 @@ import java.util.Properties; import tim.prune.data.RecentFileList; import tim.prune.data.UnitSet; import tim.prune.data.UnitSetLibrary; +import tim.prune.gui.colour.ColourerFactory; +import tim.prune.gui.colour.PointColourer; +import tim.prune.gui.map.MapSourceLibrary; /** @@ -21,6 +24,8 @@ public abstract class Config private static Properties _configValues = null; /** Colour scheme object is also part of config */ private static ColourScheme _colourScheme = new ColourScheme(); + /** Point colourer object, if any */ + private static PointColourer _pointColourer = null; /** Recently-used file list */ private static RecentFileList _recentFiles = new RecentFileList(); /** Current unit set */ @@ -42,6 +47,10 @@ public abstract class Config public static final String KEY_GPS_DEVICE = "prune.gpsdevice"; /** Key for GPS format */ public static final String KEY_GPS_FORMAT = "prune.gpsformat"; + /** Key for GPSBabel filter string */ + public static final String KEY_GPSBABEL_FILTER = "prune.gpsbabelfilter"; + /** Key for GPSBabel import file format */ + public static final String KEY_IMPORT_FILE_FORMAT = "prune.lastimportfileformat"; /** Key for Povray font */ public static final String KEY_POVRAY_FONT = "prune.povrayfont"; /** Key for the selected unit set */ @@ -59,9 +68,7 @@ public abstract class Config /** Key for working online flag */ public static final String KEY_ONLINE_MODE = "prune.onlinemode"; /** Key for width of thumbnails in kmz */ - public static final String KEY_KMZ_IMAGE_WIDTH = "prune.kmzimagewidth"; - /** Key for height of thumbnails in kmz */ - public static final String KEY_KMZ_IMAGE_HEIGHT = "prune.kmzimageheight"; + public static final String KEY_KMZ_IMAGE_SIZE = "prune.kmzimagewidth"; /** Key for gpsbabel path */ public static final String KEY_GPSBABEL_PATH = "prune.gpsbabelpath"; /** Key for gnuplot path */ @@ -70,6 +77,8 @@ public abstract class Config public static final String KEY_EXIFTOOL_PATH = "prune.exiftoolpath"; /** Key for colour scheme */ public static final String KEY_COLOUR_SCHEME = "prune.colourscheme"; + /** Key for point colourer */ + public static final String KEY_POINT_COLOURER = "prune.pointcolourer"; /** Key for line width used for drawing */ public static final String KEY_LINE_WIDTH = "prune.linewidth"; /** Key for kml track colour */ @@ -78,6 +87,14 @@ public abstract class Config public static final String KEY_AUTOSAVE_SETTINGS = "prune.autosavesettings"; /** Key for recently used files */ public static final String KEY_RECENT_FILES = "prune.recentfiles"; + /** Key for estimation parameters */ + public static final String KEY_ESTIMATION_PARAMS = "prune.estimationparams"; + /** Key for 3D exaggeration factor */ + public static final String KEY_HEIGHT_EXAGGERATION = "prune.heightexaggeration"; + /** Key for terrain grid size */ + public static final String KEY_TERRAIN_GRID_SIZE = "prune.terraingridsize"; + /** Key for altitude tolerance */ + public static final String KEY_ALTITUDE_TOLERANCE = "prune.altitudetolerance"; /** Initialise the default properties */ @@ -138,8 +155,11 @@ public abstract class Config // Save all properties from file _configValues.putAll(props); _colourScheme.loadFromHex(_configValues.getProperty(KEY_COLOUR_SCHEME)); + _pointColourer = ColourerFactory.createColourer(_configValues.getProperty(KEY_POINT_COLOURER)); _recentFiles = new RecentFileList(_configValues.getProperty(KEY_RECENT_FILES)); _unitSet = UnitSetLibrary.getUnitSet(_configValues.getProperty(KEY_UNITSET_KEY)); + // Adjust map source index if necessary + adjustSelectedMap(); if (loadFailed) { throw new ConfigException(); @@ -162,13 +182,36 @@ public abstract class Config props.put(KEY_EXIFTOOL_PATH, "exiftool"); props.put(KEY_GNUPLOT_PATH, "gnuplot"); props.put(KEY_GPSBABEL_PATH, "gpsbabel"); - props.put(KEY_KMZ_IMAGE_WIDTH, "240"); - props.put(KEY_KMZ_IMAGE_HEIGHT, "240"); + props.put(KEY_IMPORT_FILE_FORMAT, "-1"); // no file format selected + props.put(KEY_KMZ_IMAGE_SIZE, "240"); props.put(KEY_AUTOSAVE_SETTINGS, "0"); // autosave false by default props.put(KEY_UNITSET_KEY, "unitset.kilometres"); // metric by default + props.put(KEY_HEIGHT_EXAGGERATION, "100"); // 100%, no exaggeration + props.put(KEY_TERRAIN_GRID_SIZE, "50"); + props.put(KEY_ALTITUDE_TOLERANCE, "0"); // 0, all exact as before return props; } + /** + * Adjust the index of the selected map + * (only required if config was loaded from a previous version of GpsPrune) + */ + private static void adjustSelectedMap() + { + int sourceNum = getConfigInt(Config.KEY_MAPSOURCE_INDEX); + int prevNumFixed = getConfigInt(Config.KEY_NUM_FIXED_MAPS); + // Number of fixed maps not specified in version <=13, default to 6 + if (prevNumFixed == 0) prevNumFixed = 6; + int currNumFixed = MapSourceLibrary.getNumFixedSources(); + // Only need to do something if the number has changed + if (currNumFixed != prevNumFixed && (sourceNum >= prevNumFixed || sourceNum >= currNumFixed)) + { + sourceNum += (currNumFixed - prevNumFixed); + setConfigInt(Config.KEY_MAPSOURCE_INDEX, sourceNum); + } + setConfigInt(Config.KEY_NUM_FIXED_MAPS, currNumFixed); + } + /** * @param inString String to parse * @return int value of String, or 0 if unparseable @@ -207,6 +250,14 @@ public abstract class Config return _colourScheme; } + /** + * @return the current point colourer, if any + */ + public static PointColourer getPointColourer() + { + return _pointColourer; + } + /** * @return list of recently used files */ @@ -307,6 +358,16 @@ public abstract class Config setConfigString(KEY_COLOUR_SCHEME, _colourScheme.toString()); } + /** + * Update the point colourer from the given colourer + * @param inColourer point colourer object, or null + */ + public static void updatePointColourer(PointColourer inColourer) + { + _pointColourer = inColourer; + setConfigString(KEY_POINT_COLOURER, ColourerFactory.PointColourerToString(_pointColourer)); + } + /** * @return the current unit set */ @@ -314,6 +375,9 @@ public abstract class Config return _unitSet; } + /** + * @param inIndex index of unit set to select + */ public static void selectUnitSet(int inIndex) { _unitSet = UnitSetLibrary.getUnitSet(inIndex);