Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[6908] trunk/soft/fudaa-prepro/ui/src/main
|
From: <de...@us...> - 2012-01-03 22:53:18
|
Revision: 6908
http://fudaa.svn.sourceforge.net/fudaa/?rev=6908&view=rev
Author: deniger
Date: 2012-01-03 22:53:12 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrCourbeTemporelleManager.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarEvolutionManager.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarFileStateMng.java
trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrCourbeTemporelleManager.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrCourbeTemporelleManager.java 2012-01-03 21:02:11 UTC (rev 6907)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrCourbeTemporelleManager.java 2012-01-03 22:53:12 UTC (rev 6908)
@@ -47,36 +47,40 @@
import com.memoire.fu.FuLog;
/**
- * Il est suppose qu'il n'y a qu'un seul graphe dessine.
- * It is supposed that there is only a graph drawn
+ * Il est suppose qu'il n'y a qu'un seul graphe dessine. It is supposed that there is only a graph drawn
+ *
* @author Fred Deniger
* @version $Id: TrCourbeTemporelleManager.java,v 1.29 2007-05-22 14:20:38 deniger Exp $
*/
-public class TrCourbeTemporelleManager extends EGGrapheTreeModel implements EvolutionListener,
- TrCourbeImporter.Target {
+public class TrCourbeTemporelleManager extends EGGrapheTreeModel implements EvolutionListener, TrCourbeImporter.Target {
public static final H2dVariableType getRealVariable(final H2dVariableType _t) {
+ if (_t == null) {
+ return null;
+ }
return _t.getParentVariable() == null ? _t : _t.getParentVariable();
}
- public static final boolean isCurveNotEnoughLarge(final double _min, final double _max,
- final EvolutionReguliereInterface[] _l) {
+ public static final boolean isCurveNotEnoughLarge(final double _min, final double _max, final EvolutionReguliereInterface[] _l) {
if (_l != null) {
for (int i = _l.length - 1; i >= 0; i--) {
final EvolutionReguliereInterface li = _l[i];
- if ((li.getMinX() > _min) || (li.getMaxX() < _max)) { return true; }
+ if ((li.getMinX() > _min) || (li.getMaxX() < _max)) {
+ return true;
+ }
}
return false;
}
return true;
}
- public static final boolean isCurveNotEnoughLarge(final double _min, final double _max,
- final H2dEvolutionFrontiereLiquide[] _l) {
+ public static final boolean isCurveNotEnoughLarge(final double _min, final double _max, final H2dEvolutionFrontiereLiquide[] _l) {
if (_l != null) {
for (int i = _l.length - 1; i >= 0; i--) {
final EvolutionReguliereInterface li = _l[i].getEvolution();
- if ((li.getMinX() > _min) || (li.getMaxX() < _max)) { return true; }
+ if ((li.getMinX() > _min) || (li.getMaxX() < _max)) {
+ return true;
+ }
}
return false;
}
@@ -90,12 +94,18 @@
protected final transient H2dParameters params_;
- public TrCourbeTemporelleManager(final H2dParameters _p) {
+ public TrCourbeTemporelleManager(final H2dParameters _p, boolean createDefaultCourbe) {
+ setCreateDefaultCourbe(createDefaultCourbe);
initWith(_p);
params_ = _p;
_p.getProjectDispatcher().addEvolutionListener(this);
}
+ public TrCourbeTemporelleManager(final H2dParameters _p) {
+ this(_p, false);
+
+ }
+
private TrCourbeComboboxModel initCombobox(final TrCourbeComboboxModel _m, final JComboBox _cb) {
_cb.setModel(_m);
_cb.setEditable(false);
@@ -140,11 +150,11 @@
final EGCourbeChild courbe = new EGCourbeChild(_g, new FudaaCourbeModel(_e));
// courbe.setTitre(_e.getNom());
courbe.setAspectContour(BPalettePlageDefault.getColor(_idx));
-
+
// on met a jour si la courbe est un nuage de points ou non --//
//We update if the curve is a cloud of points or not
courbe.setNuagePoints(_e.isNuagePoints());
-
+
if (_g == null) {
groupNull_.addEGComponent(courbe);
} else {
@@ -155,7 +165,9 @@
@Override
protected EGCourbeChild duplicateCourbe(final EGCourbeChild _c) {
- if (_c == null) { return null; }
+ if (_c == null) {
+ return null;
+ }
final EvolutionReguliere newE = ((FudaaCourbeModel) _c.getModel()).getEvolution().duplicate();
// newE.setListener(listener_);
newE.setNom(_c.getTitle() + CtuluLibString.ESPACE + BuResource.BU.getString("Copie"));
@@ -167,7 +179,9 @@
final EGGroup g = getGroup(i);
for (int j = g.getChildCount() - 1; j >= 0; j--) {
final EGCourbe c = (EGCourbe) g.getChildAt(j);
- if (((FudaaCourbeModel) c.getModel()).getEvolution().equals(_e)) { return c; }
+ if (((FudaaCourbeModel) c.getModel()).getEvolution().equals(_e)) {
+ return c;
+ }
}
}
return null;
@@ -175,7 +189,9 @@
protected String majNom(final String _nom, final int _idx) {
final int idxUnder = _nom.lastIndexOf('_');
- if (idxUnder < 0) { return _nom + '_' + _idx; }
+ if (idxUnder < 0) {
+ return _nom + '_' + _idx;
+ }
try {
Integer.parseInt(_nom.substring(idxUnder + 1));
return _nom.substring(0, idxUnder) + "_" + _idx;
@@ -210,9 +226,7 @@
final Map.Entry e = (Map.Entry) it.next();
final H2dVariableType t = getRealVariable((H2dVariableType) e.getValue());
EGGroup g = groupNull_;
- if (t == null) {
- FuLog.warning(e + " mal d\xE9fini ?");
- } else {
+ if (t != null) {
g = (EGGroup) varGrapheGroup_.get(t);
}
if (g == null) {
@@ -245,11 +259,6 @@
}
}
- /*
- * public boolean isUsedCurveNotEnoughWidth(double _min, double _max) { new Throwable().printStackTrace(); return
- * false; }
- */
-
@Override
public void addNewCourbe(final CtuluCommandManager _cmd, final Component _parent, final EGGraphe _graphe) {
final String title = TrResource.getS("courbe") + CtuluLibString.ESPACE + (getNbCourbes() + 1);
@@ -274,8 +283,7 @@
xmaxVal = 1;
}
}
- final FudaaCourbeCreateGroupPanel pn = new FudaaCourbeCreateGroupPanel(title, xminVal, xmaxVal, model, _graphe,
- null);
+ final FudaaCourbeCreateGroupPanel pn = new FudaaCourbeCreateGroupPanel(title, xminVal, xmaxVal, model, _graphe, null);
if (CtuluDialogPanel.isOkResponse(pn.afficheModale(_parent))) {
final EGGroup gr = pn.getSelectedGroup();
final EvolutionReguliere evol = pn.getEvol();
@@ -321,8 +329,7 @@
* @param _t la variable a considere
* @return un model pour les courbes de la variable _t
*/
- public ComboBoxModel createComboBoxModel(final H2dVariableType _t, final EvolutionReguliereInterface _evol1,
- final EvolutionReguliereAbstract _evol2) {
+ public ComboBoxModel createComboBoxModel(final H2dVariableType _t, final EvolutionReguliereInterface _evol1, final EvolutionReguliereAbstract _evol2) {
return new TrCourbeComboboxModel(_evol1, _evol2, getGroupeFor(_t), null);
}
@@ -330,13 +337,12 @@
return initCombobox(new TrCourbeComboboxModel(getGroupeFor(_t), groupNull_), _cb);
}
- public ComboBoxModel createComboBoxModelWithEmpty(final EvolutionReguliereInterface _e0,
- final EvolutionReguliereInterface _e, final H2dVariableType _t, final JComboBox _cb) {
+ public ComboBoxModel createComboBoxModelWithEmpty(final EvolutionReguliereInterface _e0, final EvolutionReguliereInterface _e,
+ final H2dVariableType _t, final JComboBox _cb) {
return initCombobox(new TrCourbeComboboxModel(_e0, _e, getGroupeFor(_t), groupNull_), _cb);
}
- public ComboBoxModel createComboBoxModelWithEmpty(final EvolutionReguliereInterface _e, final H2dVariableType _t,
- final JComboBox _cb) {
+ public ComboBoxModel createComboBoxModelWithEmpty(final EvolutionReguliereInterface _e, final H2dVariableType _t, final JComboBox _cb) {
return initCombobox(new TrCourbeComboboxModel(_e, null, getGroupeFor(_t), groupNull_), _cb);
}
@@ -356,8 +362,8 @@
}
}
- public void evolutionUsedChanged(final EvolutionReguliereInterface _e, final int _old, final int _new,
- final boolean _isAdjusting) {}
+ public void evolutionUsedChanged(final EvolutionReguliereInterface _e, final int _old, final int _new, final boolean _isAdjusting) {
+ }
public int getNbEvol() {
int r = 0;
@@ -384,13 +390,14 @@
public H2dVariableType getVar(final EGGroup _g) {
for (final Iterator it = varGrapheGroup_.entrySet().iterator(); it.hasNext();) {
final Map.Entry e = (Map.Entry) it.next();
- if (e.getValue() == _g) { return (H2dVariableType) e.getKey(); }
+ if (e.getValue() == _g) {
+ return (H2dVariableType) e.getKey();
+ }
}
return null;
}
- public void importCourbes(final EvolutionReguliereInterface[] _crb, final CtuluCommandManager _mng,
- final ProgressionInterface _prog) {
+ public void importCourbes(final EvolutionReguliereInterface[] _crb, final CtuluCommandManager _mng, final ProgressionInterface _prog) {
add(_crb, _mng);
}
@@ -410,6 +417,9 @@
v.setTitre("Import");
groupNull_.setTitle(v.getTitre());
groupNull_.setAxeY(v);
+ if (createDefaultCourbe) {
+ createDefaultCourbe(groupNull_);
+ }
}
setValues(m);
if (!contains(groupNull_)) {
@@ -422,6 +432,16 @@
fireTreeStructureChanged(this, getPathToRoot(getGrapheTreeNode()), null, null);
}
+ private boolean createDefaultCourbe = false;
+
+ public boolean isCreateDefaultCourbe() {
+ return createDefaultCourbe;
+ }
+
+ private final void setCreateDefaultCourbe(boolean createDefaultCourbe) {
+ this.createDefaultCourbe = createDefaultCourbe;
+ }
+
protected final EGGroup getOrCreateGroupFor(final H2dVariableType _tInit) {
final H2dVariableType t = getRealVariable(_tInit);
if (!varGrapheGroup_.containsKey(t)) {
@@ -432,11 +452,19 @@
v.setUnite(_tInit.getCommonUnit() == null ? null : _tInit.getCommonUnit().toString());
g.setAxeY(v);
varGrapheGroup_.put(t, g);
+
return g;
}
return (EGGroup) varGrapheGroup_.get(t);
}
+ private void createDefaultCourbe(final EGGroup g) {
+ EvolutionReguliere defaultCourbe = new EvolutionReguliere(1);
+ defaultCourbe.add(0, 0);
+ defaultCourbe.setNom(TrLib.getString("vide"));
+ createEGCourbe(g, defaultCourbe);
+ }
+
public boolean isOneCurveUsed() {
FuLog.error("DO NOT USE");
return false;
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarEvolutionManager.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarEvolutionManager.java 2012-01-03 21:02:11 UTC (rev 6907)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarEvolutionManager.java 2012-01-03 22:53:12 UTC (rev 6908)
@@ -53,7 +53,7 @@
* @param _p
*/
public TrRubarEvolutionManager(final H2dParameters _p) {
- super(_p);
+ super(_p, true);
rubarParam_ = (H2dRubarParameters) _p;
rubarParam_.getBcMng().addListener(this);
rubarParam_.getAppMng().addAppListener(this);
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarFileStateMng.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarFileStateMng.java 2012-01-03 21:02:11 UTC (rev 6907)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarFileStateMng.java 2012-01-03 22:53:12 UTC (rev 6908)
@@ -213,7 +213,7 @@
fileModified = null;
_impl.getImpl().setMainMessage(TrResource.getS("Suppression fichiers"));
// suppression des fichiers inutiles
- for (int i = fileToRemove.size() - 1; i > 0; i--) {
+ for (int i = fileToRemove.size() - 1; i >= 0; i--) {
final File f = (File) fileToRemove.get(i);
CtuluLibMessage.info("SAVE: file removed " + f.getAbsolutePath());
f.delete();
Modified: trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt 2012-01-03 21:02:11 UTC (rev 6907)
+++ trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt 2012-01-03 22:53:12 UTC (rev 6908)
@@ -1,4 +1,5 @@
Le fichier r\xE9sultat utilis\xE9 actuellement=The current source used
+vide=empty
S\xE9lectionner les ar\xEAtes du m\xEAme type=Select edges with same type
Choisir l'isoligne de la courbe s\xE9lectionn\xE9e=Choose the line of the selected curve.
Fichier=File
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
