Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[3741] trunk/fudaa_devel
|
From: <opa...@us...> - 2008-08-08 15:17:27
|
Revision: 3741
http://fudaa.svn.sourceforge.net/fudaa/?rev=3741&view=rev
Author: opasteur
Date: 2008-08-08 15:17:33 +0000 (Fri, 08 Aug 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/fudaa_devel/dodico/idl/code/mascaret.idl
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoAnalyzer.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/DeserializerHandlerVersion04.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1d.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierProfil.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DCalculMascaret.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DParametresMascaret.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/MascaretClient.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dExport.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dImport.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProjet.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvH1D_Masc.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvMasc_H1D.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dBiefEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierGeometriePanel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneProfilTableau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauProfilsModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java
Modified: trunk/fudaa_devel/dodico/idl/code/mascaret.idl
===================================================================
--- trunk/fudaa_devel/dodico/idl/code/mascaret.idl 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/dodico/idl/code/mascaret.idl 2008-08-08 15:17:33 UTC (rev 3741)
@@ -833,6 +833,7 @@
reel absc; // abscisse utilisateur du profil
VSParametresPt pts; // les points du profil
booleen avecGeoReferencement; //booleen indiquant la pr\xE9sence de g\xE9or\xE9f\xE9rencement ou non
+ chaine infoGeoReferencement; //Contient le infos du g\xE9or\xE9f\xE9rencement indiqu\xE9 dans l'en-tete du ficher
};
typedef sequence <SParametresProfil> VSParametresProfil;
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoAnalyzer.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoAnalyzer.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoAnalyzer.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -661,6 +661,8 @@
}
stemp = entite.isDefautValuesValides();
final String app = (String) mapEncours.get(kw_.getApparence());
+ System.err.println("app "+app);
+ System.err.println("stemp "+stemp);
if (stemp != null && ((app == null) || (app.indexOf("IS REQUIRED") < 0))) {
analyze_.addFatalError(getQuoteString() + noms[0] + "': "
+ DicoResource.getS("Les valeurs par d\xE9faut sont invalides"), ligne);
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/DeserializerHandlerVersion04.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/DeserializerHandlerVersion04.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/DeserializerHandlerVersion04.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -58,7 +58,7 @@
private List singles_;
private final Map typeClass_;
-
+
private final Map classNameTypeData_ = new TreeMap();
/**
@@ -89,10 +89,10 @@
* Mapping des anciennes classes dans les nouvelles.
*/
private String getNewClassName(final String _c) throws ClassNotFoundException {
+
final String PK_DODICO_HYDR="org.fudaa.dodico.hydraulique1d.";
final String PK_DODICO_CORBA_HYDR="org.fudaa.dodico.corba.hydraulique1d.";
final String PK_DODICO_CORBA_GEOM="org.fudaa.dodico.corba.geometrie.";
-
String newpk;
String newname;
@@ -116,6 +116,7 @@
else if (oldpk.startsWith(PK_DODICO_CORBA_GEOM)) {
newpk="org.fudaa.dodico.hydraulique1d.metier.geometrie.";
}
+
// Aucun changement.
else {
return _c;
@@ -163,6 +164,7 @@
protected Field getField(final Class _c, final String _name) {
final String s = _c.getName();
+
TypeData d = (TypeData) classNameTypeData_.get(s);
if (d == null) {
d = new TypeData();
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1d.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1d.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1d.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -38,7 +38,8 @@
*/
public class MetierEtude1d extends MetierHydraulique1d {
// IMPORTANT: NE PAS OUBLIER D'INCREMENTER CE NUMERO A CHAQUE MODIF DU FORMAT
- public final static String FORMAT_VERSION= "0.5"; // Les objets metiers ne sont plus corba, mais Java.
+ public final static String FORMAT_VERSION= "0.6"; // Les objets metiers ont \xE9t\xE9 d\xE9plac\xE9s de fudaa.hydraulique1d \xE0 dodico.hydraulique1d.
+ public final static String FORMAT_VERSION_0_5= "0.5"; // Les objets metiers ne sont plus corba, mais Java.
public final static String FORMAT_VERSION_0_4= "0.4"; // Passage en Java 1.4
public final static String FORMAT_VERSION_0_3= "0.3";
@@ -344,6 +345,15 @@
etude.versionFormat(FORMAT_VERSION);
}
}
+
+ // Version 0.5
+ else if (FORMAT_VERSION_0_5.compareTo(_version)==0){
+ System.out.println("=> Conversion format "+_version);
+ fluxLu.setHandler(new DeserializerHandlerVersion05(true));
+ Object[] infos=(Object[])fluxLu.read();
+ etude=(MetierEtude1d)infos[1];
+ etude.versionFormat(FORMAT_VERSION);
+ }
if(etude==null) return etude;
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierProfil.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierProfil.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierProfil.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -33,6 +33,7 @@
indiceLitMajDr(q.indiceLitMajDr());
indiceLitMajGa(q.indiceLitMajGa());
avecGeoreferencement(q.avecGeoreferencement());
+ infosGeoReferencement(q.infosGeoReferencement());
}
}
final public MetierHydraulique1d creeClone() {
@@ -50,6 +51,7 @@
p.indiceLitMinDr(indiceLitMinDr_);
p.indiceLitMajDr(indiceLitMajDr_);
p.avecGeoreferencement(avecGeoreferencement_);
+ p.infosGeoReferencement(infosGeoReferencement_);
return p;
}
final public String toString() {
@@ -69,6 +71,7 @@
indiceLitMajDr_= 0;
indiceLitMajGa_= 0;
avecGeoreferencement_=false;
+ infosGeoReferencement_="";
notifieObjetCree();
}
public void dispose() {
@@ -80,6 +83,7 @@
indiceLitMajDr_= -1;
indiceLitMajGa_= -1;
avecGeoreferencement_=false;
+ infosGeoReferencement_="";
super.dispose();
}
// attributs
@@ -110,6 +114,7 @@
abscisse_= s;
Notifieur.getNotifieur().fireObjetModifie(toString(), this, "abscisse");
}
+
private boolean avecGeoreferencement_;
public boolean avecGeoreferencement() {
return avecGeoreferencement_;
@@ -119,6 +124,16 @@
avecGeoreferencement_= b;
Notifieur.getNotifieur().fireObjetModifie(toString(), this, "avecGeoreferencement");
}
+
+ private String infosGeoReferencement_;
+ public String infosGeoReferencement() {
+ return infosGeoReferencement_;
+ }
+ public void infosGeoReferencement(String s) {
+ if (infosGeoReferencement_==s) return;
+ infosGeoReferencement_= s;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "infosGeoReferencement");
+ }
private MetierPoint2D[] points_;
public MetierPoint2D[] points() {
return points_;
@@ -398,7 +413,7 @@
if (p2.length != length) return false;
for (int i=0; i<length; i++)
- if (!((p[i].x==p2[i].x)&&(p[i].y==p2[i].y)))
+ if (!((p[i].x==p2[i].x)&&(p[i].y==p2[i].y) &&(p[i].cx==p2[i].cx)&&(p[i].cy==p2[i].cy)))
return false;
return true;
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DCalculMascaret.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DCalculMascaret.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DCalculMascaret.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -380,7 +380,7 @@
DParametresMascaret.ecritParametresCAS(ficCAS, params.parametresCAS());
setProgression("Ecriture des fichiers param\xE8tres", 55);
if (bInterrompu_) return;
- DParametresMascaret.ecritParametresGEO(ficGEO, params.parametresGEO());
+ DParametresMascaret.ecritParametresGEO(ficGEO, params.parametresGEO(),false);
setProgression("Ecriture des fichiers des lois hydrauliques", 70);
if (bInterrompu_) return;
DParametresMascaret.ecritLoisHydrauliques(path + nomEtude, true, params.loisHydrauliques());
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DParametresMascaret.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DParametresMascaret.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DParametresMascaret.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -1292,16 +1292,19 @@
SParametresProfil profil,
String nomBief,
int indBief,
- int indProfil)
+ int indProfil,
+ boolean ecrireGeoReferencement)
throws IOException {
String nomProfil= profil.nom;
if (nomProfil == null)
nomProfil= "prof" + (indBief + 1) + "_" + (indProfil + 1);
else if (nomProfil.equals(""))
nomProfil= "prof" + (indBief + 1) + "_" + (indProfil + 1);
- fgeo.writeln("PROFIL " + nomBief + " " + nomProfil + " " + profil.absc);
- if (profil.avecGeoReferencement){
- System.err.println("avec georef");
+ if (profil.infoGeoReferencement!=null && !profil.infoGeoReferencement.equals(""))
+ fgeo.writeln("PROFIL " + nomBief + " " + nomProfil + " " + profil.absc+" "+profil.infoGeoReferencement);
+ else
+ fgeo.writeln("PROFIL " + nomBief + " " + nomProfil + " " + profil.absc);
+ if (ecrireGeoReferencement && profil.avecGeoReferencement){
for (int i= 0; i < profil.pts.length; i++) {
fgeo.writeln(
profil.pts[i].x + " " + profil.pts[i].y + " " + profil.pts[i].lit+ " " + profil.pts[i].cx+ " " + profil.pts[i].cy);
@@ -1318,7 +1321,8 @@
private final static void ecritParametresBief(
FortranWriter fgeo,
SParametresBief bief,
- int indBief)
+ int indBief,
+ boolean ecrireGeoReferencement)
throws IOException {
String nomBief= bief.nom;
if (nomBief == null)
@@ -1326,7 +1330,7 @@
else if (nomBief.equals(""))
nomBief= "bief" + (indBief + 1);
for (int i= 0; i < bief.profils.length; i++) {
- ecritParametresProfil(fgeo, bief.profils[i], nomBief, indBief, i);
+ ecritParametresProfil(fgeo, bief.profils[i], nomBief, indBief, i,ecrireGeoReferencement);
}
}
@@ -1464,7 +1468,8 @@
}
private static SParametresProfil mascaretEnteteProfil(String line) throws NoSuchElementException, NumberFormatException {
- StringTokenizer st=new StringTokenizer(line);
+ System.err.println("hjohkh");
+ StringTokenizer st=new StringTokenizer(line);
SParametresProfil res=null;
/* String motCle = */
st.nextToken();
@@ -1475,7 +1480,18 @@
res=new SParametresProfil();
res.nom=nomProfil;
res.absc=abscisse;
- return res;
+
+ String infoGeoRef ="";
+ try{
+ while (st.hasMoreTokens()){ //boucle de lecture
+ infoGeoRef = infoGeoRef + " " +st.nextToken();
+ }
+ }catch (NoSuchElementException e){
+ }finally{
+ //System.err.println(" infoGeoRef"+infoGeoRef);
+ res.infoGeoReferencement=infoGeoRef;
+ return res;
+ }
}
private static boolean mascaretPointProfil(String line, Vector ptsProfil) throws NoSuchElementException, NumberFormatException {
@@ -1495,7 +1511,6 @@
}catch(NoSuchElementException e){avecGeoReferencement=false;}
if (avecGeoReferencement){
- System.err.println("georef found "+ cx +" "+cy);
pt=new SParametresPt(x,y,cx,cy,lit);
}else{
pt=new SParametresPt(x,y,0,0,lit);
@@ -1511,12 +1526,13 @@
public final static void ecritParametresGEO(
File fichier,
- SParametresGEO params) {
+ SParametresGEO params,
+ boolean ecrireGeoReferencement) {
try {
FortranWriter fgeo= new FortranWriter(new FileWriter(fichier));
System.out.println("Creation du fichier " + fichier.getName());
for (int i= 0; i < params.biefs.length; i++) {
- ecritParametresBief(fgeo, params.biefs[i], i);
+ ecritParametresBief(fgeo, params.biefs[i], i,ecrireGeoReferencement);
}
fgeo.close();
} catch (Exception ex) {
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/MascaretClient.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/MascaretClient.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/MascaretClient.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -275,8 +275,8 @@
pts[1].y = 10;
pts[2].y = 10;
pts[3].y = 20;
- parametresGEO.biefs[0].profils[0] = new SParametresProfil("AMONT_BIEF", 0, pts,false);
- parametresGEO.biefs[0].profils[1] = new SParametresProfil("AVAL_BIEF", 18000, pts,false);
+ parametresGEO.biefs[0].profils[0] = new SParametresProfil("AMONT_BIEF", 0, pts,false,"");
+ parametresGEO.biefs[0].profils[1] = new SParametresProfil("AVAL_BIEF", 18000, pts,false,"");
return parametresGEO;
}
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dExport.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dExport.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dExport.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -8,12 +8,16 @@
*/
package org.fudaa.fudaa.hydraulique1d;
import java.io.File;
+import java.io.FileWriter;
import java.io.IOException;
import javax.swing.JFileChooser;
import javax.swing.filechooser.FileFilter;
import org.fudaa.ctulu.gui.CtuluFileChooser;
+import org.fudaa.dodico.corba.mascaret.SParametresBief;
+import org.fudaa.dodico.corba.mascaret.SParametresGEO;
+import org.fudaa.dodico.fortran.FortranWriter;
import org.fudaa.dodico.hydraulique1d.metier.MetierBief;
import org.fudaa.dodico.hydraulique1d.metier.MetierCasier;
import org.fudaa.dodico.hydraulique1d.metier.MetierEtude1d;
@@ -43,8 +47,11 @@
MetierBief[] biefs) {
DParametresMascaret.ecritParametresGEO(
filename,
- ConvH1D_Masc.convertirParametresGeo(biefs));
+ ConvH1D_Masc.convertirParametresGeo(biefs),true);
}
+
+
+
public static final void exportGeometrie_CASIER(
File filename,
MetierCasier[] casiers) {
@@ -57,6 +64,8 @@
ConvH1D_Masc.convertirParametresGeoCasiers(casiers));
}
}
+
+
public static final void exportReprise_MASCARET(
File filename,
MetierParametresReprise paramReprise) {
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dImport.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dImport.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dImport.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -1505,14 +1505,25 @@
res= bief.creeProfil();
res.nom(nomProfil);
res.abscisse(abscisse);
- return res;
+ String infoGeoRef ="";
+ try{
+ while (st.hasMoreTokens()){ //boucle de lecture
+ infoGeoRef = infoGeoRef + " " +st.nextToken();
+ }
+ }catch (NoSuchElementException e){
+ }finally{
+ //System.err.println(" infoGeoRef"+infoGeoRef);
+ res.infosGeoReferencement(infoGeoRef);
+ return res;
+ }
+
+
}
private static boolean mascaretPointProfil(
String logMsg,
String line,
Vector ptsProfil)
throws NoSuchElementException, NumberFormatException {
- System.err.println("in mascaretPointProfil");
MetierPoint2D pt2D;
boolean avecGeoReferencement = false;
@@ -1529,7 +1540,6 @@
}catch(NoSuchElementException e){avecGeoReferencement=false;}
if (avecGeoReferencement){
- System.err.println("georef found "+ cx +" "+cy);
pt2D=new MetierPoint2D(x,y,cx,cy);
}else{
pt2D=new MetierPoint2D(x,y);
@@ -1752,14 +1762,24 @@
res= new Hydraulique1dProfilModel();
res.nom(nomProfil);
res.setAbscisse(abscisse);
- return res;
+
+ String infoGeoRef ="";
+ try{
+ while (st.hasMoreTokens()){ //boucle de lecture
+ infoGeoRef = infoGeoRef + " " +st.nextToken();
+ }
+ }catch (NoSuchElementException e){
+ }finally{
+ //System.err.println(" infoGeoRef"+infoGeoRef);
+ res.infoGeoreferencement(infoGeoRef);
+ return res;
+ }
}
private static boolean mascaretPointProfil(
String logMsg,
String line,
ArrayList ptsProfil)
throws NoSuchElementException, NumberFormatException {
- System.err.println("in mascaretPointProfil");
MetierPoint2D pt2D;
boolean avecGeoReferencement = false;
@@ -1776,7 +1796,6 @@
}catch(NoSuchElementException e){avecGeoReferencement=false;}
if (avecGeoReferencement){
- System.err.println("georef found "+ cx +" "+cy);
pt2D=new MetierPoint2D(x,y,cx,cy);
}else{
pt2D=new MetierPoint2D(x,y);
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilModel.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilModel.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilModel.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -82,7 +82,7 @@
private HashSet hsellisteners_=new HashSet();
private boolean avecGeoreferencement_;
-
+ private String infoGeoreferencement_;
// constructeurs
public Hydraulique1dProfilModel() {
@@ -94,6 +94,7 @@
ptLitMajDr_ = null;
ptLitMajGa_ = null;
avecGeoreferencement_ = false;
+ infoGeoreferencement_="";
}
public Hydraulique1dProfilModel(MetierProfil iprofil) {
@@ -106,6 +107,7 @@
setIndiceLitMinDr(iprofil.indiceLitMinDr());
setIndiceLitMajDr(iprofil.indiceLitMajDr());
avecGeoreferencement_= iprofil.avecGeoreferencement();
+ infoGeoreferencement_=iprofil.infosGeoReferencement();
}
public Object clone() {
@@ -123,6 +125,7 @@
clone.setIndiceLitMinDr(getIndiceLitMinDr());
clone.setIndiceLitMajDr(getIndiceLitMajDr());
clone.avecGeoreferencement(avecGeoreferencement_);
+ clone.infoGeoreferencement(infoGeoreferencement_);
return clone;
}
@@ -131,6 +134,8 @@
if (o instanceof Hydraulique1dProfilModel) {
Hydraulique1dProfilModel p = (Hydraulique1dProfilModel)o;
if (abscisse_ != p.getAbscisse()) return false;
+ if (!avecGeoreferencement_==p.avecGeoreferencement()) return false;
+ if (!infoGeoreferencement_.equals(p.infoGeoreferencement())) return false;
if (getIndiceLitMajDr() != p.getIndiceLitMajDr()) return false;
if (getIndiceLitMajGa() != p.getIndiceLitMajGa()) return false;
if (getIndiceLitMinDr() != p.getIndiceLitMinDr()) return false;
@@ -141,6 +146,8 @@
else if (o instanceof MetierProfil) {
MetierProfil p = (MetierProfil)o;
if (abscisse_ != p.abscisse()) return false;
+ if (!avecGeoreferencement_==p.avecGeoreferencement()) return false;
+ if (!infoGeoreferencement_.equals(p.infosGeoReferencement())) return false;
if (getIndiceLitMajDr() != p.indiceLitMajDr()) return false;
if (getIndiceLitMajGa() != p.indiceLitMajGa()) return false;
if (getIndiceLitMinDr() != p.indiceLitMinDr()) return false;
@@ -191,6 +198,14 @@
avecGeoreferencement_= b;
}
+ public String infoGeoreferencement() {
+ return infoGeoreferencement_;
+ }
+
+ public void infoGeoreferencement(String s) {
+ infoGeoreferencement_ = s;
+ }
+
public String nom() {
return nom_;
}
@@ -753,7 +768,7 @@
for (int i = 0; i < length; i++) {
Hydraulique1dPoint p2 = (Hydraulique1dPoint)liste.get(i);
- if (! ( (p[i].x == p2.x()) && (p[i].y == p2.y()))) {
+ if (! ( (p[i].x == p2.x()) && (p[i].y == p2.y())&& (p[i].cx == p2.Cx()) && (p[i].cy == p2.Cy()))) {
return false;
}
}
@@ -773,7 +788,7 @@
for (int i = 0; i < length; i++) {
Hydraulique1dPoint p1 = (Hydraulique1dPoint)l1.get(i);
Hydraulique1dPoint p2 = (Hydraulique1dPoint)l2.get(i);
- if (! ( (p1.x() == p2.x()) && (p1.y() == p2.y()))) {
+ if (! ( (p1.x() == p2.x()) && (p1.y() == p2.y()) && (p1.Cx() == p2.Cx()) && (p1.Cy() == p2.Cy()))) {
return false;
}
}
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProjet.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProjet.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProjet.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -150,7 +150,16 @@
// Etude
entry=zf.getEntry("etude1d.xml");
- ietude1d_=ietude1d_.readFrom(zf.getInputStream(entry), false, MetierEtude1d.FORMAT_VERSION);
+
+ //On recupere la version de l'etude
+ byte[] b = new byte[1000];
+ zf.getInputStream(entry).read(b);
+ String DebutEtude = new String(b);
+ int indexVersion = DebutEtude.indexOf("<single type=\"String\">");
+ String versionEtude=DebutEtude.substring(indexVersion+22,indexVersion+25);
+
+ System.err.println("version de l'Etude lu "+versionEtude);
+ ietude1d_=ietude1d_.readFrom(zf.getInputStream(entry), false, versionEtude);
// R\xE9seau
entry=zf.getEntry("reseau.xml");
djaFrameReadFrom(zf.getInputStream(entry), FORMAT_DJA_VERSION);
@@ -341,15 +350,28 @@
System.out.println("Lecture du fichier XML contenant l'\xE9tude : " + fichierEtude.getName());
MetierEtude1d etd=null;
+ FileInputStream in;
// try{
// On teste en version 0.4
- FileInputStream in= new FileInputStream(fichierEtude);
+ in= new FileInputStream(fichierEtude);
etd=ietude1d_.readFrom(in, false,MetierEtude1d.FORMAT_VERSION_0_4);
in.close();
- // Si ca ne fonctionne pas, on teste en 0.5
+
+ // Si ca ne fonctionne pas, on teste les versions sup\xE9rieurs \xE0 0.5
if (etd==null) {
+
+ //On recupere la version de l'etude
+ in= new FileInputStream(fichierEtude);
+ byte[] b = new byte[1000];
+ in.read(b);
+ String DebutEtude = new String(b);
+ int indexVersion = DebutEtude.indexOf("<single type=\"String\">");
+ String versionEtude=DebutEtude.substring(indexVersion+22,indexVersion+25);
+
+
+ // On teste la version
in= new FileInputStream(fichierEtude);
- etd=ietude1d_.readFrom(in, false,MetierEtude1d.FORMAT_VERSION);
+ etd=ietude1d_.readFrom(in, false,versionEtude);
in.close();
}
ietude1d_=etd;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvH1D_Masc.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvH1D_Masc.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvH1D_Masc.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -2589,6 +2589,7 @@
geoMas.biefs[i].profils[j].nom =
biefs[i].profils()[j].nom().trim().replace(' ', '_');
geoMas.biefs[i].profils[j].avecGeoReferencement = biefs[i].profils()[j].avecGeoreferencement();
+ geoMas.biefs[i].profils[j].infoGeoReferencement = biefs[i].profils()[j].infosGeoReferencement();
geoMas.biefs[i].profils[j].pts =
new SParametresPt[biefs[i].profils()[j].points().length];
for (int k = 0; k < biefs[i].profils()[j].points().length; k++) {
@@ -2599,7 +2600,7 @@
biefs[i].profils()[j].points()[k].y;
geoMas.biefs[i].profils[j].pts[k].cx =
biefs[i].profils()[j].points()[k].cx;
- geoMas.biefs[i].profils[j].pts[k].cx =
+ geoMas.biefs[i].profils[j].pts[k].cy =
biefs[i].profils()[j].points()[k].cy;
if ( (biefs[i].profils()[j].indiceLitMinGa() <= k)
&& (k <= biefs[i].profils()[j].indiceLitMinDr())) {
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvMasc_H1D.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvMasc_H1D.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvMasc_H1D.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -438,6 +438,7 @@
biefs[i].profils()[j].abscisse(_params.biefs[i].profils[j].absc);
biefs[i].profils()[j].nom(_params.biefs[i].profils[j].nom);
biefs[i].profils()[j].avecGeoreferencement(_params.biefs[i].profils[j].avecGeoReferencement);
+ biefs[i].profils()[j].infosGeoReferencement(_params.biefs[i].profils[j].infoGeoReferencement);
biefs[i].profils()[j].points(new MetierPoint2D[_params.biefs[i].profils[j].pts.length]);
int indMinGa=_params.biefs[i].profils[j].pts.length;
int indMinDr=0;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dBiefEditor.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dBiefEditor.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dBiefEditor.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -130,7 +130,7 @@
modele_.setValeurs();
}
public boolean getValeurs() {
- return modele_.getValeurs();
+ return modele_.getValeurs();
}
/**
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierGeometriePanel.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierGeometriePanel.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierGeometriePanel.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -184,8 +184,11 @@
0));
}
protected void importer() {
- File fichier=
- Hydraulique1dImport.chooseFile("geo", "Fichier geom\xE9trie du casier");
+
+ String[] extensionGeometrie = {"casier","geo"};
+ String[] descriptionGeometrie = {"Fichier geom\xE9trie du casier","Fichier geom\xE9trie du casier"};
+ File fichier=Hydraulique1dImport.chooseFile(extensionGeometrie,descriptionGeometrie);
+
if (fichier != null) {
try {
MetierGeometrieCasier[] tabGeo=
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneProfilTableau.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneProfilTableau.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneProfilTableau.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -59,7 +59,23 @@
return super.chaine();
}
+
/**
+ * Retourne avecGeoReferencement.
+ * @return boolean
+ */
+ public boolean avecGeoReferencement() {
+ return profilModel_.avecGeoreferencement();
+ }
+
+ /**
+ * Retourne infoGeoreferencement.
+ * @return String
+ */
+ public String infoGeoreferencement() {
+ return profilModel_.infoGeoreferencement();
+ }
+ /**
* Initialise le premier \xE9lement de la ligne.
* @param chaine La nouvelle valeur enti\xE8re de la ligne (peut \xEAtre nulle).
*/
@@ -104,6 +120,7 @@
else if (obj instanceof MetierProfil) {
MetierProfil iprofil = (MetierProfil)obj;
if (iprofil.abscisse() != abscisse()) return false;
+ if (iprofil.avecGeoreferencement() != avecGeoReferencement()) return false;
if ((iprofil.nom() == null)&&(nom()!=null)) return false;
if ((iprofil.nom() != null)&&(nom()==null)) return false;
if (!iprofil.nom().equals(nom())) return false;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauProfilsModel.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauProfilsModel.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauProfilsModel.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -125,6 +125,7 @@
if (existeDifference) {
miseAJourModeleMetier(profilsTmp);
}
+
return existeDifference;
}
@@ -195,6 +196,8 @@
protected void initDProfil(Hydraulique1dLigneProfilTableau profilTab, MetierProfil iprofil) {
iprofil.abscisse(profilTab.abscisse());
iprofil.nom(profilTab.nom());
+ iprofil.avecGeoreferencement(profilTab.avecGeoReferencement());
+ iprofil.infosGeoReferencement(profilTab.infoGeoreferencement());
if (profilTab.profilModel() != null) {
iprofil.points(profilTab.profilModel().pointsNonNuls());
iprofil.indiceLitMajGa(profilTab.profilModel().getIndiceLitMajGa());
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -1273,8 +1273,10 @@
.activate();
return;
}
- File fichier=
- Hydraulique1dImport.chooseFile("geo", "Fichier geom\xE9trie des casiers");
+ String[] extensionGeometrie = {"casier","geo"};
+ String[] descriptionGeometrie = {"Fichier geom\xE9trie des casiers","Fichier geom\xE9trie des casiers"};
+ File fichier=Hydraulique1dImport.chooseFile(extensionGeometrie,descriptionGeometrie);
+
if (fichier != null) {
MetierGeometrieCasier[] tabGeo=
Hydraulique1dImport.geometrieCasier(fichier, false);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
