Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[3745] trunk/fudaa_devel
|
From: <opa...@us...> - 2008-08-08 20:01:48
|
Revision: 3745
http://fudaa.svn.sourceforge.net/fudaa/?rev=3745&view=rev
Author: opasteur
Date: 2008-08-08 20:01:53 +0000 (Fri, 08 Aug 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierBief.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierReseau.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierZonePlanimetrage.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DParametresMascaret.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dImport.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dPlanimetrageEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementModel.java
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierBief.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierBief.java 2008-08-08 16:25:05 UTC (rev 3744)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierBief.java 2008-08-08 20:01:53 UTC (rev 3745)
@@ -757,24 +757,28 @@
return false;
}
public int getNbPasPlanimetrage() {
- int nbPas= 0;
- org.omg.CORBA.DoubleHolder coteMin= new org.omg.CORBA.DoubleHolder();
- org.omg.CORBA.DoubleHolder coteMax= new org.omg.CORBA.DoubleHolder();
- for (int i= 0; i < zonesPlanimetrage_.length; i++) {
- double pas= zonesPlanimetrage_[i].taillePas();
- int indDebut=
- getIndiceProfilAbscisse(zonesPlanimetrage_[i].abscisseDebut());
- int indFin= getIndiceProfilAbscisse(zonesPlanimetrage_[i].abscisseFin());
- if (indDebut < 0) indDebut = -indDebut;
- if (indFin < 0) indFin = -indFin;
- for (int j= indDebut; j <= indFin; j++) {
- profils_[j].coteMinMax(coteMin, coteMax);
- double h= coteMax.value - coteMin.value;
- nbPas= Math.max((int) (h / pas) + 1, nbPas);
- }
- }
- return nbPas;
+ return getNbPasPlanimetrage(zonesPlanimetrage_);
}
+
+ public int getNbPasPlanimetrage(MetierZonePlanimetrage[] zonesPlanimetrage) {
+ int nbPas= 0;
+ org.omg.CORBA.DoubleHolder coteMin= new org.omg.CORBA.DoubleHolder();
+ org.omg.CORBA.DoubleHolder coteMax= new org.omg.CORBA.DoubleHolder();
+ for (int i= 0; i < zonesPlanimetrage.length; i++) {
+ double pas= zonesPlanimetrage[i].taillePas();
+ int indDebut=
+ getIndiceProfilAbscisse(zonesPlanimetrage[i].abscisseDebut());
+ int indFin= getIndiceProfilAbscisse(zonesPlanimetrage[i].abscisseFin());
+ if (indDebut < 0) indDebut = -indDebut;
+ if (indFin < 0) indFin = -indFin;
+ for (int j= indDebut; j <= indFin; j++) {
+ profils_[j].coteMinMax(coteMin, coteMax);
+ double h= coteMax.value - coteMin.value;
+ nbPas= Math.max((int) (h / pas) + 1, nbPas);
+ }
+ }
+ return nbPas;
+ }
public double interpoleFond(double abscisse) {
double res= Double.POSITIVE_INFINITY;
MetierProfil p1= null;
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierReseau.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierReseau.java 2008-08-08 16:25:05 UTC (rev 3744)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierReseau.java 2008-08-08 20:01:53 UTC (rev 3745)
@@ -1053,6 +1053,13 @@
}
return Math.min(nbPas, 250);
}
+ public int getNbPasPlanimetrage(MetierZonePlanimetrage[] zonesPlanimetrage) {
+ int nbPas= 0;
+ for (int i= 0; i < biefs_.length; i++) {
+ nbPas= Math.max(nbPas, biefs_[i].getNbPasPlanimetrage(zonesPlanimetrage));
+ }
+ return Math.min(nbPas, 250);
+ }
public MetierSingularite[] getSingularitesHorsBief() {
MetierSingularite[] sings= singularites();
Vector resV= new Vector();
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierZonePlanimetrage.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierZonePlanimetrage.java 2008-08-08 16:25:05 UTC (rev 3744)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierZonePlanimetrage.java 2008-08-08 20:01:53 UTC (rev 3745)
@@ -52,4 +52,8 @@
taillePas_= t;
Notifieur.getNotifieur().fireObjetModifie(toString(), this, "taillePas");
}
+
+ /*public String toString(){
+ return "MetierZonePlanimetrage bief="+this.biefRattache().numero()+" abs debut "+this.abscisseDebut()+" abs fin "+this.abscisseFin()+" taille pas "+this.taillePas();
+ }*/
}
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 16:25:05 UTC (rev 3744)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DParametresMascaret.java 2008-08-08 20:01:53 UTC (rev 3745)
@@ -1504,11 +1504,13 @@
String lit= st.nextToken();
double cx = 0;
double cy = 0;
- try{
- cx = Double.parseDouble(st.nextToken());
- cy = Double.parseDouble(st.nextToken());
- avecGeoReferencement=true;
- }catch(NoSuchElementException e){avecGeoReferencement=false;}
+ if (st.hasMoreTokens()){
+ try{
+ cx = Double.parseDouble(st.nextToken());
+ cy = Double.parseDouble(st.nextToken());
+ avecGeoReferencement=true;
+ }catch(NoSuchElementException e){avecGeoReferencement=false;}
+ }
if (avecGeoReferencement){
pt=new SParametresPt(x,y,cx,cy,lit);
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 16:25:05 UTC (rev 3744)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dImport.java 2008-08-08 20:01:53 UTC (rev 3745)
@@ -1533,12 +1533,13 @@
String lit= st.nextToken();
double cx = 0;
double cy = 0;
- try{
- cx = Double.parseDouble(st.nextToken());
- cy = Double.parseDouble(st.nextToken());
- avecGeoReferencement=true;
- }catch(NoSuchElementException e){avecGeoReferencement=false;}
-
+ if (st.hasMoreTokens()){
+ try{
+ cx = Double.parseDouble(st.nextToken());
+ cy = Double.parseDouble(st.nextToken());
+ avecGeoReferencement=true;
+ }catch(NoSuchElementException e){avecGeoReferencement=false;}
+ }
if (avecGeoReferencement){
pt2D=new MetierPoint2D(x,y,cx,cy);
}else{
@@ -1789,12 +1790,13 @@
String lit= st.nextToken();
double cx = 0;
double cy = 0;
- try{
- cx = Double.parseDouble(st.nextToken());
- cy = Double.parseDouble(st.nextToken());
- avecGeoReferencement=true;
- }catch(NoSuchElementException e){avecGeoReferencement=false;}
-
+ if (st.hasMoreTokens()){
+ try{
+ cx = Double.parseDouble(st.nextToken());
+ cy = Double.parseDouble(st.nextToken());
+ avecGeoReferencement=true;
+ }catch(NoSuchElementException e){avecGeoReferencement=false;}
+ }
if (avecGeoReferencement){
pt2D=new MetierPoint2D(x,y,cx,cy);
}else{
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dPlanimetrageEditor.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dPlanimetrageEditor.java 2008-08-08 16:25:05 UTC (rev 3744)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dPlanimetrageEditor.java 2008-08-08 20:01:53 UTC (rev 3745)
@@ -9,6 +9,9 @@
package org.fudaa.fudaa.hydraulique1d.editor;
import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
import org.fudaa.dodico.hydraulique1d.metier.MetierReseau;
+import org.fudaa.dodico.hydraulique1d.metier.MetierZonePlanimetrage;
+import org.fudaa.fudaa.hydraulique1d.tableau.Hydraulique1dLigneReelTableau;
+import org.fudaa.fudaa.hydraulique1d.tableau.Hydraulique1dLigneZoneTableau;
import org.fudaa.fudaa.hydraulique1d.tableau.Hydraulique1dTableauZoneTailleModel;
import com.memoire.bu.BuTextField;
@@ -17,7 +20,10 @@
import com.memoire.bu.BuHorizontalLayout;
import com.memoire.bu.BuPanel;
import com.memoire.bu.BuCheckBox;
+
import java.awt.event.*;
+import java.util.Iterator;
+import java.util.List;
/**
* Editeur des zones de planim\xE9trages (MetierZonePlanimetrage).<br>
* Appeler si l'utilisateur clic sur le menu "Mascaret/Planim\xE9trage".<br>
@@ -95,7 +101,32 @@
}
private void estimationPasPlanim() {
- tfNbPasPlanim_.setValue(new Integer(reseau_.getNbPasPlanimetrage()));
+ List lstPoints = modele_.getListePtsComplets();
+
+ //ON doit construire metierZonePlanimetrages car celui de l'objet m\xE9tier n'est pas \xE0 jour
+ MetierZonePlanimetrage[] metierZonePlanimetrages = new MetierZonePlanimetrage[lstPoints.size()];
+ int i = 0;
+ for (Iterator iter = lstPoints.iterator(); iter.hasNext();) {
+
+ Hydraulique1dLigneZoneTableau element = (Hydraulique1dLigneZoneTableau) iter.next();
+ metierZonePlanimetrages[i]=new MetierZonePlanimetrage();
+ metierZonePlanimetrages[i].biefRattache(reseau_.getBiefNumero(element.iBief()));
+ metierZonePlanimetrages[i].abscisseDebut(element.abscDebut());
+ metierZonePlanimetrages[i].abscisseFin(element.abscFin());
+ metierZonePlanimetrages[i].taillePas(element.getValue(2).doubleValue());
+
+
+ System.err.println(reseau_.getBiefNumero(element.iBief()));
+ System.err.println(element.abscDebut());
+ System.err.println(element.abscFin());
+ System.err.println(element.getValue(2).doubleValue());
+
+ i++;
+ }
+ System.err.println();
+ int res = reseau_.getNbPasPlanimetrage(metierZonePlanimetrages);
+ tfNbPasPlanim_.setValue(new Integer(res));
+ System.err.println("plani"+res);
}
private void enableTxtFieldButton() {
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementModel.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementModel.java 2008-08-08 16:25:05 UTC (rev 3744)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementModel.java 2008-08-08 20:01:53 UTC (rev 3745)
@@ -117,7 +117,6 @@
*/
public boolean getValeurs() {
trier();
-
List listeTmp = getListeLignesCorrectes();
MetierZoneFrottement[] tabMetier = null;
boolean existeDifference = false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
