Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[5983] trunk/framework/fudaa-common-courbe/src/main/java/ org/fudaa/fudaa/commun/courbe
|
From: <de...@us...> - 2010-10-18 00:18:13
|
Revision: 5983
http://fudaa.svn.sourceforge.net/fudaa/?rev=5983&view=rev
Author: deniger
Date: 2010-10-18 00:18:07 +0000 (Mon, 18 Oct 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefautModel.java
trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeTime.java
trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeListModel.java
trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java
trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaGrapheTimeTreeFille.java
Added Paths:
-----------
trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeListModelDefault.java
trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimePersistBuilder.java
Modified: trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefautModel.java
===================================================================
--- trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefautModel.java 2010-10-18 00:17:47 UTC (rev 5982)
+++ trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefautModel.java 2010-10-18 00:18:07 UTC (rev 5983)
@@ -171,18 +171,16 @@
return new FudaaCourbeDefautModel(this.e_.getCopy(this.e_.getListener()));
}
- public Object getPersistSpecificDatas() {
+ public Object savePersistSpecificDatas() {
return null;
}
- public void setPersistSpecificDatas(Object data, Map infos) {
+ public void restoreFromSpecificDatas(Object data, Map infos) {
}
public void viewGenerationSource(Map infos, CtuluUI impl){
}
public void replayData(EGGrapheTreeModel model,Map infos, CtuluUI impl) {
- // TODO Auto-generated method stub
-
}
}
\ No newline at end of file
Modified: trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeTime.java
===================================================================
--- trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeTime.java 2010-10-18 00:17:47 UTC (rev 5982)
+++ trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeTime.java 2010-10-18 00:18:07 UTC (rev 5983)
@@ -1,8 +1,12 @@
/*
* @creation 8 mars 07
+ *
* @modification $Date: 2007-03-09 08:39:04 $
+ *
* @license GNU General Public License 2
+ *
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ *
* @mail de...@fu...
*/
package org.fudaa.fudaa.commun.courbe;
@@ -16,6 +20,7 @@
import org.fudaa.ebli.animation.EbliAnimationAdapterInterface;
import org.fudaa.ebli.controle.BSelecteurListTimeTarget;
import org.fudaa.ebli.courbe.EGCourbeChild;
+import org.fudaa.ebli.courbe.EGCourbePersistBuilder;
import org.fudaa.ebli.courbe.EGGroup;
import org.fudaa.ebli.courbe.EGModel;
@@ -39,6 +44,11 @@
selection_.addListSelectionListener(this);
}
+ @Override
+ protected EGCourbePersistBuilder<FudaaCourbeTime> createPersistBuilder() {
+ return new FudaaCourbeTimePersistBuilder();
+ }
+
public int getActiveTimeIdx() {
return selection_.getMaxSelectionIndex();
}
@@ -80,4 +90,11 @@
fireCourbeAspectChanged(false);
}
+ /**
+ * @return the timeModel_
+ */
+ public FudaaCourbeTimeListModel getTimeModel() {
+ return timeModel_;
+ }
+
}
Modified: trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeListModel.java
===================================================================
--- trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeListModel.java 2010-10-18 00:17:47 UTC (rev 5982)
+++ trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeListModel.java 2010-10-18 00:18:07 UTC (rev 5983)
@@ -14,8 +14,6 @@
void setTimeFmt(CtuluNumberFormatI _fmt);
- //void updateFrom(MVTimeListModel _other);
-
CtuluNumberFormatI getTimeFmt();
double[] getTimesInSec();
Added: trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeListModelDefault.java
===================================================================
--- trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeListModelDefault.java (rev 0)
+++ trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeListModelDefault.java 2010-10-18 00:18:07 UTC (rev 5983)
@@ -0,0 +1,53 @@
+/**
+ *
+ */
+package org.fudaa.fudaa.commun.courbe;
+
+import javax.swing.event.ListDataListener;
+
+import org.fudaa.ctulu.CtuluLibArray;
+import org.fudaa.ctulu.CtuluNumberFormatI;
+
+public class FudaaCourbeTimeListModelDefault implements FudaaCourbeTimeListModel {
+ final double[] times_;
+ CtuluNumberFormatI timeFmt;
+
+ public FudaaCourbeTimeListModelDefault(final double[] _times, CtuluNumberFormatI timeFmt) {
+ super();
+ times_ = _times;
+ this.timeFmt = timeFmt;
+ }
+
+ public Object getElementAt(final int _index) {
+ return getTimeFmt() == null ? Double.toString(times_[_index]) : getTimeFmt().format(times_[_index]);
+ }
+
+ public int getSize() {
+ return times_ == null ? 0 : times_.length;
+ }
+
+ public void fireContentChanged() {}
+
+ public void fireStructureChanged() {}
+
+ public CtuluNumberFormatI getTimeFmt() {
+ return timeFmt;
+ }
+
+ public double getTimeInSec(final int _i) {
+ return times_[_i];
+ }
+
+ public double[] getTimesInSec() {
+ return CtuluLibArray.copy(times_);
+ }
+
+ public void setTimeFmt(final CtuluNumberFormatI _fmt) {
+ this.timeFmt = _fmt;
+ }
+
+ public void addListDataListener(final ListDataListener _l) {}
+
+ public void removeListDataListener(final ListDataListener _l) {}
+
+}
\ No newline at end of file
Modified: trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java
===================================================================
--- trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java 2010-10-18 00:17:47 UTC (rev 5982)
+++ trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java 2010-10-18 00:18:07 UTC (rev 5983)
@@ -40,6 +40,8 @@
super();
time_ = _timeIdx;
}
+
+
/**
* ACHTUNG!!!; constructeur utilis\xE9 uniquement pour la persistance des donnees!!!
@@ -197,7 +199,9 @@
}
public boolean setValues(final int[] _idx, final double[] _x, final double[] _y, final CtuluCommandContainer _cmd) {
- return false;
+ time_=_x;
+ y_=_y;
+ return true;
}
public void setY(final double[] _y) {
@@ -214,11 +218,15 @@
return duplic;
}
- public Object getPersistSpecificDatas() {
- return null;
+ public Object savePersistSpecificDatas() {
+ return nom_;
}
- public void setPersistSpecificDatas(Object data, Map infos) {
+ public void restoreFromSpecificDatas(Object data, Map infos) {
+ if(data instanceof String){
+ nom_ = (String) data;
+ }
+ infos.put(FudaaCourbeTimePersistBuilder.TIME_MODEL, new FudaaCourbeTimeListModelDefault(time_, null));
}
public void viewGenerationSource(Map infos, CtuluUI impl){
Added: trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimePersistBuilder.java
===================================================================
--- trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimePersistBuilder.java (rev 0)
+++ trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimePersistBuilder.java 2010-10-18 00:18:07 UTC (rev 5983)
@@ -0,0 +1,43 @@
+package org.fudaa.fudaa.commun.courbe;
+
+import java.util.Map;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.ebli.courbe.EGCourbePersist;
+import org.fudaa.ebli.courbe.EGCourbePersistBuilder;
+import org.fudaa.ebli.courbe.EGGraphe;
+import org.fudaa.ebli.courbe.EGGroup;
+import org.fudaa.ebli.courbe.EGModel;
+import org.fudaa.fudaa.commun.FudaaLib;
+
+public class FudaaCourbeTimePersistBuilder extends EGCourbePersistBuilder<FudaaCourbeTime> {
+
+ public final static String TIME_MODEL = "TIME_MODEL";
+
+ @Override
+ protected FudaaCourbeTime createEGObject(EGCourbePersist target, Map params, CtuluAnalyze log) {
+ EGGroup parent = getGroup(params);
+ EGModel createModel = createModel(target, params);
+ FudaaCourbeTimeListModel timeModel = (FudaaCourbeTimeListModel) params.get(TIME_MODEL);
+ if (timeModel == null) {
+ log.addError(FudaaLib.getS("Le temps n'a pas \xE9t\xE9 trouv\xE9 pour la courbe {0}", target.getTitle()));
+ return null;
+ }
+ return new FudaaCourbeTime(parent, createModel, timeModel);
+ }
+
+ @Override
+ protected void postRestore(FudaaCourbeTime egObject, EGCourbePersist persist, Map params, CtuluAnalyze log) {
+ super.postRestore(egObject, persist, params, log);
+ int idx = persist.getSpecificIntValue("timeIdx", 0);
+ egObject.selection_.setSelectionInterval(idx, idx);
+
+ }
+
+ @Override
+ protected void postCreatePersist(EGCourbePersist res, FudaaCourbeTime courbe, EGGraphe graphe) {
+ super.postCreatePersist(res, courbe, graphe);
+ res.saveSpecificData("timeIdx", courbe.selection_.getLeadSelectionIndex());
+ }
+
+}
Modified: trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaGrapheTimeTreeFille.java
===================================================================
--- trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaGrapheTimeTreeFille.java 2010-10-18 00:17:47 UTC (rev 5982)
+++ trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaGrapheTimeTreeFille.java 2010-10-18 00:18:07 UTC (rev 5983)
@@ -1,13 +1,18 @@
/*
- * @creation 14 mars 2005
- * @modification $Date: 2007-04-02 08:56:22 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail fud...@li...
+ * @creation 14 mars 2005
+ *
+ * @modification $Date: 2007-04-02 08:56:22 $
+ *
+ * @license GNU General Public License 2
+ *
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ *
+ * @mail fud...@li...
*/
package org.fudaa.fudaa.commun.courbe;
import java.awt.event.ActionEvent;
+import java.util.List;
import javax.swing.JMenu;
@@ -16,6 +21,7 @@
import org.fudaa.ctulu.CtuluNumberFormatI;
import org.fudaa.ebli.commun.EbliLib;
+import org.fudaa.ebli.courbe.EGCourbeChild;
import org.fudaa.ebli.courbe.EGFillePanel;
import org.fudaa.ebli.courbe.EGFilleTree;
import org.fudaa.ebli.courbe.EGTableGraphePanel;
@@ -79,6 +85,12 @@
public void setTimeFmt(final CtuluNumberFormatI _timeFmt) {
if (timeFmt_ != _timeFmt) {
timeFmt_ = _timeFmt;
+ List<EGCourbeChild> allCourbesChild = getGrapheTree().getAllCourbesChild();
+ for (EGCourbeChild egCourbeChild : allCourbesChild) {
+ if (egCourbeChild instanceof FudaaCourbeTime) {
+ ((FudaaCourbeTime) egCourbeChild).getTimeModel().setTimeFmt(_timeFmt);
+ }
+ }
FudaaGrapheSimpleTimeFille.updateGraphe(getGraphe(), timeFmt_);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
