[Fudaa-cvs-commit] fudaa_devel/ebli/src/org/fudaa/ebli/graphe Graphe.java,1.9,1.10

[<de...@us...>]

Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe
In directory sc8-pr-cvs1:/tmp/cvs-serv15919

Modified Files:
	Graphe.java 
Log Message:
Corrections bogues


Index: Graphe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/Graphe.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Graphe.java	19 Dec 2003 12:06:42 -0000	1.9
--- Graphe.java	19 Dec 2003 14:02:08 -0000	1.10
***************
*** 437,440 ****
--- 437,448 ----
          }
        }
+       for (int i= nbCourbe - 1; i >= 0; i--) {
+         GrapheComponent c= (GrapheComponent)courbes.get(i);
+         if (c.isLegendAvailable() && c.isVisible()) {
+           temp= fm.stringWidth(c.getTitre());
+           if (temp > maxWidthForLegend)
+             maxWidthForLegend= temp;
+         }
+       }
        if (maxWidthForLegend == 0) {
          return;
***************
*** 454,457 ****
--- 462,484 ----
        for (int i= 0; i < nbElement; i++) {
          GrapheComponent c= (GrapheComponent)grComponents.get(i);
+         if (c.isLegendAvailable()
+           && c.isVisible()
+           && (c.getTitre() != null)
+           && (c.getTitre().length() > 0)) {
+           g2d.setColor(c.getAspectSurface());
+           g2d.fillRect(xLeft, yl - hRect, wRect, hRect);
+           g2d.setColor(c.getAspectContour());
+           g2d.fillRect(
+             xLeft,
+             yl - ((hRect - hTrait) / 2) - hTrait,
+             wTrait,
+             hTrait);
+           g2d.drawString(c.getTitre(), xTitre, yl);
+ 
+         }
+         yl += hLine;
+       }
+       for (int i= 0; i < nbCourbe; i++) {
+         GrapheComponent c= (GrapheComponent)courbes.get(i);
          if (c.isLegendAvailable()
            && c.isVisible()