Menu
▾
▴
fudaa-svn-commit — svn commit with diffs
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(46) |
Jul
(37) |
Aug
(154) |
Sep
(140) |
Oct
(132) |
Nov
(104) |
Dec
(67) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(113) |
Feb
(73) |
Mar
(102) |
Apr
(106) |
May
(114) |
Jun
(67) |
Jul
(116) |
Aug
(48) |
Sep
(108) |
Oct
(296) |
Nov
(56) |
Dec
(53) |
| 2010 |
Jan
(95) |
Feb
(31) |
Mar
(40) |
Apr
(12) |
May
(10) |
Jun
(27) |
Jul
(19) |
Aug
(81) |
Sep
(48) |
Oct
(45) |
Nov
(40) |
Dec
(7) |
| 2011 |
Jan
(16) |
Feb
(32) |
Mar
(55) |
Apr
(38) |
May
(24) |
Jun
(37) |
Jul
(12) |
Aug
(16) |
Sep
(97) |
Oct
(90) |
Nov
(101) |
Dec
(89) |
| 2012 |
Jan
(18) |
Feb
(2) |
Mar
(54) |
Apr
(69) |
May
(97) |
Jun
(131) |
Jul
(70) |
Aug
(48) |
Sep
(48) |
Oct
(119) |
Nov
(194) |
Dec
(60) |
| 2013 |
Jan
(73) |
Feb
(35) |
Mar
(42) |
Apr
(28) |
May
(7) |
Jun
(17) |
Jul
(27) |
Aug
(10) |
Sep
(38) |
Oct
(12) |
Nov
(4) |
Dec
(16) |
| 2014 |
Jan
(33) |
Feb
(37) |
Mar
(19) |
Apr
(3) |
May
(47) |
Jun
(26) |
Jul
(22) |
Aug
|
Sep
(10) |
Oct
(30) |
Nov
(24) |
Dec
(19) |
| 2015 |
Jan
(13) |
Feb
(16) |
Mar
(36) |
Apr
(19) |
May
(5) |
Jun
(5) |
Jul
(3) |
Aug
(11) |
Sep
(22) |
Oct
(7) |
Nov
(14) |
Dec
|
| 2016 |
Jan
|
Feb
(26) |
Mar
(13) |
Apr
(61) |
May
|
Jun
|
Jul
(4) |
Aug
|
Sep
|
Oct
(27) |
Nov
(14) |
Dec
(21) |
| 2017 |
Jan
(30) |
Feb
(4) |
Mar
(3) |
Apr
(5) |
May
(69) |
Jun
(29) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <de...@us...> - 2013-03-07 16:59:13
|
Revision: 8313
http://fudaa.svn.sourceforge.net/fudaa/?rev=8313&view=rev
Author: deniger
Date: 2013-03-07 16:59:06 +0000 (Thu, 07 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/CtuluLogsTopComponent.java
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/CtuluLogsTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/CtuluLogsTopComponent.java 2013-03-07 16:58:04 UTC (rev 8312)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/CtuluLogsTopComponent.java 2013-03-07 16:59:06 UTC (rev 8313)
@@ -127,11 +127,11 @@
}
List<TableColumn> allColumns = new ArrayList<TableColumn>();
- private void setColumns(List<PropertyColumnFilterable> columns) {
+ private void setColumns(List<PropertyColumnFilterable> newColumns) {
allColumns.clear();
ETableColumnModel columnModel = (ETableColumnModel) outlineLogsView.getOutline().getColumnModel();
if (this.columns != null) {
- for (PropertyColumnFilterable col : columns) {
+ for (PropertyColumnFilterable col : this.columns) {
outlineLogsView.removePropertyColumn(col.getColumnId());
}
for (int i = columnModel.getColumnCount() - 1; i > 0; i--) {
@@ -139,19 +139,19 @@
columnModel.removeColumn(column);
}
}
- this.columns = new ArrayList<PropertyColumnFilterable>(columns);
- for (PropertyColumnFilterable propertyColumn : columns) {
+ this.columns = new ArrayList<PropertyColumnFilterable>(newColumns);
+ for (PropertyColumnFilterable propertyColumn : newColumns) {
outlineLogsView.addPropertyColumn(propertyColumn.getColumnId(), propertyColumn.getDisplayName(),
propertyColumn.getDescription());
}
- int columnCount = columnModel.getColumnCount();
+ int columnCount = Math.min(columnModel.getColumnCount(), newColumns.size());
CollectionUtils.addAll(allColumns, columnModel.getColumns());
for (int i = columnCount - 1; i > 0; i--) {//on commence par la fin car les colonnes sont enlevées au fur et à mesure
final TableColumn column = columnModel.getColumn(i);
//enleve la colonne des colonnes visibles.
- columnModel.setColumnHidden(column, !columns.get(i - 1).isVisibleByDefault());//enleve la colonne des colonnes visibles.
+ columnModel.setColumnHidden(column, !newColumns.get(i - 1).isVisibleByDefault());//enleve la colonne des colonnes visibles.
}
outlineLogsView.getOutline().getTableHeader().setToolTipText(null);
outlineLogsView.setNodePopupFactory(new LogNodePopupFactory(this.columns));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-07 07:06:43
|
Revision: 8311
http://fudaa.svn.sourceforge.net/fudaa/?rev=8311&view=rev
Author: deniger
Date: 2013-03-07 07:06:36 +0000 (Thu, 07 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/ValidatorResultatCrue10Test.java
Modified: trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/ValidatorResultatCrue10Test.java
===================================================================
--- trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/ValidatorResultatCrue10Test.java 2013-03-06 23:52:26 UTC (rev 8310)
+++ trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/ValidatorResultatCrue10Test.java 2013-03-07 07:06:36 UTC (rev 8311)
@@ -16,7 +16,6 @@
import org.fudaa.dodico.crue.metier.emh.DonCLimMScenario;
import org.fudaa.dodico.crue.metier.emh.EMHBranchePdc;
import org.fudaa.dodico.crue.metier.emh.EMHModeleBase;
-import org.fudaa.dodico.crue.metier.factory.EMHNoeudFactory;
import org.fudaa.dodico.crue.metier.emh.EMHNoeudNiveauContinu;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
import org.fudaa.dodico.crue.metier.emh.EMHSousModele;
@@ -27,6 +26,7 @@
import org.fudaa.dodico.crue.metier.emh.ResPrtReseau;
import org.fudaa.dodico.crue.metier.emh.ResPrtReseauNoeud;
import org.fudaa.dodico.crue.metier.emh.ResPrtReseauNoeuds;
+import org.fudaa.dodico.crue.metier.factory.EMHNoeudFactory;
import org.fudaa.dodico.crue.metier.factory.EMHRelationFactory;
/**
@@ -74,7 +74,7 @@
assertFalse(validateResultatPretraitement);
CtuluLog log = errorMng.getLogs().get(0);
assertEquals(2, log.getRecords().size());
- assertTrue(log.containsSevereError());
+ assertTrue(log.containsErrors());
Iterator<CtuluLogRecord> iterator = log.getRecords().iterator();
CtuluLogRecord next = iterator.next();
assertEquals("rptr.UnactiveEMHNoeud.error", next.getMsg());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-06 09:09:14
|
Revision: 8307
http://fudaa.svn.sourceforge.net/fudaa/?rev=8307&view=rev
Author: deniger
Date: 2013-03-06 09:09:07 +0000 (Wed, 06 Mar 2013)
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/FudaaCourbeTimeModel.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 2013-03-05 16:31:56 UTC (rev 8306)
+++ trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefautModel.java 2013-03-06 09:09:07 UTC (rev 8307)
@@ -5,7 +5,6 @@
package org.fudaa.fudaa.commun.courbe;
import java.util.Map;
-
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluLibString;
@@ -37,6 +36,11 @@
e_ = _e;
}
+ @Override
+ public boolean useSpecificIcon(int idx) {
+ return false;
+ }
+
/**
* Achtung: utiliser uniqument pour la persistance des donnees.
*/
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 2013-03-05 16:31:56 UTC (rev 8306)
+++ trunk/framework/fudaa-common-courbe/src/main/java/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java 2013-03-06 09:09:07 UTC (rev 8307)
@@ -12,7 +12,6 @@
package org.fudaa.fudaa.commun.courbe;
import java.util.Map;
-
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluLibArray;
import org.fudaa.ctulu.CtuluListSelectionInterface;
@@ -42,6 +41,11 @@
time_ = _timeIdx;
}
+ @Override
+ public boolean useSpecificIcon(int idx) {
+ return false;
+ }
+
/**
* ACHTUNG!!!; constructeur utilis\xE9 uniquement pour la persistance des donnees!!!
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-04 22:50:22
|
Revision: 8304
http://fudaa.svn.sourceforge.net/fudaa/?rev=8304&view=rev
Author: deniger
Date: 2013-03-04 22:50:15 +0000 (Mon, 04 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableGraphePanel.java
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableGraphePanel.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableGraphePanel.java 2013-03-04 07:44:17 UTC (rev 8303)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableGraphePanel.java 2013-03-04 22:50:15 UTC (rev 8304)
@@ -14,7 +14,6 @@
import java.awt.Dimension;
import java.awt.Insets;
import java.awt.event.ActionEvent;
-import java.awt.event.FocusEvent;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
@@ -455,7 +454,7 @@
}
SpecTableModel model = (SpecTableModel) _table.getModel();
//on modifie le tooltip que si non modifi\xE9 par le decorator eventuelle...
- if (!CtuluLibString.EMPTY_STRING.equals(getToolTipText())) {
+ if (CtuluLibString.EMPTY_STRING.equals(getToolTipText())) {
if (_column == model.getXColIndex()) {
setToolTipText(model.getXDetailAsString(_row));
} else if (_column == model.getYColIndex()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-02-26 16:22:44
|
Revision: 8302
http://fudaa.svn.sourceforge.net/fudaa/?rev=8302&view=rev
Author: deniger
Date: 2013-02-26 16:22:36 +0000 (Tue, 26 Feb 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeRepereConfigurator.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbeConfigureTarget.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbeModelDefault.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersist.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersistBuilder.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGModel.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGModelDecoratorInverse.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGModelTransformed.java
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeRepereConfigurator.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeRepereConfigurator.java 2013-02-23 00:10:39 UTC (rev 8301)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeRepereConfigurator.java 2013-02-26 16:22:36 UTC (rev 8302)
@@ -205,7 +205,6 @@
btValid.addActionListener(this);
add(bt);
final EbliActionAbstract s = new EbliActionSimple(EbliResource.EBLI.getString("Restaurer"), EbliResource.EBLI.getIcon("restore"), "RESTORE") {
-
@Override
public void actionPerformed(final ActionEvent _e) {
// -- on reinitialise les mioin/max saisi par l'user --//
@@ -620,7 +619,6 @@
lb = new BuLabel(typePasTxt);
// -- listener de la combo --//
comboHorizontal_.addActionListener(new ActionListener() {
-
@Override
public void actionPerformed(final ActionEvent e) {
modeGraduationX_ = comboHorizontal_.getSelectedIndex();
@@ -776,8 +774,7 @@
comboVertical_ = new BuComboBox(new String[]{EbliLib.getS("Manuel: Nombre de graduations"),
EbliLib.getS("Manuel: longueur des pas"), EbliLib.getS("Automatique: Nombre de graduations"),
EbliLib.getS("Automatique: Longueur des pas"), EbliLib.getS("Logarithmique")}) {
-
- @Override
+ @Override
public void setSelectedIndex(int anIndex) {
super.setSelectedIndex(anIndex);
@@ -791,7 +788,6 @@
pnAxeY_.add(tfVertSousPas_);
// -- listener de la combo --//
comboVertical_.addActionListener(new ActionListener() {
-
@Override
public void actionPerformed(final ActionEvent e) {
updateModeGraduationForY();
@@ -864,7 +860,6 @@
titreAxeXVisible = new BuCheckBox();
titreAxeXVisible.setToolTipText(EbliLib.getS("Affichage ou non du titre de l'axe"));
titreAxeXVisible.addActionListener(new ActionListener() {
-
@Override
public void actionPerformed(ActionEvent e) {
titreAxeXNom.setEnabled(titreAxeXVisible.isSelected() && axeX_.isTitleModifiable());
@@ -887,7 +882,6 @@
uniteAxeXVisible = new BuCheckBox();
uniteAxeXVisible.setToolTipText(EbliLib.getS("Affichage ou non de l'unit\xE9"));
uniteAxeXVisible.addActionListener(new ActionListener() {
-
@Override
public void actionPerformed(ActionEvent e) {
uniteAxeXNom.setEnabled(uniteAxeXVisible.isSelected() && axeX_.isUniteModifiable());
@@ -911,7 +905,6 @@
titreAxeYVisible = new BuCheckBox();
titreAxeYVisible.setToolTipText(EbliLib.getS("Affichage ou non du titre de l'axe"));
titreAxeYVisible.addActionListener(new ActionListener() {
-
@Override
public void actionPerformed(ActionEvent e) {
updateTitreAxeY();
@@ -935,7 +928,6 @@
uniteAxeYVisible = new BuCheckBox();
uniteAxeYVisible.setToolTipText(EbliLib.getS("Affichage ou non de l'unit\xE9"));
uniteAxeYVisible.addActionListener(new ActionListener() {
-
@Override
public void actionPerformed(ActionEvent e) {
updateUniteAxeY();
@@ -959,7 +951,7 @@
}
private CtuluValueEditorI getEditorFor(final EGAxe _a) {
- CtuluValueEditorI r = _a.getValueEditor();
+ CtuluValueEditorI r = _a == null ? null : _a.getValueEditor();
if (r == null) {
r = DEFAULT_EDITOR;
}
@@ -1104,7 +1096,10 @@
final Set s = new HashSet();
if (targets_ != null) {
for (int i = targets_.length - 1; i >= 0; i--) {
- s.add(targets_[i].getAxeY());
+ final EGAxeVertical axeY = targets_[i].getAxeY();
+ if (axeY != null) {
+ s.add(axeY);
+ }
}
}
if (s.size() > 0) {
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java 2013-02-23 00:10:39 UTC (rev 8301)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java 2013-02-26 16:22:36 UTC (rev 8302)
@@ -76,6 +76,9 @@
boolean displayPointLabels_;
Font font_ = CtuluLibSwing.getMiniFont();
final TraceIconModel iconeModel_;
+ TraceIconModel iconeModelSpecific_;
+ private String specificIconTitle = EbliLib.getS("Icone pour points sp\xE9cifiques");
+ private boolean useSpecificIcon;
EGCourbeSurfacePainter surfacePainter_;
TraceBox tbox_;
protected TraceBox tboxLabels_;
@@ -85,12 +88,28 @@
*/
public EGCourbe(final EGModel _model) {
iconeModel_ = new TraceIconModel(TraceIcon.RIEN, 1, Color.BLACK);
+ iconeModelSpecific_ = new TraceIconModel(TraceIcon.RIEN, 1, Color.BLACK);
lineModel_ = new TraceLigneModel();
model_ = _model;
initLabelsTraceBox(Color.BLACK);
+ }
+ public boolean isUseSpecificIcon() {
+ return useSpecificIcon;
}
+ public String getSpecificIconTitle() {
+ return specificIconTitle;
+ }
+
+ public void setSpecificIconTitle(String specificIconTitle) {
+ this.specificIconTitle = specificIconTitle;
+ }
+
+ public void setUseSpecificIcon(boolean useSpecificIcon) {
+ this.useSpecificIcon = useSpecificIcon;
+ }
+
public Collection<EGCourbe> getAssociatesCourbesForExport() {
return Collections.emptyList();
}
@@ -469,6 +488,17 @@
*/
protected int largeurPointsNuage_ = 5;
+ protected TraceIcon getSpecificIcon() {
+ if (useSpecificIcon && iconeModelSpecific_ != null) {
+ return new TraceIcon(new TraceIconModel(iconeModelSpecific_));
+ }
+ return null;
+ }
+
+ protected boolean useSpecific(int idx) {
+ return getModel().useSpecificIcon(idx);
+ }
+
@Override
public void dessine(final Graphics2D _g, final EGRepere _t) {
if (!isVisible_) {
@@ -494,10 +524,14 @@
_g.setColor(EbliLib.getAlphaColor(getAspectContour(), alpha_));
final boolean isAlphaChanged = EbliLib.isAlphaChanged(alpha_);
final TraceIcon trIcon = new TraceIcon(isAlphaChanged ? new TraceIconModel(iconeModel_) : iconeModel_);
+ final TraceIcon trIconSpecific = getSpecificIcon();
final TraceLigne trLigne = new TraceLigne(isAlphaChanged ? new TraceLigneModel(lineModel_) : lineModel_);
if (isAlphaChanged) {
trIcon.setCouleur(EbliLib.getAlphaColor(trIcon.getCouleur(), alpha_));
trLigne.setCouleur(EbliLib.getAlphaColor(trLigne.getCouleur(), alpha_));
+ if (trIconSpecific != null) {
+ trIconSpecific.setCouleur(EbliLib.getAlphaColor(trIconSpecific.getCouleur(), alpha_));
+ }
}
// Les labels ont m\xEAme couleur que la courbe.
initLabelsTraceBox(trLigne.getCouleur());
@@ -541,16 +575,20 @@
}
}
}
+ final boolean useSpecific = trIconSpecific != null && useSpecific(i);
// Paint point
- if (iconeModel_.getType() != TraceIcon.RIEN) {
+ if (iconeModel_.getType() != TraceIcon.RIEN || (useSpecific && trIconSpecific.getType() != TraceIcon.RIEN)) {
if (displayTitleOnCurve_) {
if (rangeDisplayed == null) {
rangeDisplayed = new Envelope();
}
rangeDisplayed.expandToInclude(xi, yi);
}
- // icone_.couleur(getAspectContour());
- trIcon.paintIconCentre(_g, xie, yie);
+ if (useSpecific) {
+ trIconSpecific.paintIconCentre(_g, xie, yie);
+ } else {
+ trIcon.paintIconCentre(_g, xie, yie);
+ }
}
}
if ((i > 0) && model_.isSegmentDrawn(i - 1) && (xpVisible || xiVisible || _t.getXAxe().isContained(xpe, xie))) {
@@ -724,6 +762,10 @@
return iconeModel_;
}
+ public TraceIconModel getIconModelSpecific() {
+ return iconeModelSpecific_;
+ }
+
@Override
public int getIconWidth() {
return 24;
@@ -1121,6 +1163,20 @@
return r;
}
+ public boolean setIconeModelSpecific(TraceIconModel traceIconModel) {
+ boolean r = false;
+ if (iconeModelSpecific_ == null) {
+ r = true;
+ iconeModelSpecific_ = new TraceIconModel();
+ }
+ r = iconeModelSpecific_.updateData(traceIconModel);
+ if (r) {
+ fireCourbeAspectChanged(false);
+ super.firePropertyChange(EGCourbeConfigureTarget.SPECIFIC_ICON, null, iconeModelSpecific_);
+ }
+ return r;
+ }
+
public boolean setLigneMark(final TraceLigneModel _data) {
if (tLigneMarqueur_ == null) {
buildLigneMarqueur();
@@ -1327,4 +1383,4 @@
protected void paintLabelBox(final Graphics2D _g, int xBox, int yBox, String pLabel, final EGRepere _t, Rectangle view) {
tboxLabels_.paintBox(_g, xBox, yBox, pLabel, view);
}
-}
\ No newline at end of file
+}
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbeConfigureTarget.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbeConfigureTarget.java 2013-02-23 00:10:39 UTC (rev 8301)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbeConfigureTarget.java 2013-02-26 16:22:36 UTC (rev 8302)
@@ -29,6 +29,8 @@
public abstract class EGCourbeConfigureTarget implements /*BConfigurableSectionInterface, */ BSelecteurTargetInterface,
BConfigurableInterface {
+ public static final String SPECIFIC_ICON = "SPECIFIC_ICON";
+
public static class Display extends EGCourbeConfigureTarget {
public Display(final EGCourbe _target) {
@@ -37,31 +39,34 @@
@Override
public Object getProperty(final String _key) {
- if (_key == BSelecteurIconModel.DEFAULT_PROPERTY) {
+ if (BSelecteurIconModel.DEFAULT_PROPERTY.equals(_key)) {
return target_.getIconModel();
}
- if (_key == BSelecteurColorChooser.DEFAULT_PROPERTY) {
+ if (SPECIFIC_ICON.equals(_key)) {
+ return target_.getIconModelSpecific();
+ }
+ if (BSelecteurColorChooser.DEFAULT_PROPERTY.equals(_key)) {
return target_.getAspectContour();
}
- if (_key == BSelecteurLineModel.PROPERTY) {
+ if (BSelecteurLineModel.PROPERTY.equals(_key)) {
return target_.getLigneModel();
}
- if (_key == BSelecteurAlpha.DEFAULT_PROPERTY) {
+ if (BSelecteurAlpha.DEFAULT_PROPERTY.equals(_key)) {
return new Integer(target_.getAlpha());
}
- if (_key == PROP_DISPLAY_TITLE_CURVE) {
+ if (PROP_DISPLAY_TITLE_CURVE.equals(_key)) {
return Boolean.valueOf(target_.isDisplayTitleOnCurve());
}
- if (_key == PROP_DISPLAY_POINT_LABELS) {
+ if (PROP_DISPLAY_POINT_LABELS.equals(_key)) {
return Boolean.valueOf(target_.isDisplayPointLabels());
}
- if (_key == PROP_DISPLAY_VERTICAL_LABELS) {
+ if (PROP_DISPLAY_VERTICAL_LABELS.equals(_key)) {
return Boolean.valueOf(target_.isVerticalLabels());
}
- if (_key == BSelecteurReduitFonteNewVersion.PROPERTY) {
+ if (BSelecteurReduitFonteNewVersion.PROPERTY.equals(_key)) {
return target_.getFont();
}
- if (_key == EGCourbeConfigureTarget.PROP_NUAGE_POINTS) {
+ if (EGCourbeConfigureTarget.PROP_NUAGE_POINTS.equals(_key)) {
return target_.isNuagePoints();
}
@@ -70,31 +75,34 @@
@Override
public boolean setProperty(final String _key, final Object _newProp) {
- if (_key == BSelecteurIconModel.DEFAULT_PROPERTY) {
+ if (BSelecteurIconModel.DEFAULT_PROPERTY.equals(_key)) {
return target_.setIconeModel((TraceIconModel) _newProp);
}
- if (_key == BSelecteurColorChooser.DEFAULT_PROPERTY) {
+ if (SPECIFIC_ICON.equals(_key)) {
+ return target_.setIconeModelSpecific((TraceIconModel) _newProp);
+ }
+ if (BSelecteurColorChooser.DEFAULT_PROPERTY.equals(_key)) {
return target_.setAspectContour((Color) _newProp);
}
- if (_key == BSelecteurLineModel.PROPERTY) {
+ if (BSelecteurLineModel.PROPERTY.equals(_key)) {
return target_.setLigneType((TraceLigneModel) _newProp);
}
- if (_key == BSelecteurAlpha.DEFAULT_PROPERTY) {
+ if (BSelecteurAlpha.DEFAULT_PROPERTY.equals(_key)) {
return target_.setAlpha(((Integer) _newProp).intValue());
}
- if (_key == PROP_DISPLAY_TITLE_CURVE) {
+ if (PROP_DISPLAY_TITLE_CURVE.equals(_key)) {
return target_.setDisplayTitleOnCurve(((Boolean) _newProp).booleanValue());
}
- if (_key == PROP_DISPLAY_POINT_LABELS) {
+ if (PROP_DISPLAY_POINT_LABELS.equals(_key)) {
return target_.setDisplayPointLabels(((Boolean) _newProp).booleanValue());
}
- if (_key == PROP_DISPLAY_VERTICAL_LABELS) {
+ if (PROP_DISPLAY_VERTICAL_LABELS.equals(_key)) {
return target_.setVerticalLabels(((Boolean) _newProp).booleanValue());
}
- if (_key == BSelecteurReduitFonteNewVersion.PROPERTY) {
+ if (BSelecteurReduitFonteNewVersion.PROPERTY.equals(_key)) {
return target_.setFont((Font) _newProp);
}
- if (_key == EGCourbeConfigureTarget.PROP_NUAGE_POINTS) {
+ if (EGCourbeConfigureTarget.PROP_NUAGE_POINTS.equals(_key)) {
boolean value = ((Boolean) _newProp).booleanValue();
return target_.setNuagePointEtApplique(value);
@@ -105,7 +113,8 @@
@Override
public BSelecteurInterface[] createSelecteurs() {
- final BSelecteurInterface[] res = new BSelecteurInterface[9];
+ boolean useSpecific = target_.isUseSpecificIcon();
+ final BSelecteurInterface[] res = new BSelecteurInterface[useSpecific ? 10 : 9];
int idx = 0;
res[idx] = new BSelecteurColorChooserBt();
((BSelecteurColorChooserBt) res[idx]).setAddListenerToTarget(false);
@@ -113,6 +122,11 @@
res[idx++] = new BSelecteurAlpha();
res[idx++] = new BSelecteurLineModel();
res[idx++] = new BSelecteurIconModel();
+ if (useSpecific) {
+ final BSelecteurIconModel bSelecteurIconModel = new BSelecteurIconModel(SPECIFIC_ICON);
+ bSelecteurIconModel.setTitle(target_.getSpecificIconTitle());
+ res[idx++] = bSelecteurIconModel;
+ }
res[idx] = new BSelecteurCheckBox(PROP_NUAGE_POINTS);
((BSelecteurCheckBox) res[idx++]).setTitle(EbliLib.getS("Nuage de points"));
res[idx] = new BSelecteurCheckBox(PROP_DISPLAY_TITLE_CURVE);
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbeModelDefault.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbeModelDefault.java 2013-02-23 00:10:39 UTC (rev 8301)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbeModelDefault.java 2013-02-26 16:22:36 UTC (rev 8302)
@@ -79,6 +79,11 @@
y_ = CtuluLibArray.copy(_y);
}
+ @Override
+ public boolean useSpecificIcon(int idx) {
+ return false;
+ }
+
/**
* ACHTUNG: Constructeur uniquement utilis\xE9 pour la persistance des donn\xE9es.
*/
@@ -283,10 +288,8 @@
@Override
public boolean isGenerationSourceVisible() {
- return false;
+ return false;
}
-
-
@Override
public Object savePersistSpecificDatas() {
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersist.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersist.java 2013-02-23 00:10:39 UTC (rev 8301)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersist.java 2013-02-26 16:22:36 UTC (rev 8302)
@@ -56,6 +56,8 @@
TraceLigneModel tLigneMarqueur_;
@XStreamAlias("Icon")
TraceIconModel iconeModel;
+ @XStreamAlias("IconSpecific")
+ TraceIconModel iconeModelSpecific;
// -- data specifiques --//
@XStreamOmitField
Object dataSpecifiques;
@@ -119,10 +121,20 @@
return iconeModel;
}
+ public TraceIconModel getIconeModelSpecific() {
+ return iconeModelSpecific;
+ }
+
+
public void setIconeModel(TraceIconModel iconeModel) {
this.iconeModel = iconeModel;
}
+ public void setIconeModelSpecific(TraceIconModel iconeModelSpecific) {
+ this.iconeModelSpecific = iconeModelSpecific;
+ }
+
+
public List<EGCourbeMarqueur> getListeMarqueurs() {
return listeMarqueurs_;
}
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersistBuilder.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersistBuilder.java 2013-02-23 00:10:39 UTC (rev 8301)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersistBuilder.java 2013-02-26 16:22:36 UTC (rev 8302)
@@ -118,6 +118,11 @@
courbeToModify.setIconeModel(persist.iconeModel);
}
+ if (persist.iconeModelSpecific != null) {
+ courbeToModify.setIconeModelSpecific(persist.iconeModelSpecific);
+ }
+
+
courbeToModify.setNuagePoints(persist.nuagePoints);
if (persist.listeMarqueurs_ != null) {
@@ -177,6 +182,9 @@
res.tLigneMarqueur_ = new TraceLigneModel(courbe.getMarkLigneModel());
}
res.iconeModel = new TraceIconModel(courbe.getIconModel());
+ if (courbe.isUseSpecificIcon() && courbe.getIconModelSpecific() != null) {
+ res.iconeModelSpecific = new TraceIconModel(courbe.getIconModelSpecific());
+ }
final List<EGCourbeMarqueur> initMarqueurs = courbe.getMarqueurs();
if (initMarqueurs != null) {
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGModel.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGModel.java 2013-02-23 00:10:39 UTC (rev 8301)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGModel.java 2013-02-26 16:22:36 UTC (rev 8302)
@@ -236,7 +236,13 @@
* @param infos
*/
void restoreFromSpecificDatas(Object data, Map infos);
+
+ /**
+ *
+ * @param idx
+ * @return true if a specific icon must be used for this point
+ */
+ boolean useSpecificIcon(int idx);
-
}
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGModelDecoratorInverse.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGModelDecoratorInverse.java 2013-02-23 00:10:39 UTC (rev 8301)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGModelDecoratorInverse.java 2013-02-26 16:22:36 UTC (rev 8302)
@@ -7,8 +7,8 @@
import org.fudaa.ebli.palette.BPaletteInfo.InfoData;
/**
- * Decorator pour le EGModel, inverse les x et y de la courbe. utilise le design pattern decorator. permet de g\xE9rer sans trop de
- * d\xE9gat l'inversion des donn\xE9es.
+ * Decorator pour le EGModel, inverse les x et y de la courbe. utilise le design pattern decorator. permet de g\xE9rer sans trop de d\xE9gat l'inversion des
+ * donn\xE9es.
*
* @author Adrien Hadoux
*
@@ -27,6 +27,11 @@
}
@Override
+ public boolean useSpecificIcon(int idx) {
+ return instanceModele_.useSpecificIcon(idx);
+ }
+
+ @Override
public boolean addValue(double[] _x, double[] _y, CtuluCommandContainer _cmd) {
return instanceModele_.addValue(_y, _x, _cmd);
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGModelTransformed.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGModelTransformed.java 2013-02-23 00:10:39 UTC (rev 8301)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGModelTransformed.java 2013-02-26 16:22:36 UTC (rev 8302)
@@ -7,9 +7,8 @@
import org.fudaa.ebli.palette.BPaletteInfo.InfoData;
/**
- * Decorator pour le EGModel, permet de g\xE9rer sans trop de d\xE9gat des egmodel aux comportements diff\xE9rents. Utilise le
- * design pattern decorator.
- *
+ * Decorator pour le EGModel, permet de g\xE9rer sans trop de d\xE9gat des egmodel aux comportements diff\xE9rents. Utilise le design pattern decorator.
+ *
* @author Adrien Hadoux
*/
public class EGModelTransformed extends EGModelDecorator {
@@ -64,6 +63,11 @@
}
@Override
+ public boolean useSpecificIcon(int idx) {
+ return instanceModele_.useSpecificIcon(idx);
+ }
+
+ @Override
public double getXMax() {
return instanceModele_.getXMax();
}
@@ -150,19 +154,19 @@
@Override
public void viewGenerationSource(Map infos, CtuluUI impl) {
}
-
+
@Override
public boolean isGenerationSourceVisible() {
- return false;
+ return false;
}
@Override
public void replayData(EGGrapheModel model, Map infos, CtuluUI impl) {
}
-
+
@Override
public boolean isReplayable() {
- return false;
+ return false;
}
@Override
@@ -173,5 +177,4 @@
@Override
public void restoreFromSpecificDatas(Object data, Map infos) {
}
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-02-23 00:10:50
|
Revision: 8301
http://fudaa.svn.sourceforge.net/fudaa/?rev=8301&view=rev
Author: deniger
Date: 2013-02-23 00:10:39 +0000 (Sat, 23 Feb 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-mesh/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/GridProcessTaskModel.java
Modified: trunk/soft/fudaa-mesh/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/GridProcessTaskModel.java
===================================================================
--- trunk/soft/fudaa-mesh/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/GridProcessTaskModel.java 2013-02-23 00:10:08 UTC (rev 8300)
+++ trunk/soft/fudaa-mesh/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/GridProcessTaskModel.java 2013-02-23 00:10:39 UTC (rev 8301)
@@ -1,5 +1,19 @@
package org.fudaa.fudaa.meshviewer.gridprocess;
+import com.memoire.bu.BuBorderLayout;
+import com.memoire.bu.BuButton;
+import com.memoire.bu.BuCheckBox;
+import com.memoire.bu.BuComboBox;
+import com.memoire.bu.BuGridLayout;
+import com.memoire.bu.BuLabel;
+import com.memoire.bu.BuNumericValueValidator;
+import com.memoire.bu.BuPanel;
+import com.memoire.bu.BuResource;
+import com.memoire.bu.BuScrollPane;
+import com.memoire.bu.BuStringValidator;
+import com.memoire.bu.BuTextField;
+import com.memoire.bu.BuVerticalLayout;
+import com.memoire.fu.FuLog;
import java.awt.Color;
import java.awt.Component;
import java.awt.Dialog;
@@ -13,32 +27,15 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-
import javax.swing.BorderFactory;
import javax.swing.JButton;
+import javax.swing.JCheckBox;
import javax.swing.JComponent;
import javax.swing.JOptionPane;
import javax.swing.JTable;
import javax.swing.SwingUtilities;
import javax.swing.border.TitledBorder;
import javax.swing.filechooser.FileFilter;
-
-import com.memoire.bu.BuBorderLayout;
-import com.memoire.bu.BuButton;
-import com.memoire.bu.BuCheckBox;
-import com.memoire.bu.BuComboBox;
-import com.memoire.bu.BuGridLayout;
-import com.memoire.bu.BuLabel;
-import com.memoire.bu.BuNumericValueValidator;
-import com.memoire.bu.BuPanel;
-import com.memoire.bu.BuResource;
-import com.memoire.bu.BuScrollPane;
-import com.memoire.bu.BuStringValidator;
-import com.memoire.bu.BuTextField;
-import com.memoire.bu.BuVerticalLayout;
-import com.memoire.fu.FuLog;
-import javax.swing.JCheckBox;
-
import org.fudaa.ctulu.CtuluActivity;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluAnalyzeGroup;
@@ -635,6 +632,7 @@
maxDistanceToIgnore.setEnabled(false);
this.fileMng = new FSigWizardFileMng();
+ this.fileMng.getModel().setCsvFirstColonne(GISAttributeConstants.BATHY);
panel = new CtuluListEditorPanel(fileMng.getModel());
panel.setValueListCellEditor(new FileListCellEditor());
panel.setValueListCellRenderer(new FileListCellRenderer());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-02-23 00:10:28
|
Revision: 8300
http://fudaa.svn.sourceforge.net/fudaa/?rev=8300&view=rev
Author: deniger
Date: 2013-02-23 00:10:08 +0000 (Sat, 23 Feb 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderCsv.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardFileMng.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardFileModel.java
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderCsv.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderCsv.java 2013-02-22 23:35:17 UTC (rev 8299)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderCsv.java 2013-02-23 00:10:08 UTC (rev 8300)
@@ -11,50 +11,54 @@
*/
package org.fudaa.fudaa.sig.wizard;
-
+import com.memoire.bu.BuFileFilter;
import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
-
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluDoubleParser;
import org.fudaa.ctulu.CtuluIOOperationSynthese;
import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.gis.GISAttributeConstants;
+import org.fudaa.ctulu.gis.GISAttributeDouble;
import org.fudaa.ctulu.gis.GISAttributeInterface;
import org.fudaa.ctulu.gis.GISDataModelAttributeAdapter;
import org.fudaa.ctulu.gis.GISPoint;
+import org.fudaa.ctulu.gis.GISZoneCollectionPoint;
import org.fudaa.dodico.mesure.DodicoCsvReader;
import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.sig.FSigLib;
-import com.memoire.bu.BuFileFilter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import org.fudaa.ctulu.gis.GISZoneCollectionPoint;
-
/**
* @author Fred Deniger
* @version $Id: FSigFileLoaderCsv.java,v 1.2 2007-05-04 14:00:26 deniger Exp $
*/
public class FSigFileLoaderCsv implements FSigFileLoaderI {
-
+
final BuFileFilter ft_;
-
+ private GISAttributeDouble firstColonne;
+
public final Map getOptions() {
return options_;
}
-
+
public final void setOptions(final Map _options) {
options_ = _options;
}
+
+ void setFirstColonneAttribute(GISAttributeDouble csvFirstColonne) {
+ this.firstColonne = csvFirstColonne;
+ }
/**
* @author fred deniger
* @version $Id: FSigFileLoaderCsv.java,v 1.2 2007-05-04 14:00:26 deniger Exp $
*/
static final class CsvFileFilter extends BuFileFilter {
+
/**
* @param _filters
* @param _description
@@ -62,12 +66,12 @@
CsvFileFilter(String[] _filters, String _description) {
super(_filters, _description);
}
-
+
@Override
public boolean accept(final File _f) {
return _f != null;
}
-
+
@Override
public boolean accept(final File _d, final String _fn) {
return !new File(_fn).isDirectory();
@@ -79,20 +83,24 @@
* @version $Id: FSigFileLoaderCsv.java,v 1.2 2007-05-04 14:00:26 deniger Exp $
*/
public static class XYCsvReader extends DodicoCsvReader {
-
+
public XYCsvReader() {
setNumeric(false);
setBlankValid(true);
super.minValueByLine_ = 2;
}
-
+
@Override
public String[] getName() {
- if (reader_ == null) { return null; }
+ if (reader_ == null) {
+ return null;
+ }
String[] names = reader_.getName();
if (names == null) {
names = new String[reader_.getNbValues()];
- if (names.length < 2) { return null; }
+ if (names.length < 2) {
+ return null;
+ }
names[0] = "X";
names[1] = "Y";
for (int i = 2; i < names.length; i++) {
@@ -102,58 +110,58 @@
}
return reader_.getName();
}
-
+
public String containsError() {
final String[][] r = getPreview();
if (r == null || r.length == 0 || r[0].length < 2) {
return FSigLib.getS("Le fichier doit contenir 2 champs (X,Y) au minimum");
}
- if (colTypes_==null || colTypes_[0]==DodicoCsvReader.COL_TYPE_STRING ||
- colTypes_[1]==DodicoCsvReader.COL_TYPE_STRING ) {
+ if (colTypes_ == null || colTypes_[0] == DodicoCsvReader.COL_TYPE_STRING
+ || colTypes_[1] == DodicoCsvReader.COL_TYPE_STRING) {
return FSigLib.getS("Les champs (X,Y) doivent \xEAtre de type num\xE9rique");
}
return null;
}
-
+
@Override
protected String[][] internalRead() {
analyze_.clear();
final String[][] r = (String[][]) super.internalRead();
- String error=containsError();
- if (error!=null) {
+ String error = containsError();
+ if (error != null) {
analyze_.addFatalError(error);
return null;
}
return r;
}
-
}
-
+
public FSigFileLoaderCsv() {
- ft_ = new CsvFileFilter(new String[] { "txt", "csv", "*" }, FudaaLib.getS("Fichier csv"));
+ ft_ = new CsvFileFilter(new String[]{"txt", "csv", "*"}, FudaaLib.getS("Fichier csv"));
}
-
Map options_;
-
+
private FSigFileLoaderCsv(final BuFileFilter _ft) {
ft_ = _ft;
}
-
+
@Override
public FSigFileLoaderI createNew() {
- return new FSigFileLoaderCsv(ft_);
+ final FSigFileLoaderCsv fSigFileLoaderCsv = new FSigFileLoaderCsv(ft_);
+ fSigFileLoaderCsv.setFirstColonneAttribute(firstColonne);
+ return fSigFileLoaderCsv;
}
-
+
@Override
public BuFileFilter getFileFilter() {
return ft_;
}
-
+
@Override
public void setInResult(final FSigFileLoadResult _r, final File _f, String _fileOrigine, final ProgressionInterface _prog,
- final CtuluAnalyze _analyze) {
-
+ final CtuluAnalyze _analyze) {
+
// Lecture du fichier
final XYCsvReader reader = new XYCsvReader();
final CtuluDoubleParser parser = new CtuluDoubleParser();
@@ -165,30 +173,31 @@
_analyze.merge(op.getAnalyze());
return;
}
-
+
// Suppression des lignes invalides (X ou Y non Double) et conversion des
// String en Double pour les colonnes de ce type.
- String[][] vals=(String[][]) op.getSource();
- if (vals.length==0) return;
+ String[][] vals = (String[][]) op.getSource();
+ if (vals.length == 0) {
+ return;
+ }
- ArrayList[] lvals=new ArrayList[vals.length];
- for (int i=0; i<lvals.length; i++) {
- lvals[i]=new ArrayList(Arrays.asList(vals[i]));
+ ArrayList[] lvals = new ArrayList[vals.length];
+ for (int i = 0; i < lvals.length; i++) {
+ lvals[i] = new ArrayList(Arrays.asList(vals[i]));
}
- int[] colTypes=reader.getColTypes();
- for (int i=0; i<lvals.length; i++) {
+ int[] colTypes = reader.getColTypes();
+ for (int i = 0; i < lvals.length; i++) {
if (colTypes[i] == DodicoCsvReader.COL_TYPE_STRING) {
continue;
}
-
- for (int j=0; j < lvals[i].size(); ) {
+
+ for (int j = 0; j < lvals[i].size();) {
try {
- lvals[i].set(j,Double.parseDouble((String)lvals[i].get(j)));
+ lvals[i].set(j, Double.parseDouble((String) lvals[i].get(j)));
j++;
- }
- catch (NumberFormatException _exc) {
- for (int k=0; k < lvals.length; k++) {
+ } catch (NumberFormatException _exc) {
+ for (int k = 0; k < lvals.length; k++) {
lvals[k].remove(j);
}
}
@@ -196,44 +205,48 @@
}
// Cr\xE9ation des points
- final GISPoint[] pt=new GISPoint[lvals[0].size()];
- for (int i=0; i<pt.length; i++) {
- pt[i]=new GISPoint((Double) lvals[0].get(i), (Double) lvals[1].get(i), 0);
+ final GISPoint[] pt = new GISPoint[lvals[0].size()];
+ for (int i = 0; i < pt.length; i++) {
+ pt[i] = new GISPoint((Double) lvals[0].get(i), (Double) lvals[1].get(i), 0);
}
// Cr\xE9ation des attributs
- List<Object[]> attVals=new ArrayList<Object[]>();
-
- final String[] name=reader.getName();
- GISAttributeInterface[] att=new GISAttributeInterface[lvals.length - 2];
+ List<Object[]> attVals = new ArrayList<Object[]>();
+
+ final String[] name = reader.getName();
+ GISAttributeInterface[] att = new GISAttributeInterface[lvals.length - 2];
if (lvals.length > 2) { // On ne prend pas le x et le y
- for (int i=0; i < att.length; i++) {
- final int real=i + 2;
+ for (int i = 0; i < att.length; i++) {
+ final int real = i + 2;
+ if (i == 0 && firstColonne != null) {
+ att[i] = firstColonne;
+ attVals.add(lvals[real].toArray(new Double[0]));
+ continue;
+ }
if (colTypes[real] == DodicoCsvReader.COL_TYPE_STRING) {
- att[i]=_r.findOrCreateAttribute(name.length > real ? name[real]
- : "S_" + (i + 1), String.class, true);
+ att[i] = _r.findOrCreateAttribute(name.length > real ? name[real]
+ : "S_" + (i + 1), String.class, true);
attVals.add(lvals[real].toArray(new String[0]));
- }
- else {
- att[i]=_r.findOrCreateAttribute(name.length > real ? name[real]
- : "V_" + (i + 1), Double.class, true);
+ } else {
+ att[i] = _r.findOrCreateAttribute(name.length > real ? name[real]
+ : "V_" + (i + 1), Double.class, true);
attVals.add(lvals[real].toArray(new Double[0]));
}
}
_r.addUsedAttributes(att);
}
-
- GISZoneCollectionPoint zone=new GISZoneCollectionPoint();
+
+ GISZoneCollectionPoint zone = new GISZoneCollectionPoint();
zone.setAttributes(att, null);
zone.addAll(pt, attVals, null);
// Ajout de l'attribut ETAT_GEOM
_r.findOrCreateAttribute(GISAttributeConstants.ETAT_GEOM.getID(), String.class, false);
- GISDataModelAttributeAdapter adapter=new GISDataModelAttributeAdapter(zone);
+ GISDataModelAttributeAdapter adapter = new GISDataModelAttributeAdapter(zone);
adapter.addAttribut(GISAttributeConstants.ETAT_GEOM, _fileOrigine);
-
- _r.nbPoint_+=pt.length;
- _r.nbPointTotal_+=pt.length;
+
+ _r.nbPoint_ += pt.length;
+ _r.nbPointTotal_ += pt.length;
_r.pointModel_.add(adapter);
}
}
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardFileMng.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardFileMng.java 2013-02-22 23:35:17 UTC (rev 8299)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardFileMng.java 2013-02-23 00:10:08 UTC (rev 8300)
@@ -7,6 +7,9 @@
*/
package org.fudaa.fudaa.sig.wizard;
+import com.memoire.bu.BuComboBox;
+import com.memoire.bu.BuFileFilter;
+import com.memoire.fu.FuLog;
import java.awt.Color;
import java.awt.Frame;
import java.io.File;
@@ -17,14 +20,12 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-
import javax.swing.DefaultCellEditor;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JFileChooser;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
import javax.swing.table.TableCellEditor;
-
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.gis.GISAttributeConstants;
@@ -37,14 +38,10 @@
import org.fudaa.dodico.ef.io.trigrid.TrigridFileFormat;
import org.fudaa.dodico.rubar.io.RubarDATFileFormat;
import org.fudaa.dodico.rubar.io.RubarMAIFileFormat;
+import org.fudaa.fudaa.commun.FudaaPreferences;
import org.fudaa.fudaa.sig.FSigLib;
import org.geotools.data.FileDataStoreFactorySpi;
-import com.memoire.bu.BuComboBox;
-import com.memoire.bu.BuFileFilter;
-import com.memoire.fu.FuLog;
-import org.fudaa.fudaa.commun.FudaaPreferences;
-
/**
* @author Fred Deniger
* @version $Id$
@@ -56,6 +53,7 @@
* @version $Id$
*/
static final class FilterComparator implements Comparator {
+
@Override
public int compare(Object _o1, Object _o2) {
return ((BuFileFilter) _o1).getDescription().compareTo(((BuFileFilter) _o2).getDescription());
@@ -67,6 +65,7 @@
* @version $Id$
*/
static final class FmtRowRenderer extends CtuluCellTextRenderer {
+
@Override
protected void setValue(final Object _value) {
setForeground(_value == null ? Color.RED : Color.BLACK);
@@ -79,6 +78,7 @@
}
static final class FmtRowOrigineRenderer extends CtuluCellTextRenderer {
+
@Override
protected void setValue(final Object _value) {
setForeground(_value == null ? Color.RED : Color.BLACK);
@@ -86,27 +86,25 @@
setText(FSigLib.getS("Non d\xE9fini"));
} else {
String val = FSigLib.getS("Inconnu");
- if((String) _value == GISAttributeConstants.ATT_VAL_ETAT_ORIG)
+ if ((String) _value == GISAttributeConstants.ATT_VAL_ETAT_ORIG) {
val = FSigLib.getS("Origine");
- else if((String) _value == GISAttributeConstants.ATT_VAL_ETAT_MODI)
+ } else if ((String) _value == GISAttributeConstants.ATT_VAL_ETAT_MODI) {
val = FSigLib.getS("Modifi\xE9");
+ }
setText(val);
}
}
}
-
FSigWizardFileModel model_;
-
FSigFileLoadResult res_;
-
- /** Le file chooser pour tous les fichiers. En variable globale pour conserver la derniere op\xE9ration */
+ /**
+ * Le file chooser pour tous les fichiers. En variable globale pour conserver la derniere op\xE9ration
+ */
CtuluFileChooser fileChooser_;
-
public FSigWizardFileMng() {
model_ = buildFmt();
model_.addTableModelListener(new TableModelListener() {
-
@Override
public void tableChanged(final TableModelEvent _e) {
res_ = null;
@@ -192,40 +190,41 @@
/**
* Choisit un fichier a importer.
+ *
* @param _f Le nom du fichier en cas de modification de selection. Peut \xEAtre null.
* @param _frame Le frame parent.
* @return Le filtre et les fichiers selectionn\xE9s (null si pas de fichiers selectionn\xE9s).
*/
FSigWizardFileModel.FileSelectResult startEditingFile(final File _f, final Frame _frame) {
- if (fileChooser_==null) {
+ if (fileChooser_ == null) {
// Recup\xE9ration du dernier format de fichier sauvegard\xE9.
- String fltImport=FudaaPreferences.FUDAA.getStringProperty("filter.import");
- BuFileFilter lastFlt=null;
- fileChooser_=new CtuluFileChooser(true);
- for (int i=0; i<model_.filters_.length; i++) {
+ String fltImport = FudaaPreferences.FUDAA.getStringProperty("filter.import");
+ BuFileFilter lastFlt = null;
+ fileChooser_ = new CtuluFileChooser(true);
+ for (int i = 0; i < model_.filters_.length; i++) {
fileChooser_.addChoosableFileFilter(model_.filters_[i]);
if (model_.filters_[i].getShortDescription().equals(fltImport)) {
fileChooser_.setFileFilter(model_.filters_[i]);
- lastFlt=model_.filters_[i];
+ lastFlt = model_.filters_[i];
}
}
fileChooser_.setDialogType(JFileChooser.OPEN_DIALOG);
- fileChooser_.setFileFilter(lastFlt!=null ? lastFlt:fileChooser_.getAcceptAllFileFilter());
+ fileChooser_.setFileFilter(lastFlt != null ? lastFlt : fileChooser_.getAcceptAllFileFilter());
}
if (_f != null) {
fileChooser_.setSelectedFile(_f);
}
fileChooser_.setMultiSelectionEnabled(_f == null ? true : false);
final FSigWizardFileModel.FileSelectResult r = new FSigWizardFileModel.FileSelectResult();
- if (fileChooser_.showOpenDialog(_frame)==JFileChooser.APPROVE_OPTION) {
+ if (fileChooser_.showOpenDialog(_frame) == JFileChooser.APPROVE_OPTION) {
r.f_ = fileChooser_.getSelectedFiles();
- String fltImport="";
+ String fltImport = "";
if (r.f_ != null && (fileChooser_.getFileFilter() instanceof BuFileFilter)) {
r.ft_ = (BuFileFilter) fileChooser_.getFileFilter();
- fltImport=((BuFileFilter)fileChooser_.getFileFilter()).getShortDescription();
+ fltImport = ((BuFileFilter) fileChooser_.getFileFilter()).getShortDescription();
}
// Sauvegarde du format de fichier pour une prochaine ouverture.
- FudaaPreferences.FUDAA.putStringProperty("filter.import",fltImport);
+ FudaaPreferences.FUDAA.putStringProperty("filter.import", fltImport);
FudaaPreferences.FUDAA.writeIniFile();
}
return r;
@@ -246,7 +245,7 @@
public final CtuluCellTextRenderer getFmtRowRenderer() {
return new FmtRowRenderer();
}
-
+
public final TableCellEditor getFmtRowOrigineEditor() {
return GISAttributeConstants.ETAT_GEOM.getEditor().createTableEditorComponent();
}
@@ -281,6 +280,9 @@
}
String fileOrigine = origines.get(file.getName());
try {
+ if (model instanceof FSigFileLoaderCsv) {
+ ((FSigFileLoaderCsv) model).setFirstColonneAttribute(getModel().getCsvFirstColonne());
+ }
model.setInResult(res_, file, fileOrigine, _prog, _analyze);
} catch (final Exception _e) {
_analyze.addError(_e.getMessage(), -1);
@@ -290,5 +292,4 @@
}
return res_;
}
-
}
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardFileModel.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardFileModel.java 2013-02-22 23:35:17 UTC (rev 8299)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardFileModel.java 2013-02-23 00:10:08 UTC (rev 8300)
@@ -1,24 +1,23 @@
package org.fudaa.fudaa.sig.wizard;
+import com.memoire.bu.BuFileFilter;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
-
+import javax.swing.JFileChooser;
import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.ctulu.gis.GISAttributeConstants;
+import org.fudaa.ctulu.gis.GISAttributeDouble;
import org.fudaa.ctulu.gui.CtuluDialogPanel;
+import org.fudaa.ctulu.gui.CtuluFileChooser;
+import org.fudaa.ctulu.gui.CtuluLibSwing;
import org.fudaa.ctulu.gui.CtuluListEditorModel;
import org.fudaa.fudaa.commun.impl.FudaaImportCsvPanel;
import org.fudaa.fudaa.sig.FSigLib;
-import com.memoire.bu.BuFileFilter;
-import javax.swing.JFileChooser;
-import org.fudaa.ctulu.gui.CtuluFileChooser;
-import org.fudaa.ctulu.gui.CtuluLibSwing;
-
/**
* Le modele gerant le fichier.
- *
+ *
* @author Fred Deniger
* @version $Id: FSigWizardFileModel.java,v 1.2 2007-04-30 14:22:39 deniger Exp $
*/
@@ -29,29 +28,24 @@
* @version $Id: FSigWizardFileModel.java,v 1.2 2007-04-30 14:22:39 deniger Exp $
*/
protected final static class FileSelectResult {
+
File[] f_;
-
BuFileFilter ft_;
}
-
final Map fileData_;
-
final Map fmtLoader_;
-
final BuFileFilter[] filters_;
-
final BuFileFilter csv_;
-
// Association entre le nom du fichier et son \xE9tat (d'origine ou non)
private HashMap<String, String> origines_;
/**
* @return Une HashMap Associant le nom du fichier et son \xE9tat (d'origine ou non)
*/
- public HashMap<String, String> getOrigines(){
+ public HashMap<String, String> getOrigines() {
return origines_;
}
-
+
protected FSigFileLoaderI createModel(final BuFileFilter _f) {
if (_f == null) {
return null;
@@ -92,7 +86,17 @@
super.addElement(_o);
}
}
+ private GISAttributeDouble csvFirstColonne;
+ public void setCsvFirstColonne(GISAttributeDouble csvFirstColonne) {
+ this.csvFirstColonne = csvFirstColonne;
+ }
+
+ public GISAttributeDouble getCsvFirstColonne() {
+ return csvFirstColonne;
+ }
+
+
public void addFiles(final FSigWizardFileModel.FileSelectResult _r, final int _i) {
if (_r.f_ != null && _r.f_.length > 0) {
if (_r.ft_ == null) {
@@ -109,9 +113,9 @@
boolean modifyData = false;
if (!fileData_.containsKey(_r.f_[i])) {
modifyData = true;
- if (_i >= 0)
+ if (_i >= 0) {
super.add(_i, _r.f_[i]);
- else {
+ } else {
super.addElement(_r.f_[i]);
super.getRowCount();
}
@@ -121,6 +125,7 @@
if (modifyData || !((FSigFileLoaderI) fileData_.get(_r.f_[i])).getFileFilter().equals(_r.ft_)) {
if (isCsv) {
final FSigFileLoaderCsv csv = (FSigFileLoaderCsv) createModel(csv_);
+ csv.setFirstColonneAttribute(csvFirstColonne);
csv.setOptions(options);
fileData_.put(_r.f_[i], csv);
} else {
@@ -139,16 +144,16 @@
@Override
public String getColumnName(final int _column) {
switch (_column) {
- case 0:
- return FSigLib.getS("N\xB0");
- case 1:
- return FSigLib.getS("Fichier");
- case 2:
- return FSigLib.getS("Format");
- case 3:
- return FSigLib.getS(GISAttributeConstants.ETAT_GEOM.getName());
- default:
- return CtuluLibString.EMPTY_STRING;
+ case 0:
+ return FSigLib.getS("N\xB0");
+ case 1:
+ return FSigLib.getS("Fichier");
+ case 2:
+ return FSigLib.getS("Format");
+ case 3:
+ return FSigLib.getS(GISAttributeConstants.ETAT_GEOM.getName());
+ default:
+ return CtuluLibString.EMPTY_STRING;
}
}
@@ -167,7 +172,6 @@
public boolean isCellEditable(final int _rowIndex, final int _columnIndex) {
return _columnIndex > 0;
}
-
CtuluFileChooser fileChooser;
@Override
@@ -178,14 +182,16 @@
fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
fileChooser.setMultiSelectionEnabled(false);
final int r = fileChooser.showOpenDialog(CtuluLibSwing.getActiveWindow());
- if (r == JFileChooser.APPROVE_OPTION) { return fileChooser.getSelectedFile(); }
+ if (r == JFileChooser.APPROVE_OPTION) {
+ return fileChooser.getSelectedFile();
+ }
return null;
}
@Override
public void setValueAt(final Object _value, final int _rowIndex, final int _columnIndex) {
if (_columnIndex == 3) {
- origines_.put(((File) super.getValueAt(_rowIndex, 1)).getName(), (String)_value);
+ origines_.put(((File) super.getValueAt(_rowIndex, 1)).getName(), (String) _value);
}
if (_columnIndex == 2) {
final FSigFileLoaderI loader = (FSigFileLoaderI) fileData_.get(getValueAt(_rowIndex));
@@ -224,21 +230,22 @@
public static Map loadCsv(final File _f) {
final FSigFileLoaderCsv.XYCsvReader reader = new FSigFileLoaderCsv.XYCsvReader();
final FudaaImportCsvPanel pn = new FudaaImportCsvPanel(_f, false) {
-
@Override
public boolean isDataValid() {
reader.initFromOption(buildOption());
final String res = reader.containsError();
- if (res!=null) {
+ if (res != null) {
setErrorText(res);
}
- return res==null;
+ return res == null;
}
};
reader.setNumeric(false);
pn.setReader(reader);
- if (CtuluDialogPanel.isOkResponse(pn.afficheModale(CtuluLibSwing.getActiveWindow()))) { return pn.buildOption(); }
+ if (CtuluDialogPanel.isOkResponse(pn.afficheModale(CtuluLibSwing.getActiveWindow()))) {
+ return pn.buildOption();
+ }
return null;
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-02-22 23:35:25
|
Revision: 8299
http://fudaa.svn.sourceforge.net/fudaa/?rev=8299&view=rev
Author: deniger
Date: 2013-02-22 23:35:17 +0000 (Fri, 22 Feb 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluImageContainer.java
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluImageContainer.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluImageContainer.java 2013-02-22 23:34:47 UTC (rev 8298)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluImageContainer.java 2013-02-22 23:35:17 UTC (rev 8299)
@@ -7,6 +7,7 @@
*/
package org.fudaa.ctulu;
+import com.memoire.fu.FuLog;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.RenderingHints;
@@ -14,25 +15,21 @@
import java.io.File;
import java.io.IOException;
import java.lang.ref.SoftReference;
-
import javax.imageio.ImageIO;
import javax.imageio.ImageReadParam;
import javax.imageio.ImageReader;
import javax.imageio.ImageWriter;
-import com.memoire.fu.FuLog;
-
-
/**
- * Un container d'image. Utilise des caches d'images (snapshots) pour des
- * repr\xE9sentations zoom\xE9es.
- *
+ * Un container d'image. Utilise des caches d'images (snapshots) pour des repr\xE9sentations zoom\xE9es.
+ *
* @author fred deniger
* @version $Id: CtuluImageContainer.java,v 1.8 2007-04-20 16:20:19 deniger Exp $
*/
public class CtuluImageContainer {
public static class Snapshot {
+
SoftReference<BufferedImage> bigSnapshot_;
final int defaultBigSnapshotSize_ = 512;
final int defaultSnapshotSize_ = 256;
@@ -42,20 +39,23 @@
private float ratioSnapshot_;
BufferedImage snapshot_;
final CtuluImageContainer src_;
- /** Si true, utilisation d'un big cache */
+ /**
+ * Si true, utilisation d'un big cache
+ */
final boolean useBigSnapshot_;
-
File tmpBigSnapshot_;
public Snapshot(final CtuluImageContainer _src, boolean _useBigSnapshot) {
super();
src_ = _src;
- useBigSnapshot_=_useBigSnapshot;
+ useBigSnapshot_ = _useBigSnapshot;
// createBigSnapshot();
}
synchronized void createBigSnapshot() {
- if (!useBigSnapshot_) return;
+ if (!useBigSnapshot_) {
+ return;
+ }
new Thread() {
@Override
public void run() {
@@ -226,19 +226,13 @@
public float getRatioBigSnapshot() {
return ratioBigSnapshot_;
}
-
}
-
final File file_;
-
final int h_;
final int imageIdx_ = 0;
final ImageReader reader_;
-
final Snapshot snapshot_;
-
final int tileSize_ = 512;
-
final int w_;
public CtuluImageContainer(final File _file) {
@@ -246,14 +240,13 @@
}
public CtuluImageContainer(final ImageReader _reader, final File _f) {
- this(_reader, _f,true);
+ this(_reader, _f, true);
}
/**
- * Cree le container avec ou sans bigSnapshot. Le bigSnapshot \xE9tant cr\xE9e dans un thread
- * s\xE9par\xE9, cela peut poser probl\xE8me si on accede \xE0 l'image en m\xEAme temps que le thread
- * de cr\xE9ation.
- *
+ * Cree le container avec ou sans bigSnapshot. Le bigSnapshot \xE9tant cr\xE9e dans un thread s\xE9par\xE9, cela peut poser probl\xE8me si on accede \xE0 l'image en
+ * m\xEAme temps que le thread de cr\xE9ation.
+ *
* @param _reader Le reader associ\xE9 \xE0 l'image.
* @param _f Le fichier image.
* @param _useBigSnapshot True : Creation d'un big snapshot (d\xE9faut)
@@ -287,7 +280,9 @@
}
private boolean canUseSmallSnapshot(final float _ratioX, final float _ratioY) {
- if (snapshot_ == null) return false;
+ if (snapshot_ == null) {
+ return false;
+ }
return canUseSnapshot(snapshot_.getSmallSnapshot(), snapshot_.getRatioSnapshot(), _ratioX, _ratioY);
}
@@ -296,7 +291,7 @@
}
private boolean canUseSnapshot(final BufferedImage _im, final float _ratioSnap, final float _ratioX,
- final float _ratioY) {
+ final float _ratioY) {
return _im != null && _ratioSnap > 0 && _ratioX <= _ratioSnap && _ratioY <= _ratioSnap;
}
@@ -309,10 +304,10 @@
}
private BufferedImage getImageFromSnapshot(final float _ratioX, final float _ratioY, final Rectangle _source,
- final float _ratioSnap, final BufferedImage _imSnap) {
+ final float _ratioSnap, final BufferedImage _imSnap) {
BufferedImage res;
res = new BufferedImage((int) Math.ceil(_source.width * _ratioX), (int) Math.ceil(_source.height * _ratioY),
- BufferedImage.TYPE_INT_ARGB);
+ BufferedImage.TYPE_INT_ARGB);
final Graphics2D g2d = res.createGraphics();
g2d.getRenderingHints().put(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
final int xInSnapshot = (int) Math.floor(_source.x * _ratioSnap);
@@ -336,13 +331,13 @@
final int nbYTiled = (int) Math.ceil(CtuluLibImage.getRatio(_source.height, tileSize_));
final Rectangle r = new Rectangle();
res = new BufferedImage((int) Math.ceil(_source.width * _ratioX), (int) Math.ceil(_source.height * _ratioY),
- BufferedImage.TYPE_INT_ARGB);
+ BufferedImage.TYPE_INT_ARGB);
final Graphics2D g2d = res.createGraphics();
// on am\xE9liore la qualit\xE9 si l'image n'est pas trop r\xE9duite
if (_ratioX > 0.8 || _ratioY > 0.8) {
g2d.getRenderingHints().put(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
g2d.getRenderingHints().put(RenderingHints.KEY_ALPHA_INTERPOLATION,
- RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
+ RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
} else {
g2d.getRenderingHints().put(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
}
@@ -356,9 +351,9 @@
try {
final BufferedImage tmp = reader_.read(imageIdx_, params);
g2d.drawImage(tmp, (int) Math.floor(i * tileSize_ * _ratioX), (int) Math.floor(j * tileSize_ * _ratioY),
- (int) Math.ceil(r.width * _ratioX), (int) Math.ceil(r.height * _ratioY), null);
+ (int) Math.ceil(r.width * _ratioX), (int) Math.ceil(r.height * _ratioY), null);
tmp.flush();
- } catch (final IOException _evt) {
+ } catch (final Exception _evt) {
FuLog.error(_evt);
}
@@ -412,10 +407,10 @@
}
public BufferedImage getImage(final Rectangle _source, final float _ratioX, final float _ratioY,
- final boolean _useSnapshot) {
+ final boolean _useSnapshot) {
final Rectangle source = new Rectangle(_source);
- source.width = Math.min(source.width, w_ - source.x);
- source.height = Math.min(source.height, h_ - source.y);
+ source.width = Math.max(1, Math.min(source.width, w_ - source.x));
+ source.height = Math.max(1, Math.min(source.height, h_ - source.y));
BufferedImage res = null;
if (_useSnapshot && canUseSmallSnapshot(_ratioX, _ratioY)) {
res = createFromSmallSnapshot(_ratioX, _ratioY, source);
@@ -449,7 +444,7 @@
/**
* Dessine l'image de pr\xE9visualisation dans un carr\xE9 de _w, _h en centrant l'image.
- *
+ *
* @param _dest le graphics a utilse
* @param _w la largeur disponible
* @param _h la hauteur disponible
@@ -474,5 +469,4 @@
snapshot_.resetCache();
}
}
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-02-22 23:30:12
|
Revision: 8297
http://fudaa.svn.sourceforge.net/fudaa/?rev=8297&view=rev
Author: deniger
Date: 2013-02-22 23:30:04 +0000 (Fri, 22 Feb 2013)
Log Message:
-----------
Removed Paths:
-------------
trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/dao/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-02-22 21:51:17
|
Revision: 8296
http://fudaa.svn.sourceforge.net/fudaa/?rev=8296&view=rev
Author: deniger
Date: 2013-02-22 21:51:09 +0000 (Fri, 22 Feb 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISAttribute.java
Modified: trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISAttribute.java
===================================================================
--- trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISAttribute.java 2013-02-22 21:38:31 UTC (rev 8295)
+++ trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISAttribute.java 2013-02-22 21:51:09 UTC (rev 8296)
@@ -202,6 +202,7 @@
String id;
public void setID(String id) {
+ this.id = id;
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-02-22 21:38:42
|
Revision: 8295
http://fudaa.svn.sourceforge.net/fudaa/?rev=8295&view=rev
Author: deniger
Date: 2013-02-22 21:38:31 +0000 (Fri, 22 Feb 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISAttribute.java
Modified: trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISAttribute.java
===================================================================
--- trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISAttribute.java 2013-02-22 21:22:16 UTC (rev 8294)
+++ trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISAttribute.java 2013-02-22 21:38:31 UTC (rev 8295)
@@ -9,7 +9,6 @@
import java.util.Arrays;
import java.util.Comparator;
-
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.ctulu.collection.CtuluCollection;
@@ -29,7 +28,6 @@
boolean isUserVisible_ = true;
Object userData_;
-
/**
* Construction d'un attribut non atomique et anonyme.
*
@@ -178,7 +176,7 @@
@Override
public boolean isSameContent(final GISAttributeInterface _att) {
- return _att != null && isAtomic_ == _att.isAtomicValue() && name_.equals(_att.getName())
+ return _att != null && isAtomic_ == _att.isAtomicValue() && getID().equals(_att.getID())
&& getDataClass().equals(_att.getDataClass()) && CtuluLib.isEquals(userData_, _att.getUserData());
}
@@ -201,10 +199,14 @@
public CtuluValueEditorI getEditor() {
return editor_;
}
+ String id;
+ public void setID(String id) {
+ }
+
@Override
public String getID() {
- return name_;
+ return id == null ? name_ : id;
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-02-22 21:22:24
|
Revision: 8294
http://fudaa.svn.sourceforge.net/fudaa/?rev=8294&view=rev
Author: deniger
Date: 2013-02-22 21:22:16 +0000 (Fri, 22 Feb 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java
Modified: trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java
===================================================================
--- trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java 2013-02-22 15:59:22 UTC (rev 8293)
+++ trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java 2013-02-22 21:22:16 UTC (rev 8294)
@@ -11,12 +11,15 @@
*/
package org.fudaa.ctulu.gis.gml;
+import com.memoire.fu.FuLog;
+import com.vividsolutions.jts.geom.Geometry;
import gnu.trove.TIntArrayList;
import gnu.trove.TObjectIntHashMap;
-
import java.io.IOException;
import java.io.OutputStream;
-
+import java.util.Date;
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluActivity;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.ProgressionUpdater;
@@ -24,6 +27,8 @@
import org.fudaa.ctulu.gis.GISAttributeDouble;
import org.fudaa.ctulu.gis.GISAttributeInterface;
import org.fudaa.ctulu.gis.GISAttributeModel;
+import org.fudaa.ctulu.gis.GISDataModel;
+import org.fudaa.ctulu.gis.GISDataModelFeatureAdapter;
import org.fudaa.ctulu.gis.GISLib;
import org.fudaa.ctulu.gis.GISZoneCollection;
import org.geotools.data.DataStore;
@@ -38,15 +43,6 @@
import org.geotools.feature.SchemaException;
import org.geotools.feature.type.BasicFeatureTypes;
-import org.fudaa.ctulu.gis.GISDataModel;
-
-import com.memoire.fu.FuLog;
-import com.vividsolutions.jts.geom.Geometry;
-import java.util.Date;
-import org.apache.commons.lang.ObjectUtils;
-import org.apache.commons.lang.StringUtils;
-import org.fudaa.ctulu.gis.GISDataModelFeatureAdapter;
-
/**
* @author Fred Deniger
* @version $Id: GISGMLZoneExporter.java,v 1.1.6.1 2008-03-28 14:59:28 bmarchan Exp $
@@ -144,6 +140,22 @@
process(_prog, _zone, _attIsZ);
}
+ public void processStore(final ProgressionInterface _prog, final GISDataModel _zone,
+ final DataStore _dest)
+ throws IOException, SchemaException, IllegalAttributeException {
+ out_ = null;
+ store_ = _dest;
+ process(_prog, _zone, null, _dest);
+ }
+
+ public void process(final ProgressionInterface _prog, final GISZoneCollection _zone, final DataStore _dest) throws IOException,
+ SchemaException, IllegalAttributeException {
+ out_ = null;
+ store_ = _dest;
+ _zone.prepareExport();
+ process(_prog, _zone, _zone.getAttributeIsZ());
+ }
+
/**
* Attention: l'outputstream n'est pas ferme.
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-02-22 15:59:34
|
Revision: 8293
http://fudaa.svn.sourceforge.net/fudaa/?rev=8293&view=rev
Author: deniger
Date: 2013-02-22 15:59:22 +0000 (Fri, 22 Feb 2013)
Log Message:
-----------
correction tests unitaires
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluExprGUI.java
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluExprGUI.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluExprGUI.java 2013-02-22 07:33:37 UTC (rev 8292)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluExprGUI.java 2013-02-22 15:59:22 UTC (rev 8293)
@@ -7,6 +7,7 @@
*/
package org.fudaa.ctulu.editor;
+import com.memoire.bu.*;
import java.awt.Color;
import java.awt.Component;
import java.awt.LayoutManager;
@@ -21,7 +22,6 @@
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-
import javax.swing.AbstractListModel;
import javax.swing.ComboBoxModel;
import javax.swing.DefaultListCellRenderer;
@@ -34,15 +34,11 @@
import javax.swing.event.ListSelectionListener;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.DefaultTableCellRenderer;
-
-import org.nfunk.jep.Variable;
-
-import com.memoire.bu.*;
-
import org.fudaa.ctulu.CtuluExpr;
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.ctulu.table.CtuluTable;
+import org.nfunk.jep.Variable;
/**
* @author Fred Deniger
@@ -67,41 +63,41 @@
InfoUpdater(final BuLabel _lb) {
lb_ = _lb;
}
-
+
public void updateCst() {
Variable v = null;
if (!cstSelected_.isSelectionEmpty()) {
v = (Variable) cstModel_.getElementAt(cstSelected_.getMaxSelectionIndex());
-
+
}
updateTxt(v);
}
-
+
public void updateVar() {
Variable v = null;
if (!varSelected_.isSelectionEmpty()) {
v = (Variable) model_.getElementAt(varSelected_.getMaxSelectionIndex());
-
+
}
updateTxt(v);
}
-
+
@Override
public void valueChanged(final ListSelectionEvent _e) {
-
+
if (_e.getSource() == cstSelected_) {
updateCst();
}
if (_e.getSource() == varSelected_) {
updateVar();
}
-
+
}
-
+
private void updateTxt(final Variable _v) {
String txt = CtuluLibString.ESPACE;
if (_v != null) {
-
+
final String name = _v.getName();
if (expr_.containsDescFor(name)) {
txt = name + ": " + expr_.getDesc(name);
@@ -112,14 +108,14 @@
lb_.setText(txt);
}
}
-
+
class ValueTableModel extends AbstractTableModel {
-
+
protected void fireChanged() {
super.fireTableRowsDeleted(0, getRowCount());
super.fireTableRowsInserted(0, getRowCount());
}
-
+
@Override
public Class getColumnClass(final int _columnIndex) {
if (_columnIndex == 0) {
@@ -127,22 +123,22 @@
}
return Double.class;
}
-
+
@Override
public int getColumnCount() {
return 2;
}
-
+
@Override
public String getColumnName(final int _column) {
return CtuluLibString.ESPACE;
}
-
+
@Override
public int getRowCount() {
return varToSet_ == null ? 0 : varToSet_.length;
}
-
+
@Override
public Object getValueAt(final int _rowIndex, final int _columnIndex) {
if (_columnIndex == 0) {
@@ -150,12 +146,12 @@
}
return varToSet_[_rowIndex].getValue();
}
-
+
@Override
public boolean isCellEditable(final int _rowIndex, final int _columnIndex) {
return _columnIndex == 1;
}
-
+
@Override
public void setValueAt(final Object _value, final int _rowIndex, final int _columnIndex) {
if (_value == null || _value.equals(varToSet_[_rowIndex].getValue())) {
@@ -165,35 +161,35 @@
clearResult();
}
}
-
+
private static final class VariableModel extends AbstractListModel implements ComboBoxModel {
-
+
final List l_;
Object selected_;
-
+
VariableModel(final List _l) {
l_ = _l;
}
-
+
protected void fireAllChanged() {
super.fireIntervalAdded(this, 0, getSize());
}
-
+
@Override
public Object getElementAt(final int _index) {
return l_.get(_index);
}
-
+
@Override
public Object getSelectedItem() {
return selected_;
}
-
+
@Override
public int getSize() {
return l_.size();
}
-
+
@Override
public void setSelectedItem(final Object _anItem) {
if (selected_ != _anItem) {
@@ -202,9 +198,9 @@
}
}
}
-
+
class VarRenderer extends DefaultListCellRenderer {
-
+
@Override
public Component getListCellRendererComponent(final JList _list, final Object _value, final int _index,
final boolean _isSelected, final boolean _cellHasFocus) {
@@ -232,9 +228,9 @@
return c;
}
}
-
+
static class TableCellRenderer extends DefaultTableCellRenderer {
-
+
@Override
public Component getTableCellRendererComponent(final JTable _table, final Object _value, final boolean _isSelected,
final boolean _hasFocus, final int _row, final int _column) {
@@ -252,7 +248,7 @@
* @version $Id: CtuluExprGUI.java,v 1.9 2006-09-19 14:36:55 deniger Exp $
*/
public static class VariableComparator implements Comparator {
-
+
@Override
public int compare(final Object _o1, final Object _o2) {
if (_o1 == _o2) {
@@ -325,7 +321,7 @@
add(top);
final BuLabel lb = new BuLabel(CtuluLibString.ESPACE);
add(lb);
-
+
var = new BuPanel(lay);
var.add(new BuLabel(CtuluLib.getS("Constantes")));
listCst.setVisibleRowCount(3);
@@ -351,7 +347,7 @@
scroll.setPreferredHeight(prefH);
var.add(scroll);
top.add(var);
-
+
txt_ = new BuTextArea();
txt_.getDocument().addDocumentListener(this);
txt_.setColumns(30);
@@ -397,26 +393,26 @@
@Override
public void focusLost(final FocusEvent _e) {
}
-
+
@Override
public void focusGained(final FocusEvent _e) {
listener.updateVar();
-
+
}
});
listCst.addFocusListener(new FocusListener() {
@Override
public void focusLost(final FocusEvent _e) {
}
-
+
@Override
public void focusGained(final FocusEvent _e) {
listener.updateCst();
-
+
}
});
}
-
+
private void initFctList(final BuEmptyList _listFct) {
_listFct.setVisibleRowCount(3);
_listFct.setModel(fctModel_);
@@ -430,7 +426,7 @@
}
});
}
-
+
private void initCstVar(final BuEmptyList _listVar, final BuEmptyList _listCst) {
_listVar.addMouseListener(new MouseAdapter() {
@Override
@@ -451,25 +447,31 @@
_listVar.setModel(model_);
_listCst.setModel(cstModel_);
}
-
+
public boolean isExprValide() {
if (btValid_.isEnabled()) {
valideExpr();
}
return isValid_;
}
-
+
public BuTextArea getTxtArea() {
return txt_;
}
-
+
private void updateBt() {
btValid_.setEnabled(true);
if (btEvaluate_ != null) {
btEvaluate_.setEnabled(true);
}
}
-
+
+ public void setError(String msg) {
+ txtError_.setForeground(Color.RED);
+ txtError_.setToolTipText(msg);
+ txtError_.setText(msg);
+ }
+
public final void valideExpr() {
expr_.getParser().parseExpression(getExprText());
isValid_ = !expr_.getParser().hasError();
@@ -478,8 +480,7 @@
txtError_.setText(CtuluLib.getS("Valide"));
txtError_.setToolTipText(txtError_.getText());
} else {
- txtError_.setForeground(Color.RED);
- txtError_.setText(expr_.getParser().getError(0)
+ setError(expr_.getParser().getError(0)
+ (expr_.getParser().getNbError() > 0 ? "..." : CtuluLibString.EMPTY_STRING));
txtError_.setToolTipText(expr_.getParser().getHtmlError());
}
@@ -496,16 +497,16 @@
varToSet_ = newVar;
tModel_.fireChanged();
}
-
+
expr_.findUsedVar();
}
-
+
protected void clearResult() {
if (tfResult_ != null) {
tfResult_.setText(CtuluLibString.EMPTY_STRING);
}
}
-
+
String containsNullValue() {
final StringBuffer buf = new StringBuffer();
boolean aie = false;
@@ -522,7 +523,7 @@
}
return aie ? buf.toString() : null;
}
-
+
@Override
public void actionPerformed(final ActionEvent _e) {
if (_e.getSource() == btValid_) {
@@ -551,7 +552,7 @@
}
}
}
-
+
protected void insertFct() {
txt_.insert(fctModel_.getElementAt(fctSelected_.getMaxSelectionIndex()) + "(", txt_.getCaretPosition());
final int pos = txt_.getCaretPosition();
@@ -559,33 +560,37 @@
txt_.setCaretPosition(pos);
txt_.requestFocus();
}
-
+
+ public void setButtonValidVisible(boolean b) {
+ btValid_.setVisible(b);
+ }
+
protected void insertVar(final VariableModel _var, final ListSelectionModel _select) {
txt_.insert(((Variable) _var.getElementAt(_select.getMaxSelectionIndex())).getName(), txt_.getCaretPosition());
txt_.requestFocus();
}
-
+
@Override
public void changedUpdate(final DocumentEvent _e) {
updateBt();
}
-
+
public final CtuluExpr getExpr() {
return expr_;
}
-
+
public String getExprText() {
String txt = txt_.getText();
txt = txt.replace('\r', ' ');
txt = txt.replace('\n', ' ');
return txt;
}
-
+
@Override
public void insertUpdate(final DocumentEvent _e) {
updateBt();
}
-
+
@Override
public void removeUpdate(final DocumentEvent _e) {
updateBt();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-02-22 07:33:45
|
Revision: 8292
http://fudaa.svn.sourceforge.net/fudaa/?rev=8292&view=rev
Author: deniger
Date: 2013-02-22 07:33:37 +0000 (Fri, 22 Feb 2013)
Log Message:
-----------
correction tests unitaires
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportService.java
trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/FormuleContentServiceUpdaterTest.java
trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/AbstracTestWithScenarioTest.java
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportService.java 2013-02-21 22:02:30 UTC (rev 8291)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportService.java 2013-02-22 07:33:37 UTC (rev 8292)
@@ -34,7 +34,6 @@
private final Result<EMHScenario> resultat;
protected InstanceContent dynamicContent = new InstanceContent();
protected Lookup lookup = new AbstractLookup(dynamicContent);
-
private ReportTimeFormatter reportTimeFormatter;
private final ReportRunKey currentRunKey = new ReportRunKey();
@@ -90,6 +89,7 @@
public void unloadCurrentRun() {
ReportRunContent run = getRunCourant();
if (run != null) {
+ new Throwable().printStackTrace();
postRunService.unloadRun();
dynamicContent.remove(run);
ModeleResultatTimeKeyContent timeContent = getTimeContent();
Copied: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/AbstracTestWithScenarioTest.java (from rev 8289, trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/AbstracTestWithScenarioTest.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/AbstracTestWithScenarioTest.java 2013-02-22 07:33:37 UTC (rev 8292)
@@ -0,0 +1,33 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.crue.report;
+
+import java.io.File;
+import org.fudaa.ctulu.CtuluLibFile;
+import org.fudaa.fudaa.crue.report.service.ReportService;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.openide.util.Lookup;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public abstract class AbstracTestWithScenarioTest {
+
+ static File toDelete;
+ static ReportService reportService = Lookup.getDefault().lookup(ReportService.class);
+
+ @BeforeClass
+ public static void beforeTest() {
+ if (!reportService.isRunLoaded()) {
+ toDelete = ReportTestHelper.readScenario().second;
+ }
+ }
+
+ @AfterClass
+ public static void afterTest() {
+ CtuluLibFile.deleteDir(toDelete);
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/FormuleContentServiceUpdaterTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/FormuleContentServiceUpdaterTest.java 2013-02-21 22:02:30 UTC (rev 8291)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/FormuleContentServiceUpdaterTest.java 2013-02-22 07:33:37 UTC (rev 8292)
@@ -3,40 +3,24 @@
*/
package org.fudaa.fudaa.crue.report.formule;
-import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.ctulu.CtuluLogGroupResult;
import org.fudaa.dodico.crue.common.transformer.TransformerHelper;
-import org.fudaa.fudaa.crue.report.ReportTestHelper;
-import org.junit.AfterClass;
+import org.fudaa.fudaa.crue.report.AbstracTestWithScenarioTest;
import org.junit.Test;
import static org.junit.Assert.*;
-import org.junit.BeforeClass;
/**
*
* @author Frederic Deniger
*/
-public class FormuleContentServiceUpdaterTest {
+public class FormuleContentServiceUpdaterTest extends AbstracTestWithScenarioTest {
public FormuleContentServiceUpdaterTest() {
}
- static File toDelete;
- @BeforeClass
- public static void beforeTest() {
- System.setProperty("test", "true");
- toDelete = ReportTestHelper.readScenario().second;
- }
-
- @AfterClass
- public static void afterTest() {
- CtuluLibFile.deleteDir(toDelete);
- }
-
@Test
public void testComputeChanges() {
Modified: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java 2013-02-21 22:02:30 UTC (rev 8291)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java 2013-02-22 07:33:37 UTC (rev 8292)
@@ -3,14 +3,12 @@
*/
package org.fudaa.fudaa.crue.report.formule;
-import java.io.File;
import java.util.Arrays;
import java.util.Collection;
-import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.ctulu.CtuluLogRecord;
import org.fudaa.dodico.crue.metier.emh.ResultatTimeKey;
-import org.fudaa.fudaa.crue.report.ReportTestHelper;
+import org.fudaa.fudaa.crue.report.AbstracTestWithScenarioTest;
import org.fudaa.fudaa.crue.report.data.ReportRunKey;
import org.fudaa.fudaa.crue.report.data.ReportRunVariableKey;
import org.fudaa.fudaa.crue.report.data.ReportVariableTypeEnum;
@@ -18,32 +16,19 @@
import org.fudaa.fudaa.crue.report.formule.function.FunctionMaxSurT;
import org.fudaa.fudaa.crue.report.service.RangeSelectedTimeKey;
import org.fudaa.fudaa.crue.report.service.ReportService;
-import org.junit.AfterClass;
import org.junit.Test;
import static org.junit.Assert.*;
-import org.junit.BeforeClass;
import org.openide.util.Lookup;
/**
*
* @author Frederic Deniger
*/
-public class VariableContentFormuleTest {
+public class VariableContentFormuleTest extends AbstracTestWithScenarioTest{
public VariableContentFormuleTest() {
}
- static File toDelete;
- @BeforeClass
- public static void beforeTest() {
- toDelete = ReportTestHelper.readScenario().second;
- }
-
- @AfterClass
- public static void afterTest() {
- CtuluLibFile.deleteDir(toDelete);
- }
-
@Test
public void testGoodFormula() {
FormuleParametersExpr params = new FormuleParametersExpr();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-02-21 16:32:54
|
Revision: 8290
http://fudaa.svn.sourceforge.net/fudaa/?rev=8290&view=rev
Author: deniger
Date: 2013-02-21 16:32:43 +0000 (Thu, 21 Feb 2013)
Log Message:
-----------
support VariableFC
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluExpr.java
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluExpr.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluExpr.java 2013-02-21 16:32:10 UTC (rev 8289)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluExpr.java 2013-02-21 16:32:43 UTC (rev 8290)
@@ -144,6 +144,10 @@
return parser_;
}
+ public void setParser(CtuluParser parser) {
+ this.parser_ = parser;
+ }
+
public CtuluExpr(final CtuluParser _p) {
parser_ = new CtuluParser(_p);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-02-20 21:28:43
|
Revision: 8287
http://fudaa.svn.sourceforge.net/fudaa/?rev=8287&view=rev
Author: deniger
Date: 2013-02-20 21:28:32 +0000 (Wed, 20 Feb 2013)
Log Message:
-----------
support VariableFC
Added Paths:
-----------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/math/
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/math/BilanHelper.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/math/DataIntegrale.java
Copied: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/math/BilanHelper.java (from rev 8186, trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/cubature/EfBilanHelper.java)
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/math/BilanHelper.java (rev 0)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/math/BilanHelper.java 2013-02-20 21:28:32 UTC (rev 8287)
@@ -0,0 +1,149 @@
+/**
+ * Licence GPL Copyright Genesis
+ */
+package org.fudaa.ctulu.math;
+
+/**
+ * @author deniger
+ */
+public class BilanHelper {
+
+ /**
+ * Integration des donnees par la methode des trapezes entre la courbe representee par les x1 et y1 et la droite d\xE9finie par la fonction affine de
+ * coeff a et d'ordonn\xE9\xE9e a l origine b y1=a*x1+b
+ *
+ * @param lx
+ * @param ly
+ * @return
+ */
+ public static DataIntegrale integrerMethodeTrapeze(double[] lx, double[] ly, double a, double b) {
+
+ DataIntegrale data = new DataIntegrale();
+
+ for (int i = 0; i < Math.min(lx.length, ly.length) - 1; i++) {
+ double x = lx[i];
+ double x2 = lx[i + 1];
+ double y = ly[i];
+ double y2 = ly[i + 1];
+
+ double ySeuil1 = a * x + b;
+ double ySeuil2 = a * x2 + b;
+ if (y > ySeuil1 && y2 > ySeuil2) {
+ // courbe au dessus de la ligne
+ data.addZonePlus(calculAireTrapeze(x, y, x2, y2, ySeuil1, ySeuil2));
+
+ } else if (y < ySeuil1 && y2 < ySeuil2) {
+ // courbe en dessous de la ligne
+ data.addZoneMoins(calculAireTrapeze(x, y, x2, y2, ySeuil1, ySeuil2));
+
+ } else {
+ // cas particulier : intersection, on calcule l'intersection entre les
+ // points
+ // cas particulier : intersection, on calcule l'intersection entre les
+ // points
+ double yIntersect = 0;
+ double xIntersect = 0;
+ // on prend la droite form\xE9e par les 2 points et on calcule son
+ // intersection avec la droite affine
+ if (x2 - x != 0) {
+ // droite non parrallele a l axe des abscisses
+ double coefDirecteur = (y2 - y) / (x2 - x);
+ double ordoOrigine = y2 - coefDirecteur * x2;
+
+ // intersection de droites avec le seuil
+
+ if (coefDirecteur - a != 0) {
+ // droie non paralleles
+ xIntersect = (ordoOrigine - b) / (coefDirecteur - a);
+ yIntersect = coefDirecteur * xIntersect + ordoOrigine;
+ } else {
+ // droite parrallele confondue au seuil, on ne fais rien...
+ }
+
+ } else {
+ // x2=x1 droite d equation x1=Cste
+
+ xIntersect = x;
+ yIntersect = a * x + b;
+ }
+
+ // maintenant que l on a le point d'intersection, on test si on ajoute en positif ou negatif
+ if (y >= ySeuil1 && y2 <= ySeuil2) {
+ data.addZonePlus(calculAireTrapeze(x, y, xIntersect, yIntersect, ySeuil1, ySeuil2));
+ data.addZoneMoins(calculAireTrapeze(xIntersect, yIntersect, x2, y2, ySeuil1, ySeuil2));
+
+ } else {
+ data.addZoneMoins(calculAireTrapeze(x, y, xIntersect, yIntersect, ySeuil1, ySeuil2));
+ data.addZonePlus(calculAireTrapeze(xIntersect, yIntersect, x2, y2, ySeuil1, ySeuil2));
+ }
+
+ }
+
+ }
+
+ return data;
+ }
+
+ /**
+ * calcul de l'aire du trapeze form\xE9 par les 4 points (x1,y1) (x2,y2) (x1,y3) (x2,y4)
+ */
+ public static double calculAireTrapeze(double x, double y, double x2, double y2, double y3, double y4) {
+ // 1: calcul de la hauteur
+ double h = Math.abs(x2 - x);
+ // 2 base 1: coordonnees cartesiennes entre le point x1,y1 et x1,y3
+ double base1 = Math.abs(y3 - y);
+ // 3 base 2: coordonnees cartesiennes entre le point x2,y2 et x2,y4
+ double base2 = Math.abs(y4 - y2);
+ // 4 calcul de l'aire
+ return h * (base1 + base2) / 2;
+ }
+
+ public static void computeBilan(double x1, double x2, double y1, double y2, double seuil, DataIntegrale targetData) {
+ if (y1 >= seuil && y2 >= seuil) {
+ // courbe au dessus de la ligne
+ targetData.addZonePlus(calculAireTrapeze(x1, y1, x2, y2, seuil, seuil));
+ } else if (y1 <= seuil && y2 <= seuil) {
+ // courbe en dessous de la ligne
+ targetData.addZoneMoins(calculAireTrapeze(x1, y1, x2, y2, seuil, seuil));
+ } else {
+ // cas particulier : intersection, on calcule l'intersection entre les
+ // points
+ final double yIntersect = seuil;
+ double xIntersect = 0;
+ // on prend la droite form\xE9e par les 2 points et on calcule son
+ // intersection avec la droite affine
+ if (x2 - x1 != 0) {
+ // droite non parrallele a l axe des ordonn\xE9e !
+ double coefDirecteur = (y2 - y1) / (x2 - x1);
+ double ordoOrigine = y2 - coefDirecteur * x2;
+
+ // intersection de droites avec le seuil
+ // yIntersect = seuil;
+
+ if (coefDirecteur != 0) // droie non parallele au seuil
+ {
+ xIntersect = (yIntersect - ordoOrigine) / coefDirecteur;
+ } else {
+ // droite parrallele confondue au seuil, on ne fais rien...
+ }
+
+ } else {
+ // x2=x1 droite perpendiculaire au seuil, le point d'intersection est
+ // donc (x1,seuil)
+ xIntersect = x1;
+ // yIntersect = seuil;
+ }
+
+ // maintenant que l on a le point d'intersection, on test si on ajoute en positif ou negatif
+ if (y1 >= seuil && y2 <= seuil) {
+ targetData.addZonePlus(calculAireTrapeze(x1, y1, xIntersect, yIntersect, seuil, seuil));
+ targetData.addZoneMoins(calculAireTrapeze(xIntersect, yIntersect, x2, y2, seuil, seuil));
+
+ } else {
+ targetData.addZoneMoins(calculAireTrapeze(x1, y1, xIntersect, yIntersect, seuil, seuil));
+ targetData.addZonePlus(calculAireTrapeze(xIntersect, yIntersect, x2, y2, seuil, seuil));
+ }
+
+ }
+ }
+}
Copied: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/math/DataIntegrale.java (from rev 7895, trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/cubature/EfDataIntegrale.java)
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/math/DataIntegrale.java (rev 0)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/math/DataIntegrale.java 2013-02-20 21:28:32 UTC (rev 8287)
@@ -0,0 +1,47 @@
+package org.fudaa.ctulu.math;
+
+/**
+ * Classe qui gere les bilans ainsi que les cubatures.
+ *
+ * @author Adrien Hadoux
+ */
+public class DataIntegrale {
+
+ /**
+ * Valeur pour la zone plus
+ */
+ private double zonePlus_ = 0;
+ /**
+ * Valeur int\xE9grale pour la zone moins
+ */
+ private double zoneMoins_ = 0;
+
+ public double getZonePlus() {
+ return zonePlus_;
+ }
+
+ public double getZoneMoins() {
+ return zoneMoins_;
+ }
+
+ public void addZonePlus(double _d) {
+ zonePlus_ = zonePlus_ + Math.abs(_d);
+
+ }
+
+ public void addZoneMoins(double _d) {
+ zoneMoins_ = zoneMoins_ + Math.abs(_d);
+ }
+
+ public void add(double _d) {
+ if (Math.signum(_d) > 0) {
+ addZonePlus(_d);
+ } else {
+ addZoneMoins(_d);
+ }
+ }
+
+ public double getResultat() {
+ return zonePlus_ - zoneMoins_;
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-02-20 21:28:07
|
Revision: 8286
http://fudaa.svn.sourceforge.net/fudaa/?rev=8286&view=rev
Author: deniger
Date: 2013-02-20 21:28:00 +0000 (Wed, 20 Feb 2013)
Log Message:
-----------
support VariableFC
Modified Paths:
--------------
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/cubature/EfBilanHelper.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/cubature/EfDataIntegrale.java
Modified: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/cubature/EfBilanHelper.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/cubature/EfBilanHelper.java 2013-02-20 14:37:52 UTC (rev 8285)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/cubature/EfBilanHelper.java 2013-02-20 21:28:00 UTC (rev 8286)
@@ -3,6 +3,7 @@
*/
package org.fudaa.dodico.ef.cubature;
+import org.fudaa.ctulu.math.BilanHelper;
import org.fudaa.dodico.ef.EfData;
import org.fudaa.dodico.ef.operation.EfLineIntersection;
import org.fudaa.dodico.ef.operation.EfLineIntersectionsResultsI;
@@ -11,85 +12,9 @@
/**
* @author deniger
*/
-public class EfBilanHelper {
+public class EfBilanHelper extends BilanHelper {
/**
- * Integration des donnees par la methode des trapezes entre la courbe representee par les x1 et y1 et la droite d\xE9finie par la fonction affine de
- * coeff a et d'ordonn\xE9\xE9e a l origine b y1=a*x1+b
- *
- * @param lx
- * @param ly
- * @return
- */
- public static EfDataIntegrale integrerMethodeTrapeze(double[] lx, double[] ly, double a, double b) {
-
- EfDataIntegrale data = new EfDataIntegrale();
-
- for (int i = 0; i < Math.min(lx.length, ly.length) - 1; i++) {
- double x = lx[i];
- double x2 = lx[i + 1];
- double y = ly[i];
- double y2 = ly[i + 1];
-
- double ySeuil1 = a * x + b;
- double ySeuil2 = a * x2 + b;
- if (y > ySeuil1 && y2 > ySeuil2) {
- // courbe au dessus de la ligne
- data.addZonePlus(calculAireTrapeze(x, y, x2, y2, ySeuil1, ySeuil2));
-
- } else if (y < ySeuil1 && y2 < ySeuil2) {
- // courbe en dessous de la ligne
- data.addZoneMoins(calculAireTrapeze(x, y, x2, y2, ySeuil1, ySeuil2));
-
- } else {
- // cas particulier : intersection, on calcule l'intersection entre les
- // points
- // cas particulier : intersection, on calcule l'intersection entre les
- // points
- double yIntersect = 0;
- double xIntersect = 0;
- // on prend la droite form\xE9e par les 2 points et on calcule son
- // intersection avec la droite affine
- if (x2 - x != 0) {
- // droite non parrallele a l axe des abscisses
- double coefDirecteur = (y2 - y) / (x2 - x);
- double ordoOrigine = y2 - coefDirecteur * x2;
-
- // intersection de droites avec le seuil
-
- if (coefDirecteur - a != 0) {
- // droie non paralleles
- xIntersect = (ordoOrigine - b) / (coefDirecteur - a);
- yIntersect = coefDirecteur * xIntersect + ordoOrigine;
- } else {
- // droite parrallele confondue au seuil, on ne fais rien...
- }
-
- } else {
- // x2=x1 droite d equation x1=Cste
-
- xIntersect = x;
- yIntersect = a * x + b;
- }
-
- // maintenant que l on a le point d'intersection, on test si on ajoute en positif ou negatif
- if (y >= ySeuil1 && y2 <= ySeuil2) {
- data.addZonePlus(calculAireTrapeze(x, y, xIntersect, yIntersect, ySeuil1, ySeuil2));
- data.addZoneMoins(calculAireTrapeze(xIntersect, yIntersect, x2, y2, ySeuil1, ySeuil2));
-
- } else {
- data.addZoneMoins(calculAireTrapeze(x, y, xIntersect, yIntersect, ySeuil1, ySeuil2));
- data.addZonePlus(calculAireTrapeze(xIntersect, yIntersect, x2, y2, ySeuil1, ySeuil2));
- }
-
- }
-
- }
-
- return data;
- }
-
- /**
* Calcule l'aire du trapeze en utilisant un objet EfLineIntersectionsResultsI. EfLineIntersectionsResultsI fonctionne de la maniere suivante:
* getNbIntersect():donne le nombre de points getDistFromDeb(i) donne le Xi: distance entre le debut et le point getIntersect(i)
* getValueBadInterpolation(EfData _d) donne le y1 associ\xE9 au x1
@@ -114,20 +39,6 @@
return data;
}
- /**
- * calcul de l'aire du trapeze form\xE9 par les 4 points (x1,y1) (x2,y2) (x1,y3) (x2,y4)
- */
- public static double calculAireTrapeze(double x, double y, double x2, double y2, double y3, double y4) {
- // 1: calcul de la hauteur
- double h = Math.abs(x2 - x);
- // 2 base 1: coordonnees cartesiennes entre le point x1,y1 et x1,y3
- double base1 = Math.abs(y3 - y);
- // 3 base 2: coordonnees cartesiennes entre le point x2,y2 et x2,y4
- double base2 = Math.abs(y4 - y2);
- // 4 calcul de l'aire
- return h * (base1 + base2) / 2;
- }
-
public static EfDataIntegrale integrerMethodeTrapezeVector(EfLineIntersectionsResultsI interfaceRes, EfData vxData, EfData vyData, double seuil) {
EfDataIntegrale data = new EfDataIntegrale();
EfVectorComputation vectorComputation = new EfVectorComputation();
@@ -195,53 +106,4 @@
return data;
}
-
- private static void computeBilan(double x1, double x2, double y1, double y2, double seuil, EfDataIntegrale targetData) {
- if (y1 >= seuil && y2 >= seuil) {
- // courbe au dessus de la ligne
- targetData.addZonePlus(calculAireTrapeze(x1, y1, x2, y2, seuil, seuil));
- } else if (y1 <= seuil && y2 <= seuil) {
- // courbe en dessous de la ligne
- targetData.addZoneMoins(calculAireTrapeze(x1, y1, x2, y2, seuil, seuil));
- } else {
- // cas particulier : intersection, on calcule l'intersection entre les
- // points
- final double yIntersect = seuil;
- double xIntersect = 0;
- // on prend la droite form\xE9e par les 2 points et on calcule son
- // intersection avec la droite affine
- if (x2 - x1 != 0) {
- // droite non parrallele a l axe des ordonn\xE9e !
- double coefDirecteur = (y2 - y1) / (x2 - x1);
- double ordoOrigine = y2 - coefDirecteur * x2;
-
- // intersection de droites avec le seuil
- // yIntersect = seuil;
-
- if (coefDirecteur != 0) // droie non parallele au seuil
- {
- xIntersect = (yIntersect - ordoOrigine) / coefDirecteur;
- } else {
- // droite parrallele confondue au seuil, on ne fais rien...
- }
-
- } else {
- // x2=x1 droite perpendiculaire au seuil, le point d'intersection est
- // donc (x1,seuil)
- xIntersect = x1;
- // yIntersect = seuil;
- }
-
- // maintenant que l on a le point d'intersection, on test si on ajoute en positif ou negatif
- if (y1 >= seuil && y2 <= seuil) {
- targetData.addZonePlus(calculAireTrapeze(x1, y1, xIntersect, yIntersect, seuil, seuil));
- targetData.addZoneMoins(calculAireTrapeze(xIntersect, yIntersect, x2, y2, seuil, seuil));
-
- } else {
- targetData.addZoneMoins(calculAireTrapeze(x1, y1, xIntersect, yIntersect, seuil, seuil));
- targetData.addZonePlus(calculAireTrapeze(xIntersect, yIntersect, x2, y2, seuil, seuil));
- }
-
- }
- }
}
Modified: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/cubature/EfDataIntegrale.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/cubature/EfDataIntegrale.java 2013-02-20 14:37:52 UTC (rev 8285)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/cubature/EfDataIntegrale.java 2013-02-20 21:28:00 UTC (rev 8286)
@@ -1,47 +1,11 @@
package org.fudaa.dodico.ef.cubature;
+import org.fudaa.ctulu.math.DataIntegrale;
+
/**
* Classe qui gere les bilans ainsi que les cubatures.
*
* @author Adrien Hadoux
*/
-public class EfDataIntegrale {
-
- /**
- * Valeur pour la zone plus
- */
- private double zonePlus_ = 0;
- /**
- * Valeur int\xE9grale pour la zone moins
- */
- private double zoneMoins_ = 0;
-
- public double getZonePlus() {
- return zonePlus_;
- }
-
- public double getZoneMoins() {
- return zoneMoins_;
- }
-
- public void addZonePlus(double _d) {
- zonePlus_ = zonePlus_ + Math.abs(_d);
-
- }
-
- public void addZoneMoins(double _d) {
- zoneMoins_ = zoneMoins_ + Math.abs(_d);
- }
-
- public void add(double _d) {
- if (Math.signum(_d) > 0) {
- addZonePlus(_d);
- } else {
- addZoneMoins(_d);
- }
- }
-
- public double getResultat() {
- return zonePlus_ - zoneMoins_;
- }
+public class EfDataIntegrale extends DataIntegrale {
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-02-20 14:38:04
|
Revision: 8285
http://fudaa.svn.sourceforge.net/fudaa/?rev=8285&view=rev
Author: deniger
Date: 2013-02-20 14:37:52 +0000 (Wed, 20 Feb 2013)
Log Message:
-----------
support VariableFC
Modified Paths:
--------------
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/palette/BPalettePlageProperties.java
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/palette/BPalettePlageProperties.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/palette/BPalettePlageProperties.java 2013-02-20 10:32:15 UTC (rev 8284)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/palette/BPalettePlageProperties.java 2013-02-20 14:37:52 UTC (rev 8285)
@@ -53,6 +53,10 @@
isReduit_ = _plage.isReduit();
}
+ public void setSsTitre(String ssTitre) {
+ this.ssTitre_ = ssTitre;
+ }
+
protected void updatePalette(final BPalettePlageAbstract _target) {
if (ssTitre_ != null) {
_target.setSousTitre(ssTitre_);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-02-19 14:34:51
|
Revision: 8283
http://fudaa.svn.sourceforge.net/fudaa/?rev=8283&view=rev
Author: deniger
Date: 2013-02-19 14:34:41 +0000 (Tue, 19 Feb 2013)
Log Message:
-----------
ajout groupe de r?\195?\169sultats
Added Paths:
-----------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogGroupResult.java
Copied: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogGroupResult.java (from rev 7889, trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogResult.java)
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogGroupResult.java (rev 0)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogGroupResult.java 2013-02-19 14:34:41 UTC (rev 8283)
@@ -0,0 +1,55 @@
+/**
+ *
+ */
+package org.fudaa.ctulu;
+
+/**
+ * Classe permettant de donner le resultat et le log d'une op\xE9ration.
+ *
+ * @author deniger
+ *
+ */
+public class CtuluLogGroupResult<T, U> {
+
+ private T resultat;
+ private U complement;
+ private CtuluLogGroup log;
+
+ public CtuluLogGroupResult() {
+ }
+
+ public CtuluLogGroupResult(T resultat, CtuluLogGroup log) {
+ this.resultat = resultat;
+ this.log = log;
+ }
+
+ public CtuluLogGroupResult(T resultat, U complement, CtuluLogGroup log) {
+ this.resultat = resultat;
+ this.complement = complement;
+ this.log = log;
+ }
+
+ public U getComplement() {
+ return complement;
+ }
+
+ public void setComplement(U complement) {
+ this.complement = complement;
+ }
+
+ public T getResultat() {
+ return resultat;
+ }
+
+ public void setResultat(T resultat) {
+ this.resultat = resultat;
+ }
+
+ public CtuluLogGroup getLog() {
+ return log;
+ }
+
+ public void setLog(CtuluLogGroup log) {
+ this.log = log;
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-02-19 07:37:48
|
Revision: 8282
http://fudaa.svn.sourceforge.net/fudaa/?rev=8282&view=rev
Author: deniger
Date: 2013-02-19 07:37:39 +0000 (Tue, 19 Feb 2013)
Log Message:
-----------
corrections tests unitaires
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ConfigTest.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/formule/FormuleCalculatorExpr.java
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/
trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/MockResultProvider.java
trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ConfigTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ConfigTest.java 2013-02-19 07:37:03 UTC (rev 8281)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ConfigTest.java 2013-02-19 07:37:39 UTC (rev 8282)
@@ -133,6 +133,11 @@
res.add("condLimite.positions.tarage");
res.add("condLimite.positions.manoeuvre");
res.add("condLimite.positions.qruis");
+ res.add("groupeDessin.visible");
+ res.add("groupHydraulique.visible");
+ res.add("groupeImage.visible");
+ res.add("groupeAutre.visible");
+ res.add("groupeFichierSIG.visible");
return res;
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/formule/FormuleCalculatorExpr.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/formule/FormuleCalculatorExpr.java 2013-02-19 07:37:03 UTC (rev 8281)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/formule/FormuleCalculatorExpr.java 2013-02-19 07:37:39 UTC (rev 8282)
@@ -25,8 +25,19 @@
this.parser = parser;
findUsedVar = this.parser.findUsedVar();
}
+
+ /**
+ * pour les tests
+ * @param service
+ */
+ protected void setService(ReportReadResultServiceContrat service) {
+ this.service = service;
+ }
+
+
+
@Override
public Double getValue(ResultatTimeKey selectedTime, ReportRunVariableKey key, String emhNom) {
Copied: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/MockResultProvider.java (from rev 8279, trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/variable/MockResultProvider.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/MockResultProvider.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/MockResultProvider.java 2013-02-19 07:37:39 UTC (rev 8282)
@@ -0,0 +1,40 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.crue.report.formule;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier;
+import org.fudaa.dodico.crue.config.ccm.CrueConfigMetierLoaderDefaultTest;
+import org.fudaa.dodico.crue.metier.emh.ResultatTimeKey;
+import org.fudaa.fudaa.crue.report.data.ReportRunVariableKey;
+import org.fudaa.fudaa.crue.report.service.ReportReadResultServiceContrat;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class MockResultProvider implements ReportReadResultServiceContrat {
+
+ Map<String, Double> values = new HashMap<String, Double>();
+
+ public void setValue(String name, double val) {
+ values.put(name, val);
+ }
+
+ @Override
+ public Double getReadValue(ReportRunVariableKey key, String emhNom) {
+ return values.get(key.getVariable().getVariableName());
+ }
+
+ @Override
+ public CrueConfigMetier getCcm() {
+ return CrueConfigMetierLoaderDefaultTest.DEFAULT;
+ }
+
+ @Override
+ public Double getReadValue(ResultatTimeKey selectedTime, ReportRunVariableKey key, String emhNom) {
+ return values.get(key.getVariable().getVariableName());
+ }
+}
Copied: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java (from rev 8279, trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/variable/VariableContentFormuleTest.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java 2013-02-19 07:37:39 UTC (rev 8282)
@@ -0,0 +1,54 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.crue.report.formule;
+
+import org.fudaa.fudaa.crue.report.formule.FormuleCalculatorExpr;
+import org.fudaa.fudaa.crue.report.formule.FormuleParametersExpr;
+import org.fudaa.fudaa.crue.report.formule.FormuleContentExpr;
+import java.util.Arrays;
+import org.fudaa.ctulu.CtuluLog;
+import org.fudaa.ctulu.CtuluLogRecord;
+import org.fudaa.fudaa.crue.report.data.ReportRunKey;
+import org.fudaa.fudaa.crue.report.data.ReportRunVariableKey;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class VariableContentFormuleTest {
+
+ public VariableContentFormuleTest() {
+ }
+
+ @Test
+ public void testGoodFormula() {
+ FormuleParametersExpr params = new FormuleParametersExpr();
+ params.setFormule("x+y+10");
+ params.setVariables(Arrays.asList("x", "y"));
+ FormuleContentExpr content = new FormuleContentExpr();
+ CtuluLog log = content.setParameter(params);
+ assertFalse(log.containsErrors());
+ FormuleCalculatorExpr calculator = content.getCalculator();
+ MockResultProvider mock = new MockResultProvider();
+ mock.setValue("x", 100);
+ mock.setValue("y", 1000);
+ calculator.setService(mock);
+ Double value = calculator.getValue(null, new ReportRunVariableKey(new ReportRunKey(), ""), null);
+ assertEquals(1110, value.intValue());
+ }
+
+ @Test
+ public void testBadFormula() {
+ FormuleParametersExpr params = new FormuleParametersExpr();
+ params.setFormule("x+y+10");
+ params.setVariables(Arrays.asList("x"));
+ FormuleContentExpr content = new FormuleContentExpr();
+ CtuluLog log = content.setParameter(params);
+ assertTrue(log.containsErrorOrSevereError());
+ CtuluLogRecord get = log.getRecords().get(0);
+ assertEquals("Unrecognized symbol \"y\"", get.getMsg().trim());
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-02-19 07:37:11
|
Revision: 8281
http://fudaa.svn.sourceforge.net/fudaa/?rev=8281&view=rev
Author: deniger
Date: 2013-02-19 07:37:03 +0000 (Tue, 19 Feb 2013)
Log Message:
-----------
corrections tests unitaires
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/variable/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-02-19 07:33:29
|
Revision: 8280
http://fudaa.svn.sourceforge.net/fudaa/?rev=8280&view=rev
Author: deniger
Date: 2013-02-19 07:33:18 +0000 (Tue, 19 Feb 2013)
Log Message:
-----------
corrections tests unitaires
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/Etu201.zip
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/Etu201.zip
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-02-18 20:55:52
|
Revision: 8278
http://fudaa.svn.sourceforge.net/fudaa/?rev=8278&view=rev
Author: deniger
Date: 2013-02-18 20:55:43 +0000 (Mon, 18 Feb 2013)
Log Message:
-----------
variables
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/variable/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-02-18 18:18:03
|
Revision: 8277
http://fudaa.svn.sourceforge.net/fudaa/?rev=8277&view=rev
Author: deniger
Date: 2013-02-18 18:17:46 +0000 (Mon, 18 Feb 2013)
Log Message:
-----------
variables
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluExprGUI.java
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluExprGUI.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluExprGUI.java 2013-02-15 16:20:05 UTC (rev 8276)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluExprGUI.java 2013-02-18 18:17:46 UTC (rev 8277)
@@ -55,8 +55,9 @@
* @version $Id: CtuluExprGUI.java,v 1.9 2006-09-19 14:36:55 deniger Exp $
*/
private final class InfoUpdater implements ListSelectionListener {
+
/**
- *
+ *
*/
private final BuLabel lb_;
@@ -168,7 +169,6 @@
private static final class VariableModel extends AbstractListModel implements ComboBoxModel {
final List l_;
-
Object selected_;
VariableModel(final List _l) {
@@ -207,7 +207,7 @@
@Override
public Component getListCellRendererComponent(final JList _list, final Object _value, final int _index,
- final boolean _isSelected, final boolean _cellHasFocus) {
+ final boolean _isSelected, final boolean _cellHasFocus) {
final Component c = super.getListCellRendererComponent(_list, _value, _index, _isSelected, _cellHasFocus);
if (_value == null) {
return c;
@@ -223,21 +223,21 @@
buf.append("</td></tr><tr><td>");
if (expr_.containsDescFor(name)) {
buf.append(CtuluLib.getS("Desc")).append("</td><td>: ").append(expr_.getDesc(name))
- .append("</td></tr><tr><td>");
+ .append("</td></tr><tr><td>");
}
buf.append(CtuluLib.getS("Valeur courante")).append("</td><td>: ").append(CtuluLibString.ESPACE).append(
- v.getValue());
+ v.getValue());
buf.append("</td></tr></table></body></html>");
setToolTipText(buf.toString());
return c;
}
}
- static class TableCellRenderer extends DefaultTableCellRenderer {
+ static class TableCellRenderer extends DefaultTableCellRenderer {
@Override
public Component getTableCellRendererComponent(final JTable _table, final Object _value, final boolean _isSelected,
- final boolean _hasFocus, final int _row, final int _column) {
+ final boolean _hasFocus, final int _row, final int _column) {
final Component r = super.getTableCellRendererComponent(_table, _value, _isSelected, _hasFocus, _row, _column);
if (_value == null) {
setText(CtuluLib.getS("Pr\xE9ciser une valeur"));
@@ -264,44 +264,26 @@
return ((Variable) _o1).getName().compareTo(((Variable) _o2).getName());
}
}
-
-
-
private boolean isValid_;
-
BuButton btEvaluate_;
-
final BuButton btValid_;
-
final transient CtuluExpr expr_;
-
final VariableModel fctModel_;
-
final transient ListSelectionModel fctSelected_;
-
final VariableModel model_;
-
final VariableModel cstModel_;
-
BuTextField tfResult_;
-
final BuTextArea txt_;
-
final BuLabel txtError_;
-
transient Variable[] varToSet_;
-
final transient ListSelectionModel varSelected_;
-
final transient ListSelectionModel cstSelected_;
-
final ValueTableModel tModel_;
-
final BuTable table_;
/**
* Construit a partir de l'expression par default.
- *
+ *
* @param _expr l'expression
*/
public CtuluExprGUI(final CtuluExpr _expr) {
@@ -412,28 +394,26 @@
cstSelected_.addListSelectionListener(listener);
varSelected_.addListSelectionListener(listener);
listVar.addFocusListener(new FocusListener() {
-
@Override
- public void focusLost(final FocusEvent _e) {}
+ public void focusLost(final FocusEvent _e) {
+ }
@Override
public void focusGained(final FocusEvent _e) {
listener.updateVar();
}
-
});
listCst.addFocusListener(new FocusListener() {
-
@Override
- public void focusLost(final FocusEvent _e) {}
+ public void focusLost(final FocusEvent _e) {
+ }
@Override
public void focusGained(final FocusEvent _e) {
listener.updateCst();
}
-
});
}
@@ -442,7 +422,6 @@
_listFct.setModel(fctModel_);
fctSelected_.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
_listFct.addMouseListener(new MouseAdapter() {
-
@Override
public void mouseClicked(final MouseEvent _e) {
if (_e.getClickCount() >= 2) {
@@ -454,24 +433,20 @@
private void initCstVar(final BuEmptyList _listVar, final BuEmptyList _listCst) {
_listVar.addMouseListener(new MouseAdapter() {
-
@Override
public void mouseClicked(final MouseEvent _e) {
if (_e.getClickCount() >= 2) {
insertVar(model_, varSelected_);
}
}
-
});
_listCst.addMouseListener(new MouseAdapter() {
-
@Override
public void mouseClicked(final MouseEvent _e) {
if (_e.getClickCount() >= 2) {
insertVar(cstModel_, cstSelected_);
}
}
-
});
_listVar.setModel(model_);
_listCst.setModel(cstModel_);
@@ -484,6 +459,10 @@
return isValid_;
}
+ public BuTextArea getTxtArea() {
+ return txt_;
+ }
+
private void updateBt() {
btValid_.setEnabled(true);
if (btEvaluate_ != null) {
@@ -501,7 +480,7 @@
} else {
txtError_.setForeground(Color.RED);
txtError_.setText(expr_.getParser().getError(0)
- + (expr_.getParser().getNbError() > 0 ? "..." : CtuluLibString.EMPTY_STRING));
+ + (expr_.getParser().getNbError() > 0 ? "..." : CtuluLibString.EMPTY_STRING));
txtError_.setToolTipText(expr_.getParser().getHtmlError());
}
btValid_.setEnabled(false);
@@ -596,9 +575,9 @@
}
public String getExprText() {
- String txt = txt_.getText();
- txt=txt.replace('\r', ' ');
- txt=txt.replace('\n', ' ');
+ String txt = txt_.getText();
+ txt = txt.replace('\r', ' ');
+ txt = txt.replace('\n', ' ');
return txt;
}
@@ -611,5 +590,4 @@
public void removeUpdate(final DocumentEvent _e) {
updateBt();
}
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-02-15 14:51:21
|
Revision: 8275
http://fudaa.svn.sourceforge.net/fudaa/?rev=8275&view=rev
Author: deniger
Date: 2013-02-15 14:51:11 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
cas ?\195?\160 g?\195?\169rer si titre du calque est null.
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/MessageFormatHelper.java
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/MessageFormatHelper.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/MessageFormatHelper.java 2013-02-14 22:28:35 UTC (rev 8274)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/MessageFormatHelper.java 2013-02-15 14:51:11 UTC (rev 8275)
@@ -1,6 +1,5 @@
/**
- * Licence GPL
- * Copyright Genesis
+ * Licence GPL Copyright Genesis
*/
package org.fudaa.ctulu;
@@ -19,15 +18,18 @@
* @return la chaine traduite
*/
public static String getS(ResourceBundle bundle, final String s, Object... args) {
- try {
- String res = bundle.getString(s);
- if (!CtuluLibArray.isEmpty(args)) { return new MessageFormat(res).format(args); }
- return res;
- } catch (Exception e) {
-
- }
- return s;
-
+// System.err.println("getS "+s+" args= "+args);
+ if (bundle.containsKey(s)) {
+ try {
+ String res = bundle.getString(s);
+ if (!CtuluLibArray.isEmpty(args)) {
+ return new MessageFormat(res).format(args);
+ }
+ return res;
+ } catch (Exception e) {
+ }
+ }
+ return s;
+
}
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
