+ for (int i = 0; i < aa.length; i++)\r
+ {\r
+ if (!aa[i].visible)\r
+ {\r
+ continue;\r
+ }\r
+\r
+ x = width - fm.stringWidth(aa[i].label) - 3;\r
+\r
+ if (aa[i].graph>0)\r
+ {\r
+ graphExtras = y;\r
+\r
+ y += (aa[i].height / 3);\r
+\r
+ if(aa[i].graphGroup<0)\r
+ graphExtras = y + fontHeight;\r
+ }\r
+\r
+ if(aa[i].graphGroup>-1)\r
+ {\r
+ int groupSize = 0;\r
+ for (int gg = 0; gg < aa.length; gg++)\r
+ {\r
+ if (aa[gg].graphGroup == aa[i].graphGroup)\r
+ groupSize++;\r
+ }\r
+\r
+ if(groupSize * (fontHeight+8) < aa[i].height)\r
+ graphExtras += (aa[i].height -( groupSize * (fontHeight+8)) )/2;\r
+\r
+ for(int gg=0; gg<aa.length; gg++)\r
+ {\r
+ if(aa[gg].graphGroup==aa[i].graphGroup)\r
+ {\r
+ x = width - fm.stringWidth(aa[gg].label) - 3;\r
+ g.drawString(aa[gg].label, x, graphExtras );\r
+ if(aa[gg].annotations[0]!=null)\r
+ g.setColor(aa[gg].annotations[0].colour);\r
+\r
+ g.drawLine( x, graphExtras+3,\r
+ x+fm.stringWidth(aa[gg].label),\r
+ graphExtras+3);\r
+\r
+ g.setColor(Color.black);\r
+ graphExtras += fontHeight+8;\r
+ }\r
+ }\r
+ }\r
+ else\r
+ g.drawString(aa[i].label, x, y);\r
+\r
+ if (aa[i].graph>0)\r
+ {\r
+ /* if (aa[i].graphLines != null)\r
+ {\r
+ for (int gl = 0; gl < aa[i].graphLines.size(); gl++)\r
+ {\r
+ x = width - fm.stringWidth(aa[i].getGraphLine(gl).label) - 3;\r
+ g.drawString(aa[i].getGraphLine(gl).label, x, graphExtras);\r
+ g.setColor(aa[i].getGraphLine(gl).colour);\r
+ Graphics2D g2 = (Graphics2D) g;\r
+ g2.setStroke(new BasicStroke(1,\r
+ BasicStroke.CAP_SQUARE,\r
+ BasicStroke.JOIN_ROUND, 3f,\r
+ new float[]\r
+ {5f, 3f}, 0f));\r
+\r
+ graphExtras += 3;\r
+\r
+ g.drawLine(x, graphExtras,\r
+ x+fm.stringWidth(aa[i].label),\r
+ graphExtras);\r
+ g2.setStroke(new BasicStroke());\r
+ }\r
+ }*/\r
+ y += ((2 * aa[i].height) / 3);\r
+ }\r
+ else\r
+ {\r
+ y += aa[i].height;\r
+ }\r
+ }\r