Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[5586] trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa /fudaa/tr/post
|
From: <de...@us...> - 2010-01-03 21:48:21
|
Revision: 5586
http://fudaa.svn.sourceforge.net/fudaa/?rev=5586&view=rev
Author: deniger
Date: 2010-01-03 21:48:10 +0000 (Sun, 03 Jan 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceComparatorBuilder.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceOneTimeStep.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceProjected.java
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceComparatorBuilder.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceComparatorBuilder.java 2010-01-03 21:46:55 UTC (rev 5585)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceComparatorBuilder.java 2010-01-03 21:48:10 UTC (rev 5586)
@@ -1,8 +1,12 @@
/*
* @creation 19 mars 07
+ *
* @modification $Date: 2007-06-13 12:58:14 $
+ *
* @license GNU General Public License 2
+ *
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ *
* @mail de...@fu...
*/
package org.fudaa.fudaa.tr.post;
@@ -68,36 +72,34 @@
// il est modifie si on utilise le maillage de projet ou si le type (rubar ou non) est modifie
// la comparaison se fait sur le maillage importe ou le mode rubar est modifie
if (_useProjGrid || rubar != ref.isRubar()) {
- ref = new TrPostSourceProjected(ref, ref.getAvailableVar(), grid, _useProjTime ? time : null, rubar,
- _isGridEquals, _impl);
+ ref = new TrPostSourceProjected(ref, grid, _useProjTime ? time : null, rubar, _isGridEquals, _impl);
openRef = true;
}
// il est egalement modifie si les pas de temps sont diff\xE9rents
else if (_useProjTime) {
// seuls les pas de temps sont modifies
- ref = new TrPostSourceProjected(ref, ref.getAvailableVar(), grid, time, rubar, true, _impl);
+ ref = new TrPostSourceProjected(ref, grid, time, rubar, true, _impl);
openRef = true;
}
// le projet importe
// modifie si on utilise le maillage du projet de ref ou si le mode est modifie
if (!_useProjGrid || rubar != proj.isRubar()) {
- proj = new TrPostSourceProjected(proj, proj.getAvailableVar(), grid, _useProjTime ? null : time, rubar,
- _isGridEquals, _impl);
+ proj = new TrPostSourceProjected(proj, grid, _useProjTime ? null : time, rubar, _isGridEquals, _impl);
openProj = true;
}
// modifie si on utilise les pas de temps du projet importe
// Dans ce cas, seuls les pas de temps sont modifies
else if (!_useProjTime) {
- proj = new TrPostSourceProjected(proj, proj.getAvailableVar(), grid, time, rubar, true, _impl);
+ proj = new TrPostSourceProjected(proj, grid, time, rubar, true, _impl);
openProj = true;
}
if (openProj) {
- proj.openDatas(_prog, null, null, _impl);
+ proj.openDatas(_prog, null, _impl);
proj.buildDefaultVarUpdateLists();
}
if (openRef) {
- ref.openDatas(_prog, null, null, _impl);
+ ref.openDatas(_prog, null, _impl);
ref.buildDefaultVarUpdateLists();
}
final TrPostSourceComparator comparaison = new TrPostSourceComparator(ref, proj, _impl);
@@ -106,7 +108,7 @@
}
- comparaison.openDatas(_prog, null, null, _impl);
+ comparaison.openDatas(_prog, null, _impl);
comparaison.updateVarList();
comparaison.buildDefaultVectors();
return comparaison;
@@ -132,7 +134,6 @@
return FDicoLib.getS("Comparaison");
}
-
protected static void activeComparaison(final TrPostSource _src, final TrPostSource _toProject,
final String _quickDiff, final TrPostProjet projet) {
@@ -193,7 +194,7 @@
pref = TrResource.getS("Projet\xE9") + " ";
infosCreation_.put(pref + ZEbliCalquesPanel.TITRE_FIC, proj.getTitle());
TrPostSourceAbstractFromIdx.fillWithSourceInfo(pref, infosCreation_, proj);
-
+
if (isOnImpGrid) infosCreation_.put(ZEbliCalquesPanel.MAILLAGE_FIC, proj.getTitle());
else infosCreation_.put(ZEbliCalquesPanel.MAILLAGE_FIC, src.getTitle());
@@ -206,9 +207,9 @@
final TrPostVisuPanel pnVisu = new TrPostVisuPanel(impl, projet,
comparaison.getFlecheListModel().getSize() == 0, legendeCalque, comparaison);
pnVisu.infosCreation_ = infosCreation_;
-
- final BCalque calqueActif=pnVisu.getCalqueActif();
-
+
+ final BCalque calqueActif = pnVisu.getCalqueActif();
+
// final TrPostFille compFille = new TrPostFille(pnVisu);
// compFille.addInternalFrameListener(new InternalFrameAdapter() {
// public void internalFrameClosed(InternalFrameEvent _e) {
@@ -249,12 +250,11 @@
final Point location = pnVisu.getLocation();
location.x += 10;
location.y += 10;
- BCalque calqueAct=calqueActif;
+ BCalque calqueAct = calqueActif;
pnVisu.setCalqueActif(calqueAct);
- impl.getCurrentLayoutFille().controller_.addCalque(
- TrPostSourceComparatorBuilder.getComparaisonTitle() + " "
- + impl.getCurrentLayoutFille().getScene().getAllVue2d().size() + 1, location,
- pnVisu.getPreferredSize(), pnVisu, legendeCalque);
+ impl.getCurrentLayoutFille().controller_.addCalque(TrPostSourceComparatorBuilder.getComparaisonTitle()
+ + " " + impl.getCurrentLayoutFille().getScene().getAllVue2d().size() + 1, location, pnVisu
+ .getPreferredSize(), pnVisu, legendeCalque);
pnVisu.restaurer();
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceOneTimeStep.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceOneTimeStep.java 2010-01-03 21:46:55 UTC (rev 5585)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceOneTimeStep.java 2010-01-03 21:48:10 UTC (rev 5586)
@@ -1,8 +1,12 @@
/*
* @creation 17 juil. 06
+ *
* @modification $Date: 2007-06-05 09:01:14 $
+ *
* @license GNU General Public License 2
+ *
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ *
* @mail de...@fu...
*/
package org.fudaa.fudaa.tr.post;
@@ -14,6 +18,7 @@
import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.dodico.ef.EfData;
import org.fudaa.dodico.h2d.type.H2dVariableType;
+import org.fudaa.fudaa.tr.post.persist.TrPostSourceOneTimeStepReplayPersist;
/**
* Source definie a partir d'une autre et sur un seul pas de temps.
@@ -21,28 +26,28 @@
* @author fred deniger
* @version $Id: TrPostSourceOneTimeStep.java,v 1.4 2007-06-05 09:01:14 deniger Exp $
*/
-public class TrPostSourceOneTimeStep extends TrPostSourceAbstractFromIdx {
+public class TrPostSourceOneTimeStep extends TrPostSourceAbstractFromIdx implements TrPostSourceBuilt {
final int timeStep_;
final TrPostSource init_;
public TrPostSourceOneTimeStep(final TrPostSource _srcInit, final int _timeIdx, final TrPostCommonImplementation _impl) {
- super( _srcInit.getTitle() + CtuluLibString.ESPACE
- + _srcInit.getTime().getTimeListModel().getElementAt(_timeIdx), _srcInit.getGrid(), new double[] { _srcInit
- .getTimeStep(_timeIdx) }, _srcInit.getAllVariablesNonVec(), _impl);
+ super(_srcInit.getTitle() + CtuluLibString.ESPACE + _srcInit.getTime().getTimeListModel().getElementAt(_timeIdx),
+ _srcInit.getGrid(), new double[] { _srcInit.getTimeStep(_timeIdx) }, _srcInit.getAllVariablesNonVec(), _impl);
init_ = _srcInit;
timeStep_ = _timeIdx;
}
-
-
+ public TrPostSourceOneTimeStepReplayPersist getReplay() {
+ return new TrPostSourceOneTimeStepReplayPersist(getId(), init_.getId(), timeStep_);
+ }
+
@Override
public EfData getInitData(final int _varIdx, final int _timeIdx) {
final H2dVariableType var = getVariableWithInitIdx(_varIdx);
return init_.getData(var, timeStep_);
}
-
@Override
public double getInitData(final int _varIdx, final int _timeIdx, final int _ptIdx) throws IOException {
return getInitData(_varIdx, _timeIdx).getValue(_ptIdx);
@@ -56,8 +61,6 @@
return init_.isRubar();
}
-
-
public Collection<File> getFiles() {
return init_.getFiles();
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceProjected.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceProjected.java 2010-01-03 21:46:55 UTC (rev 5585)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceProjected.java 2010-01-03 21:48:10 UTC (rev 5586)
@@ -1,19 +1,24 @@
/*
- * @creation 7 d\xE9c. 2005
- * @modification $Date: 2007-06-28 09:28:18 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail fud...@li...
+ * @creation 7 d\xE9c. 2005
+ *
+ * @modification $Date: 2007-06-28 09:28:18 $
+ *
+ * @license GNU General Public License 2
+ *
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ *
+ * @mail fud...@li...
*/
package org.fudaa.fudaa.tr.post;
-import gnu.trove.TIntObjectHashMap;
-
import java.io.File;
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
-import com.db4o.ObjectContainer;
import com.memoire.fu.FuLog;
import org.fudaa.ctulu.CtuluAnalyze;
@@ -31,12 +36,14 @@
import org.fudaa.dodico.ef.interpolation.EfInterpolationGridSupportAdapter;
import org.fudaa.dodico.h2d.type.H2dVariableType;
import org.fudaa.fudaa.tr.common.TrResource;
+import org.fudaa.fudaa.tr.post.persist.TrPostSourceProjectedPersistReplay;
+import org.fudaa.fudaa.tr.post.persist.TrPostSourceReplayPersist;
/**
* @author Fred Deniger
* @version $Id: TrPostSourceProjected.java,v 1.14 2007-06-28 09:28:18 deniger Exp $
*/
-public class TrPostSourceProjected extends TrPostSourceAbstractFromIdx {
+public class TrPostSourceProjected extends TrPostSourceAbstract implements TrPostSourceBuilt {
final boolean destIsRubar_;
@@ -44,7 +51,6 @@
double eps_ = 1E-5;
-
/**
* De la taille des points dest. Pour chaque point dest donne les points sources a utiliser pour interpoler la valeur.
* Si null, c'est que c'est identique.
@@ -57,7 +63,7 @@
*/
int[][] idxTime_;
- final TIntObjectHashMap intVar_;
+ // final TIntObjectHashMap intVar_;
final boolean isGridEquals_;
@@ -67,43 +73,32 @@
final EfGridInterface target_;
- public TrPostSourceProjected(final TrPostSource _srcInit, final H2dVariableType[] _varsToProject,
- final EfGridInterface _grid, final double[] _destTimeStep, final boolean _destIsRubar,
- final boolean _isGridEquals, final TrPostCommonImplementation _impl) {
+ final TrPostSourceProjectedPersistReplay replay;
+
+ public TrPostSourceProjected(final TrPostSource _srcInit, final EfGridInterface _grid, final double[] _destTimeStep,
+ final boolean _destIsRubar, final boolean _isGridEquals, final TrPostCommonImplementation _impl) {
+ this(_srcInit, _grid, _destTimeStep, _destIsRubar, _isGridEquals, _impl, null);
+
+ }
+
+ public TrPostSourceProjected(final TrPostSource _srcInit, final EfGridInterface _grid, final double[] _destTimeStep,
+ final boolean _destIsRubar, final boolean _isGridEquals, final TrPostCommonImplementation _impl,
+ TrPostSourceProjectedPersistReplay replay) {
super(_srcInit.getTitle(), _grid, _destTimeStep == null ? _srcInit.getTime().getInitTimeSteps() : _destTimeStep,
- _varsToProject, _impl);
+ _srcInit.getAvailableVar(), _impl);
destTimeStep_ = _destTimeStep;
destIsRubar_ = _destIsRubar;
srcInit_ = _srcInit;
isGridEquals_ = _isGridEquals;
target_ = _grid;
- if (_varsToProject == null) {
- intVar_ = null;
- } else {
- final Set initVar = new HashSet(Arrays.asList(_varsToProject));
- // on va ajouter les variables necessaires pour les vecteurs
- for (int i = 0; i < _varsToProject.length; i++) {
- final TrPostFlecheContent fleche = srcInit_.getFlecheContent(_varsToProject[i]);
- if (fleche != null) {
- fleche.fillWhithAllUsedVar(initVar);
- }
- }
- // il y a eu un changement
- if (initVar.size() != _varsToProject.length) {
- super.variable_ = (H2dVariableType[]) initVar.toArray(new H2dVariableType[initVar.size()]);
- // on remet a jour les indices des variables dans le sens nom de variables -> indices
- setInitVar(super.variable_);
- }
- intVar_ = new TIntObjectHashMap(variable_.length);
- for (int i = variable_.length - 1; i >= 0; i--) {
- // on remet a jour les indices des variables dans le sens indices->nom de variables
- intVar_.put(i, variable_[i]);
- }
- }
+ this.replay = replay;
}
-
-
+ public TrPostSourceReplayPersist getReplay() {
+ replay.setId(getId());
+ return replay;
+ }
+
private int[] getPt(final int[] _srcIdx, final double _xDest, final double _yDest) {
int nb = 0;
final int[] res = new int[4];
@@ -146,8 +141,8 @@
}
@Override
- public EfData getInitData(final int _varIdx, final int _timeIdx) {
- final H2dVariableType dest = (H2dVariableType) intVar_.get(_varIdx);
+ public EfData getInitData(final H2dVariableType dest, final int _timeIdx) {
+ // final H2dVariableType dest = (H2dVariableType) intVar_.get(_varIdx);
try {
// pas de temps identique
@@ -175,8 +170,8 @@
}
@Override
- public double getInitData(final int _varIdx, final int _timeIdx, final int _ptIdx) throws IOException {
- final H2dVariableType dest = (H2dVariableType) intVar_.get(_varIdx);
+ public double getInitData(final H2dVariableType dest, final int _timeIdx, final int _ptIdx) throws IOException {
+ // final H2dVariableType dest = (H2dVariableType) intVar_.get(_varIdx);
try {
// pas de temps identique
@@ -252,7 +247,7 @@
if (nearestPt.length == 1) { return srcInit_.getData(_varIdx, _srcTimeIdx, nearestPt[0]); }
double num = 0;
double den = 0;
- final boolean isSrcRubar = srcInit_.isRubar();
+ final boolean isSrcRubar = srcInit_.isElementVar(_varIdx);
final double ptX = destIsRubar_ ? target_.getCentreXElement(_ptIdx) : target_.getPtX(_ptIdx);
final double ptY = destIsRubar_ ? target_.getCentreYElement(_ptIdx) : target_.getPtY(_ptIdx);
final EfGridInterface srcGrid = srcInit_.getGrid();
@@ -349,8 +344,7 @@
* plus proches dans la source initiale
*/
@Override
- public boolean openDatas(final ProgressionInterface _int, final CtuluAnalyze _analyze, final ObjectContainer _db,
- final CtuluUI _ui) {
+ public boolean openDatas(final ProgressionInterface _int, final CtuluAnalyze _analyze, final CtuluUI _ui) {
if (!isGridEquals_ || (srcInit_.isRubar() != destIsRubar_)) {
final EfInterpolationGridSupportAdapter srcInterpol = srcInit_.isRubar() ? (EfInterpolationGridSupportAdapter) new EfInterpolationGridSupportAdapter.Mesh(
srcInit_.getGrid())
@@ -412,8 +406,6 @@
return null;
}
-
-
public Collection<File> getFiles() {
return this.srcInit_.getFiles();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
