Changeset 175

Timestamp:

01/23/10 00:58:03 (2 years ago)

Author:

stefan

Message:

several style changes (diagram)

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• src/org/jergometer/communication/BikeReader.java (modified) (2 diffs)
• src/org/jergometer/diagram/BikeDiagram.java (added)
• src/org/jergometer/diagram/BikeProgramVisualizer.java (modified) (2 diffs)
• src/org/jergometer/diagram/BikeSessionVisualizer.java (modified) (1 diff)
• src/org/jergometer/diagram/ProgressionVisualizer.java (modified) (3 diffs)
• src/org/jergometer/gui/Diagram.java (modified) (6 diffs)
• src/org/jergometer/Jergometer.java (modified) (7 diffs)

trunk/CHANGELOG

@@ -5 +5 @@
 
 2010-01-22
-* [stefan]  * changed background color of the diagram
-            * changed size of record and stop buttons to 20x20
+* [stefan]  * several style changes (diagram, buttons)
 
 == 0.7.7 ==

trunk/src/org/jergometer/communication/BikeReader.java

@@ -75 +75 @@
           }
           else if(printAvailable == PrintAvailable.decimals) {
-            for (int i = 0; i < bytes.length; i++) {
-              System.out.print("," + (bytes[i] & 0xFF));
+            for (byte aByte : bytes) {
+              System.out.print("," + (aByte & 0xFF));
             }
           }
           else if(printAvailable == PrintAvailable.hexadecimal) {
             // TODO
-            for (int i = 0; i < bytes.length; i++) {
-              System.out.print("," + (bytes[i] & 0xFF));
+            for (byte aByte : bytes) {
+              System.out.print("," + (aByte & 0xFF));
             }
           }
@@ -97 +97 @@
       inStream.close();
       this.interrupt();
-    } catch (IOException e) {}
+    } catch (IOException ignored) {}
     super.interrupt();
   }

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

@@ -18 +18 @@
   }
 
