Version 7, February 2009

[GpsPrune.git] / tim / prune / gui / GenericChart.java

diff --git a/tim/prune/gui/GenericChart.java b/tim/prune/gui/GenericChart.java
index 081c823257713aa5365aa8972a399c736ac6ceee..731b91c47221b26959751d8e39a3db1f47d3d8d2 100644 (file)
--- a/tim/prune/gui/GenericChart.java
+++ b/tim/prune/gui/GenericChart.java
@@ -19,7 +19,7 @@ public abstract class GenericChart extends GenericDisplay implements MouseListen
        protected static final int BORDER_WIDTH = 8;
 
        // Colours
-       private static final Color COLOR_BORDER_BG   = Color.GRAY;
+       private static final Color COLOR_BORDER_BG   = Color.WHITE;
        private static final Color COLOR_CHART_BG    = Color.WHITE;
        private static final Color COLOR_CHART_LINE  = Color.BLACK;
        private static final Color COLOR_NODATA_TEXT = Color.GRAY;
@@ -44,26 +44,29 @@ public abstract class GenericChart extends GenericDisplay implements MouseListen
 
        /**
         * Override paint method to draw map
+        * @param inG graphics object
         */
-       public void paint(Graphics g)
+       public void paint(Graphics inG)
        {
-               super.paint(g);
+               super.paint(inG);
                int width = getWidth();
                int height = getHeight();
                // border background
-               g.setColor(COLOR_BORDER_BG);
-               g.fillRect(0, 0, width, height);
+               inG.setColor(COLOR_BORDER_BG);
+               inG.fillRect(0, 0, width, height);
                if (width < 2*BORDER_WIDTH || height < 2*BORDER_WIDTH) return;
                // blank graph area, with line border
-               g.setColor(COLOR_CHART_BG);
-               g.fillRect(BORDER_WIDTH, BORDER_WIDTH, width - 2*BORDER_WIDTH, height-2*BORDER_WIDTH);
-               g.setColor(COLOR_CHART_LINE);
-               g.drawRect(BORDER_WIDTH, BORDER_WIDTH, width - 2*BORDER_WIDTH, height-2*BORDER_WIDTH);
+               inG.setColor(COLOR_CHART_BG);
+               inG.fillRect(BORDER_WIDTH, BORDER_WIDTH, width - 2*BORDER_WIDTH, height-2*BORDER_WIDTH);
                // Display message if no data to be displayed
                if (_track == null || _track.getNumPoints() <= 0)
                {
-                       g.setColor(COLOR_NODATA_TEXT);
-                       g.drawString(I18nManager.getText("display.nodata"), 50, height/2);
+                       inG.setColor(COLOR_NODATA_TEXT);
+                       inG.drawString(I18nManager.getText("display.nodata"), 50, height/2);
+               }
+               else {
+                       inG.setColor(COLOR_CHART_LINE);
+                       inG.drawRect(BORDER_WIDTH, BORDER_WIDTH, width - 2*BORDER_WIDTH, height-2*BORDER_WIDTH);
                }
        }
 
@@ -71,7 +74,7 @@ public abstract class GenericChart extends GenericDisplay implements MouseListen
        /**
         * Method to inform map that data has changed
         */
-       public void dataUpdated()
+       public void dataUpdated(byte inUpdateType)
        {
                repaint();
        }