Changeset 21 in josm for src/org/openstreetmap/josm/gui/layer/Layer.java

Timestamp:

2005-10-20T13:00:33+02:00 (19 years ago)

Author:

imi

Message:

• started command implementation
• cleaned up Layer
• gpsbabel style for importing qpegps tracks

File:

• src/org/openstreetmap/josm/gui/layer/Layer.java (modified) (3 diffs)

src/org/openstreetmap/josm/gui/layer/Layer.java

@@ -5 +5 @@
 import javax.swing.Icon;
 
-import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.command.DataSet;
+import org.openstreetmap.josm.data.osm.LineSegment;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Track;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.engine.Engine;
 
 /**
@@ -23 +27 @@
  * @author imi
  */
-public interface Layer {
+abstract public class Layer {
 
         /**
-         * Draw the layer on the given Graphics. The state of the graphics object
-         * can be changed (drawing color..)
-         *
-         * @param g The graphics to draw the layer on.
-         * @param mv The MapView with information about the screen layout. 
+         * The visibility state of the layer.
          */
-        void paint(Graphics g, MapView mv);
+        public boolean visible = true;
+        /**
+         * The dataSet this layer operates on, if any. Not all layer may have a
+         * dataset associated.
+         */
+        public final DataSet dataSet;
+        /**
+         * The name of this layer.
+         */
+        public final String name;
+        /**
+         * The engine used to draw the data.
+         */
+        private final Engine engine;
+        
+        /**
+         * Create the layer and fill in the necessary components.
+         * @param dataSet The DataSet, this layer operates on. Can be <code>null</code>.
+         */
+        public Layer(DataSet dataSet, Engine engine, String name) {
+                if (engine == null || name == null)
+                        throw new NullPointerException();
+                this.dataSet = dataSet;
+                this.name = name;
+                this.engine = engine;
+        }
+
+        /**
+         * Paint the dataset using the engine set.
+         * @param mv The object that can translate GeoPoints to screen coordinates.
+         */
+        public final void paint(Graphics g, MapView mv) {
+                engine.init(g, mv);
+
+                for (Track t : dataSet.tracks())
+                        engine.drawTrack(t);
+                for (LineSegment ls : dataSet.pendingLineSegments())
+                        engine.drawPendingLineSegment(ls);
+                for (Node n : dataSet.nodes)
+                        engine.drawNode(n);
+        }
 
         /**
@@ -38 +78 @@
          * be larger than 64 pixel in any dimension.
          */
-        Icon getIcon();
+        abstract public Icon getIcon();
 
-        /**
-         * Provide a human readable name (may be in html format).
-         */
-        String getName();
-        
-        /**
-         * If the layer has a dataset it can provide, return it here.
-         * @return The dataset for this layer or <code>null</code> if no dataset
-         *              is available.
-         */
-        DataSet getDataSet();
-        
         /**
          * @return <code>true</code>, if the map data can be edited.
          */
-        boolean isEditable();
-
-        /**
-         * @return <code>true</code>, if the layer is visible
-         */
-        boolean isVisible();
-        
-        /**
-         * Set the visibility state of the layer.
-         */
-        void setVisible(boolean visible);
+        public boolean isEditable() {
+                return false;
+        }
 }