Changeset 5551 in josm for trunk

Timestamp:

2012-11-01T21:11:11+01:00 (12 years ago)

Author:

bastiK

Message:

see #4029 - remember layer visibility/opacity

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/projection/datum/SevenParameterDatum.java (modified) (1 diff)
• gui/preferences/projection/ProjectionPreference.java (modified) (1 diff)
• io/session/SessionReader.java (modified) (2 diffs)
• io/session/SessionWriter.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/projection/datum/SevenParameterDatum.java

@@ -14 +14 @@
  * 
  * This method is described by EPSG as EPSG::9606.
+ * Also known as Bursa-Wolf.
  */
 public class SevenParameterDatum extends AbstractDatum {

trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java

@@ -65 +65 @@
     private static Map<String, ProjectionChoice> projectionChoicesById = new HashMap<String, ProjectionChoice>();
 
-    public static final ProjectionChoice wgs84;
-    public static final ProjectionChoice mercator;
-    public static final ProjectionChoice lambert;
+    // some ProjectionChoices that are referenced from other parts of the code
+    public static final ProjectionChoice wgs84, mercator, lambert;
+
     static {
 

trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

@@ -417 +417 @@
 
         layers = new ArrayList<Layer>();
+        for (int idx : layersMap.keySet()) {
+            Layer layer = layersMap.get(idx);
+            if (layer == null) {
+                continue;
+            }
+            Element el = elems.get(idx);
+            if (el.hasAttribute("visible")) {
+                layer.setVisible(Boolean.parseBoolean(el.getAttribute("visible")));
+            }
+            if (el.hasAttribute("opacity")) {
+                try {
+                    double opacity = Double.parseDouble(el.getAttribute("opacity"));
+                    layer.setOpacity(opacity);
+                } catch (NumberFormatException ex) {}
+            }
+        }
         for (Entry<Integer, Layer> e : layersMap.entrySet()) {
             Layer l = e.getValue();
@@ -422 +438 @@
                 continue;
             }
+
             l.setName(names.get(e.getKey()));
             layers.add(l);

trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java

@@ -172 +172 @@
             el.setAttribute("index", Integer.toString(index+1));
             el.setAttribute("name", layer.getName());
+            el.setAttribute("visible", Boolean.toString(layer.isVisible()));
+            if (layer.getOpacity() != 1.0) {
+                el.setAttribute("opacity", Double.toString(layer.getOpacity()));
+            }
             Set<Layer> deps = dependencies.get(layer);
             if (deps.size() > 0) {