|
From: <de...@us...> - 2003-12-19 14:18:17
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe
In directory sc8-pr-cvs1:/tmp/cvs-serv18553
Modified Files:
Graphe.java
Log Message:
Gestion titre
CVS:
----------------------------------------------------------------------
Index: Graphe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/Graphe.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Graphe.java 19 Dec 2003 14:02:08 -0000 1.10
--- Graphe.java 19 Dec 2003 14:18:14 -0000 1.11
***************
*** 343,350 ****
--- 343,356 ----
g2d.setColor(Color.black);
fm= g2d.getFontMetrics();
+ int legendeYShift= y;
g2d.drawString(
titre,
x + (w - fm.stringWidth(titre)) / 2,
y + (marges.haut + f.getSize()) / 2);
+ if ((titre != null) && (titre.length() > 0)) {
+ int max= (int) (y + (marges.haut + f.getSize()) / 2);
+ if (max > legendeYShift)
+ legendeYShift= max;
+ }
f= ftSousTitre;
g2d.setFont(f);
***************
*** 355,359 ****
x + (w - fm.stringWidth(soustitre)) / 2,
y + marges.haut - 2);
- int legendeYShift= y;
if (copyright) {
g2d.setColor(Color.orange);
--- 361,364 ----
***************
*** 363,367 ****
fm= g2d.getFontMetrics();
g2d.drawString(t, x + w - 2 - fm.stringWidth(t), y + f.getSize() + 5);
! legendeYShift= y + f.getSize() + 5;
}
g2d.setColor(Color.black);
--- 368,374 ----
fm= g2d.getFontMetrics();
g2d.drawString(t, x + w - 2 - fm.stringWidth(t), y + f.getSize() + 5);
! int max= y + f.getSize() + 5;
! if (max > legendeYShift)
! legendeYShift= max;
}
g2d.setColor(Color.black);
|