[Fudaa-svn-commit] SF.net SVN: fudaa:[7706] trunk/framework/ebli-1d/src/main/java/org/fudaa/ ebli/courbe

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

Revision: 7706
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7706&view=rev
Author:   deniger
Date:     2012-10-04 22:59:53 +0000 (Thu, 04 Oct 2012)
Log Message:
-----------
am?\195?\169lioration des courbes: labels verticaux, banni?\195?\168res...

Modified Paths:
--------------
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontal.java

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java	2012-10-04 22:53:11 UTC (rev 7705)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java	2012-10-04 22:59:53 UTC (rev 7706)
@@ -110,6 +110,12 @@
     return isDiscret_;
   }
 
+  public CtuluRange getRange() {
+    return range_==null?new CtuluRange():new CtuluRange(range_);
+  }
+  
+  
+
   public void setIsDiscret(boolean isDiscret) {
     this.isDiscret_ = isDiscret;
   }

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontal.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontal.java	2012-10-04 22:53:11 UTC (rev 7705)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontal.java	2012-10-04 22:59:53 UTC (rev 7706)
@@ -106,7 +106,7 @@
           final double wordWidth = fm.stringWidth(t);
           final double xLeft = xe - wordWidth / 2;
           // pour eviter que les graduations se chevauchent
-          if (xLeft > (lastMaxX + 2) && (xe + wordWidth / 2) < (_f.getMaxEcranX() + _f.getMargesDroite()))  {
+          if (xLeft > (lastMaxX + 2) && (xe + wordWidth / 2) < (_f.getMaxEcranX() + _f.getMargesDroite())) {
             if (traceGrille_) {
               traceGraduations.dessineTrait(_g, xe, y, xe, yMaxGrad);
             }
@@ -229,7 +229,7 @@
           }
         }
         final int xtext = _xi + (_f.getMaxEcranX() - _xi) / 2 - fm.stringWidth(txt) / 2;
-        _g.drawString(txt, xtext, _y + _f.getMargesBas() - fm.getHeight() - 1);
+        _g.drawString(txt, xtext, _y + getBottomHeightNeeded(_g) - fm.getHeight() - 1);
       } else {
         if (t != null) {
           width = fm.stringWidth(t);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.