-  public void visualize(BikeProgram bikeProgram) {
+  public void visualize(BikeProgram bikeProgram, boolean bright) {
     synchronized(diagram) {
       BikeProgramData data = bikeProgram.getProgramData();
@@ -25 +25 @@
 
       diagram.clearGraphs();
-      diagram.addGraph("pulse-dest", "Dest. Pulse", new Color(255,0,0), Diagram.Side.left);
-      diagram.addGraph("pedalRPM-dest", "Dest. Pedal RPM", new Color(0,255,0), Diagram.Side.left);
-      diagram.addGraph("power-dest", "Dest. Power", new Color(0,0,255), Diagram.Side.left);
+      BikeDiagram.createLegend(diagram, true, bright);
 
       BikeProgramData.Action lastAction = null;

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

@@ -30 +30 @@
         diagram.clearGraphs();
       }
-      diagram.addGraph("pulse", "Pulse", new Color(128,0,0), Diagram.Side.left);
-      diagram.addGraph("pedalRPM", "Pedal RPM", new Color(0,128,0), Diagram.Side.left);
-      diagram.addGraph("power", "Power", new Color(0,0,128), Diagram.Side.left);
+      BikeDiagram.createLegend(diagram, false, false);
 
       int time = 0;

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

@@ -5 +5 @@
 import org.jergometer.model.MiniDataRecord;
 
-import java.awt.*;
 import java.util.ArrayList;
 import java.util.Date;
@@ -12 +11 @@
  */
 public class ProgressionVisualizer implements DiagramVisualizer {
-  private Diagram diagram;
+  private final Diagram diagram;
   private boolean stopped = false;
 
@@ -36 +35 @@
 
       diagram.clearGraphs();
-      diagram.addGraph("pulse", "Pulse", new Color(255,0,0), Diagram.Side.left);
-      diagram.addGraph("pedalRPM", "Pedal RPM", new Color(0,255,0), Diagram.Side.left);
-      diagram.addGraph("power", "Power", new Color(0,0,255), Diagram.Side.left);
-      diagram.addGraph("performance", "Performance", new Color(0,0,0), Diagram.Side.left);
+      BikeDiagram.createLegend(diagram, false, false);
 
       for (BikeSession bikeSession : bikeSessions) {

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

@@ -99 +99 @@
     super(true);
 
-    addHighlightRange(new Range<Color>(125, 145, brighter(0.5f, new Color(192,255,192))));
-    addHighlightRange(new Range<Color>(145, 165, brighter(0.5f, new Color(192,230,255))));
-    addHighlightRange(new Range<Color>(165, 220, brighter(0.5f, new Color(255,192,192))));
+    addHighlightRange(new Range<Color>(125, 145, brighten(0.5f, new Color(192,255,192))));
+    addHighlightRange(new Range<Color>(145, 165, brighten(0.5f, new Color(192,230,255))));
+    addHighlightRange(new Range<Color>(165, 220, brighten(0.5f, new Color(255,192,192))));
 
     addComponentListener(this);
@@ -107 +107 @@
   }
 
-  public Color brighter(double ratio, Color color) {
+  public static Color brighten(double ratio, Color color) {
     int r = color.getRed();
     int g = color.getGreen();
     int b = color.getBlue();
-
-    r = (int) ((255-r)*ratio + r);
-    g = (int) ((255-g)*ratio + g);
-    b = (int) ((255-b)*ratio + b);
-
-    return new Color(r, g, b);
+    int a = color.getAlpha();
+
+    if (ratio >= 0) {
+      r = (int) ((255-r)*ratio + r);
+      g = (int) ((255-g)*ratio + g);
+      b = (int) ((255-b)*ratio + b);
+    } else {
+      ratio = 1+ratio;
+      r = (int) (r*ratio);
+      g = (int) (g*ratio);
+      b = (int) (b*ratio);
+    }
+
+    return new Color(r, g, b, a);
   }
 
@@ -131 +139 @@
   }
 
-  public void addGraph(String key, String name, Color color, Side lr) {
-    Graph graph = new Graph(name, color);
+  public void addGraph(String key, Graph graph, Side lr) {
     graphs[lr.getInt()].add(graph);
     key2Graph.put(key, graph);
@@ -147 +154 @@
   }
 
+  private AlphaComposite makeComposite(float alpha) {
+   int type = AlphaComposite.SRC_OVER;
+   return(AlphaComposite.getInstance(type, alpha));
+  }
+  
   public synchronized void addValue(String key, long time, int value) {
     Graph graph = key2Graph.get(key);
@@ -158 +170 @@
 
     Graphics2D g = backgroundImage.createGraphics();
-    g.setColor(graph.color);
-    g.setStroke(new BasicStroke(0.5f));  // 1.0 besser ???
+    //g.setComposite(makeComposite(0.4f));
+    g.setPaint(graph.color);
+    g.setStroke(graph.stroke);  // 1.0 besser ???
     g.setRenderingHints(renderingHintsGraph);
 
@@ -430 +443 @@
     public String name;
     public Color color;
+    public Stroke stroke;
     public ArrayList<Point> timedValues;
 
-    public Graph(String name, Color color) {
+    public Graph(String name, Color color, Stroke stroke) {
       this.name = name;
       this.color = color;
+      this.stroke = stroke;
       timedValues = new ArrayList<Point>();
+    }
+
+    public Graph(String name, Color color) {
+      this(name, color, new BasicStroke(0.5f));
     }
   }

trunk/src/org/jergometer/Jergometer.java

@@ -7 +7 @@
 import org.jergometer.communication.*;
 import org.jergometer.control.BikeProgram;
-import org.jergometer.diagram.BikeProgramVisualizer;
-import org.jergometer.diagram.BikeSessionVisualizer;
-import org.jergometer.diagram.DiagramVisualizer;
-import org.jergometer.diagram.ProgressionVisualizer;
+import org.jergometer.diagram.*;
 import org.jergometer.gui.ChooseNewProgramDialog;
 import org.jergometer.gui.Diagram;
@@ -18 +15 @@
 
 import javax.swing.*;
-import javax.swing.tree.DefaultTreeModel;
-import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -25 +20 @@
 import java.awt.event.WindowListener;
 import java.io.IOException;
-import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.util.HashMap;
 
 import gnu.io.UnsupportedCommOperationException;
-import gnu.io.PortInUseException;
 
 /**
@@ -348 +341 @@
       Diagram diagram = mainWindow.getDiagram();
 //      diagram.clearGraphs();
-      diagram.addGraph("pulse", "Pulse", new Color(128,0,0), Diagram.Side.left);
-      diagram.addGraph("pedalRPM", "Pedal RPM", new Color(0,128,0), Diagram.Side.left);
-      diagram.addGraph("power", "Power", new Color(0,0,128), Diagram.Side.left);
+      BikeDiagram.createLegend(diagram, false, false);
 
       try {
@@ -426 +417 @@
     diagramVisualizer.stopVisualization();
     filterSessions();
-    visualizeBikeProgram(bikeProgram);
+    visualizeBikeProgram(bikeProgram, false);
   }
 
@@ -439 +430 @@
   }
 
-  private void visualizeBikeProgram(BikeProgram bikeProgram) {
+  private void visualizeBikeProgram(BikeProgram bikeProgram, boolean bright) {
     BikeProgramVisualizer bikeProgramVisualizer = new BikeProgramVisualizer(mainWindow.getDiagram());
     diagramVisualizer = bikeProgramVisualizer;
-    bikeProgramVisualizer.visualize(bikeProgram);
+    bikeProgramVisualizer.visualize(bikeProgram, bright);
   }
 
@@ -485 +476 @@
     boolean programFound = bikeProgram != null;
     if (programFound) {
-      visualizeBikeProgram(bikeProgram);
+      visualizeBikeProgram(bikeProgram, true);
     }