Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[6224] trunk/framework
|
From: <de...@us...> - 2011-04-21 22:55:06
|
Revision: 6224
http://fudaa.svn.sourceforge.net/fudaa/?rev=6224&view=rev
Author: deniger
Date: 2011-04-21 22:54:59 +0000 (Thu, 21 Apr 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersistBuilder.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphePersist.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/find/EbliFindDialog.java
trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaGrapheTimeAnimatedVisuPanel.java
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 2011-04-20 14:29:52 UTC (rev 6223)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersistBuilder.java 2011-04-21 22:54:59 UTC (rev 6224)
@@ -24,6 +24,10 @@
if (persist.inverse) egObject.inverserModele();
}
+ public boolean saveXY() {
+ return true;
+ }
+
public EGCourbePersist persistGraphicsData(T egCourbe) {
EGCourbePersist createPersistUnit = createPersistUnit(egCourbe);
saveGraphicsData(createPersistUnit, egCourbe);
@@ -52,12 +56,11 @@
if (model == null) {
model = new EGCourbeModelDefault(persist.abscisses, persist.ordonnees);
- } else {
- // -- ajotu des coordonnees --//
+ } else if (saveXY()) {
+ // -- ajout des coordonnees --//
model.addValue(persist.abscisses, persist.ordonnees, null);
+ _infos.put(DEFAULTY, persist.ordonnees);
}
- // -- donnees specifiques --//
- _infos.put(DEFAULTY, persist.ordonnees);
model.restoreFromSpecificDatas(persist.dataSpecifiques, _infos);
return model;
}
@@ -81,15 +84,18 @@
res.title_ = courbe.getTitle();
res.nuagePoints = courbe.isNuagePoints();
EGModel initialModel = courbe.getInitialModel();
- res.Xmin = initialModel.getXMin();
- res.Xmax = initialModel.getXMax();
- res.Ymin = initialModel.getYMin();
- res.Ymax = initialModel.getYMax();
- res.abscisses = new double[initialModel.getNbValues()];
- res.ordonnees = new double[initialModel.getNbValues()];
- for (int i = 0; i < initialModel.getNbValues(); i++) {
- res.abscisses[i] = initialModel.getX(i);
- res.ordonnees[i] = initialModel.getY(i);
+ if (saveXY()) {
+ res.Xmin = initialModel.getXMin();
+ res.Xmax = initialModel.getXMax();
+ res.Ymin = initialModel.getYMin();
+ res.Ymax = initialModel.getYMax();
+
+ res.abscisses = new double[initialModel.getNbValues()];
+ res.ordonnees = new double[initialModel.getNbValues()];
+ for (int i = 0; i < initialModel.getNbValues(); i++) {
+ res.abscisses[i] = initialModel.getX(i);
+ res.ordonnees[i] = initialModel.getY(i);
+ }
}
// -- exemple pour evol: pdt, point,variable, fichier source --//
res.dataSpecifiques = initialModel.savePersistSpecificDatas();
@@ -107,7 +113,7 @@
res.listeMarqueurs_ = courbe.getMarqueurs();
res.inverse = courbe.isInverse;
-
+
}
}
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphePersist.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphePersist.java 2011-04-20 14:29:52 UTC (rev 6223)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphePersist.java 2011-04-21 22:54:59 UTC (rev 6224)
@@ -484,7 +484,6 @@
}
} catch (Exception e) {
FuLog.error(e);
- e.printStackTrace();
}
}
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/find/EbliFindDialog.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/find/EbliFindDialog.java 2011-04-20 14:29:52 UTC (rev 6223)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/find/EbliFindDialog.java 2011-04-21 22:54:59 UTC (rev 6224)
@@ -46,7 +46,7 @@
public class EbliFindDialog extends BuPanel implements ActionListener, ItemListener, PropertyChangeListener {
static class SelectComboboxRenderer extends CtuluCellTextRenderer {
-
+
private static final String AND = EbliLib.getS("Rechercher dans la s\xE9lection") + " (and)";
private static final String REPLACE = EbliLib.getS("Remplacer la s\xE9lection courante");
private static final String REPLACE_SONDE = EbliLib.getS("Remplacer la sonde courante");
@@ -76,7 +76,7 @@
final Integer i = (Integer) _value;
switch (i.intValue()) {
case EbliSelectionState.ACTION_ADD:
- txt = selectModeModel.isValueSonde()?ADD_SONDE:ADD;
+ txt = selectModeModel.isValueSonde() ? ADD_SONDE : ADD;
ic = add_;
break;
case EbliSelectionState.ACTION_DEL:
@@ -84,7 +84,7 @@
ic = remove_;
break;
case EbliSelectionState.ACTION_REPLACE:
- txt = selectModeModel.isValueSonde()?REPLACE_SONDE:REPLACE;
+ txt = selectModeModel.isValueSonde() ? REPLACE_SONDE : REPLACE;
ic = set_;
break;
case EbliSelectionState.ACTION_AND:
@@ -111,7 +111,8 @@
public SelectionModeModel() {
valuesNormal_ = new Integer[] { new Integer(EbliSelectionState.ACTION_REPLACE),
- new Integer(EbliSelectionState.ACTION_ADD)};
+ new Integer(EbliSelectionState.ACTION_ADD), new Integer(EbliSelectionState.ACTION_DEL),
+ new Integer(EbliSelectionState.ACTION_AND) };
values_ = valuesNormal_;
selected_ = values_[0];
}
@@ -303,8 +304,7 @@
private void updateSelectModel() {
if (findCmp_ == null) {
cbSelectMode_.setEnabled(false);
- }
- else{
+ } else {
cbMode_.setSondeMode("SONDE".equals(findCmp_.getSearchId()));
}
}
Modified: trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaGrapheTimeAnimatedVisuPanel.java
===================================================================
--- trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaGrapheTimeAnimatedVisuPanel.java 2011-04-20 14:29:52 UTC (rev 6223)
+++ trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaGrapheTimeAnimatedVisuPanel.java 2011-04-21 22:54:59 UTC (rev 6224)
@@ -11,6 +11,7 @@
import java.util.Arrays;
import java.util.List;
+import org.fudaa.ctulu.CtuluUI;
import org.fudaa.ebli.animation.ActionAnimationTreeSelection;
import org.fudaa.ebli.animation.EbliAnimatedInterface;
import org.fudaa.ebli.animation.EbliAnimationSourceInterface;
@@ -29,9 +30,13 @@
ActionAnimationTreeSelection video_;
public FudaaGrapheTimeAnimatedVisuPanel(EGGraphe _a) {
- this(_a,null);
+ this(_a, (EbliActionInterface[]) null);
}
+ public FudaaGrapheTimeAnimatedVisuPanel(EGGraphe _a, CtuluUI ui) {
+ this(_a, (EbliActionInterface[]) null);
+ }
+
public FudaaGrapheTimeAnimatedVisuPanel(EGGraphe _a, EbliActionInterface[] _userAction) {
super(_a, _userAction);
List acts = new ArrayList();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
