Changeset 181

Timestamp:

01/23/10 18:57:21 (2 years ago)

Author:

stefan

Message:

implemented feature #154: add legend to the diagram

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• src/org/jergometer/diagram/BikeDiagram.java (modified) (1 diff)
• src/org/jergometer/gui/Diagram.java (modified) (4 diffs)

trunk/CHANGELOG

@@ -7 +7 @@
 * [stefan]  * fixed some I18N issues
             * solved issue #161: design an icon for JErgometer
+            * implemented feature #154: add legend to the diagram
 
 2010-01-22

trunk/src/org/jergometer/diagram/BikeDiagram.java

@@ -17 +17 @@
       suffix = "-dest";
     }
-    diagram.addGraph("pulse" + suffix, new Diagram.Graph("Pulse", Diagram.brighten(b, new Color(255,0,0, a)), s), Diagram.Side.left);
-    diagram.addGraph("pedalRPM" + suffix, new Diagram.Graph("Pedal RPM", Diagram.brighten(b, new Color(0,255,0, a)), s), Diagram.Side.left);
-    diagram.addGraph("power" + suffix, new Diagram.Graph("Power", Diagram.brighten(b, new Color(0,0,255, a)), s), Diagram.Side.left);
-    diagram.addGraph("performance" + suffix, new Diagram.Graph("Performance", Diagram.brighten(b, new Color(0,0,0, a)), s), Diagram.Side.left);
+    diagram.addGraph("pulse" + suffix, new Diagram.Graph("Pulse", Diagram.brighten(b, new Color(255,0,0, a)), s, bright), Diagram.Side.left);
+    diagram.addGraph("pedalRPM" + suffix, new Diagram.Graph("Pedal RPM", Diagram.brighten(b, new Color(0,255,0, a)), s, bright), Diagram.Side.left);
+    diagram.addGraph("power" + suffix, new Diagram.Graph("Power", Diagram.brighten(b, new Color(0,0,255, a)), s, bright), Diagram.Side.left);
+    diagram.addGraph("performance" + suffix, new Diagram.Graph("Performance", Diagram.brighten(b, new Color(0,0,0, a)), s, bright), Diagram.Side.left);
   }
 }

trunk/src/org/jergometer/gui/Diagram.java

@@ -142 +142 @@
     graphs[lr.getInt()].add(graph);
     key2Graph.put(key, graph);
+
+    drawLegend(backgroundImage.createGraphics());
+
+    redrawImage();
+    repaint();
   }
 
@@ -212 +217 @@
       for(Graph graph : graphs[lr.getInt()]) drawGraph(g, graph, lr);
     }
+    drawLegend(g);
 
     // axis
@@ -346 +352 @@
   }
 
+  private void drawLegend(Graphics2D g) {
+    int width = backgroundImage.getWidth();
+    int height = backgroundImage.getHeight();
+
+    int y = height - margin.bottom + 22;
+    Range range = timeRange;
+    int minX = margin.left;
+    int maxX = width - margin.right;
+
+    // font metrics
+    FontMetrics fm = g.getFontMetrics();
+
+    int spacing = 30;
+
+    // determine total with of the legend
+    int totalWidth = -10;
+    for (ArrayList<Graph> graphs2 : graphs) {
+      for (Graph graph : graphs2) {
+        if (!graph.hideInLegend) {
+          Rectangle2D bounds = fm.getStringBounds(graph.name, g);
+          totalWidth += bounds.getWidth() + spacing;
+        }
+      }
+    }
+
+    // draw legend
+    int x = minX + ((maxX-minX) - totalWidth)/2;
+    for (ArrayList<Graph> graphs2 : graphs) {
+      for (Graph graph : graphs2) {
+        if (!graph.hideInLegend) {
+          Rectangle2D bounds = fm.getStringBounds(graph.name, g);
+          g.setColor(graph.color);
+          g.setStroke(normalStroke);
+          g.drawString(graph.name, x, y + (int) bounds.getHeight() + markerSize + 1);
+          g.setColor(Color.BLACK);
+          g.setStroke(normalStroke);
+
+          x += bounds.getWidth() + spacing;
+        }
+      }
+    }
+  }
+
   private void drawGraph(Graphics2D g, Graph graph, Side lr) {
     g.setPaint(graph.color);
@@ -443 +492 @@
     public Color color;
     public Stroke stroke;
+    public boolean hideInLegend;
     public ArrayList<Point> timedValues;
 
-    public Graph(String name, Color color, Stroke stroke) {
+    public Graph(String name, Color color, Stroke stroke, boolean hideInLegend) {
       this.name = name;
       this.color = color;
       this.stroke = stroke;
+      this.hideInLegend = hideInLegend;
       timedValues = new ArrayList<Point>();
     }
 
     public Graph(String name, Color color) {
-      this(name, color, new BasicStroke(0.5f));
+      this(name, color, new BasicStroke(0.5f), false);
     }
   }