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-04-04 21:16:41
|
Revision: 8380
http://fudaa.svn.sourceforge.net/fudaa/?rev=8380&view=rev
Author: deniger
Date: 2013-04-04 21:16:34 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
version 0.68
Modified Paths:
--------------
trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISDataModelAttributeToAtomicSubstitutionAdapter.java
Modified: trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISDataModelAttributeToAtomicSubstitutionAdapter.java
===================================================================
--- trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISDataModelAttributeToAtomicSubstitutionAdapter.java 2013-04-04 09:44:57 UTC (rev 8379)
+++ trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISDataModelAttributeToAtomicSubstitutionAdapter.java 2013-04-04 21:16:34 UTC (rev 8380)
@@ -11,12 +11,11 @@
*/
package org.fudaa.ctulu.gis;
-import org.fudaa.ctulu.ProgressionInterface;
-
import com.vividsolutions.jts.geom.Envelope;
import com.vividsolutions.jts.geom.Geometry;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
+import org.fudaa.ctulu.ProgressionInterface;
/**
* Permet de prendre en compte les donn\xE9es enregistrer avec des valeurs atomique rang\xE9es dans des valeurs non atomiques. S'appuie sur le proc\xE9d\xE9 de
@@ -26,7 +25,7 @@
* @version $Id$
*/
public class GISDataModelAttributeToAtomicSubstitutionAdapter implements GISDataModel {
-
+
private final GISDataModel model_;
private final GISAttributeInterface initNotAtomic;
private final int idxAttribute;
@@ -52,9 +51,9 @@
}
this.initNotAtomic = initNotAtomic;
this.targetAtomic = targetAtomic;
-
+
}
-
+
@Override
public GISDataModel createTranslate(GISPoint xyToAdd) {
if (xyToAdd == null) {
@@ -82,7 +81,7 @@
public double getDoubleValue(int _att, int _geom) {
return model_.getDoubleValue(_att, _geom);
}
-
+
@Override
public void preload(GISAttributeInterface[] _att, ProgressionInterface _prog) {
model_.preload(_att, _prog);
@@ -109,7 +108,7 @@
*/
@Override
public int getIndiceOf(GISAttributeInterface _att) {
- if (_att == targetAtomic) {
+ if (_att == targetAtomic || (ObjectUtils.equals(_att, targetAtomic))) {
return idxAttribute;
}
return model_.getIndiceOf(_att);
@@ -168,6 +167,6 @@
} else {
return model_.getValue(_att, _geom);
}
-
+
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-04-04 09:45:10
|
Revision: 8379
http://fudaa.svn.sourceforge.net/fudaa/?rev=8379&view=rev
Author: deniger
Date: 2013-04-04 09:44:57 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
version 0.68
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-compare/pom.xml
trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterResultatCalcul.java
trunk/soft/fudaa-crue/crue-config/pom.xml
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/CrueConfigMetierReader.java
trunk/soft/fudaa-crue/crue-core/pom.xml
trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerDate.java
trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerMillis.java
trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerSecond.java
trunk/soft/fudaa-crue/crue-emh/pom.xml
trunk/soft/fudaa-crue/crue-io/pom.xml
trunk/soft/fudaa-crue/crue-otfa/pom.xml
trunk/soft/fudaa-crue/crue-project/pom.xml
trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
trunk/soft/fudaa-crue/crue-test/pom.xml
trunk/soft/fudaa-crue/pom.xml
trunk/soft/fudaa-crue/ui-application/pom.xml
trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf
trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf
trunk/soft/fudaa-crue/ui-branding/pom.xml
trunk/soft/fudaa-crue/ui-commandline/pom.xml
trunk/soft/fudaa-crue/ui-common/pom.xml
trunk/soft/fudaa-crue/ui-comparison/pom.xml
trunk/soft/fudaa-crue/ui-emh/pom.xml
trunk/soft/fudaa-crue/ui-loader/pom.xml
trunk/soft/fudaa-crue/ui-loi/pom.xml
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/SecondValueEditor.java
trunk/soft/fudaa-crue/ui-modelling/pom.xml
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java
trunk/soft/fudaa-crue/ui-options/pom.xml
trunk/soft/fudaa-crue/ui-options/src/main/resources/FudaaCrue_Site.xml
trunk/soft/fudaa-crue/ui-otfa/pom.xml
trunk/soft/fudaa-crue/ui-planimetry/pom.xml
trunk/soft/fudaa-crue/ui-post/pom.xml
trunk/soft/fudaa-crue/ui-report/pom.xml
trunk/soft/fudaa-crue/ui-study/pom.xml
trunk/soft/fudaa-crue/ui-sysdoc/pom.xml
trunk/soft/fudaa-crue/ui-views/pom.xml
trunk/soft/fudaa-crue/ui-wrapper/pom.xml
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/SecondParser.java
Modified: trunk/soft/fudaa-crue/crue-compare/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-compare/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>crue-compare</artifactId>
<name>Crue Compare</name>
Modified: trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterResultatCalcul.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterResultatCalcul.java 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterResultatCalcul.java 2013-04-04 09:44:57 UTC (rev 8379)
@@ -120,7 +120,6 @@
}
public String resultatTimeKeyToString(ResultatTimeKey resultatKey, ResultKeyFormatter formatter) {
- //TODO modifier le resultatKeyToString avec transformer:
String toString = stringByTimeKey.get(resultatKey);
if (toString == null) {
toString = formatter.getResulatKeyTempsSceToStringTransformer().transform(resultatKey);
Modified: trunk/soft/fudaa-crue/crue-config/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-config/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-config/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>crue-config</artifactId>
<name>Crue Config</name>
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/CrueConfigMetierReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/CrueConfigMetierReader.java 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/CrueConfigMetierReader.java 2013-04-04 09:44:57 UTC (rev 8379)
@@ -223,7 +223,7 @@
//utile pour la verbosité.
int currentIdx = nature.ItemEnum.size();
for (DaoItemEnum object : nature.ItemEnum) {
- int idx = currentIdx--;
+ int idx = --currentIdx;
if (object.Id != null) {
idx = Integer.parseInt(object.Id);
}
Modified: trunk/soft/fudaa-crue/crue-core/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-core/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-core/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>crue-core</artifactId>
<name>Crue Core</name>
Added: trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/SecondParser.java
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/SecondParser.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/SecondParser.java 2013-04-04 09:44:57 UTC (rev 8379)
@@ -0,0 +1,13 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.common.time;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public interface SecondParser {
+
+ Double parseInSec(String in);
+}
Modified: trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerDate.java
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerDate.java 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerDate.java 2013-04-04 09:44:57 UTC (rev 8379)
@@ -6,6 +6,7 @@
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluNumberFormatI;
import org.fudaa.dodico.crue.common.transformer.ToStringTransformer;
+import org.joda.time.DateTime;
import org.joda.time.LocalDateTime;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.ISODateTimeFormat;
@@ -14,7 +15,7 @@
*
* @author Frederic Deniger
*/
-public class ToStringTransformerDate implements ToStringTransformer, CtuluNumberFormatI {
+public class ToStringTransformerDate implements ToStringTransformer, CtuluNumberFormatI, SecondParser {
private static final DateTimeFormatter XSD_DATE_FORMATTER = ISODateTimeFormat.dateHourMinuteSecondMillis();
LocalDateTime date;
@@ -29,6 +30,24 @@
this.date = date;
}
+ @Override
+ public Double parseInSec(String in) {
+ //ce n'est pas une date
+ if (in.indexOf('T') < 0) {
+ return initTransformer.parseInSec(in);
+ }
+ if (in.indexOf('.') < 0) {
+ return parseInSec(in + ".000");
+ }
+ try {
+ DateTime parseDateTime = XSD_DATE_FORMATTER.parseDateTime(in);
+ long millis = parseDateTime.getMillis() - date.toDateTime().getMillis();
+ return millis / 1000d;
+ } catch (Exception ex) {
+ }
+ return null;
+ }
+
public LocalDateTime getDate() {
return date;
}
@@ -51,7 +70,7 @@
}
Number value = (Number) in;
LocalDateTime plusMillis = date.plusMillis((int) (value.doubleValue() * 1000));
- return plusMillis.toString(XSD_DATE_FORMATTER);
+ return format(plusMillis);
}
@Override
@@ -75,6 +94,6 @@
return initTransformer.format(sec);
}
LocalDateTime plusMillis = date.plusMillis((int) (sec * 1000));
- return plusMillis.toString(XSD_DATE_FORMATTER);
+ return format(plusMillis);
}
}
Modified: trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerMillis.java
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerMillis.java 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerMillis.java 2013-04-04 09:44:57 UTC (rev 8379)
@@ -16,7 +16,7 @@
*
* @author Frederic Deniger
*/
-public class ToStringTransformerMillis implements ToStringTransformer {
+public class ToStringTransformerMillis implements ToStringTransformer, SecondParser {
PeriodFormatter dureeFormater = new PeriodFormatterBuilder()
.appendDays().appendSeparatorIfFieldsBefore(":")
@@ -34,6 +34,7 @@
return dureeFormater.print(createPeriodFromMillis(value.longValue()));
}
+ @Override
public Double parseInSec(String in) {
try {
if (in.indexOf('.') < 0) {
Modified: trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerSecond.java
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerSecond.java 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerSecond.java 2013-04-04 09:44:57 UTC (rev 8379)
@@ -11,7 +11,7 @@
*
* @author Frederic Deniger
*/
-public class ToStringTransformerSecond implements ToStringTransformer, CtuluNumberFormatI {
+public class ToStringTransformerSecond implements ToStringTransformer, CtuluNumberFormatI, SecondParser {
ToStringTransformerMillis millis = new ToStringTransformerMillis();
@@ -44,7 +44,8 @@
return millis.format((long) (sec * 1000L));
}
- public double parseInSec(String in) {
+ @Override
+ public Double parseInSec(String in) {
return millis.parseInSec(in);
}
}
Modified: trunk/soft/fudaa-crue/crue-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-emh/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>crue-emh</artifactId>
<name>Crue EMH</name>
Modified: trunk/soft/fudaa-crue/crue-io/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-io/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-io/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>crue-io</artifactId>
<name>Crue IO</name>
Modified: trunk/soft/fudaa-crue/crue-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-otfa/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>crue-otfa</artifactId>
<name>Crue OTFA</name>
Modified: trunk/soft/fudaa-crue/crue-project/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-project/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-project/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>crue-project</artifactId>
<name>Crue Project</name>
Modified: trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-sysdoc/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>crue-sysdoc</artifactId>
<name>Crue Sysdoc</name>
Modified: trunk/soft/fudaa-crue/crue-test/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-test/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-test/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>crue-test</artifactId>
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
<name>Fudaa-Crue</name>
<packaging>pom</packaging>
<ciManagement>
Modified: trunk/soft/fudaa-crue/ui-application/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-application/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>application</artifactId>
Modified: trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf
===================================================================
--- trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf 2013-04-04 09:44:57 UTC (rev 8379)
@@ -1,8 +1,8 @@
# ${HOME} will be replaced by user home directory according to platform
#default_userdir="${DEFAULT_USERDIR_ROOT}/0.62"
#default_cachedir="${DEFAULT_CACHEDIR_ROOT}/0.62"
-default_userdir="${HOME}\.${APPNAME}\0.67"
-default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/0.67/"
+default_userdir="${HOME}\.${APPNAME}\0.69"
+default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/0.69/"
# options used by the launcher by default, can be overridden by explicit
# command line switches
default_options="--branding fudaacrue -J-Xms24m -J-Xmx512m --multi-instances"
Modified: trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf
===================================================================
--- trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf 2013-04-04 09:44:57 UTC (rev 8379)
@@ -1,5 +1,5 @@
# ${HOME} will be replaced by user home directory according to platform
-default_userdir="${HOME}\.${APPNAME}\0.66"
+default_userdir="${HOME}\.${APPNAME}\0.68"
# options used by the launcher by default, can be overridden by explicit
# command line switches
Modified: trunk/soft/fudaa-crue/ui-branding/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-branding/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>ui-branding</artifactId>
Modified: trunk/soft/fudaa-crue/ui-commandline/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-commandline/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-commandline/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>ui-commandline</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-common/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-common/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-common/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>ui-common</artifactId>
Modified: trunk/soft/fudaa-crue/ui-comparison/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-comparison/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-comparison/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>ui-comparison</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-emh/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>ui-emh</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-loader/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loader/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-loader/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>ui-loader</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-loi/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-loi/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>ui-loi</artifactId>
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java 2013-04-04 09:44:57 UTC (rev 8379)
@@ -19,11 +19,12 @@
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluNumberFormatDefault;
import org.fudaa.ctulu.CtuluNumberFormatI;
+import org.fudaa.ctulu.editor.CtuluValueEditorI;
import org.fudaa.ctulu.gui.PopupMenuReceiver;
import org.fudaa.ctulu.image.CtuluImageProducer;
import org.fudaa.ctulu.iterator.FixedIntegerIterator;
+import org.fudaa.dodico.crue.common.time.ToStringTransformerSecond;
import org.fudaa.dodico.crue.common.transformer.CtuluNumberFormatAppender;
-import org.fudaa.dodico.crue.common.time.ToStringTransformerSecond;
import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier;
import org.fudaa.dodico.crue.config.ccm.DecimalFormatEpsilonEnum;
import org.fudaa.dodico.crue.config.ccm.ItemVariable;
@@ -42,89 +43,89 @@
* @author Frederic Deniger
*/
public class CourbesUiController implements CtuluImageProducer {
-
+
protected EGFillePanel panel;
protected EGTableGraphePanel tableGraphePanel;
protected EGAxeHorizontal axeH;
protected JPanel toolbar;
protected boolean useVariableForAxeH;
protected List<EbliActionInterface> editCourbeActions = new ArrayList<EbliActionInterface>();
-
+
protected void configureTablePanel() {
tableGraphePanel.getTable().setModel(createTableModel());
tableGraphePanel.setPreferredSize(new Dimension(300, 600));
}
-
+
public boolean isUseVariableForAxeH() {
return useVariableForAxeH;
}
-
+
public void setUseVariableForAxeH(boolean useVariableForAxeH) {
this.useVariableForAxeH = useVariableForAxeH;
}
-
+
public void installComboxSelector() {
tableGraphePanel.getTitleLabel().setVisible(false);
tableGraphePanel.remove(tableGraphePanel.getTitleLabel());
ComboboxCourbeSelector cb = new ComboboxCourbeSelector(getGraphe());
tableGraphePanel.add(cb.getCb(), BorderLayout.NORTH);
-
+
}
-
+
public EGGrapheSimpleModel getEGGrapheSimpleModel() {
return (EGGrapheSimpleModel) getGraphe().getModel();
}
-
+
public EGTableGraphePanel getTableGraphePanel() {
return tableGraphePanel;
}
-
+
public EGAxeHorizontal getAxeX() {
return getEGGrapheSimpleModel().getAxeX();
}
-
+
public List<EGAxeVertical> getAxesY() {
return getGraphe().getAllAxeVertical();
}
-
+
@Override
public BufferedImage produceImage(final Map _params) {
return panel.produceImage(_params);
-
+
}
-
+
@Override
public BufferedImage produceImage(int _w, int _h, Map _params) {
return panel.produceImage(_w, _h, _params);
}
-
+
@Override
public Dimension getDefaultImageDimension() {
return panel.getDefaultImageDimension();
}
-
+
public void addExportImagesToToolbar() {
toolbar.add(new ExportImageAction(panel).buildToolButton(EbliComponentFactory.INSTANCE));
toolbar.add(new ExportImageToClipboardAction(panel).buildToolButton(EbliComponentFactory.INSTANCE));
}
-
+
public JPanel getToolbar() {
return toolbar;
}
-
+
public EGFillePanel getPanel() {
return panel;
}
-
+
public EGGraphe getGraphe() {
return panel.getGraphe();
}
-
+
public void removeEditActions() {
tableGraphePanel.removeEditButtonsButCopy();
removeActions("MOVE_POINT", "SIMPLIFY");
}
-
+
public void removeActions(String... actionCommands) {
if (toolbar != null) {
Set<String> command = new HashSet<String>(Arrays.asList(actionCommands));
@@ -136,12 +137,12 @@
toolbar.remove(component);
}
}
-
+
}
}
-
+
}
-
+
public List<EbliActionInterface> getActions(String... command) {
EbliActionInterface[] specificActions = panel.getSpecificActions();
List<EbliActionInterface> res = new ArrayList<EbliActionInterface>();
@@ -157,11 +158,11 @@
}
return res;
}
-
+
public List<EbliActionInterface> getEditActions() {
return getActions("CONFIGURE", "CONFIGURE_REPERE");
}
-
+
public CourbesUiController() {
final EGGrapheSimpleModel grapheModel = new LoiGrapheSimpleModel();
axeH = new EGAxeHorizontal();
@@ -206,20 +207,20 @@
popupGraphe.install(panel.getGraphe(), tableGraphePanel.getTable(), CtuluUIForNetbeans.DEFAULT);
}
protected boolean editable;
-
+
public void setEditable(boolean b) {
editable = b;
tableGraphePanel.updateState();
for (EbliActionInterface ebliActionInterface : editCourbeActions) {
ebliActionInterface.setEnabled(b);
-
+
}
}
-
+
protected AbstractTableModel createTableModel() {
return new EGTableGraphePanel.SpecTableModel(tableGraphePanel);
}
-
+
public void configureAxeH(final PropertyNature natureAbscisse, boolean usePresentation) {
if (natureAbscisse == null) {
return;
@@ -230,7 +231,7 @@
axeH.setUnite(natureAbscisse.getUnite());
installFormatter(natureAbscisse, axeH, usePresentation);
}
-
+
public void configureAxeH(final ItemVariable varAbscisse, boolean usePresentation) {
if (varAbscisse == null) {
return;
@@ -238,15 +239,15 @@
configureAxeH(varAbscisse.getNature(), usePresentation);
axeH.setTitre(varAbscisse.getDisplayNom());
}
-
+
public EGAxeVertical findAxe(final ItemVariable varOrdonnee) {
if (varOrdonnee == null) {
return null;
}
return findAxe(varOrdonnee.getNature());
-
+
}
-
+
public EGAxeVertical findAxe(final PropertyNature nature) {
if (nature == null) {
return null;
@@ -259,15 +260,15 @@
}
return null;
}
-
+
public EGAxeVertical createAxeVertical(final ItemVariable varOrdonnee, boolean usePresentation) {
if (varOrdonnee == null) {
return null;
}
return createAxeVertical(varOrdonnee.getNature(), usePresentation);
-
+
}
-
+
public EGAxeVertical createAxeVertical(final PropertyNature nature, boolean usePresentation) {
EGAxeVertical axeV = null;
if (nature != null) {
@@ -281,17 +282,18 @@
installFormatter(nature, axeV, usePresentation);
return axeV;
}
-
- public void setAxeHSpecificFormats(CtuluNumberFormatI mainFormat, CtuluNumberFormatI detailFormat) {
+
+ public void setAxeHSpecificFormats(CtuluNumberFormatI mainFormat, CtuluNumberFormatI detailFormat, final CtuluValueEditorI _valueEditor) {
if (getAxeX() != null) {
getAxeX().setSpecificFormat(mainFormat);
getAxeX().setSpecificDetailFormat(detailFormat);
+ getAxeX().setValueEditor(_valueEditor);
}
}
-
+
protected void installFormatter(final PropertyNature var, EGAxe axe, boolean usePresentation) {
if (var != null) {
-
+
if (var.isEnum()) {
axe.setSpecificFormat(new EnumNumberFormatter(var));
axe.setAxisIterator(new FixedIntegerIterator(var.getItemEnumByValue().keys()));
@@ -308,7 +310,7 @@
}
axe.setUserObject(var);
}
-
+
public LoiPopupMenuReceiver createLoiPoupReceiver() {
return new LoiPopupMenuReceiver(panel);
}
@@ -328,7 +330,7 @@
configureAxeH(varAbscisse.getNature(), usePresentationFormat);
}
}
-
+
public void initAxeWithDuration(final PropertyNature var, EGAxe axe) {
final ToStringTransformerSecond toStringTransformerSecond = new ToStringTransformerSecond();
final CtuluNumberFormatDefault toSecondFormat = new CtuluNumberFormatDefault(var.getFormatter(DecimalFormatEpsilonEnum.COMPARISON));
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/SecondValueEditor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/SecondValueEditor.java 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/SecondValueEditor.java 2013-04-04 09:44:57 UTC (rev 8379)
@@ -11,9 +11,9 @@
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluDurationFormatter;
import org.fudaa.ctulu.CtuluLibString;
-import org.fudaa.ctulu.CtuluNumberFormatDefault;
+import org.fudaa.ctulu.CtuluNumberFormatI;
import org.fudaa.ctulu.editor.CtuluValueEditorDouble;
-import org.fudaa.dodico.crue.common.time.ToStringTransformerSecond;
+import org.fudaa.dodico.crue.common.time.SecondParser;
/**
*
@@ -21,11 +21,16 @@
*/
public class SecondValueEditor extends CtuluValueEditorDouble {
- final ToStringTransformerSecond transformer;
+ final SecondParser secondParser;
- public SecondValueEditor(ToStringTransformerSecond transformer, CtuluNumberFormatDefault toSecond) {
+ /**
+ *
+ * @param secondParser peut etre null si la date de deb ne l'est pas.
+ * @param toSecond
+ */
+ public SecondValueEditor(SecondParser secondParser, CtuluNumberFormatI toSecond) {
super(false);
- this.transformer = transformer;
+ this.secondParser = secondParser;
setFormatter(toSecond);
}
@@ -98,7 +103,7 @@
return res;
} catch (NumberFormatException numberFormatException) {
}
- Double parse = transformer.parseInSec(_value);
+ Double parse = secondParser == null ? null : secondParser.parseInSec(_value);
if (parse != null) {
return parse;
}
Modified: trunk/soft/fudaa-crue/ui-modelling/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-modelling/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-modelling</artifactId>
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java 2013-04-04 09:44:57 UTC (rev 8379)
@@ -16,6 +16,7 @@
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.ctulu.CtuluLogLevel;
+import org.fudaa.ctulu.CtuluNumberFormatI;
import org.fudaa.dodico.crue.common.time.ToStringTransformerDate;
import org.fudaa.dodico.crue.common.transformer.TransformerHelper;
import org.fudaa.dodico.crue.config.ccm.ConfigLoi;
@@ -39,6 +40,7 @@
import org.fudaa.fudaa.crue.common.log.LogsDisplayer;
import org.fudaa.fudaa.crue.common.services.SysdocContrat;
import org.fudaa.fudaa.crue.common.services.SysdocUrlBuilder;
+import org.fudaa.fudaa.crue.loi.common.SecondValueEditor;
import org.fudaa.fudaa.crue.loi.loiff.LoiUiController;
import org.fudaa.fudaa.crue.modelling.services.EnumModification;
import org.fudaa.fudaa.crue.modelling.services.ScenarioModificationEvent;
@@ -376,7 +378,10 @@
loiUiController.configureAxeH(getCcm(), getCurrentLoi(), false);
} else {
ToStringTransformerDate transformer = new ToStringTransformerDate(dateZeroLoiDF);
- loiUiController.setAxeHSpecificFormats(transformer, loiUiController.getAxeX().getSpecificDetailFormat());
+ final CtuluNumberFormatI detailFormat = loiUiController.getAxeX().getSpecificDetailFormat();
+ SecondValueEditor oldSecondValueEditor = (SecondValueEditor) loiUiController.getAxeX().getValueEditor();
+ SecondValueEditor editor = new SecondValueEditor(transformer, oldSecondValueEditor.getFormatter());
+ loiUiController.setAxeHSpecificFormats(transformer, detailFormat, editor);
}
loiUiController.getTableGraphePanel().updateState();
loiUiController.getGraphe().fullRepaint();
Modified: trunk/soft/fudaa-crue/ui-options/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-options/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-options/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>ui-options</artifactId>
<name>Crue UI Options</name>
Modified: trunk/soft/fudaa-crue/ui-options/src/main/resources/FudaaCrue_Site.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/resources/FudaaCrue_Site.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-options/src/main/resources/FudaaCrue_Site.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -28,6 +28,10 @@
<Commentaire>Nombre maximal de lignes lues dans un CR</Commentaire>
<Valeur>500</Valeur>
</SiteOption>
+ <SiteOption Nom="maxComparisonResultatByEMH" UserVisible="true">
+ <Commentaire>Nombre maximal de différences sur les résultats de calcul par EMH</Commentaire>
+ <Valeur>500</Valeur>
+ </SiteOption>
<SiteOption Nom="crue10.rptr.exeOption" UserVisible="true">
<Commentaire>Crue 10: option pour demande de pre-traitement réseau.</Commentaire>
<Valeur>-r</Valeur>
Modified: trunk/soft/fudaa-crue/ui-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-otfa/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>ui-otfa</artifactId>
Modified: trunk/soft/fudaa-crue/ui-planimetry/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-planimetry/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-planimetry</artifactId>
Modified: trunk/soft/fudaa-crue/ui-post/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-post/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-post/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-post</artifactId>
Modified: trunk/soft/fudaa-crue/ui-report/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-report/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-report/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>ui-report</artifactId>
Modified: trunk/soft/fudaa-crue/ui-study/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-study/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-study/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-study</artifactId>
Modified: trunk/soft/fudaa-crue/ui-sysdoc/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-sysdoc/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>ui-sysdoc</artifactId>
Modified: trunk/soft/fudaa-crue/ui-views/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-views/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-views/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-views</artifactId>
Modified: trunk/soft/fudaa-crue/ui-wrapper/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-wrapper/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>ui-wrapper</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-04-04 09:36:42
|
Revision: 8378
http://fudaa.svn.sourceforge.net/fudaa/?rev=8378&view=rev
Author: deniger
Date: 2013-04-04 09:36:34 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
lors du calcul des min max prend en compte les modeles vides.
Modified Paths:
--------------
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java
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-04-03 21:41:01 UTC (rev 8377)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java 2013-04-04 09:36:34 UTC (rev 8378)
@@ -431,16 +431,18 @@
public boolean ajusteX(final CtuluRange _r) {
double x = getXMin();
boolean r = false;
- final boolean mustChange = _r.isNill();
- if (mustChange || x < _r.min_) {
- r = true;
- _r.min_ = x;
+ if (model_.getNbValues() > 0) {
+ final boolean mustChange = _r.isNill();
+ if (mustChange || x < _r.min_) {
+ r = true;
+ _r.min_ = x;
+ }
+ x = getXMax();
+ if (mustChange || x > _r.max_) {
+ r = true;
+ _r.max_ = x;
+ }
}
- x = getXMax();
- if (mustChange || x > _r.max_) {
- r = true;
- _r.max_ = x;
- }
return r;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-04-03 21:09:48
|
Revision: 8376
http://fudaa.svn.sourceforge.net/fudaa/?rev=8376&view=rev
Author: deniger
Date: 2013-04-03 21:09:35 +0000 (Wed, 03 Apr 2013)
Log Message:
-----------
Correction bugs divers
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-core/src/test/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerMillisTest.java
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/
trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerDate.java
trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerMillis.java
trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerSecond.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerMillis.java
trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerSecond.java
Copied: trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerDate.java (from rev 8335, trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerSecond.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerDate.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerDate.java 2013-04-03 21:09:35 UTC (rev 8376)
@@ -0,0 +1,82 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.common.time;
+
+import org.apache.commons.lang.StringUtils;
+import org.fudaa.ctulu.CtuluNumberFormatI;
+import org.fudaa.dodico.crue.common.transformer.ToStringTransformer;
+import org.fudaa.dodico.crue.common.transformer.ToStringTransformer;
+import org.fudaa.dodico.crue.common.transformer.ToStringTransformer;
+import org.joda.time.LocalDateTime;
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class ToStringTransformerDate implements ToStringTransformer, CtuluNumberFormatI {
+
+ private static final DateTimeFormatter XSD_DATE_FORMATTER = ISODateTimeFormat.dateHourMinuteSecondMillis();
+ LocalDateTime date;
+ ToStringTransformerSecond initTransformer = new ToStringTransformerSecond();
+
+ public static String format(LocalDateTime dateTime) {
+ String formatted = dateTime.toString(XSD_DATE_FORMATTER);
+ return StringUtils.removeEnd(formatted, ".000");
+ }
+
+ public ToStringTransformerDate(LocalDateTime date) {
+ this.date = date;
+ }
+
+ public LocalDateTime getDate() {
+ return date;
+ }
+
+ public void setDate(LocalDateTime date) {
+ this.date = date;
+ }
+
+ /**
+ * @param in in est en second.
+ * @return
+ */
+ @Override
+ public String transform(Object in) {
+ if (in == null) {
+ return StringUtils.EMPTY;
+ }
+ if (date == null) {
+ return initTransformer.transform(in);
+ }
+ Number value = (Number) in;
+ LocalDateTime plusMillis = date.plusMillis((int) (value.doubleValue() * 1000));
+ return plusMillis.toString(XSD_DATE_FORMATTER);
+ }
+
+ @Override
+ public CtuluNumberFormatI getCopy() {
+ return this;
+ }
+
+ @Override
+ public String toLocalizedPattern() {
+ return null;
+ }
+
+ @Override
+ public boolean isDecimal() {
+ return true;
+ }
+
+ @Override
+ public String format(double sec) {
+ if (date == null) {
+ return initTransformer.format(sec);
+ }
+ LocalDateTime plusMillis = date.plusMillis((int) (sec * 1000));
+ return plusMillis.toString(XSD_DATE_FORMATTER);
+ }
+}
Copied: trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerMillis.java (from rev 8335, trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerMillis.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerMillis.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerMillis.java 2013-04-03 21:09:35 UTC (rev 8376)
@@ -0,0 +1,61 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.common.time;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.apache.commons.lang.StringUtils;
+import org.fudaa.dodico.crue.common.transformer.ToStringTransformer;
+import org.joda.time.Period;
+import org.joda.time.PeriodType;
+import org.joda.time.format.PeriodFormatter;
+import org.joda.time.format.PeriodFormatterBuilder;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class ToStringTransformerMillis implements ToStringTransformer {
+
+ PeriodFormatter dureeFormater = new PeriodFormatterBuilder()
+ .appendDays().appendSeparatorIfFieldsBefore(":")
+ .printZeroAlways().minimumPrintedDigits(2).
+ appendHours().printZeroAlways().appendSuffix(":")
+ .appendMinutes().minimumPrintedDigits(2).appendSuffix(":")
+ .appendSecondsWithOptionalMillis().minimumPrintedDigits(2).toFormatter();
+
+ @Override
+ public String transform(Object in) {
+ if (in == null) {
+ return StringUtils.EMPTY;
+ }
+ Long value = (Long) in;
+ return dureeFormater.print(createPeriodFromMillis(value.longValue()));
+ }
+
+ public Double parseInSec(String in) {
+ try {
+ if (in.indexOf('.') < 0) {
+ in = in + ".000";
+ }
+ int countMatches = StringUtils.countMatches(in, ":");
+ if (countMatches == 2) {
+ in = "00:" + in;
+ }
+ final Period parsePeriod = dureeFormater.parsePeriod(in);
+ return parsePeriod == null ? null : Double.valueOf(parsePeriod.toStandardDuration().getMillis() / 1000d);
+ } catch (Exception ex) {
+ Logger.getLogger(ToStringTransformerMillis.class.getName()).log(Level.FINE, "message {0}", ex);
+ }
+ return null;
+ }
+
+ public String format(long millis) {
+ return dureeFormater.print(createPeriodFromMillis(millis));
+ }
+
+ public static Period createPeriodFromMillis(long millis) {
+ return new Period(millis).normalizedStandard(PeriodType.dayTime());
+ }
+}
Copied: trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerSecond.java (from rev 8335, trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerSecond.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerSecond.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerSecond.java 2013-04-03 21:09:35 UTC (rev 8376)
@@ -0,0 +1,51 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.common.time;
+
+import org.apache.commons.lang.StringUtils;
+import org.fudaa.ctulu.CtuluNumberFormatI;
+import org.fudaa.dodico.crue.common.transformer.ToStringTransformer;
+import org.fudaa.dodico.crue.common.transformer.ToStringTransformer;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class ToStringTransformerSecond implements ToStringTransformer, CtuluNumberFormatI {
+
+ ToStringTransformerMillis millis = new ToStringTransformerMillis();
+
+ @Override
+ public String transform(Object in) {
+ if (in == null) {
+ return StringUtils.EMPTY;
+ }
+ Number value = (Number) in;
+ return millis.format((long) (value.doubleValue() * 1000L));
+ }
+
+ @Override
+ public CtuluNumberFormatI getCopy() {
+ return this;
+ }
+
+ @Override
+ public String toLocalizedPattern() {
+ return null;
+ }
+
+ @Override
+ public boolean isDecimal() {
+ return true;
+ }
+
+ @Override
+ public String format(double sec) {
+ return millis.format((long) (sec * 1000L));
+ }
+
+ public double parseInSec(String in) {
+ return millis.parseInSec(in);
+ }
+}
Deleted: trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerMillis.java
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerMillis.java 2013-04-03 13:10:39 UTC (rev 8375)
+++ trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerMillis.java 2013-04-03 21:09:35 UTC (rev 8376)
@@ -1,61 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.dodico.crue.common.transformer;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.apache.commons.lang.StringUtils;
-import org.joda.time.Period;
-import org.joda.time.PeriodType;
-import org.joda.time.format.PeriodFormatter;
-import org.joda.time.format.PeriodFormatterBuilder;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class ToStringTransformerMillis implements ToStringTransformer {
-
- PeriodFormatter dureeFormater = new PeriodFormatterBuilder()
- .appendDays().appendSeparatorIfFieldsBefore(":")
- .printZeroAlways().minimumPrintedDigits(2).
- appendHours().printZeroAlways().appendSuffix(":")
- .appendMinutes().minimumPrintedDigits(2).appendSuffix(":")
- .appendSecondsWithOptionalMillis().minimumPrintedDigits(2).toFormatter();
-
- @Override
- public String transform(Object in) {
- if (in == null) {
- return StringUtils.EMPTY;
- }
- Long value = (Long) in;
- return dureeFormater.print(createPeriodFromMillis(value.longValue()));
- }
-
- public Double parseInSec(String in) {
- try {
- String toUse = in;
- if (in.indexOf('.') < 0) {
- in = in + ".000";
- }
- int countMatches = StringUtils.countMatches(in, ":");
- if (countMatches == 2) {
- in = "00:" + in;
- }
- final Period parsePeriod = dureeFormater.parsePeriod(in);
- return parsePeriod == null ? null : Double.valueOf(parsePeriod.toStandardDuration().getMillis() / 1000d);
- } catch (Exception ex) {
- Logger.getLogger(ToStringTransformerMillis.class.getName()).log(Level.FINE, "message {0}", ex);
- }
- return null;
- }
-
- public String format(long millis) {
- return dureeFormater.print(createPeriodFromMillis(millis));
- }
-
- public static Period createPeriodFromMillis(long millis) {
- return new Period(millis).normalizedStandard(PeriodType.dayTime());
- }
-}
Deleted: trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerSecond.java
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerSecond.java 2013-04-03 13:10:39 UTC (rev 8375)
+++ trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerSecond.java 2013-04-03 21:09:35 UTC (rev 8376)
@@ -1,49 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.dodico.crue.common.transformer;
-
-import org.apache.commons.lang.StringUtils;
-import org.fudaa.ctulu.CtuluNumberFormatI;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class ToStringTransformerSecond implements ToStringTransformer, CtuluNumberFormatI {
-
- ToStringTransformerMillis millis = new ToStringTransformerMillis();
-
- @Override
- public String transform(Object in) {
- if (in == null) {
- return StringUtils.EMPTY;
- }
- Number value = (Number) in;
- return millis.format((long) (value.doubleValue() * 1000L));
- }
-
- @Override
- public CtuluNumberFormatI getCopy() {
- return this;
- }
-
- @Override
- public String toLocalizedPattern() {
- return null;
- }
-
- @Override
- public boolean isDecimal() {
- return true;
- }
-
- @Override
- public String format(double sec) {
- return millis.format((long) (sec * 1000L));
- }
-
- public double parseInSec(String in) {
- return millis.parseInSec(in);
- }
-}
Modified: trunk/soft/fudaa-crue/crue-core/src/test/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerMillisTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/test/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerMillisTest.java 2013-04-03 13:10:39 UTC (rev 8375)
+++ trunk/soft/fudaa-crue/crue-core/src/test/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerMillisTest.java 2013-04-03 21:09:35 UTC (rev 8376)
@@ -3,6 +3,7 @@
*/
package org.fudaa.dodico.crue.common.transformer;
+import org.fudaa.dodico.crue.common.time.ToStringTransformerMillis;
import static org.junit.Assert.*;
import org.junit.Test;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-04-03 12:47:17
|
Revision: 8374
http://fudaa.svn.sourceforge.net/fudaa/?rev=8374&view=rev
Author: deniger
Date: 2013-04-03 12:47:10 +0000 (Wed, 03 Apr 2013)
Log Message:
-----------
sauvegarde de la visibilit?\195?\169 d'une courbe
Modified Paths:
--------------
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.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
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java 2013-04-03 09:45:41 UTC (rev 8373)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java 2013-04-03 12:47:10 UTC (rev 8374)
@@ -214,17 +214,16 @@
int nbSousGraduations_ = 3;
final TickIterator buildUpToDateMainTickIterator() {
-
- if (modeGraduations_ == LOGARITHMIQUE) {
+ if (userIterator != null) {
+ axisIterator_ = userIterator;
+ } else if (modeGraduations_ == LOGARITHMIQUE) {
axisIterator_ = new LogarithmicNumberIterator();
+ ((NumberIterator) axisIterator_).setMaxFractionDigits(2);
} else {
axisIterator_ = new NumberIterator();
+ ((NumberIterator) axisIterator_).setMaxFractionDigits(2);
}
- ((NumberIterator) axisIterator_).setMaxFractionDigits(2);
- final double min = getMinimum();
- final double max = getMaximum();
- final int mode = modeGraduations_;
if (modeGraduations_ == MANUEL_GRADUATIONS) {
axisIterator_.initExact(getMinimum(), getMaximum(), nbPas_, nbSousGraduations_ + 1);
@@ -507,8 +506,10 @@
public boolean isVisible() {
return visible_;
}
+ private TickIterator userIterator;
public final void setAxisIterator(final TickIterator _axisIterator) {
+ this.userIterator = _axisIterator;
axisIterator_ = _axisIterator;
isIteratorUptodate_ = false;
}
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-04-03 09:45:41 UTC (rev 8373)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersist.java 2013-04-03 12:47:10 UTC (rev 8374)
@@ -15,7 +15,7 @@
*/
@XStreamAlias("Curve")
public class EGCourbePersist extends EGPersist {
-
+
@XStreamAlias("Title")
String title_;
@XStreamAlias("IdGroup")
@@ -77,122 +77,137 @@
boolean displayTitle = false;
@XStreamAlias("VerticalLabels")
boolean verticalLabels = false;
-
+ @XStreamAlias("Visible")
+ private Boolean visible = true;
+
public EGCourbePersist() {
}
+ /**
+ *
+ * @return
+ */
+ public boolean isVisible() {
+ //test bizarre pour le compatibilit\xE9 descendante: anciennes versions ne contenants pas cette valeur visible.
+ return visible == null || Boolean.TRUE.equals(visible);
+ }
+
+ public void setVisible(boolean visible) {
+ this.visible = visible;
+ }
+
public TraceLigneModel getLineModel_() {
return lineModel_;
}
-
+
public String getTitle_() {
return title_;
}
-
+
public void setTitle_(String title_) {
this.title_ = title_;
}
-
+
public boolean isNuagePoints() {
return nuagePoints;
}
-
+
public void setNuagePoints(boolean nuagePoints) {
this.nuagePoints = nuagePoints;
}
-
+
public TraceBox getTracebox() {
return tracebox;
}
-
+
public void setTracebox(TraceBox tracebox) {
this.tracebox = tracebox;
}
-
+
public TraceLigneModel gettLigneMarqueur() {
return tLigneMarqueur_;
}
-
+
public void settLigneMarqueur(TraceLigneModel tLigneMarqueur_) {
this.tLigneMarqueur_ = tLigneMarqueur_;
}
-
+
public TraceIconModel getIconeModel() {
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_;
}
-
+
public void setListeMarqueurs(List<EGCourbeMarqueur> listeMarqueurs_) {
this.listeMarqueurs_ = listeMarqueurs_;
}
-
+
public EGCourbeSurfacePersist getSurfacePainter() {
return surfacePainter;
}
-
+
public void setSurfacePainter(EGCourbeSurfacePersist surfacePainter) {
this.surfacePainter = surfacePainter;
}
-
+
public void setLineModel(TraceLigneModel lineModel_) {
this.lineModel_ = lineModel_;
}
-
+
public boolean isDisplayLabels() {
return displayLabels;
}
-
+
public void setDisplayLabels(boolean displayLabels) {
this.displayLabels = displayLabels;
}
-
+
public boolean isVerticalLabels() {
return verticalLabels;
}
-
+
public void setVerticalLabels(boolean verticalLabels) {
this.verticalLabels = verticalLabels;
}
-
+
public boolean isDisplayTitle() {
return displayTitle;
}
-
+
public void setDisplayTitle(boolean displayTitle) {
this.displayTitle = displayTitle;
}
-
+
public String getTitle() {
return title_;
}
-
+
public void setTitle(String _title) {
this.title_ = _title;
}
-
+
public int getIdgroup() {
return Idgroup;
}
-
+
public void setIdgroup(int _idgroup) {
Idgroup = _idgroup;
}
-
+
public int getSpecificIntValue(String string, int defaultValue) {
Object o = getSpecificValue(string);
if (o == null) {
@@ -200,7 +215,7 @@
}
return ((Integer) o).intValue();
}
-
+
public boolean getSpecificBooleanValue(String string) {
Object o = getSpecificValue(string);
return Boolean.TRUE.equals(o);
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-04-03 09:45:41 UTC (rev 8373)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersistBuilder.java 2013-04-03 12:47:10 UTC (rev 8374)
@@ -131,6 +131,7 @@
courbeToModify.setDisplayPointLabels(persist.displayLabels);
courbeToModify.setVerticalLabels(persist.verticalLabels);
courbeToModify.setDisplayTitleOnCurve(persist.displayTitle);
+ courbeToModify.setVisible(persist.isVisible());
}
public final static String X_KEY = "X";
@@ -197,6 +198,7 @@
res.displayLabels = courbe.displayPointLabels_;
res.verticalLabels = courbe.isVerticalLabels();
res.displayTitle = courbe.displayTitleOnCurve_;
+ res.setVisible(courbe.isVisible_);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-04-03 09:45:48
|
Revision: 8373
http://fudaa.svn.sourceforge.net/fudaa/?rev=8373&view=rev
Author: deniger
Date: 2013-04-03 09:45:41 +0000 (Wed, 03 Apr 2013)
Log Message:
-----------
Ajout d'un iterator sur un tableau d'entier
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/FixedIntegerIterator.java
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/FixedIntegerIterator.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/FixedIntegerIterator.java 2013-04-03 09:22:49 UTC (rev 8372)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/FixedIntegerIterator.java 2013-04-03 09:45:41 UTC (rev 8373)
@@ -37,7 +37,7 @@
*/
public FixedIntegerIterator(int[] values) {
this.values = values == null ? FuEmptyArrays.INT0 : CtuluLibArray.copy(values);
- Arrays.sort(values);
+ Arrays.sort(this.values);
}
public FixedIntegerIterator(final FixedIntegerIterator _it) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-04-03 09:22:59
|
Revision: 8372
http://fudaa.svn.sourceforge.net/fudaa/?rev=8372&view=rev
Author: deniger
Date: 2013-04-03 09:22:49 +0000 (Wed, 03 Apr 2013)
Log Message:
-----------
Ajout d'un iterator sur un tableau d'entier
Added Paths:
-----------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/FixedIntegerIterator.java
Removed Paths:
-------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/FixedIntegerIterator.java
Deleted: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/FixedIntegerIterator.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/FixedIntegerIterator.java 2013-04-03 09:21:33 UTC (rev 8371)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/FixedIntegerIterator.java 2013-04-03 09:22:49 UTC (rev 8372)
@@ -1,227 +0,0 @@
-/*
- */
-package org.fudaa.ctulu.iterator;
-
-// Miscellaneous
-import com.memoire.fu.FuEmptyArrays;
-import java.util.Arrays;
-import org.apache.commons.lang.StringUtils;
-import org.fudaa.ctulu.CtuluLibArray;
-
-/**
- */
-public class FixedIntegerIterator implements TickIterator {
-
- private final int[] values;
- /**
- * Pour eviter les loop infinie.
- */
- private static final int MAX_ITERATION = 200;
- int iterationDone_;
- /**
- * Valeur limite des graduations. La derni\xE8re graduation n'aura pas n\xE9cessairement cette valeur. Cette valeur est fix\xE9e par {@link #init}.
- */
- private int maximum_;
- /**
- * Valeur de la premi\xE8re graduation principale. Cette valeur est fix\xE9e par {@link #init}.
- */
- private int minimum_;
- /**
- * Index de la graduation principale en cours de tra\xE7age. Cette valeur commence \xE0 0 et sera modifi\xE9e \xE0 chaque appel \xE0 {@link #next}.
- */
- private int idx;
-
- /**
- * Construit un it\xE9rateur par d\xE9faut. La m\xE9thode {@link #init(double, double, float, float)}<u>doit </u> \xEAtre appel\xE9e avant que cet it\xE9rateur ne
- * soit utilisable.
- */
- public FixedIntegerIterator(int[] values) {
- this.values = values == null ? FuEmptyArrays.INT0 : CtuluLibArray.copy(values);
- Arrays.sort(values);
- }
-
- public FixedIntegerIterator(final FixedIntegerIterator _it) {
- this.values = _it.values;
- initFrom(_it);
- // this.locale = locale;
- }
-
- protected final void initFrom(final FixedIntegerIterator _it) {
- if (_it != null) {
- maximum_ = _it.maximum_;
- minimum_ = _it.minimum_;
- idx = _it.idx;
- }
- }
-
- /**
- * Initialise l'it\xE9rateur.
- *
- * @param _minimum Valeur minimale de la premi\xE8re graduation.
- * @param _maximum Valeur limite des graduations. La derni\xE8re graduation n'aura pas n\xE9cessairement cette valeur.
- * @param _visualLength Longueur visuelle de l'axe sur laquelle tracer la graduation. Cette longueur doit \xEAtre exprim\xE9e en pixels ou en points.
- * @param _visualTickSpacing Espace \xE0 laisser visuellement entre deux marques de graduation. Cet espace doit \xEAtre exprim\xE9 en pixels ou en points
- * (1/72 de pouce).
- */
- protected void init(final double _minimum, final double _maximum, final float _visualLength,
- final float _visualTickSpacing) {
- if (_minimum == this.minimum_ && _maximum == this.maximum_) {
- rewind();
- return;
- }
- AssertValues.ensureFinite("minimum", _minimum);
- AssertValues.ensureFinite("maximum", _maximum);
- minimum_ = (int) Math.min(_minimum, _maximum);
- maximum_ = (int) Math.max(_minimum, _maximum);
-
- initCounters();
- }
-
- @Override
- public void initExact(double _min, double _max, int _nbIteration, int _nbSousIteration) {
- initExactCommon(_min, _max, _nbSousIteration);
- }
-
- private void initExactCommon(double _min, double _max, int _nbSousIteration) {
- minimum_ = (int) Math.min(_min, _max);
- maximum_ = (int) Math.max(_min, _max);
- initCounters();
- }
-
- @Override
- public void initExactFromDist(double _min, double _max, double _increment, int _nbSousIteration) {
- initExactCommon(_min, _max, _nbSousIteration);
-
- }
-
- @Override
- public final Object clone() throws CloneNotSupportedException {
- final FixedIntegerIterator res = (FixedIntegerIterator) super.clone();
- res.initFrom(this);
- return res;
- }
-
- /**
- * Retourne l'\xE9tiquette de la graduation courante. On n'appele g\xE9n\xE9ralement cette m\xE9thode que pour les graduations majeures, mais elle peut aussi
- * \xEAtre appel\xE9e pour les graduations mineures. Cette m\xE9thode retourne
- * <code>null</code> s'il n'y a pas d'\xE9tiquette pour la graduation courante.
- */
- @Override
- public String currentLabel() {
- if (idx >= 0 && idx < values.length) {
- return Integer.toString(values[idx]);
- }
- return StringUtils.EMPTY;
- }
-
- /**
- * Returns the position where to draw the current tick. The position is scaled from the graduation's minimum to maximum. This is usually the same
- * number than {@link #currentValue}. The mean exception is for logarithmic graduation, in which the tick position is not proportional to the tick
- * value.
- */
- @Override
- public double currentPosition() {
- if (idx >= 0 && idx < values.length) {
- return values[idx];
- }
- return Double.NaN;
- }
-
- /**
- * Retourne la valeur de la graduation courante. Cette m\xE9thode peut \xEAtre appel\xE9e pour une graduation majeure ou mineure.
- */
- @Override
- public double currentValue() {
- return currentPosition();
- }
-
- @Override
- public String formatSubValue(final double _v) {
- return Integer.toString((int) _v);
- }
-
- @Override
- public String formatValue(final double _v) {
- return Integer.toString((int) _v);
- }
-
- @Override
- public double getIncrement() {
- return 1;
- }
-
- /**
- * Indique s'il reste des graduations \xE0 retourner. Cette m\xE9thode retourne
- * <code>true</code> tant que {@link #currentValue}ou {@link #currentLabel}peuvent \xEAtre appel\xE9es.
- */
- @Override
- public boolean hasNext() {
- return iterationDone_ < MAX_ITERATION && idx >= 0 && idx < values.length && values[idx] <= maximum_;
- }
-
- /**
- * Initialise l'it\xE9rateur.
- *
- * @param _minimum Valeur minimale de la premi\xE8re graduation.
- * @param _maximum Valeur limite des graduations. La derni\xE8re graduation n'aura pas n\xE9cessairement cette valeur.
- * @param _nbTick le nombre de graduation
- */
- @Override
- public void init(final double _minimum, final double _maximum, final int _nbTick) {
- init(_minimum, _maximum, _nbTick <= 1 ? DEFAULT_STICK_NUMBER : _nbTick, 1);
- }
-
- /**
- * Indique si la graduation courante est une graduation majeure.
- *
- * @return <code>true</code> si la graduation courante est une graduation majeure, ou <code>false</code> si elle est une graduation mineure.
- */
- @Override
- public boolean isMajorTick() {
- return true;
- }
-
- @Override
- public double getValueFromPosition(final double _v) {
- return _v;
- }
-
- @Override
- public double getPositionFromValue(final double _v) {
- return _v;
- }
-
- /**
- * Passe \xE0 la graduation suivante.
- */
- @Override
- public void next() {
- iterationDone_++;
- idx++;
- }
-
- /**
- * Passe directement \xE0 la graduation majeure suivante.
- */
- @Override
- public void nextMajor() {
- next();
- }
-
- /**
- * Replace l'it\xE9rateur sur la premi\xE8re graduation.
- */
- @Override
- public void rewind() {
- initCounters();
- }
-
- public void initCounters() {
- idx = Arrays.binarySearch(values, minimum_);
- if (idx < 0) {
- idx = -idx - 1;
- }
-
- iterationDone_ = 0;
- }
-}
\ No newline at end of file
Copied: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/FixedIntegerIterator.java (from rev 8335, trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/NumberIterator.java)
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/FixedIntegerIterator.java (rev 0)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/FixedIntegerIterator.java 2013-04-03 09:22:49 UTC (rev 8372)
@@ -0,0 +1,227 @@
+/*
+ */
+package org.fudaa.ctulu.iterator;
+
+// Miscellaneous
+import com.memoire.fu.FuEmptyArrays;
+import java.util.Arrays;
+import org.apache.commons.lang.StringUtils;
+import org.fudaa.ctulu.CtuluLibArray;
+
+/**
+ */
+public class FixedIntegerIterator implements TickIterator {
+
+ private final int[] values;
+ /**
+ * Pour eviter les loop infinie.
+ */
+ private static final int MAX_ITERATION = 200;
+ int iterationDone_;
+ /**
+ * Valeur limite des graduations. La derni\xE8re graduation n'aura pas n\xE9cessairement cette valeur. Cette valeur est fix\xE9e par {@link #init}.
+ */
+ private int maximum_;
+ /**
+ * Valeur de la premi\xE8re graduation principale. Cette valeur est fix\xE9e par {@link #init}.
+ */
+ private int minimum_;
+ /**
+ * Index de la graduation principale en cours de tra\xE7age. Cette valeur commence \xE0 0 et sera modifi\xE9e \xE0 chaque appel \xE0 {@link #next}.
+ */
+ private int idx;
+
+ /**
+ * Construit un it\xE9rateur par d\xE9faut. La m\xE9thode {@link #init(double, double, float, float)}<u>doit </u> \xEAtre appel\xE9e avant que cet it\xE9rateur ne
+ * soit utilisable.
+ */
+ public FixedIntegerIterator(int[] values) {
+ this.values = values == null ? FuEmptyArrays.INT0 : CtuluLibArray.copy(values);
+ Arrays.sort(values);
+ }
+
+ public FixedIntegerIterator(final FixedIntegerIterator _it) {
+ this.values = _it.values;
+ initFrom(_it);
+ // this.locale = locale;
+ }
+
+ protected final void initFrom(final FixedIntegerIterator _it) {
+ if (_it != null) {
+ maximum_ = _it.maximum_;
+ minimum_ = _it.minimum_;
+ idx = _it.idx;
+ }
+ }
+
+ /**
+ * Initialise l'it\xE9rateur.
+ *
+ * @param _minimum Valeur minimale de la premi\xE8re graduation.
+ * @param _maximum Valeur limite des graduations. La derni\xE8re graduation n'aura pas n\xE9cessairement cette valeur.
+ * @param _visualLength Longueur visuelle de l'axe sur laquelle tracer la graduation. Cette longueur doit \xEAtre exprim\xE9e en pixels ou en points.
+ * @param _visualTickSpacing Espace \xE0 laisser visuellement entre deux marques de graduation. Cet espace doit \xEAtre exprim\xE9 en pixels ou en points
+ * (1/72 de pouce).
+ */
+ protected void init(final double _minimum, final double _maximum, final float _visualLength,
+ final float _visualTickSpacing) {
+ if (_minimum == this.minimum_ && _maximum == this.maximum_) {
+ rewind();
+ return;
+ }
+ AssertValues.ensureFinite("minimum", _minimum);
+ AssertValues.ensureFinite("maximum", _maximum);
+ minimum_ = (int) Math.min(_minimum, _maximum);
+ maximum_ = (int) Math.max(_minimum, _maximum);
+
+ initCounters();
+ }
+
+ @Override
+ public void initExact(double _min, double _max, int _nbIteration, int _nbSousIteration) {
+ initExactCommon(_min, _max, _nbSousIteration);
+ }
+
+ private void initExactCommon(double _min, double _max, int _nbSousIteration) {
+ minimum_ = (int) Math.min(_min, _max);
+ maximum_ = (int) Math.max(_min, _max);
+ initCounters();
+ }
+
+ @Override
+ public void initExactFromDist(double _min, double _max, double _increment, int _nbSousIteration) {
+ initExactCommon(_min, _max, _nbSousIteration);
+
+ }
+
+ @Override
+ public final Object clone() throws CloneNotSupportedException {
+ final FixedIntegerIterator res = (FixedIntegerIterator) super.clone();
+ res.initFrom(this);
+ return res;
+ }
+
+ /**
+ * Retourne l'\xE9tiquette de la graduation courante. On n'appele g\xE9n\xE9ralement cette m\xE9thode que pour les graduations majeures, mais elle peut aussi
+ * \xEAtre appel\xE9e pour les graduations mineures. Cette m\xE9thode retourne
+ * <code>null</code> s'il n'y a pas d'\xE9tiquette pour la graduation courante.
+ */
+ @Override
+ public String currentLabel() {
+ if (idx >= 0 && idx < values.length) {
+ return Integer.toString(values[idx]);
+ }
+ return StringUtils.EMPTY;
+ }
+
+ /**
+ * Returns the position where to draw the current tick. The position is scaled from the graduation's minimum to maximum. This is usually the same
+ * number than {@link #currentValue}. The mean exception is for logarithmic graduation, in which the tick position is not proportional to the tick
+ * value.
+ */
+ @Override
+ public double currentPosition() {
+ if (idx >= 0 && idx < values.length) {
+ return values[idx];
+ }
+ return Double.NaN;
+ }
+
+ /**
+ * Retourne la valeur de la graduation courante. Cette m\xE9thode peut \xEAtre appel\xE9e pour une graduation majeure ou mineure.
+ */
+ @Override
+ public double currentValue() {
+ return currentPosition();
+ }
+
+ @Override
+ public String formatSubValue(final double _v) {
+ return Integer.toString((int) _v);
+ }
+
+ @Override
+ public String formatValue(final double _v) {
+ return Integer.toString((int) _v);
+ }
+
+ @Override
+ public double getIncrement() {
+ return 1;
+ }
+
+ /**
+ * Indique s'il reste des graduations \xE0 retourner. Cette m\xE9thode retourne
+ * <code>true</code> tant que {@link #currentValue}ou {@link #currentLabel}peuvent \xEAtre appel\xE9es.
+ */
+ @Override
+ public boolean hasNext() {
+ return iterationDone_ < MAX_ITERATION && idx >= 0 && idx < values.length && values[idx] <= maximum_;
+ }
+
+ /**
+ * Initialise l'it\xE9rateur.
+ *
+ * @param _minimum Valeur minimale de la premi\xE8re graduation.
+ * @param _maximum Valeur limite des graduations. La derni\xE8re graduation n'aura pas n\xE9cessairement cette valeur.
+ * @param _nbTick le nombre de graduation
+ */
+ @Override
+ public void init(final double _minimum, final double _maximum, final int _nbTick) {
+ init(_minimum, _maximum, _nbTick <= 1 ? DEFAULT_STICK_NUMBER : _nbTick, 1);
+ }
+
+ /**
+ * Indique si la graduation courante est une graduation majeure.
+ *
+ * @return <code>true</code> si la graduation courante est une graduation majeure, ou <code>false</code> si elle est une graduation mineure.
+ */
+ @Override
+ public boolean isMajorTick() {
+ return true;
+ }
+
+ @Override
+ public double getValueFromPosition(final double _v) {
+ return _v;
+ }
+
+ @Override
+ public double getPositionFromValue(final double _v) {
+ return _v;
+ }
+
+ /**
+ * Passe \xE0 la graduation suivante.
+ */
+ @Override
+ public void next() {
+ iterationDone_++;
+ idx++;
+ }
+
+ /**
+ * Passe directement \xE0 la graduation majeure suivante.
+ */
+ @Override
+ public void nextMajor() {
+ next();
+ }
+
+ /**
+ * Replace l'it\xE9rateur sur la premi\xE8re graduation.
+ */
+ @Override
+ public void rewind() {
+ initCounters();
+ }
+
+ public void initCounters() {
+ idx = Arrays.binarySearch(values, minimum_);
+ if (idx < 0) {
+ idx = -idx - 1;
+ }
+
+ iterationDone_ = 0;
+ }
+}
\ 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-04-03 09:21:41
|
Revision: 8371
http://fudaa.svn.sourceforge.net/fudaa/?rev=8371&view=rev
Author: deniger
Date: 2013-04-03 09:21:33 +0000 (Wed, 03 Apr 2013)
Log Message:
-----------
Ajout d'un iterator sur un tableau d'entier
Added Paths:
-----------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/FixedIntegerIterator.java
Removed Paths:
-------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/FixedIntegerIterator.java
Deleted: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/FixedIntegerIterator.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/FixedIntegerIterator.java 2013-04-03 09:20:14 UTC (rev 8370)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/FixedIntegerIterator.java 2013-04-03 09:21:33 UTC (rev 8371)
@@ -1,262 +0,0 @@
-/*
- * Geotools 2 - OpenSource mapping toolkit
- * (C) 2003, Geotools Project Managment Committee (PMC)
- * (C) 2000, Institut de Recherche pour le D\xE9veloppement
- * (C) 1999, P\xEAches et Oc\xE9ans Canada
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- *
- * Contacts:
- * UNITED KINGDOM: James Macgill
- * mailto:j.m...@ge...
- * FRANCE: Surveillance de l'Environnement Assist\xE9e par Satellite
- * Institut de Recherche pour le D\xE9veloppement / US-Espace
- * mailto:se...@te...
- *
- * CANADA: Observatoire du Saint-Laurent
- * Institut Maurice-Lamontagne
- * mailto:os...@os...
- */
-package org.fudaa.ctulu.iterator;
-
-// Miscellaneous
-import com.memoire.fu.FuEmptyArrays;
-import java.util.Arrays;
-import org.apache.commons.lang.StringUtils;
-import org.fudaa.ctulu.CtuluLibArray;
-
-/**
- * It\xE9rateur balayant les barres et \xE9tiquettes de graduation d'un axe. Cet it\xE9rateur retourne les positions des graduations \xE0 partir de la valeur
- * minimale jusqu'\xE0 la valeur maximale.
- *
- * @version $Id: NumberIterator.java,v 1.1 2007-01-17 10:45:26 deniger Exp $
- * @author Martin Desruisseaux
- */
-public class FixedIntegerIterator implements TickIterator {
-
- private final int[] values;
- /**
- * Pour eviter les loop infinie.
- */
- private static final int MAX_ITERATION = 200;
- int iterationDone_;
- /**
- * Valeur limite des graduations. La derni\xE8re graduation n'aura pas n\xE9cessairement cette valeur. Cette valeur est fix\xE9e par {@link #init}.
- */
- private int maximum_;
- /**
- * Valeur de la premi\xE8re graduation principale. Cette valeur est fix\xE9e par {@link #init}.
- */
- private int minimum_;
- /**
- * Index de la graduation principale en cours de tra\xE7age. Cette valeur commence \xE0 0 et sera modifi\xE9e \xE0 chaque appel \xE0 {@link #next}.
- */
- private int idx;
-
- /**
- * Construit un it\xE9rateur par d\xE9faut. La m\xE9thode {@link #init(double, double, float, float)}<u>doit </u> \xEAtre appel\xE9e avant que cet it\xE9rateur ne
- * soit utilisable.
- */
- public FixedIntegerIterator(int[] values) {
- this.values = values == null ? FuEmptyArrays.INT0 : CtuluLibArray.copy(values);
- Arrays.sort(values);
- }
-
- public FixedIntegerIterator(final FixedIntegerIterator _it) {
- this.values = _it.values;
- initFrom(_it);
- // this.locale = locale;
- }
-
- protected final void initFrom(final FixedIntegerIterator _it) {
- if (_it != null) {
- maximum_ = _it.maximum_;
- minimum_ = _it.minimum_;
- idx = _it.idx;
- }
- }
-
- /**
- * Initialise l'it\xE9rateur.
- *
- * @param _minimum Valeur minimale de la premi\xE8re graduation.
- * @param _maximum Valeur limite des graduations. La derni\xE8re graduation n'aura pas n\xE9cessairement cette valeur.
- * @param _visualLength Longueur visuelle de l'axe sur laquelle tracer la graduation. Cette longueur doit \xEAtre exprim\xE9e en pixels ou en points.
- * @param _visualTickSpacing Espace \xE0 laisser visuellement entre deux marques de graduation. Cet espace doit \xEAtre exprim\xE9 en pixels ou en points
- * (1/72 de pouce).
- */
- protected void init(final double _minimum, final double _maximum, final float _visualLength,
- final float _visualTickSpacing) {
- if (_minimum == this.minimum_ && _maximum == this.maximum_) {
- rewind();
- return;
- }
- AssertValues.ensureFinite("minimum", _minimum);
- AssertValues.ensureFinite("maximum", _maximum);
- minimum_ = (int) Math.min(_minimum, _maximum);
- maximum_ = (int) Math.max(_minimum, _maximum);
-
- initCounters();
- }
-
- @Override
- public void initExact(double _min, double _max, int _nbIteration, int _nbSousIteration) {
- initExactCommon(_min, _max, _nbSousIteration);
- }
-
- private void initExactCommon(double _min, double _max, int _nbSousIteration) {
- minimum_ = (int) Math.min(_min, _max);
- maximum_ = (int) Math.max(_min, _max);
- initCounters();
- }
-
- @Override
- public void initExactFromDist(double _min, double _max, double _increment, int _nbSousIteration) {
- initExactCommon(_min, _max, _nbSousIteration);
-
- }
-
- @Override
- public final Object clone() throws CloneNotSupportedException {
- final FixedIntegerIterator res = (FixedIntegerIterator) super.clone();
- res.initFrom(this);
- return res;
- }
-
- /**
- * Retourne l'\xE9tiquette de la graduation courante. On n'appele g\xE9n\xE9ralement cette m\xE9thode que pour les graduations majeures, mais elle peut aussi
- * \xEAtre appel\xE9e pour les graduations mineures. Cette m\xE9thode retourne
- * <code>null</code> s'il n'y a pas d'\xE9tiquette pour la graduation courante.
- */
- @Override
- public String currentLabel() {
- if (idx >= 0 && idx < values.length) {
- return Integer.toString(values[idx]);
- }
- return StringUtils.EMPTY;
- }
-
- /**
- * Returns the position where to draw the current tick. The position is scaled from the graduation's minimum to maximum. This is usually the same
- * number than {@link #currentValue}. The mean exception is for logarithmic graduation, in which the tick position is not proportional to the tick
- * value.
- */
- @Override
- public double currentPosition() {
- if (idx >= 0 && idx < values.length) {
- return values[idx];
- }
- return Double.NaN;
- }
-
- /**
- * Retourne la valeur de la graduation courante. Cette m\xE9thode peut \xEAtre appel\xE9e pour une graduation majeure ou mineure.
- */
- @Override
- public double currentValue() {
- return currentPosition();
- }
-
- @Override
- public String formatSubValue(final double _v) {
- return Integer.toString((int) _v);
- }
-
- @Override
- public String formatValue(final double _v) {
- return Integer.toString((int) _v);
- }
-
- @Override
- public double getIncrement() {
- return 1;
- }
-
- /**
- * Indique s'il reste des graduations \xE0 retourner. Cette m\xE9thode retourne
- * <code>true</code> tant que {@link #currentValue}ou {@link #currentLabel}peuvent \xEAtre appel\xE9es.
- */
- @Override
- public boolean hasNext() {
- return iterationDone_ < MAX_ITERATION && idx >= 0 && idx < values.length && values[idx] <= maximum_;
- }
-
- /**
- * Initialise l'it\xE9rateur.
- *
- * @param _minimum Valeur minimale de la premi\xE8re graduation.
- * @param _maximum Valeur limite des graduations. La derni\xE8re graduation n'aura pas n\xE9cessairement cette valeur.
- * @param _nbTick le nombre de graduation
- */
- @Override
- public void init(final double _minimum, final double _maximum, final int _nbTick) {
- init(_minimum, _maximum, _nbTick <= 1 ? DEFAULT_STICK_NUMBER : _nbTick, 1);
- }
-
- /**
- * Indique si la graduation courante est une graduation majeure.
- *
- * @return <code>true</code> si la graduation courante est une graduation majeure, ou <code>false</code> si elle est une graduation mineure.
- */
- @Override
- public boolean isMajorTick() {
- return true;
- }
-
- @Override
- public double getValueFromPosition(final double _v) {
- return _v;
- }
-
- @Override
- public double getPositionFromValue(final double _v) {
- return _v;
- }
-
- /**
- * Passe \xE0 la graduation suivante.
- */
- @Override
- public void next() {
- iterationDone_++;
- idx++;
- }
-
- /**
- * Passe directement \xE0 la graduation majeure suivante.
- */
- @Override
- public void nextMajor() {
- next();
- }
-
- /**
- * Replace l'it\xE9rateur sur la premi\xE8re graduation.
- */
- @Override
- public void rewind() {
- initCounters();
- }
-
- public void initCounters() {
- idx = Arrays.binarySearch(values, minimum_);
- if (idx < 0) {
- idx = -idx - 1;
- }
-
- iterationDone_ = 0;
- }
-}
\ No newline at end of file
Copied: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/FixedIntegerIterator.java (from rev 8335, trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/NumberIterator.java)
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/FixedIntegerIterator.java (rev 0)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/FixedIntegerIterator.java 2013-04-03 09:21:33 UTC (rev 8371)
@@ -0,0 +1,227 @@
+/*
+ */
+package org.fudaa.ctulu.iterator;
+
+// Miscellaneous
+import com.memoire.fu.FuEmptyArrays;
+import java.util.Arrays;
+import org.apache.commons.lang.StringUtils;
+import org.fudaa.ctulu.CtuluLibArray;
+
+/**
+ */
+public class FixedIntegerIterator implements TickIterator {
+
+ private final int[] values;
+ /**
+ * Pour eviter les loop infinie.
+ */
+ private static final int MAX_ITERATION = 200;
+ int iterationDone_;
+ /**
+ * Valeur limite des graduations. La derni\xE8re graduation n'aura pas n\xE9cessairement cette valeur. Cette valeur est fix\xE9e par {@link #init}.
+ */
+ private int maximum_;
+ /**
+ * Valeur de la premi\xE8re graduation principale. Cette valeur est fix\xE9e par {@link #init}.
+ */
+ private int minimum_;
+ /**
+ * Index de la graduation principale en cours de tra\xE7age. Cette valeur commence \xE0 0 et sera modifi\xE9e \xE0 chaque appel \xE0 {@link #next}.
+ */
+ private int idx;
+
+ /**
+ * Construit un it\xE9rateur par d\xE9faut. La m\xE9thode {@link #init(double, double, float, float)}<u>doit </u> \xEAtre appel\xE9e avant que cet it\xE9rateur ne
+ * soit utilisable.
+ */
+ public FixedIntegerIterator(int[] values) {
+ this.values = values == null ? FuEmptyArrays.INT0 : CtuluLibArray.copy(values);
+ Arrays.sort(values);
+ }
+
+ public FixedIntegerIterator(final FixedIntegerIterator _it) {
+ this.values = _it.values;
+ initFrom(_it);
+ // this.locale = locale;
+ }
+
+ protected final void initFrom(final FixedIntegerIterator _it) {
+ if (_it != null) {
+ maximum_ = _it.maximum_;
+ minimum_ = _it.minimum_;
+ idx = _it.idx;
+ }
+ }
+
+ /**
+ * Initialise l'it\xE9rateur.
+ *
+ * @param _minimum Valeur minimale de la premi\xE8re graduation.
+ * @param _maximum Valeur limite des graduations. La derni\xE8re graduation n'aura pas n\xE9cessairement cette valeur.
+ * @param _visualLength Longueur visuelle de l'axe sur laquelle tracer la graduation. Cette longueur doit \xEAtre exprim\xE9e en pixels ou en points.
+ * @param _visualTickSpacing Espace \xE0 laisser visuellement entre deux marques de graduation. Cet espace doit \xEAtre exprim\xE9 en pixels ou en points
+ * (1/72 de pouce).
+ */
+ protected void init(final double _minimum, final double _maximum, final float _visualLength,
+ final float _visualTickSpacing) {
+ if (_minimum == this.minimum_ && _maximum == this.maximum_) {
+ rewind();
+ return;
+ }
+ AssertValues.ensureFinite("minimum", _minimum);
+ AssertValues.ensureFinite("maximum", _maximum);
+ minimum_ = (int) Math.min(_minimum, _maximum);
+ maximum_ = (int) Math.max(_minimum, _maximum);
+
+ initCounters();
+ }
+
+ @Override
+ public void initExact(double _min, double _max, int _nbIteration, int _nbSousIteration) {
+ initExactCommon(_min, _max, _nbSousIteration);
+ }
+
+ private void initExactCommon(double _min, double _max, int _nbSousIteration) {
+ minimum_ = (int) Math.min(_min, _max);
+ maximum_ = (int) Math.max(_min, _max);
+ initCounters();
+ }
+
+ @Override
+ public void initExactFromDist(double _min, double _max, double _increment, int _nbSousIteration) {
+ initExactCommon(_min, _max, _nbSousIteration);
+
+ }
+
+ @Override
+ public final Object clone() throws CloneNotSupportedException {
+ final FixedIntegerIterator res = (FixedIntegerIterator) super.clone();
+ res.initFrom(this);
+ return res;
+ }
+
+ /**
+ * Retourne l'\xE9tiquette de la graduation courante. On n'appele g\xE9n\xE9ralement cette m\xE9thode que pour les graduations majeures, mais elle peut aussi
+ * \xEAtre appel\xE9e pour les graduations mineures. Cette m\xE9thode retourne
+ * <code>null</code> s'il n'y a pas d'\xE9tiquette pour la graduation courante.
+ */
+ @Override
+ public String currentLabel() {
+ if (idx >= 0 && idx < values.length) {
+ return Integer.toString(values[idx]);
+ }
+ return StringUtils.EMPTY;
+ }
+
+ /**
+ * Returns the position where to draw the current tick. The position is scaled from the graduation's minimum to maximum. This is usually the same
+ * number than {@link #currentValue}. The mean exception is for logarithmic graduation, in which the tick position is not proportional to the tick
+ * value.
+ */
+ @Override
+ public double currentPosition() {
+ if (idx >= 0 && idx < values.length) {
+ return values[idx];
+ }
+ return Double.NaN;
+ }
+
+ /**
+ * Retourne la valeur de la graduation courante. Cette m\xE9thode peut \xEAtre appel\xE9e pour une graduation majeure ou mineure.
+ */
+ @Override
+ public double currentValue() {
+ return currentPosition();
+ }
+
+ @Override
+ public String formatSubValue(final double _v) {
+ return Integer.toString((int) _v);
+ }
+
+ @Override
+ public String formatValue(final double _v) {
+ return Integer.toString((int) _v);
+ }
+
+ @Override
+ public double getIncrement() {
+ return 1;
+ }
+
+ /**
+ * Indique s'il reste des graduations \xE0 retourner. Cette m\xE9thode retourne
+ * <code>true</code> tant que {@link #currentValue}ou {@link #currentLabel}peuvent \xEAtre appel\xE9es.
+ */
+ @Override
+ public boolean hasNext() {
+ return iterationDone_ < MAX_ITERATION && idx >= 0 && idx < values.length && values[idx] <= maximum_;
+ }
+
+ /**
+ * Initialise l'it\xE9rateur.
+ *
+ * @param _minimum Valeur minimale de la premi\xE8re graduation.
+ * @param _maximum Valeur limite des graduations. La derni\xE8re graduation n'aura pas n\xE9cessairement cette valeur.
+ * @param _nbTick le nombre de graduation
+ */
+ @Override
+ public void init(final double _minimum, final double _maximum, final int _nbTick) {
+ init(_minimum, _maximum, _nbTick <= 1 ? DEFAULT_STICK_NUMBER : _nbTick, 1);
+ }
+
+ /**
+ * Indique si la graduation courante est une graduation majeure.
+ *
+ * @return <code>true</code> si la graduation courante est une graduation majeure, ou <code>false</code> si elle est une graduation mineure.
+ */
+ @Override
+ public boolean isMajorTick() {
+ return true;
+ }
+
+ @Override
+ public double getValueFromPosition(final double _v) {
+ return _v;
+ }
+
+ @Override
+ public double getPositionFromValue(final double _v) {
+ return _v;
+ }
+
+ /**
+ * Passe \xE0 la graduation suivante.
+ */
+ @Override
+ public void next() {
+ iterationDone_++;
+ idx++;
+ }
+
+ /**
+ * Passe directement \xE0 la graduation majeure suivante.
+ */
+ @Override
+ public void nextMajor() {
+ next();
+ }
+
+ /**
+ * Replace l'it\xE9rateur sur la premi\xE8re graduation.
+ */
+ @Override
+ public void rewind() {
+ initCounters();
+ }
+
+ public void initCounters() {
+ idx = Arrays.binarySearch(values, minimum_);
+ if (idx < 0) {
+ idx = -idx - 1;
+ }
+
+ iterationDone_ = 0;
+ }
+}
\ 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-04-03 09:20:23
|
Revision: 8370
http://fudaa.svn.sourceforge.net/fudaa/?rev=8370&view=rev
Author: deniger
Date: 2013-04-03 09:20:14 +0000 (Wed, 03 Apr 2013)
Log Message:
-----------
Ajout d'un iterator sur un tableau d'entier
Added Paths:
-----------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/FixedIntegerIterator.java
trunk/framework/ctulu-common/src/test/java/org/fudaa/ctulu/iterator/
trunk/framework/ctulu-common/src/test/java/org/fudaa/ctulu/iterator/FixedIntegerIteratorTest.java
Copied: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/FixedIntegerIterator.java (from rev 8335, trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/NumberIterator.java)
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/FixedIntegerIterator.java (rev 0)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/iterator/FixedIntegerIterator.java 2013-04-03 09:20:14 UTC (rev 8370)
@@ -0,0 +1,262 @@
+/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+ * (C) 2000, Institut de Recherche pour le D\xE9veloppement
+ * (C) 1999, P\xEAches et Oc\xE9ans Canada
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ *
+ * Contacts:
+ * UNITED KINGDOM: James Macgill
+ * mailto:j.m...@ge...
+ * FRANCE: Surveillance de l'Environnement Assist\xE9e par Satellite
+ * Institut de Recherche pour le D\xE9veloppement / US-Espace
+ * mailto:se...@te...
+ *
+ * CANADA: Observatoire du Saint-Laurent
+ * Institut Maurice-Lamontagne
+ * mailto:os...@os...
+ */
+package org.fudaa.ctulu.iterator;
+
+// Miscellaneous
+import com.memoire.fu.FuEmptyArrays;
+import java.util.Arrays;
+import org.apache.commons.lang.StringUtils;
+import org.fudaa.ctulu.CtuluLibArray;
+
+/**
+ * It\xE9rateur balayant les barres et \xE9tiquettes de graduation d'un axe. Cet it\xE9rateur retourne les positions des graduations \xE0 partir de la valeur
+ * minimale jusqu'\xE0 la valeur maximale.
+ *
+ * @version $Id: NumberIterator.java,v 1.1 2007-01-17 10:45:26 deniger Exp $
+ * @author Martin Desruisseaux
+ */
+public class FixedIntegerIterator implements TickIterator {
+
+ private final int[] values;
+ /**
+ * Pour eviter les loop infinie.
+ */
+ private static final int MAX_ITERATION = 200;
+ int iterationDone_;
+ /**
+ * Valeur limite des graduations. La derni\xE8re graduation n'aura pas n\xE9cessairement cette valeur. Cette valeur est fix\xE9e par {@link #init}.
+ */
+ private int maximum_;
+ /**
+ * Valeur de la premi\xE8re graduation principale. Cette valeur est fix\xE9e par {@link #init}.
+ */
+ private int minimum_;
+ /**
+ * Index de la graduation principale en cours de tra\xE7age. Cette valeur commence \xE0 0 et sera modifi\xE9e \xE0 chaque appel \xE0 {@link #next}.
+ */
+ private int idx;
+
+ /**
+ * Construit un it\xE9rateur par d\xE9faut. La m\xE9thode {@link #init(double, double, float, float)}<u>doit </u> \xEAtre appel\xE9e avant que cet it\xE9rateur ne
+ * soit utilisable.
+ */
+ public FixedIntegerIterator(int[] values) {
+ this.values = values == null ? FuEmptyArrays.INT0 : CtuluLibArray.copy(values);
+ Arrays.sort(values);
+ }
+
+ public FixedIntegerIterator(final FixedIntegerIterator _it) {
+ this.values = _it.values;
+ initFrom(_it);
+ // this.locale = locale;
+ }
+
+ protected final void initFrom(final FixedIntegerIterator _it) {
+ if (_it != null) {
+ maximum_ = _it.maximum_;
+ minimum_ = _it.minimum_;
+ idx = _it.idx;
+ }
+ }
+
+ /**
+ * Initialise l'it\xE9rateur.
+ *
+ * @param _minimum Valeur minimale de la premi\xE8re graduation.
+ * @param _maximum Valeur limite des graduations. La derni\xE8re graduation n'aura pas n\xE9cessairement cette valeur.
+ * @param _visualLength Longueur visuelle de l'axe sur laquelle tracer la graduation. Cette longueur doit \xEAtre exprim\xE9e en pixels ou en points.
+ * @param _visualTickSpacing Espace \xE0 laisser visuellement entre deux marques de graduation. Cet espace doit \xEAtre exprim\xE9 en pixels ou en points
+ * (1/72 de pouce).
+ */
+ protected void init(final double _minimum, final double _maximum, final float _visualLength,
+ final float _visualTickSpacing) {
+ if (_minimum == this.minimum_ && _maximum == this.maximum_) {
+ rewind();
+ return;
+ }
+ AssertValues.ensureFinite("minimum", _minimum);
+ AssertValues.ensureFinite("maximum", _maximum);
+ minimum_ = (int) Math.min(_minimum, _maximum);
+ maximum_ = (int) Math.max(_minimum, _maximum);
+
+ initCounters();
+ }
+
+ @Override
+ public void initExact(double _min, double _max, int _nbIteration, int _nbSousIteration) {
+ initExactCommon(_min, _max, _nbSousIteration);
+ }
+
+ private void initExactCommon(double _min, double _max, int _nbSousIteration) {
+ minimum_ = (int) Math.min(_min, _max);
+ maximum_ = (int) Math.max(_min, _max);
+ initCounters();
+ }
+
+ @Override
+ public void initExactFromDist(double _min, double _max, double _increment, int _nbSousIteration) {
+ initExactCommon(_min, _max, _nbSousIteration);
+
+ }
+
+ @Override
+ public final Object clone() throws CloneNotSupportedException {
+ final FixedIntegerIterator res = (FixedIntegerIterator) super.clone();
+ res.initFrom(this);
+ return res;
+ }
+
+ /**
+ * Retourne l'\xE9tiquette de la graduation courante. On n'appele g\xE9n\xE9ralement cette m\xE9thode que pour les graduations majeures, mais elle peut aussi
+ * \xEAtre appel\xE9e pour les graduations mineures. Cette m\xE9thode retourne
+ * <code>null</code> s'il n'y a pas d'\xE9tiquette pour la graduation courante.
+ */
+ @Override
+ public String currentLabel() {
+ if (idx >= 0 && idx < values.length) {
+ return Integer.toString(values[idx]);
+ }
+ return StringUtils.EMPTY;
+ }
+
+ /**
+ * Returns the position where to draw the current tick. The position is scaled from the graduation's minimum to maximum. This is usually the same
+ * number than {@link #currentValue}. The mean exception is for logarithmic graduation, in which the tick position is not proportional to the tick
+ * value.
+ */
+ @Override
+ public double currentPosition() {
+ if (idx >= 0 && idx < values.length) {
+ return values[idx];
+ }
+ return Double.NaN;
+ }
+
+ /**
+ * Retourne la valeur de la graduation courante. Cette m\xE9thode peut \xEAtre appel\xE9e pour une graduation majeure ou mineure.
+ */
+ @Override
+ public double currentValue() {
+ return currentPosition();
+ }
+
+ @Override
+ public String formatSubValue(final double _v) {
+ return Integer.toString((int) _v);
+ }
+
+ @Override
+ public String formatValue(final double _v) {
+ return Integer.toString((int) _v);
+ }
+
+ @Override
+ public double getIncrement() {
+ return 1;
+ }
+
+ /**
+ * Indique s'il reste des graduations \xE0 retourner. Cette m\xE9thode retourne
+ * <code>true</code> tant que {@link #currentValue}ou {@link #currentLabel}peuvent \xEAtre appel\xE9es.
+ */
+ @Override
+ public boolean hasNext() {
+ return iterationDone_ < MAX_ITERATION && idx >= 0 && idx < values.length && values[idx] <= maximum_;
+ }
+
+ /**
+ * Initialise l'it\xE9rateur.
+ *
+ * @param _minimum Valeur minimale de la premi\xE8re graduation.
+ * @param _maximum Valeur limite des graduations. La derni\xE8re graduation n'aura pas n\xE9cessairement cette valeur.
+ * @param _nbTick le nombre de graduation
+ */
+ @Override
+ public void init(final double _minimum, final double _maximum, final int _nbTick) {
+ init(_minimum, _maximum, _nbTick <= 1 ? DEFAULT_STICK_NUMBER : _nbTick, 1);
+ }
+
+ /**
+ * Indique si la graduation courante est une graduation majeure.
+ *
+ * @return <code>true</code> si la graduation courante est une graduation majeure, ou <code>false</code> si elle est une graduation mineure.
+ */
+ @Override
+ public boolean isMajorTick() {
+ return true;
+ }
+
+ @Override
+ public double getValueFromPosition(final double _v) {
+ return _v;
+ }
+
+ @Override
+ public double getPositionFromValue(final double _v) {
+ return _v;
+ }
+
+ /**
+ * Passe \xE0 la graduation suivante.
+ */
+ @Override
+ public void next() {
+ iterationDone_++;
+ idx++;
+ }
+
+ /**
+ * Passe directement \xE0 la graduation majeure suivante.
+ */
+ @Override
+ public void nextMajor() {
+ next();
+ }
+
+ /**
+ * Replace l'it\xE9rateur sur la premi\xE8re graduation.
+ */
+ @Override
+ public void rewind() {
+ initCounters();
+ }
+
+ public void initCounters() {
+ idx = Arrays.binarySearch(values, minimum_);
+ if (idx < 0) {
+ idx = -idx - 1;
+ }
+
+ iterationDone_ = 0;
+ }
+}
\ No newline at end of file
Added: trunk/framework/ctulu-common/src/test/java/org/fudaa/ctulu/iterator/FixedIntegerIteratorTest.java
===================================================================
--- trunk/framework/ctulu-common/src/test/java/org/fudaa/ctulu/iterator/FixedIntegerIteratorTest.java (rev 0)
+++ trunk/framework/ctulu-common/src/test/java/org/fudaa/ctulu/iterator/FixedIntegerIteratorTest.java 2013-04-03 09:20:14 UTC (rev 8370)
@@ -0,0 +1,60 @@
+/*
+ GPL 2
+ */
+package org.fudaa.ctulu.iterator;
+
+import java.util.ArrayList;
+import java.util.List;
+import junit.framework.TestCase;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class FixedIntegerIteratorTest extends TestCase {
+
+ public void testIterate() {
+ int[] values = new int[]{-1, 1, 10, 100};
+ FixedIntegerIterator iterator = new FixedIntegerIterator(values);
+ iterator.init(-100, 1000, 1);
+ assertTrue(iterator.hasNext());
+ assertEquals(-1, (int) iterator.currentValue());
+
+
+ List<String> readValues = getValuesForIterator(iterator);
+ assertSame(readValues, new String[]{"-1", "1", "10", "100"});
+
+ iterator.init(-1, 1000, 1);
+ readValues = getValuesForIterator(iterator);
+ assertSame(readValues, new String[]{"-1", "1", "10", "100"});
+
+ iterator.init(-1, 99, 1);
+ readValues = getValuesForIterator(iterator);
+ assertSame(readValues, new String[]{"-1", "1", "10"});
+
+
+ iterator.init(9, 99, 1);
+ readValues = getValuesForIterator(iterator);
+ assertSame(readValues, new String[]{"10"});
+
+
+ iterator.init(101, 1000, 1);
+ readValues = getValuesForIterator(iterator);
+ assertTrue(readValues.isEmpty());
+ }
+
+ private List<String> getValuesForIterator(FixedIntegerIterator iterator) {
+ List<String> readValues = new ArrayList<String>();
+ for (final TickIterator it = iterator; it.hasNext(); it.next()) {
+ readValues.add(iterator.currentLabel());
+ }
+ return readValues;
+ }
+
+ public void assertSame(List<String> readValues, String[] expectedValues) {
+ assertEquals(readValues.size(), expectedValues.length);
+ for (int i = 0; i < expectedValues.length; i++) {
+ assertEquals(expectedValues[i], readValues.get(i));
+ }
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-04-02 15:59:49
|
Revision: 8369
http://fudaa.svn.sourceforge.net/fudaa/?rev=8369&view=rev
Author: deniger
Date: 2013-04-02 15:59:38 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
Support donn?\195?\169es issues de GGCrue
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/ConvertCompare.java
trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/config/ConfCompareListe.java
trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/io/ReaderConfig.java
trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterIsIncludeCollection.java
trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/ResultatTest.java
trunk/soft/fudaa-crue/crue-compare/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml
trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/Dde.java
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdRes.java
trunk/soft/fudaa-crue/pom.xml
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceProfilSectionImporterAction.java
Modified: trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/ConvertCompare.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/ConvertCompare.java 2013-04-02 15:27:26 UTC (rev 8368)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/ConvertCompare.java 2013-04-02 15:59:38 UTC (rev 8369)
@@ -109,6 +109,7 @@
final ConfCompareListe inObject = (ConfCompareListe) in;
final EqualsTesterIsIncludeCollection res = new EqualsTesterIsIncludeCollection(inObject.getAttribut(), inObject
.isBidirect());
+ res.setPrefixDiffMessageId(inObject.getDiffTranslation());
computeOptions(inObject, res.getContextFactory(), analyze);
return new ExecuteCompareActionOnList(res, false);
} else if (ConfCompareListeOrder.class.equals(inClass)) {
Modified: trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/config/ConfCompareListe.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/config/ConfCompareListe.java 2013-04-02 15:27:26 UTC (rev 8368)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/config/ConfCompareListe.java 2013-04-02 15:59:38 UTC (rev 8369)
@@ -8,7 +8,8 @@
public class ConfCompareListe extends AbstractConfCompare {
private String attribut;
-
+ //si non null doit contenir le prefix pour l'id du message contenant la traduction.
+ private String diffTranslation;
private boolean bidirect;
/**
@@ -18,6 +19,15 @@
return attribut;
}
+ public String getDiffTranslation() {
+ return diffTranslation;
+ }
+
+ public void setDiffTranslation(String diffTranslation) {
+ this.diffTranslation = diffTranslation;
+ }
+
+
/**
* @param attribut the attribut to set
*/
@@ -38,5 +48,4 @@
public void setBidirect(boolean bidirect) {
this.bidirect = bidirect;
}
-
}
Modified: trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/io/ReaderConfig.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/io/ReaderConfig.java 2013-04-02 15:27:26 UTC (rev 8368)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/io/ReaderConfig.java 2013-04-02 15:59:38 UTC (rev 8369)
@@ -34,7 +34,6 @@
public class ReaderConfig {
private final static Logger LOGGER = Logger.getLogger(ReaderConfig.class.getName());
-
private CtuluLog analyze;
public CtuluLog getAnalyze() {
@@ -63,9 +62,8 @@
}
} catch (final Exception e) {
analyze.addSevereError("file.read.error", file, e.getMessage());
- LOGGER.log(Level.SEVERE,"read " + file, e);
- }
- finally{
+ LOGGER.log(Level.SEVERE, "read " + file, e);
+ } finally {
CtuluLibFile.close(in);
}
return res;
@@ -105,6 +103,7 @@
xstream.alias("Compare-Liste", ConfCompareListe.class);
xstream.aliasAttribute(ConfCompareListe.class, "attribut", "Attribut");
xstream.aliasAttribute(ConfCompareListe.class, "bidirect", "Bidirect");
+ xstream.aliasAttribute(ConfCompareListe.class, "diffTranslation", "DiffTranslation");
xstream.alias("Compare-Liste-Order", ConfCompareListeOrder.class);
xstream.aliasAttribute(ConfCompareListeOrder.class, "attribut", "Attribut");
xstream.aliasAttribute(ConfCompareListeOrder.class, "onlyIfSameList", "OnlyIfSameList");
@@ -130,12 +129,10 @@
public Object fromString(String arg0) {
return StringUtils.trim(arg0);
}
-
}
private Converter createSingleValueConverterRequete() {
return new Converter() {
-
@Override
public boolean canConvert(final Class arg0) {
return ConfSelectionItemRequete.class.equals(arg0);
Modified: trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterIsIncludeCollection.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterIsIncludeCollection.java 2013-04-02 15:27:26 UTC (rev 8368)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterIsIncludeCollection.java 2013-04-02 15:59:38 UTC (rev 8369)
@@ -29,6 +29,9 @@
private static final String DIFF_INCLUDE_DANS_A_PAS_DANS_B = BusinessMessages
.getString("diff.include.dansA.pasDansB");
private final String propName;
+ private String prefixDiffMessageId;
+ private String diffMessageIdDansBPasDansA;
+ private String diffMessageIdDansAPasDansB;
/**
* @return the propName
@@ -37,6 +40,27 @@
return propName;
}
+ private String getDansAPasDansB() {
+ if (prefixDiffMessageId == null) {
+ return DIFF_INCLUDE_DANS_A_PAS_DANS_B;
+ }
+ if (diffMessageIdDansAPasDansB == null) {
+ diffMessageIdDansAPasDansB = BusinessMessages.getString(prefixDiffMessageId + ".dansA.pasDansB");
+ }
+ return diffMessageIdDansAPasDansB;
+
+ }
+
+ private String getDansBPasDansA() {
+ if (prefixDiffMessageId == null) {
+ return DIFF_INCLUDE_DANS_B_PAS_DANS_A;
+ }
+ if (diffMessageIdDansBPasDansA == null) {
+ diffMessageIdDansBPasDansA = BusinessMessages.getString(prefixDiffMessageId + ".dansB.pasDansA");
+ }
+ return diffMessageIdDansBPasDansA;
+ }
+
/**
* @return the bidirect
*/
@@ -80,13 +104,13 @@
list.subList(0, nbMaxItemInDiff);
}
if (CollectionUtils.isNotEmpty(subtract)) {
- addDiff(DIFF_INCLUDE_DANS_A_PAS_DANS_B, res, toString(subtract), StringUtils.EMPTY);
+ addDiff(getDansAPasDansB(), res, toString(subtract), StringUtils.EMPTY);
resFinal = false;
}
if (bidirect) {
subtract = CollectionUtils.subtract(propInB, propInA);
if (CollectionUtils.isNotEmpty(subtract)) {
- addDiff(DIFF_INCLUDE_DANS_B_PAS_DANS_A, res, StringUtils.EMPTY, toString(subtract));
+ addDiff(getDansBPasDansA(), res, StringUtils.EMPTY, toString(subtract));
resFinal = false;
}
}
@@ -100,4 +124,12 @@
res.addDiff(new ResultatTest(obj1, obj2, msg, true));
}
}
+
+ public String getPrefixDiffMessageId() {
+ return prefixDiffMessageId;
+ }
+
+ public void setPrefixDiffMessageId(String prefixDiffMessageId) {
+ this.prefixDiffMessageId = prefixDiffMessageId;
+ }
}
Modified: trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/ResultatTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/ResultatTest.java 2013-04-02 15:27:26 UTC (rev 8368)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/ResultatTest.java 2013-04-02 15:59:38 UTC (rev 8369)
@@ -188,11 +188,11 @@
return String.class.equals(c) || Double.class.equals(c) || Integer.class.equals(c);
}
- public void setMsg(final String msg) {
+ public final void setMsg(final String msg) {
setMsg(msg, null);
}
- public void setMsg(final String msg, final Object... msgArguments) {
+ public final void setMsg(final String msg, final Object... msgArguments) {
this.msg = msg;
this.msgArguments = msgArguments;
}
Modified: trunk/soft/fudaa-crue/crue-compare/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml 2013-04-02 15:27:26 UTC (rev 8368)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml 2013-04-02 15:59:38 UTC (rev 8369)
@@ -2,29 +2,29 @@
<Comparaisons xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue
http://www.fudaa.fr/xsd/crue/comparaison-1.0.0.xsd">
<!--
- Dans toutes les requetes, on part de EMHScenario. On a ajouté des
- methodes pour faciliter les requetes
- -->
+ Dans toutes les requetes, on part de EMHScenario. On a ajouté des
+ methodes pour faciliter les requetes
+ -->
<Comparaison>
<Id>DRSO1.1</Id>
<Nom>Quelle EMH, présente (et active) dans A, est absente (ou inactive) dans B</Nom>
<Selection>
<!--
- allSimpleEMH donne la liste des tous les EMH simple (non conteneur)
- contenu par les sous-modeles du scenario
- -->
+ allSimpleEMH donne la liste des tous les EMH simple (non conteneur)
+ contenu par les sous-modeles du scenario
+ -->
<!--
- allSimpleEMH[actuallyActive='true'] signifie que l'on ne recupere que les EMH qui sont
- actives
- -->
+ allSimpleEMH[actuallyActive='true'] signifie que l'on ne recupere que les EMH qui sont
+ actives
+ -->
<Requete Description="EMH active">
allSimpleEMH[actuallyActive='true']
</Requete>
</Selection>
<!--
- Compare-Liste Attribut="id": signifie que dans les listes obtenues on
- teste si l'id dans la liste A est présent dans B
- -->
+ Compare-Liste Attribut="id": signifie que dans les listes obtenues on
+ teste si l'id dans la liste A est présent dans B
+ -->
<!-- Bidirect="true" signifie que l'on fait le test dans les 2 sens-->
<Compare-Liste Bidirect="true" Attribut="id" />
</Comparaison>
@@ -43,9 +43,9 @@
<Nom>Quelle EMH, présente dans A et B, a un type différent</Nom>
<Selection>
<!--
- Merge signifie que l'on va "merger" le contenu de la requete "allSimpleEMH" et faire concorder les EMH qui ont le même Id Attribut="Id" La comparaison portera sur toutes les
- EMH qui ont même id
- -->
+ Merge signifie que l'on va "merger" le contenu de la requete "allSimpleEMH" et faire concorder les EMH qui ont le même Id Attribut="Id" La comparaison portera sur toutes les
+ EMH qui ont même id
+ -->
<Merge Attribut="id" Description="EMH présente dans A et B de même Id">
<Requete Description="Toutes les EMH">allSimpleEMH[actuallyActive='true']
</Requete>
@@ -80,9 +80,9 @@
</Merge>
</Selection>
<!--
- La classe CatEMHNoeud possede une methode idCasier qui renvoie
- l'identifiant du casier attache
- -->
+ La classe CatEMHNoeud possede une methode idCasier qui renvoie
+ l'identifiant du casier attache
+ -->
<Compare-Objet>
<Attribut>idCasier</Attribut>
</Compare-Objet>
@@ -99,8 +99,8 @@
<Requete Description="Toutes les sections de la branche">sections</Requete>
</Selection>
<!--
- On compare les id des emh contenues par les relations
- -->
+ On compare les id des emh contenues par les relations
+ -->
<Compare-Liste Bidirect="true" Attribut="emhId" />
</Comparaison>
<Comparaison>
@@ -118,8 +118,8 @@
</Merge>
</Selection>
<!--
- On compare les xp
- -->
+ On compare les xp
+ -->
<Compare-Objet>
<Attribut>xp</Attribut>
<Attribut>pos</Attribut>
@@ -140,9 +140,9 @@
</Merge>
</Selection>
<!--
- On compare les 3 coefficients. En ne mettant rien, on compare toutes
- les propriétés
- -->
+ On compare les 3 coefficients. En ne mettant rien, on compare toutes
+ les propriétés
+ -->
<Compare-Objet>
<Attribut>coefConv</Attribut>
<Attribut>coefDiv</Attribut>
@@ -156,9 +156,9 @@
<Requete Description="Tous les noeuds">noeuds[actuallyActive='true']</Requete>
</Selection>
<!--
- On compare les 3 coefficients. En ne mettant rien, on compare toutes
- les propriétés
- -->
+ On compare les 3 coefficients. En ne mettant rien, on compare toutes
+ les propriétés
+ -->
<Compare-Liste-Order Attribut="id" />
</Comparaison>
<Comparaison>
@@ -211,10 +211,10 @@
</Requete>
</Merge>
<!--
- les EMH ont une methode getDPTG qui liste toutes les DonPrtGeo qui
- sont nommées: soit DonPrtGeoBatiCasier,
- DonPrtGeoProfilCasier,DonPrtGeoProfilSection
- -->
+ les EMH ont une methode getDPTG qui liste toutes les DonPrtGeo qui
+ sont nommées: soit DonPrtGeoBatiCasier,
+ DonPrtGeoProfilCasier,DonPrtGeoProfilSection
+ -->
<Requete Description="Les dptg nommés">DPTGNommes</Requete>
</Selection>
<Compare-Liste Bidirect="true" Attribut="id" />
@@ -233,9 +233,9 @@
</Merge>
</Selection>
<!--
- Par defaut le Compare-Objet ne compare que les attributs simple de premier niveau Pour descendre dans l'arborescence d'objet il est possible d'utiliser le paramètre deep. Par
- exemple: <Compare-Objet Deep="2"/> si on ne veut pas de limite, il faut utiliser la valeur -1
- -->
+ Par defaut le Compare-Objet ne compare que les attributs simple de premier niveau Pour descendre dans l'arborescence d'objet il est possible d'utiliser le paramètre deep. Par
+ exemple: <Compare-Objet Deep="2"/> si on ne veut pas de limite, il faut utiliser la valeur -1
+ -->
<Compare-Objet Deep="1">
<AttributToIgnore>nombreLitNumerote</AttributToIgnore>
</Compare-Objet>
@@ -347,10 +347,10 @@
<Requete Description="Les LitNumerote">litNumerote</Requete>
</Selection>
<!--
- On va descendre dans l'arborescence des objets Deep permet de
- controler le nombre d'étage a descendre. Deep=-1 signifie que l'on ne
- s'arrete pas.
- -->
+ On va descendre dans l'arborescence des objets Deep permet de
+ controler le nombre d'étage a descendre. Deep=-1 signifie que l'on ne
+ s'arrete pas.
+ -->
<Compare-Objet Deep="-1">
<Attribut>frotId</Attribut>
<Option>
@@ -606,9 +606,9 @@
<Nom>Quel calcul, présent (et utilisé) dans A, est absent (ou inutilisé) dans B</Nom>
<Selection>
<!--
- un calcul est utilise s'il appartient a un Ordre de calcul du
- scenario?
- -->
+ un calcul est utilise s'il appartient a un Ordre de calcul du
+ scenario?
+ -->
<Requete Description="tous les calculs utilisés">
ordCalcScenario/ordCalc/calc
</Requete>
@@ -682,9 +682,9 @@
</Requete>
</Selection>
<!--
- Compare-Liste Attribut="id" : signifie que dans les listes obtenues
- on teste si l'id dans la liste A est présent dans B
- -->
+ Compare-Liste Attribut="id" : signifie que dans les listes obtenues
+ on teste si l'id dans la liste A est présent dans B
+ -->
<!-- Bidirect="true" signifie que l'on fait le test dans les 2 sens-->
<Compare-Liste Bidirect="true" Attribut="id" />
</Comparaison>
@@ -737,11 +737,17 @@
<Id>ORES1</Id>
<Nom>Quelles demandes de résultat sont différentes entre les scénarios A et B</Nom>
<Selection>
- <Requete Description="Les OrdRes du scenario">
- ordResScenario
+ <Merge Attribut="key" Description="Les OrdRes de même id">
+ <Requete Description="Les OrdRes du scenario">
+ ordResScenario/listOfOrdRes
+ </Requete>
+ </Merge>
+ <Requete Description="Les OrdRes actives">
+ activeOrdResDisplayName
</Requete>
</Selection>
- <Compare-Objet Deep="2" />
+ <!--DiffTranslation= permet de préciser le préfixe à utiliser pour les différences trouvées dans des listes-->
+ <Compare-Liste Bidirect="true" DiffTranslation="diff.include.oresActive"/>
</Comparaison>
<Comparaison>
@@ -866,9 +872,9 @@
</Compare-Objet>
</Comparaison>
<!--
- Attention, pour que cette comparaison fonctionne, il faut qu'il y le
- meme nombre de modele
- -->
+ Attention, pour que cette comparaison fonctionne, il faut qu'il y le
+ meme nombre de modele
+ -->
<Comparaison>
<Id>OPTG2</Id>
<Nom>Quel modèle, présent dans A et B, a des listes de règles à vérifier différentes</Nom>
Modified: trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2013-04-02 15:27:26 UTC (rev 8368)
+++ trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2013-04-02 15:59:38 UTC (rev 8369)
@@ -241,6 +241,8 @@
diff.include.dansA.pasDansB = Des objets sont pr\u00e9sents dans A et pas dans B
diff.include.dansB.pasDansA = Des objets sont pr\u00e9sents dans B et pas dans A
+diff.include.oresActive.dansA.pasDansB=Des OrdRes sont actives dans A et pas dans B
+diff.include.oresActive.dansB.pasDansA=Des OrdRes sont actives dans B et pas dans A
compare.nbPdt.diff=Le nombre de pas de temps est diff\u00e9rent
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/Dde.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/Dde.java 2013-04-02 15:27:26 UTC (rev 8368)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/Dde.java 2013-04-02 15:59:38 UTC (rev 8369)
@@ -1,5 +1,6 @@
package org.fudaa.dodico.crue.metier.emh;
+import org.apache.commons.lang.StringUtils;
import org.fudaa.dodico.crue.common.contrat.ObjetWithID;
/**
@@ -21,6 +22,10 @@
return getNom();
}
+ public String getDisplayName() {
+ return StringUtils.capitalize(getNom());
+ }
+
@Override
public int hashCode() {
int hash = 7 + (valeur ? 8 : 101);
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdRes.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdRes.java 2013-04-02 15:27:26 UTC (rev 8368)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdRes.java 2013-04-02 15:59:38 UTC (rev 8369)
@@ -104,12 +104,12 @@
}
@UsedByComparison
- public List<String> getActiveOrdRes() {
+ public List<String> getActiveOrdResDisplayName() {
Collection<Dde> ddes = values.values();
ArrayList<String> res = new ArrayList<String>();
for (Dde dde : ddes) {
if (dde.isValeur()) {
- res.add(dde.getId());
+ res.add(dde.getDisplayName());
}
}
return res;
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2013-04-02 15:27:26 UTC (rev 8368)
+++ trunk/soft/fudaa-crue/pom.xml 2013-04-02 15:59:38 UTC (rev 8369)
@@ -18,8 +18,8 @@
<properties>
<projetEncoding>UTF-8</projetEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <javaCompiler>1.6</javaCompiler>
- <targetJdk>1.6</targetJdk>
+ <javaCompiler>1.7</javaCompiler>
+ <targetJdk>1.7</targetJdk>
<fudaa-sig.version>1.4-SNAPSHOT</fudaa-sig.version>
<netbeans.run.params.ide/>
<netbeans.run.params>${netbeans.run.params.ide}</netbeans.run.params>
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceProfilSectionImporterAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceProfilSectionImporterAction.java 2013-04-02 15:27:26 UTC (rev 8368)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceProfilSectionImporterAction.java 2013-04-02 15:59:38 UTC (rev 8369)
@@ -40,7 +40,7 @@
PlanimetryController controller;
public TraceProfilSectionImporterAction(PlanimetryController controller) {
- super(NbBundle.getMessage(TraceProfilSectionImporterAction.class, "TraceProfilImporterAction.ActioName"), null, "IMPORT");
+ super(NbBundle.getMessage(TraceProfilSectionImporterAction.class, "TraceProfilImporterAction.ActionName"), null, "IMPORT");
assert controller != null;
this.controller = controller;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-04-02 15:27:33
|
Revision: 8368
http://fudaa.svn.sourceforge.net/fudaa/?rev=8368&view=rev
Author: deniger
Date: 2013-04-02 15:27:26 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
Support donn?\195?\169es issues de GGCrue
Modified Paths:
--------------
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGFillePanel.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGFillePanel.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGFillePanel.java 2013-04-02 15:26:47 UTC (rev 8367)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGFillePanel.java 2013-04-02 15:27:26 UTC (rev 8368)
@@ -56,7 +56,7 @@
*/
public class EGFillePanel extends BuPanel implements PropertyChangeListener, ActionListener, CtuluSelectionInterface,
CtuluImageProducer {
-
+
protected final EGVue vue_;
JLabel lbTools_;
EbliActionInterface[] personnalAction_;
@@ -69,7 +69,7 @@
public EGFillePanel(final EGGraphe _a) {
this(_a, null);
}
-
+
public EGFillePanel duplicate() {
return new EGFillePanel(vue_.getGraphe().duplicate());
}
@@ -81,12 +81,12 @@
EbliLib.cleanListener(personnalAction_);
EbliLib.cleanListener(specificTools_);
}
-
+
public void addSelectionListener(final CtuluListSelectionListener _l) {
selection_.addSelectionListener(_l);
-
+
}
-
+
public EGFillePanel(final EGGraphe _a, final EbliActionInterface[] _userAction) {
setLayout(new BuBorderLayout(5, 0));
personnalAction_ = _userAction;
@@ -101,7 +101,7 @@
lbTools_.setPreferredSize(new Dimension(200, 20));
lbTools_.setSize(new Dimension(100, 20));
lbTools_.setOpaque(false);
-
+
add(lbTools_, BuBorderLayout.SOUTH);
vue_ = new EGVue(_a);
add(vue_, BuBorderLayout.CENTER);
@@ -110,7 +110,7 @@
// suiviInfos_ = new EGInteractionSuiviAllOrdonnees(vue_.getGraphe());
}
-
+
protected void addListenerCourbePoint(final CtuluListSelectionListener _l) {
selection_.getSelection().addListeSelectionListener(_l);
}
@@ -131,7 +131,7 @@
r.add(a);
selection_.addPropertyChangeListener(this);
actionForGroup.add(a);
-
+
EbliActionAbstract s = new EbliActionSimple(EbliResource.EBLI.getString("Restaurer"), EbliResource.EBLI
.getIcon("restore"), "RESTORE") {
@Override
@@ -166,7 +166,7 @@
r.add(a);
actionForGroup.add(a);
zoom.addPropertyChangeListener(this);
-
+
final EGInteractionMove move = new EGInteractionMove(vue_.graphe_);
move.setDefaultInteractiveComponent(selection_);
vue_.addInteractiveCmp(move);
@@ -175,14 +175,14 @@
a.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('m'));
r.add(a);
actionForGroup.add(a);
-
+
final EGInteractionInfoOnCourbe infoOnCourbe = new EGInteractionInfoOnCourbe(vue_.graphe_);
vue_.addInteractiveCmp(infoOnCourbe);
a = new EGActionInteraction(EbliLib.getS("Afficher le nom de la courbe sous la souris"), EbliResource.EBLI.getIcon("tooltip"), "INFO", infoOnCourbe);
a.putValue(Action.SHORT_DESCRIPTION, EbliLib.getS("Afficher le nom de la courbe sous la souris"));
a.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('n'));
r.add(a);
-
+
final EGInteractionSuivi suivi = new EGInteractionSuivi(vue_.getGraphe());
vue_.addInteractiveCmp(suivi);
a = new EGActionInteraction(EbliLib.getS("suivi"), EbliResource.EBLI.getIcon("pointeur"), "SUIVI", suivi);
@@ -193,7 +193,7 @@
actionForGroup.add(a);
EbliActionSimple actionpal = new EGActionPaletteAllCoordonnees(this);
r.add(actionpal);
-
+
if (getModel().isContentModifiable()) {
r.add(null);
final EGInteractionAddPoint addPt = new EGInteractionAddPoint(this);
@@ -212,7 +212,7 @@
r.add(a);
pt.addPropertyChangeListener(this);
actionForGroup.add(a);
-
+
EbliActionSimple act = new EGSimplificationAction(vue_.graphe_);
r.add(act);
r.add(null);
@@ -225,18 +225,18 @@
@Override
public void actionPerformed(ActionEvent _e) {
EGPaletteLegendeGraphe palette = new EGPaletteLegendeGraphe(getGraphe());
- palette.setPreferredSize(new Dimension(500, 600));
+ palette.setBtRefreshTitleVisible(showRefreshButtonInConfigurePanel);
+ palette.setPreferredSize(new Dimension(500, 800));
palette.afficheModale(CtuluLibSwing.getFrameAncestor(EGFillePanel.this));
-
}
});
-
+
final BPaletteInfoAbstractAction info = new BPaletteInfoAbstractAction() {
@Override
public JComponent buildContentPane() {
return new EGPaletteInfo(EGFillePanel.this, null);
}
-
+
@Override
protected boolean mustBeUpdated() {
return getModel().getNbSelectedObjects() >= 0;
@@ -244,9 +244,9 @@
};
r.add(info);
r.add(new EGTableAction(getGraphe()));
-
+
new EbliActionGroup(actionForGroup);
-
+
if (personnalAction_ != null) {
r.add(null);
final int nb = personnalAction_.length;
@@ -271,43 +271,43 @@
| InputEvent.SHIFT_DOWN_MASK));
r.add(addAction);
}
-
+
final EbliActionInterface[] rf = new EbliActionInterface[r.size()];
r.toArray(rf);
EbliLib.updateMapKeyStroke(this, rf);
-
+
return rf;
}
-
+
protected EGCourbe getCourbeSelected() {
return vue_.graphe_.getSelectedComponent();
}
-
+
public EGGraphe getGraphe() {
return vue_.graphe_;
}
-
+
protected EGGrapheModel getModel() {
return vue_.graphe_.getModel();
}
-
+
public CtuluListSelection getSelection() {
return selection_.getSelection();
}
-
+
public void majSelectionListener(final EGTableGraphePanel _tablePanel) {
if ((selection_ != null) && (_tablePanel != null)) {
_tablePanel.setListenerToSelection(selection_);
}
}
-
+
protected void majLabelInfo(final String _s) {
lbTools_.setText(_s);
}
-
+
protected void fillPopupMenu(final BuPopupMenu _menu) {
}
-
+
public void popupMenu(final int _x, final int _y) {
final BuPopupMenu m = new BuPopupMenu();
m.setInvoker(this);
@@ -317,7 +317,7 @@
fillSpecificMenu(m);
m.show(this, _x, _y);
}
-
+
@Override
public void actionPerformed(final ActionEvent _evt) {
if (FuLog.isTrace()) {
@@ -389,7 +389,7 @@
}
}
}
-
+
@Override
public void find() {
}
@@ -401,23 +401,32 @@
public Dimension getDefaultImageDimension() {
return vue_.getDefaultImageDimension();
}
-
+
public EGVue getView() {
return vue_;
}
-
+
public EbliActionInterface[] getSpecificActions() {
if (specificTools_ == null) {
specificTools_ = buildActions();
}
return specificTools_;
}
-
+ private boolean showRefreshButtonInConfigurePanel = true;
+
+ public boolean isShowRefreshButtonInConfigurePanel() {
+ return showRefreshButtonInConfigurePanel;
+ }
+
+ public void setShowRefreshButtonInConfigurePanel(boolean showRefreshButtonInConfigurePanel) {
+ this.showRefreshButtonInConfigurePanel = showRefreshButtonInConfigurePanel;
+ }
+
@Override
public void clearSelection() {
selection_.clearSelection();
}
-
+
@Override
public void inverseSelection() {
selection_.inverseSelection();
@@ -428,15 +437,15 @@
*/
@Override
public BufferedImage produceImage(final Map _params) {
-
+
return vue_.produceImage(_params);
}
-
+
@Override
public BufferedImage produceImage(final int _w, final int _h, final Map _params) {
return vue_.produceImage(_w, _h, _params);
}
-
+
@Override
public void propertyChange(final PropertyChangeEvent _evt) {
if (_evt.getSource() instanceof EGInteractiveComponent) {
@@ -448,11 +457,11 @@
}
}
}
-
+
@Override
public void replace() {
}
-
+
@Override
public void select() {
selection_.selectAll();
@@ -473,65 +482,65 @@
BuMenuItem alignPointMenuItem;
BuMenuItem refinePointMenuItem;
BuMenuItem removePointMenuItem;
-
+
public void fillMenuWithActions(final BuPopupMenu m) {
modifiyPointsMenuItem = addModifiyPointsMenuItem(m);
alignPointMenuItem = addAlignPointMenuItem(m);
refinePointMenuItem = addRefinePointMenuItem(m);
removePointMenuItem = addRemovePointMenuItem(m);
}
-
+
public boolean isSelectedCourbeModifiable() {
final EGCourbe c = vue_.graphe_.getSelectedComponent();
return (c != null) && (c.getModel().isModifiable()) && (getSelection() != null)
&& (!getSelection().isEmpty());
}
-
+
public boolean isSelectionAlignable() {
return isSelectedCourbeModifiable() && (getSelection().getNbSelectedIndex() >= 2);
}
-
+
public boolean isSelectionRefinable() {
return isSelectedCourbeModifiable()
&& (getSelection().getNbSelectedIndex() >= 2);
}
-
+
public boolean isSelectionRemovable() {
return isSelectedCourbeModifiable();
}
-
+
public BuMenuItem addModifiyPointsMenuItem(final BuPopupMenu m) {
return m.addMenuItem(EbliLib.getS("Modifier les points s\xE9lectionn\xE9s"), "MODIFY_POINTS", EbliResource.EBLI
.getToolIcon("node-edit"), isSelectedCourbeModifiable());
}
-
+
public BuMenuItem addModifiyPointsMenuItem(final CtuluPopupMenu m) {
return m.addMenuItem(EbliLib.getS("Modifier les points s\xE9lectionn\xE9s"), "MODIFY_POINTS", EbliResource.EBLI
.getToolIcon("node-edit"), isSelectedCourbeModifiable());
}
-
+
public BuMenuItem addAlignPointMenuItem(final CtuluPopupMenu m) {
return m.addMenuItem(EbliLib.getS("Aligner les points"), "ALIGN_POINTS", EbliResource.EBLI.getToolIcon("node-corner"), isSelectionAlignable());
}
-
+
public BuMenuItem addAlignPointMenuItem(final BuPopupMenu m) {
return m.addMenuItem(EbliLib.getS("Aligner les points"), "ALIGN_POINTS", EbliResource.EBLI.getToolIcon("node-corner"), isSelectionAlignable());
}
-
+
public BuMenuItem addRefinePointMenuItem(final CtuluPopupMenu m) {
return m.addMenuItem(EbliLib.getS("Raffiner"), "ADD_POINTS", EbliResource.EBLI.getToolIcon("node-add"), isSelectionRefinable());
}
-
+
public BuMenuItem addRefinePointMenuItem(final BuPopupMenu m) {
return m.addMenuItem(EbliLib.getS("Raffiner"), "ADD_POINTS", EbliResource.EBLI.getToolIcon("node-add"), isSelectionRefinable());
}
-
+
public BuMenuItem addRemovePointMenuItem(final CtuluPopupMenu m) {
final BuMenuItem addMenuItem = m.addMenuItem(EbliLib.getS("Supprimer un point"), "REMOVE_POINTS", EbliResource.EBLI.getToolIcon("node-delete"), isSelectionRemovable());
addMenuItem.setAccelerator(EGTableGraphePanel.getDeleteKeyStroke());
return addMenuItem;
}
-
+
public BuMenuItem addRemovePointMenuItem(final BuPopupMenu m) {
final BuMenuItem addMenuItem = m.addMenuItem(EbliLib.getS("Supprimer un point"), "REMOVE_POINTS", EbliResource.EBLI.getToolIcon("node-delete"), isSelectionRemovable());
addMenuItem.setAccelerator(EGTableGraphePanel.getDeleteKeyStroke());
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java 2013-04-02 15:26:47 UTC (rev 8367)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java 2013-04-02 15:27:26 UTC (rev 8368)
@@ -44,44 +44,44 @@
*/
public class EGPaletteLegendeGraphe extends CtuluDialogPanel implements ActionListener, ListSelectionListener,
BuBorders {
-
+
private final class EGGrapheModelListenerImplementation implements EGGrapheModelListener {
-
+
@Override
public void structureChanged() {
}
-
+
@Override
public void courbeContentChanged(final EGObject c, final boolean mustRestore) {
}
-
+
@Override
public void courbeAspectChanged(final EGObject c, final boolean visibil) {
model_.fireContentsChanged(this, 0, model_.getSize() - 1);
-
+
}
-
+
@Override
public void axeContentChanged(final EGAxe c) {
}
-
+
@Override
public void axeAspectChanged(final EGAxe c) {
}
}
-
+
class CustomDefaultListModel extends DefaultListModel {
-
+
@Override
public void fireContentsChanged(Object source, int index0, int index1) {
super.fireContentsChanged(source, index0, index1);
}
-
+
@Override
public void fireIntervalAdded(Object source, int index0, int index1) {
super.fireIntervalAdded(source, index0, index1);
}
-
+
@Override
public void fireIntervalRemoved(Object source, int index0, int index1) {
super.fireIntervalRemoved(source, index0, index1);
@@ -112,13 +112,13 @@
private JList list_;
CustomDefaultListModel model_;
private EGGrapheModelListenerImplementation modelListener;
-
+
public EGPaletteLegendeGraphe(final EGGraphe graphe) {
super(false);
graphe_ = graphe;
buildContent();
}
-
+
@Override
public boolean cancel() {
graphe_.removeModelListener(modelListener);
@@ -138,13 +138,13 @@
}
return super.cancel();
}
-
+
@Override
public boolean ok() {
graphe_.removeModelListener(modelListener);
return super.ok();
}
-
+
@Override
public void closeDialog() {
graphe_.removeModelListener(modelListener);
@@ -156,7 +156,7 @@
*/
private void actionApply() {
}
-
+
private void actionFormat() {
final CtuluNumberFormatI ctuluNumberFormatI = format_;
/*
@@ -177,7 +177,7 @@
tf.setText(separatorFormat_);
pnSep.add(tf);
pn.add(pnSep);
-
+
if (ctuluNumberFormatI == null || ctuluNumberFormatI.isDecimal()) {
fmtSelect.setBorder(BorderFactory.createTitledBorder(EbliLib.getS("Format d\xE9cimal")));
pn.add(fmtSelect);
@@ -186,13 +186,13 @@
format_ = fmtSelect.getCurrentFmt();
separatorFormat_ = tf.getText();
ajusteAllLegendes();
-
+
}
}
-
+
@Override
public void actionPerformed(final ActionEvent _e) {
-
+
final Object s = _e.getSource();
if (s == btApply_) {
actionApply();
@@ -201,7 +201,7 @@
} else if (btFormat_ == _e.getSource()) {
actionFormat();
}
-
+
}
/**
@@ -209,7 +209,7 @@
*/
protected void ajusteAllLegendes() {
}
-
+
public int getLine(EGCourbe c) {
int nb = model_.getSize();
for (int i = 0; i < nb; i++) {
@@ -219,7 +219,7 @@
}
return -1;
}
-
+
public void selectCourbe(EGCourbe c) {
int idx = getLine(c);
if (idx >= 0) {
@@ -229,7 +229,7 @@
Map<EGCourbe, EGCourbePersist> initCourbeConfig = new HashMap<EGCourbe, EGCourbePersist>();
Map<EGAxeVertical, EGAxeVerticalPersist> initAxeConfig = new HashMap<EGAxeVertical, EGAxeVerticalPersist>();
EGAxeHorizontalPersist initAxeHorizontal;
-
+
private void buildContent() {
final EGCourbe[] cs = graphe_.getModel().getCourbes();
for (EGCourbe eGCourbe : cs) {
@@ -241,7 +241,7 @@
initAxeConfig.put(axe, new EGAxeVerticalPersist(axe));
}
initAxeHorizontal = new EGAxeHorizontalPersist(graphe_.getTransformer().getXAxe());
-
+
final BuBorderLayout lay = new BuBorderLayout(2, 2);
setLayout(lay);
@@ -262,12 +262,12 @@
list_.setCellRenderer(new EGCourbeCellRenderer());
list_.getSelectionModel().addListSelectionListener(this);
list_.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
-
+
final BuScrollPane sp = new BuScrollPane(list_);
sp.setPreferredSize(new Dimension(600, 100));
sp.setBorder(BorderFactory.createTitledBorder(EbliResource.EBLI.getString("Liste des courbes")));
add(sp, BuBorderLayout.NORTH);
-
+
final BuPanel pnColor = new BuPanel();
pnColor.setLayout(new BuButtonLayout(1, SwingConstants.LEFT));
@@ -275,9 +275,10 @@
paletteAction = new EGConfigureActionPalette();
final JComponent paletteComp = paletteAction.getPaletteContent();
+ paletteComp.setPreferredSize(new Dimension(550, 550));
updatePanelData();
paletteComp.setBorder(BorderFactory.createTitledBorder(EbliResource.EBLI.getString("Param\xE9trage")));
-
+
add(paletteComp, BorderLayout.CENTER);
if (selection.size() > 0) {
list_.setSelectedIndices(selection.toNativeArray());
@@ -288,20 +289,28 @@
btApply_.addActionListener(this);
btRefresh_ = new BuButton(BuResource.BU.getIcon("rafraichir"));
btRefresh_.setText(EbliLib.getS("R\xE9initialiser les titres"));
- btRefresh_.setToolTipText(EbliLib.getS("Initialiser les plages des couleurs"));
+ btRefresh_.setToolTipText(EbliLib.getS("R\xE9initialiser les titres"));
btRefresh_.addActionListener(this);
+ btRefresh_.setVisible(btRefreshVisible);
btRefresh_.setEnabled(true);
final BuPanel btpn = new BuPanel();
btpn.setLayout(new BuButtonLayout(1, SwingConstants.RIGHT));
-
+
btpn.add(btRefresh_);
add(btpn, BuBorderLayout.SOUTH);
-
- this.setPreferredSize(new Dimension(550, 750));
- this.setMinimumSize(new Dimension(550, 750));
-
+
+ this.setPreferredSize(new Dimension(550, 850));
+ this.setMinimumSize(new Dimension(550, 850));
}
-
+ private boolean btRefreshVisible = true;
+
+ public void setBtRefreshTitleVisible(boolean visible) {
+ btRefreshVisible = visible;
+ if (btRefresh_ != null) {
+ btRefresh_.setVisible(visible);
+ }
+ }
+
private EGCourbe[] getSelectedCourbes() {
final int[] select = this.list_.getSelectedIndices();
if (select == null) {
@@ -328,7 +337,7 @@
private void updatePanelData() {
paletteAction.setPaletteTarget(getSelectedCourbes());
}
-
+
@Override
public void valueChanged(final ListSelectionEvent e) {
updatePanelData();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-04-02 07:33:17
|
Revision: 8366
http://fudaa.svn.sourceforge.net/fudaa/?rev=8366&view=rev
Author: deniger
Date: 2013-04-02 07:33:10 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
CRUE-464
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java 2013-03-29 00:21:50 UTC (rev 8365)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java 2013-04-02 07:33:10 UTC (rev 8366)
@@ -615,8 +615,8 @@
LoiLine loiLine = getLoiLine(_idx[i]);
double oldX = loiLine.getPtEvolutionFF().getAbscisse();
double oldY = loiLine.getPtEvolutionFF().getOrdonnee();
- if (configLoi.getVarAbscisse().getEpsilon().isSame(oldX, newX[i])
- && configLoi.getVarAbscisse().getEpsilon().isSame(oldY, newY[i])) {
+ if (!configLoi.getVarAbscisse().getEpsilon().isSame(oldX, newX[i])
+ || !configLoi.getVarAbscisse().getEpsilon().isSame(oldY, newY[i])) {
changed = true;
loiLine.ptEvolutionFF.setAbscisse(newX[i]);
loiLine.ptEvolutionFF.setOrdonnee(newY[i]);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-29 00:21:57
|
Revision: 8365
http://fudaa.svn.sourceforge.net/fudaa/?rev=8365&view=rev
Author: deniger
Date: 2013-03-29 00:21:50 +0000 (Fri, 29 Mar 2013)
Log Message:
-----------
Occupation m?\195?\169moire + vitesse
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluDefaultLogFormatter.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLog.java
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluDefaultLogFormatter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluDefaultLogFormatter.java 2013-03-29 00:21:19 UTC (rev 8364)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluDefaultLogFormatter.java 2013-03-29 00:21:50 UTC (rev 8365)
@@ -191,6 +191,9 @@
public synchronized String formatMessage(final CtuluLogRecord record, ResourceBundle catalog) {
String format = record.getMsg();
+ if (format == null) {
+ return format;
+ }
if (catalog != null) {
// // We cache catalog lookups. This is mostly to avoid the
// // cost of exceptions for keys that are not in the catalog.
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLog.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLog.java 2013-03-29 00:21:19 UTC (rev 8364)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLog.java 2013-03-29 00:21:50 UTC (rev 8365)
@@ -29,6 +29,15 @@
*/
public class CtuluLog {
+ ResourceBundle defaultResourceBundle;
+ private String description = "Analyzing";
+ private String[] descriptionArgs = null;
+ protected final List<CtuluLogRecord> logs = new ArrayList<CtuluLogRecord>();
+ protected final List<CtuluLogRecord> logsExt = Collections.unmodifiableList(logs);
+ private String ressource;
+ private boolean containsSevereError;
+ private boolean containsError;
+
/**
* Constructeur par defaut
*/
@@ -36,6 +45,16 @@
super();
}
+ /**
+ * Constructeur precisant le resourceBundle a utiliser
+ *
+ * @param defaultResourceBundle
+ */
+ public CtuluLog(final ResourceBundle defaultResourceBundle) {
+ super();
+ this.defaultResourceBundle = defaultResourceBundle;
+ }
+
public void updateLocalizedMessage(ResourceBundle resourceBundle) {
if (logs != null) {
for (CtuluLogRecord ctuluLogRecord : logs) {
@@ -60,22 +79,6 @@
}
/**
- * Constructeur precisant le resourceBundle a utiliser
- *
- * @param defaultResourceBundle
- */
- public CtuluLog(final ResourceBundle defaultResourceBundle) {
- super();
- this.defaultResourceBundle = defaultResourceBundle;
- }
- ResourceBundle defaultResourceBundle;
- private String description = "Analyzing";
- private String[] descriptionArgs = null;
- protected final List<CtuluLogRecord> logs = new ArrayList<CtuluLogRecord>();
- protected final List<CtuluLogRecord> logsExt = Collections.unmodifiableList(logs);
- private String ressource;
-
- /**
* @param msg le message
*/
public void addError(final String msg) {
@@ -231,6 +234,7 @@
*/
public CtuluLogRecord addRecord(final CtuluLogLevel level, final String msg, Object... data) {
final CtuluLogRecord o = new CtuluLogRecord(level, msg);
+ updatePrivateFlags(level);
o.setArgs(data);
logs.add(o);
return o;
@@ -238,6 +242,7 @@
public void addRecord(CtuluLogRecord record) {
if (record != null) {
+ updatePrivateFlags(record.getLevel());
logs.add(record);
}
}
@@ -261,7 +266,6 @@
* @param msg le message d'avertissement
* @param args les arguments supplementaires
*/
- // public void addWarn(final String msg, final Map<String, Object> args) {
public CtuluLogRecord addWarn(final String msg, final Object... args) {
return addRecord(CtuluLogLevel.WARNING, msg, args);
}
@@ -287,6 +291,8 @@
*/
public void clear() {
logs.clear();
+ containsSevereError = false;
+ containsError = false;
}
public boolean containsErrorOrSevereError() {
@@ -297,14 +303,15 @@
* @return true si contient au moins une erreur
*/
public boolean containsErrors() {
- return containsLevel(CtuluLogLevel.ERROR);
+ return containsError;
}
/**
* @return true si contient une erreur fatale
*/
public boolean containsSevereError() {
- return containsLevel(CtuluLogLevel.SEVERE);
+ //otpimisation
+ return containsSevereError;
}
/**
@@ -330,7 +337,9 @@
* @return true si au moins un message et de niveau l.
*/
public boolean containsLevel(final CtuluLogLevel l) {
- for (final CtuluLogRecord log : logs) {
+ int nb = logs.size();
+ for (int i = 0; i < nb; i++) {
+ final CtuluLogRecord log = logs.get(i);
if (l.equals(log.getLevel())) {
return true;
}
@@ -497,6 +506,7 @@
setDefaultResourceBundle(_analyze.getDefaultResourceBundle());
setResource(_analyze.getResource());
logs.addAll(_analyze.logs);
+ updatePrivateFlags(_analyze);
}
/**
@@ -506,6 +516,7 @@
public void addAllLogRecord(final CtuluLog logToCopyFrom) {
if (logToCopyFrom != null) {
logs.addAll(logToCopyFrom.logs);
+ updatePrivateFlags(logToCopyFrom);
}
}
@@ -544,4 +555,21 @@
public void setResource(final String _string) {
ressource = _string;
}
+
+ private void updatePrivateFlags(final CtuluLogLevel level) {
+ if (CtuluLogLevel.SEVERE.equals(level)) {
+ containsSevereError = true;
+ } else if (CtuluLogLevel.ERROR.equals(level)) {
+ containsError = true;
+ }
+ }
+
+ private void updatePrivateFlags(final CtuluLog _analyze) {
+ if (_analyze.containsError) {
+ containsError = true;
+ }
+ if (_analyze.containsSevereError) {
+ containsSevereError = true;
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-22 16:48:38
|
Revision: 8363
http://fudaa.svn.sourceforge.net/fudaa/?rev=8363&view=rev
Author: deniger
Date: 2013-03-22 16:48:31 +0000 (Fri, 22 Mar 2013)
Log Message:
-----------
am?\195?\169lioration aide
Added Paths:
-----------
trunk/soft/fudaa-mascaret/server/src/test/resources/xcas/
trunk/soft/fudaa-mascaret/server/src/test/resources/xcas/exmod.xcas
Added: trunk/soft/fudaa-mascaret/server/src/test/resources/xcas/exmod.xcas
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/test/resources/xcas/exmod.xcas (rev 0)
+++ trunk/soft/fudaa-mascaret/server/src/test/resources/xcas/exmod.xcas 2013-03-22 16:48:31 UTC (rev 8363)
@@ -0,0 +1,420 @@
+<!DOCTYPE fichierCas SYSTEM "mascaret-1.0.dtd">
+<fichierCas>
+ <parametresCas>
+ <parametresGeneraux>
+ <versionCode>3</versionCode>
+ <code>2</code>
+ <fichMotsCles>C:\data\LNHE\mascaret\exportTest\exmod.cas</fichMotsCles>
+ <dictionaire>dico.txt</dictionaire>
+ <progPrincipal>princi.f</progPrincipal>
+ <sauveModele>false</sauveModele>
+ <fichSauvModele>C:\data\LNHE\mascaret\exportTest\exmod.tmp</fichSauvModele>
+ <validationCode>false</validationCode>
+ <typeValidation>1</typeValidation>
+ <presenceCasiers>false</presenceCasiers>
+ <bibliotheques>
+ <bibliotheque>mascaretV5P1.a damoV3P0.a</bibliotheque>
+ </bibliotheques>
+ </parametresGeneraux>
+ <parametresModelePhysique>
+ <perteChargeConf>false</perteChargeConf>
+ <compositionLits>1</compositionLits>
+ <conservFrotVertical>true</conservFrotVertical>
+ <elevCoteArrivFront>0.05</elevCoteArrivFront>
+ <interpolLinStrickler>false</interpolLinStrickler>
+ <debordement>
+ <litMajeur>false</litMajeur>
+ <zoneStock>false</zoneStock>
+ </debordement>
+ </parametresModelePhysique>
+ <parametresNumeriques>
+ <calcOndeSubmersion>false</calcOndeSubmersion>
+ <froudeLimCondLim>1000.0</froudeLimCondLim>
+ <traitImplicitFrot>false</traitImplicitFrot>
+ <hauteurEauMini>0.005</hauteurEauMini>
+ <implicitNoyauTrans>false</implicitNoyauTrans>
+ <optimisNoyauTrans>false</optimisNoyauTrans>
+ <perteChargeAutoElargissement>false</perteChargeAutoElargissement>
+ <termesNonHydrostatiques>false</termesNonHydrostatiques>
+ </parametresNumeriques>
+ <parametresTemporels>
+ <pasTemps>17.0</pasTemps>
+ <tempsInit>0.0</tempsInit>
+ <critereArret>1</critereArret>
+ <nbPasTemps>1443</nbPasTemps>
+ <tempsMax>4752.0</tempsMax>
+ <pasTempsVar>false</pasTempsVar>
+ <nbCourant>0.8</nbCourant>
+ <coteMax>0.0</coteMax>
+ <abscisseControle>0.0</abscisseControle>
+ <biefControle>1</biefControle>
+ </parametresTemporels>
+ <parametresGeometrieReseau>
+ <geometrie>
+ <fichier>C:\data\LNHE\mascaret\exportTest\exmod.geo</fichier>
+ <format>2</format>
+ <profilsAbscAbsolu>false</profilsAbscAbsolu>
+ </geometrie>
+ <listeBranches>
+ <nb>7</nb>
+ <numeros>1 2 3 4 5 6 7</numeros>
+ <abscDebut>0.0 0.0 -10811.0 0.0 0.0 0.0 0.0</abscDebut>
+ <abscFin>5730.0 25190.0 11989.0 34496.0 9431.0 25308.0 38029.0</abscFin>
+ <numExtremDebut>1 3 5 7 9 11 13</numExtremDebut>
+ <numExtremFin>2 4 6 8 10 12 14</numExtremFin>
+ </listeBranches>
+ <listeNoeuds>
+ <nb>3</nb>
+ <noeuds>
+ <noeud>
+ <num>1 4 6 0 0</num>
+ </noeud>
+ <noeud>
+ <num>3 8 10 0 0</num>
+ </noeud>
+ <noeud>
+ <num>9 12 14 0 0</num>
+ </noeud>
+ </noeuds>
+ </listeNoeuds>
+ <extrLibres>
+ <nb>5</nb>
+ <num>1 2 3 4 5</num>
+ <numExtrem>2 5 7 11 13</numExtrem>
+ <noms>
+ <string>limite2</string>
+ <string>limite5</string>
+ <string>limite7</string>
+ <string>limite11</string>
+ <string>limite13</string>
+ </noms>
+ <typeCond>2 1 1 1 1</typeCond>
+ <numLoi>1 2 3 5 4</numLoi>
+ </extrLibres>
+ </parametresGeometrieReseau>
+ <parametresConfluents>
+ <nbConfluents>3</nbConfluents>
+ <confluents>
+ <structureParametresConfluent>
+ <nbAffluent>3</nbAffluent>
+ <nom>Noeud1</nom>
+ <abscisses>0.0 0.0 0.0</abscisses>
+ <ordonnees>0.0 0.0 0.0</ordonnees>
+ <angles>0.0 0.0 0.0</angles>
+ </structureParametresConfluent>
+ <structureParametresConfluent>
+ <nbAffluent>3</nbAffluent>
+ <nom>Noeud2</nom>
+ <abscisses>0.0 0.0 0.0</abscisses>
+ <ordonnees>0.0 0.0 0.0</ordonnees>
+ <angles>0.0 0.0 0.0</angles>
+ </structureParametresConfluent>
+ <structureParametresConfluent>
+ <nbAffluent>3</nbAffluent>
+ <nom>Noeud3</nom>
+ <abscisses>0.0 0.0 0.0</abscisses>
+ <ordonnees>0.0 0.0 0.0</ordonnees>
+ <angles>0.0 0.0 0.0</angles>
+ </structureParametresConfluent>
+ </confluents>
+ </parametresConfluents>
+ <parametresPlanimetrageMaillage>
+ <methodeMaillage>5</methodeMaillage>
+ <planim>
+ <nbPas>126</nbPas>
+ <nbZones>7</nbZones>
+ <valeursPas>0.5 0.5 0.2 0.2 0.5 0.2 0.2</valeursPas>
+ <num1erProf>1 24 123 340 435 485 503</num1erProf>
+ <numDerProf>23 122 339 434 484 502 548</numDerProf>
+ </planim>
+ <maillage>
+ <modeSaisie>2</modeSaisie>
+ <sauvMaillage>false</sauvMaillage>
+ <maillageClavier>
+ <nbSections>0</nbSections>
+ <nbPlages>10</nbPlages>
+ <num1erProfPlage>1 24 123 131 340 435 485 494 503 541</num1erProfPlage>
+ <numDerProfPlage>23 122 131 339 434 484 494 502 541 548</numDerProfPlage>
+ <pasEspacePlage>50.0 50.0 100.0 20.0 50.0 50.0 100.0 20.0 100.0 20.0</pasEspacePlage>
+ <nbZones>0</nbZones>
+ </maillageClavier>
+ </maillage>
+ </parametresPlanimetrageMaillage>
+ <parametresSingularite>
+ <nbSeuils>3</nbSeuils>
+ <seuils>
+ <structureParametresSeuil>
+ <nom>Seuil loi-Singularit\xE9 n\xB03</nom>
+ <type>4</type>
+ <numBranche>3</numBranche>
+ <abscisse>-161.0</abscisse>
+ <coteCrete>4.24</coteCrete>
+ <coteCreteMoy>NaN</coteCreteMoy>
+ <coteRupture>10000.0</coteRupture>
+ <coeffDebit>0.38</coeffDebit>
+ <largVanne>NaN</largVanne>
+ <numLoi>-2147483648</numLoi>
+ <nbPtLoiSeuil>-2147483648</nbPtLoiSeuil>
+ <epaisseur>2</epaisseur>
+ <gradient>NaN</gradient>
+ </structureParametresSeuil>
+ <structureParametresSeuil>
+ <nom>Seuil loi-Singularit\xE9 n\xB02</nom>
+ <type>4</type>
+ <numBranche>6</numBranche>
+ <abscisse>22020.0</abscisse>
+ <coteCrete>8.81</coteCrete>
+ <coteCreteMoy>NaN</coteCreteMoy>
+ <coteRupture>10000.0</coteRupture>
+ <coeffDebit>0.38</coeffDebit>
+ <largVanne>NaN</largVanne>
+ <numLoi>-2147483648</numLoi>
+ <nbPtLoiSeuil>-2147483648</nbPtLoiSeuil>
+ <epaisseur>1</epaisseur>
+ <gradient>NaN</gradient>
+ </structureParametresSeuil>
+ <structureParametresSeuil>
+ <nom>Seuil loi-Singularit\xE9 n\xB01</nom>
+ <type>4</type>
+ <numBranche>7</numBranche>
+ <abscisse>35700.0</abscisse>
+ <coteCrete>6.51</coteCrete>
+ <coteCreteMoy>NaN</coteCreteMoy>
+ <coteRupture>10000.0</coteRupture>
+ <coeffDebit>0.38</coeffDebit>
+ <largVanne>NaN</largVanne>
+ <numLoi>-2147483648</numLoi>
+ <nbPtLoiSeuil>-2147483648</nbPtLoiSeuil>
+ <epaisseur>1</epaisseur>
+ <gradient>NaN</gradient>
+ </structureParametresSeuil>
+ </seuils>
+ </parametresSingularite>
+ <parametresApportDeversoirs>
+ <debitsApports>
+ <nbQApport>1</nbQApport>
+ <noms>
+ <string>D\xE9bit apport-Singularit\xE9 n\xB04</string>
+ </noms>
+ <numBranche>4</numBranche>
+ <abscisses>0.0</abscisses>
+ <longueurs>0.0</longueurs>
+ <numLoi>6</numLoi>
+ </debitsApports>
+ <deversLate>
+ <nbDeversoirs>1</nbDeversoirs>
+ <noms>
+ <string>D\xE9versoir lat\xE9ral-Singularit\xE9 n\xB05</string>
+ </noms>
+ <type>1</type>
+ <numBranche>2</numBranche>
+ <abscisse>150.0</abscisse>
+ <longueur>10.0</longueur>
+ <coteCrete>10.0</coteCrete>
+ <coeffDebit>0.8</coeffDebit>
+ <numLoi>0</numLoi>
+ </deversLate>
+ </parametresApportDeversoirs>
+ <parametresCalage>
+ <frottement>
+ <loi>1</loi>
+ <nbZone>21</nbZone>
+ <numBranche>1 2 3 3 3 3 3 3 3 3 3 3 3 3 4 5 6 6 6 7 7</numBranche>
+ <absDebZone>0.0 0.0 -10811.0 0.0 10652.0 10741.0 11278.0 11327.0 11512.0 11532.0 11666.0 11676.0 11812.0 11855.0 0.0 0.0 0.0 23020.0 23270.0 0.0 35860.0</absDebZone>
+ <absFinZone>5730.0 25190.0 0.0 10652.0 10741.0 11278.0 11327.0 11512.0 11532.0 11666.0 11676.0 11812.0 11855.0 11989.0 34496.0 9431.0 23020.0 23270.0 25308.0 35860.0 38029.0</absFinZone>
+ <coefLitMin>30.0 27.5 15.0 40.0 3.0 22.5 3.0 22.5 3.0 22.5 3.0 22.5 3.0 22.5 27.5 52.5 30.0 20.0 37.5 30.0 37.5</coefLitMin>
+ <coefLitMaj>30.0 27.5 15.0 40.0 3.0 22.5 3.0 22.5 3.0 22.5 3.0 22.5 3.0 22.5 30.0 40.0 5.0 20.0 37.5 30.0 37.5</coefLitMaj>
+ </frottement>
+ <zoneStockage>
+ <nbProfils>0</nbProfils>
+ <numProfil>[0]</numProfil>
+ <limGauchLitMaj>[0]</limGauchLitMaj>
+ <limDroitLitMaj>[0]</limDroitLitMaj>
+ </zoneStockage>
+ </parametresCalage>
+ <parametresLoisHydrauliques>
+ <nb>6</nb>
+ <lois>
+ <structureParametresLoi>
+ <nom>bief_01_1467</nom>
+ <type>2</type>
+ <donnees>
+ <modeEntree>1</modeEntree>
+ <fichier>C:\data\LNHE\mascaret\exportTest\exmod_0.loi</fichier>
+ <uniteTps>-2147483648</uniteTps>
+ <nbPoints>-2147483648</nbPoints>
+ <nbDebitsDifferents>-2147483648</nbDebitsDifferents>
+ </donnees>
+ </structureParametresLoi>
+ <structureParametresLoi>
+ <nom>bief_03_1023</nom>
+ <type>1</type>
+ <donnees>
+ <modeEntree>1</modeEntree>
+ <fichier>C:\data\LNHE\mascaret\exportTest\exmod_1.loi</fichier>
+ <uniteTps>-2147483648</uniteTps>
+ <nbPoints>-2147483648</nbPoints>
+ <nbDebitsDifferents>-2147483648</nbDebitsDifferents>
+ </donnees>
+ </structureParametresLoi>
+ <structureParametresLoi>
+ <nom>bief_04_1029</nom>
+ <type>1</type>
+ <donnees>
+ <modeEntree>1</modeEntree>
+ <fichier>C:\data\LNHE\mascaret\exportTest\exmod_2.loi</fichier>
+ <uniteTps>-2147483648</uniteTps>
+ <nbPoints>-2147483648</nbPoints>
+ <nbDebitsDifferents>-2147483648</nbDebitsDifferents>
+ </donnees>
+ </structureParametresLoi>
+ <structureParametresLoi>
+ <nom>bief_07_1049</nom>
+ <type>1</type>
+ <donnees>
+ <modeEntree>1</modeEntree>
+ <fichier>C:\data\LNHE\mascaret\exportTest\exmod_3.loi</fichier>
+ <uniteTps>-2147483648</uniteTps>
+ <nbPoints>-2147483648</nbPoints>
+ <nbDebitsDifferents>-2147483648</nbDebitsDifferents>
+ </donnees>
+ </structureParametresLoi>
+ <structureParametresLoi>
+ <nom>bief_06_1030</nom>
+ <type>1</type>
+ <donnees>
+ <modeEntree>1</modeEntree>
+ <fichier>C:\data\LNHE\mascaret\exportTest\exmod_4.loi</fichier>
+ <uniteTps>-2147483648</uniteTps>
+ <nbPoints>-2147483648</nbPoints>
+ <nbDebitsDifferents>-2147483648</nbDebitsDifferents>
+ </donnees>
+ </structureParametresLoi>
+ <structureParametresLoi>
+ <nom>Apport</nom>
+ <type>1</type>
+ <donnees>
+ <modeEntree>1</modeEntree>
+ <fichier>C:\data\LNHE\mascaret\exportTest\exmod_5.loi</fichier>
+ <uniteTps>-2147483648</uniteTps>
+ <nbPoints>-2147483648</nbPoints>
+ <nbDebitsDifferents>-2147483648</nbDebitsDifferents>
+ </donnees>
+ </structureParametresLoi>
+ </lois>
+ </parametresLoisHydrauliques>
+ <parametresConditionsInitiales>
+ <repriseEtude>
+ <repriseCalcul>true</repriseCalcul>
+ </repriseEtude>
+ <ligneEau>
+ <LigEauInit>true</LigEauInit>
+ <modeEntree>1</modeEntree>
+ <fichLigEau>C:\data\LNHE\mascaret\exportTest\exmod.lig</fichLigEau>
+ <formatFichLig>2</formatFichLig>
+ <nbPts>-2147483648</nbPts>
+ </ligneEau>
+ </parametresConditionsInitiales>
+ <parametresImpressionResultats>
+ <titreCalcul>Adour_maritime_v1</titreCalcul>
+ <impression>
+ <impressionGeometrie>false</impressionGeometrie>
+ <impressionPlanimetrage>false</impressionPlanimetrage>
+ <impressionReseau>false</impressionReseau>
+ <impressionLoiHydraulique>false</impressionLoiHydraulique>
+ <impressionligneEauInitiale>false</impressionligneEauInitiale>
+ <impressionCalcul>false</impressionCalcul>
+ </impression>
+ <pasStockage>
+ <premPasTpsStock>1</premPasTpsStock>
+ <pasStock>1</pasStock>
+ <pasImpression>24</pasImpression>
+ </pasStockage>
+ <resultats>
+ <fichResultat>C:\data\LNHE\mascaret\exportTest\exmod_ecr.opt</fichResultat>
+ <postProcesseur>2</postProcesseur>
+ </resultats>
+ <listing>
+ <fichListing>C:\data\LNHE\mascaret\exportTest\exmod.lis</fichListing>
+ </listing>
+ <fichReprise>
+ <fichRepriseEcr>C:\data\LNHE\mascaret\exportTest\exmod_ecr.rep</fichRepriseEcr>
+ </fichReprise>
+ <rubens>
+ <ecartInterBranch>1.0</ecartInterBranch>
+ </rubens>
+ <stockage>
+ <option>2</option>
+ <nbSite>7</nbSite>
+ <branche>5 3 3 2 2 1 6</branche>
+ <abscisse>1361.0 10067.0 11730.0 10340.0 23890.0 518.0 25308.0</abscisse>
+ </stockage>
+ </parametresImpressionResultats>
+ <parametresVariablesCalculees>
+ <variablesCalculees>false false false false false false false false false false false false false false false</variablesCalculees>
+ </parametresVariablesCalculees>
+ <parametresVariablesStockees>
+ <variablesStockees>false false false false false true false false false false false false false false false false false false false false false false false false false false false false false false false false false false false false false false false false false false</variablesStockees>
+ </parametresVariablesStockees>
+ <parametresTraceur>
+ <presenceTraceurs>true</presenceTraceurs>
+ <nbTraceur>1</nbTraceur>
+ <parametresConvectionDiffusion>
+ <convectionTraceurs>true</convectionTraceurs>
+ <optionConvection>2</optionConvection>
+ <ordreSchemaConvec>-2147483648</ordreSchemaConvec>
+ <paramW>NaN</paramW>
+ <LimitPente>false</LimitPente>
+ <diffusionTraceurs>true</diffusionTraceurs>
+ <optionCalculDiffusion>1</optionCalculDiffusion>
+ <coeffDiffusion1>0.0</coeffDiffusion1>
+ <coeffDiffusion2>0.0</coeffDiffusion2>
+ </parametresConvectionDiffusion>
+ <parametresNumeriquesQualiteEau>
+ <modeleQualiteEau>1</modeleQualiteEau>
+ <frequenceCouplHydroTracer>1</frequenceCouplHydroTracer>
+ </parametresNumeriquesQualiteEau>
+ <parametresImpressionTraceur>
+ <fichListTracer>C:\data\LNHE\mascaret\exportTest\exmod.tra_lis</fichListTracer>
+ <concentInit>false</concentInit>
+ <loiTracer>false</loiTracer>
+ <concentrations>true</concentrations>
+ <bilanTracer>true</bilanTracer>
+ <fichResultTracer>C:\data\LNHE\mascaret\exportTest\exmod.tra_opt</fichResultTracer>
+ <formatFichResultat>2</formatFichResultat>
+ </parametresImpressionTraceur>
+ <parametresConditionsLimitesTraceur>
+ <typeCondLimTracer>1 1 1 1 1</typeCondLimTracer>
+ <numLoiCondLimTracer>1 1 1 1 1</numLoiCondLimTracer>
+ </parametresConditionsLimitesTraceur>
+ <parametresConcentrationsInitialesTraceur>
+ <presenceConcInit>false</presenceConcInit>
+ <modeEntree>1</modeEntree>
+ <nbPts>0</nbPts>
+ </parametresConcentrationsInitialesTraceur>
+ <parametresSourcesTraceur>
+ <nbSources>1</nbSources>
+ <noms>
+ <string>Source-Singularit\xE9 n\xB06</string>
+ </noms>
+ <typeSources>1</typeSources>
+ <numBranche>7</numBranche>
+ <abscisses>7000.0</abscisses>
+ <longueurs>1.0</longueurs>
+ <numLoi>1</numLoi>
+ </parametresSourcesTraceur>
+ <parametresLoisTraceur>
+ <nbLoisTracer>1</nbLoisTracer>
+ <loisTracer>
+ <structureSParametresLoiTraceur>
+ <nom>loi_7_tracer</nom>
+ <modeEntree>1</modeEntree>
+ <fichier>C:\data\LNHE\mascaret\exportTest\exmod_tracer0.loi</fichier>
+ <uniteTps>-2147483648</uniteTps>
+ <nbPoints>-2147483648</nbPoints>
+ </structureSParametresLoiTraceur>
+ </loisTracer>
+ </parametresLoisTraceur>
+ </parametresTraceur>
+ </parametresCas>
+</fichierCas>
\ 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-03-22 16:40:17
|
Revision: 8362
http://fudaa.svn.sourceforge.net/fudaa/?rev=8362&view=rev
Author: deniger
Date: 2013-03-22 16:40:09 +0000 (Fri, 22 Mar 2013)
Log Message:
-----------
am?\195?\169lioration aide
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/EdamoxXMLContent.java
trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/EdamoxXmlReaderWriter.java
Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/EdamoxXMLContent.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/EdamoxXMLContent.java 2013-03-22 16:14:34 UTC (rev 8361)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/EdamoxXMLContent.java 2013-03-22 16:40:09 UTC (rev 8362)
@@ -11,9 +11,6 @@
*/
public class EdamoxXMLContent {
-// protected String xmlns = "http://www.fudaa.fr/xsd/mascaret";
-// protected String xmlnsxsi = "http://www.w3.org/2001/XMLSchema-instance";
-// protected String xsischemaLocation;
private SParametresCAS parametresCas;
public EdamoxXMLContent(SParametresCAS parametresCas) {
@@ -23,14 +20,6 @@
public EdamoxXMLContent() {
}
-// protected void setXsdName(final String xsdFile) {
-// xsischemaLocation = "http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/mascaret/" + xsdFile;
-// }
-//
-// public void updateXmlns() {
-// xmlns = "http://www.fudaa.fr/xsd/mascaret";
-// xmlnsxsi = "http://www.w3.org/2001/XMLSchema-instance";
-// }
public SParametresCAS getParametresCas() {
return parametresCas;
Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/EdamoxXmlReaderWriter.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/EdamoxXmlReaderWriter.java 2013-03-22 16:14:34 UTC (rev 8361)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/EdamoxXmlReaderWriter.java 2013-03-22 16:40:09 UTC (rev 8362)
@@ -4,7 +4,6 @@
package org.fudaa.dodico.mascaret;
import com.memoire.fu.FuLib;
-import org.fudaa.ctulu.xml.DoubleArrayConverter;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.converters.ConversionException;
import com.thoughtworks.xstream.io.naming.NameCoder;
@@ -39,8 +38,9 @@
import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.ctulu.CtuluLog;
-import org.fudaa.ctulu.xml.ErrorHandlerDefault;
import org.fudaa.ctulu.xml.BooleanArrayConverter;
+import org.fudaa.ctulu.xml.DoubleArrayConverter;
+import org.fudaa.ctulu.xml.ErrorHandlerDefault;
import org.fudaa.ctulu.xml.FloatArrayConverter;
import org.fudaa.ctulu.xml.IntegerArrayConverter;
import org.fudaa.dodico.corba.mascaret.SNoeud;
@@ -73,12 +73,15 @@
*/
public class EdamoxXmlReaderWriter {
+ public static final String VERSION_1_0 = "1.0";
+ public static final String LAST_VERSION = VERSION_1_0;
+
/**
*
* @return
*/
public static EdamoxXmlReaderWriter createReaderWriter() {
- return new EdamoxXmlReaderWriter("1.0");
+ return new EdamoxXmlReaderWriter(LAST_VERSION);
}
/**
@@ -87,6 +90,7 @@
* @return
*/
public static EdamoxXmlReaderWriter findReader(File xcas) {
+ //voir XmlVersionFinder
return new EdamoxXmlReaderWriter("1.0");
}
public static final String ENCODING = "ISO-8859-1";
@@ -112,8 +116,6 @@
public EdamoxXmlReaderWriter(String version) {
this.version = version;
this.xsdId = "mascaret";
-// dtdFile = xsdId + "-" + version + ".xsd";
-// xsdPath = "/xsd/" + dtdFile;
dtdFile = xsdId + "-" + version + ".dtd";
dtdPath = "/dtd/" + dtdFile;
}
@@ -150,13 +152,6 @@
final StaxDriver staxDriver = new StaxDriver(replacer);
final XStream xstream = new XStream(staxDriver);
xstream.setMode(XStream.NO_REFERENCES);
-// xstream.aliasAttribute("xmlns:xsi", "xmlnsxsi");
-// xstream.aliasAttribute("xsi:schemaLocation", "xsischemaLocation");
-
-// xstream.useAttributeFor(EdamoxXMLContent.class, "xmlns");
-// xstream.useAttributeFor(EdamoxXMLContent.class, "xmlnsxsi");
-// xstream.useAttributeFor(EdamoxXMLContent.class, "xsischemaLocation");
-
configureXStream(xstream);
return xstream;
}
@@ -476,7 +471,7 @@
xstream.aliasField("impressionligneEauInitiale", SParametresImpress.class, "ligneEauInit");
xstream.aliasField("impressionCalcul", SParametresImpress.class, "calcul");
-
+
xstream.aliasField("noms", SParametresExtrLibres.class, "Nom");
xstream.aliasField("noms", SParametresDeversLateraux.class, "nom");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-22 16:14:40
|
Revision: 8361
http://fudaa.svn.sourceforge.net/fudaa/?rev=8361&view=rev
Author: deniger
Date: 2013-03-22 16:14:34 +0000 (Fri, 22 Mar 2013)
Log Message:
-----------
am?\195?\169lioration aide
Modified Paths:
--------------
trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/FudaaHelpPDFViewer.java
Modified: trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/FudaaHelpPDFViewer.java
===================================================================
--- trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/FudaaHelpPDFViewer.java 2013-03-22 16:12:46 UTC (rev 8360)
+++ trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/FudaaHelpPDFViewer.java 2013-03-22 16:14:34 UTC (rev 8361)
@@ -130,9 +130,6 @@
if (!jarFile.isFile()) {
return;
}
-// String completePathpathFichierJar = pathFudaa + File.separator + nomRep + File.separator + nomFichierJar;
-
-
// --creation du modele depuis un fichier jar ou un r\xE9pertoire classique selon le constructeur appel\xE9.--//
listeColonnesModel_.add(FudaaResource.FUDAA.getString("Aide disponible"));
modelList_ = new DefaultTreeTableModel(constructStructureModelWithJAREntree(), listeColonnesModel_);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-22 16:12:53
|
Revision: 8360
http://fudaa.svn.sourceforge.net/fudaa/?rev=8360&view=rev
Author: deniger
Date: 2013-03-22 16:12:46 +0000 (Fri, 22 Mar 2013)
Log Message:
-----------
am?\195?\169lioration aide
Modified Paths:
--------------
trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/FudaaHelpPDFViewer.java
Modified: trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/FudaaHelpPDFViewer.java
===================================================================
--- trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/FudaaHelpPDFViewer.java 2013-03-22 10:33:02 UTC (rev 8359)
+++ trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/FudaaHelpPDFViewer.java 2013-03-22 16:12:46 UTC (rev 8360)
@@ -105,7 +105,8 @@
/**
* Constructeur pour la creation de l'interface Fudaa.
*
- * @param fichierJar nom du jar \xE0 utiliser (celui qui contient la doc). Peut etre le jar logiciel lui meme.
+ * @param jarName nom du jar \xE0 utiliser (celui qui contient la doc). Peut etre le jar logiciel lui meme.
+ * @param pathFichierJar le path dans le fichier jar: Non UTILISE !
* @param _ui implementaion fudaa.
* @param useThumbs Utilise ou non les apercu images des pages (pour un gain de place, mettre \xE0 false).
*/
@@ -121,14 +122,7 @@
} else {
jarPath = new File(new File(pathFudaa, nomRep), jarName).getAbsolutePath();
}
- if (jarPath == null) {
- //Fred traduction \xE0 revoir !
- ui_.error(FudaaResource.FUDAA.getString("Erreur, il n'existe pas de variable d'environnement " + FUDAA_HOME + "\n Pour faire fonctionner l'aide, il faut:\n - Cr\xE9er une variable d'environnement avec le chemin Fudaa,"
- + "\n - cr\xE9er un r\xE9pertoire " + nomRep + " \n - y d\xE9poser le jar de nom " + jarName));
- //-- rechercher le lien de la bvar environement FUDAA_HOME
-
- }
- pathJarDocAide_ = verifPathForJarIsCorrect(jarPath, propertyForHelp);
+ pathJarDocAide_ = retrieveCorrectPathForJarDoc(jarPath, propertyForHelp);
if (pathJarDocAide_ == null) {
return;
}
@@ -152,7 +146,7 @@
* @param pathPresumePourJar
* @return
*/
- public String verifPathForJarIsCorrect(String initPathForHelp, String propertyForHelp) {
+ public String retrieveCorrectPathForJarDoc(String initPathForHelp, String propertyForHelp) {
File test = initPathForHelp == null ? null : new File(initPathForHelp);
if (initPathForHelp == null || !test.exists() || test.isDirectory()) {
ui_.warn(FudaaResource.FUDAA.getString("Aide non trouv\xE9e"), FudaaResource.FUDAA.getString("Choisir le chemin vers l'archive de l'aide"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-22 10:33:08
|
Revision: 8359
http://fudaa.svn.sourceforge.net/fudaa/?rev=8359&view=rev
Author: deniger
Date: 2013-03-22 10:33:02 +0000 (Fri, 22 Mar 2013)
Log Message:
-----------
am?\195?\169lioration aide
Modified Paths:
--------------
trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
Modified: trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
===================================================================
--- trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java 2013-03-22 10:31:37 UTC (rev 8358)
+++ trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java 2013-03-22 10:33:02 UTC (rev 8359)
@@ -575,8 +575,8 @@
} else {
JFrame frame = new JFrame();
frame.setContentPane(frameHelpPDF_.getContentPane());
- frame.setPreferredSize(new Dimension(500, 600));
- frame.setSize(new Dimension(500, 600));
+ frame.setPreferredSize(new Dimension(800, 800));
+ frame.setSize(new Dimension(800, 800));
frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
frame.setVisible(true);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-22 10:31:44
|
Revision: 8358
http://fudaa.svn.sourceforge.net/fudaa/?rev=8358&view=rev
Author: deniger
Date: 2013-03-22 10:31:37 +0000 (Fri, 22 Mar 2013)
Log Message:
-----------
am?\195?\169lioration aide
Modified Paths:
--------------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrCommonImplementation.java
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2013-03-22 10:30:53 UTC (rev 8357)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2013-03-22 10:31:37 UTC (rev 8358)
@@ -72,8 +72,8 @@
infoSoft = new BuInformationsSoftware();
infoSoft.name = "prepro";
- infoSoft.version = "1.2-RC22";
- infoSoft.date = "2013-03-18";
+ infoSoft.version = "1.2-RC23";
+ infoSoft.date = "2013-03-22";
infoSoft.rights = TrResource.getS("Tous droits r\xE9serv\xE9s") + ". CETMEF (c)2003-2009";
infoSoft.contact = "fre...@fu...";
infoSoft.license = "GPL2";
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrCommonImplementation.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrCommonImplementation.java 2013-03-22 10:30:53 UTC (rev 8357)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrCommonImplementation.java 2013-03-22 10:31:37 UTC (rev 8358)
@@ -84,6 +84,7 @@
public TrCommonImplementation() {
useNewHelp_ = true;
setOnlyOneApplicationFrame(false);
+ documentationJar = "Fudaa-preproDocumentation.jar";
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-21 16:01:16
|
Revision: 8356
http://fudaa.svn.sourceforge.net/fudaa/?rev=8356&view=rev
Author: deniger
Date: 2013-03-21 16:01:07 +0000 (Thu, 21 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java
trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java 2013-03-21 09:07:53 UTC (rev 8355)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java 2013-03-21 16:01:07 UTC (rev 8356)
@@ -31,7 +31,11 @@
if ("nbr".equalsIgnoreCase(natureNom) || "num".equalsIgnoreCase(natureNom)) {
return null;
}
- int nbDec = Math.abs((int) Math.floor(Math.log10(nature.getEpsilon().getEpsilon(presentionOrComparison))));
+ double epsilon = nature.getEpsilon().getEpsilon(presentionOrComparison);
+ if (DecimalFormatEpsilonEnum.COMPARISON.equals(presentionOrComparison)) {
+ epsilon = epsilon / 10;
+ }
+ int nbDec = Math.abs((int) Math.floor(Math.log10(epsilon)));
NumberFormat numberFormat = this.nbDecFormat.get(nbDec);
if (numberFormat == null) {
numberFormat = new DecimalFormat();
Modified: trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java 2013-03-21 09:07:53 UTC (rev 8355)
+++ trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java 2013-03-21 16:01:07 UTC (rev 8356)
@@ -17,10 +17,10 @@
@Test
public void testCreateFormatter() {
- test(1e-2, 2, 1e-3, 3);
- test(1e-10, 10, 1e-22, 22);
- test(2e-2, 2, 2e-3, 3);
- test(3e-10, 10, 3e-22, 22);
+ test(1e-2, 3, 1e-3, 3);
+ test(1e-10, 11, 1e-22, 22);
+ test(2e-2, 3, 2e-3, 3);
+ test(3e-10, 11, 3e-22, 22);
}
protected void test(double comparaison, int comparaisonFractionDigits, double presentation, int presentationFractionDigits) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-21 09:08:00
|
Revision: 8355
http://fudaa.svn.sourceforge.net/fudaa/?rev=8355&view=rev
Author: deniger
Date: 2013-03-21 09:07:53 +0000 (Thu, 21 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/NumberFormatChoice.java
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/NumberFormatInfini.java
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/NumberFormatChoice.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/NumberFormatChoice.java 2013-03-20 15:25:37 UTC (rev 8354)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/NumberFormatChoice.java 2013-03-21 09:07:53 UTC (rev 8355)
@@ -44,6 +44,10 @@
return (absValue > maxValue || absValue < minValue);
}
+ public NumberFormat getBase() {
+ return base;
+ }
+
@Override
public StringBuffer format(final double number, final StringBuffer toAppendTo, final FieldPosition pos) {
if (useScientific(number)) {
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/NumberFormatInfini.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/NumberFormatInfini.java 2013-03-20 15:25:37 UTC (rev 8354)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/NumberFormatInfini.java 2013-03-21 09:07:53 UTC (rev 8355)
@@ -67,4 +67,11 @@
public NumberFormat getBase() {
return base;
}
+
+ public NumberFormat getRealBase() {
+ if (base instanceof NumberFormatChoice) {
+ return ((NumberFormatChoice) base).getBase();
+ }
+ return base;
+ }
}
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java 2013-03-20 15:25:37 UTC (rev 8354)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java 2013-03-21 09:07:53 UTC (rev 8355)
@@ -31,7 +31,7 @@
if ("nbr".equalsIgnoreCase(natureNom) || "num".equalsIgnoreCase(natureNom)) {
return null;
}
- int nbDec = Math.abs((int) Math.log10(nature.getEpsilon().getEpsilon(presentionOrComparison)));
+ int nbDec = Math.abs((int) Math.floor(Math.log10(nature.getEpsilon().getEpsilon(presentionOrComparison))));
NumberFormat numberFormat = this.nbDecFormat.get(nbDec);
if (numberFormat == null) {
numberFormat = new DecimalFormat();
Added: trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java 2013-03-21 09:07:53 UTC (rev 8355)
@@ -0,0 +1,35 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.config.ccm;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class PropertyFormaterBuilderTest {
+
+ public PropertyFormaterBuilderTest() {
+ }
+
+ @Test
+ public void testCreateFormatter() {
+ test(1e-2, 2, 1e-3, 3);
+ test(1e-10, 10, 1e-22, 22);
+ test(2e-2, 2, 2e-3, 3);
+ test(3e-10, 10, 3e-22, 22);
+ }
+
+ protected void test(double comparaison, int comparaisonFractionDigits, double presentation, int presentationFractionDigits) {
+ PropertyFormaterBuilder builder = new PropertyFormaterBuilder();
+ PropertyEpsilon epsilon = new PropertyEpsilon(comparaison, presentation);
+ PropertyNature property = new PropertyNature("test", epsilon, "none", new PropertyTypeNumerique("Tnu_Reel", "", 1e23));
+ NumberFormatInfini formatter = (NumberFormatInfini) builder.getFormatter(property, DecimalFormatEpsilonEnum.COMPARISON);
+ assertEquals(comparaisonFractionDigits, formatter.getRealBase().getMaximumFractionDigits());
+ formatter = (NumberFormatInfini) builder.getFormatter(property, DecimalFormatEpsilonEnum.PRESENTATION);
+ assertEquals(presentationFractionDigits, formatter.getRealBase().getMaximumFractionDigits());
+ }
+}
\ 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-03-20 15:25:44
|
Revision: 8354
http://fudaa.svn.sourceforge.net/fudaa/?rev=8354&view=rev
Author: deniger
Date: 2013-03-20 15:25:37 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java 2013-03-20 15:25:19 UTC (rev 8353)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java 2013-03-20 15:25:37 UTC (rev 8354)
@@ -7,6 +7,12 @@
*/
package org.fudaa.fudaa.modeleur.modeleur1d.view;
+import com.memoire.bu.BuBorderLayout;
+import com.memoire.bu.BuButton;
+import com.memoire.bu.BuComboBox;
+import com.memoire.bu.BuPanel;
+import com.memoire.bu.BuSpecificBar;
+import com.memoire.bu.BuToggleButton;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
@@ -16,11 +22,10 @@
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
-
+import java.util.Map;
import javax.swing.AbstractButton;
import javax.swing.Action;
import javax.swing.JComponent;
-
import org.fudaa.ctulu.CtuluCommandComposite;
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluLib;
@@ -30,26 +35,18 @@
import org.fudaa.ctulu.CtuluNumberFormatDefault;
import org.fudaa.ctulu.CtuluUI;
import org.fudaa.ebli.commun.EbliActionInterface;
+import org.fudaa.ebli.commun.EbliActionPaletteAbstract;
import org.fudaa.ebli.commun.EbliComponentFactory;
import org.fudaa.ebli.commun.EbliLib;
+import org.fudaa.ebli.courbe.*;
import org.fudaa.ebli.palette.BPaletteInfo.InfoData;
import org.fudaa.ebli.trace.TraceIcon;
import org.fudaa.ebli.trace.TraceIconModel;
import org.fudaa.ebli.trace.TraceLigne;
import org.fudaa.ebli.trace.TraceLigneModel;
+import org.fudaa.fudaa.modeleur.modeleur1d.model.ProfilContainerException;
import org.fudaa.fudaa.modeleur.modeleur1d.model.ProfilContainerI;
-import org.fudaa.fudaa.modeleur.modeleur1d.model.ProfilContainerException;
import org.fudaa.fudaa.modeleur.modeleur1d.model.ProfilContainerListener;
-import org.fudaa.ebli.courbe.*;
-
-import com.memoire.bu.BuBorderLayout;
-import com.memoire.bu.BuButton;
-import com.memoire.bu.BuComboBox;
-import com.memoire.bu.BuPanel;
-import com.memoire.bu.BuSpecificBar;
-import com.memoire.bu.BuToggleButton;
-import java.util.Map;
-import org.fudaa.ebli.commun.EbliActionPaletteAbstract;
import org.fudaa.fudaa.modeleur.modeleur1d.model.ProfileSetI;
import org.fudaa.fudaa.modeleur.modeleur1d.model.ProfileSetListener;
import org.fudaa.fudaa.modeleur.resource.MdlResource;
@@ -110,13 +107,11 @@
public CourbeGeomModel() {
}
-// public CourbeGeomModel(ProfilContainerI _data, double _xoffSet, double _zoffSet) {
-// if(_data==null)
-// throw new IllegalArgumentException("Erreur prog : _data ne doit pas \xEAtre null.");
-// xoffSet_=_xoffSet;
-// zoffSet_=_zoffSet;
-// setProfil(_data);
-// }
+ @Override
+ public boolean useSpecificIcon(int idx) {
+ return false;
+ }
+
/**
* @return Retourne le profil associ\xE9.
*/
@@ -551,6 +546,11 @@
}
@Override
+ public boolean useSpecificIcon(int idx) {
+ return false;
+ }
+
+ @Override
public boolean isGenerationSourceVisible() {
return false;
}
@@ -856,9 +856,9 @@
// Les actions a conserver.
HashSet<String> actionsKept = new HashSet<String>(Arrays.asList(
new String[]{
- "SELECT", "RESTORE", "AUTO_REST", "CONFIGURE_REPERE",
- "ZOOM", "SUIVI", "MOVE_POINT", "CONFIGURE", "INFOS", "TABLE"
- }));
+ "SELECT", "RESTORE", "AUTO_REST", "CONFIGURE_REPERE",
+ "ZOOM", "SUIVI", "MOVE_POINT", "CONFIGURE", "INFOS", "TABLE"
+ }));
for (int i = 0; i < actionAbs.length; i++) {
if (actionAbs[i] != null && actionsKept.contains(actionAbs[i].getValue(Action.ACTION_COMMAND_KEY))) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-20 15:25:27
|
Revision: 8353
http://fudaa.svn.sourceforge.net/fudaa/?rev=8353&view=rev
Author: deniger
Date: 2013-03-20 15:25:19 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigCurveModelProfile.java
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigCurveModelProfile.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigCurveModelProfile.java 2013-03-20 12:50:19 UTC (rev 8352)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigCurveModelProfile.java 2013-03-20 15:25:19 UTC (rev 8353)
@@ -8,7 +8,6 @@
package org.fudaa.fudaa.sig;
import java.util.Map;
-
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluListSelectionInterface;
import org.fudaa.ctulu.CtuluUI;
@@ -32,6 +31,11 @@
pnCurve_ = _pnCurve;
}
+ @Override
+ public boolean useSpecificIcon(int idx) {
+ return false;
+ }
+
/*
* (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#addValue(double, double, org.fudaa.ctulu.CtuluCommandContainer)
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-20 12:50:26
|
Revision: 8352
http://fudaa.svn.sourceforge.net/fudaa/?rev=8352&view=rev
Author: deniger
Date: 2013-03-20 12:50:19 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/Etu201.zip
Added: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/Etu201.zip
===================================================================
(Binary files differ)
Property changes on: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/Etu201.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-20 12:49:16
|
Revision: 8351
http://fudaa.svn.sourceforge.net/fudaa/?rev=8351&view=rev
Author: deniger
Date: 2013-03-20 12:49:10 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-emh/src/test/java/org/fudaa/dodico/crue/metier/helper/ToStringTest.java
Modified: trunk/soft/fudaa-crue/crue-emh/src/test/java/org/fudaa/dodico/crue/metier/helper/ToStringTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/test/java/org/fudaa/dodico/crue/metier/helper/ToStringTest.java 2013-03-20 12:47:42 UTC (rev 8350)
+++ trunk/soft/fudaa-crue/crue-emh/src/test/java/org/fudaa/dodico/crue/metier/helper/ToStringTest.java 2013-03-20 12:49:10 UTC (rev 8351)
@@ -22,7 +22,7 @@
CrueConfigMetier def = CrueConfigMetierLoaderDefaultTest.DEFAULT;
ToStringTransformer create = ToStringTransfomerFactory.create(def,DecimalFormatEpsilonEnum.PRESENTATION);
ParamNumCalcPseudoPerm pseudo = new ParamNumCalcPseudoPerm(def);
- assertEquals("ParamNumCalcPseudoPerm [coefRelaxQ=1, coefRelaxZ=1, crMaxFlu=1.0E30, crMaxTor=1.0E30, nbrPdtDecoup=10, nbrPdtMax=40, pdt=Cst: 3600 s, tolMaxQ=0.01, tolMaxZ=0.001]", create.transform(pseudo));
+ assertEquals("ParamNumCalcPseudoPerm [coefRelaxQ=1, coefRelaxZ=1, crMaxFlu=1.0E30, crMaxTor=1.0E30, nbrPdtDecoup=1, nbrPdtMax=40, pdt=Cst: 3600 s, tolMaxQ=0.01, tolMaxZ=0.001]", create.transform(pseudo));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
