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...> - 2014-11-06 21:31:27
|
Revision: 8907
http://sourceforge.net/p/fudaa/svn/8907
Author: deniger
Date: 2014-11-06 21:31:23 +0000 (Thu, 06 Nov 2014)
Log Message:
-----------
mois de version
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2014-11-05 17:34:09 UTC (rev 8906)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2014-11-06 21:31:23 UTC (rev 8907)
@@ -153,7 +153,7 @@
static {
isApp_.name = "Fudaa-Mascaret";
isApp_.version = "3.4";
- isApp_.date = "October 2014";
+ isApp_.date = "November 2014";
isApp_.rights = MascaretResource.MASCARET.getString("Tous droits r\xE9serv\xE9s") + ". EDF-CEREMA (c) 2001-2014";
// isApp_.contact = "http://www.openmascaret.org/index.php?option=com_kunena&view=category&Itemid=177&layout=list";
isApp_.contact = "ot-...@op...";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-28 21:07:25
|
Revision: 8903
http://sourceforge.net/p/fudaa/svn/8903
Author: deniger
Date: 2014-10-28 21:07:17 +0000 (Tue, 28 Oct 2014)
Log Message:
-----------
maj shortcuts
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/conv/CConversionHydraulique1d.java
trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/MascaretClient.java
Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/conv/CConversionHydraulique1d.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/conv/CConversionHydraulique1d.java 2014-10-28 20:59:44 UTC (rev 8902)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/conv/CConversionHydraulique1d.java 2014-10-28 21:07:17 UTC (rev 8903)
@@ -96,7 +96,7 @@
.paramsReprise()));
}
parametresMascaret.parametresNCA(
- new SParametresNCA("mascaret" + connexion_.numero() + ".cas"));
+ new SParametresNCA("mascaret" + connexion_.numero() + (xcas ? ".xcas" : ".cas")));
MetierParametresTailleMaxFichier t
= calculHydraulique1d.etude().paramResultats().paramTailleMaxFichier();
parametresMascaret.parametresTailleMaxFichier(
Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/MascaretClient.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/MascaretClient.java 2014-10-28 20:59:44 UTC (rev 8902)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/MascaretClient.java 2014-10-28 21:07:17 UTC (rev 8903)
@@ -80,8 +80,8 @@
IResultatsMascaret rFic = IResultatsMascaretHelper.narrow(mascaret.resultats(c));
// mascaret.parametres(pFic);
String nomEtu = "mascaret" + c.numero();
- cas.parametresGen.fichMotsCles = path + nomEtu + ".cas";
- SParametresNCA ncas = new SParametresNCA(path + nomEtu + ".cas");
+ cas.parametresGen.fichMotsCles = path + nomEtu + ".xcas";
+ SParametresNCA ncas = new SParametresNCA(path + nomEtu + ".cxas");
pFic.parametresNCA(ncas);
cas.parametresGeoReseau.geometrie.fichier = path + nomEtu + ".geo";
cas.parametresImpressResult.resultats.fichResultat = path + nomEtu + "_ecr.opt";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-28 20:59:51
|
Revision: 8902
http://sourceforge.net/p/fudaa/svn/8902
Author: deniger
Date: 2014-10-28 20:59:44 +0000 (Tue, 28 Oct 2014)
Log Message:
-----------
maj shortcuts
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/distrib/src/dist/Lisezmoi.txt
Modified: trunk/soft/fudaa-mascaret/distrib/src/dist/Lisezmoi.txt
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/src/dist/Lisezmoi.txt 2014-10-28 20:59:07 UTC (rev 8901)
+++ trunk/soft/fudaa-mascaret/distrib/src/dist/Lisezmoi.txt 2014-10-28 20:59:44 UTC (rev 8902)
@@ -1,4 +1,4 @@
-*** FUDAA-MASCARET 3.3.1 ***
+*** FUDAA-MASCARET 3.4 ***
Fudaa Mascaret : Installation
-----------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-28 20:59:09
|
Revision: 8901
http://sourceforge.net/p/fudaa/svn/8901
Author: deniger
Date: 2014-10-28 20:59:07 +0000 (Tue, 28 Oct 2014)
Log Message:
-----------
maj shortcuts
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauPalette.java
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauPalette.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauPalette.java 2014-10-28 20:37:54 UTC (rev 8900)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauPalette.java 2014-10-28 20:59:07 UTC (rev 8901)
@@ -72,7 +72,7 @@
"bief",
"confluent",
"apport",
- "pertecharge",
+ "perteCharge",
"seuil",
"deversoir",
"-casier",
@@ -84,7 +84,7 @@
"bief",
"confluent",
"apport",
- "pertecharge",
+ "perteCharge",
"seuil",
"deversoir",
"-casier",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-28 20:37:57
|
Revision: 8900
http://sourceforge.net/p/fudaa/svn/8900
Author: deniger
Date: 2014-10-28 20:37:54 +0000 (Tue, 28 Oct 2014)
Log Message:
-----------
maj shortcuts
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/distrib/src/dist/Readme.txt
trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/unix_shortcutSpec.xml
trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/unix_shortcutSpec_eng.xml
trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/win_shortcutSpec.xml
trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/win_shortcutSpec_eng.xml
Modified: trunk/soft/fudaa-mascaret/distrib/src/dist/Readme.txt
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/src/dist/Readme.txt 2014-10-28 20:37:02 UTC (rev 8899)
+++ trunk/soft/fudaa-mascaret/distrib/src/dist/Readme.txt 2014-10-28 20:37:54 UTC (rev 8900)
@@ -1,4 +1,4 @@
-*** FUDAA-MASCARET 3.3.1 ***
+*** FUDAA-MASCARET 3.4 ***
Fudaa Mascaret : Installation
Modified: trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/unix_shortcutSpec.xml
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/unix_shortcutSpec.xml 2014-10-28 20:37:02 UTC (rev 8899)
+++ trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/unix_shortcutSpec.xml 2014-10-28 20:37:54 UTC (rev 8900)
@@ -49,7 +49,7 @@
startMenu="no"
startup="no"
target="evince"
- commandLine="$INSTALL_PATH/doc/Note_Principe.pdf"
+ commandLine="$INSTALL_PATH/doc/Princip_FR.pdf"
iconFile="$INSTALL_PATH/icons/help.png"
description="La note de principe de l'hydraulique">
<createForPack name="Docs" />
@@ -65,7 +65,7 @@
startMenu="no"
startup="no"
target="evince"
- commandLine="$INSTALL_PATH/doc/Princip_Tracer.pdf"
+ commandLine="$INSTALL_PATH/doc/PrincipTracer_FR.pdf"
iconFile="$INSTALL_PATH/icons/help.png"
description="La note de principe de qualité d'eau">
<createForPack name="Docs" />
@@ -97,7 +97,7 @@
startMenu="no"
startup="no"
target="evince"
- commandLine="$INSTALL_PATH/doc/ApplicationGuide.pdf"
+ commandLine="$INSTALL_PATH/doc/ApplGuid.pdf"
iconFile="$INSTALL_PATH/icons/help.png"
description="Le guide d'application Fudaa-Mascaret">
<createForPack name="Docs" />
Modified: trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/unix_shortcutSpec_eng.xml
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/unix_shortcutSpec_eng.xml 2014-10-28 20:37:02 UTC (rev 8899)
+++ trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/unix_shortcutSpec_eng.xml 2014-10-28 20:37:54 UTC (rev 8900)
@@ -49,7 +49,7 @@
startMenu="no"
startup="no"
target="evince"
- commandLine="$INSTALL_PATH/doc/Theoretical_Note.pdf"
+ commandLine="$INSTALL_PATH/doc/Theoretical_Note_EN.pdf"
iconFile="$INSTALL_PATH/icons/help.png"
description="The theoretical note for Mascaret">
<createForPack name="Docs" />
@@ -65,7 +65,7 @@
startMenu="no"
startup="no"
target="evince"
- commandLine="$INSTALL_PATH/doc/ApplicationGuide.pdf"
+ commandLine="$INSTALL_PATH/doc/ApplGuid.pdf"
iconFile="$INSTALL_PATH/icons/help.png"
description="The application guide for Fudaa-Mascaret">
<createForPack name="Docs" />
Modified: trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/win_shortcutSpec.xml
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/win_shortcutSpec.xml 2014-10-28 20:37:02 UTC (rev 8899)
+++ trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/win_shortcutSpec.xml 2014-10-28 20:37:54 UTC (rev 8900)
@@ -43,7 +43,7 @@
applications="no"
startMenu="no"
startup="no"
- target="$INSTALL_PATH\doc\ApplicationGuide.pdf"
+ target="$INSTALL_PATH\doc\ApplGuid.pdf"
commandLine=""
iconFile="$INSTALL_PATH\icons\help.ico"
iconIndex="0"
@@ -58,7 +58,7 @@
applications="no"
startMenu="no"
startup="no"
- target="$INSTALL_PATH\doc\Note_Principe.pdf"
+ target="$INSTALL_PATH\doc\Princip_FR.pdf"
commandLine=""
iconFile="$INSTALL_PATH\icons\help.ico"
iconIndex="0"
@@ -73,7 +73,7 @@
applications="no"
startMenu="no"
startup="no"
- target="$INSTALL_PATH\doc\Princip_Tracer.pdf"
+ target="$INSTALL_PATH\doc\PrincipTracer_FR.pdf"
commandLine=""
iconFile="$INSTALL_PATH\icons\help.ico"
iconIndex="0"
Modified: trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/win_shortcutSpec_eng.xml
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/win_shortcutSpec_eng.xml 2014-10-28 20:37:02 UTC (rev 8899)
+++ trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/win_shortcutSpec_eng.xml 2014-10-28 20:37:54 UTC (rev 8900)
@@ -43,7 +43,7 @@
applications="no"
startMenu="no"
startup="no"
- target="$INSTALL_PATH\doc\ApplicationGuide.pdf"
+ target="$INSTALL_PATH\doc\ApplGuid.pdf"
commandLine=""
iconFile="$INSTALL_PATH\icons\help.ico"
iconIndex="0"
@@ -58,7 +58,7 @@
applications="no"
startMenu="no"
startup="no"
- target="$INSTALL_PATH\doc\Theoretical_Note.pdf"
+ target="$INSTALL_PATH\doc\Theoretical_Note_EN.pdf"
commandLine=""
iconFile="$INSTALL_PATH\icons\help.ico"
iconIndex="0"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-28 20:37:10
|
Revision: 8899
http://sourceforge.net/p/fudaa/svn/8899
Author: deniger
Date: 2014-10-28 20:37:02 +0000 (Tue, 28 Oct 2014)
Log Message:
-----------
maj retour EDF
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBiefCourbe.java
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBiefDroit.java
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauFrame.java
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauNoeud.java
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBiefCourbe.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBiefCourbe.java 2014-10-27 14:00:11 UTC (rev 8898)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBiefCourbe.java 2014-10-28 20:37:02 UTC (rev 8899)
@@ -7,6 +7,7 @@
* @mail de...@fu...
*/
package org.fudaa.fudaa.hydraulique1d.reseau;
+
import java.awt.Polygon;
import org.fudaa.dodico.hydraulique1d.metier.MetierBief;
@@ -18,105 +19,124 @@
import com.memoire.dja.DjaArcArrow;
import com.memoire.dja.DjaMatrixHermite;
import com.memoire.dja.DjaText;
+import org.fudaa.dodico.boony.BoonyDeserializationAware;
+
/**
- * Composant graphique du r\xE9seau hydraulique repr\xE9sentant un bief.
- * A la cr\xE9ation, il est courb\xE9.
+ * Composant graphique du r\xE9seau hydraulique repr\xE9sentant un bief. A la cr\xE9ation, il est courb\xE9.
+ *
* @see MetierBief
- * @version $Revision: 1.11 $ $Date: 2007-11-20 11:42:40 $ by $Author: bmarchan $
- * @author Jean-Marc Lacombe
+ * @version $Revision: 1.11 $ $Date: 2007-11-20 11:42:40 $ by $Author: bmarchan $
+ * @author Jean-Marc Lacombe
*/
public class Hydraulique1dReseauBiefCourbe
- extends DjaArcArrow
- implements Hydraulique1dReseauElementInterf {
- protected int nbAnchors= 9;
+ extends DjaArcArrow
+ implements Hydraulique1dReseauElementInterf, BoonyDeserializationAware {
+
+ protected int nbAnchors = 9;
+
Hydraulique1dReseauBiefCourbe(MetierBief bief) {
super();
- if (bief != null)
- super.addText(Integer.toString(bief.indice()+1));
+ if (bief != null) {
+ super.addText(Integer.toString(bief.indice() + 1));
+ }
super.setEndType(5); // fleche pleine
super.setEndO(0); // fleche vers le bas
super.setHeight(100);
super.setBeginX(super.getEndX()); // vertical
// symetrie horizontale
- int YBegin= super.getBeginY();
- int YEnd= super.getEndY();
+ int YBegin = super.getBeginY();
+ int YEnd = super.getEndY();
super.setBeginY(YEnd);
super.setEndY(YBegin);
- if (bief != null)
+ if (bief != null) {
putData("bief", bief);
+ }
}
+
Hydraulique1dReseauBiefCourbe() {
this(null);
}
+
@Override
public Object clone() throws CloneNotSupportedException {
- Hydraulique1dReseauBiefCourbe r=(Hydraulique1dReseauBiefCourbe)super.clone();
+ Hydraulique1dReseauBiefCourbe r = (Hydraulique1dReseauBiefCourbe) super.clone();
MetierReseau reseau = Hydraulique1dProjet.getInstance().getEtude1d().reseau();
- MetierBief bief= reseau.creeBief();
- bief.initialise((MetierBief)getData("bief"));
+ MetierBief bief = reseau.creeBief();
+ bief.initialise((MetierBief) getData("bief"));
r.putData("bief", bief);
return r;
}
+
+ protected final void clearCourbure() {
+ this.putProperty("courbure", "0.");
+ }
+
+ @Override
+ public void endDeserialization() {
+ clearCourbure();
+ }
+
public void setNbAnchors(int nbAnchors_) {
- nbAnchors= nbAnchors_;
+ nbAnchors = nbAnchors_;
}
+
@Override
public DjaText[] getTexts() {
- DjaText[] r= super.getTexts();
+ DjaText[] r = super.getTexts();
if (r.length > 0) {
r[0].setPosition(RELATIVE_ANCHOR);
r[0].setReference(nbAnchors / 2);
}
return r;
}
+
@Override
public DjaAnchor[] getAnchors() {
- DjaAnchor[] r = new DjaAnchor[0];
- double c= getCourbure();
- if (c != 0.) {
- try{
- int vx0= (int) ((yr0 - yr1) * c);
- int vy0= (int) ((xr1 - xr0) * c);
- int vx1= (int) ((yr1 - yr0) * c);
- int vy1= (int) ((xr0 - xr1) * c);
- Polygon p=
- DjaMatrixHermite.arc2polyline(xr0, yr0, xr1, yr1, vx0, vy0, vx1, vy1);
- int nbPoints= p.npoints;
- nbAnchors = Math.min(nbPoints,nbAnchors);
- int pas= (nbPoints - 1) / (nbAnchors + 1);
- pas= Math.max(pas, 1);
+ DjaAnchor[] r = new DjaAnchor[0];
+ double c = getCourbure();
+ if (Math.abs(c) > 0.001) {
+ try {
+ int vx0 = (int) ((yr0 - yr1) * c);
+ int vy0 = (int) ((xr1 - xr0) * c);
+ int vx1 = (int) ((yr1 - yr0) * c);
+ int vy1 = (int) ((xr0 - xr1) * c);
+ Polygon p
+ = DjaMatrixHermite.arc2polyline(xr0, yr0, xr1, yr1, vx0, vy0, vx1, vy1);
+ int nbPoints = p.npoints;
+ nbAnchors = Math.min(nbPoints, nbAnchors);
+ int pas = (nbPoints - 1) / (nbAnchors + 1);
+ pas = Math.max(pas, 1);
// Unused int fin= Math.min(nbPoints - 1, pas * (nbAnchors + 1));
- r= new DjaAnchor[nbAnchors/*Math.round((fin / pas) + 0.499999f) - 1*/];
- //System.out.println("fin "+fin+"; pas "+pas +"; nbpoints "+nbPoints+"; a49 "+a49+"; a4999 "+a4999 );
- int j= 0;
- for (int i= pas;j<nbAnchors; i += pas) {//erreur lorsque i>nbPoints
- r[j]= new DjaAnchor(this, j, ANY, p.xpoints[i], p.ypoints[i]);
- j++;
- }
- }
- catch(Throwable e) {
- System.out.println("Erreur dans Hydraulique1dReseauBiefCourbe.getAnchors");
- }
- } else {
- r= new DjaAnchor[nbAnchors];
- float pasX = (xr1 - xr0) / (nbAnchors + 1f);
- float pasY = (yr1 - yr0) / (nbAnchors + 1f);
- for (int i= 1; i <= nbAnchors; i++) {
- r[i - 1]=
- new DjaAnchor(
- this,
- i - 1,
- ANY,
- Math.round(xr0 + i * pasX),
- Math.round(yr0 + i * pasY));
- }
- }
- return r;
- }
-
+ r = new DjaAnchor[nbAnchors/*Math.round((fin / pas) + 0.499999f) - 1*/];
+ //System.out.println("fin "+fin+"; pas "+pas +"; nbpoints "+nbPoints+"; a49 "+a49+"; a4999 "+a4999 );
+ int j = 0;
+ for (int i = pas; j < nbAnchors; i += pas) {//erreur lorsque i>nbPoints
+ r[j] = new DjaAnchor(this, j, ANY, p.xpoints[i], p.ypoints[i]);
+ j++;
+ }
+ } catch (Throwable e) {
+ System.out.println("Erreur dans Hydraulique1dReseauBiefCourbe.getAnchors");
+ }
+ } else {
+ r = new DjaAnchor[nbAnchors];
+ float pasX = (xr1 - xr0) / (nbAnchors + 1f);
+ float pasY = (yr1 - yr0) / (nbAnchors + 1f);
+ for (int i = 1; i <= nbAnchors; i++) {
+ r[i - 1]
+ = new DjaAnchor(
+ this,
+ i - 1,
+ ANY,
+ Math.round(xr0 + i * pasX),
+ Math.round(yr0 + i * pasY));
+ }
+ }
+ return r;
+ }
+
@Override
public String[] getInfos() {
- MetierHydraulique1d iobjet= (MetierHydraulique1d)getData("bief");
+ MetierHydraulique1d iobjet = (MetierHydraulique1d) getData("bief");
return iobjet.getInfos();
}
}
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBiefDroit.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBiefDroit.java 2014-10-27 14:00:11 UTC (rev 8898)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBiefDroit.java 2014-10-28 20:37:02 UTC (rev 8899)
@@ -19,7 +19,7 @@
extends Hydraulique1dReseauBiefCourbe {
Hydraulique1dReseauBiefDroit(MetierBief bief) {
super(bief);
- this.putProperty("courbure", "0.");
+ clearCourbure();
}
Hydraulique1dReseauBiefDroit() {
this(null);
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauFrame.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauFrame.java 2014-10-27 14:00:11 UTC (rev 8898)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauFrame.java 2014-10-28 20:37:02 UTC (rev 8899)
@@ -17,12 +17,10 @@
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.PrintStream;
-import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Hashtable;
-import java.util.List;
import javax.swing.JComponent;
import javax.swing.JSplitPane;
@@ -87,12 +85,12 @@
import com.memoire.dja.DjaText;
import com.memoire.dja.DjaVector;
import java.awt.Color;
-import java.awt.event.ActionListener;
import java.util.Map;
import java.awt.image.BufferedImage;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import org.fudaa.ctulu.CtuluLibImage;
+import org.fudaa.fudaa.mascaret.MascaretImplementation;
/**
* La fen\xEAtre contenant le r\xE9seau hydraulique.
@@ -277,9 +275,10 @@
// pbReseau_.setEnabled(grid_.isInteractive());
final BuColumn leftColumn = app_.getMainPanel().getLeftColumn();
if (grid_.isInteractive()) {
- if (srcReseau_.getParent() != leftColumn) {
- removeExistingPalette(leftColumn);
- leftColumn.add(srcReseau_);
+ ((MascaretImplementation) app_).ensureRigthColumnIsVisible(leftColumn);
+ if (srcReseau_.getParent() != leftColumn) {
+ removeExistingPalette(leftColumn);
+ leftColumn.add(srcReseau_);
}
}
srcReseau_.setVisible(grid_.isInteractive());
@@ -290,15 +289,15 @@
}
- private void removeExistingPalette(BuColumn buComp) {
- for(Component comp: buComp.getComponents()) {
- if(comp instanceof Hydraulique1dReseauPalette) {
- buComp.remove(comp);
- }
- }
-}
+ private void removeExistingPalette(BuColumn buComp) {
+ for (Component comp : buComp.getComponents()) {
+ if (comp instanceof Hydraulique1dReseauPalette) {
+ buComp.remove(comp);
+ }
+ }
+ }
-/**
+ /**
* R\xE9implementation de BuCutCopyPasteInterface pour d\xE9sactiver la fonction
*/
@Override
@@ -1781,11 +1780,11 @@
@Override
public void dispose() {
- //-- remove palette if opened --//
- if(app_ != null && app_.getMainPanel() != null && app_.getMainPanel().getLeftColumn() != null){
- removeExistingPalette(app_.getMainPanel().getLeftColumn());
- }
+ //-- remove palette if opened --//
+ if (app_ != null && app_.getMainPanel() != null && app_.getMainPanel().getLeftColumn() != null) {
+ removeExistingPalette(app_.getMainPanel().getLeftColumn());
+ }
- super.dispose();
+ super.dispose();
}
}
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauNoeud.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauNoeud.java 2014-10-27 14:00:11 UTC (rev 8898)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauNoeud.java 2014-10-28 20:37:02 UTC (rev 8899)
@@ -16,6 +16,7 @@
import org.fudaa.fudaa.hydraulique1d.Hydraulique1dProjet;
import com.memoire.dja.DjaCircle;
+import org.fudaa.dodico.boony.BoonyDeserializationAware;
/**
* Composant graphique du r\xE9seau hydraulique repr\xE9sentant un confluent (noeud).
@@ -26,7 +27,7 @@
*/
public class Hydraulique1dReseauNoeud
extends DjaCircle
- implements Hydraulique1dReseauElementInterf {
+ implements Hydraulique1dReseauElementInterf, BoonyDeserializationAware {
Hydraulique1dReseauNoeud(MetierNoeud noeud) {
super();
@@ -34,12 +35,17 @@
super.addText(Integer.toString(noeud.numero()));
}
super.setWidth(20);
- super.setBackground(new Color(170, 252, 255));
+ endDeserialization();
if (noeud != null) {
putData("noeud", noeud);
}
}
+ @Override
+ public final void endDeserialization() {
+ super.setBackground(new Color(170, 252, 255));
+ }
+
Hydraulique1dReseauNoeud() {
this(null);
}
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2014-10-27 14:00:11 UTC (rev 8898)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2014-10-28 20:37:02 UTC (rev 8899)
@@ -108,6 +108,7 @@
import com.memoire.fu.FuLib;
import com.memoire.bu.BuLib;
import com.memoire.fu.FuLog;
+import java.awt.EventQueue;
import javax.swing.JPanel;
import org.fudaa.ctulu.CtuluLibFile;
@@ -345,7 +346,7 @@
assistant_.changeAttitude(
BuAssistant.PAROLE,
_("Bienvenue dans ") + isApp_.name + " !\n");
- BuMainPanel mp = getMainPanel();
+ final BuMainPanel mp = getMainPanel();
BuInformationsSoftware infSoft = getInformationsSoftware();
mp.setLogo(infSoft.logo);
BuMenuBar mb = getMainMenuBar();
@@ -356,11 +357,15 @@
ihmP_ = Hydraulique1dIHMRepository.getInstance();
projet_.setIhmRepository(ihmP_);
- BuColumn rl = mp.getLeftColumn();
- rl.setVisible(true);
- rl.setMinimumSize(new Dimension(35, 120));
- rl.setMaximumSize(new Dimension(35, 120));
- rl.setSize(new Dimension(35, 120));
+ final BuColumn rl = mp.getLeftColumn();
+ EventQueue.invokeLater(new Runnable() {
+
+ @Override
+ public void run() {
+ ensureRigthColumnIsVisible(rl);
+ }
+ });
+
//Genesis: autorisation de la version 1.7
String versionJava = System.getProperty("java.version").substring(0, 3);
if (versionJava.equalsIgnoreCase("1.6") || versionJava.equalsIgnoreCase("1.7") || versionJava.equalsIgnoreCase("1.8")) {
@@ -372,6 +377,21 @@
}
}
+ public void ensureRigthColumnIsVisible(BuColumn rl) {
+ rl.setVisible(true);
+ int h = (int) rl.getPreferredSize().getHeight();
+ rl.setMinimumSize(new Dimension(LEFT_COLUMN_MIN_WIDTH, h));
+ if (rl.getWidth() < LEFT_COLUMN_MIN_WIDTH) {
+ rl.setPreferredSize(new Dimension(LEFT_COLUMN_MIN_WIDTH, h));
+ rl.setSize(new Dimension(LEFT_COLUMN_MIN_WIDTH, h));
+ rl.revalidate();
+ rl.getParent().revalidate();
+ }
+ getMainPanel().updateSplits();
+ getMainPanel().updateDisplay();
+ }
+ protected static final int LEFT_COLUMN_MIN_WIDTH = 155;
+
@Override
protected String _(String _s) {
return MascaretResource.MASCARET.getString(_s);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-22 22:02:25
|
Revision: 8893
http://sourceforge.net/p/fudaa/svn/8893
Author: deniger
Date: 2014-10-22 22:02:14 +0000 (Wed, 22 Oct 2014)
Log Message:
-----------
maj couleur par defaut ?\195?\160 similaire
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/conv/ConvH1D_Masc.java
trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/singularite/MetierSeuilLoi.java
Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/conv/ConvH1D_Masc.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/conv/ConvH1D_Masc.java 2014-10-22 21:59:05 UTC (rev 8892)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/conv/ConvH1D_Masc.java 2014-10-22 22:02:14 UTC (rev 8893)
@@ -1251,9 +1251,8 @@
for (int i = 0; i < singulariteMas.nbSeuils; i++) {
SParametresSeuil sMas
= new SParametresSeuil(null, 0, 0, 0, RIEN, RIEN, RIEN, RIEN, RIEN, IRIEN, IRIEN,
- null, null, IRIEN, RIEN);
+ null, null, SParametresSeuil.PARAMETRES_SEUIL_DEFAULT_VALUE, RIEN);
s = (MetierSeuil) seuils.elementAt(i);
- System.out.println("convertirParametresSingularite s.nom() = " + s.nom());
sMas.nom = s.nom();
sMas.abscisse = s.abscisse();
sMas.coteRupture = s.coteRupture();
Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/singularite/MetierSeuilLoi.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/singularite/MetierSeuilLoi.java 2014-10-22 21:59:05 UTC (rev 8892)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/singularite/MetierSeuilLoi.java 2014-10-22 22:02:14 UTC (rev 8893)
@@ -1,27 +1,33 @@
/**
- * @file MetierSeuilLoi.java
- * @creation 2000-08-09
+ * @file MetierSeuilLoi.java
+ * @creation 2000-08-09
* @modification $Date: 2007-11-20 11:42:36 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 EDF/LNHE
- * @mail de...@fu...
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 EDF/LNHE
+ * @mail de...@fu...
*/
package org.fudaa.dodico.hydraulique1d.metier.singularite;
+
+import org.fudaa.dodico.boony.BoonyDeserializationAware;
+import static org.fudaa.dodico.corba.mascaret.SParametresSeuil.PARAMETRES_SEUIL_DEFAULT_VALUE;
import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
import org.fudaa.dodico.hydraulique1d.metier.MetierLoiHydraulique;
import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
+
/**
- * Impl\xE9mentation de l'objet m\xE9tier singularit\xE9 de type "seuil loi".
- * Ajoute une cote de cr\xEAte, un coefficient de d\xE9bit et une \xE9paisseur (mince ou \xE9pais).
- * @version $Revision: 1.2 $ $Date: 2007-11-20 11:42:36 $ by $Author: bmarchan $
- * @author Jean-Marc Lacombe
+ * Impl\xE9mentation de l'objet m\xE9tier singularit\xE9 de type "seuil loi". Ajoute une cote de cr\xEAte, un coefficient de d\xE9bit et une \xE9paisseur (mince ou
+ * \xE9pais).
+ *
+ * @version $Revision: 1.2 $ $Date: 2007-11-20 11:42:36 $ by $Author: bmarchan $
+ * @author Jean-Marc Lacombe
*/
-public class MetierSeuilLoi extends MetierSeuil {
+public class MetierSeuilLoi extends MetierSeuil implements BoonyDeserializationAware {
+
@Override
public void initialise(MetierHydraulique1d _o) {
super.initialise(_o);
if (_o instanceof MetierSeuilLoi) {
- MetierSeuilLoi s= (MetierSeuilLoi)_o;
+ MetierSeuilLoi s = (MetierSeuilLoi) _o;
coteCrete(s.coteCrete());
coefQ(s.coefQ());
epaisseur(s.epaisseur());
@@ -29,120 +35,154 @@
debit(s.debit());
}
}
+
@Override
+ public void endDeserialization() {
+ if (epaisseur_ == null) {
+ epaisseur_ = EnumMetierEpaisseurSeuil.EPAIS;
+ }
+ }
+
+ @Override
public MetierHydraulique1d creeClone() {
- MetierSeuilLoi s= new MetierSeuilLoi();
+ MetierSeuilLoi s = new MetierSeuilLoi();
s.initialise(this);
return s;
}
+
@Override
public String toString() {
- MetierLoiHydraulique l= getLoi();
- String s= "seuilLoi " + nom_;
- if (l != null)
+ MetierLoiHydraulique l = getLoi();
+ String s = "seuilLoi " + nom_;
+ if (l != null) {
s += "(loi " + l.toString() + ")";
+ }
return s;
}
+
@Override
public String[] getInfos() {
- String epaisseur=getS("mince");
+ String epaisseur = getS("mince");
if (epaisseur_.value() == EnumMetierEpaisseurSeuil._EPAIS) {
- epaisseur=getS("\xE9pais");
+ epaisseur = getS("\xE9pais");
}
- String[] res= new String[2];
- res[0]= getS("Seuil (Zcr\xEAte,coef.Q)-Singularit\xE9 n\xB0")+numero_;
- res[1]=
- getS("Absc.")+" : "
- + abscisse_
- + " "+getS("Zrupture")+" : "
- + coteRupture_
- + " "+getS("Zcr\xEAte")+" : "
- + coteCrete_
- + " "+getS("Coef. Q")+" : "
- + coefQ_
- + " "+getS("Epaisseur")+" : "
- + epaisseur
- +" "+getS("gradient Q")+" : "
- + gradient_
- +" "+getS("d\xE9bit turbin\xE9")+" : "
- + debit_;
+ String[] res = new String[2];
+ res[0] = getS("Seuil (Zcr\xEAte,coef.Q)-Singularit\xE9 n\xB0") + numero_;
+ res[1]
+ = getS("Absc.") + " : "
+ + abscisse_
+ + " " + getS("Zrupture") + " : "
+ + coteRupture_
+ + " " + getS("Zcr\xEAte") + " : "
+ + coteCrete_
+ + " " + getS("Coef. Q") + " : "
+ + coefQ_
+ + " " + getS("Epaisseur") + " : "
+ + epaisseur
+ + " " + getS("gradient Q") + " : "
+ + gradient_
+ + " " + getS("d\xE9bit turbin\xE9") + " : "
+ + debit_;
return res;
}
- /*** MetierSeuilLoi ***/
+
+ /**
+ * * MetierSeuilLoi **
+ */
// constructeurs
protected MetierSeuilLoi(boolean _notify) {
super();
- nom_=getS("Seuil loi-Singularit\xE9 n\xB0")+numero_;
- coteCrete_= 0.;
- coefQ_= 0.38;
- epaisseur_= EnumMetierEpaisseurSeuil.EPAIS;
- gradient_= 5000.;
- debit_=0;
+ nom_ = getS("Seuil loi-Singularit\xE9 n\xB0") + numero_;
+ coteCrete_ = 0.;
+ coefQ_ = 0.38;
+ epaisseur_ = EnumMetierEpaisseurSeuil.EPAIS;
+ gradient_ = 5000.;
+ debit_ = 0;
- if (_notify) notifieObjetCree();
+ if (_notify) {
+ notifieObjetCree();
+ }
}
public MetierSeuilLoi() {
- this(true);
+ this(true);
}
@Override
public void dispose() {
- coteCrete_= 0.;
- coefQ_= 0;
- epaisseur_= null;
- gradient_= 0.;
- debit_=0;
+ coteCrete_ = 0.;
+ coefQ_ = 0;
+ epaisseur_ = null;
+ gradient_ = 0.;
+ debit_ = 0;
super.dispose();
}
// attributs
protected double coteCrete_;
+
public double coteCrete() {
return coteCrete_;
}
+
public void coteCrete(double coteCrete) {
- if (coteCrete_==coteCrete) return;
- coteCrete_= coteCrete;
+ if (coteCrete_ == coteCrete) {
+ return;
+ }
+ coteCrete_ = coteCrete;
Notifieur.getNotifieur().fireObjetModifie(toString(), this, "coteCrete");
}
protected double coefQ_;
+
public double coefQ() {
return coefQ_;
}
+
public void coefQ(double coefQ) {
- if (coefQ_==coefQ) return;
- coefQ_= coefQ;
+ if (coefQ_ == coefQ) {
+ return;
+ }
+ coefQ_ = coefQ;
Notifieur.getNotifieur().fireObjetModifie(toString(), this, "coefQ");
}
protected EnumMetierEpaisseurSeuil epaisseur_;
+
public EnumMetierEpaisseurSeuil epaisseur() {
return epaisseur_;
}
+
public void epaisseur(EnumMetierEpaisseurSeuil epaisseur) {
- if (epaisseur_.value()==epaisseur.value()) return;
- epaisseur_= epaisseur;
+ if (epaisseur_.value() == epaisseur.value()) {
+ return;
+ }
+ epaisseur_ = epaisseur;
Notifieur.getNotifieur().fireObjetModifie(toString(), this, "epaisseur");
}
private double gradient_;
+
public double gradient() {
return gradient_;
}
+
public void gradient(double gradient) {
- if (gradient_==gradient) return;
- gradient_= gradient;
+ if (gradient_ == gradient) {
+ return;
+ }
+ gradient_ = gradient;
Notifieur.getNotifieur().fireObjetModifie(toString(), this, "gradient");
}
private double debit_;
+
public double debit() {
- return debit_;
+ return debit_;
}
public void debit(double debit) {
- if (debit_ == debit)
- return;
- debit_ = debit;
- Notifieur.getNotifieur().fireObjetModifie(toString(), this, "debit");
+ if (debit_ == debit) {
+ return;
+ }
+ debit_ = debit;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "debit");
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-22 21:59:07
|
Revision: 8892
http://sourceforge.net/p/fudaa/svn/8892
Author: deniger
Date: 2014-10-22 21:59:05 +0000 (Wed, 22 Oct 2014)
Log Message:
-----------
maj couleur par defaut ?\195?\160 similaire
Removed Paths:
-------------
trunk/soft/fudaa-mascaret/test - Copie.xml
Deleted: trunk/soft/fudaa-mascaret/test - Copie.xml
===================================================================
--- trunk/soft/fudaa-mascaret/test - Copie.xml 2014-10-22 21:58:58 UTC (rev 8891)
+++ trunk/soft/fudaa-mascaret/test - Copie.xml 2014-10-22 21:59:05 UTC (rev 8892)
@@ -1,316 +0,0 @@
-<!DOCTYPE fichierCas SYSTEM "mascaret-1.0.dtd">
-<fichierCas>
- <parametresCas>
- <parametresGeneraux>
- <versionCode>3</versionCode>
- <code>2</code>
- <fichMotsCles>test.xcas</fichMotsCles>
- <dictionaire>dico.txt</dictionaire>
- <progPrincipal>princi.f</progPrincipal>
- <sauveModele>false</sauveModele>
- <fichSauvModele>test.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>true</calcOndeSubmersion>
- <froudeLimCondLim>1000.0</froudeLimCondLim>
- <traitImplicitFrot>false</traitImplicitFrot>
- <hauteurEauMini>0.005</hauteurEauMini>
- <implicitNoyauTrans>false</implicitNoyauTrans>
- <optimisNoyauTrans>false</optimisNoyauTrans>
- <perteChargeAutoElargissement>true</perteChargeAutoElargissement>
- <termesNonHydrostatiques>false</termesNonHydrostatiques>
- <apportDebit>1</apportDebit>
- <attenuationConvection>false</attenuationConvection>
- </parametresNumeriques>
- <parametresTemporels>
- <pasTemps>1.0</pasTemps>
- <tempsInit>0.0</tempsInit>
- <critereArret>2</critereArret>
- <nbPasTemps>5000</nbPasTemps>
- <tempsMax>10.0</tempsMax>
- <pasTempsVar>false</pasTempsVar>
- <nbCourant>0.9</nbCourant>
- <coteMax>0.0</coteMax>
- <abscisseControle>0.0</abscisseControle>
- <biefControle>1</biefControle>
- </parametresTemporels>
- <parametresGeometrieReseau>
- <geometrie>
- <fichier>test.geo</fichier>
- <format>2</format>
- <profilsAbscAbsolu>true</profilsAbscAbsolu>
- </geometrie>
- <listeBranches>
- <nb>7</nb>
- <numeros>1 2 3 4 5 6 7</numeros>
- <abscDebut>-16332.0 10186.0 36530.0 63545.0 1000225.0 2000300.0 3000375.0</abscDebut>
- <abscFin>9911.0 36204.0 63060.0 240420.0 1009300.0 2015350.0 3011100.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>2 3 9 0 0</num>
- </noeud>
- <noeud>
- <num>4 5 11 0 0</num>
- </noeud>
- <noeud>
- <num>6 7 13 0 0</num>
- </noeud>
- </noeuds>
- </listeNoeuds>
- <extrLibres>
- <nb>5</nb>
- <num>1 2 3 4 5</num>
- <numExtrem>1 8 10 12 14</numExtrem>
- <noms>
- <string>limite1</string>
- <string>limite8</string>
- <string>limite10</string>
- <string>limite12</string>
- <string>limite14</string>
- </noms>
- <typeCond>1 6 1 1 1</typeCond>
- <numLoi>1 1 2 2 2</numLoi>
- </extrLibres>
- </parametresGeometrieReseau>
- <parametresConfluents>
- <nbConfluents>3</nbConfluents>
- <confluents>
- <structureParametresConfluent>
- <nbAffluent>3</nbAffluent>
- <nom>Noeud1</nom>
- <abscisses>0.0 -270.0 -175.0</abscisses>
- <ordonnees>0.0 75.0 -140.0</ordonnees>
- <angles>0.0 155.0 263.0</angles>
- </structureParametresConfluent>
- <structureParametresConfluent>
- <nbAffluent>3</nbAffluent>
- <nom>Noeud2</nom>
- <abscisses>0.0 -320.0 -200.0</abscisses>
- <ordonnees>0.0 -170.0 130.0</ordonnees>
- <angles>0.0 216.0 104.4</angles>
- </structureParametresConfluent>
- <structureParametresConfluent>
- <nbAffluent>3</nbAffluent>
- <nom>Noeud3</nom>
- <abscisses>0.0 -530.0 -420.0</abscisses>
- <ordonnees>0.0 -40.0 240.0</ordonnees>
- <angles>0.0 237.15 90.0</angles>
- </structureParametresConfluent>
- </confluents>
- </parametresConfluents>
- <parametresPlanimetrageMaillage>
- <methodeMaillage>2</methodeMaillage>
- <planim>
- <nbPas>62</nbPas>
- <nbZones>8</nbZones>
- <valeursPas>3.0 3.0 3.0 3.0 1.5 3.0 3.0 3.0</valeursPas>
- <num1erProf>1 52 105 163 166 463 481 503</num1erProf>
- <numDerProf>51 104 162 165 462 480 502 525</numDerProf>
- </planim>
- <maillage>
- <modeSaisie>2</modeSaisie>
- <sauvMaillage>false</sauvMaillage>
- <maillageClavier>
- <nbSections>0</nbSections>
- <nbPlages>0</nbPlages>
- <nbZones>518</nbZones>
- <numBrancheZone>1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7</numBrancheZone>
- <absDebutZone>-16332.0 -15486.6 -15182.1 -14211.6 -13783.1 -13046.8 -12529.3 -11950.7 -11578.7 -10993.1 -10392.5 -9917.6 -9291.5 -8585.7 -8027.0 -7820.3 -6836.4 -6322.2 -5811.8 -5615.2 -5360.5 -4844.9 -4627.6 -4093.2 -3628.2 -3118.8 -2375.4 -1980.2 -930.9 -397.2 0.0 260.0 527.4 1000.1 1552.6 2299.5 2796.0 3379.8 3978.4 4877.4 5327.7 5854.9 6425.1 6875.2 7456.0 7853.7 8158.1 8617.0 8971.8 9512.1 10186.0 10624.6 11155.6 11643.6 12202.1 12513.8 13061.0 13446.4 14021.0 14425.3 14948.5 15487.7 16049.2 16593.2 17026.2 17509.8 18370.9 19088.3 19625.2 20141.0 20667.9 21170.4 21485.5 21949.3 22262.9 22766.1 23094.7 23573.0 24104.4 24752.2 25241.3 25586.6 26011.0 26410.4 26785.7 27308.0 27747.1 28290.9 28758.3 29309.1 29971.2 30532.4 31200.2 31892.7 32420.2 32798.4 33153.1 33616.1 34159.6 34712.4 35328.2 35754.7 36530.0 37198.0 37591.4 38010.6 38409.6 38816.7 39248.0 39846.4 40316.8 40767.2 41432.7 42080.9 42597.5 43039.0 43507.0 44063.5 44572.1 45204.1 45652.3 46109.4 46717.6 47566.1 48102.6 48439.2 48928.0 49129.1 49401.0 49964.8 50455.3 50851.6 51419.9 52069.3 52547.5 52883.2 53269.8 53769.8 54501.6 54976.3 55549.0 55934.3 56318.0 56722.8 57024.6 57462.4 57893.5 58287.7 58691.6 59228.4 59742.3 59977.3 60392.2 60666.7 61042.3 61498.2 61823.1 62225.5 62675.6 63545.0 63835.1 64143.0 64746.0 65179.7 66056.7 67601.8 68282.8 68824.5 69095.5 69821.1 70310.6 70587.8 71061.7 72185.1 72774.7 73658.2 74089.2 74433.7 74794.0 75116.1 75512.0 76224.9 76709.7 77067.5 77500.2 77774.2 78255.0 78646.0 79362.3 79857.5 80507.7 80954.9 81404.3 81767.8 82378.5 82834.3 83469.2 84041.2 84355.8 85277.7 85797.8 86175.0 86609.8 87064.3 87553.0 88152.2 88960.5 89446.5 90091.1 90745.9 91714.6 92106.7 92640.8 93006.4 93593.3 94164.7 94620.0 95236.6 95782.2 96322.0 97726.1 98268.9 100466.1 101094.2 101542.2 103103.9 103845.9 104144.2 104463.8 105064.4 106473.7 107358.2 108414.1 109387.3 109983.9 110890.2 111693.1 112159.4 112792.3 113455.3 114052.9 114377.5 114829.1 115289.4 115764.7 116337.8 116870.7 117231.5 117628.1 118265.7 118847.0 119306.5 119819.8 120376.8 120921.0 121635.5 122159.5 123083.0 123533.8 124075.5 124479.0 125096.6 125694.2 126089.9 126957.9 127761.6 129596.3 130407.4 130852.2 131876.0 132799.6 133629.2 134485.5 135124.4 135721.4 136198.5 136580.3 137291.3 137859.8 138405.7 138989.4 139664.8 140404.2 141172.6 141713.3 142315.6 142646.4 143248.4 144012.7 144619.8 145304.0 146025.1 146522.6 147032.6 147603.8 148064.4 148532.7 148992.5 149519.2 149950.2 150433.3 151022.8 151357.7 151695.4 152063.1 152472.2 152900.2 153558.4 154213.2 154753.9 155219.4 155771.0 156393.4 157077.7 157246.9 157924.8 158432.2 158974.1 159536.0 160170.6 160761.3 161236.6 161614.6 162465.6 163079.3 163800.9 164267.2 164802.7 165276.5 165806.7 166221.9 166603.0 167101.4 167568.7 168046.0 168476.8 169231.0 169761.3 170333.4 170907.3 171425.3 172055.4 172585.9 172941.8 173598.7 174037.9 174392.3 174952.3 175541.2 176023.6 176459.7 177008.1 177610.2 178414.3 178794.7 179204.6 179644.2 180155.8 180652.4 181082.2 181681.4 182060.8 182483.5 182966.7 183800.5 184458.6 185053.5 185479.6 185918.6 186508.8 187188.3 187887.7 188334.7 188750.1 189231.9 189604.2 190122.3 190804.9 191093.4 191361.5 192574.3 193144.0 193765.6 194553.4 195181.8 195744.4 196349.7 196843.5 197523.6 198240.9 198951.7 199722.2 200519.8 201132.3 202819.9 203278.4 203792.3 204272.9 204732.5 205102.6 205472.6 206094.7 206765.0 207338.0 208139.2 208975.4 209557.4 210185.7 210838.7 211182.4 211793.4 212379.0 212931.8 213476.8 214138.1 214726.2 215212.5 215913.9 216600.8 217128.8 217798.3 218382.7 219100.9 219639.2 220288.6 220613.4 221583.2 222511.1 223093.6 223555.9 224093.8 224546.4 225282.2 225726.8 226195.4 226592.1 226933.2 227433.7 227921.8 228391.1 229078.7 229722.3 230408.3 231119.7 231904.1 232647.6 233422.8 234117.5 234642.3 235191.0 235790.7 236593.7 237282.2 237766.3 238443.4 238959.3 239408.2 240080.0 1000225.0 1000725.0 1001400.0 1001875.0 1002450.0 1003200.0 1003575.0 1004225.0 1004900.0 1005075.0 1005650.0 1006150.0 1006525.0 1006875.0 1007450.0 1007775.0 1008075.0 2000300.0 2000525.0 2000950.0 2001350.0 2002100.0 2002475.0 2003000.0 2003650.0 2004125.0 2004575.0 2005150.0 2005650.0 2006075.0 2006300.0 2006700.0 2007375.0 2007675.0 2008350.0 2008825.0 2009275.0 2010350.0 3000375.0 3000575.0 3000825.0 3001125.0 3001550.0 3002300.0 3002425.0 3003175.0 3003575.0 3004150.0 3004750.0 3005125.0 3005600.0 3005975.0 3006450.0 3006950.0 3007450.0 3008075.0 3008500.0 3009150.0 3009800.0 3010325.0</absDebutZone>
- <absFinZone>-15486.6 -15182.1 -14211.6 -13783.1 -13046.8 -12529.3 -11950.7 -11578.7 -10993.1 -10392.5 -9917.6 -9291.5 -8585.7 -8027.0 -7820.3 -6836.4 -6322.2 -5811.8 -5615.2 -5360.5 -4844.9 -4627.6 -4093.2 -3628.2 -3118.8 -2375.4 -1980.2 -930.9 -397.2 0.0 260.0 527.4 1000.1 1552.6 2299.5 2796.0 3379.8 3978.4 4877.4 5327.7 5854.9 6425.1 6875.2 7456.0 7853.7 8158.1 8617.0 8971.8 9512.1 9911.0 10624.6 11155.6 11643.6 12202.1 12513.8 13061.0 13446.4 14021.0 14425.3 14948.5 15487.7 16049.2 16593.2 17026.2 17509.8 18370.9 19088.3 19625.2 20141.0 20667.9 21170.4 21485.5 21949.3 22262.9 22766.1 23094.7 23573.0 24104.4 24752.2 25241.3 25586.6 26011.0 26410.4 26785.7 27308.0 27747.1 28290.9 28758.3 29309.1 29971.2 30532.4 31200.2 31892.7 32420.2 32798.4 33153.1 33616.1 34159.6 34712.4 35328.2 35754.7 36204.0 37198.0 37591.4 38010.6 38409.6 38816.7 39248.0 39846.4 40316.8 40767.2 41432.7 42080.9 42597.5 43039.0 43507.0 44063.5 44572.1 45204.1 45652.3 46109.4 46717.6 47566.1 48102.6 48439.2 48928.0 49129.1 49401.0 49964.8 50455.3 50851.6 51419.9 52069.3 52547.5 52883.2 53269.8 53769.8 54501.6 54976.3 55549.0 55934.3 56318.0 56722.8 57024.6 57462.4 57893.5 58287.7 58691.6 59228.4 59742.3 59977.3 60392.2 60666.7 61042.3 61498.2 61823.1 62225.5 62675.6 63060.0 63835.1 64143.0 64746.0 65179.7 66056.7 67601.8 68282.8 68824.5 69095.5 69821.1 70310.6 70587.8 71061.7 72185.1 72774.7 73658.2 74089.2 74433.7 74794.0 75116.1 75512.0 76224.9 76709.7 77067.5 77500.2 77774.2 78255.0 78646.0 79362.3 79857.5 80507.7 80954.9 81404.3 81767.8 82378.5 82834.3 83469.2 84041.2 84355.8 85277.7 85797.8 86175.0 86609.8 87064.3 87553.0 88152.2 88960.5 89446.5 90091.1 90745.9 91714.6 92106.7 92640.8 93006.4 93593.3 94164.7 94620.0 95236.6 95782.2 96322.0 97726.1 98268.9 100466.1 101094.2 101542.2 103103.9 103845.9 104144.2 104463.8 105064.4 106473.7 107358.2 108414.1 109387.3 109983.9 110890.2 111693.1 112159.4 112792.3 113455.3 114052.9 114377.5 114829.1 115289.4 115764.7 116337.8 116870.7 117231.5 117628.1 118265.7 118847.0 119306.5 119819.8 120376.8 120921.0 121635.5 122159.5 123083.0 123533.8 124075.5 124479.0 125096.6 125694.2 126089.9 126957.9 127761.6 129596.3 130407.4 130852.2 131876.0 132799.6 133629.2 134485.5 135124.4 135721.4 136198.5 136580.3 137291.3 137859.8 138405.7 138989.4 139664.8 140404.2 141172.6 141713.3 142315.6 142646.4 143248.4 144012.7 144619.8 145304.0 146025.1 146522.6 147032.6 147603.8 148064.4 148532.7 148992.5 149519.2 149950.2 150433.3 151022.8 151357.7 151695.4 152063.1 152472.2 152900.2 153558.4 154213.2 154753.9 155219.4 155771.0 156393.4 157077.7 157246.9 157924.8 158432.2 158974.1 159536.0 160170.6 160761.3 161236.6 161614.6 162465.6 163079.3 163800.9 164267.2 164802.7 165276.5 165806.7 166221.9 166603.0 167101.4 167568.7 168046.0 168476.8 169231.0 169761.3 170333.4 170907.3 171425.3 172055.4 172585.9 172941.8 173598.7 174037.9 174392.3 174952.3 175541.2 176023.6 176459.7 177008.1 177610.2 178414.3 178794.7 179204.6 179644.2 180155.8 180652.4 181082.2 181681.4 182060.8 182483.5 182966.7 183800.5 184458.6 185053.5 185479.6 185918.6 186508.8 187188.3 187887.7 188334.7 188750.1 189231.9 189604.2 190122.3 190804.9 191093.4 191361.5 192574.3 193144.0 193765.6 194553.4 195181.8 195744.4 196349.7 196843.5 197523.6 198240.9 198951.7 199722.2 200519.8 201132.3 202819.9 203278.4 203792.3 204272.9 204732.5 205102.6 205472.6 206094.7 206765.0 207338.0 208139.2 208975.4 209557.4 210185.7 210838.7 211182.4 211793.4 212379.0 212931.8 213476.8 214138.1 214726.2 215212.5 215913.9 216600.8 217128.8 217798.3 218382.7 219100.9 219639.2 220288.6 220613.4 221583.2 222511.1 223093.6 223555.9 224093.8 224546.4 225282.2 225726.8 226195.4 226592.1 226933.2 227433.7 227921.8 228391.1 229078.7 229722.3 230408.3 231119.7 231904.1 232647.6 233422.8 234117.5 234642.3 235191.0 235790.7 236593.7 237282.2 237766.3 238443.4 238959.3 239408.2 240080.0 240420.0 1000725.0 1001400.0 1001875.0 1002450.0 1003200.0 1003575.0 1004225.0 1004900.0 1005075.0 1005650.0 1006150.0 1006525.0 1006875.0 1007450.0 1007775.0 1008075.0 1009300.0 2000525.0 2000950.0 2001350.0 2002100.0 2002475.0 2003000.0 2003650.0 2004125.0 2004575.0 2005150.0 2005650.0 2006075.0 2006300.0 2006700.0 2007375.0 2007675.0 2008350.0 2008825.0 2009275.0 2010350.0 2015350.0 3000575.0 3000825.0 3001125.0 3001550.0 3002300.0 3002425.0 3003175.0 3003575.0 3004150.0 3004750.0 3005125.0 3005600.0 3005975.0 3006450.0 3006950.0 3007450.0 3008075.0 3008500.0 3009150.0 3009800.0 3010325.0 3011100.0</absFinZone>
- <nbSectionZone>16 6 19 8 14 10 11 7 11 12 9 12 14 11 4 19 10 10 3 5 10 4 10 9 10 14 7 20 10 7 5 5 9 11 14 9 11 11 17 9 10 11 9 11 7 6 9 7 10 7 8 10 9 11 6 10 7 11 8 10 10 11 10 8 9 17 14 10 10 10 10 6 9 6 10 6 9 10 12 9 6 8 7 7 10 8 10 9 11 13 11 13 13 10 7 7 9 10 11 12 8 8 13 7 8 7 8 8 11 9 9 13 12 10 8 9 11 10 12 8 9 12 16 10 6 9 4 5 11 9 7 11 12 9 6 7 9 14 9 11 7 7 8 6 8 8 7 8 10 10 4 8 5 7 9 6 8 9 7 5 6 12 8 17 30 13 10 2 7 4 2 4 11 5 8 4 3 3 3 3 7 4 3 4 2 4 3 7 4 6 4 4 3 6 4 6 5 3 9 5 3 4 4 4 5 8 4 6 6 9 3 5 3 5 5 4 6 5 5 14 5 21 6 4 15 7 2 3 6 14 8 10 9 5 9 8 4 6 6 5 3 4 4 4 5 5 3 3 6 5 4 5 5 5 7 5 9 4 5 4 6 5 3 8 8 18 8 4 10 9 8 8 6 5 4 3 7 5 5 5 6 7 7 5 6 3 6 7 6 6 7 4 5 5 4 4 4 5 4 4 5 3 3 3 4 4 6 6 5 4 5 6 6 1 6 5 5 5 6 5 4 3 8 6 7 4 5 4 5 4 3 4 4 4 4 7 5 5 5 5 6 5 3 6 4 3 5 5 4 4 5 6 8 3 4 4 5 4 4 5 3 4 4 8 6 5 4 4 5 6 6 4 4 4 3 5 6 2 2 12 5 6 7 6 5 6 4 6 7 7 7 7 6 16 4 5 4 4 3 3 6 6 5 8 8 5 6 6 3 6 5 5 5 6 5 4 7 6 5 6 5 7 5 6 3 9 9 5 4 5 4 7 4 4 3 3 5 4 4 6 6 6 7 7 7 7 6 5 5 5 8 6 4 6 5 4 6 3 9 13 9 11 14 7 12 13 3 11 9 7 6 11 6 5 24 4 8 7 14 7 10 12 9 8 11 9 8 4 7 13 5 13 9 8 21 99 3 4 5 8 14 2 14 7 11 11 7 9 7 9 9 9 12 8 12 12 10 15</nbSectionZone>
- </maillageClavier>
- </maillage>
- </parametresPlanimetrageMaillage>
- <parametresSingularite>
- <nbSeuils>3</nbSeuils>
- <barragePrincipal>
- <numBranche>1</numBranche>
- <abscisse>0.0</abscisse>
- <typeRupture>2</typeRupture>
- <coteCrete>418.0</coteCrete>
- </barragePrincipal>
- <seuils>
- <structureParametresSeuil>
- <nom>barrage / seuil 2</nom>
- <type>4</type>
- <numBranche>2</numBranche>
- <abscisse>26011.0</abscisse>
- <coteCrete>344.0</coteCrete>
- <coteCreteMoy>NaN</coteCreteMoy>
- <coteRupture>344.0</coteRupture>
- <coeffDebit>0.38</coeffDebit>
- <largVanne>NaN</largVanne>
- <numLoi>-2147483648</numLoi>
- <nbPtLoiSeuil>-2147483648</nbPtLoiSeuil>
- <epaisseur>1</epaisseur>
- <gradient>NaN</gradient>
- </structureParametresSeuil>
- <structureParametresSeuil>
- <nom>barrage / seuil 3</nom>
- <type>4</type>
- <numBranche>3</numBranche>
- <abscisse>56318.0</abscisse>
- <coteCrete>264.0</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>barrage / seuil 1</nom>
- <type>4</type>
- <numBranche>4</numBranche>
- <abscisse>64143.0</abscisse>
- <coteCrete>195.04</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/>
- <parametresCalage>
- <frottement>
- <loi>1</loi>
- <nbZone>18</nbZone>
- <numBranche>1 1 1 2 2 2 3 4 4 4 4 4 4 5 6 6 7 7</numBranche>
- <absDebZone>-16332.0 9512.1 -11578.7 10186.0 26011.0 31200.2 36530.0 63545.0 66056.7 69095.5 77067.5 91714.6 93006.4 1000225.0 2000300.0 2003650.0 3000375.0 3001550.0</absDebZone>
- <absFinZone>-11950.7 9911.0 8971.8 25586.6 30532.4 36204.0 63060.0 65179.7 68824.5 76709.7 90745.9 92640.8 240420.0 1009300.0 2003000.0 2015350.0 3001125.0 3011100.0</absFinZone>
- <coefLitMin>25.0 25.0 20.0 25.0 20.0 30.0 30.0 30.0 15.0 25.0 20.0 15.0 25.0 25.0 30.0 25.0 30.0 25.0</coefLitMin>
- <coefLitMaj>25.0 25.0 20.0 25.0 20.0 30.0 30.0 30.0 15.0 25.0 20.0 15.0 25.0 25.0 30.0 25.0 30.0 25.0</coefLitMaj>
- </frottement>
- <zoneStockage>
- <nbProfils>0</nbProfils>
- <numProfil>[0]</numProfil>
- <limGauchLitMaj>[0]</limGauchLitMaj>
- <limDroitLitMaj>[0]</limDroitLitMaj>
- </zoneStockage>
- </parametresCalage>
- <parametresLoisHydrauliques>
- <nb>3</nb>
- <lois>
- <structureParametresLoi>
- <nom>loi_limnihydrogramme_1</nom>
- <type>3</type>
- <donnees>
- <modeEntree>1</modeEntree>
- <fichier>test_0.loi</fichier>
- <uniteTps>-2147483648</uniteTps>
- <nbPoints>-2147483648</nbPoints>
- <nbDebitsDifferents>-2147483648</nbDebitsDifferents>
- </donnees>
- </structureParametresLoi>
- <structureParametresLoi>
- <nom>loi_limnihydrogramme_2</nom>
- <type>3</type>
- <donnees>
- <modeEntree>1</modeEntree>
- <fichier>test_1.loi</fichier>
- <uniteTps>-2147483648</uniteTps>
- <nbPoints>-2147483648</nbPoints>
- <nbDebitsDifferents>-2147483648</nbDebitsDifferents>
- </donnees>
- </structureParametresLoi>
- <structureParametresLoi>
- <nom>loi_hydrogramme_3</nom>
- <type>1</type>
- <donnees>
- <modeEntree>1</modeEntree>
- <fichier>test_2.loi</fichier>
- <uniteTps>-2147483648</uniteTps>
- <nbPoints>-2147483648</nbPoints>
- <nbDebitsDifferents>-2147483648</nbDebitsDifferents>
- </donnees>
- </structureParametresLoi>
- </lois>
- </parametresLoisHydrauliques>
- <parametresConditionsInitiales>
- <repriseEtude>
- <repriseCalcul>false</repriseCalcul>
- </repriseEtude>
- <ligneEau>
- <LigEauInit>true</LigEauInit>
- <modeEntree>1</modeEntree>
- <fichLigEau>test.lig</fichLigEau>
- <formatFichLig>2</formatFichLig>
- <nbPts>-2147483648</nbPts>
- </ligneEau>
- <zonesSeches>
- <nb>4</nb>
- <branche>4 5 6 7</branche>
- <absDebut>64190.0 1005075.5 2004125.5 3002425.5</absDebut>
- <absFin>240420.0 1009300.0 2015350.0 3011100.0</absFin>
- </zonesSeches>
- </parametresConditionsInitiales>
- <parametresImpressionResultats>
- <titreCalcul>Etude hydraulique1d \xB0\xE9\xE8</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>1000</pasStock>
- <pasImpression>10000</pasImpression>
- </pasStockage>
- <resultats>
- <fichResultat>test.rub</fichResultat>
- <postProcesseur>1</postProcesseur>
- </resultats>
- <listing>
- <fichListing>test.lis</fichListing>
- </listing>
- <fichReprise>
- <fichRepriseEcr>test_ecr.rep</fichRepriseEcr>
- </fichReprise>
- <rubens>
- <ecartInterBranch>1.0</ecartInterBranch>
- </rubens>
- <stockage>
- <option>1</option>
- <nbSite>0</nbSite>
- </stockage>
- </parametresImpressionResultats>
- <parametresVariablesCalculees>
- <variablesCalculees>false false false false false false false false false false false false false false false</variablesCalculees>
- </parametresVariablesCalculees>
- <parametresVariablesStockees>
- <variablesStockees>true false false false false true true true false false false false false false false false false false false true false false true false false false false false false false true true true false false false false false true false false false</variablesStockees>
- </parametresVariablesStockees>
- </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...> - 2014-10-22 21:59:00
|
Revision: 8891
http://sourceforge.net/p/fudaa/svn/8891
Author: deniger
Date: 2014-10-22 21:58:58 +0000 (Wed, 22 Oct 2014)
Log Message:
-----------
maj couleur par defaut ?\195?\160 similaire
Modified Paths:
--------------
trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuPreferences.java
trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/boony/BoonyDeserializerHandler.java
Added Paths:
-----------
trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/boony/BoonyDeserializationAware.java
Modified: trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuPreferences.java
===================================================================
--- trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuPreferences.java 2014-10-22 21:58:46 UTC (rev 8890)
+++ trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuPreferences.java 2014-10-22 21:58:58 UTC (rev 8891)
@@ -1,14 +1,13 @@
/**
* @modification $Date: 2007-06-20 12:20:44 $
- * @statut unstable
- * @file BuPreferences.java
- * @version 0.43
- * @author Guillaume Desnoix
- * @email gui...@de...
- * @license GNU General Public License 2 (GPL2)
- * @copyright 1998-2005 Guillaume Desnoix
+ * @statut unstable
+ * @file BuPreferences.java
+ * @version 0.43
+ * @author Guillaume Desnoix
+ * @email gui...@de...
+ * @license GNU General Public License 2 (GPL2)
+ * @copyright 1998-2005 Guillaume Desnoix
*/
-
package com.memoire.bu;
import java.awt.Color;
@@ -42,16 +41,17 @@
* A class to manage user preferences for the standard GUI.
*/
public class BuPreferences extends FuPreferences {
+
public static final BuPreferences BU = new BuPreferences();
- protected BuPreferences() {}
+ protected BuPreferences() {
+ }
public String getLanguages() {
return "de,en,es,eo,fr,it,hi,hu,nl,pt,ru";
}
// Specific
-
public void applyLookAndFeel() {
applyLookAndFeel(false);
}
@@ -102,15 +102,23 @@
* if((FuLib.jdk()<=1.1)&&lnfname.equals("ASPECT_SKINLF")) lnfname="ASPECT_METAL"; if((FuLib.jdk()<=1.3)&&lnfname.equals("ASPECT_GTK"))
* lnfname="ASPECT_METAL";
*/
- if ((FuLib.jdk() <= 1.4) && lnfname.equals("ASPECT_SYNTHETICA")) lnfname = "ASPECT_METAL";
+ if ((FuLib.jdk() <= 1.4) && lnfname.equals("ASPECT_SYNTHETICA")) {
+ lnfname = "ASPECT_METAL";
+ }
- if (lnfname.equals("ASPECT_DEFAUT")) lnfclass = "";
- else if (lnfname.equals("ASPECT_AMIGA")) lnfclass = "swing.addon.plaf.threeD.ThreeDLookAndFeel";
- else if (lnfname.equals("ASPECT_FHLAF")) lnfclass = "com.shfarr.ui.plaf.fh.FhLookAndFeel";
- else if (lnfname.equals("ASPECT_GTK")) lnfclass = "com.sun.java.swing.plaf.gtk.GTKLookAndFeel";
- else if (lnfname.equals("ASPECT_KUNSTSTOFF")) lnfclass = "com.incors.plaf.kunststoff.KunststoffLookAndFeel";
- else if (lnfname.equals("ASPECT_LIQUID")) lnfclass = "com.birosoft.liquid.LiquidLookAndFeel";
- // else if (lnfname.equals("ASPECT_SUBSTANCE")) {
+ if (lnfname.equals("ASPECT_DEFAUT")) {
+ lnfclass = "";
+ } else if (lnfname.equals("ASPECT_AMIGA")) {
+ lnfclass = "swing.addon.plaf.threeD.ThreeDLookAndFeel";
+ } else if (lnfname.equals("ASPECT_FHLAF")) {
+ lnfclass = "com.shfarr.ui.plaf.fh.FhLookAndFeel";
+ } else if (lnfname.equals("ASPECT_GTK")) {
+ lnfclass = "com.sun.java.swing.plaf.gtk.GTKLookAndFeel";
+ } else if (lnfname.equals("ASPECT_KUNSTSTOFF")) {
+ lnfclass = "com.incors.plaf.kunststoff.KunststoffLookAndFeel";
+ } else if (lnfname.equals("ASPECT_LIQUID")) {
+ lnfclass = "com.birosoft.liquid.LiquidLookAndFeel";
+ } // else if (lnfname.equals("ASPECT_SUBSTANCE")) {
// lnfclass = "org.jvnet.substance.skin.SubstanceBusinessLookAndFeel";
//
// try {
@@ -122,7 +130,6 @@
// }
//
// }
-
else if (lnfname.equals("ASPECT_MAC")) {
FuLib.setSystemProperty("os.name", "Mac OS");
lnfclass = "com.sun.java.swing.plaf.mac.MacLookAndFeel";
@@ -130,28 +137,32 @@
lnfclass = "javax.swing.plaf.metal.MetalLookAndFeel";
try {
Class c = Class.forName(lnfclass);
- Method m = c.getMethod("setCurrentTheme", new Class[] { MetalTheme.class });
+ Method m = c.getMethod("setCurrentTheme", new Class[]{MetalTheme.class});
int i = Integer.parseInt(getStringProperty("metal.theme", "THEME_METAL0").substring(11));
// FuLog.debug("SET THEME "+i+" "+BuMetalCustomTheme.getList()[i]);
// FuLog.printStackTrace();
- m.invoke(null, new Object[] { BuMetalCustomTheme.getList()[i] });
+ m.invoke(null, new Object[]{BuMetalCustomTheme.getList()[i]});
} catch (Exception ex) {
FuLog.warning("BPR: metal theme", ex);
} finally {
BuLib.forgetLnf();
}
- } else if (lnfname.equals("ASPECT_METOUIA")) lnfclass = "net.sourceforge.mlf.metouia.MetouiaLookAndFeel";
- else if (lnfname.equals("ASPECT_MOTIF")) lnfclass = "com.sun.java.swing.plaf.motif.MotifLookAndFeel";
- else if (lnfname.equals("ASPECT_NEXT")) lnfclass = "nextlf.plaf.NextLookAndFeel";
- else if (lnfname.equals("ASPECT_ORGANIC")) lnfclass = "javax.swing.plaf.organic.OrganicLookAndFeel";
- else if (lnfname.equals("ASPECT_OYOAHA")) {
+ } else if (lnfname.equals("ASPECT_METOUIA")) {
+ lnfclass = "net.sourceforge.mlf.metouia.MetouiaLookAndFeel";
+ } else if (lnfname.equals("ASPECT_MOTIF")) {
+ lnfclass = "com.sun.java.swing.plaf.motif.MotifLookAndFeel";
+ } else if (lnfname.equals("ASPECT_NEXT")) {
+ lnfclass = "nextlf.plaf.NextLookAndFeel";
+ } else if (lnfname.equals("ASPECT_ORGANIC")) {
+ lnfclass = "javax.swing.plaf.organic.OrganicLookAndFeel";
+ } else if (lnfname.equals("ASPECT_OYOAHA")) {
lnfclass = "com.oyoaha.swing.plaf.oyoaha.OyoahaLookAndFeel";
try {
Class c = Class.forName(lnfclass);
Object o = c.newInstance();
- Method m = c.getMethod("setOyoahaTheme", new Class[] { File.class });
- m.invoke(o, new Object[] { new File(getStringProperty("oyoaha.theme")) });
+ Method m = c.getMethod("setOyoahaTheme", new Class[]{File.class});
+ m.invoke(o, new Object[]{new File(getStringProperty("oyoaha.theme"))});
UIManager.setLookAndFeel((LookAndFeel) o); // Oyoaha
applyFontScaling();
forced = false;
@@ -160,25 +171,30 @@
} finally {
BuLib.forgetLnf();
}
- } else if (lnfname.equals("ASPECT_PLASTIC")) lnfclass = "com.jgoodies.looks.plastic.PlasticLookAndFeel";
- else if (lnfname.equals("ASPECT_PLASTIC3D")) lnfclass = "com.jgoodies.looks.plastic.Plastic3DLookAndFeel";
- else if (lnfname.equals("ASPECT_PLASTICXP")) lnfclass = "com.jgoodies.looks.plastic.PlasticXPLookAndFeel";
- else if (lnfname.equals("ASPECT_SKINLF")) {
+ } else if (lnfname.equals("ASPECT_PLASTIC")) {
+ lnfclass = "com.jgoodies.looks.plastic.PlasticLookAndFeel";
+ } else if (lnfname.equals("ASPECT_PLASTIC3D")) {
+ lnfclass = "com.jgoodies.looks.plastic.Plastic3DLookAndFeel";
+ } else if (lnfname.equals("ASPECT_PLASTICXP")) {
+ lnfclass = "com.jgoodies.looks.plastic.PlasticXPLookAndFeel";
+ } else if (lnfname.equals("ASPECT_SKINLF")) {
lnfclass = "com.l2fprod.gui.plaf.skin.SkinLookAndFeel";
try {
String t = getStringProperty("skinlf.theme");
Class c = Class.forName(lnfclass);
Method m = null;
- if (t.toLowerCase().endsWith(".zip") || t.toLowerCase().endsWith(".jar")) m = c.getMethod("loadThemePack",
- new Class[] { String.class });
- else
- m = c.getMethod("loadSkin", new Class[] { String.class });
+ if (t.toLowerCase().endsWith(".zip") || t.toLowerCase().endsWith(".jar")) {
+ m = c.getMethod("loadThemePack",
+ new Class[]{String.class});
+ } else {
+ m = c.getMethod("loadSkin", new Class[]{String.class});
+ }
- Object s = m.invoke(null, new Object[] { t });
+ Object s = m.invoke(null, new Object[]{t});
- m = c.getMethod("setSkin", new Class[] { Class.forName("com.l2fprod.gui.plaf.skin.Skin") });
- m.invoke(null, new Object[] { s });
+ m = c.getMethod("setSkin", new Class[]{Class.forName("com.l2fprod.gui.plaf.skin.Skin")});
+ m.invoke(null, new Object[]{s});
} catch (Exception ex) {
FuLog.error("BPR: could not set skinlf theme", ex);
} finally {
@@ -188,14 +204,17 @@
lnfclass = "com.memoire.slaf.SlafLookAndFeel";
try {
Class c = Class.forName(lnfclass);
- Method m = c.getMethod("setCurrentTheme", new Class[] { String.class });
- m.invoke(null, new Object[] { getStringProperty("slaf.theme") });
- } catch (Exception ex) {} finally {
+ Method m = c.getMethod("setCurrentTheme", new Class[]{String.class});
+ m.invoke(null, new Object[]{getStringProperty("slaf.theme")});
+ } catch (Exception ex) {
+ } finally {
BuLib.forgetLnf();
}
- } else if (lnfname.equals("ASPECT_SYNTHETICA")) lnfclass = "de.javasoft.plaf.synthetica.SyntheticaStandardLookAndFeel";
- else if (lnfname.equals("ASPECT_TONIC")) lnfclass = "com.digitprop.tonic.TonicLookAndFeel";
- else if (lnfname.equals("ASPECT_WINDOWS")) {
+ } else if (lnfname.equals("ASPECT_SYNTHETICA")) {
+ lnfclass = "de.javasoft.plaf.synthetica.SyntheticaStandardLookAndFeel";
+ } else if (lnfname.equals("ASPECT_TONIC")) {
+ lnfclass = "com.digitprop.tonic.TonicLookAndFeel";
+ } else if (lnfname.equals("ASPECT_WINDOWS")) {
lnfclass = "com.jgoodies.looks.windows.WindowsLookAndFeel";
FuLib.setSystemProperty("os.name", "Windows");
@@ -205,18 +224,21 @@
}
// if(lnfclass.equals("")) lnfclass="com.memoire.slaf.SlafLookAndFeel";
-
setLookAndFeel(lnfclass, forced);
// if(FuLib.jdk()>=1.4)
// {
boolean b = getBooleanProperty("lookandfeel.decorated", false);
- if (b && FuLib.isKorteRunning()) b = false;
+ if (b && FuLib.isKorteRunning()) {
+ b = false;
+ }
JDialog.setDefaultLookAndFeelDecorated(b);
JFrame.setDefaultLookAndFeelDecorated(b);
// }
- if (os != null) FuLib.setSystemProperty("os.name", os);
+ if (os != null) {
+ FuLib.setSystemProperty("os.name", os);
+ }
if (BuLib.isMetal()) {
Icon ic = new IconUIResource(new BuEmptyIcon(10, 10));
@@ -228,9 +250,10 @@
* if((i==0)&&(FuLib.jdk()>=1.5)&& Color.white.equals(UIManager.getColor("Desktop.background")))
* UIManager.getDefaults().put ("Desktop.background",new ColorUIResource(184,207,229));
*/
-
- if (BuLib.isOcean() && Color.white.equals(UIManager.getColor("Desktop.background"))) UIManager.getDefaults().put(
- "Desktop.background", new ColorUIResource(184, 207, 229));
+ if (BuLib.isOcean() && Color.white.equals(UIManager.getColor("Desktop.background"))) {
+ UIManager.getDefaults().put(
+ "Desktop.background", new ColorUIResource(184, 207, 229));
+ }
}
boolean setLookAndFeel(String _lnfclass, boolean _forced) {
@@ -252,14 +275,20 @@
BuIcon icon;
icon = BuResource.BU.getButtonIcon("valider");
- if (!icon.isDefault() && (UIManager.get("FileChooser.approveButtonIcon") == null)) UIManager.getDefaults().put(
- "FileChooser.approveButtonIcon", icon);
+ if (!icon.isDefault() && (UIManager.get("FileChooser.approveButtonIcon") == null)) {
+ UIManager.getDefaults().put(
+ "FileChooser.approveButtonIcon", icon);
+ }
icon = BuResource.BU.getButtonIcon("annuler");
- if (!icon.isDefault() && (UIManager.get("FileChooser.cancelButtonIcon") == null)) UIManager.getDefaults().put(
- "FileChooser.cancelButtonIcon", icon);
+ if (!icon.isDefault() && (UIManager.get("FileChooser.cancelButtonIcon") == null)) {
+ UIManager.getDefaults().put(
+ "FileChooser.cancelButtonIcon", icon);
+ }
icon = BuResource.BU.getButtonIcon("renommer");
- if (!icon.isDefault() && (UIManager.get("FileChooser.renameButtonIcon") == null)) UIManager.getDefaults().put(
- "FileChooser.renameButtonIcon", icon);
+ if (!icon.isDefault() && (UIManager.get("FileChooser.renameButtonIcon") == null)) {
+ UIManager.getDefaults().put(
+ "FileChooser.renameButtonIcon", icon);
+ }
return r;
}
@@ -267,8 +296,12 @@
public int getFontScaling() {
int w = Toolkit.getDefaultToolkit().getScreenSize().width;
int f = getIntegerProperty("lookandfeel.fontscale", Math.max(100, (int) Math.round(100. * w / 1280)));
- if (f < 10) f = 10;
- if (f > 1000) f = 1000;
+ if (f < 10) {
+ f = 10;
+ }
+ if (f > 1000) {
+ f = 1000;
+ }
return f;
}
@@ -311,7 +344,9 @@
if (_dispo.indexOf(l) >= 0) {
// System.err.println("LANG="+l);
if (!l.equals("") && !l.equals(Locale.getDefault().getLanguage())) {
- if ("en".equals(l) && "EN".equals(c)) c = "US";
+ if ("en".equals(l) && "EN".equals(c)) {
+ c = "US";
+ }
Locale.setDefault(new Locale(l, c));
FuLib.setSystemProperty("user.language", l);
FuLib.setSystemProperty("user.country", c);
@@ -323,9 +358,13 @@
}
public void applyOn(Object _o) {
- if (_o == null) return;
+ if (_o == null) {
+ return;
+ }
- if (!(_o instanceof BuCommonInterface)) throw new RuntimeException("" + _o + " is not a BuCommonInterface.");
+ if (!(_o instanceof BuCommonInterface)) {
+ throw new RuntimeException("" + _o + " is not a BuCommonInterface.");
+ }
BuCommonInterface appli = (BuCommonInterface) _o;
BuMainPanel main = appli.getMainPanel();
@@ -347,38 +386,42 @@
int bottom = getIntegerProperty("screen.bottom", 0);
switch (getIntegerProperty("window.size", 2)) {
- case 0:
- f.setLocation(Math.max(left, e.width / 10), Math.max(top, e.height / 10));
- f.setSize(Math.min(e.width * 4 / 5, e.width - left - right), Math
- .min(e.height * 4 / 5, e.height - top - bottom));
- break;
- case 1:
- f.setLocation(left, top);
- f.setSize(Math.min(e.width - f.getLocation().x, e.width - left - right), Math.min(e.height - f.getLocation().y,
- e.height - top - bottom));
- break;
- case 2:
- int x = getIntegerProperty("window.x", e.width / 10);
- int y = getIntegerProperty("window.y", e.height / 10);
- int w = getIntegerProperty("window.w");
- int h = getIntegerProperty("window.h");
+ case 0:
+ f.setLocation(Math.max(left, e.width / 10), Math.max(top, e.height / 10));
+ f.setSize(Math.min(e.width * 4 / 5, e.width - left - right), Math
+ .min(e.height * 4 / 5, e.height - top - bottom));
+ break;
+ case 1:
+ f.setLocation(left, top);
+ f.setSize(Math.min(e.width - f.getLocation().x, e.width - left - right), Math.min(e.height - f.getLocation().y,
+ e.height - top - bottom));
+ break;
+ case 2:
+ int x = getIntegerProperty("window.x", e.width / 10);
+ int y = getIntegerProperty("window.y", e.height / 10);
+ int w = getIntegerProperty("window.w");
+ int h = getIntegerProperty("window.h");
- if (x < 0) x = 0;
- if (y < 0) y = 0;
- if ((w > 0) && (h > 0))
- {
- f.setLocation(x, y);
- f.setSize(w, h);
- }
- break;
- case 3:
- try {
- Method m = JFrame.class.getMethod("setState", new Class[] { Integer.class });
- m.invoke(f, new Object[] { FuFactoryInteger.get(1) });
- } catch (Exception ex) {}
+ if (x < 0) {
+ x = 0;
+ }
+ if (y < 0) {
+ y = 0;
+ }
+ if ((w > 0) && (h > 0)) {
+ f.setLocation(x, y);
+ f.setSize(w, h);
+ }
+ break;
+ case 3:
+ try {
+ Method m = JFrame.class.getMethod("setState", new Class[]{Integer.class});
+ m.invoke(f, new Object[]{FuFactoryInteger.get(1)});
+ } catch (Exception ex) {
+ }
// f.setState(Frame.ICONIFIED);
- // Frame.ICONIFIED = 1;
- break;
+ // Frame.ICONIFIED = 1;
+ break;
}
f.getRootPane().revalidate();
@@ -419,7 +462,6 @@
* if(FuLib.jdk()>=1.4) { boolean b=getBooleanProperty("lookandfeel.decorated",false); if(b&&FuLib.isKorteRunning())
* b=false; JDialog.setDefaultLookAndFeelDecorated(b); JFrame. setDefaultLookAndFeelDecorated(b); }
*/
-
applyLookAndFeel();
// Desktop
applyOnDesktop(desktop);
@@ -434,7 +476,9 @@
if (!"".equals(url.trim())) {
BuIcon icon = new BuIcon(url);
- if (!icon.isDefault()) img = icon.getImage();
+ if (!icon.isDefault()) {
+ img = icon.getImage();
+ }
}
if (img == null) {
@@ -445,41 +489,53 @@
}
public void applyOnMainPanel(BuMainPanel _main) {
- if (_main.getSpecificBar() != null) _main.getSpecificBar().setVisible(
- getBooleanProperty("specificbar.visible", true));
- if (_main.getLeftColumn() != null) _main.getLeftColumn().setVisible(getBooleanProperty("leftcolumn.visible", true));
- if (_main.getRightColumn() != null) _main.getRightColumn().setVisible(
- getBooleanProperty("rightcolumn.visible", true));
- if (_main.getStatusBar() != null) _main.getStatusBar().setVisible(getBooleanProperty("statusbar.visible", true));
+ if (_main.getSpecificBar() != null) {
+ _main.getSpecificBar().setVisible(
+ getBooleanProperty("specificbar.visible", true));
+ }
+ if (_main.getLeftColumn() != null) {
+ _main.getLeftColumn().setVisible(getBooleanProperty("leftcolumn.visible", true));
+ }
+ if (_main.getRightColumn() != null) {
+ _main.getRightColumn().setVisible(
+ getBooleanProperty("rightcolumn.visible", true));
+ }
+ if (_main.getStatusBar() != null) {
+ _main.getStatusBar().setVisible(getBooleanProperty("statusbar.visible", true));
+ }
boolean va = getBooleanProperty("assistant.visible", true);
_main.getLeftColumn().toggleComponent("ASSISTANT", va);
_main.getRightColumn().toggleComponent("ASSISTANT", va);
-
- int lcwidth=getIntegerProperty("leftcolumn.width",-1);
- if (lcwidth>0) {
- int height=_main.getLeftColumn().getPreferredSize().height;
- _main.getLeftColumn().setPreferredSize(new Dimension(lcwidth,height));
+
+ int lcwidth = getIntegerProperty("leftcolumn.width", -1);
+ if (lcwidth > 0) {
+ int height = _main.getLeftColumn().getPreferredSize().height;
+ _main.getLeftColumn().setPreferredSize(new Dimension(lcwidth, height));
}
-
- int rcwidth=getIntegerProperty("rightcolumn.width",-1);
- if (rcwidth>0) {
- int height=_main.getRightColumn().getPreferredSize().height;
- _main.getRightColumn().setPreferredSize(new Dimension(rcwidth,height));
+
+ int rcwidth = getIntegerProperty("rightcolumn.width", -1);
+ if (rcwidth > 0) {
+ int height = _main.getRightColumn().getPreferredSize().height;
+ _main.getRightColumn().setPreferredSize(new Dimension(rcwidth, height));
}
- if (getBooleanProperty("columns.swapped", false) ^ _main.isColumnsSwapped()) _main.swapColumns();
-
+ if (getBooleanProperty("columns.swapped", false) ^ _main.isColumnsSwapped()) {
+ _main.swapColumns();
+ }
+
_main.revalidate();
}
public void applyOnDesktop(BuDesktop _desktop) {
- if (_desktop == null) return;
+ if (_desktop == null) {
+ return;
+ }
BuBackgroundPainter bp = _desktop.getBackgroundPainter();
bp.setGrid(getBooleanProperty("desktop.grid", false));
bp.setDots(getBooleanProperty("desktop.dots", false));
-
+ _desktop.setBackground(UIManager.getColor("Panel.background"));
if (getStringProperty("desktop.background").equals("DESKTOP_ROUGE")) {
_desktop.setBackground(new Color(128, 64, 64));
bp.setIcon(null);
@@ -526,33 +582,52 @@
public boolean isEnabled(String _option) {
boolean r = true;
if (_option.startsWith("ASPECT_")) {
- if (_option.endsWith("AMIGA")) r = FuLib.classExists("swing.addon.plaf.threeD.ThreeDLookAndFeel");
- else if (_option.endsWith("FHLAF")) r = FuLib.classExists("com.shfarr.ui.plaf.fh.FhLookAndFeel");
- else if (_option.endsWith("GTK")) r = FuLib.classExists("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
- else if (_option.endsWith("KUNSTSTOFF")) r = FuLib
- .classExists("com.incors.plaf.kunststoff.KunststoffLookAndFeel");
- else if (_option.endsWith("LIQUID")) r = FuLib.classExists("com.birosoft.liquid.LiquidLookAndFeel");
- else if (_option.endsWith("MAC")) r = FuLib.classExists("com.sun.java.swing.plaf.mac.MacLookAndFeel");
- else if (_option.endsWith("METAL")) r = FuLib.classExists("javax.swing.plaf.metal.MetalLookAndFeel");
- else if (_option.endsWith("MOTIF")) r = FuLib.classExists("com.sun.java.swing.plaf.motif.MotifLookAndFeel");
- else if (_option.endsWith("NEXT")) r = FuLib.classExists("nextlf.plaf.NextLookAndFeel");
- else if (_option.endsWith("ORGANIC")) r = FuLib.classExists("com.sun.java.swing.plaf.organic.OrganicLookAndFeel");
- else if (_option.endsWith("OYOAHA")) r = FuLib.classExists("com.oyoaha.swing.plaf.oyoaha.OyoahaLookAndFeel");
- else if (_option.endsWith("PLASTIC")) r = FuLib.classExists("com.jgoodies.looks.plastic.PlasticLookAndFeel");
- else if (_option.endsWith("PLASTIC3D")) r = FuLib.classExists("com.jgoodies.looks.plastic.Plastic3DLookAndFeel");
- else if (_option.endsWith("PLASTICXP")) r = FuLib.classExists("com.jgoodies.looks.plastic.PlasticXPLookAndFeel");
- else if (_option.endsWith("SKINLF")) r = FuLib.classExists("com.l2fprod.gui.plaf.skin.SkinLookAndFeel");
- else if (_option.endsWith("SLAF")) r = FuLib.classExists("com.memoire.slaf.SlafLookAndFeel");
- else if (_option.endsWith("SYNTHETICA")) r = FuLib
- .classExists("de.javasoft.plaf.synthetica.SyntheticaStandardLookAndFeel");
- else if (_option.endsWith("TONIC")) r = FuLib.classExists("com.digitprop.tonic.TonicLookAndFeel");
- else if (_option.endsWith("WINDOWS")) r = FuLib.classExists("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
+ if (_option.endsWith("AMIGA")) {
+ r = FuLib.classExists("swing.addon.plaf.threeD.ThreeDLookAndFeel");
+ } else if (_option.endsWith("FHLAF")) {
+ r = FuLib.classExists("com.shfarr.ui.plaf.fh.FhLookAndFeel");
+ } else if (_option.endsWith("GTK")) {
+ r = FuLib.classExists("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
+ } else if (_option.endsWith("KUNSTSTOFF")) {
+ r = FuLib
+ .classExists("com.incors.plaf.kunststoff.KunststoffLookAndFeel");
+ } else if (_option.endsWith("LIQUID")) {
+ r = FuLib.classExists("com.birosoft.liquid.LiquidLookAndFeel");
+ } else if (_option.endsWith("MAC")) {
+ r = FuLib.classExists("com.sun.java.swing.plaf.mac.MacLookAndFeel");
+ } else if (_option.endsWith("METAL")) {
+ r = FuLib.classExists("javax.swing.plaf.metal.MetalLookAndFeel");
+ } else if (_option.endsWith("MOTIF")) {
+ r = FuLib.classExists("com.sun.java.swing.plaf.motif.MotifLookAndFeel");
+ } else if (_option.endsWith("NEXT")) {
+ r = FuLib.classExists("nextlf.plaf.NextLookAndFeel");
+ } else if (_option.endsWith("ORGANIC")) {
+ r = FuLib.classExists("com.sun.java.swing.plaf.organic.OrganicLookAndFeel");
+ } else if (_option.endsWith("OYOAHA")) {
+ r = FuLib.classExists("com.oyoaha.swing.plaf.oyoaha.OyoahaLookAndFeel");
+ } else if (_option.endsWith("PLASTIC")) {
+ r = FuLib.classExists("com.jgoodies.looks.plastic.PlasticLookAndFeel");
+ } else if (_option.endsWith("PLASTIC3D")) {
+ r = FuLib.classExists("com.jgoodies.looks.plastic.Plastic3DLookAndFeel");
+ } else if (_option.endsWith("PLASTICXP")) {
+ r = FuLib.classExists("com.jgoodies.looks.plastic.PlasticXPLookAndFeel");
+ } else if (_option.endsWith("SKINLF")) {
+ r = FuLib.classExists("com.l2fprod.gui.plaf.skin.SkinLookAndFeel");
+ } else if (_option.endsWith("SLAF")) {
+ r = FuLib.classExists("com.memoire.slaf.SlafLookAndFeel");
+ } else if (_option.endsWith("SYNTHETICA")) {
+ r = FuLib
+ .classExists("de.javasoft.plaf.synthetica.SyntheticaStandardLookAndFeel");
+ } else if (_option.endsWith("TONIC")) {
+ r = FuLib.classExists("com.digitprop.tonic.TonicLookAndFeel");
+ } else if (_option.endsWith("WINDOWS")) {
+ r = FuLib.classExists("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
+ }
}
return r;
}
// GET
-
public Color getColorProperty(String _key) {
return getColorProperty(_key, Color.black);
}
@@ -564,7 +639,8 @@
if (s != null) {
try {
r = new Color(Integer.parseInt(s, 16));
- } catch (Exception ex) {}
+ } catch (Exception ex) {
+ }
}
return r;
@@ -616,7 +692,9 @@
}
}
}
- if (!"".equals(s.trim())) f = s;
+ if (!"".equals(s.trim())) {
+ f = s;
+ }
r = new Font(f, t, h);
} catch (Exception ex) {
@@ -627,7 +705,6 @@
}
// PUT
-
public void putColorProperty(String _key, Color _color) {
String s = Integer.toHexString(_color.getRGB());
putStringProperty(_key, ("000000" + s).substring(s.length()));
@@ -639,7 +716,7 @@
public static String getStringValue(Font _font) {
String style = (((_font.getStyle() & Font.BOLD) != 0) ? "bold" : "")
- + (((_font.getStyle() & Font.ITALIC) != 0) ? "italic" : "");
+ + (((_font.getStyle() & Font.ITALIC) != 0) ? "italic" : "");
String string = _font.getFamily() + "," + style + "," + _font.getSize();
return string;
}
Added: trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/boony/BoonyDeserializationAware.java
===================================================================
--- trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/boony/BoonyDeserializationAware.java (rev 0)
+++ trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/boony/BoonyDeserializationAware.java 2014-10-22 21:58:58 UTC (rev 8891)
@@ -0,0 +1,14 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.boony;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public interface BoonyDeserializationAware {
+
+ void endDeserialization();
+
+}
Modified: trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/boony/BoonyDeserializerHandler.java
===================================================================
--- trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/boony/BoonyDeserializerHandler.java 2014-10-22 21:58:46 UTC (rev 8890)
+++ trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/boony/BoonyDeserializerHandler.java 2014-10-22 21:58:58 UTC (rev 8891)
@@ -224,6 +224,10 @@
} else if (("object".equals(_element)) || ("iobject".equals(_element))) {
Object o = objects_.pop();
+ if (o instanceof BoonyDeserializationAware) {
+ ((BoonyDeserializationAware) o).endDeserialization();
+
+ }
if (o instanceof CorbaEnum) {
final Object id = ref_.get(o);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-22 21:58:50
|
Revision: 8890
http://sourceforge.net/p/fudaa/svn/8890
Author: deniger
Date: 2014-10-22 21:58:46 +0000 (Wed, 22 Oct 2014)
Log Message:
-----------
maj couleur par defaut ?\195?\160 similaire
Modified Paths:
--------------
trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresSeuil.java
Added Paths:
-----------
trunk/business/dodico-corba/nbactions.xml
Added: trunk/business/dodico-corba/nbactions.xml
===================================================================
--- trunk/business/dodico-corba/nbactions.xml (rev 0)
+++ trunk/business/dodico-corba/nbactions.xml 2014-10-22 21:58:46 UTC (rev 8890)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+ <action>
+ <actionName>CUSTOM-deploy</actionName>
+ <displayName>deploy</displayName>
+ <goals>
+ <goal>deploy</goal>
+ </goals>
+ </action>
+ </actions>
Modified: trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresSeuil.java
===================================================================
--- trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresSeuil.java 2014-10-22 16:29:18 UTC (rev 8889)
+++ trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresSeuil.java 2014-10-22 21:58:46 UTC (rev 8890)
@@ -1,37 +1,35 @@
package org.fudaa.dodico.corba.mascaret;
+import org.fudaa.dodico.boony.BoonyDeserializationAware;
/**
-* org/fudaa/dodico/corba/mascaret/SParametresSeuil.java .
-* Error reading Messages File.
-* Error reading Messages File.
-* mercredi 24 octobre 2012 16 h 50 CEST
-*/
-
-public final class SParametresSeuil implements org.omg.CORBA.portable.IDLEntity
-{
+ * org/fudaa/dodico/corba/mascaret/SParametresSeuil.java . Error reading Messages File. Error reading Messages File. mercredi 24 octobre 2012 16 h 50
+ * CEST
+ */
+public final class SParametresSeuil implements org.omg.CORBA.portable.IDLEntity, BoonyDeserializationAware {
+ public static final int PARAMETRES_SEUIL_DEFAULT_VALUE = 1;
public String nom = null;
- public int type = (int)0;
- public int numBranche = (int)0;
- public double abscisse = (double)0;
- public double coteCrete = (double)0;
- public double coteCreteMoy = (double)0;
- public double coteRupture = (double)0;
- public double coeffDebit = (double)0;
- public double largVanne = (double)0;
- public int numLoi = (int)0;
- public int nbPtLoiSeuil = (int)0;
+ public int type = (int) 0;
+ public int numBranche = (int) 0;
+ public double abscisse = (double) 0;
+ public double coteCrete = (double) 0;
+ public double coteCreteMoy = (double) 0;
+ public double coteRupture = (double) 0;
+ public double coeffDebit = (double) 0;
+ public double largVanne = (double) 0;
+ public int numLoi = (int) 0;
+ public int nbPtLoiSeuil = (int) 0;
public double abscTravCrete[] = null;
public double cotesCrete[] = null;
- public int epaisseur = (int)0;
- public double gradient = (double)0;
+ public int epaisseur = (int) 0;
+ public double gradient = (double) 0;
- public SParametresSeuil ()
- {
+ public SParametresSeuil() {
} // ctor
- public SParametresSeuil (String _nom, int _type, int _numBranche, double _abscisse, double _coteCrete, double _coteCreteMoy, double _coteRupture, double _coeffDebit, double _largVanne, int _numLoi, int _nbPtLoiSeuil, double[] _abscTravCrete, double[] _cotesCrete, int _epaisseur, double _gradient)
- {
+ public SParametresSeuil(String _nom, int _type, int _numBranche, double _abscisse, double _coteCrete, double _coteCreteMoy, double _coteRupture,
+ double _coeffDebit, double _largVanne, int _numLoi, int _nbPtLoiSeuil, double[] _abscTravCrete, double[] _cotesCrete, int _epaisseur,
+ double _gradient) {
nom = _nom;
type = _type;
numBranche = _numBranche;
@@ -49,4 +47,11 @@
gradient = _gradient;
} // ctor
+ @Override
+ public void endDeserialization() {
+ if (epaisseur == Integer.MIN_VALUE || epaisseur == Integer.MAX_VALUE) {
+ epaisseur = PARAMETRES_SEUIL_DEFAULT_VALUE;
+ }
+ }
+
} // class SParametresSeuil
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-21 21:29:05
|
Revision: 8885
http://sourceforge.net/p/fudaa/svn/8885
Author: deniger
Date: 2014-10-21 21:28:53 +0000 (Tue, 21 Oct 2014)
Log Message:
-----------
maj couleur par defaut ?\195?\160 similaire
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/GrapheUpdateAction.java
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilLongPane.java
Added Paths:
-----------
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/graphe/MascaretXYAreaRendererProfilLong.java
Removed Paths:
-------------
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/graphe/GrapheUpdateAction.java
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/GrapheUpdateAction.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/GrapheUpdateAction.java 2014-10-21 15:32:20 UTC (rev 8884)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/GrapheUpdateAction.java 2014-10-21 21:28:53 UTC (rev 8885)
@@ -40,7 +40,6 @@
@Override
public void valueChanged(ListSelectionEvent e) {
- System.out.println("changement toto!!");
if(isAuto){
//-- do the automatic update --//
pane.visualiser(true,true);
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilLongPane.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilLongPane.java 2014-10-21 15:32:20 UTC (rev 8884)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilLongPane.java 2014-10-21 21:28:53 UTC (rev 8885)
@@ -293,7 +293,6 @@
profilsList.add(modelProfilList.get(indices[i]));
double z = calculeCoteZProfil(lsBief_.getSelectedIndex(), indices[i], 0);
- System.out.println("z de "+modelProfilList.get(indices[i]).nom()+" = "+ z);
}
getDataset().setBiefProfilModels(profilsList.toArray(new Hydraulique1dProfilModel[profilsList.size()]));
Deleted: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/graphe/GrapheUpdateAction.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/graphe/GrapheUpdateAction.java 2014-10-21 15:32:20 UTC (rev 8884)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/graphe/GrapheUpdateAction.java 2014-10-21 21:28:53 UTC (rev 8885)
@@ -1,54 +0,0 @@
-package org.fudaa.fudaa.hydraulique1d.editor;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-/**
- * Action to update automatically the results when user perform a change.
- * @author Adrien
- *
- */
-public class GrapheUpdateAction implements ActionListener,ListSelectionListener{
-
-
- public boolean isAuto = true;
- private Hydraulique1dGraphesResultatsEditor pane;
-
- public GrapheUpdateAction(Hydraulique1dGraphesResultatsEditor p) {
- pane = p;
- pane.getPnHydro().getLstBiefCasierLiaison_().addListSelectionListener(this);
- pane.getPnHydro().getLstPasTpsSection_().addListSelectionListener(this);
- pane.getPnHydro().getLstVar().addListSelectionListener(this);
- pane.getPnHydro().getCheckboxMajAuto().addActionListener(this);
-
- }
-
-
- @Override
- public void actionPerformed(ActionEvent e) {
- if(e.getSource() == pane.getPnHydro().getCheckboxMajAuto())
- isAuto = pane.getPnHydro().getCheckboxMajAuto().isSelected();
- else if(isAuto){
- //-- do the automatic update --//
- pane.visualiser(true,true);
-
- }
- }
-
-
- @Override
- public void valueChanged(ListSelectionEvent e) {
- System.out.println("changement toto!!");
- if(isAuto){
- //-- do the automatic update --//
- pane.visualiser(true,true);
-
- }
-
- }
-
-
-
-}
Added: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/graphe/MascaretXYAreaRendererProfilLong.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/graphe/MascaretXYAreaRendererProfilLong.java (rev 0)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/graphe/MascaretXYAreaRendererProfilLong.java 2014-10-21 21:28:53 UTC (rev 8885)
@@ -0,0 +1,210 @@
+package org.fudaa.fudaa.hydraulique1d.graphe;
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.Paint;
+import java.awt.Polygon;
+import java.awt.Shape;
+import java.awt.Stroke;
+import java.awt.geom.Line2D;
+import java.awt.geom.Rectangle2D;
+import java.util.ArrayList;
+import java.util.List;
+import org.jfree.chart.axis.ValueAxis;
+import org.jfree.chart.plot.CrosshairState;
+import org.jfree.chart.plot.PlotRenderingInfo;
+import org.jfree.chart.plot.XYPlot;
+import org.jfree.chart.renderer.xy.XYAreaRenderer2;
+import org.jfree.chart.renderer.xy.XYItemRendererState;
+import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
+import org.jfree.data.xy.XYDataset;
+/**
+ * Renderer pour remplir la zone du profil long
+ * @author Adrien Hadoux
+ *
+ */
+public class MascaretXYAreaRendererProfilLong extends XYAreaRenderer2{
+
+
+ public static class AreaPoint {
+ public double x;
+ public AreaPoint(double x, double y) {
+ super();
+ this.x = x;
+ this.y = y;
+ }
+ public double y;
+ }
+
+ XYLineAndShapeRenderer defaultRenderer;
+ boolean isNiveauEau = true;
+
+ boolean traceProfil = true;
+
+ private List<Integer> itemLineToDraw;
+ private boolean drawProfileLine=true;
+ final static int CURVE_SERIE = 0;
+ final static int End_CURVE_SERIE = 0;
+
+ public MascaretXYAreaRendererProfilLong(XYLineAndShapeRenderer defaultRenderer) {
+ this.defaultRenderer = defaultRenderer;
+ setPaint(new Color(132,166,188));
+ //setStroke(new BasicStroke(4));
+ }
+
+
+ private boolean mustDrawPolygone(double x1, double y1,XYDataset dataset, int item) {
+ double valNiveauEau = ((Hydraulique1dGrapheProfilLongDataset)dataset).getNiveauBas(CURVE_SERIE, item);
+ return isNiveauEau && y1 >= valNiveauEau;
+ }
+
+ /**
+ * Build the polygon corresponding to the shape between the curve and the level f water.
+ * @param domainAxis
+ * @param rangeAxis
+ * @param dataset
+ * @return
+ */
+ public List<Shape> buildShapeProfilLong(ValueAxis domainAxis, ValueAxis rangeAxis,XYDataset dataset, XYPlot plot, Rectangle2D dataArea) {
+ List<AreaPoint> listcoordonnees = new ArrayList<AreaPoint>();
+ List<AreaPoint> listniveauEau = new ArrayList<AreaPoint>();
+ itemLineToDraw = new ArrayList<Integer>();
+ List<Shape>listShape = new ArrayList<Shape>();
+ boolean first = true;
+ boolean last = false;
+ AreaPoint firstA=null, firstB=null, lastA = null, lastB = null;
+ //-- step 1 - determine all the point under the level --//
+ for(int item=0; item< dataset.getItemCount(CURVE_SERIE);item++){
+ double x = dataset.getXValue(CURVE_SERIE, item);
+ double y = dataset.getYValue(CURVE_SERIE, item);
+ double valNiveauEau = ((Hydraulique1dGrapheProfilLongDataset)dataset).getNiveauBas(CURVE_SERIE, item);
+ if(y>=valNiveauEau) {
+ AreaPoint p = new AreaPoint(x,y);
+ itemLineToDraw.add(item);
+ //-- on ajoute a la liste des coordonn\xE9es le point p mais aussi le point niveau d'eau --//
+ Line2D.Double shape = new Line2D.Double((int)domainAxis.valueToJava2D(p.x, dataArea, plot.getDomainAxisEdge())
+ ,(int)rangeAxis.valueToJava2D(p.y, dataArea, plot.getRangeAxisEdge()),
+ (int)domainAxis.valueToJava2D(p.x, dataArea, plot.getDomainAxisEdge()),
+ (int)rangeAxis.valueToJava2D(((Hydraulique1dGrapheProfilLongDataset)dataset).getNiveauBas(0, item), dataArea, plot.getRangeAxisEdge()));
+ listShape.add(shape);
+
+
+ listcoordonnees.add(p);
+ listniveauEau.add(new AreaPoint(x,valNiveauEau));
+
+ }
+ }
+
+
+ //-- step 4 - construct poly --//
+ Polygon poly = new Polygon();
+ for(AreaPoint p: listcoordonnees) {
+ poly.addPoint(
+ (int)domainAxis.valueToJava2D(p.x, dataArea, plot.getDomainAxisEdge()),
+ (int)rangeAxis.valueToJava2D(p.y, dataArea, plot.getRangeAxisEdge()));
+ }
+ //-- ensuite on termine par la liste des points d'eau dans l'ordre inverse pour avoir l'enveloppe convexe--//
+ for(int i=listniveauEau.size()-1;i>=0;i--) {
+ AreaPoint p = listniveauEau.get(i);
+ poly.addPoint(
+ (int)domainAxis.valueToJava2D(p.x, dataArea, plot.getDomainAxisEdge()),
+ (int)rangeAxis.valueToJava2D(p.y, dataArea, plot.getRangeAxisEdge()));
+ }
+
+
+
+ listShape.add(0,poly);
+ return listShape;
+
+ }
+
+ public void drawItem(Graphics2D g2,
+ XYItemRendererState state,
+ Rectangle2D dataArea,
+ PlotRenderingInfo info,
+ XYPlot plot,
+ ValueAxis domainAxis,
+ ValueAxis rangeAxis,
+ XYDataset dataset,
+ int series,
+ int item,
+ CrosshairState crosshairState,
+ int pass) {
+
+ if (!getItemVisible(series, item)) {
+ return;
+ }
+ // get the data point...
+ double x1 = dataset.getXValue(series, item);
+ double y1 = dataset.getYValue(series, item);
+ if (Double.isNaN(y1)) {
+ y1 = 0.0;
+ }
+
+ List<Shape> hotspot = null;
+
+
+ if( series == CURVE_SERIE && mustDrawPolygone(x1,y1,dataset, item)) {
+ hotspot = buildShapeProfilLong(domainAxis, rangeAxis, dataset,plot,dataArea);
+
+ }
+
+
+ Paint paint = getItemPaint(series, item);
+ Stroke stroke = getItemStroke(series, item);
+ g2.setPaint(paint);
+ g2.setStroke(stroke);
+
+
+ if( series == CURVE_SERIE && mustDrawPolygone(x1,y1,dataset, item)) {
+ if(hotspot.size() >0)
+ g2.fill(hotspot.get(0));
+ if(drawProfileLine) {
+ Color previous = g2.getColor();
+ Stroke prevStroke = g2.getStroke();
+
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[]{9}, 0);
+ g2.setStroke(dashed);
+ g2.setColor(Color.BLACK);
+ for(int i=1;i<hotspot.size();i++) {
+ g2.draw(hotspot.get(i));
+ g2.drawString("P"+(i-1), (int)((Line2D.Double)hotspot.get(i)).x1, (int)(((Line2D.Double)hotspot.get(i)).y1*1.3));
+ }
+ g2.setColor(previous);
+ g2.setStroke(prevStroke);
+ }
+ //-- warning: must draw he prevous line curve again to draw onto the polygon shape --//
+ if(itemLineToDraw != null)
+ for(Integer itemLine:itemLineToDraw)
+ defaultRenderer.drawItem(g2, state, dataArea, info, plot, domainAxis, rangeAxis, dataset, series, itemLine, crosshairState, pass);
+ }else {
+ //-- render line default renderer --//
+ defaultRenderer.drawItem(g2, state, dataArea, info, plot, domainAxis, rangeAxis, dataset, series, item, crosshairState, pass);
+ }
+
+ }
+
+
+
+
+ public boolean isNiveauEau() {
+ return isNiveauEau;
+ }
+
+ public void setNiveauEau(boolean isNiveauEau) {
+ this.isNiveauEau = isNiveauEau;
+ }
+
+
+ public boolean isDrawProfileLine() {
+ return drawProfileLine;
+ }
+
+
+ public void setDrawProfileLine(boolean drawProfileLine) {
+ this.drawProfileLine = drawProfileLine;
+ }
+
+
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-14 20:07:07
|
Revision: 8879
http://sourceforge.net/p/fudaa/svn/8879
Author: deniger
Date: 2014-10-14 20:06:59 +0000 (Tue, 14 Oct 2014)
Log Message:
-----------
maj couleur par defaut ?\195?\160 similaire
Modified Paths:
--------------
trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuDesktop.java
trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuLookPreferencesPanel.java
trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuPreferences.java
Modified: trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuDesktop.java
===================================================================
--- trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuDesktop.java 2014-10-14 19:59:19 UTC (rev 8878)
+++ trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuDesktop.java 2014-10-14 20:06:59 UTC (rev 8879)
@@ -1206,8 +1206,8 @@
true);
mnCouleurs.addMenuItem(_("Similaire"), "DESKTOP_SIMILAIRE",
new BuColorIcon(UIManager.getColor("Panel.background")), true);
- mnCouleurs.addMenuItem(_("D\xE9faut"), "DESKTOP_DEFAUT", new BuColorIcon(UIManager.getColor("Desktop.background")),
- true);
+// mnCouleurs.addMenuItem(_("D\xE9faut"), "DESKTOP_DEFAUT", new BuColorIcon(UIManager.getColor("Desktop.background")),
+// true);
menu_.addSubMenu(mnTextures, true);
menu_.addSubMenu(mnCouleurs, true);
@@ -1267,7 +1267,7 @@
setBackground(UIManager.getColor("Panel.background"));
bp.setIcon(null);
} else if (action.equals("DESKTOP_DEFAUT")) {
- setBackground(UIManager.getColor("Desktop.background"));
+ setBackground(UIManager.getColor("Panel.background"));
bp.setIcon(null);
}
Modified: trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuLookPreferencesPanel.java
===================================================================
--- trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuLookPreferencesPanel.java 2014-10-14 19:59:19 UTC (rev 8878)
+++ trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuLookPreferencesPanel.java 2014-10-14 20:06:59 UTC (rev 8879)
@@ -134,7 +134,7 @@
optionsStr_.put
(itemStr="DESKTOP_DEFAUT",
itemOpt=new BuOptionItem(getS("D\xE9faut"),
- new BuColorIcon(UIManager.getColor("Desktop.background"))));
+ new BuColorIcon(UIManager.getColor("Panel.background"))));
optionsStr_.put(itemOpt, itemStr);
optionsStr_.put
(itemStr="ASPECT_DEFAUT",
Modified: trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuPreferences.java
===================================================================
--- trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuPreferences.java 2014-10-14 19:59:19 UTC (rev 8878)
+++ trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuPreferences.java 2014-10-14 20:06:59 UTC (rev 8879)
@@ -496,7 +496,7 @@
_desktop.setBackground(UIManager.getColor("Panel.background"));
bp.setIcon(null);
} else if (getStringProperty("desktop.background").equals("DESKTOP_DEFAUT")) {
- _desktop.setBackground(UIManager.getColor("Desktop.background"));
+ _desktop.setBackground(UIManager.getColor("Panel.background"));
bp.setIcon(null);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-14 19:59:27
|
Revision: 8878
http://sourceforge.net/p/fudaa/svn/8878
Author: deniger
Date: 2014-10-14 19:59:19 +0000 (Tue, 14 Oct 2014)
Log Message:
-----------
correction bogue 2.1.5
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/PanneauGraphesResultats.java
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/PanneauGraphesResultats.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/PanneauGraphesResultats.java 2014-10-09 22:26:53 UTC (rev 8877)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/PanneauGraphesResultats.java 2014-10-14 19:59:19 UTC (rev 8878)
@@ -90,7 +90,7 @@
private MetierResultatsTemporelSpatial resultatsCourant_ = null;
private Hydraulique1dGraphesResultatsEditor parent_;
-private JCheckBox checkboxGrid = new JCheckBox(Hydraulique1dResource.HYDRAULIQUE1D.getString("Afficher la Grille"));
+ private JCheckBox checkboxGrid = new JCheckBox(Hydraulique1dResource.HYDRAULIQUE1D.getString("Afficher la Grille"));
private enum UniteTps {
@@ -110,8 +110,6 @@
Dimension d = bgraphe_.getPersonnaliseurGraphe().getPreferredSize();
Dimension dList = new Dimension(d.width, d.height / 2);
-
-
scrlpListPasTpsSection_.setPreferredSize(dList);
scrlpListPasTpsSection_.setBorder(ttlPasTempsSection_);
@@ -177,16 +175,16 @@
});
checkboxGrid.setSelected(true);
checkboxGrid.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- boolean displayGrid = checkboxGrid.isSelected();
- if(bgraphe_.getGraphe() != null && bgraphe_.getGraphe() instanceof MascaretGridGraphe) {
- ((MascaretGridGraphe)bgraphe_.getGraphe()).setDisplayGrid(displayGrid);
- bgraphe_.fullRepaint();
- }
-
- }
- });
-
+ public void actionPerformed(ActionEvent e) {
+ boolean displayGrid = checkboxGrid.isSelected();
+ if (bgraphe_.getGraphe() != null && bgraphe_.getGraphe() instanceof MascaretGridGraphe) {
+ ((MascaretGridGraphe) bgraphe_.getGraphe()).setDisplayGrid(displayGrid);
+ bgraphe_.fullRepaint();
+ }
+
+ }
+ });
+
rbSpatial_.setActionCommand("SPATIAL");
rbSpatial_.addActionListener(this);
rbTemporel_.setActionCommand("TEMPOREL");
@@ -362,7 +360,7 @@
String numFinChaine = valueChaine.substring(debutChaine.length()).trim();
listeIndexes.add(new Integer(Integer.parseInt(numFinChaine) - 1));
}
- //StringTokenizer st= new StringTokenizer(values[i].toString());
+ //StringTokenizer st= new StringTokenizer(values[i].toString());
//if (debutChaine.equals(st.nextToken())) {
// listeIndexes.add(new Integer(Integer.parseInt(st.nextToken()) - 1));
//}
@@ -485,6 +483,11 @@
//pnWest_.paintAll(pnWest_.getGraphics());
} else {
rbSpatial_.setEnabled(true);
+ if (rbSpatial_.isSelected()) {
+ spatial();
+ } else {
+ temporel();
+ }
scrlpListPasTpsSection_.setVisible(true);
//pnWest_.paintAll(pnWest_.getGraphics());
}
@@ -573,7 +576,7 @@
protected void visualiser(boolean calculBorne) {
int[] index = getIndexElementsSelectionnes();
- //System.err.println("Mode "+mode_);
+ //System.err.println("Mode "+mode_);
MetierResultatsTemporelSpatialBief[] res = new MetierResultatsTemporelSpatialBief[index.length];
for (int i = 0; i < index.length; i++) {
@@ -853,7 +856,7 @@
// idem la courbe a pour titre casier 0.0 car elle affiche le numero de section qui est pas defaut 0
// !!!!!!!!!!!!!!!!!!!!!!!!!!
int nbCourbe = indicesVar.length * resCasiersLiasons.length;
- //System.err.println("NB VAR "+indicesVar.length);
+ //System.err.println("NB VAR "+indicesVar.length);
//System.err.println("NBCASIER "+resCasiersLiasons.length);
//System.err.println("NB COURBE "+nbCourbe);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-09 22:27:08
|
Revision: 8877
http://sourceforge.net/p/fudaa/svn/8877
Author: deniger
Date: 2014-10-09 22:26:53 +0000 (Thu, 09 Oct 2014)
Log Message:
-----------
grille ne bouge pas si
Modified Paths:
--------------
trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaArcArrow.java
Modified: trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaArcArrow.java
===================================================================
--- trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaArcArrow.java 2014-10-09 22:25:23 UTC (rev 8876)
+++ trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaArcArrow.java 2014-10-09 22:26:53 UTC (rev 8877)
@@ -1,14 +1,13 @@
/**
* @modification $Date: 2006-09-19 14:34:56 $
- * @statut unstable
- * @file DjaArcArrow.java
- * @version 0.36
- * @author Guillaume Desnoix
- * @email gui...@de...
- * @license GNU General Public License 2 (GPL2)
- * @copyright 1998-2001 Guillaume Desnoix
+ * @statut unstable
+ * @file DjaArcArrow.java
+ * @version 0.36
+ * @author Guillaume Desnoix
+ * @email gui...@de...
+ * @license GNU General Public License 2 (GPL2)
+ * @copyright 1998-2001 Guillaume Desnoix
*/
-
package com.memoire.dja;
import java.awt.Graphics;
@@ -16,239 +15,243 @@
import java.awt.Rectangle;
public class DjaArcArrow
- extends DjaLink
-{
- protected int xr0,yr0,xr1,yr1;
+ extends DjaLink {
- public DjaArcArrow(String _text)
- {
+ protected int xr0, yr0, xr1, yr1;
+
+ public DjaArcArrow(String _text) {
super();
- yend_=ybegin_;
- ybegin_+=deltaY;
- obegin_=NORTH;
- oend_ =SOUTH;
+ yend_ = ybegin_;
+ ybegin_ += deltaY;
+ obegin_ = NORTH;
+ oend_ = SOUTH;
//putProperty("courbure","20.");
- xr0=xbegin_;
- yr0=ybegin_;
- xr1=xend_;
- yr1=yend_;
+ xr0 = xbegin_;
+ yr0 = ybegin_;
+ xr1 = xend_;
+ yr1 = yend_;
- if(_text!=null) addText(_text);
+ if (_text != null) {
+ addText(_text);
+ }
}
- public DjaArcArrow()
- {
+ public DjaArcArrow() {
this(null);
}
- public int getMiddleX()
- { return (xr0+xr1)/2; }
+ public int getMiddleX() {
+ return (xr0 + xr1) / 2;
+ }
- public int getMiddleY()
- { return (yr0+yr1)/2; }
+ public int getMiddleY() {
+ return (yr0 + yr1) / 2;
+ }
- private static class PC extends DjaControl
- {
- public PC(DjaObject _f,int _p,int _o,int _x,int _y)
- {
- super(_f,_p,_o,_x,_y);
- }
+ private static class PC extends DjaControl {
- public void draggedTo(int _x, int _y)
- {
- DjaArcArrow p=(DjaArcArrow)getParent();
- p.setCourbure(_x,_y);
- }
+ public PC(DjaObject _f, int _p, int _o, int _x, int _y) {
+ super(_f, _p, _o, _x, _y);
+ }
+
+ public void draggedTo(int _x, int _y) {
+ DjaArcArrow p = (DjaArcArrow) getParent();
+ p.setCourbure(_x, _y);
+ }
}
- public double getCourbure()
- {
- double r=Math.PI*1.25;
+ public double getCourbure() {
+ double r = Math.PI * 1.25;
- String courbure=getProperty("courbure");
- if(courbure!=null)
- r*=new Double(courbure).doubleValue()
- /Math.sqrt((xr0-xr1)*(xr0-xr1)+(yr0-yr1)*(yr0-yr1));
+ String courbure = getProperty("courbure");
+ if (courbure != null) {
+ r *= new Double(courbure).doubleValue()
+ / Math.sqrt((xr0 - xr1) * (xr0 - xr1) + (yr0 - yr1) * (yr0 - yr1));
+ }
return r;
}
- public void setCourbure(int _x,int _y)
- {
- int xm=getMiddleX();
- int ym=getMiddleY();
- double c=Math.sqrt((xm-_x)*(xm-_x)+(ym-_y)*(ym-_y));
- if((xr0-xm)*(_y-ym)-(yr0-ym)*(_x-xm)>0) c=-c;
- putProperty("courbure",""+c);
+ public void setCourbure(int _x, int _y) {
+ int xm = getMiddleX();
+ int ym = getMiddleY();
+ double c = Math.sqrt((xm - _x) * (xm - _x) + (ym - _y) * (ym - _y));
+ if ((xr0 - xm) * (_y - ym) - (yr0 - ym) * (_x - xm) > 0) {
+ c = -c;
+ }
+ putProperty("courbure", "" + c);
}
- public Rectangle getExtendedBounds()
- {
- double c=getCourbure();
- int vx0=(int)((yr0-yr1)*c);
- int vy0=(int)((xr1-xr0)*c);
- int vx1=(int)((yr1-yr0)*c);
- int vy1=(int)((xr0-xr1)*c);
+ public Rectangle getExtendedBounds() {
+ double c = getCourbure();
+ int vx0 = (int) ((yr0 - yr1) * c);
+ int vy0 = (int) ((xr1 - xr0) * c);
+ int vx1 = (int) ((yr1 - yr0) * c);
+ int vy1 = (int) ((xr0 - xr1) * c);
- Polygon p=DjaMatrixHermite.arc2polyline(xr0,yr0,xr1,yr1,vx0,vy0,vx1,vy1);
+ Polygon p = DjaMatrixHermite.arc2polyline(xr0, yr0, xr1, yr1, vx0, vy0, vx1, vy1);
- Rectangle r=super.getExtendedBounds();
- r=r.union(p.getBounds());
- r.grow(3,3);
+ Rectangle r = super.getExtendedBounds();
+ r = r.union(p.getBounds());
+ r.grow(3, 3);
- String epaisseur=getProperty("epaisseur");
- if(epaisseur!=null)
- {
- int e=Integer.parseInt(epaisseur);
- r.grow(e,e);
+ String epaisseur = getProperty("epaisseur");
+ if (epaisseur != null) {
+ int e = Integer.parseInt(epaisseur);
+ r.grow(e, e);
}
return r;
}
- public DjaControl[] getControls()
- {
- double c=getCourbure();
- int vx0=(int)((yr0-yr1)*c);
- int vy0=(int)((xr1-xr0)*c);
- int vx1=(int)((yr1-yr0)*c);
- int vy1=(int)((xr0-xr1)*c);
+ public DjaControl[] getControls() {
+ double c = getCourbure();
+ int vx0 = (int) ((yr0 - yr1) * c);
+ int vy0 = (int) ((xr1 - xr0) * c);
+ int vx1 = (int) ((yr1 - yr0) * c);
+ int vy1 = (int) ((xr0 - xr1) * c);
- Polygon p=DjaMatrixHermite.arc2polyline(xr0,yr0,xr1,yr1,vx0,vy0,vx1,vy1);
- int i=p.npoints/2;
+ Polygon p = DjaMatrixHermite.arc2polyline(xr0, yr0, xr1, yr1, vx0, vy0, vx1, vy1);
+ int i = p.npoints / 2;
- DjaControl[] r=new DjaControl[1];
- r[0]=new PC(this,0,BOTH,p.xpoints[i],p.ypoints[i]);
+ DjaControl[] r = new DjaControl[1];
+ r[0] = new PC(this, 0, BOTH, p.xpoints[i], p.ypoints[i]);
return r;
}
- public boolean contains(int _x, int _y)
- {
- double c=getCourbure();
- int vx0=(int)((yr0-yr1)*c);
- int vy0=(int)((xr1-xr0)*c);
- int vx1=(int)((yr1-yr0)*c);
- int vy1=(int)((xr0-xr1)*c);
+ public boolean contains(int _x, int _y) {
+ double c = getCourbure();
+ int vx0 = (int) ((yr0 - yr1) * c);
+ int vy0 = (int) ((xr1 - xr0) * c);
+ int vx1 = (int) ((yr1 - yr0) * c);
+ int vy1 = (int) ((xr0 - xr1) * c);
- Polygon p=DjaMatrixHermite.arc2polyline(xr0,yr0,xr1,yr1,vx0,vy0,vx1,vy1);
+ Polygon p = DjaMatrixHermite.arc2polyline(xr0, yr0, xr1, yr1, vx0, vy0, vx1, vy1);
- boolean r=false;
- for(int i=0; i<p.npoints-1; i++)
- r|=DjaLib.close(p.xpoints[i],p.ypoints[i],p.xpoints[i+1],p.ypoints[i+1],_x,_y);
+ boolean r = false;
+ for (int i = 0; i < p.npoints - 1; i++) {
+ r |= DjaLib.close(p.xpoints[i], p.ypoints[i], p.xpoints[i + 1], p.ypoints[i + 1], _x, _y);
+ }
return r;
}
- public DjaAnchor[] getAnchors()
- {
- double c=getCourbure();
- int vx0=(int)((yr0-yr1)*c);
- int vy0=(int)((xr1-xr0)*c);
- int vx1=(int)((yr1-yr0)*c);
- int vy1=(int)((xr0-xr1)*c);
+ public DjaAnchor[] getAnchors() {
+ double c = getCourbure();
+ int vx0 = (int) ((yr0 - yr1) * c);
+ int vy0 = (int) ((xr1 - xr0) * c);
+ int vx1 = (int) ((yr1 - yr0) * c);
+ int vy1 = (int) ((xr0 - xr1) * c);
- Polygon p=DjaMatrixHermite.arc2polyline(xr0,yr0,xr1,yr1,vx0,vy0,vx1,vy1);
- int i=p.npoints/2;
+ Polygon p = DjaMatrixHermite.arc2polyline(xr0, yr0, xr1, yr1, vx0, vy0, vx1, vy1);
+ int i = p.npoints / 2;
- DjaAnchor[] r=new DjaAnchor[1];
- r[0]=new DjaAnchor(this,0,ANY,p.xpoints[i],p.ypoints[i]);
+ DjaAnchor[] r = new DjaAnchor[1];
+ r[0] = new DjaAnchor(this, 0, ANY, p.xpoints[i], p.ypoints[i]);
return r;
}
- public void paintObject(Graphics _g)
- {
+ public void paintObject(Graphics _g) {
updateXYO();
- int x0=xbegin_;
- int y0=ybegin_;
- int o0=obegin_;
- int x1=xend_;
- int y1=yend_;
- int o1=oend_;
+ int x0 = xbegin_;
+ int y0 = ybegin_;
+ int o0 = obegin_;
+ int x1 = xend_;
+ int y1 = yend_;
+ int o1 = oend_;
//int /*x,*/y;
+ xr0 = x0;
+ yr0 = y0;
+ xr1 = x1;
+ yr1 = y1;
- xr0=x0;
- yr0=y0;
- xr1=x1;
- yr1=y1;
+ if (tbegin_ != 0) {
+ switch (o0) {
+ case EAST:
+ drawBracket(_g, tbegin_, o0, x0, y0 - 5, x0 + 10, y0 + 5);
+ xr0 += 11;
+ break;
+ case WEST:
+ drawBracket(_g, tbegin_, o0, x0, y0 - 5, x0 - 10, y0 + 5);
+ xr0 -= 11;
+ break;
+ case NORTH:
+ drawBracket(_g, tbegin_, o0, x0 - 5, y0, x0 + 5, y0 - 10);
+ yr0 -= 11;
+ break;
+ case SOUTH:
+ drawBracket(_g, tbegin_, o0, x0 - 5, y0, x0 + 5, y0 + 10);
+ yr0 += 11;
+ break;
+ }
+ }
- if(tbegin_!=0)
- switch(o0)
- {
- case EAST:
- drawBracket(_g,tbegin_,o0,x0,y0-5,x0+10,y0+5);
- xr0+=11;
- break;
- case WEST:
- drawBracket(_g,tbegin_,o0,x0,y0-5,x0-10,y0+5);
- xr0-=11;
- break;
- case NORTH:
- drawBracket(_g,tbegin_,o0,x0-5,y0,x0+5,y0-10);
- yr0-=11;
- break;
- case SOUTH:
- drawBracket(_g,tbegin_,o0,x0-5,y0,x0+5,y0+10);
- yr0+=11;
- break;
+ if (tend_ != 0) {
+ switch (o1) {
+ case EAST:
+ drawBracket(_g, tend_, o1, x1, y1 - 5, x1 + 10, y1 + 5);
+ xr1 += 11;
+ break;
+ case WEST:
+ drawBracket(_g, tend_, o1, x1, y1 - 5, x1 - 10, y1 + 5);
+ xr1 -= 11;
+ break;
+ case NORTH:
+ drawBracket(_g, tend_, o1, x1 - 5, y1, x1 + 5, y1 - 10);
+ yr1 -= 11;
+ break;
+ case SOUTH:
+ drawBracket(_g, tend_, o1, x1 - 5, y1, x1 + 5, y1 + 10);
+ yr1 += 11;
+ break;
+ }
}
-
- if(tend_!=0)
- switch(o1)
- {
- case EAST:
- drawBracket(_g,tend_,o1,x1,y1-5,x1+10,y1+5);
- xr1+=11;
- break;
- case WEST:
- drawBracket(_g,tend_,o1,x1,y1-5,x1-10,y1+5);
- xr1-=11;
- break;
- case NORTH:
- drawBracket(_g,tend_,o1,x1-5,y1,x1+5,y1-10);
- yr1-=11;
- break;
- case SOUTH:
- drawBracket(_g,tend_,o1,x1-5,y1,x1+5,y1+10);
- yr1+=11;
- break;
+
+ if ((tbegin_ == 1) || (tbegin_ == 4)) {
+ xr0 = xbegin_;
+ yr0 = ybegin_;
}
+ if ((tend_ == 1) || (tend_ == 4)) {
+ xr1 = xend_;
+ yr1 = yend_;
+ }
- if((tbegin_==1)||(tbegin_==4)) { xr0=xbegin_; yr0=ybegin_; }
- if((tend_ ==1)||(tend_ ==4)) { xr1=xend_; yr1=yend_; }
+ double c = getCourbure();
+ _g.setColor(getForeground());
+ if (Math.abs(c) > 0.001) {
+ int vx0 = (int) ((yr0 - yr1) * c);
+ int vy0 = (int) ((xr1 - xr0) * c);
+ int vx1 = (int) ((yr1 - yr0) * c);
+ int vy1 = (int) ((xr0 - xr1) * c);
- double c=getCourbure();
- int vx0=(int)((yr0-yr1)*c);
- int vy0=(int)((xr1-xr0)*c);
- int vx1=(int)((yr1-yr0)*c);
- int vy1=(int)((xr0-xr1)*c);
+ Polygon p = DjaMatrixHermite.arc2polyline(xr0, yr0, xr1, yr1, vx0, vy0, vx1, vy1);
- Polygon p=DjaMatrixHermite.arc2polyline(xr0,yr0,xr1,yr1,vx0,vy0,vx1,vy1);
+ DjaGraphics.BresenhamParams bp = DjaGraphics.getBresenhamParams(this);
+ DjaGraphics.drawPolyline(_g, p, bp);
+ } else {
+ _g.drawLine(xr0, yr0, xr1, yr1);
- _g.setColor(getForeground());
- DjaGraphics.BresenhamParams bp=DjaGraphics.getBresenhamParams(this);
- DjaGraphics.drawPolyline(_g,p,bp);
+ }
super.paintObject(_g);
}
- public void paintInteractive(Graphics _g)
- {
+ public void paintInteractive(Graphics _g) {
super.paintInteractive(_g);
- if(isSelected())
- {
- int x1=getMiddleX();
- int y1=getMiddleY();
- DjaControl c=getControls()[0];
- int x2=c.getX();
- int y2=c.getY();
+ if (isSelected()) {
+ int x1 = getMiddleX();
+ int y1 = getMiddleY();
+ DjaControl c = getControls()[0];
+ int x2 = c.getX();
+ int y2 = c.getY();
_g.setColor(controlsColor);
- DjaGraphics.BresenhamParams bp=new DjaGraphics.BresenhamParams(2,2);
- DjaGraphics.drawLine(_g,x1,y1,x2,y2,bp);
+ DjaGraphics.BresenhamParams bp = new DjaGraphics.BresenhamParams(2, 2);
+ DjaGraphics.drawLine(_g, x1, y1, x2, y2, bp);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-09 22:25:40
|
Revision: 8876
http://sourceforge.net/p/fudaa/svn/8876
Author: deniger
Date: 2014-10-09 22:25:23 +0000 (Thu, 09 Oct 2014)
Log Message:
-----------
grille ne bouge pas si
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBiefCourbe.java
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBiefCourbe.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBiefCourbe.java 2014-10-09 22:05:40 UTC (rev 8875)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBiefCourbe.java 2014-10-09 22:25:23 UTC (rev 8876)
@@ -99,8 +99,8 @@
}
} else {
r= new DjaAnchor[nbAnchors];
- float pasX= (xr1 - xr0) / (nbAnchors + 1);
- float pasY= (yr1 - yr0) / (nbAnchors + 1);
+ float pasX = (xr1 - xr0) / (nbAnchors + 1f);
+ float pasY = (yr1 - yr0) / (nbAnchors + 1f);
for (int i= 1; i <= nbAnchors; i++) {
r[i - 1]=
new DjaAnchor(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-09 22:05:43
|
Revision: 8875
http://sourceforge.net/p/fudaa/svn/8875
Author: deniger
Date: 2014-10-09 22:05:40 +0000 (Thu, 09 Oct 2014)
Log Message:
-----------
grille ne bouge pas si
Modified Paths:
--------------
trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaGridInteractive.java
Modified: trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaGridInteractive.java
===================================================================
--- trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaGridInteractive.java 2014-10-09 22:05:26 UTC (rev 8874)
+++ trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaGridInteractive.java 2014-10-09 22:05:40 UTC (rev 8875)
@@ -38,8 +38,6 @@
public class DjaGridInteractive
extends DjaGrid {
-
-
public DjaGridInteractive() {
this(true, null);
}
@@ -59,8 +57,6 @@
setInteractive(_interactive);
}
-
-
private boolean anchorsVisible_;
public boolean isAnchorsVisible() {
@@ -374,6 +370,16 @@
}
}
+ private boolean paintRect = true;
+
+ public boolean isPaintRect() {
+ return paintRect;
+ }
+
+ public void setPaintRect(boolean paintRect) {
+ this.paintRect = paintRect;
+ }
+
public void paintComponent(Graphics _g) {
super.paintComponent(_g);
@@ -383,7 +389,9 @@
int h = getHeight() - i.top - i.bottom;
_g.setColor(UIManager.getColor("Button.focus"));
- _g.drawRect(i.left + 1, i.top + 1, w - 3, h - 3);
+ if (paintRect) {
+ _g.drawRect(i.left + 1, i.top + 1, w - 3, h - 3);
+ }
if (kl_ != null) {
int kp = kl_.getPreviousKey();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-09 22:05:34
|
Revision: 8874
http://sourceforge.net/p/fudaa/svn/8874
Author: deniger
Date: 2014-10-09 22:05:26 +0000 (Thu, 09 Oct 2014)
Log Message:
-----------
grille ne bouge pas si
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/MascaretGridInteractive.java
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/MascaretGridInteractive.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/MascaretGridInteractive.java 2014-10-09 22:00:14 UTC (rev 8873)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/MascaretGridInteractive.java 2014-10-09 22:05:26 UTC (rev 8874)
@@ -12,16 +12,16 @@
* a custom grid interactive that allow zoom and dnd
*/
public class MascaretGridInteractive extends DjaGridInteractive {
-
+
private static final long serialVersionUID = 1L;
private MascaretScaledGridMouseListener mouseScaleListener;
private Hydraulique1dReseauFrame parentFrame;
-
+
public MascaretGridInteractive(boolean b, DjaVector djaVector) {
super(b, djaVector);
init();
}
-
+
private final void init() {
setOpaque(true);
setBackground(Color.WHITE);
@@ -29,37 +29,38 @@
addMouseListener(mouseScaleListener);
addMouseMotionListener(mouseScaleListener);
setDoubleBuffered(false);
+ setPaintRect(false);
}
-
+
public void setParentFrame(Hydraulique1dReseauFrame parentFrame) {
this.parentFrame = parentFrame;
}
-
+
public Hydraulique1dReseauFrame getParentFrame() {
return parentFrame;
}
-
+
public MascaretScaledGridMouseListener getMouseScaleListener() {
return mouseScaleListener;
}
-
+
public MascaretGridInteractive() {
super(false);
init();
}
-
+
public void setScale(float scale) {
getTransform().setScale(scale);
}
-
+
public void setTranslationActive(boolean active) {
mouseScaleListener.setMoveActionEnabled(active);
}
-
+
public void setZoom(boolean active) {
mouseScaleListener.setZoomActionEnabled(active);
}
-
+
@Override
public void paint(Graphics g) {
final Dimension size = getSize();
@@ -70,7 +71,7 @@
}
super.paint(g);
}
-
+
@Override
public void setInteractive(boolean _s
) {
@@ -80,13 +81,13 @@
mouseScaleListener.setMoveActionEnabled(false);
}
}
-
+
public void zoomOn(MouseEvent evt, boolean zoomIn) {
-
+
getTransform().zoom(evt, zoomIn);
getParentFrame().repaint(0);
repaint(0);
-
+
}
// @Override
@@ -104,5 +105,5 @@
boolean isZoomOrMoveActivated() {
return mouseScaleListener.isMoveActionEnabled() || mouseScaleListener.isZoomActionEnabled();
}
-
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-09 22:00:19
|
Revision: 8873
http://sourceforge.net/p/fudaa/svn/8873
Author: deniger
Date: 2014-10-09 22:00:14 +0000 (Thu, 09 Oct 2014)
Log Message:
-----------
grille ne bouge pas si
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/MascaretGridInteractive.java
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/MascaretGridInteractive.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/MascaretGridInteractive.java 2014-10-09 21:59:27 UTC (rev 8872)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/MascaretGridInteractive.java 2014-10-09 22:00:14 UTC (rev 8873)
@@ -61,7 +61,7 @@
}
@Override
- public void paint(Graphics g) {
+ public void paint(Graphics g) {
final Dimension size = getSize();
Rectangle clip = new Rectangle(0, 0, size.width, size.height);
if (isOpaque()) {
@@ -82,7 +82,7 @@
}
public void zoomOn(MouseEvent evt, boolean zoomIn) {
-
+
getTransform().zoom(evt, zoomIn);
getParentFrame().repaint(0);
repaint(0);
@@ -104,6 +104,5 @@
boolean isZoomOrMoveActivated() {
return mouseScaleListener.isMoveActionEnabled() || mouseScaleListener.isZoomActionEnabled();
}
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-09 21:59:37
|
Revision: 8872
http://sourceforge.net/p/fudaa/svn/8872
Author: deniger
Date: 2014-10-09 21:59:27 +0000 (Thu, 09 Oct 2014)
Log Message:
-----------
prise en compte d'une valeur null
Modified Paths:
--------------
trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaGrid.java
Modified: trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaGrid.java
===================================================================
--- trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaGrid.java 2014-10-09 21:42:46 UTC (rev 8871)
+++ trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaGrid.java 2014-10-09 21:59:27 UTC (rev 8872)
@@ -411,12 +411,12 @@
@Override
public void paintComponent(Graphics _g) {
+ paintGrid(_g);
Graphics2D g2d = (Graphics2D) _g;
AffineTransform at = g2d.getTransform();
at.scale(getTransform().getScale(), getTransform().getScale());
at.translate(getTransform().getTranslateX(), getTransform().getTranslateY());
g2d.setTransform(at);
- paintGrid(_g);
paintObjects(_g);
if (repaintOnceScaleIsDone) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-09 21:42:25
|
Revision: 8870
http://sourceforge.net/p/fudaa/svn/8870
Author: deniger
Date: 2014-10-09 21:42:19 +0000 (Thu, 09 Oct 2014)
Log Message:
-----------
prise en compte d'une valeur null
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1d.java
trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/MetierReseau.java
trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/DoubleConverter.java
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/IntegerConverter.java
trunk/soft/fudaa-mascaret/server/src/main/resources/dtd/mascaret-1.0.dtd
trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/mascaret/EdamoxXmlReaderWriterTest.java
Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1d.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1d.java 2014-10-09 21:08:28 UTC (rev 8869)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1d.java 2014-10-09 21:42:19 UTC (rev 8870)
@@ -289,6 +289,7 @@
return calageAuto_;
}
+
public void calageAuto(MetierCalageAuto _calageAuto) {
if (calageAuto_ == _calageAuto) {
return;
Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/MetierReseau.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/MetierReseau.java 2014-10-09 21:08:28 UTC (rev 8869)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/MetierReseau.java 2014-10-09 21:42:19 UTC (rev 8870)
@@ -908,6 +908,9 @@
}
public MetierNoeud[] noeudsConnectesBiefs() {
+ if (biefs_ == null) {
+ return new MetierNoeud[0];
+ }
Vector noeuds = new Vector();
MetierNoeud n = null;
for (int i = 0; i < biefs_.length; i++) {
Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/DoubleConverter.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/DoubleConverter.java 2014-10-09 21:08:28 UTC (rev 8869)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/DoubleConverter.java 2014-10-09 21:42:19 UTC (rev 8870)
@@ -23,7 +23,7 @@
public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
Double values = (Double) source;
if (values == null || values.isNaN() || ConvH1D_Masc.RIEN == values.doubleValue()) {
- writer.setValue(StringUtils.EMPTY);
+ writer.setValue(IntegerConverter.NOTHING_VALUE);
} else {
writer.setValue(basicDoubleConverter.toString(values));
}
@@ -32,7 +32,7 @@
@Override
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
String value = reader.getValue();
- if (value == null || StringUtils.isBlank(value)) {
+ if (value == null || StringUtils.isBlank(value) || IntegerConverter.NOTHING_VALUE.equals(value)) {
return ConvH1D_Masc.RIEN;
}
return basicDoubleConverter.fromString(value);
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 2014-10-09 21:08:28 UTC (rev 8869)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/EdamoxXmlReaderWriter.java 2014-10-09 21:42:19 UTC (rev 8870)
@@ -156,7 +156,7 @@
}
private XmlFriendlyNameCoder createReplacer() {
- return new XmlFriendlyNameCoder("#", "_") ;
+ return new XmlFriendlyNameCoder("#", "_");
}
public CtuluLog isValide(final File xml) {
@@ -406,21 +406,7 @@
private void configureXStream(XStream xstream) {
xstream.alias("fichierCas", EdamoxXMLContent.class);
- //ces converter traduisent des tableaux de double, boolean,... en chaine de caractere
- //avec chaque entr\xE9e s\xE9par\xE9s par un espace.
- //Si la lecture de ces lignes est trop compliqu\xE9 en fortran, il est possible
- //de supprimer ces converter. Ainsi chaque entr\xE9e sera dans des balises <double>,...
- xstream.registerConverter(new DoubleArrayConverter());
- xstream.registerConverter(new BooleanArrayConverter());
- xstream.registerConverter(new IntegerArrayConverter());
- xstream.registerConverter(new FloatArrayConverter());
- //pour enlever les caracteres speciaux
- xstream.registerConverter(new StringConverter());
- //pour les NAN
- xstream.registerConverter(new IntegerConverter());
- //pour les NAN
- xstream.registerConverter(new DoubleConverter());
-// xstream.registerConverter(new StringArrayConverter());
+ registerConverters(xstream);
xstream.alias("structureParametresCAS", SParametresCAS.class);
xstream.alias("noeud", SNoeud.class);
@@ -486,6 +472,24 @@
}
+ public static void registerConverters(XStream xstream) {
+ //ces converter traduisent des tableaux de double, boolean,... en chaine de caractere
+ //avec chaque entr\xE9e s\xE9par\xE9s par un espace.
+ //Si la lecture de ces lignes est trop compliqu\xE9 en fortran, il est possible
+ //de supprimer ces converter. Ainsi chaque entr\xE9e sera dans des balises <double>,...
+ xstream.registerConverter(new DoubleArrayConverter(IntegerConverter.NOTHING_VALUE));
+ xstream.registerConverter(new BooleanArrayConverter(IntegerConverter.NOTHING_VALUE));
+ xstream.registerConverter(new IntegerArrayConverter(IntegerConverter.NOTHING_VALUE));
+ xstream.registerConverter(new FloatArrayConverter(IntegerConverter.NOTHING_VALUE));
+ //pour enlever les caracteres speciaux
+ xstream.registerConverter(new StringConverter());
+ //pour les NAN
+ xstream.registerConverter(new IntegerConverter());
+ //pour les NAN
+ xstream.registerConverter(new DoubleConverter());
+// xstream.registerConverter(new StringArrayConverter());
+ }
+
protected static class CustomPrettyPrintWriter extends PrettyPrintWriter {
public CustomPrettyPrintWriter(Writer writer, char[] lineIndenter, NameCoder nameCoder) {
Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/IntegerConverter.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/IntegerConverter.java 2014-10-09 21:08:28 UTC (rev 8869)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/IntegerConverter.java 2014-10-09 21:42:19 UTC (rev 8870)
@@ -9,7 +9,6 @@
import com.thoughtworks.xstream.converters.basic.IntConverter;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-import java.text.Normalizer;
import org.apache.commons.lang.StringUtils;
import org.fudaa.dodico.hydraulique1d.conv.ConvH1D_Masc;
@@ -19,13 +18,15 @@
*/
public class IntegerConverter implements Converter {
+ public static String NOTHING_VALUE = "-0";
+
IntConverter basicIntConverter = new IntConverter();
@Override
public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
Integer values = (Integer) source;
if (values == null || ConvH1D_Masc.IRIEN == values.intValue()) {
- writer.setValue(StringUtils.EMPTY);
+ writer.setValue(NOTHING_VALUE);
} else {
writer.setValue(basicIntConverter.toString(values));
}
@@ -34,7 +35,7 @@
@Override
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
String value = reader.getValue();
- if (value == null || StringUtils.isBlank(value)) {
+ if (value == null || StringUtils.isBlank(value) || NOTHING_VALUE.equals(value)) {
return ConvH1D_Masc.IRIEN;
}
return basicIntConverter.fromString(value);
Modified: trunk/soft/fudaa-mascaret/server/src/main/resources/dtd/mascaret-1.0.dtd
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/resources/dtd/mascaret-1.0.dtd 2014-10-09 21:08:28 UTC (rev 8869)
+++ trunk/soft/fudaa-mascaret/server/src/main/resources/dtd/mascaret-1.0.dtd 2014-10-09 21:42:19 UTC (rev 8870)
@@ -57,8 +57,7 @@
perteChargeAutoElargissement?,
termesNonHydrostatiques?,
apportDebit?,
- attenuationConvection?,
- parametresNumeriqueCasier?)
+ attenuationConvection?)
>
<!ELEMENT parametresTemporels (
Modified: trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/mascaret/EdamoxXmlReaderWriterTest.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/mascaret/EdamoxXmlReaderWriterTest.java 2014-10-09 21:08:28 UTC (rev 8869)
+++ trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/mascaret/EdamoxXmlReaderWriterTest.java 2014-10-09 21:42:19 UTC (rev 8870)
@@ -83,6 +83,7 @@
*/
public static void testCompare(SParametresCAS cas1, SParametresCAS cas2) {
XStream xstream = new XStream();
+ EdamoxXmlReaderWriter.registerConverters(xstream);
xstream.setMode(XStream.NO_REFERENCES);
// cas2.parametresGen.code=3;
String cas1ToXml = xstream.toXML(cas1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-09 21:08:40
|
Revision: 8869
http://sourceforge.net/p/fudaa/svn/8869
Author: deniger
Date: 2014-10-09 21:08:28 +0000 (Thu, 09 Oct 2014)
Log Message:
-----------
prise en compte d'une valeur null
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/BooleanArrayConverter.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/DoubleArrayConverter.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/FloatArrayConverter.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/IntegerArrayConverter.java
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/BooleanArrayConverter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/BooleanArrayConverter.java 2014-10-09 21:06:30 UTC (rev 8868)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/BooleanArrayConverter.java 2014-10-09 21:08:28 UTC (rev 8869)
@@ -22,6 +22,13 @@
private String emptyValue = CtuluLibString.getEmptyTableau();
+ public BooleanArrayConverter() {
+ }
+
+ public BooleanArrayConverter(String emptyValue) {
+ this.emptyValue = emptyValue;
+ }
+
public String getEmptyValue() {
return emptyValue;
}
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/DoubleArrayConverter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/DoubleArrayConverter.java 2014-10-09 21:06:30 UTC (rev 8868)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/DoubleArrayConverter.java 2014-10-09 21:08:28 UTC (rev 8869)
@@ -21,6 +21,13 @@
private String emptyValue = CtuluLibString.getEmptyTableau();
+ public DoubleArrayConverter() {
+ }
+
+ public DoubleArrayConverter(String emptyValue) {
+ this.emptyValue = emptyValue;
+ }
+
public String getEmptyValue() {
return emptyValue;
}
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/FloatArrayConverter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/FloatArrayConverter.java 2014-10-09 21:06:30 UTC (rev 8868)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/FloatArrayConverter.java 2014-10-09 21:08:28 UTC (rev 8869)
@@ -21,6 +21,13 @@
private String emptyValue = CtuluLibString.getEmptyTableau();
+ public FloatArrayConverter() {
+ }
+
+ public FloatArrayConverter(String emptyValue) {
+ this.emptyValue = emptyValue;
+ }
+
public String getEmptyValue() {
return emptyValue;
}
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/IntegerArrayConverter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/IntegerArrayConverter.java 2014-10-09 21:06:30 UTC (rev 8868)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/IntegerArrayConverter.java 2014-10-09 21:08:28 UTC (rev 8869)
@@ -21,6 +21,13 @@
private String emptyValue = CtuluLibString.getEmptyTableau();
+ public IntegerArrayConverter() {
+ }
+
+ public IntegerArrayConverter(String emptyValue) {
+ this.emptyValue = emptyValue;
+ }
+
public String getEmptyValue() {
return emptyValue;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-09 21:06:40
|
Revision: 8868
http://sourceforge.net/p/fudaa/svn/8868
Author: deniger
Date: 2014-10-09 21:06:30 +0000 (Thu, 09 Oct 2014)
Log Message:
-----------
prise en compte d'une valeur null
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/BooleanArrayConverter.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/DoubleArrayConverter.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/FloatArrayConverter.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/IntegerArrayConverter.java
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/BooleanArrayConverter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/BooleanArrayConverter.java 2014-10-09 20:56:03 UTC (rev 8867)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/BooleanArrayConverter.java 2014-10-09 21:06:30 UTC (rev 8868)
@@ -20,16 +20,30 @@
*/
public class BooleanArrayConverter implements Converter {
+ private String emptyValue = CtuluLibString.getEmptyTableau();
+
+ public String getEmptyValue() {
+ return emptyValue;
+ }
+
+ public void setEmptyValue(String emptyValue) {
+ this.emptyValue = emptyValue;
+ }
+
@Override
public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
boolean[] values = (boolean[]) source;
- writer.setValue(CtuluLibString.arrayToString(values, " "));
+ if (values == null || values.length == 0) {
+ writer.setValue(emptyValue);
+ } else {
+ writer.setValue(CtuluLibString.arrayToString(values, " "));
+ }
}
@Override
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
String value = reader.getValue();
- if (CtuluLibString.getEmptyTableau().equals(value)) {
+ if (CtuluLibString.getEmptyTableau().equals(value) || emptyValue.equals(value)) {
return FuEmptyArrays.BOOLEAN0;
} else if (CtuluLibString.getNullString().equals(value)) {
return null;
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/DoubleArrayConverter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/DoubleArrayConverter.java 2014-10-09 20:56:03 UTC (rev 8867)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/DoubleArrayConverter.java 2014-10-09 21:06:30 UTC (rev 8868)
@@ -19,17 +19,31 @@
*/
public class DoubleArrayConverter implements Converter {
+ private String emptyValue = CtuluLibString.getEmptyTableau();
+
+ public String getEmptyValue() {
+ return emptyValue;
+ }
+
+ public void setEmptyValue(String emptyValue) {
+ this.emptyValue = emptyValue;
+ }
+
@Override
public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
double[] values = (double[]) source;
- writer.setValue(CtuluLibString.arrayToString(values, " "));
+ if (values == null || values.length == 0) {
+ writer.setValue(emptyValue);
+ } else {
+ writer.setValue(CtuluLibString.arrayToString(values, " "));
+ }
}
@Override
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
try {
String value = reader.getValue();
- if (CtuluLibString.getEmptyTableau().equals(value)) {
+ if (CtuluLibString.getEmptyTableau().equals(value) || emptyValue.equals(value)) {
return FuEmptyArrays.DOUBLE0;
} else if (CtuluLibString.getNullString().equals(value)) {
return null;
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/FloatArrayConverter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/FloatArrayConverter.java 2014-10-09 20:56:03 UTC (rev 8867)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/FloatArrayConverter.java 2014-10-09 21:06:30 UTC (rev 8868)
@@ -19,16 +19,30 @@
*/
public class FloatArrayConverter implements Converter {
+ private String emptyValue = CtuluLibString.getEmptyTableau();
+
+ public String getEmptyValue() {
+ return emptyValue;
+ }
+
+ public void setEmptyValue(String emptyValue) {
+ this.emptyValue = emptyValue;
+ }
+
@Override
public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
float[] values = (float[]) source;
- writer.setValue(CtuluLibString.arrayToString(values, " "));
+ if (values == null || values.length == 0) {
+ writer.setValue(emptyValue);
+ } else {
+ writer.setValue(CtuluLibString.arrayToString(values, " "));
+ }
}
@Override
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
String valueAsText = reader.getValue();
- if (CtuluLibString.getEmptyTableau().equals(valueAsText)) {
+ if (CtuluLibString.getEmptyTableau().equals(valueAsText) || emptyValue.equals(valueAsText)) {
return FuEmptyArrays.FLOAT0;
} else if (CtuluLibString.getNullString().equals(valueAsText)) {
return null;
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/IntegerArrayConverter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/IntegerArrayConverter.java 2014-10-09 20:56:03 UTC (rev 8867)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/IntegerArrayConverter.java 2014-10-09 21:06:30 UTC (rev 8868)
@@ -19,16 +19,30 @@
*/
public class IntegerArrayConverter implements Converter {
+ private String emptyValue = CtuluLibString.getEmptyTableau();
+
+ public String getEmptyValue() {
+ return emptyValue;
+ }
+
+ public void setEmptyValue(String emptyValue) {
+ this.emptyValue = emptyValue;
+ }
+
@Override
public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
int[] values = (int[]) source;
- writer.setValue(CtuluLibString.arrayToString(values, " "));
+ if (values == null || values.length == 0) {
+ writer.setValue(emptyValue);
+ } else {
+ writer.setValue(CtuluLibString.arrayToString(values, " "));
+ }
}
@Override
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
String value = reader.getValue();
- if (CtuluLibString.getEmptyTableau().equals(value)) {
+ if (CtuluLibString.getEmptyTableau().equals(value) || emptyValue.equals(value)) {
return FuEmptyArrays.INT0;
} else if (CtuluLibString.getNullString().equals(value)) {
return null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-09 20:56:08
|
Revision: 8867
http://sourceforge.net/p/fudaa/svn/8867
Author: deniger
Date: 2014-10-09 20:56:03 +0000 (Thu, 09 Oct 2014)
Log Message:
-----------
maj des couleurs des ?\195?\169l?\195?\169ments de r?\195?\169seau
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/hydraulique1dapport.gif
trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/hydraulique1ddeversoir.gif
trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/hydraulique1dpertecharge.gif
trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/hydraulique1dseuil.gif
trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/hydraulique1dsource.gif
Removed Paths:
-------------
trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/hydraulique1dapport10.gif
trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/hydraulique1ddeversoir10.gif
trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/hydraulique1dpertecharge10.gif
trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/hydraulique1dseuil10.gif
trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/hydraulique1dsource10.gif
Modified: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/hydraulique1dapport.gif
===================================================================
(Binary files differ)
Deleted: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/hydraulique1dapport10.gif
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/hydraulique1ddeversoir.gif
===================================================================
(Binary files differ)
Deleted: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/hydraulique1ddeversoir10.gif
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/hydraulique1dpertecharge.gif
===================================================================
(Binary files differ)
Deleted: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/hydraulique1dpertecharge10.gif
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/hydraulique1dseuil.gif
===================================================================
(Binary files differ)
Deleted: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/hydraulique1dseuil10.gif
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/hydraulique1dsource.gif
===================================================================
(Binary files differ)
Deleted: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/hydraulique1dsource10.gif
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-09 20:52:12
|
Revision: 8866
http://sourceforge.net/p/fudaa/svn/8866
Author: deniger
Date: 2014-10-09 20:52:06 +0000 (Thu, 09 Oct 2014)
Log Message:
-----------
maj des couleurs des ?\195?\169l?\195?\169ments de r?\195?\169seau
Added Paths:
-----------
trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_apport.png
trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_deversoir.png
trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_perteCharge.png
trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_seuil.png
trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_source.png
Added: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_apport.png
===================================================================
(Binary files differ)
Index: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_apport.png
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_apport.png 2014-10-09 20:26:01 UTC (rev 8865)
+++ trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_apport.png 2014-10-09 20:52:06 UTC (rev 8866)
Property changes on: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_apport.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_deversoir.png
===================================================================
(Binary files differ)
Index: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_deversoir.png
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_deversoir.png 2014-10-09 20:26:01 UTC (rev 8865)
+++ trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_deversoir.png 2014-10-09 20:52:06 UTC (rev 8866)
Property changes on: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_deversoir.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_perteCharge.png
===================================================================
(Binary files differ)
Index: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_perteCharge.png
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_perteCharge.png 2014-10-09 20:26:01 UTC (rev 8865)
+++ trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_perteCharge.png 2014-10-09 20:52:06 UTC (rev 8866)
Property changes on: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_perteCharge.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_seuil.png
===================================================================
(Binary files differ)
Index: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_seuil.png
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_seuil.png 2014-10-09 20:26:01 UTC (rev 8865)
+++ trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_seuil.png 2014-10-09 20:52:06 UTC (rev 8866)
Property changes on: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_seuil.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_source.png
===================================================================
(Binary files differ)
Index: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_source.png
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_source.png 2014-10-09 20:26:01 UTC (rev 8865)
+++ trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_source.png 2014-10-09 20:52:06 UTC (rev 8866)
Property changes on: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/reseau/reseau_source.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-09 20:26:07
|
Revision: 8865
http://sourceforge.net/p/fudaa/svn/8865
Author: deniger
Date: 2014-10-09 20:26:01 +0000 (Thu, 09 Oct 2014)
Log Message:
-----------
upgrade de versions
Modified Paths:
--------------
trunk/soft/fudaa-prepro/pom.xml
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
Modified: trunk/soft/fudaa-prepro/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/pom.xml 2014-10-09 20:18:51 UTC (rev 8864)
+++ trunk/soft/fudaa-prepro/pom.xml 2014-10-09 20:26:01 UTC (rev 8865)
@@ -11,7 +11,7 @@
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>soft-pom</artifactId>
- <version>1.3</version>
+ <version>1.5</version>
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
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 2014-10-09 20:18:51 UTC (rev 8864)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2014-10-09 20:26:01 UTC (rev 8865)
@@ -72,8 +72,8 @@
infoSoft = new BuInformationsSoftware();
infoSoft.name = "prepro";
- infoSoft.version = "1.3-RC5";
- infoSoft.date = "2014-06-25";
+ infoSoft.version = "1.3-RC6";
+ infoSoft.date = "2014-10-09";
infoSoft.rights = TrResource.getS("Tous droits r\xE9serv\xE9s") + ". CETMEF (c)2003-2009";
infoSoft.contact = "fre...@fu...";
infoSoft.license = "GPL2";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
