Menu
▾
▴
fudaa-cvs-commit
|
From: <jm_...@us...> - 2003-12-08 18:22:50
|
Update of /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/casier
In directory sc8-pr-cvs1:/tmp/cvs-serv30418/dodico/src/org/fudaa/dodico/hydraulique1d/casier
Modified Files:
DCaracteristiqueLiaison.java DOrificeLiaison.java
DSeuilLiaison.java
Log Message:
Mise à jour des nouvelles fonctionnalités Casier
YapodTestEnumereCorba : sérialise aussi
Debug léger
Index: DCaracteristiqueLiaison.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/casier/DCaracteristiqueLiaison.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DCaracteristiqueLiaison.java 2 Dec 2003 19:54:40 -0000 1.5
--- DCaracteristiqueLiaison.java 8 Dec 2003 18:22:47 -0000 1.6
***************
*** 26,29 ****
--- 26,30 ----
ICaracteristiqueLiaison q= (ICaracteristiqueLiaison)_o;
cote(q.cote());
+ id(q.id());
}
}
***************
*** 33,40 ****
public DCaracteristiqueLiaison() {
super();
! id_= Identifieur.IDENTIFIEUR.identificateurLibre(getClass().getName());
}
public void dispose() {
cote_= 0;
super.dispose();
}
--- 34,44 ----
public DCaracteristiqueLiaison() {
super();
! cote_=0;
! id_= Identifieur.IDENTIFIEUR.identificateurLibre(
! "org.fudaa.dodico.hydraulique1d.casier.DCaracteristiqueLiaison");
}
public void dispose() {
cote_= 0;
+ id_=0;
super.dispose();
}
***************
*** 48,51 ****
--- 52,63 ----
// attributs
protected int id_;
+ public int id() {
+ return id_;
+ }
+ public void id(int s) {
+ if (id_==s) return;
+ id_= s;
+ CDodico.findUsine().fireObjetModifie(toString(), tie(), "id");
+ }
protected double cote_;
public double cote() {
***************
*** 100,108 ****
throw new IllegalArgumentException("methode invalide : setSection()");
}
! public double getCoefEnnoiment() {
! throw new IllegalArgumentException("methode invalide : getCoefEnnoiment()");
}
! public void setCoefEnnoiment(double coefEnnoiment) {
! throw new IllegalArgumentException("methode invalide : setCoefEnnoiment()");
}
public double getRugosite() {
--- 112,120 ----
throw new IllegalArgumentException("methode invalide : setSection()");
}
! public double getCoefActivation() {
! throw new IllegalArgumentException("methode invalide : getCoefActivation()");
}
! public void setCoefActivation(double coefActivation) {
! throw new IllegalArgumentException("methode invalide : setCoefActivation()");
}
public double getRugosite() {
***************
*** 118,126 ****
throw new IllegalArgumentException("methode invalide : setCoefPerteCharge()");
}
! public double getCoteMin() {
! throw new IllegalArgumentException("methode invalide : getCoteMin()");
}
! public void setCoteMin(double coteMin) {
! throw new IllegalArgumentException("methode invalide : setCoteMin()");
}
public LSensDebitLiaison getSensDebit() {
--- 130,138 ----
throw new IllegalArgumentException("methode invalide : setCoefPerteCharge()");
}
! public double getCoefQOrifice() {
! throw new IllegalArgumentException("methode invalide : getCoefQOrifice()");
}
! public void setCoefQOrifice(double coteMin) {
! throw new IllegalArgumentException("methode invalide : setCoefQOrifice()");
}
public LSensDebitLiaison getSensDebit() {
Index: DOrificeLiaison.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/casier/DOrificeLiaison.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DOrificeLiaison.java 2 Dec 2003 19:54:40 -0000 1.3
--- DOrificeLiaison.java 8 Dec 2003 18:22:47 -0000 1.4
***************
*** 24,30 ****
if (_o instanceof IOrificeLiaison) {
IOrificeLiaison q= (IOrificeLiaison)_o;
! coefPerteCharge(q.coefPerteCharge());
! coefQ(q.coefQ());
! coteMin(q.coteMin());
largeur(q.largeur());
section(q.section());
--- 24,29 ----
if (_o instanceof IOrificeLiaison) {
IOrificeLiaison q= (IOrificeLiaison)_o;
! coefQSeuil(q.coefQSeuil());
! coefQOrifice(q.coefQOrifice());
largeur(q.largeur());
section(q.section());
***************
*** 38,41 ****
--- 37,46 ----
}
public String[] getInfos() {
+ String sensDebit = "les 2";
+ if (sensDebit_.value() == LSensDebitLiaison._FIN_VERS_ORIGINE) {
+ sensDebit = "Fin->Origine";
+ } else if (sensDebit_.value() == LSensDebitLiaison._ORIGINE_VERS_FIN) {
+ sensDebit = "Origine->Fin";
+ }
String[] res= new String[2];
res[0]= "Orifice";
***************
*** 44,53 ****
+ " larg. : "
+ largeur_
! + " coef. Q : "
! + coefQ_
! + " coef. Perte Charge : "
! + coefPerteCharge_
! + " cote min : "
! + coteMin_;
return res;
}
--- 49,58 ----
+ " larg. : "
+ largeur_
! + " coef. Q seuil : "
! + coefQSeuil_
! + " coef. Q orifice : "
! + coefQOrifice_
! + " sens Q : "
! + sensDebit;
return res;
}
***************
*** 57,64 ****
super();
largeur_= 1;
! coefQ_= 0.40;
section_= 1;
! coefPerteCharge_= 0.5;
! coteMin_= 1;
sensDebit_= LSensDebitLiaison.DEUX_SENS;
}
--- 62,68 ----
super();
largeur_= 1;
! coefQSeuil_= 0.40;
section_= 1;
! coefQOrifice_= 0.5;
sensDebit_= LSensDebitLiaison.DEUX_SENS;
}
***************
*** 66,73 ****
id_= 0;
largeur_= 0;
! coefQ_= 0;
section_= 0;
! coefPerteCharge_= 0;
! coteMin_= 0;
sensDebit_= null;
super.dispose();
--- 70,76 ----
id_= 0;
largeur_= 0;
! coefQSeuil_= 0;
section_= 0;
! coefQOrifice_= 0;
sensDebit_= null;
super.dispose();
***************
*** 84,95 ****
CDodico.findUsine().fireObjetModifie(toString(), tie(), "largeur");
}
! private double coefQ_;
! public double coefQ() {
! return coefQ_;
}
! public void coefQ(double s) {
! if (coefQ_==s) return;
! coefQ_= s;
! CDodico.findUsine().fireObjetModifie(toString(), tie(), "coefQ");
}
private double section_;
--- 87,98 ----
CDodico.findUsine().fireObjetModifie(toString(), tie(), "largeur");
}
! private double coefQSeuil_;
! public double coefQSeuil() {
! return coefQSeuil_;
}
! public void coefQSeuil(double s) {
! if (coefQSeuil_==s) return;
! coefQSeuil_= s;
! CDodico.findUsine().fireObjetModifie(toString(), tie(), "coefQSeuil");
}
private double section_;
***************
*** 102,122 ****
CDodico.findUsine().fireObjetModifie(toString(), tie(), "section");
}
! private double coefPerteCharge_;
! public double coefPerteCharge() {
! return coefPerteCharge_;
! }
! public void coefPerteCharge(double s) {
! if (coefPerteCharge_==s) return;
! coefPerteCharge_= s;
! CDodico.findUsine().fireObjetModifie(toString(), tie(), "coefPerteCharge");
! }
! private double coteMin_;
! public double coteMin() {
! return coteMin_;
}
! public void coteMin(double s) {
! if (coteMin_==s) return;
! coteMin_= s;
! CDodico.findUsine().fireObjetModifie(toString(), tie(), "coteMin");
}
private LSensDebitLiaison sensDebit_;
--- 105,116 ----
CDodico.findUsine().fireObjetModifie(toString(), tie(), "section");
}
! private double coefQOrifice_;
! public double coefQOrifice() {
! return coefQOrifice_;
}
! public void coefQOrifice(double s) {
! if (coefQOrifice_==s) return;
! coefQOrifice_= s;
! CDodico.findUsine().fireObjetModifie(toString(), tie(), "coefQOrifice");
}
private LSensDebitLiaison sensDebit_;
***************
*** 125,130 ****
}
public void sensDebit(LSensDebitLiaison s) {
! if (sensDebit_.value()==s.value()) return;
sensDebit_= s;
CDodico.findUsine().fireObjetModifie(toString(), tie(), "sensDebit");
}
--- 119,130 ----
}
public void sensDebit(LSensDebitLiaison s) {
! System.out.println("DOrificeLiaison sensDebit(LSensDebitLiaison s)");
! System.out.println("s.value()="+s.value());
! System.out.println("sensDebit_.value()="+sensDebit_.value());
! System.out.println("(sensDebit_==s) ="+(sensDebit_==s));
! if (sensDebit_==s) return;
! System.out.println("Affectation sensDebit_= s;");
sensDebit_= s;
+ System.out.println("CDodico.findUsine().fireObjetModifie");
CDodico.findUsine().fireObjetModifie(toString(), tie(), "sensDebit");
}
***************
*** 140,147 ****
}
public double getCoefQ() {
! return coefQ();
}
public void setCoefQ(double coefQ) {
! coefQ(coefQ);
}
public double getSection() {
--- 140,147 ----
}
public double getCoefQ() {
! return coefQSeuil();
}
public void setCoefQ(double coefQ) {
! coefQSeuil(coefQ);
}
public double getSection() {
***************
*** 151,165 ****
section(section);
}
! public double getCoefPerteCharge() {
! return coefPerteCharge();
! }
! public void setCoefPerteCharge(double coefPerteCharge) {
! coefPerteCharge(coefPerteCharge);
! }
! public double getCoteMin() {
! return coteMin();
}
! public void setCoteMin(double coteMin) {
! coteMin(coteMin);
}
public LSensDebitLiaison getSensDebit() {
--- 151,159 ----
section(section);
}
! public double getCoefQOrifice() {
! return coefQOrifice();
}
! public void setCoefQOrifice(double coefQOrifice) {
! coefQOrifice(coefQOrifice);
}
public LSensDebitLiaison getSensDebit() {
Index: DSeuilLiaison.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/casier/DSeuilLiaison.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DSeuilLiaison.java 2 Dec 2003 19:54:40 -0000 1.4
--- DSeuilLiaison.java 8 Dec 2003 18:22:47 -0000 1.5
***************
*** 25,29 ****
largeur(q.largeur());
coefQ(q.coefQ());
! coefEnnoiment(q.coefEnnoiment());
}
}
--- 25,29 ----
largeur(q.largeur());
coefQ(q.coefQ());
! coefActivation(q.coefActivation());
}
}
***************
*** 43,47 ****
+ coefQ_
+ " coef. Ennoiment : "
! + coefEnnoiment_;
return res;
}
--- 43,47 ----
+ coefQ_
+ " coef. Ennoiment : "
! + coefActivation_;
return res;
}
***************
*** 52,56 ****
largeur_= 1;
coefQ_= 0.40;
! coefEnnoiment_= 0.50;
}
public void dispose() {
--- 52,56 ----
largeur_= 1;
coefQ_= 0.40;
! coefActivation_= 0.50;
}
public void dispose() {
***************
*** 58,62 ****
largeur_= 0;
coefQ_= 0;
! coefEnnoiment_= 0;
super.dispose();
}
--- 58,62 ----
largeur_= 0;
coefQ_= 0;
! coefActivation_= 0;
super.dispose();
}
***************
*** 81,92 ****
CDodico.findUsine().fireObjetModifie(toString(), tie(), "coefQ");
}
! private double coefEnnoiment_;
! public double coefEnnoiment() {
! return coefEnnoiment_;
}
! public void coefEnnoiment(double s) {
! if (coefEnnoiment_==s) return;
! coefEnnoiment_= s;
! CDodico.findUsine().fireObjetModifie(toString(), tie(), "coefEnnoiment");
}
// méthodes
--- 81,92 ----
CDodico.findUsine().fireObjetModifie(toString(), tie(), "coefQ");
}
! private double coefActivation_;
! public double coefActivation() {
! return coefActivation_;
}
! public void coefActivation(double s) {
! if (coefActivation_==s) return;
! coefActivation_= s;
! CDodico.findUsine().fireObjetModifie(toString(), tie(), "coefActivation");
}
// méthodes
***************
*** 106,114 ****
coefQ(coefQ);
}
! public double getCoefEnnoiment() {
! return coefEnnoiment();
}
! public void setCoefEnnoiment(double coefEnnoiment) {
! coefEnnoiment(coefEnnoiment);
}
}
--- 106,114 ----
coefQ(coefQ);
}
! public double getCoefActivation() {
! return coefActivation();
}
! public void setCoefActivation(double coefActivation) {
! coefActivation(coefActivation);
}
}
|
Thanks for helping keep SourceForge clean.
X