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

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

Revision: 8387
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8387&view=rev
Author:   deniger
Date:     2013-04-06 02:12:17 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVerticalPersist.java
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGFillePanel.java
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVerticalPersist.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVerticalPersist.java	2013-04-06 01:39:09 UTC (rev 8386)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVerticalPersist.java	2013-04-06 02:12:17 UTC (rev 8387)
@@ -291,6 +291,19 @@
   }
 
   public void apply(EGAxeVertical axeY) {
+    applyAllButRange(axeY);
+    if (range != null) {
+      axeY.range_.initWith(range);
+    }
+  }
+
+  public EGAxeVertical generateAxe() {
+    EGAxeVertical axeY = new EGAxeVertical();
+    apply(axeY);
+    return axeY;
+  }
+
+  public void applyAllButRange(EGAxeVertical axeY) {
     axeY.droite_ = this.droite;
     axeY.titreVertical_ = this.titreVertical;
     axeY.titreVerticalDroite_ = this.titreVerticalDroite;
@@ -314,15 +327,6 @@
     axeY.longueurPas_ = longueurPas_;
     axeY.setModeGraduations(modeGraduations_);
     axeY.nbSousGraduations_ = nbSousGraduations_;
-    if (range != null) {
-      axeY.range_.initWith(range);
-    }
     axeY.initDisplayValues();
   }
-
-  public EGAxeVertical generateAxe() {
-    EGAxeVertical axeY = new EGAxeVertical();
-    apply(axeY);
-    return axeY;
-  }
 }

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGFillePanel.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGFillePanel.java	2013-04-06 01:39:09 UTC (rev 8386)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGFillePanel.java	2013-04-06 02:12:17 UTC (rev 8387)
@@ -106,6 +106,7 @@
     vue_ = new EGVue(_a);
     add(vue_, BuBorderLayout.CENTER);
     selection_ = new EGInteractionSelection(vue_.graphe_);
+    setDoubleBuffered(false);
 
     // suiviInfos_ = new EGInteractionSuiviAllOrdonnees(vue_.getGraphe());
 

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java	2013-04-06 01:39:09 UTC (rev 8386)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java	2013-04-06 02:12:17 UTC (rev 8387)
@@ -117,8 +117,6 @@
   public ExportTableCommentSupplier getExportTableCommentSupplier() {
     return exportTableCommentSupplier;
   }
-  
-  
 
   private void ajusteXAxe() {
     final EGAxeHorizontal hAxe = getTransformer().getXAxe();
@@ -368,7 +366,7 @@
       } else if (_c.isVisible_) {
         final EGAxeVertical vert = _c.getAxeY();
         // si l'axe n'a pas d\xE9j\xE0 \xE9t\xE9 initialis\xE9.
-        if (!vert.isRangeInit()) {
+        if (vert != null && !vert.isRangeInit()) {
           vert.ajusteFor(_c);
         }
 
@@ -635,6 +633,9 @@
       final EGObject o = m.getEGObject(i);
       if (o.isVisible_) {
         final EGAxeVertical axe = o.getAxeY();
+        if (axe == null) {
+          continue;
+        }
         CtuluRange r = (CtuluRange) axeYRange.get(axe);
         if (r == null) {
           r = new CtuluRange();
@@ -643,6 +644,7 @@
           axeYRange.put(axe, r);
         }
         o.ajusteY(r);
+        System.err.println("r=" + r);
       }
     }
     for (final Iterator it = axeYRange.entrySet().iterator(); it.hasNext();) {

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