Menu
▾
▴
[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion LidoPH_Apport.java,1.5,1.6 LidoPH_Base.java,1.5,1.6 LidoPH_Bief.java,1.6,1.7 LidoPH_Calcul.java,1.5,1.6 LidoPH_Laisse.java,1.5,1.6 LidoPH_Limite.java,1.5,1.6 LidoPH_Loiclm.java,1.6,1.7 LidoPH_Loisng.java,1.5,1.6 LidoPH_Noeud.java,1.5,1.6 LidoPH_PermSection2.java,1.5,1.6 LidoPH_PermSection3.java,1.5,1.6 LidoPH_Perte.java,1.5,1.6 LidoPH_Profil.java,1.5,1.6 LidoPH_Singularite.java,1.6,1.7 LidoParamsHelper.java,1.5,1.6
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion
In directory sc8-pr-cvs1:/tmp/cvs-serv14621a/ihmhelper/gestion
Modified Files:
LidoPH_Apport.java LidoPH_Base.java LidoPH_Bief.java
LidoPH_Calcul.java LidoPH_Laisse.java LidoPH_Limite.java
LidoPH_Loiclm.java LidoPH_Loisng.java LidoPH_Noeud.java
LidoPH_PermSection2.java LidoPH_PermSection3.java
LidoPH_Perte.java LidoPH_Profil.java LidoPH_Singularite.java
LidoParamsHelper.java
Log Message:
VERSION 1.4
Index: LidoPH_Apport.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_Apport.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LidoPH_Apport.java 1 Apr 2003 16:13:17 -0000 1.5
--- LidoPH_Apport.java 4 Jul 2003 15:46:50 -0000 1.6
***************
*** 11,14 ****
--- 11,15 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.fudaa.lido.*;
Index: LidoPH_Base.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_Base.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LidoPH_Base.java 1 Apr 2003 16:13:16 -0000 1.5
--- LidoPH_Base.java 4 Jul 2003 15:46:50 -0000 1.6
***************
*** 11,14 ****
--- 11,15 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.fudaa.lido.*;
import java.util.*;
Index: LidoPH_Bief.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_Bief.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LidoPH_Bief.java 1 Apr 2003 16:13:03 -0000 1.6
--- LidoPH_Bief.java 4 Jul 2003 15:46:50 -0000 1.7
***************
*** 11,14 ****
--- 11,15 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.fudaa.lido.*;
Index: LidoPH_Calcul.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_Calcul.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LidoPH_Calcul.java 1 Apr 2003 16:13:11 -0000 1.5
--- LidoPH_Calcul.java 4 Jul 2003 15:46:50 -0000 1.6
***************
*** 11,14 ****
--- 11,15 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.fudaa.lido.*;
Index: LidoPH_Laisse.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_Laisse.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LidoPH_Laisse.java 1 Apr 2003 16:13:13 -0000 1.5
--- LidoPH_Laisse.java 4 Jul 2003 15:46:50 -0000 1.6
***************
*** 11,14 ****
--- 11,15 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.fudaa.lido.*;
Index: LidoPH_Limite.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_Limite.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LidoPH_Limite.java 1 Apr 2003 16:13:05 -0000 1.5
--- LidoPH_Limite.java 4 Jul 2003 15:46:50 -0000 1.6
***************
*** 11,14 ****
--- 11,15 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.fudaa.lido.*;
Index: LidoPH_Loiclm.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_Loiclm.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LidoPH_Loiclm.java 1 Apr 2003 16:13:15 -0000 1.6
--- LidoPH_Loiclm.java 4 Jul 2003 15:46:50 -0000 1.7
***************
*** 17,22 ****
import org.fudaa.dodico.corba.lido.SParametresCondLimBlocCLM;
import org.fudaa.dodico.corba.lido.SParametresCondLimPointLigneCLM;
! import org.fudaa.fudaa.commun.FudaaParamEvent;
! import org.fudaa.fudaa.commun.FudaaProjet;
import org.fudaa.fudaa.lido.LidoResource;
--- 17,22 ----
import org.fudaa.dodico.corba.lido.SParametresCondLimBlocCLM;
import org.fudaa.dodico.corba.lido.SParametresCondLimPointLigneCLM;
! import org.fudaa.fudaa.commun.projet.FudaaParamEvent;
! import org.fudaa.fudaa.commun.projet.FudaaProjet;
import org.fudaa.fudaa.lido.LidoResource;
Index: LidoPH_Loisng.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_Loisng.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LidoPH_Loisng.java 1 Apr 2003 16:13:13 -0000 1.5
--- LidoPH_Loisng.java 4 Jul 2003 15:46:50 -0000 1.6
***************
*** 11,14 ****
--- 11,15 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.fudaa.lido.*;
Index: LidoPH_Noeud.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_Noeud.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LidoPH_Noeud.java 1 Apr 2003 16:13:17 -0000 1.5
--- LidoPH_Noeud.java 4 Jul 2003 15:46:50 -0000 1.6
***************
*** 11,14 ****
--- 11,15 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.fudaa.lido.*;
Index: LidoPH_PermSection2.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_PermSection2.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LidoPH_PermSection2.java 1 Apr 2003 16:12:59 -0000 1.5
--- LidoPH_PermSection2.java 4 Jul 2003 15:46:50 -0000 1.6
***************
*** 11,14 ****
--- 11,15 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.fudaa.lido.*;
Index: LidoPH_PermSection3.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_PermSection3.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LidoPH_PermSection3.java 1 Apr 2003 16:13:06 -0000 1.5
--- LidoPH_PermSection3.java 4 Jul 2003 15:46:50 -0000 1.6
***************
*** 11,14 ****
--- 11,15 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.fudaa.lido.*;
Index: LidoPH_Perte.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_Perte.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LidoPH_Perte.java 1 Apr 2003 16:13:09 -0000 1.5
--- LidoPH_Perte.java 4 Jul 2003 15:46:50 -0000 1.6
***************
*** 11,14 ****
--- 11,15 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.fudaa.lido.*;
Index: LidoPH_Profil.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_Profil.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LidoPH_Profil.java 1 Apr 2003 16:13:13 -0000 1.5
--- LidoPH_Profil.java 4 Jul 2003 15:46:50 -0000 1.6
***************
*** 11,14 ****
--- 11,15 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.fudaa.lido.*;
Index: LidoPH_Singularite.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_Singularite.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LidoPH_Singularite.java 1 Apr 2003 16:13:10 -0000 1.6
--- LidoPH_Singularite.java 4 Jul 2003 15:46:50 -0000 1.7
***************
*** 11,14 ****
--- 11,15 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.fudaa.lido.*;
Index: LidoParamsHelper.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoParamsHelper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LidoParamsHelper.java 1 Apr 2003 16:13:00 -0000 1.5
--- LidoParamsHelper.java 4 Jul 2003 15:46:50 -0000 1.6
***************
*** 10,18 ****
package org.fudaa.fudaa.lido.ihmhelper.gestion;
import com.memoire.bu.BuInformationsDocument;
! import org.fudaa.fudaa.commun.*;
! import org.fudaa.fudaa.lido.*;
! import org.fudaa.dodico.corba.lido.*;
! import java.util.*;
/**
--- 10,62 ----
[...1206 lines suppressed...]
! old = null;
}
+ else
+ // hydros
+ if ((clm.condLimites[i].typLoi == LidoResource.LIMITE.HYDRO))
+ {
+ SParametresCondLimPointLigneCLM[] old = clm.condLimites[i].point;
+ clm.condLimites[i].point = new SParametresCondLimPointLigneCLM[2];
+
+ clm.condLimites[i].point[0] = new SParametresCondLimPointLigneCLM();
+ clm.condLimites[i].point[0].tLim = 1.;
+ clm.condLimites[i].point[0].qLim = old[1].qLim;
+ clm.condLimites[i].point[1] = new SParametresCondLimPointLigneCLM();
+ clm.condLimites[i].point[1].tLim = 2.;
+ clm.condLimites[i].point[1].qLim = old[1].qLim;
+ clm.condLimites[i].nbPoints = 2;
+ old = null;
+ }
}
}
|
