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

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

Revision: 8374
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8374&view=rev
Author:   deniger
Date:     2013-04-03 12:47:10 +0000 (Wed, 03 Apr 2013)
Log Message:
-----------
sauvegarde de la visibilit?\195?\169 d'une courbe

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/EGCourbePersist.java
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersistBuilder.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	2013-04-03 09:45:41 UTC (rev 8373)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java	2013-04-03 12:47:10 UTC (rev 8374)
@@ -214,17 +214,16 @@
   int nbSousGraduations_ = 3;
 
   final TickIterator buildUpToDateMainTickIterator() {
-
-    if (modeGraduations_ == LOGARITHMIQUE) {
+    if (userIterator != null) {
+      axisIterator_ = userIterator;
+    } else if (modeGraduations_ == LOGARITHMIQUE) {
       axisIterator_ = new LogarithmicNumberIterator();
+      ((NumberIterator) axisIterator_).setMaxFractionDigits(2);
     } else {
       axisIterator_ = new NumberIterator();
+      ((NumberIterator) axisIterator_).setMaxFractionDigits(2);
     }
-    ((NumberIterator) axisIterator_).setMaxFractionDigits(2);
 
-    final double min = getMinimum();
-    final double max = getMaximum();
-    final int mode = modeGraduations_;
 
     if (modeGraduations_ == MANUEL_GRADUATIONS) {
       axisIterator_.initExact(getMinimum(), getMaximum(), nbPas_, nbSousGraduations_ + 1);
@@ -507,8 +506,10 @@
   public boolean isVisible() {
     return visible_;
   }
+  private TickIterator userIterator;
 
   public final void setAxisIterator(final TickIterator _axisIterator) {
+    this.userIterator = _axisIterator;
     axisIterator_ = _axisIterator;
     isIteratorUptodate_ = false;
   }

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersist.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersist.java	2013-04-03 09:45:41 UTC (rev 8373)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersist.java	2013-04-03 12:47:10 UTC (rev 8374)
@@ -15,7 +15,7 @@
  */
 @XStreamAlias("Curve")
 public class EGCourbePersist extends EGPersist {
-
+  
   @XStreamAlias("Title")
   String title_;
   @XStreamAlias("IdGroup")
@@ -77,122 +77,137 @@
   boolean displayTitle = false;
   @XStreamAlias("VerticalLabels")
   boolean verticalLabels = false;
-
+  @XStreamAlias("Visible")
+  private Boolean visible = true;
+  
   public EGCourbePersist() {
   }
 
+  /**
+   *
+   * @return
+   */
+  public boolean isVisible() {
+    //test bizarre pour le compatibilit\xE9 descendante: anciennes versions ne contenants pas cette valeur visible.
+    return visible == null || Boolean.TRUE.equals(visible);
+  }
+  
+  public void setVisible(boolean visible) {
+    this.visible = visible;
+  }
+  
   public TraceLigneModel getLineModel_() {
     return lineModel_;
   }
-
+  
   public String getTitle_() {
     return title_;
   }
-
+  
   public void setTitle_(String title_) {
     this.title_ = title_;
   }
-
+  
   public boolean isNuagePoints() {
     return nuagePoints;
   }
-
+  
   public void setNuagePoints(boolean nuagePoints) {
     this.nuagePoints = nuagePoints;
   }
-
+  
   public TraceBox getTracebox() {
     return tracebox;
   }
-
+  
   public void setTracebox(TraceBox tracebox) {
     this.tracebox = tracebox;
   }
-
+  
   public TraceLigneModel gettLigneMarqueur() {
     return tLigneMarqueur_;
   }
-
+  
   public void settLigneMarqueur(TraceLigneModel tLigneMarqueur_) {
     this.tLigneMarqueur_ = tLigneMarqueur_;
   }
-
+  
   public TraceIconModel getIconeModel() {
     return iconeModel;
   }
-
+  
   public TraceIconModel getIconeModelSpecific() {
     return iconeModelSpecific;
   }
-
+  
   public void setIconeModel(TraceIconModel iconeModel) {
     this.iconeModel = iconeModel;
   }
-
+  
   public void setIconeModelSpecific(TraceIconModel iconeModelSpecific) {
     this.iconeModelSpecific = iconeModelSpecific;
   }
-
+  
   public List<EGCourbeMarqueur> getListeMarqueurs() {
     return listeMarqueurs_;
   }
-
+  
   public void setListeMarqueurs(List<EGCourbeMarqueur> listeMarqueurs_) {
     this.listeMarqueurs_ = listeMarqueurs_;
   }
-
+  
   public EGCourbeSurfacePersist getSurfacePainter() {
     return surfacePainter;
   }
-
+  
   public void setSurfacePainter(EGCourbeSurfacePersist surfacePainter) {
     this.surfacePainter = surfacePainter;
   }
-
+  
   public void setLineModel(TraceLigneModel lineModel_) {
     this.lineModel_ = lineModel_;
   }
-
+  
   public boolean isDisplayLabels() {
     return displayLabels;
   }
-
+  
   public void setDisplayLabels(boolean displayLabels) {
     this.displayLabels = displayLabels;
   }
-
+  
   public boolean isVerticalLabels() {
     return verticalLabels;
   }
-
+  
   public void setVerticalLabels(boolean verticalLabels) {
     this.verticalLabels = verticalLabels;
   }
-
+  
   public boolean isDisplayTitle() {
     return displayTitle;
   }
-
+  
   public void setDisplayTitle(boolean displayTitle) {
     this.displayTitle = displayTitle;
   }
-
+  
   public String getTitle() {
     return title_;
   }
-
+  
   public void setTitle(String _title) {
     this.title_ = _title;
   }
-
+  
   public int getIdgroup() {
     return Idgroup;
   }
-
+  
   public void setIdgroup(int _idgroup) {
     Idgroup = _idgroup;
   }
-
+  
   public int getSpecificIntValue(String string, int defaultValue) {
     Object o = getSpecificValue(string);
     if (o == null) {
@@ -200,7 +215,7 @@
     }
     return ((Integer) o).intValue();
   }
-
+  
   public boolean getSpecificBooleanValue(String string) {
     Object o = getSpecificValue(string);
     return Boolean.TRUE.equals(o);

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersistBuilder.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersistBuilder.java	2013-04-03 09:45:41 UTC (rev 8373)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersistBuilder.java	2013-04-03 12:47:10 UTC (rev 8374)
@@ -131,6 +131,7 @@
     courbeToModify.setDisplayPointLabels(persist.displayLabels);
     courbeToModify.setVerticalLabels(persist.verticalLabels);
     courbeToModify.setDisplayTitleOnCurve(persist.displayTitle);
+    courbeToModify.setVisible(persist.isVisible());
 
   }
   public final static String X_KEY = "X";
@@ -197,6 +198,7 @@
     res.displayLabels = courbe.displayPointLabels_;
     res.verticalLabels = courbe.isVerticalLabels();
     res.displayTitle = courbe.displayTitleOnCurve_;
+    res.setVisible(courbe.isVisible_);
 
   }
 }

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