Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[6899] trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa /fudaa/tr
|
From: <de...@us...> - 2012-01-02 12:59:25
|
Revision: 6899
http://fudaa.svn.sourceforge.net/fudaa/?rev=6899&view=rev
Author: deniger
Date: 2012-01-02 12:59:19 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostRubarEdgesResults.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarDonneesBrutesNuageLayer.java
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostRubarEdgesResults.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostRubarEdgesResults.java 2012-01-02 12:58:51 UTC (rev 6898)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostRubarEdgesResults.java 2012-01-02 12:59:19 UTC (rev 6899)
@@ -84,16 +84,16 @@
* @param _idx
* @param _results
*/
- protected TrPostRubarEdgesResults(final H2dRubarGridAreteSource _g, final int[] _idx,
- final RubarOutEdgeResult[] _results, final H2dRubarOuvrageContainer _ouvrages) {
+ protected TrPostRubarEdgesResults(final H2dRubarGridAreteSource _g, final int[] _idx, final RubarOutEdgeResult[] _results,
+ final H2dRubarOuvrageContainer _ouvrages) {
super();
idx_ = _idx;
results_ = _results;
if (results_ != null && results_.length > 0) {
H2dVariableType[] vars;
if (results_[0].isConcentrationSet()) {
- vars = new H2dVariableType[] { H2dVariableType.DEBIT_M3, H2dVariableTransType.CONCENTRATION_PAR_HAUTEUR,
- H2dVariableType.HAUTEUR_EAU };
+ vars = new H2dVariableType[] { H2dVariableType.DEBIT_M3, H2dVariableTransType.CONCENTRATION_PAR_HAUTEUR, H2dVariableType.HAUTEUR_EAU,
+ H2dVariableTransType.ETENDUE, H2dVariableTransType.DIAMETRE };
} else {
vars = new H2dVariableType[] { H2dVariableType.DEBIT_M3, H2dVariableType.HAUTEUR_EAU };
}
@@ -105,19 +105,22 @@
}
public String checkTime(final TrPostSource _src) {
- if (isTimeChecked_) { return null; }
+ if (isTimeChecked_) {
+ return null;
+ }
if (!_src.getTime().isUseTempTimeStep() && _src.getNbTimeStep() > 0 && !CtuluLibArray.isEmpty(results_)) {
isTimeChecked_ = true;
final double last = _src.getTime().getInitTimeStep(_src.getNbTimeStep() - 1);
final double lastHere = results_[0].getLastTimeStep();
- if (Math.abs(last - lastHere) > 1E-1) { return TrResource.getS(
- "Les pas de temps du fichier {0} ne sont pas compatibles", "OUT/MAS"); }
+ if (Math.abs(last - lastHere) > 1E-1) {
+ return TrResource.getS("Les pas de temps du fichier {0} ne sont pas compatibles", "OUT/MAS");
+ }
}
return null;
}
- void addGraphe(final int _globalEdgeIdx, final ProgressionInterface _prog, final FudaaCommonImplementation _impl,
- final TrPostProjet _proj, final TrPostSource _src) {
+ void addGraphe(final int _globalEdgeIdx, final ProgressionInterface _prog, final FudaaCommonImplementation _impl, final TrPostProjet _proj,
+ final TrPostSource _src) {
final int res = getLocalEdgeSet(_globalEdgeIdx);
if (res < 0) {
TrPostRubarEdgeFille.getErrorSelectedEdge(_impl);
@@ -164,15 +167,17 @@
final EGGraphe graphe = new EGGraphe(EGGrapheSimpleModel.createSimpleModel(cs));
graphe.setXAxe(EGAxeHorizontal.buildDefautTimeAxe(_src.getTimeFormatter()));
graphe.restore();
- final EGFilleSimple fille = new TrPostRubarEdgeFille(graphe, TrResource.getS("Ar\xEAte {0}", CtuluLibString
- .getString(_globalEdgeIdx + 1)), _impl, null);
+ final EGFilleSimple fille = new TrPostRubarEdgeFille(graphe, TrResource.getS("Ar\xEAte {0}", CtuluLibString.getString(_globalEdgeIdx + 1)), _impl,
+ null);
addFille(fille, _impl);
}
- void addGraphe(final int[] _globalEdgeIdx, final ProgressionInterface _prog, final FudaaCommonImplementation _impl,
- final TrPostProjet _proj, final TrPostSource _src) {
- if (_globalEdgeIdx == null) { return; }
+ void addGraphe(final int[] _globalEdgeIdx, final ProgressionInterface _prog, final FudaaCommonImplementation _impl, final TrPostProjet _proj,
+ final TrPostSource _src) {
+ if (_globalEdgeIdx == null) {
+ return;
+ }
if (_globalEdgeIdx.length == 1) {
addGraphe(_globalEdgeIdx[0], _prog, _impl, _proj, _src);
return;
@@ -243,13 +248,12 @@
}
final EGGraphe graphe = new EGGraphe(treeModel);
graphe.setXAxe(EGAxeHorizontal.buildDefautTimeAxe(_src.getTimeFormatter()));
- addFille(new TrPostRubarEdgeTreeFille(graphe, TrResource.getS("Evolutions sur {0} ar\xEAtes", CtuluLibString
- .getString(_globalEdgeIdx.length)), _impl, null), _impl);
+ addFille(new TrPostRubarEdgeTreeFille(graphe, TrResource.getS("Evolutions sur {0} ar\xEAtes", CtuluLibString.getString(_globalEdgeIdx.length)),
+ _impl, null), _impl);
}
- protected void addEdgeFrame(final int[] _globalEgeIdx, final FudaaCommonImplementation _impl,
- final TrPostProjet _prj, final TrPostSource _src) {
+ protected void addEdgeFrame(final int[] _globalEgeIdx, final FudaaCommonImplementation _impl, final TrPostProjet _prj, final TrPostSource _src) {
if (idx_ != null) {
new CtuluTaskOperationGUI(_impl, H2dResource.getS("Limnigrammes")) {
@@ -324,21 +328,29 @@
*/
public RubarOutEdgeResult getResultFromGlobal(final int _globalEdgeIdx) {
final int i = getLocalEdgeSet(_globalEdgeIdx);
- if (i >= 0) { return results_[i]; }
+ if (i >= 0) {
+ return results_[i];
+ }
return null;
}
public boolean isLocalEdgeSet(final int[] _globalEdgeIdx) {
- if (_globalEdgeIdx == null) { return false; }
+ if (_globalEdgeIdx == null) {
+ return false;
+ }
for (int i = _globalEdgeIdx.length - 1; i >= 0; i--) {
- if (getLocalEdgeSet(_globalEdgeIdx[i]) >= 0) { return true; }
+ if (getLocalEdgeSet(_globalEdgeIdx[i]) >= 0) {
+ return true;
+ }
}
return false;
}
public int[] getCorrectLocalEdgeSet(final int[] _globalEdgeIdx) {
- if (_globalEdgeIdx == null) { return null; }
+ if (_globalEdgeIdx == null) {
+ return null;
+ }
final int nb = _globalEdgeIdx.length;
final TIntArrayList res = new TIntArrayList(nb);
for (int i = 0; i < nb; i++) {
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarDonneesBrutesNuageLayer.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarDonneesBrutesNuageLayer.java 2012-01-02 12:58:51 UTC (rev 6898)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarDonneesBrutesNuageLayer.java 2012-01-02 12:59:19 UTC (rev 6899)
@@ -14,6 +14,7 @@
import org.fudaa.ctulu.CtuluNumberFormatI;
import org.fudaa.ctulu.CtuluRange;
import org.fudaa.ctulu.gis.CtuluLibGeometrie;
+import org.fudaa.ctulu.gis.GISAttributeConstants;
import org.fudaa.dodico.h2d.rubar.H2dRubarDonneesBrutes;
import org.fudaa.dodico.h2d.rubar.H2dRubarDonneesBrutesListener;
import org.fudaa.dodico.h2d.rubar.H2dRubarDonneesBrutesMng;
@@ -48,10 +49,6 @@
br_ = _br;
}
- /*
- * public BuTable createValuesTable(ZCalqueAffichageDonneesInterface _layer){ return new CtuluTable(new
- * NuageTableModel(br_)); }
- */
@Override
public void fillWithInfo(final InfoData _d, final ZCalqueAffichageDonneesInterface _layer) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
