Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7301] trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa /fudaa/tr
|
From: <de...@us...> - 2012-06-12 20:24:24
|
Revision: 7301
http://fudaa.svn.sourceforge.net/fudaa/?rev=7301&view=rev
Author: deniger
Date: 2012-06-12 20:24:17 +0000 (Tue, 12 Jun 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/common/Tr3DFactory.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoModel.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoModelAbstract.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheLayer.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheModel.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceAbstract.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceRubar.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataMinMaxGlobalItem.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostExtremVisitor.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-06-12 15:51:14 UTC (rev 7300)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2012-06-12 20:24:17 UTC (rev 7301)
@@ -77,8 +77,8 @@
infoSoft = new BuInformationsSoftware();
infoSoft.name = "prepro";
- infoSoft.version = "1.2RC7";
- infoSoft.date = "2012-06-07";
+ infoSoft.version = "1.2RC8";
+ infoSoft.date = "2012-06-12";
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/common/Tr3DFactory.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/Tr3DFactory.java 2012-06-12 15:51:14 UTC (rev 7300)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/Tr3DFactory.java 2012-06-12 20:24:17 UTC (rev 7301)
@@ -82,13 +82,16 @@
}
//TODO Gard\xE9e pour retro-compatibilit\xE9, voir si \xE0 virer.
- public static void afficheFrame(final JFrame _f, final EfGridData _grid, final InterpolationVectorContainer _vects, final CtuluUI _ui,
- final BGroupeCalque _fond, final MvFrontierLayerAbstract _fr) {
+ public static void afficheFrame(final JFrame _f, final EfGridData _grid, final InterpolationVectorContainer _vects,
+ final CtuluUI _ui,
+ final BGroupeCalque _fond, final MvFrontierLayerAbstract _fr) {
afficheFrame(_f, _grid, _vects, _ui, _fond, _fr, new ZCalqueLigneBrisee[0]);
}
- public static void afficheFrame(final JFrame _f, final EfGridData _grid, final InterpolationVectorContainer _vects, final CtuluUI _ui,
- final BGroupeCalque _fond, final MvFrontierLayerAbstract _fr, final ZCalqueLigneBrisee[] _buildingLayers) {
+ public static void afficheFrame(final JFrame _f, final EfGridData _grid, final InterpolationVectorContainer _vects,
+ final CtuluUI _ui,
+ final BGroupeCalque _fond, final MvFrontierLayerAbstract _fr,
+ final ZCalqueLigneBrisee[] _buildingLayers) {
if (_grid == null) {
return;
}
@@ -99,11 +102,11 @@
public void run() {
afficheFrameAction(_f, _grid, _vects, _ui, _fond, _fr, _buildingLayers, task.getStateReceiver());
}
-
});
}
public static class Action3D extends EbliActionSimple {
+
final TrVisuPanel visu_;
JFrame f_;
final String name_;
@@ -131,7 +134,6 @@
public void windowClosed(final WindowEvent _evt) {
f_ = null;
}
-
});
visu_.view3D(f_);
@@ -143,11 +145,11 @@
}
}
-
}
- private static EfGridData convertGrid(final EfGridData _grid, final CtuluUI _ui, final ProgressionInterface _prog, final CtuluVariable[] _vars,
- final InterpolationVectorContainer _vects) {
+ private static EfGridData convertGrid(final EfGridData _grid, final CtuluUI _ui, final ProgressionInterface _prog,
+ final CtuluVariable[] _vars,
+ final InterpolationVectorContainer _vects) {
final EfElementType elt = _grid.getGrid().getEltType();
EfGridData endData = _grid;
final CtuluAnalyze res = new CtuluAnalyze();
@@ -160,7 +162,8 @@
endData = act.process(_prog, res);
try {
EfData data = endData.getData(H2dVariableType.BATHYMETRIE, 0);
- } catch (IOException e) {
+ data.getSize();
+ } catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
@@ -180,7 +183,8 @@
endData = toNode.process(_prog, res);
try {
EfData data = endData.getData(H2dVariableType.BATHYMETRIE, 0);
- } catch (IOException e) {
+ data.getSize();
+ } catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
@@ -189,19 +193,23 @@
}
//TODO Gard\xE9e pour retro-compatibilit\xE9, voir si \xE0 virer.
- public static void afficheFrameAction(final JFrame _f, final EfGridData _initSrc, final InterpolationVectorContainer _vects, final CtuluUI _ui,
- final BGroupeCalque _cqFond, final MvFrontierLayerAbstract _building, final ProgressionInterface _prog) {
+ public static void afficheFrameAction(final JFrame _f, final EfGridData _initSrc, final InterpolationVectorContainer _vects,
+ final CtuluUI _ui,
+ final BGroupeCalque _cqFond, final MvFrontierLayerAbstract _building,
+ final ProgressionInterface _prog) {
afficheFrameAction(_f, _initSrc, _vects, _ui, _cqFond, _building, new ZCalqueLigneBrisee[0], _prog);
}
- public static void afficheFrameAction(final JFrame _f, final EfGridData _initSrc, final InterpolationVectorContainer _vects, final CtuluUI _ui,
- final BGroupeCalque _cqFond, final MvFrontierLayerAbstract _building, final ZCalqueLigneBrisee[] _buildingLayers,
- final ProgressionInterface _prog) {
+ public static void afficheFrameAction(final JFrame _f, final EfGridData _initSrc, final InterpolationVectorContainer _vects,
+ final CtuluUI _ui,
+ final BGroupeCalque _cqFond, final MvFrontierLayerAbstract _building,
+ final ZCalqueLigneBrisee[] _buildingLayers,
+ final ProgressionInterface _prog) {
// on doit avoir des T3
//we must get T3
H2dVariableType varBathy = H2dVariableType.BATHYMETRIE;
boolean containsBathy = _initSrc.isDefined(varBathy);
- H2dVariableType[] varZe = new H2dVariableType[] { H2dVariableType.COTE_EAU };
+ H2dVariableType[] varZe = new H2dVariableType[]{H2dVariableType.COTE_EAU};
boolean containsZe = _initSrc.isDefined(varZe[0]);
boolean isTelemac3D = false;
if (!containsBathy && !containsZe) {
@@ -228,7 +236,8 @@
}
}
- final EfGridData endData = isTelemac3D ? _initSrc : convertGrid(_initSrc, _ui, _prog, new CtuluVariable[] { varBathy, varZe[0] }, _vects);
+ final EfGridData endData = isTelemac3D ? _initSrc : convertGrid(_initSrc, _ui, _prog, new CtuluVariable[]{varBathy, varZe[0]},
+ _vects);
if (endData == null) {
return;
}
@@ -246,7 +255,8 @@
boolean isAnim = _initSrc instanceof TrPostSource;
if (isAnim) {
idx = ((TrPostSource) _initSrc).getNbTimeStep() - 1;
- if (idx == 0) {
+ if (idx <= 0) {
+ idx = 0;
isAnim = false;
}
}
@@ -381,6 +391,7 @@
}
BuLib.invokeLater(new Runnable() {
+
@Override
public void run() {
fille.updateFrame(_f);
@@ -391,7 +402,6 @@
_f.show();
fille.getUnivers().getCanvas3D().requestFocusInWindow();
}
-
});
}
@@ -470,7 +480,7 @@
}
private static Point3d[] create3d(final EfGridData _grid, final H2dVariableType _var, final int _timeIdx, final CtuluUI _ui,
- final ProgressionUpdater _up, final GrBoite _r) {
+ final ProgressionUpdater _up, final GrBoite _r) {
final EfGridInterface grid = _grid.getGrid();
final Point3d[] pts = new Point3d[grid.getPtsNb()];
EfData data;
@@ -498,5 +508,4 @@
}
return pts;
}
-
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoModel.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoModel.java 2012-06-12 15:51:14 UTC (rev 7300)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoModel.java 2012-06-12 20:24:17 UTC (rev 7301)
@@ -45,7 +45,8 @@
@Override
public void fillInterpolateInfo(final InfoData _m, final int _element, final double _x, final double _y,
final String _layerTitle) {
- if (_element >= 0 && s_.containsOnlyElementVar()) {
+
+ if (oldData_ != null && oldData_.isElementData() && _element >= 0) {
_m.put(MvResource.getS("Aire de l'\xE9l\xE9ment"), CtuluLib.DEFAULT_NUMBER_FORMAT.format(s_.getGrid().getAire(_element)));
}
s_.fillInterpolateInfo(_m, _element, _x, _y, tIdx_, _layerTitle);
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoModelAbstract.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoModelAbstract.java 2012-06-12 15:51:14 UTC (rev 7300)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoModelAbstract.java 2012-06-12 20:24:17 UTC (rev 7301)
@@ -267,7 +267,7 @@
@Override
public final EbliFindExpressionContainerInterface getExpressionContainer() {
return new EbliFindExpressionComposite(
- s_.containsOnlyElementVar() ? (EbliFindExpressionContainerInterface) new MvExpressionSupplierElement(this)
+ oldData_!=null && oldData_.isElementData()? (EbliFindExpressionContainerInterface) new MvExpressionSupplierElement(this)
: new MvExpressionSupplierNode(this), new TrPostExprDataSupplier(this));
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheLayer.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheLayer.java 2012-06-12 15:51:14 UTC (rev 7300)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheLayer.java 2012-06-12 20:24:17 UTC (rev 7301)
@@ -559,12 +559,14 @@
@Override
public boolean isSelectionElementEmpty() {
- return isGrilleActivated() || isSelectionEmpty() || !initModel_.s_.containsOnlyElementVar();
+ boolean isElement = initModel_.getData() != null && initModel_.getData().isElementData();
+ return !isElement || isGrilleActivated() || isSelectionEmpty();
}
@Override
public boolean isSelectionPointEmpty() {
- return isSelectionEmpty() || initModel_.s_.containsOnlyElementVar() || isGrilleActivated();
+ boolean isElement = initModel_.getData() != null && initModel_.getData().isElementData();
+ return isElement || isSelectionEmpty() || isGrilleActivated();
}
@Override
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheModel.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheModel.java 2012-06-12 15:51:14 UTC (rev 7300)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheModel.java 2012-06-12 20:24:17 UTC (rev 7301)
@@ -1,9 +1,6 @@
/**
- * @creation 16 nov. 2004
- * @modification $Date: 2007-06-20 12:23:40 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
+ * @creation 16 nov. 2004 @modification $Date: 2007-06-20 12:23:40 $ @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;
@@ -100,7 +97,8 @@
return false;
}
- public void fillInterpolateInfo(final InfoData _m, final int _element, final double _x, final double _y, final String _layerTitle) {
+ public void fillInterpolateInfo(final InfoData _m, final int _element, final double _x, final double _y,
+ final String _layerTitle) {
s_.fillInterpolateInfo(_m, _element, _x, _y, timeIdx_, _layerTitle);
}
@@ -120,7 +118,8 @@
return null;
}
final BuTable b = new CtuluTable();
- final String s = TrResource.getS("<u>Variable</u>: {0}<br><u>Pas de temps</u>: {1}", current_.getVar().getName(), getSelectedTime());
+ final String s = TrResource.getS("<u>Variable</u>: {0}<br><u>Pas de temps</u>: {1}", current_.getVar().getName(),
+ getSelectedTime());
EbliTableInfoPanel.setTitle(b, "<html>" + s + "</html>");
b.setModel(new ZCalqueFleche.ValueTableModel(this) {
@@ -171,7 +170,7 @@
info.vx_ = current_.getVxDesc();
info.vy_ = current_.getVyDesc();
}
- if (s_.containsOnlyElementVar()) {
+ if (data_ != null && data_.isElementData()) {
MvInfoDelegateAbstract.fillWithElementInfo(_d, _layer.getLayerSelection(), s_.getGrid(), null, false, _layer.getTitle());
if (!_layer.isOnlyOneObjectSelected()) {
return;
@@ -227,7 +226,7 @@
}
public EfFilterTime getFilterForCurrentVar() {
- if(current_==null){
+ if (current_ == null) {
return null;
}
final TrPostFilterLayer filter = getCond();
@@ -420,15 +419,16 @@
_s.e_.y_ += data_.getVy(_i);
return true;
}
-
+
@Override
- public void prepare(){
+ public void prepare() {
updateFilter();
}
private boolean isActivated(final int _idxPtOrMesh) {
if (filterForCurrentVar != null
- && ((data_.isElementData() && !filterForCurrentVar.isActivatedElt(_idxPtOrMesh)) || (!data_.isElementData() && !filterForCurrentVar.isActivated(_idxPtOrMesh)))) {
+ && ((data_.isElementData() && !filterForCurrentVar.isActivatedElt(_idxPtOrMesh)) || (!data_.isElementData() && !filterForCurrentVar.isActivated(
+ _idxPtOrMesh)))) {
return false;
}
return true;
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceAbstract.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceAbstract.java 2012-06-12 15:51:14 UTC (rev 7300)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceAbstract.java 2012-06-12 20:24:17 UTC (rev 7301)
@@ -534,10 +534,12 @@
protected TrPostDataMinMaxGlobalItem computeMinMax(final H2dVariableType _variable, final ProgressionInterface _prog) {
final ProgressionUpdater up = createUpdaterForMinMax(_variable);
- final TrPostExtremVisitor visitor = new TrPostExtremVisitor(containsOnlyElementVar() ? getGrid().getEltNb()
- : getGrid().getPtsNb());
+ TrPostExtremVisitor visitor = null;
for (int i = getNbTimeStep() - 1; i >= 0; i--) {
final EfData d = getData(_variable, i);
+ if (visitor == null) {
+ visitor = new TrPostExtremVisitor(d.isElementData() ? getGrid().getEltNb() : getGrid().getPtsNb(), d.isElementData());
+ }
visitor.setCurrentTime(getTimeStep(i));
d.iterate(visitor);
if (up != null) {
@@ -545,6 +547,9 @@
}
}
impl_.clearMainProgression();
+ if (visitor == null) {
+ return null;
+ }
return new TrPostDataMinMaxGlobalItem(_variable.getShortName(), visitor);
}
@@ -834,7 +839,7 @@
range.setToNill();
final CtuluCollectionDouble mins = it.getMinOnObjects();
final CtuluCollectionDouble maxs = it.getMaxOnObjects();
- final boolean elt = containsOnlyElementVar();
+ final boolean elt = it.isElementData();
final int nb = elt ? g_.getEltNb() : g_.getPtsNb();
for (int i = nb - 1; i >= 0; i--) {
if ((elt && _cond.isActivatedElt(i)) || (!elt && _cond.isActivated(i))) {
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceRubar.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceRubar.java 2012-06-12 15:51:14 UTC (rev 7300)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceRubar.java 2012-06-12 20:24:17 UTC (rev 7301)
@@ -504,11 +504,14 @@
final ProgressionUpdater up = createUpdaterForMinMax(_variable);
up.majProgessionStateOnly();
TIntIntIterator it = exposeTimeInitTime_.iterator();
- final TrPostExtremVisitor visitor = new TrPostExtremVisitor(getGrid().getEltNb());
+ TrPostExtremVisitor visitor = null;
for (int i = exposeTimeInitTime_.size(); i-- > 0;) {
it.advance();
final int idxTime = it.key();
final EfData d = getData(_variable, idxTime);
+ if (visitor == null) {
+ visitor = new TrPostExtremVisitor(d.isElementData() ? getGrid().getEltNb() : getGrid().getPtsNb(), d.isElementData());
+ }
visitor.setCurrentTime(getTimeStep(idxTime));
d.iterate(visitor);
up.majAvancement();
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataMinMaxGlobalItem.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataMinMaxGlobalItem.java 2012-06-12 15:51:14 UTC (rev 7300)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataMinMaxGlobalItem.java 2012-06-12 20:24:17 UTC (rev 7301)
@@ -1,9 +1,6 @@
/**
- * @creation 20 d\xE9c. 2004
- * @modification $Date: 2007-01-10 09:03:19 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
+ * @creation 20 d\xE9c. 2004 @modification $Date: 2007-01-10 09:03:19 $ @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.data;
@@ -24,7 +21,6 @@
_q.constrain(TrPostDataMinMaxGlobalItem.class);
_q.descend("id_").constrain(_varId);
}
-
final String id_;
final double maxGlobal_;
final CtuluArrayDouble[] maxTimeStep_;
@@ -45,7 +41,12 @@
minGlobalTimeStep_ = null;
maxValues_ = null;
minValues_ = null;
+ elementData = false;
+ }
+ final boolean elementData;
+ public boolean isElementData() {
+ return elementData;
}
/**
@@ -54,6 +55,7 @@
*/
public TrPostDataMinMaxGlobalItem(final String _id, final TrPostExtremVisitor _extrems) {
id_ = _id;
+ elementData = _extrems.isElementData();
minGlobal_ = _extrems.minGlobal_;
maxGlobal_ = _extrems.maxGlobal_;
maxValues_ = new CtuluArrayDouble(_extrems.maxValues_);
@@ -134,5 +136,4 @@
public final double getMin() {
return minGlobal_;
}
-
}
\ No newline at end of file
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostExtremVisitor.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostExtremVisitor.java 2012-06-12 15:51:14 UTC (rev 7300)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostExtremVisitor.java 2012-06-12 20:24:17 UTC (rev 7301)
@@ -27,13 +27,14 @@
double[] maxValues_;
double minGlobal_;
TDoubleArrayList[] minTimeStep_;
-
double[] minValues_;
+ final boolean elementData;
/**
- *
+ *
*/
- public TrPostExtremVisitor(final int _nbValues) {
+ public TrPostExtremVisitor(final int _nbValues, final boolean isElement) {
+ this.elementData = isElement;
minValues_ = new double[_nbValues];
maxValues_ = new double[_nbValues];
Arrays.fill(minValues_, Double.MAX_VALUE);
@@ -44,6 +45,11 @@
maxTimeStep_ = new TDoubleArrayList[_nbValues];
}
+ public boolean isElementData() {
+ return elementData;
+ }
+
+
@Override
public boolean accept(final int _idxPt, final double _v) {
if (_v >= maxGlobal_) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
