[Fudaa-svn-commit] SF.net SVN: fudaa:[3705] trunk/fudaa_devel/ebli/src/org/fudaa/ebli

[<had...@us...>]

Revision: 3705
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3705&view=rev
Author:   hadouxad
Date:     2008-08-04 12:24:25 +0000 (Mon, 04 Aug 2008)

Log Message:
-----------
AFFECT?\195?\137 - # 40: L?\195?\169gende pour les courbe 1d 
http://mantis.genesis-groupe.com//view.php?id=40
R?\195?\137SOLU - # 16: Test 
http://mantis.genesis-groupe.com//view.php?id=16

Modified Paths:
--------------
    trunk/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java
    trunk/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGGraphe.java
    trunk/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGGrapheModelListener.java
    trunk/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGRepere.java

Modified: trunk/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java
===================================================================
--- trunk/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java	2008-08-04 12:21:24 UTC (rev 3704)
+++ trunk/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java	2008-08-04 12:24:25 UTC (rev 3705)
@@ -391,7 +391,7 @@
       RenderingHints old = null;
       if (isRapide()) {
         old = graphics2D.getRenderingHints();
-        final RenderingHints newRenderer = new RenderingHints(old);
+        final RenderingHints newRenderer = (RenderingHints)old.clone();
         newRenderer.put(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
         newRenderer.put(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
         newRenderer.put(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_SPEED);
@@ -403,7 +403,7 @@
         graphics2D.setRenderingHints(newRenderer);
       } else if (isAntialiasSupported() && antialiasing_) {
         old = graphics2D.getRenderingHints();
-        final RenderingHints newRenderer = new RenderingHints(old);
+        final RenderingHints newRenderer = (RenderingHints)old.clone();
         newRenderer.put(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         newRenderer.put(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
         graphics2D.setRenderingHints(newRenderer);

Modified: trunk/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGGraphe.java
===================================================================
--- trunk/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGGraphe.java	2008-08-04 12:21:24 UTC (rev 3704)
+++ trunk/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGGraphe.java	2008-08-04 12:24:25 UTC (rev 3705)
@@ -247,9 +247,12 @@
   }
 
   public void componentShown(final ComponentEvent _e) {}
+  
+  public EGMarges computeMarges() {
+	  return computeMarges((Graphics2D) getGraphics());
+  }
 
-  public EGMarges computeMarges() {
-    final Graphics2D gr = (Graphics2D) getGraphics();
+  public EGMarges computeMarges(Graphics2D gr) {
     final EGMarges m = new EGMarges();
     final EGAxeHorizontal xaxe = transformer_.getXAxe();
     if (xaxe == null) {
@@ -331,7 +334,7 @@
     structureChanged(_mustRestore);
   }
 
-  private void dessine(final Graphics _g, final int _w, final int _h, final boolean _fill) {
+  public void dessine(final Graphics _g, final int _w, final int _h, final boolean _fill) {
     if (!isVisible()) {
       return;
     }
@@ -350,7 +353,7 @@
     g2d.setColor(Color.black);
     final EGGrapheModel model = getModel();
     final int nbElement = model.getNbEGObject();
-    transformer_.initFor(this);
+    transformer_.initFor(this,g2d);
     // dessine axe horizontal
     final Shape oldClip = g2d.getClip();
     // g2d.clip(new Rectangle(xMarge, yMarge, wMarge, hMarge));

Modified: trunk/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGGrapheModelListener.java
===================================================================
--- trunk/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGGrapheModelListener.java	2008-08-04 12:21:24 UTC (rev 3704)
+++ trunk/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGGrapheModelListener.java	2008-08-04 12:24:25 UTC (rev 3705)
@@ -19,7 +19,7 @@
 public interface EGGrapheModelListener extends EventListener{
 
   /**
-   * Envoye si l'organisation des courbes a ete modifiee.
+   * Envoye si l'organisation des courbes a \xE9t\xE9 modifiee.
    */
   void structureChanged();
 

Modified: trunk/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGRepere.java
===================================================================
--- trunk/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGRepere.java	2008-08-04 12:21:24 UTC (rev 3704)
+++ trunk/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGRepere.java	2008-08-04 12:24:25 UTC (rev 3705)
@@ -7,6 +7,7 @@
  */
 package org.fudaa.ebli.courbe;
 
+import java.awt.Graphics2D;
 import java.awt.geom.Point2D;
 
 /**
@@ -38,10 +39,10 @@
     return marges_.getBas();
   }
 
-  public void initFor(final EGGraphe _g){
+  public void initFor(final EGGraphe _g,Graphics2D g2d){
     w_ = _g.getWidth();
     h_ = _g.getHeight();
-    marges_ = _g.computeMarges();
+    marges_ = _g.computeMarges(g2d);
     marges_.ajouteEmptyBorder(3);
     xAxe_=_g.getModel().getAxeX();
   }


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