Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7583] trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa /fudaa/tr
|
From: <de...@us...> - 2012-08-28 09:31:10
|
Revision: 7583
http://fudaa.svn.sourceforge.net/fudaa/?rev=7583&view=rev
Author: deniger
Date: 2012-08-28 09:31:04 +0000 (Tue, 28 Aug 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostRubarLoader.java
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/data/TrPostDataCreatedExpr.java
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2012-08-28 09:29:52 UTC (rev 7582)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2012-08-28 09:31:04 UTC (rev 7583)
@@ -73,8 +73,8 @@
infoSoft = new BuInformationsSoftware();
infoSoft.name = "prepro";
- infoSoft.version = "1.2RC12";
- infoSoft.date = "2012-08-14";
+ infoSoft.version = "1.2RC13";
+ infoSoft.date = "2012-08-28";
infoSoft.rights = TrResource.getS("Tous droits r\xE9serv\xE9s") + ". CETMEF (c)2003-2009";
infoSoft.contact = "fre...@fu...";
infoSoft.license = "GPL2";
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostRubarLoader.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostRubarLoader.java 2012-08-28 09:29:52 UTC (rev 7582)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostRubarLoader.java 2012-08-28 09:31:04 UTC (rev 7583)
@@ -199,7 +199,7 @@
_impl.error(
CtuluUIAbstract.getDefaultErrorTitle(),
TrResource.getS("Il semble que le fichier {0} soit corrompu. Le post-processeur va essayer de le corriger" + CtuluLibString.LINE_SEP
- + TrResource.getS("L'ancien fichier {0} sera sauvegarder avec un extension .old"), _f.getName()),
+ + TrResource.getS("L'ancien fichier {0} sera sauvegarder avec un extension .old"), _f.getName()),
false);
isTpsCopied_ = true;
final File old = new File(_f.getAbsolutePath() + ".old");
@@ -337,7 +337,7 @@
}
final Map varEnveloppData = new TreeMap();
H2dVariableTypeCreated v = H2dVariableType.createTempVar(TrResource.getS("Temps de la hauteur maximale"), null, "s",
- src_.getShortNameCreateVar());
+ src_.getShortNameCreateVar());
v.setParent(H2dVariableType.TEMPS);
varEnveloppData.put(v, new EfDataElement(tempsHMax));
v = H2dVariableType.createTempVar(TrResource.getS("Temps de la vitesse maximale"), null, "s", src_.getShortNameCreateVar());
@@ -633,7 +633,7 @@
for (H2dRubarSedimentVariableType h2dRubarSedimentVariableType : variables) {
varInitIDx_.put(h2dRubarSedimentVariableType, SED_START_IDX + idx);
src_.sedimentVariable.put(h2dRubarSedimentVariableType, new TrPostRubarSedimentVariable(src_, h2dRubarSedimentVariableType,
- result));
+ result));
idx++;
if (h2dRubarSedimentVariableType.getParentVariable().equals(H2dVariableTransType.EPAISSEUR)) {
TrPostRubarSedimentFondVariable value = new TrPostRubarSedimentFondVariable(src_, h2dRubarSedimentVariableType, result);
@@ -720,7 +720,6 @@
}
String name = file.getName();
String[] list = file.getParentFile().list(new FilenameFilter() {
-
@Override
public boolean accept(File dir, String name) {
// TODO Auto-generated method stub
@@ -826,13 +825,19 @@
// on ajoute le pas de temps que s'il n'est pas contenu dans les pas de temps de TPS,TPC
if (!initTimeIntPos.containsKey(it.key())) {
final TrPostSourceRubarMaxContainer max = TrPostSourceRubarMaxContainer.compute(it.key(),
- (TIntObjectHashMap) it.value(),
- src_.tpsReader_, timeStep);
+ (TIntObjectHashMap) it.value(),
+ src_.tpsReader_, timeStep);
tAjoutMax.put(it.key(), max);
if (coteEau != null) {
for (int ie = max.getNbContent() - 1; ie >= 0; ie--) {
final ElementContent c = max.getContentAt(ie);
- coteEau[c.ie_] = c.h_ + max.getValueZFN(c.ie_, src_.zfnReader_);
+ EfElement element = src_.getGrid().getElement(c.ie_);
+ double value = 0;
+ final int ptNb = element.getPtNb();
+ for (int idxPt = 0; idxPt < ptNb; idxPt++) {
+ value = max.getValueZFN(element.getPtIndex(idxPt), src_.zfnReader_);
+ }
+ coteEau[c.ie_] = c.h_ + value / ((double) ptNb);
if (set != null) {
set.set(c.ie_);
}
@@ -880,7 +885,6 @@
TrPostSourceBuilder.loadData(_impl, _prog, proj_);
}
BuLib.invokeLater(new Runnable() {
-
@Override
public void run() {
if (proj_ != null) {
@@ -937,17 +941,15 @@
pnButtons.add(btSelectAll);
pnButtons.add(btUnSelectAll);
btSelectAll.addActionListener(new ActionListener() {
-
@Override
public void actionPerformed(ActionEvent e) {
- trPostRubarFmtModel.selectAll();
+ trPostRubarFmtModel.selectAll();
}
});
btUnSelectAll.addActionListener(new ActionListener() {
-
@Override
public void actionPerformed(ActionEvent e) {
- trPostRubarFmtModel.unselectAll();
+ trPostRubarFmtModel.unselectAll();
}
});
pn.add(pnButtons, BorderLayout.SOUTH);
@@ -957,7 +959,6 @@
final CtuluTaskDelegate task = _f.createTask(TrResource.getS("Charger"));
final ProgressionInterface prog = task.getStateReceiver();
task.start(new Runnable() {
-
@Override
public void run() {
loadFiles(prog, _f);
@@ -1036,7 +1037,7 @@
_titre,
TrResource.getS("Les r\xE9sultats sont tronqu\xE9s")
+ (_d >= 0 ? (CtuluLibString.LINE_SEP + TrResource.getS("Les pas de temps sont ignor\xE9s \xE0 partir de:") + CtuluLibString.ESPACE + _d)
- : CtuluLibString.EMPTY_STRING), false);
+ : CtuluLibString.EMPTY_STRING), false);
}
}
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 2012-08-28 09:29:52 UTC (rev 7582)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceProjected.java 2012-08-28 09:31:04 UTC (rev 7583)
@@ -16,7 +16,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedExpr.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedExpr.java 2012-08-28 09:29:52 UTC (rev 7582)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedExpr.java 2012-08-28 09:31:04 UTC (rev 7583)
@@ -276,7 +276,7 @@
FuLog.error(e);
}
- return src_.containsElementVar() ? (EfData) new EfDataElement(res) : new EfDataNode(res);
+ return isElem? (EfData) new EfDataElement(res) : new EfDataNode(res);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
