X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fgui%2FGenericChart.java;h=731b91c47221b26959751d8e39a3db1f47d3d8d2;hb=54b9d8bc8f0025ccf97a67d9dd217ef1f9cf082f;hp=916c738d817c34e90defcb0f7d523e111f197ec9;hpb=d3679d647d57c2ee7376ddbf6def2d5b23c04307;p=GpsPrune.git diff --git a/tim/prune/gui/GenericChart.java b/tim/prune/gui/GenericChart.java index 916c738..731b91c 100644 --- 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); } }