Menu
▾
▴
fudaa-cvs-commit — Mailing list for CVS commit messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(89) |
Mar
(219) |
Apr
(82) |
May
(33) |
Jun
(11) |
Jul
(129) |
Aug
(357) |
Sep
(34) |
Oct
(37) |
Nov
(42) |
Dec
(182) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(59) |
Feb
(74) |
Mar
(196) |
Apr
(205) |
May
(109) |
Jun
(268) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <de...@us...> - 2003-12-11 12:50:59
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/vag
In directory sc8-pr-cvs1:/tmp/cvs-serv25368/vag
Modified Files:
VagCalqueOrthogonalesInteraction.java
Log Message:
Modification du prepro tr.
Ajout tail follow
Modifation ebli/graphe/courbe
Index: VagCalqueOrthogonalesInteraction.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/vag/VagCalqueOrthogonalesInteraction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** VagCalqueOrthogonalesInteraction.java 25 Nov 2003 10:14:33 -0000 1.5
--- VagCalqueOrthogonalesInteraction.java 11 Dec 2003 12:50:56 -0000 1.6
***************
*** 310,314 ****
ay.pas= Math.round(ay.pas);
graphe.ajoute(ay);
! Courbe c= new Courbe();
c.titre= crbTitre;
//c.type="aire";
--- 310,314 ----
ay.pas= Math.round(ay.pas);
graphe.ajoute(ay);
! CourbeDefault c= new CourbeDefault();
c.titre= crbTitre;
//c.type="aire";
|
|
From: <de...@us...> - 2003-12-11 12:50:58
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac
In directory sc8-pr-cvs1:/tmp/cvs-serv25368/taucomac
Modified Files:
TaucomacGraphe.java
Log Message:
Modification du prepro tr.
Ajout tail follow
Modifation ebli/graphe/courbe
Index: TaucomacGraphe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacGraphe.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TaucomacGraphe.java 25 Nov 2003 10:14:27 -0000 1.6
--- TaucomacGraphe.java 11 Dec 2003 12:50:55 -0000 1.7
***************
*** 127,133 ****
//================
public void traceGraphe() {
! Courbe courbe_;
for (int ic= 0; ic < nc; ic++) {
! courbe_= new Courbe();
Aspect asp= new Aspect();
asp.contour= aspcont[ic];
--- 127,133 ----
//================
public void traceGraphe() {
! CourbeDefault courbe_;
for (int ic= 0; ic < nc; ic++) {
! courbe_= new CourbeDefault();
Aspect asp= new Aspect();
asp.contour= aspcont[ic];
***************
*** 155,159 ****
}
for (int ic= 0; ic < nlib; ic++) {
! courbe_= new Courbe();
Aspect asp= new Aspect();
asp.contour= asplib[ic];
--- 155,159 ----
}
for (int ic= 0; ic < nlib; ic++) {
! courbe_= new CourbeDefault();
Aspect asp= new Aspect();
asp.contour= asplib[ic];
|
|
From: <de...@us...> - 2003-12-11 12:50:58
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/test/tr In directory sc8-pr-cvs1:/tmp/cvs-serv25368/test/tr Added Files: TestExec.java TestExecLinux.java Log Message: Modification du prepro tr. Ajout tail follow Modifation ebli/graphe/courbe --- NEW FILE: TestExec.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: TestExecLinux.java --- (This appears to be a binary file; contents omitted.) |
|
From: <de...@us...> - 2003-12-11 12:50:58
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/seuil
In directory sc8-pr-cvs1:/tmp/cvs-serv25368/seuil
Modified Files:
SeuilGraphe.java SeuilGrapheGeom.java
Log Message:
Modification du prepro tr.
Ajout tail follow
Modifation ebli/graphe/courbe
Index: SeuilGraphe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/seuil/SeuilGraphe.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SeuilGraphe.java 25 Nov 2003 10:14:18 -0000 1.6
--- SeuilGraphe.java 11 Dec 2003 12:50:55 -0000 1.7
***************
*** 110,116 ****
} // fin constructeur
public void traceGraphe() {
! Courbe courbe_;
for (int ic= 0; ic < nc; ic++) {
! courbe_= new Courbe();
Aspect asp= new Aspect();
asp.contour= aspcont[ic];
--- 110,116 ----
} // fin constructeur
public void traceGraphe() {
! CourbeDefault courbe_;
for (int ic= 0; ic < nc; ic++) {
! courbe_= new CourbeDefault();
Aspect asp= new Aspect();
asp.contour= aspcont[ic];
***************
*** 135,139 ****
}
for (int ic= 0; ic < nlib; ic++) {
! courbe_= new Courbe();
Aspect asp= new Aspect();
asp.contour= asplib[ic];
--- 135,139 ----
}
for (int ic= 0; ic < nlib; ic++) {
! courbe_= new CourbeDefault();
Aspect asp= new Aspect();
asp.contour= asplib[ic];
Index: SeuilGrapheGeom.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/seuil/SeuilGrapheGeom.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SeuilGrapheGeom.java 25 Nov 2003 10:14:18 -0000 1.5
--- SeuilGrapheGeom.java 11 Dec 2003 12:50:55 -0000 1.6
***************
*** 30,34 ****
private Graphe graphe_;
private Axe axeX;
! private Courbe courbe_;
private Color[] col=
{ Color.black, Color.blue, Color.green, Color.orange, Color.pink };
--- 30,34 ----
private Graphe graphe_;
private Axe axeX;
! private CourbeDefault courbe_;
private Color[] col=
{ Color.black, Color.blue, Color.green, Color.orange, Color.pink };
***************
*** 127,131 ****
double[] vals= new double[valeurs_.length];
Axe axe= new Axe();
! courbe_= new Courbe();
/*
if(u < 3)
--- 127,131 ----
double[] vals= new double[valeurs_.length];
Axe axe= new Axe();
! courbe_= new CourbeDefault();
/*
if(u < 3)
|
|
From: <de...@us...> - 2003-12-11 12:50:58
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi
In directory sc8-pr-cvs1:/tmp/cvs-serv25368/sinavi
Modified Files:
SinaviGraphiqueResultat.java
Log Message:
Modification du prepro tr.
Ajout tail follow
Modifation ebli/graphe/courbe
Index: SinaviGraphiqueResultat.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviGraphiqueResultat.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SinaviGraphiqueResultat.java 25 Nov 2003 10:14:21 -0000 1.5
--- SinaviGraphiqueResultat.java 11 Dec 2003 12:50:55 -0000 1.6
***************
*** 61,65 ****
graphe_.marges.droite= 10 + 7 * _titre.length();
graphe_.marges.gauche= 20;
! Courbe courbe= new Courbe();
courbe.titre= _titre;
courbe.type= "histogramme";
--- 61,65 ----
graphe_.marges.droite= 10 + 7 * _titre.length();
graphe_.marges.gauche= 20;
! CourbeDefault courbe= new CourbeDefault();
courbe.titre= _titre;
courbe.type= "histogramme";
***************
*** 126,130 ****
graphe_.marges.gauche= 20;
axe_des_x_.maximum= _valeursX.length;
! Courbe courbe= new Courbe();
courbe.titre= _titre;
courbe.type= "courbe";
--- 126,130 ----
graphe_.marges.gauche= 20;
axe_des_x_.maximum= _valeursX.length;
! CourbeDefault courbe= new CourbeDefault();
courbe.titre= _titre;
courbe.type= "courbe";
|
|
From: <de...@us...> - 2003-12-11 12:50:58
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/refonde
In directory sc8-pr-cvs1:/tmp/cvs-serv25368/refonde
Modified Files:
RefondeMiseEnPage.java
Log Message:
Modification du prepro tr.
Ajout tail follow
Modifation ebli/graphe/courbe
Index: RefondeMiseEnPage.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/refonde/RefondeMiseEnPage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RefondeMiseEnPage.java 25 Nov 2003 10:14:16 -0000 1.4
--- RefondeMiseEnPage.java 11 Dec 2003 12:50:54 -0000 1.5
***************
*** 745,749 ****
private String getTexteValeur(Element _el) throws SAXException {
NodeList nls= _el.getChildNodes();
! for (int i= 0; i < nls.getLength(); i++) {
if (nls.item(i) instanceof Text)
return ((Text)nls.item(i)).getNodeValue();
--- 745,749 ----
private String getTexteValeur(Element _el) throws SAXException {
NodeList nls= _el.getChildNodes();
! for (int i= 0; i < nls.getTimeLength(); i++) {
if (nls.item(i) instanceof Text)
return ((Text)nls.item(i)).getNodeValue();
***************
*** 760,764 ****
private int getIntValeur(Element _el) throws SAXException {
NodeList nls= _el.getChildNodes();
! for (int i= 0; i < nls.getLength(); i++) {
if (nls.item(i) instanceof Text) {
try {
--- 760,764 ----
private int getIntValeur(Element _el) throws SAXException {
NodeList nls= _el.getChildNodes();
! for (int i= 0; i < nls.getTimeLength(); i++) {
if (nls.item(i) instanceof Text) {
try {
***************
*** 781,785 ****
private double getDoubleValeur(Element _el) throws SAXException {
NodeList nls= _el.getChildNodes();
! for (int i= 0; i < nls.getLength(); i++) {
if (nls.item(i) instanceof Text) {
try {
--- 781,785 ----
private double getDoubleValeur(Element _el) throws SAXException {
NodeList nls= _el.getChildNodes();
! for (int i= 0; i < nls.getTimeLength(); i++) {
if (nls.item(i) instanceof Text) {
try {
***************
*** 806,810 ****
Element r= null;
NodeList nls= _el.getChildNodes();
! for (int i= 0; i < nls.getLength(); i++) {
if (nls.item(i) instanceof Element
&& ((Element)nls.item(i)).getTagName().equals(_nom)) {
--- 806,810 ----
Element r= null;
NodeList nls= _el.getChildNodes();
! for (int i= 0; i < nls.getTimeLength(); i++) {
if (nls.item(i) instanceof Element
&& ((Element)nls.item(i)).getTagName().equals(_nom)) {
***************
*** 841,845 ****
Vector vr= new Vector();
NodeList nls= _el.getChildNodes();
! for (int i= 0; i < nls.getLength(); i++) {
if (nls.item(i) instanceof Element
&& ((Element)nls.item(i)).getTagName().equals(_nom)) {
--- 841,845 ----
Vector vr= new Vector();
NodeList nls= _el.getChildNodes();
! for (int i= 0; i < nls.getTimeLength(); i++) {
if (nls.item(i) instanceof Element
&& ((Element)nls.item(i)).getTagName().equals(_nom)) {
|
|
From: <de...@us...> - 2003-12-11 12:50:58
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/ressource In directory sc8-pr-cvs1:/tmp/cvs-serv25368/ressource Modified Files: fudaa_en.fr_txt Log Message: Modification du prepro tr. Ajout tail follow Modifation ebli/graphe/courbe Index: fudaa_en.fr_txt =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/ressource/fudaa_en.fr_txt,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** fudaa_en.fr_txt 14 Nov 2003 08:24:06 -0000 1.8 --- fudaa_en.fr_txt 11 Dec 2003 12:50:55 -0000 1.9 *************** *** 175,178 **** --- 175,179 ---- Options valides=Valid options Création application=Software creation + Création projet=Project creation Démarrage de l'application=Software starting Export=Export *************** *** 188,190 **** Projet modifié=Modified project Projet valide=Valid project ! Le projet contient des erreurs=project contains errors \ No newline at end of file --- 189,196 ---- Projet modifié=Modified project Projet valide=Valid project ! Le projet contient des erreurs=project contains errors ! Début=Begin ! Fin=End ! Méthode=Method ! Modifier=Modify ! Si vous répondez non, toutes vos modifications seront perdues=If no, your modifications will be lost \ No newline at end of file |
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/graphe
In directory sc8-pr-cvs1:/tmp/cvs-serv25368/lido/graphe
Modified Files:
LidoGrapheCourbe.java LidoGrapheLignedeau.java
LidoGrapheProfil.java LidoGrapheResultatEnLong.java
LidoGrapheSingulariteCourbe.java
Log Message:
Modification du prepro tr.
Ajout tail follow
Modifation ebli/graphe/courbe
Index: LidoGrapheCourbe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/graphe/LidoGrapheCourbe.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** LidoGrapheCourbe.java 25 Nov 2003 10:13:50 -0000 1.7
--- LidoGrapheCourbe.java 11 Dec 2003 12:50:54 -0000 1.8
***************
*** 30,34 ****
private Marges marges_;
private Axe axeX, axeY;
! private Courbe crb_;
public LidoGrapheCourbe(
String gra_title,
--- 30,34 ----
private Marges marges_;
private Axe axeX, axeY;
! private CourbeDefault crb_;
public LidoGrapheCourbe(
String gra_title,
***************
*** 111,115 ****
axeY.vertical= true;
graphe_.ajoute(axeY);
! crb_= new Courbe();
if (!thumbnail_) {
crb_.titre= GRA_TITLE;
--- 111,115 ----
axeY.vertical= true;
graphe_.ajoute(axeY);
! crb_= new CourbeDefault();
if (!thumbnail_) {
crb_.titre= GRA_TITLE;
Index: LidoGrapheLignedeau.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/graphe/LidoGrapheLignedeau.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** LidoGrapheLignedeau.java 25 Nov 2003 10:13:51 -0000 1.8
--- LidoGrapheLignedeau.java 11 Dec 2003 12:50:54 -0000 1.9
***************
*** 22,26 ****
import org.fudaa.ebli.graphe.BGraphe;
import org.fudaa.ebli.graphe.Contrainte;
! import org.fudaa.ebli.graphe.Courbe;
import org.fudaa.ebli.graphe.Graphe;
import org.fudaa.ebli.graphe.Marges;
--- 22,26 ----
import org.fudaa.ebli.graphe.BGraphe;
import org.fudaa.ebli.graphe.Contrainte;
! import org.fudaa.ebli.graphe.CourbeDefault;
import org.fudaa.ebli.graphe.Graphe;
import org.fudaa.ebli.graphe.Marges;
***************
*** 43,52 ****
String crbTitr[];
Graphe graphe_;
! Courbe crbLidoI;
Vector crbLidoImport;
Contrainte[] ctrLaisses;
Marges marges;
Axe axeX, axeY;
! Courbe crbFond[],
crbRiveDr[],
crbRiveGa[],
--- 43,52 ----
String crbTitr[];
Graphe graphe_;
! CourbeDefault crbLidoI;
Vector crbLidoImport;
Contrainte[] ctrLaisses;
Marges marges;
Axe axeX, axeY;
! CourbeDefault crbFond[],
crbRiveDr[],
crbRiveGa[],
***************
*** 150,154 ****
}
public void addLigneDeauImport(double[] x, double[] z, String tit) {
! Courbe c= new Courbe();
c.titre= tit;
c.trace= "lineaire";
--- 150,154 ----
}
public void addLigneDeauImport(double[] x, double[] z, String tit) {
! CourbeDefault c= new CourbeDefault();
c.titre= tit;
c.trace= "lineaire";
***************
*** 173,177 ****
if (isModeResultat_) {
for (int i= 0; i < crbLidoImport.size(); i++)
! ((Courbe)crbLidoImport.get(i)).visible= v;
}
fullRepaint();
--- 173,177 ----
if (isModeResultat_) {
for (int i= 0; i < crbLidoImport.size(); i++)
! ((CourbeDefault)crbLidoImport.get(i)).visible= v;
}
fullRepaint();
***************
*** 189,193 ****
(crbLidoImport.size() == 0)
? false
! : ((Courbe)crbLidoImport.get(0)).visible;
else
res= false;
--- 189,193 ----
(crbLidoImport.size() == 0)
? false
! : ((CourbeDefault)crbLidoImport.get(0)).visible;
else
res= false;
***************
*** 569,584 ****
graphe_.ajoute(axeY);
Aspect aspect= null;
! crbFond= new Courbe[biefs_.size()];
! crbRiveGa= new Courbe[biefs_.size()];
! crbRiveDr= new Courbe[biefs_.size()];
crbTitr= new String[biefs_.size()];
! crbLidoR= new Courbe[biefs_.size()];
if (isModeResultat_) {
! crbLidoEnvMin= new Courbe[biefs_.size()];
! crbLidoEnvMax= new Courbe[biefs_.size()];
}
for (int c= 0; c < crbFond.length; c++) {
crbTitr[c]= "" + (c + 1);
! crbFond[c]= new Courbe();
crbFond[c].titre= "fond " + crbTitr[c];
crbFond[c].trace= "lineaire";
--- 569,584 ----
graphe_.ajoute(axeY);
Aspect aspect= null;
! crbFond= new CourbeDefault[biefs_.size()];
! crbRiveGa= new CourbeDefault[biefs_.size()];
! crbRiveDr= new CourbeDefault[biefs_.size()];
crbTitr= new String[biefs_.size()];
! crbLidoR= new CourbeDefault[biefs_.size()];
if (isModeResultat_) {
! crbLidoEnvMin= new CourbeDefault[biefs_.size()];
! crbLidoEnvMax= new CourbeDefault[biefs_.size()];
}
for (int c= 0; c < crbFond.length; c++) {
crbTitr[c]= "" + (c + 1);
! crbFond[c]= new CourbeDefault();
crbFond[c].titre= "fond " + crbTitr[c];
crbFond[c].trace= "lineaire";
***************
*** 591,595 ****
crbFond[c].aspect= aspect;
graphe_.ajoute(crbFond[c]);
! crbRiveDr[c]= new Courbe();
crbRiveDr[c].titre= "rive D " + crbTitr[c];
crbRiveDr[c].trace= "lineaire";
--- 591,595 ----
crbFond[c].aspect= aspect;
graphe_.ajoute(crbFond[c]);
! crbRiveDr[c]= new CourbeDefault();
crbRiveDr[c].titre= "rive D " + crbTitr[c];
crbRiveDr[c].trace= "lineaire";
***************
*** 602,606 ****
crbRiveDr[c].aspect= aspect;
graphe_.ajoute(crbRiveDr[c]);
! crbRiveGa[c]= new Courbe();
crbRiveGa[c].titre= "rive G " + crbTitr[c];
crbRiveGa[c].trace= "lineaire";
--- 602,606 ----
crbRiveDr[c].aspect= aspect;
graphe_.ajoute(crbRiveDr[c]);
! crbRiveGa[c]= new CourbeDefault();
crbRiveGa[c].titre= "rive G " + crbTitr[c];
crbRiveGa[c].trace= "lineaire";
***************
*** 614,618 ****
graphe_.ajoute(crbRiveGa[c]);
if (isModeResultat_) {
! crbLidoR[c]= new Courbe();
crbLidoR[c].trace= "lineaire";
crbLidoR[c].marqueurs= false;
--- 614,618 ----
graphe_.ajoute(crbRiveGa[c]);
if (isModeResultat_) {
! crbLidoR[c]= new CourbeDefault();
crbLidoR[c].trace= "lineaire";
crbLidoR[c].marqueurs= false;
***************
*** 622,626 ****
crbLidoR[c].aspect= aspect;
graphe_.ajoute(crbLidoR[c]);
! crbLidoEnvMin[c]= new Courbe();
crbLidoEnvMin[c].trace= "lineaire";
crbLidoEnvMin[c].marqueurs= false;
--- 622,626 ----
crbLidoR[c].aspect= aspect;
graphe_.ajoute(crbLidoR[c]);
! crbLidoEnvMin[c]= new CourbeDefault();
crbLidoEnvMin[c].trace= "lineaire";
crbLidoEnvMin[c].marqueurs= false;
***************
*** 630,634 ****
crbLidoEnvMin[c].aspect= aspect;
graphe_.ajoute(crbLidoEnvMin[c]);
! crbLidoEnvMax[c]= new Courbe();
crbLidoEnvMax[c].trace= "lineaire";
crbLidoEnvMax[c].marqueurs= false;
--- 630,634 ----
crbLidoEnvMin[c].aspect= aspect;
graphe_.ajoute(crbLidoEnvMin[c]);
! crbLidoEnvMax[c]= new CourbeDefault();
crbLidoEnvMax[c].trace= "lineaire";
crbLidoEnvMax[c].marqueurs= false;
***************
*** 640,644 ****
}
}
! crbLidoI= new Courbe();
crbLidoI.titre= "ligne initiale";
crbLidoI.trace= "lineaire";
--- 640,644 ----
}
}
! crbLidoI= new CourbeDefault();
crbLidoI.titre= "ligne initiale";
crbLidoI.trace= "lineaire";
Index: LidoGrapheProfil.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/graphe/LidoGrapheProfil.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** LidoGrapheProfil.java 25 Nov 2003 10:13:51 -0000 1.10
--- LidoGrapheProfil.java 11 Dec 2003 12:50:54 -0000 1.11
***************
*** 41,45 ****
private Marges marges_;
private Axe axeX, axeY;
! private Courbe crbProfil_, crbPtEdited_;
private Contrainte ctrStoG_,
ctrStoD_,
--- 41,45 ----
private Marges marges_;
private Axe axeX, axeY;
! private CourbeDefault crbProfil_, crbPtEdited_;
private Contrainte ctrStoG_,
ctrStoD_,
***************
*** 265,269 ****
axeY.pas= 5;
graphe_.ajoute(axeY);
! crbProfil_= new Courbe();
// crbProfil_.titre = crbTitre_;
crbProfil_.trace= "lineaire";
--- 265,269 ----
axeY.pas= 5;
graphe_.ajoute(axeY);
! crbProfil_= new CourbeDefault();
// crbProfil_.titre = crbTitre_;
crbProfil_.trace= "lineaire";
***************
*** 317,321 ****
graphe_.ajoute(ctrPasPlani_[i]);
}
! crbPtEdited_= new Courbe();
crbPtEdited_.type= "nuage";
crbPtEdited_.marqueurs= true;
--- 317,321 ----
graphe_.ajoute(ctrPasPlani_[i]);
}
! crbPtEdited_= new CourbeDefault();
crbPtEdited_.type= "nuage";
crbPtEdited_.marqueurs= true;
Index: LidoGrapheResultatEnLong.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/graphe/LidoGrapheResultatEnLong.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** LidoGrapheResultatEnLong.java 25 Nov 2003 10:13:51 -0000 1.8
--- LidoGrapheResultatEnLong.java 11 Dec 2003 12:50:54 -0000 1.9
***************
*** 50,54 ****
private Marges marges_;
private Axe axeX, axeY;
! private Courbe crbDataMin_[], crbDataMax_[];
private Contrainte ctr_[];
private boolean isRapide_;
--- 50,54 ----
private Marges marges_;
private Axe axeX, axeY;
! private CourbeDefault crbDataMin_[], crbDataMax_[];
private Contrainte ctr_[];
private boolean isRapide_;
***************
*** 526,534 ****
axeY.grille= false;
graphe_.ajoute(axeY);
! crbDataMin_= new Courbe[biefs_.size()];
! crbDataMax_= new Courbe[biefs_.size()];
int coul= 0xFF0000;
for (int c= 0; c < crbDataMin_.length; c++) {
! crbDataMin_[c]= new Courbe();
crbDataMin_[c].trace= "lineaire";
crbDataMin_[c].marqueurs= false;
--- 526,534 ----
axeY.grille= false;
graphe_.ajoute(axeY);
! crbDataMin_= new CourbeDefault[biefs_.size()];
! crbDataMax_= new CourbeDefault[biefs_.size()];
int coul= 0xFF0000;
for (int c= 0; c < crbDataMin_.length; c++) {
! crbDataMin_[c]= new CourbeDefault();
crbDataMin_[c].trace= "lineaire";
crbDataMin_[c].marqueurs= false;
***************
*** 537,541 ****
crbDataMin_[c].aspect= aspect;
graphe_.ajoute(crbDataMin_[c]);
! crbDataMax_[c]= new Courbe();
crbDataMax_[c].trace= "lineaire";
crbDataMax_[c].marqueurs= false;
--- 537,541 ----
crbDataMin_[c].aspect= aspect;
graphe_.ajoute(crbDataMin_[c]);
! crbDataMax_[c]= new CourbeDefault();
crbDataMax_[c].trace= "lineaire";
crbDataMax_[c].marqueurs= false;
Index: LidoGrapheSingulariteCourbe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/graphe/LidoGrapheSingulariteCourbe.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** LidoGrapheSingulariteCourbe.java 25 Nov 2003 10:13:51 -0000 1.8
--- LidoGrapheSingulariteCourbe.java 11 Dec 2003 12:50:54 -0000 1.9
***************
*** 44,48 ****
private Marges marges_;
private Axe axeX, axeY;
! private Courbe crb_;
public LidoGrapheSingulariteCourbe(
int iabs,
--- 44,48 ----
private Marges marges_;
private Axe axeX, axeY;
! private CourbeDefault crb_;
public LidoGrapheSingulariteCourbe(
int iabs,
***************
*** 109,113 ****
axeY.graduations= true;
graphe_.ajoute(axeY);
! crb_= new Courbe();
crb_.titre= GRA_TITLE;
crb_.marqueurs= true;
--- 109,113 ----
axeY.graduations= true;
graphe_.ajoute(axeY);
! crb_= new CourbeDefault();
crb_.titre= GRA_TITLE;
crb_.marqueurs= true;
|
|
From: <de...@us...> - 2003-12-11 12:50:57
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/navmer
In directory sc8-pr-cvs1:/tmp/cvs-serv25368/navmer
Modified Files:
NavmerGrapheResultats.java
Log Message:
Modification du prepro tr.
Ajout tail follow
Modifation ebli/graphe/courbe
Index: NavmerGrapheResultats.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/navmer/NavmerGrapheResultats.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** NavmerGrapheResultats.java 25 Nov 2003 10:13:59 -0000 1.4
--- NavmerGrapheResultats.java 11 Dec 2003 12:50:54 -0000 1.5
***************
*** 32,36 ****
private Graphe graphe_;
private Axe axeX_;
! private Courbe courbe_;
private Color[] col=
{ Color.black, Color.blue, Color.green, Color.orange, Color.pink };
--- 32,36 ----
private Graphe graphe_;
private Axe axeX_;
! private CourbeDefault courbe_;
private Color[] col=
{ Color.black, Color.blue, Color.green, Color.orange, Color.pink };
***************
*** 118,122 ****
double[] vals= new double[valeurs_.length];
Axe axe= new Axe();
! courbe_= new Courbe();
courbe_.titre= nomcol_[u];
courbe_.trace= "lineaire";
--- 118,122 ----
double[] vals= new double[valeurs_.length];
Axe axe= new Axe();
! courbe_= new CourbeDefault();
courbe_.titre= nomcol_[u];
courbe_.trace= "lineaire";
|
Update of /cvsroot/fudaa/fudaa_devel/ctulu/src/ghm/follow In directory sc8-pr-cvs1:/tmp/cvs-serv24211/ghm/follow Added Files: FileFollower.java JTextAreaDestination.java OutputDestination.java PrintStreamDestination.java Log Message: Ajout d'un tail en java (Follow) --- NEW FILE: FileFollower.java --- /* Copyright (C) 2000-2003 Greg Merrill (gre...@ya...) This file is part of Follow (http://follow.sf.net). Follow is free software; you can redistribute it and/or modify it under the terms of version 2 of the GNU General Public License as published by the Free Software Foundation. Follow is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Follow; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ package ghm.follow; import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; /** Instances of this class 'follow' a particular text file, assmebling that file's characters into Strings and sending them to instances of {@link OutputDestination}. The name and behavior of this class are inspired by the '-f' (follow) flag of the UNIX command 'tail'. @see OutputDestination @author <a href="mailto:gre...@ya...">Greg Merrill</a> */ public class FileFollower { /** Constructs a new FileFollower; invoking this constructor does <em>not</em> cause the new object to begin following the supplied file. In order to begin following, one must call {@link #start()}. @param file file to be followed @param bufferSize number of chars to be read each time the file is accessed @param latency each time a FileFollower's running thread encounters the end of the file in its stream, it will rest for this many milliseconds before checking to see if there are any more bytes in the file @param initialOutputDestinations an initial array of OutputDestinations which will be used when printing the contents of the file (this array may be <tt>null</tt>) */ public FileFollower ( File file, int bufferSize, int latency, OutputDestination[] initialOutputDestinations ) { file_ = file; bufferSize_ = bufferSize; latency_ = latency; int initOutputDestsSize = (initialOutputDestinations != null) ? initialOutputDestinations.length : 0; outputDestinations_ = new ArrayList(initOutputDestsSize); for (int i=0; i < initOutputDestsSize; i++) { outputDestinations_.add(initialOutputDestinations[i]); } } /** Identical to {@link #FileFollower(File, int, int, OutputDestination[])}, except that a default buffer size (32,768 characters) and latency (1000 milliseconds) are used. @see #FileFollower(File, int, int, OutputDestination[]) */ public FileFollower ( File file, OutputDestination[] initialOutputDestinations ) { // Initial buffer size pilfered from org.gjt.sp.jedit.Buffer. I'm not sure // whether this is a truly optimal buffer size. this( file, 32768, // Don't change without updating docs! 1000, // Don't change without updating docs! initialOutputDestinations ); } /** Cause this FileFollower to spawn a thread which will follow the file supplied in the constructor and send its contents to all of the FileFollower's OutputDestinations. */ public synchronized void start () { continueRunning_ = true; runnerThread_ = new Thread(new Runner()); runnerThread_.start(); } public synchronized void restart () { needsRestart_ = true; runnerThread_.interrupt(); } /** Cause this FileFollower to stop following the file supplied in the constructor after it flushes the characters it's currently reading to all its OutputDestinations. */ public synchronized void stop () { continueRunning_ = false; runnerThread_.interrupt(); } /** Like {@link #stop()}, but this method will not exit until the thread which is following the file has finished executing (i.e., stop synchronously). */ public synchronized void stopAndWait () throws InterruptedException { stop(); while (runnerThread_.isAlive()) { Thread.yield(); } } /** Add another OutputDestination to which the followed file's contents should be printed. @param outputDestination OutputDestination to be added */ public boolean addOutputDestination (OutputDestination outputDestination) { return outputDestinations_.add(outputDestination); } /** Remove the supplied OutputDestination from the list of OutputDestinations to which the followed file's contents should be printed. @param outputDestination OutputDestination to be removed */ public boolean removeOutputDestination (OutputDestination outputDestination) { return outputDestinations_.remove(outputDestination); } /** Returns the List which maintains all OutputDestinations for this FileFollower. @return contains all OutputDestinations for this FileFollower */ public List getOutputDestinations () { return outputDestinations_; } /** Returns the file which is being followed by this FileFollower @return file being followed */ public File getFollowedFile () { return file_; } /** Returns the size of the character buffer used to read characters from the followed file. Each time the file is accessed, this buffer is filled. @return size of the character buffer */ public int getBufferSize () { return bufferSize_; } /** Sets the size of the character buffer used to read characters from the followed file. Increasing buffer size will improve efficiency but increase the amount of memory used by the FileFollower.<br> <em>NOTE:</em> Setting this value will <em>not</em> cause a running FileFollower to immediately begin reading characters into a buffer of the newly specified size. You must stop & restart the FileFollower in order for changes to take effect. @param bufferSize size of the character buffer */ public void setBufferSize (int bufferSize) { bufferSize_ = bufferSize; } /** Returns the time (in milliseconds) which a FileFollower spends sleeping each time it encounters the end of the followed file. @return latency, in milliseconds */ public int getLatency () { return latency_; } /** Sets the time (in milliseconds) which a FileFollower spends sleeping each time it encounters the end of the followed file. Note that extremely low latency values may cause thrashing between the FileFollower's running thread and other threads in an application. A change in this value will be reflected the next time the FileFollower's running thread sleeps. @param latency latency, in milliseconds */ public void setLatency (int latency) { latency_ = latency; } protected int bufferSize_; protected int latency_; protected File file_; protected List outputDestinations_; protected boolean continueRunning_; protected boolean needsRestart_; protected Thread runnerThread_; /* Instances of this class are used to run a thread which follows a FileFollower's file and sends prints its contents to OutputDestinations. */ class Runner implements Runnable { public void run () { while (continueRunning_) { runAction(); } } protected void runAction () { try { clear(); needsRestart_ = false; long fileSize = file_.length(); byte[] byteArray = new byte[bufferSize_]; int numBytesRead; long lastActivityTime = 0; FileInputStream fis = new FileInputStream(file_); // Skip to the end of the file. if (fileSize > bufferSize_) { fis.skip(fileSize - bufferSize_); } BufferedInputStream bis = new BufferedInputStream(fis); while (continueRunning_ && !needsRestart_) { numBytesRead = bis.read(byteArray, 0, byteArray.length); boolean dataWasFound = (numBytesRead > 0); if (dataWasFound) { print(new String(byteArray, 0, numBytesRead)); lastActivityTime = System.currentTimeMillis(); } else { // Now check if the filehandle has become stale (file was // modified, but no data could be read). needsRestart_ = file_.exists() && (file_.lastModified() > lastActivityTime); } boolean noDataLeft = (numBytesRead < byteArray.length); if (noDataLeft && !needsRestart_) { try { Thread.sleep(latency_); } catch (InterruptedException e) { // Interrupt may be thrown manually by stop() } } } bis.close(); fis.close(); } catch (IOException e) { e.printStackTrace(System.err); } } /* send the supplied string to all OutputDestinations */ void print (String s) { Iterator i = outputDestinations_.iterator(); while (i.hasNext()) { ((OutputDestination)i.next()).print(s); } } /* clear all OutputDestinations */ void clear () { Iterator i = outputDestinations_.iterator(); while (i.hasNext()) { ((OutputDestination)i.next()).clear(); } } } /** Line separator, retrieved from System properties & stored statically. */ protected static final String lineSeparator = System.getProperty("line.separator"); } --- NEW FILE: JTextAreaDestination.java --- /* Copyright (C) 2000-2003 Greg Merrill (gre...@ya...) This file is part of Follow (http://follow.sf.net). Follow is free software; you can redistribute it and/or modify it under the terms of version 2 of the GNU General Public License as published by the Free Software Foundation. Follow is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Follow; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ package ghm.follow; import javax.swing.JTextArea; import javax.swing.text.BadLocationException; import javax.swing.text.Document; /** Implementation of {@link OutputDestination} which appends Strings to a {@link JTextArea}. @see OutputDestination @see JTextArea @author <a href="mailto:gre...@ya...">Greg Merrill</a> */ public class JTextAreaDestination implements OutputDestination { /** Construct a new JTextAreaDestination. @param jTextArea text will be appended to this text area @param autoPositionCaret if true, caret will be automatically moved to the bottom of the text area when text is appended */ public JTextAreaDestination (JTextArea jTextArea, boolean autoPositionCaret) { jTextArea_ = jTextArea; autoPositionCaret_ = autoPositionCaret; } public JTextArea getJTextArea () { return jTextArea_; } public void setJTextArea (JTextArea jTextArea) { jTextArea_ = jTextArea; } /** @return whether caret will be automatically moved to the bottom of the text area when text is appended */ public boolean autoPositionCaret () { return autoPositionCaret_; } /** @param autoPositionCaret if true, caret will be automatically moved to the bottom of the text area when text is appended */ public void setAutoPositionCaret (boolean autoPositionCaret) { autoPositionCaret_ = autoPositionCaret; } public void print (String s) { jTextArea_.append(s); if (autoPositionCaret_) { jTextArea_.setCaretPosition(jTextArea_.getDocument().getLength()); } } public void clear () { jTextArea_.setText(""); if (autoPositionCaret_) { jTextArea_.setCaretPosition(0); } } protected JTextArea jTextArea_; protected boolean autoPositionCaret_; } --- NEW FILE: OutputDestination.java --- /* Copyright (C) 2000-2003 Greg Merrill (gre...@ya...) This file is part of Follow (http://follow.sf.net). Follow is free software; you can redistribute it and/or modify it under the terms of version 2 of the GNU General Public License as published by the Free Software Foundation. Follow is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Follow; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ package ghm.follow; /** Interface used by a {@link FileFollower} to print the contents of a followed file. @see FileFollower @author <a href="mailto:gre...@ya...">Greg Merrill</a> */ public interface OutputDestination { /** Print the supplied String. @param s String to be printed */ public void print (String s) ; /** * Clear all previous text. */ public void clear () ; } --- NEW FILE: PrintStreamDestination.java --- /* Copyright (C) 2000-2003 Greg Merrill (gre...@ya...) This file is part of Follow (http://follow.sf.net). Follow is free software; you can redistribute it and/or modify it under the terms of version 2 of the GNU General Public License as published by the Free Software Foundation. Follow is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Follow; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ package ghm.follow; import java.io.PrintStream; /** Implementation of {@link OutputDestination} which prints Strings to a {@link PrintStream}. @see OutputDestination @see PrintStream @author <a href="mailto:gre...@ya...">Greg Merrill</a> */ public class PrintStreamDestination implements OutputDestination { public PrintStreamDestination (PrintStream printStream) { printStream_ = printStream; } public PrintStream getPrintStream () { return printStream_; } public void setPrintStream (PrintStream printStream) { printStream_ = printStream; } public void print (String s) { printStream_.print(s); } public void clear () { // No real 'clear' can be done for a stream. } protected PrintStream printStream_; } |
|
From: <de...@us...> - 2003-12-11 12:47:16
|
Update of /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/bu
In directory sc8-pr-cvs1:/tmp/cvs-serv24211/com/memoire/bu
Modified Files:
BuLabelMultiLine.java BuTableRowHeaderRenderer.java
Log Message:
Ajout d'un tail en java (Follow)
Index: BuLabelMultiLine.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/bu/BuLabelMultiLine.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BuLabelMultiLine.java 23 Sep 2003 18:59:55 -0000 1.2
--- BuLabelMultiLine.java 11 Dec 2003 12:47:13 -0000 1.3
***************
*** 123,127 ****
int xm=insets.left;
int ym=insets.top;
! int wm=getWidth ()-insets.left-insets.right;
int hm=getHeight()-insets.top-insets.bottom;
int al=getHorizontalAlignment();
--- 123,127 ----
int xm=insets.left;
int ym=insets.top;
! int wm=getWidth ()-insets.left-insets.right-5;
int hm=getHeight()-insets.top-insets.bottom;
int al=getHorizontalAlignment();
Index: BuTableRowHeaderRenderer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/bu/BuTableRowHeaderRenderer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BuTableRowHeaderRenderer.java 23 Sep 2003 18:59:55 -0000 1.2
--- BuTableRowHeaderRenderer.java 11 Dec 2003 12:47:13 -0000 1.3
***************
*** 65,72 ****
setText(text);
- /* DEBUG
- if(_selected) setBackground(Color.red);
- else setBackground(Color.lightGray);
- */
return this;
--- 65,68 ----
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/graphe
In directory sc8-pr-cvs1:/tmp/cvs-serv23829/graphe
Modified Files:
Hydraulique1dAbstractGraphe.java
Hydraulique1dGrapheConditionsInitiales.java
Hydraulique1dGrapheLoi.java Hydraulique1dGrapheProfil.java
Hydraulique1dGrapheResuBief.java
Hydraulique1dGrapheTableau.java
Hydraulique1dTableauCasierSemiPointsGraphe.java
Hydraulique1dTableauLoiGraphe.java
Log Message:
Courbe renommer en CourbeDefault dans ebli
Index: Hydraulique1dAbstractGraphe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/graphe/Hydraulique1dAbstractGraphe.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Hydraulique1dAbstractGraphe.java 25 Nov 2003 10:13:46 -0000 1.6
--- Hydraulique1dAbstractGraphe.java 11 Dec 2003 12:43:17 -0000 1.7
***************
*** 244,248 ****
axeY_.vertical= true;
// efface toute les courbes actuelles
! Object[] lesCourbes= g.getElementsParType((new Courbe()).getClass());
for (int i= 0; i < lesCourbes.length; i++) {
g.enleve(lesCourbes[i]);
--- 244,248 ----
axeY_.vertical= true;
// efface toute les courbes actuelles
! Object[] lesCourbes= g.getElementsParType((new CourbeDefault()).getClass());
for (int i= 0; i < lesCourbes.length; i++) {
g.enleve(lesCourbes[i]);
Index: Hydraulique1dGrapheConditionsInitiales.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/graphe/Hydraulique1dGrapheConditionsInitiales.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Hydraulique1dGrapheConditionsInitiales.java 25 Nov 2003 10:13:46 -0000 1.5
--- Hydraulique1dGrapheConditionsInitiales.java 11 Dec 2003 12:43:17 -0000 1.6
***************
*** 25,29 ****
public class Hydraulique1dGrapheConditionsInitiales
extends Hydraulique1dAbstractGraphe {
! Courbe[] courbes_;
public Hydraulique1dGrapheConditionsInitiales() {
super();
--- 25,29 ----
public class Hydraulique1dGrapheConditionsInitiales
extends Hydraulique1dAbstractGraphe {
! CourbeDefault[] courbes_;
public Hydraulique1dGrapheConditionsInitiales() {
super();
***************
*** 41,49 ****
fullRepaint();
}
! public void affiche(Courbe[] courbes) {
courbes_= courbes;
afficheAvecCalculBorne();
}
! protected void affiche(Courbe[] courbes, boolean calculBorne) {
setLabels("Profil en long - Condition initiale", "X", "Cote", "m", "m");
initGraphe();
--- 41,49 ----
fullRepaint();
}
! public void affiche(CourbeDefault[] courbes) {
courbes_= courbes;
afficheAvecCalculBorne();
}
! protected void affiche(CourbeDefault[] courbes, boolean calculBorne) {
setLabels("Profil en long - Condition initiale", "X", "Cote", "m", "m");
initGraphe();
***************
*** 62,66 ****
double maxY= Double.NEGATIVE_INFINITY;
for (int i= 0; i < crbs.size(); i++) {
! Vector vals= ((Courbe)crbs.get(i)).valeurs;
for (int j= 0; j < vals.size(); j++) {
double x= ((Valeur)vals.get(j)).s;
--- 62,66 ----
double maxY= Double.NEGATIVE_INFINITY;
for (int i= 0; i < crbs.size(); i++) {
! Vector vals= ((CourbeDefault)crbs.get(i)).valeurs;
for (int j= 0; j < vals.size(); j++) {
double x= ((Valeur)vals.get(j)).s;
Index: Hydraulique1dGrapheLoi.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/graphe/Hydraulique1dGrapheLoi.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Hydraulique1dGrapheLoi.java 25 Nov 2003 10:13:46 -0000 1.6
--- Hydraulique1dGrapheLoi.java 11 Dec 2003 12:43:17 -0000 1.7
***************
*** 38,42 ****
private Marges marges_;
private Axe axeX, axeY;
! private Courbe crb_;
public Hydraulique1dGrapheLoi() {
super();
--- 38,42 ----
private Marges marges_;
private Axe axeX, axeY;
! private CourbeDefault crb_;
public Hydraulique1dGrapheLoi() {
super();
***************
*** 146,150 ****
axeY.vertical= true;
graphe_.ajoute(axeY);
! crb_= new Courbe();
if (!thumbnail_) {
crb_.titre= GRA_TITLE;
--- 146,150 ----
axeY.vertical= true;
graphe_.ajoute(axeY);
! crb_= new CourbeDefault();
if (!thumbnail_) {
crb_.titre= GRA_TITLE;
Index: Hydraulique1dGrapheProfil.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/graphe/Hydraulique1dGrapheProfil.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Hydraulique1dGrapheProfil.java 25 Nov 2003 10:13:46 -0000 1.5
--- Hydraulique1dGrapheProfil.java 11 Dec 2003 12:43:17 -0000 1.6
***************
*** 42,46 ****
Marges marges_;
Axe axeX, axeY;
! Courbe crbProfil_, crbPtEdited_;
Contrainte ctrStoG_,
ctrStoD_,
--- 42,46 ----
Marges marges_;
Axe axeX, axeY;
! CourbeDefault crbProfil_, crbPtEdited_;
Contrainte ctrStoG_,
ctrStoD_,
***************
*** 232,236 ****
axeY.pas= 5;
graphe_.ajoute(axeY);
! crbProfil_= new Courbe();
crbProfil_.titre= crbTitre_;
crbProfil_.trace= "lineaire";
--- 232,236 ----
axeY.pas= 5;
graphe_.ajoute(axeY);
! crbProfil_= new CourbeDefault();
crbProfil_.titre= crbTitre_;
crbProfil_.trace= "lineaire";
***************
*** 284,288 ****
graphe_.ajoute(ctrPasPlani_[i]);
}
! crbPtEdited_= new Courbe();
crbPtEdited_.type= "nuage";
crbPtEdited_.marqueurs= true;
--- 284,288 ----
graphe_.ajoute(ctrPasPlani_[i]);
}
! crbPtEdited_= new CourbeDefault();
crbPtEdited_.type= "nuage";
crbPtEdited_.marqueurs= true;
Index: Hydraulique1dGrapheResuBief.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/graphe/Hydraulique1dGrapheResuBief.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Hydraulique1dGrapheResuBief.java 25 Nov 2003 10:13:46 -0000 1.5
--- Hydraulique1dGrapheResuBief.java 11 Dec 2003 12:43:17 -0000 1.6
***************
*** 24,28 ****
*/
public class Hydraulique1dGrapheResuBief extends Hydraulique1dGrapheTableau {
! Courbe laisse_= null;
public Hydraulique1dGrapheResuBief() {
super();
--- 24,28 ----
*/
public class Hydraulique1dGrapheResuBief extends Hydraulique1dGrapheTableau {
! CourbeDefault laisse_= null;
public Hydraulique1dGrapheResuBief() {
super();
***************
*** 31,35 ****
double[][] valeurs,
String[] titreCourbes,
! Courbe laisse) {
affiche(valeurs, titreCourbes, laisse, true);
}
--- 31,35 ----
double[][] valeurs,
String[] titreCourbes,
! CourbeDefault laisse) {
affiche(valeurs, titreCourbes, laisse, true);
}
***************
*** 37,41 ****
double[][] valeurs,
String[] titreCourbes,
! Courbe laisse,
boolean calculBorne) {
laisse_= laisse;
--- 37,41 ----
double[][] valeurs,
String[] titreCourbes,
! CourbeDefault laisse,
boolean calculBorne) {
laisse_= laisse;
***************
*** 65,69 ****
Graphe g= getGraphe();
for (int i= 0; i < nbCourbe; i++) {
! Courbe c= new Courbe();
if (titreCourbes_ != null)
c.titre= titreCourbes_[i];
--- 65,69 ----
Graphe g= getGraphe();
for (int i= 0; i < nbCourbe; i++) {
! CourbeDefault c= new CourbeDefault();
if (titreCourbes_ != null)
c.titre= titreCourbes_[i];
Index: Hydraulique1dGrapheTableau.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/graphe/Hydraulique1dGrapheTableau.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Hydraulique1dGrapheTableau.java 2 Dec 2003 13:15:26 -0000 1.6
--- Hydraulique1dGrapheTableau.java 11 Dec 2003 12:43:17 -0000 1.7
***************
*** 108,112 ****
Graphe g= getGraphe();
for (int i= 0; i < nbCourbe; i++) {
! Courbe c= new Courbe();
if (titreCourbes_ != null)
c.titre= titreCourbes_[i];
--- 108,112 ----
Graphe g= getGraphe();
for (int i= 0; i < nbCourbe; i++) {
! CourbeDefault c= new CourbeDefault();
if (titreCourbes_ != null)
c.titre= titreCourbes_[i];
Index: Hydraulique1dTableauCasierSemiPointsGraphe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/graphe/Hydraulique1dTableauCasierSemiPointsGraphe.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Hydraulique1dTableauCasierSemiPointsGraphe.java 2 Dec 2003 13:15:26 -0000 1.4
--- Hydraulique1dTableauCasierSemiPointsGraphe.java 11 Dec 2003 12:43:17 -0000 1.5
***************
*** 14,18 ****
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
! import org.fudaa.ebli.graphe.Courbe;
import org.fudaa.ebli.graphe.Graphe;
import org.fudaa.ebli.graphe.Valeur;
--- 14,18 ----
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
! import org.fudaa.ebli.graphe.CourbeDefault;
import org.fudaa.ebli.graphe.Graphe;
import org.fudaa.ebli.graphe.Valeur;
***************
*** 25,30 ****
extends Hydraulique1dAbstractGraphe
implements TableModelListener {
! private Courbe cbFrontieres_;
! private Courbe cbInterieurs_;
private double minX_= Double.POSITIVE_INFINITY;
private double minY_= Double.POSITIVE_INFINITY;
--- 25,30 ----
extends Hydraulique1dAbstractGraphe
implements TableModelListener {
! private CourbeDefault cbFrontieres_;
! private CourbeDefault cbInterieurs_;
private double minX_= Double.POSITIVE_INFINITY;
private double minY_= Double.POSITIVE_INFINITY;
***************
*** 33,41 ****
public Hydraulique1dTableauCasierSemiPointsGraphe() {
super();
! cbFrontieres_= new Courbe();
cbFrontieres_.titre= "Frontière";
cbFrontieres_.marqueurs= false;
cbFrontieres_.aspect.contour= Color.blue;
! cbInterieurs_= new Courbe();
cbInterieurs_.titre= "Points intérieurs";
cbInterieurs_.marqueurs= true;
--- 33,41 ----
public Hydraulique1dTableauCasierSemiPointsGraphe() {
super();
! cbFrontieres_= new CourbeDefault();
cbFrontieres_.titre= "Frontière";
cbFrontieres_.marqueurs= false;
cbFrontieres_.aspect.contour= Color.blue;
! cbInterieurs_= new CourbeDefault();
cbInterieurs_.titre= "Points intérieurs";
cbInterieurs_.marqueurs= true;
***************
*** 79,83 ****
protected void tabDoubleToCourbe(
double[][] valeurs,
! Courbe cb,
boolean ptsFrontiere) {
double minX= Double.POSITIVE_INFINITY;
--- 79,83 ----
protected void tabDoubleToCourbe(
double[][] valeurs,
! CourbeDefault cb,
boolean ptsFrontiere) {
double minX= Double.POSITIVE_INFINITY;
Index: Hydraulique1dTableauLoiGraphe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/graphe/Hydraulique1dTableauLoiGraphe.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Hydraulique1dTableauLoiGraphe.java 25 Nov 2003 10:13:46 -0000 1.6
--- Hydraulique1dTableauLoiGraphe.java 11 Dec 2003 12:43:17 -0000 1.7
***************
*** 166,170 ****
courbes_= new Vector(nbCourbe_);
for (int i= 0; i < nbCourbe_; i++) {
! Courbe crb= new Courbe();
crb.marqueurs= !thumbnail_;
courbes_.add(crb);
--- 166,170 ----
courbes_= new Vector(nbCourbe_);
for (int i= 0; i < nbCourbe_; i++) {
! CourbeDefault crb= new CourbeDefault();
crb.marqueurs= !thumbnail_;
courbes_.add(crb);
***************
*** 225,229 ****
}
for (int i= 0; i < courbesVals.size(); i++) {
! Courbe courbe= (Courbe)courbes_.get(i);
courbe.valeurs= (Vector)courbesVals.get(i);
courbe.aspect.contour= PALETTE[i % PALETTE.length];
--- 225,229 ----
}
for (int i= 0; i < courbesVals.size(); i++) {
! CourbeDefault courbe= (CourbeDefault)courbes_.get(i);
courbe.valeurs= (Vector)courbesVals.get(i);
courbe.aspect.contour= PALETTE[i % PALETTE.length];
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor
In directory sc8-pr-cvs1:/tmp/cvs-serv23829/editor
Modified Files:
Hydraulique1dGraphesResultatsEditor.java
Hydraulique1dVisuInitialeEditor.java
Log Message:
Courbe renommer en CourbeDefault dans ebli
Index: Hydraulique1dGraphesResultatsEditor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dGraphesResultatsEditor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Hydraulique1dGraphesResultatsEditor.java 25 Nov 2003 10:13:44 -0000 1.7
--- Hydraulique1dGraphesResultatsEditor.java 11 Dec 2003 12:43:17 -0000 1.8
***************
*** 427,431 ****
return res;
}
! protected Courbe getCourbeLaisse() {
if (cbLaisse_.isSelected()) {
int indiceBief= cmbListeBiefCasierLiaison_.getSelectedIndex();
--- 427,431 ----
return res;
}
! protected CourbeDefault getCourbeLaisse() {
if (cbLaisse_.isSelected()) {
int indiceBief= cmbListeBiefCasierLiaison_.getSelectedIndex();
***************
*** 444,448 ****
if (vLaissesBief.size() == 0)
return null;
! Courbe res= new Courbe();
res.marqueurs= true;
res.titre= "laisse";
--- 444,448 ----
if (vLaissesBief.size() == 0)
return null;
! CourbeDefault res= new CourbeDefault();
res.marqueurs= true;
res.titre= "laisse";
Index: Hydraulique1dVisuInitialeEditor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dVisuInitialeEditor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Hydraulique1dVisuInitialeEditor.java 25 Nov 2003 10:13:44 -0000 1.4
--- Hydraulique1dVisuInitialeEditor.java 11 Dec 2003 12:43:17 -0000 1.5
***************
*** 164,174 ****
return;
Vector cbs= new Vector();
! Courbe c1= getCourbeFond(reseau_.biefs()[indexBief]);
if (c1 != null)
cbs.add(c1);
! Courbe c2= getCourbeLigneInitiale(indexBief + 1);
if (c2 != null)
cbs.add(c2);
! Courbe[] c3= getCourbesZonesSeches(reseau_.biefs()[indexBief]);
if (c3 != null) {
for (int i= 0; i < c3.length; i++) {
--- 164,174 ----
return;
Vector cbs= new Vector();
! CourbeDefault c1= getCourbeFond(reseau_.biefs()[indexBief]);
if (c1 != null)
cbs.add(c1);
! CourbeDefault c2= getCourbeLigneInitiale(indexBief + 1);
if (c2 != null)
cbs.add(c2);
! CourbeDefault[] c3= getCourbesZonesSeches(reseau_.biefs()[indexBief]);
if (c3 != null) {
for (int i= 0; i < c3.length; i++) {
***************
*** 177,192 ****
}
}
! Courbe[] crbAVisu= new Courbe[cbs.size()];
for (int i= 0; i < crbAVisu.length; i++) {
! crbAVisu[i]= (Courbe)cbs.get(i);
}
if (crbAVisu.length > 0)
bgraphe_.affiche(crbAVisu);
}
! protected Courbe getCourbeFond(IBief bief) {
int nbProfil= bief.profils().length;
if (nbProfil == 0)
return null;
! Courbe courbe= new Courbe();
courbe.titre= "Fond";
Vector vals= new Vector(nbProfil);
--- 177,192 ----
}
}
! CourbeDefault[] crbAVisu= new CourbeDefault[cbs.size()];
for (int i= 0; i < crbAVisu.length; i++) {
! crbAVisu[i]= (CourbeDefault)cbs.get(i);
}
if (crbAVisu.length > 0)
bgraphe_.affiche(crbAVisu);
}
! protected CourbeDefault getCourbeFond(IBief bief) {
int nbProfil= bief.profils().length;
if (nbProfil == 0)
return null;
! CourbeDefault courbe= new CourbeDefault();
courbe.titre= "Fond";
Vector vals= new Vector(nbProfil);
***************
*** 204,208 ****
return courbe;
}
! protected Courbe getCourbeLigneInitiale(int numBief) {
ILigneEauInitiale ligne= condInitiales_.ligneEauInitiale();
if (ligne == null)
--- 204,208 ----
return courbe;
}
! protected CourbeDefault getCourbeLigneInitiale(int numBief) {
ILigneEauInitiale ligne= condInitiales_.ligneEauInitiale();
if (ligne == null)
***************
*** 222,226 ****
if (vals.size() == 0)
return null;
! Courbe courbe= new Courbe();
courbe.titre= "Cote ligne d'eau initiale";
courbe.valeurs= vals;
--- 222,226 ----
if (vals.size() == 0)
return null;
! CourbeDefault courbe= new CourbeDefault();
courbe.titre= "Cote ligne d'eau initiale";
courbe.valeurs= vals;
***************
*** 230,234 ****
return courbe;
}
! protected Courbe[] getCourbesZonesSeches(IBief bief) {
IZone[] zones= condInitiales_.zonesSeches();
if ((zones == null) || (zones.length == 0))
--- 230,234 ----
return courbe;
}
! protected CourbeDefault[] getCourbesZonesSeches(IBief bief) {
IZone[] zones= condInitiales_.zonesSeches();
if ((zones == null) || (zones.length == 0))
***************
*** 239,243 ****
for (int i= 0; i < zones.length; i++) {
if (bief == zones[i].biefRattache()) {
! Courbe courbe= new Courbe();
courbe.titre= "zones sèches";
courbe.visible= true;
--- 239,243 ----
for (int i= 0; i < zones.length; i++) {
if (bief == zones[i].biefRattache()) {
! CourbeDefault courbe= new CourbeDefault();
courbe.titre= "zones sèches";
courbe.visible= true;
***************
*** 258,264 ****
if (cbs.size() == 0)
return null;
! Courbe[] res= new Courbe[cbs.size()];
for (int i= 0; i < res.length; i++) {
! res[i]= (Courbe)cbs.get(i);
}
return res;
--- 258,264 ----
if (cbs.size() == 0)
return null;
! CourbeDefault[] res= new CourbeDefault[cbs.size()];
for (int i= 0; i < res.length; i++) {
! res[i]= (CourbeDefault)cbs.get(i);
}
return res;
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico
In directory sc8-pr-cvs1:/tmp/cvs-serv23146/dico
Modified Files:
DicoCasFileFormat.java DicoEntite.java DicoExec.java
DicoParams.java DicoParamsListener.java dico_en.fr_txt
Log Message:
Ajout de fonctionnalites au modele h2d
Index: DicoCasFileFormat.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoCasFileFormat.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DicoCasFileFormat.java 25 Nov 2003 10:11:27 -0000 1.7
--- DicoCasFileFormat.java 11 Dec 2003 12:41:26 -0000 1.8
***************
*** 33,36 ****
--- 33,41 ----
return getDicoManager().createLastVersionImpl(this, _language);
}
+
+ public FileFormatVersion getLastVersionInstance(){
+ return getLastVersionImpl();
+ }
+
public DicoCasFileFormatVersion getLastVersionImpl() {
return getDicoManager().createLastVersionImpl(
Index: DicoEntite.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoEntite.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DicoEntite.java 25 Nov 2003 10:11:28 -0000 1.9
--- DicoEntite.java 11 Dec 2003 12:41:26 -0000 1.10
***************
*** 234,237 ****
--- 234,240 ----
return false;
}
+ public int getNbElemFixed() {
+ return nbElem;
+ }
/**
*
***************
*** 469,473 ****
*/
public boolean isValide(String _data) {
! if (nbElem <= 0)
return (fillListWithValidValues(_data, new ArrayList()) == null);
else {
--- 472,476 ----
*/
public boolean isValide(String _data) {
! if (nbElem < 0)
return (fillListWithValidValues(_data, new ArrayList()) == null);
else {
***************
*** 475,479 ****
String s= fillListWithValidValues(_data, l);
if (s == null) {
! return l.size() == nbElem;
}
return false;
--- 478,482 ----
String s= fillListWithValidValues(_data, l);
if (s == null) {
! return l.size() <= nbElem;
}
return false;
***************
*** 483,490 ****
_l.clear();
String s= fillListWithValidValues(_data, _l);
! if ((s == null) && (nbElem > 0)) {
! if (_l.size() != nbElem) {
! DicoResource.getS(
! "Le nombre d'élément doit être égal à {0}",
DodicoLib.getString(nbElem));
}
--- 486,496 ----
_l.clear();
String s= fillListWithValidValues(_data, _l);
! if ((s == null) && (nbElem >= 0)) {
! if (_l.size() > nbElem) {
! if(nbElem==0)
! return DicoResource.getS(
! "Ce mot-clé est inutile");
! return DicoResource.getS(
! "Le nombre d'éléments doit être inférieur à {0}",
DodicoLib.getString(nbElem));
}
***************
*** 498,501 ****
--- 504,510 ----
if (!isModifiable())
return DicoResource.getS("non modifiable");
+ else if (nbElem >= 0) {
+ return DicoResource.getS("Nombre maximal de champs") + ": " + nbElem;
+ }
return null;
}
***************
*** 828,835 ****
}
}
- public static void main(String[] args) {
- DodicoLib.printStringArray(
- DicoEntite.Vecteur.getValues("'B' ; ';C;';D;E;'F'''", ";"));
- }
/**
*
--- 837,840 ----
***************
*** 839,843 ****
}
/**
! *
*/
public void setRequired(boolean _b) {
--- 844,848 ----
}
/**
! * Ce mot-clé est nécessaire a l'appli
*/
public void setRequired(boolean _b) {
Index: DicoExec.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoExec.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DicoExec.java 25 Nov 2003 10:11:29 -0000 1.4
--- DicoExec.java 11 Dec 2003 12:41:26 -0000 1.5
***************
*** 22,77 ****
public class DicoExec extends CalculExec {
String execName_;
public DicoExec(String _execName) {
if (_execName == null)
throw new IllegalArgumentException("Argument null");
! execName_= _execName;
}
public static String getPrefIdFor(String _execName) {
return DodicoPreferences.buildPrefKey("serveur", _execName, "exe");
}
/**
*
*/
! public String[] getLaunchArray(
! File _paramsFile,
! String[] _codeArgs,
! DodicoUI _ui) {
! ArrayList l= new ArrayList(15);
! boolean win= false;
! File dir= new File("serveurs/dico");
! if (FuLib.isWindows()) {
! win= true;
! l.add("start");
! l.add(new File(dir, "universal-launcher.bat").getAbsolutePath());
! } else {
! l.add(new File(dir, "universal-launcher.sh").getAbsolutePath());
! }
! String exe=
! DodicoPreferences.DODICO.getStringProperty(
! getPrefIdFor(execName_),
! execName_);
! l.add(exe);
! if (win) {
! if (!CalculExec.getWinParams(_paramsFile, _codeArgs, l)) {
! _ui.error(
! BuResource.BU.getString("Erreur"),
! DicoResource.getS("Arguments nuls"));
! return null;
! }
! } else {
! if (!CalculExec.getUnixParams(_paramsFile, _codeArgs, l)) {
! _ui.error(
! BuResource.BU.getString("Erreur"),
! DicoResource.getS("Arguments nuls"));
! return null;
! }
! }
! return DodicoLib.enTableau(l);
}
/**
*
*/
! public int getMaxArgsNb() {
! return 5;
}
}
--- 22,64 ----
public class DicoExec extends CalculExec {
String execName_;
+ boolean log_;
public DicoExec(String _execName) {
if (_execName == null)
throw new IllegalArgumentException("Argument null");
! setChangeWorkingDirectory(true);
! setLauchInNewTerm(true);
! String exe=
! DodicoPreferences.DODICO.getStringProperty(
! getPrefIdFor(_execName),
! _execName);
! execName_= exe;
! }
! public String getExecName() {
! return execName_;
}
public static String getPrefIdFor(String _execName) {
return DodicoPreferences.buildPrefKey("serveur", _execName, "exe");
}
+ public String[] getLaunchCmd(File _paramsFile, DodicoUI _ui) {
+ String[] r= new String[log_ ? 3 : 2];
+ r[0]= execName_;
+ if (log_) {
+ r[1]= "-s";
+ r[2]= _paramsFile.getName();
+ } else
+ r[1]= _paramsFile.getName();
+ return r;
+ }
/**
*
*/
! public boolean isLog() {
! return log_;
}
/**
*
*/
! public void setLog(boolean _b) {
! log_= _b;
}
}
Index: DicoParams.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoParams.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DicoParams.java 25 Nov 2003 10:11:29 -0000 1.11
--- DicoParams.java 11 Dec 2003 12:41:26 -0000 1.12
***************
*** 41,44 ****
--- 41,45 ----
private Set badValues_;
private Set entitesFiles_;
+ private Set entitesToBeEmpty_;
private DicoCasFileFormatVersionAbstract ft_;
private DicoEntite casFileEntite_;
***************
*** 61,64 ****
--- 62,85 ----
return (entitesFiles_ == null ? 0 : entitesFiles_.size());
}
+
+ public void setDicoEntiteMustBeEmpty(DicoEntite _e, boolean _b) {
+ if (_b) {
+ if (entitesToBeEmpty_ == null)
+ entitesToBeEmpty_= new HashSet();
+ entitesToBeEmpty_.add(_e);
+ if (isValueSetFor(_e)) {
+ badValues_.add(_e);
+ fireEntiteValidStateUpdated(_e);
+ }
+ } else {
+ if (entitesToBeEmpty_ != null)
+ entitesToBeEmpty_.remove(_e);
+ if (badValues_.contains(_e)) {
+ badValues_.remove(_e);
+ fireEntiteValidStateUpdated(_e);
+ }
+ }
+
+ }
public void testIfValid(DicoEntite e) {
if ((ft_.getDico().contains(e)) && (isValueSetFor(e))) {
***************
*** 67,75 ****
if (badValues_.contains(e)) {
badValues_.remove(e);
! fireEntiteStateUpdated(e);
}
} else if (!badValues_.contains(e)) {
badValues_.add(e);
! fireEntiteStateUpdated(e);
}
}
--- 88,96 ----
if (badValues_.contains(e)) {
badValues_.remove(e);
! fireEntiteValidStateUpdated(e);
}
} else if (!badValues_.contains(e)) {
badValues_.add(e);
! fireEntiteValidStateUpdated(e);
}
}
***************
*** 77,83 ****
public String getInvalidMessage(DicoEntite _e) {
if (!isValueValideFor(_e)) {
! if (isValueSetFor(_e))
return _e.getInvalideMessage(getValue(_e));
! else if (_e.isRequired())
return DicoResource.getS("Ce mot-clé doit être défini");
else
--- 98,107 ----
public String getInvalidMessage(DicoEntite _e) {
if (!isValueValideFor(_e)) {
! if (isValueSetFor(_e)) {
! if ((entitesToBeEmpty_ != null) && (entitesToBeEmpty_.contains(_e))) {
! return DicoResource.getS("Ce mot-clé est inutile");
! }
return _e.getInvalideMessage(getValue(_e));
! } else if (_e.isRequired())
return DicoResource.getS("Ce mot-clé doit être défini");
else
***************
*** 113,116 ****
--- 137,156 ----
return false;
}
+
+ /**
+ * Enleve le mot-clé _e des mot-clés chargés
+ */
+ public void setUnloaded(DicoEntite _e) {
+ if (loadedEntiteState_ != null) {
+ loadedEntiteState_.remove(_e);
+ }
+ }
+ /**
+ * Enregistre que le mot-cle _e est charge a partir du fichier _f et
+ * le rend modifie si _m.
+ * @param _e le mot-cle charge
+ * @param _f le fichier a partir duquel le mot-clé a ete charge
+ * @param _m mot-cle modifie ou non
+ */
public boolean setLoaded(DicoEntite _e, File _f, boolean _m) {
if ((_e == null) || (!_e.isFileType()))
***************
*** 177,182 ****
DicoEntite ent= (DicoEntite)it.next();
if (!isValueSetFor(ent)) {
- System.out.println("alors " + ent);
l.add(ent);
}
}
--- 217,223 ----
DicoEntite ent= (DicoEntite)it.next();
if (!isValueSetFor(ent)) {
l.add(ent);
+ //DEBUG A ENLEVER
+ System.out.println("ent to save " + ent.getNom());
}
}
***************
*** 185,194 ****
return r;
}
! public void setModified(DicoEntite _e, boolean _b) {
DicoEntiteFileState fs= getFileState(_e);
! if (fs != null) {
fs.setModified(_b);
! } else if (_b)
setLoaded(_e, null, _b);
}
public boolean isModified() {
--- 226,239 ----
return r;
}
! public void setLoadedModified(DicoEntite _e, boolean _b) {
DicoEntiteFileState fs= getFileState(_e);
! if (fs != null && (fs.isModified() != _b)) {
fs.setModified(_b);
! fireProjectEntiteFileStateChange(_e);
! } else if (_b) {
setLoaded(_e, null, _b);
+ fireProjectEntiteFileStateChange(_e);
+ }
+
}
public boolean isModified() {
***************
*** 456,463 ****
String old= getValue(_ent);
entitesValues_.put(_ent, _value);
! if (_ent.isValide(_value)) {
badValues_.remove(_ent);
} else
badValues_.add(_ent);
fireEntiteUpdated(_ent, old);
return true;
--- 501,512 ----
String old= getValue(_ent);
entitesValues_.put(_ent, _value);
! if ((entitesToBeEmpty_ != null)
! && (entitesToBeEmpty_.contains(_ent))) {
! badValues_.add(_ent);
! } else if (_ent.isValide(_value)) {
badValues_.remove(_ent);
} else
badValues_.add(_ent);
+
fireEntiteUpdated(_ent, old);
return true;
***************
*** 472,476 ****
if (canUpdate(_ent) == null) {
entitesValues_.put(_ent, _value);
! if (_ent.isValide(_value)) {
badValues_.remove(_ent);
} else
--- 521,528 ----
if (canUpdate(_ent) == null) {
entitesValues_.put(_ent, _value);
! if ((entitesToBeEmpty_ != null)
! && (entitesToBeEmpty_.contains(_ent))) {
! badValues_.add(_ent);
! } else if (_ent.isValide(_value)) {
badValues_.remove(_ent);
} else
***************
*** 623,631 ****
}
}
! protected void fireEntiteStateUpdated(DicoEntite _ent) {
if (modelListener_ != null) {
synchronized (modelListener_) {
for (Iterator it= modelListener_.iterator(); it.hasNext();) {
! ((DicoParamsListener)it.next()).dicoParamsStateEntiteUpdated(
this,
_ent);
--- 675,683 ----
}
}
! protected void fireEntiteValidStateUpdated(DicoEntite _ent) {
if (modelListener_ != null) {
synchronized (modelListener_) {
for (Iterator it= modelListener_.iterator(); it.hasNext();) {
! ((DicoParamsListener)it.next()).dicoParamsValidStateEntiteUpdated(
this,
_ent);
Index: DicoParamsListener.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoParamsListener.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DicoParamsListener.java 25 Nov 2003 10:11:30 -0000 1.5
--- DicoParamsListener.java 11 Dec 2003 12:41:26 -0000 1.6
***************
*** 23,27 ****
DicoEntite _ent,
String _oldValue);
! public void dicoParamsStateEntiteUpdated(DicoParams _cas, DicoEntite _ent);
public void dicoParamsProjectModifyStateChanged(DicoParams _cas);
public void dicoParamsStateLoadedEntiteChanged(
--- 23,27 ----
DicoEntite _ent,
String _oldValue);
! public void dicoParamsValidStateEntiteUpdated(DicoParams _cas, DicoEntite _ent);
public void dicoParamsProjectModifyStateChanged(DicoParams _cas);
public void dicoParamsStateLoadedEntiteChanged(
Index: dico_en.fr_txt
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/dico_en.fr_txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dico_en.fr_txt 14 Nov 2003 08:22:19 -0000 1.4
--- dico_en.fr_txt 11 Dec 2003 12:41:26 -0000 1.5
***************
*** 77,79 ****
La chaine {0} n'est pas un mot-clé=The String {0} is not a keyword
La valeur {0} est ignorée=The value {0} is skipped
! Ce mot-clé doit être défini=This keyword is required
\ No newline at end of file
--- 77,81 ----
La chaine {0} n'est pas un mot-clé=The String {0} is not a keyword
La valeur {0} est ignorée=The value {0} is skipped
! Ce mot-clé doit être défini=This keyword is required
! Le nombre d'éléments doit être inférieur à {0}=The number of elements must be lower than {0}
! Ce mot-clé est inutile=This keyword is unused
|
|
From: <de...@us...> - 2003-12-11 12:42:00
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers
In directory sc8-pr-cvs1:/tmp/cvs-serv23146/fichiers
Modified Files:
FileFormat.java
Log Message:
Ajout de fonctionnalites au modele h2d
Index: FileFormat.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileFormat.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FileFormat.java 25 Nov 2003 10:11:33 -0000 1.6
--- FileFormat.java 11 Dec 2003 12:41:27 -0000 1.7
***************
*** 17,21 ****
* @version $Id$
*/
! public abstract class FileFormat {
public static final int MODE_ASCII= 0;
public static final int MODE_BINAIRE= 1;
--- 17,21 ----
* @version $Id$
*/
! public abstract class FileFormat implements Comparable {
public static final int MODE_ASCII= 0;
public static final int MODE_BINAIRE= 1;
***************
*** 42,45 ****
--- 42,60 ----
}
public abstract String getLastVersion();
+
+ public boolean isExtension(String _ext){
+ if(extensions_==null) return false;
+ return (DodicoLib.findObject(extensions_, _ext)>=0);
+ }
+
+ public abstract FileFormatVersion getLastVersionInstance();
+
+ /**
+ * Si renvoie true, cela signifie que les versions peuvent être
+ * castees en FileFormatVersionGrid pour lire un maillage.
+ */
+ public boolean containsGrid() {
+ return false;
+ }
/**
* Returns the description.
***************
*** 125,127 ****
--- 140,158 ----
}
}
+ /**
+ * Compare les noms des formats
+ */
+ public int compareTo(Object o) {
+ if (!(o instanceof FileFormat))
+ throw new IllegalArgumentException("o doit etre de type FileFormat");
+ return getName().compareTo(((FileFormat)o).getName());
+ }
+
+ /**
+ *
+ */
+ public String toString() {
+ return getName();
+ }
+
}
|
|
From: <de...@us...> - 2003-12-11 12:42:00
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io In directory sc8-pr-cvs1:/tmp/cvs-serv23146/dunes/io Modified Files: DunesFileFormat.java DunesReader.java DunesWriter.java Log Message: Ajout de fonctionnalites au modele h2d Index: DunesFileFormat.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io/DunesFileFormat.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** DunesFileFormat.java 25 Nov 2003 10:11:32 -0000 1.9 --- DunesFileFormat.java 11 Dec 2003 12:41:27 -0000 1.10 *************** *** 9,12 **** --- 9,13 ---- package org.fudaa.dodico.dunes.io; import java.io.File; + import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.fichiers.FileFormat; *************** *** 27,31 **** public class DunesFileFormat extends FileFormat { public final static int NB_FILE= 1; ! private static final DunesFileFormat INSTANCE= new DunesFileFormat(); public static final DunesFileFormat getInstance() { return INSTANCE; --- 28,33 ---- public class DunesFileFormat extends FileFormat { public final static int NB_FILE= 1; ! public static final DunesFileFormat INSTANCE= new DunesFileFormat(); ! private DunesFileFormat.DunesVersion LAST_VERSION; public static final DunesFileFormat getInstance() { return INSTANCE; *************** *** 33,37 **** private DunesFileFormat() { super(NB_FILE); ! extensions_= new String[] { "mail" }; ID_= "DUNES"; nom_= "Dunes"; --- 35,39 ---- private DunesFileFormat() { super(NB_FILE); ! extensions_= new String[] { "mail","geo" }; ID_= "DUNES"; nom_= "Dunes"; *************** *** 45,49 **** } public DunesVersion getLastVersionImpl() { ! return new DunesVersion(getLastVersion()); } public class DunesVersion --- 47,61 ---- } public DunesVersion getLastVersionImpl() { ! if (LAST_VERSION == null) ! LAST_VERSION= new DunesVersion(getLastVersion()); ! return LAST_VERSION; ! } ! ! public FileFormatVersion getLastVersionInstance(){ ! return getLastVersionImpl(); ! } ! ! public boolean containsGrid() { ! return true; } public class DunesVersion *************** *** 107,110 **** --- 119,142 ---- return write(_f, inter, _prog); } + /** + * + */ + public FileOperationSynthese readGrid( + File _f, + ProgressionInterface _prog) { + FileOperationSynthese f= read(_f, _prog); + DunesInterface interf= (DunesInterface)f.getSource(); + if (interf != null) + f.setSource(interf.getMaillage()); + return f; + } + + /** + * + */ + public boolean canWriteOnlyGrid() { + return true; + } + } } Index: DunesReader.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io/DunesReader.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** DunesReader.java 25 Nov 2003 10:11:32 -0000 1.10 --- DunesReader.java 11 Dec 2003 12:41:27 -0000 1.11 *************** *** 235,239 **** } catch (EOFException e) { if (DodicoLib.DEBUG) ! System.out.println("Read end"); } catch (NumberFormatException fe) { DodicoAnalyze.manageException(fe, analyze_, in_); --- 235,239 ---- } catch (EOFException e) { if (DodicoLib.DEBUG) ! DodicoLib.debug("Dunes Read end"); } catch (NumberFormatException fe) { DodicoAnalyze.manageException(fe, analyze_, in_); Index: DunesWriter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io/DunesWriter.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** DunesWriter.java 25 Nov 2003 10:11:32 -0000 1.10 --- DunesWriter.java 11 Dec 2003 12:41:27 -0000 1.11 *************** *** 84,89 **** boolean printAdaptatifV= false; double[] adValeur= dunes_.getAdaptatifValeur(); if (adValeur != null) { - b.append(' '); b.append(version_.getAdaptatifCode()); printAdaptatifV= true; --- 84,89 ---- boolean printAdaptatifV= false; double[] adValeur= dunes_.getAdaptatifValeur(); + b.append(' '); if (adValeur != null) { b.append(version_.getAdaptatifCode()); printAdaptatifV= true; *************** *** 146,150 **** //le nombre de points par elements. int nppel; - int[] index; for (int i= 0; i < nElems; i++) { ppel= maillage.getElement(i); --- 146,149 ---- *************** *** 156,164 **** b.append(nppel); //les indices des points pour l'element i - index= ppel.getPtIndex(); for (int j= 0; j < nppel; j++) { b.append(' '); //Les indices sont stockés a partir de 0. ! b.append(index[j] + 1); } writeln(b); --- 155,162 ---- b.append(nppel); //les indices des points pour l'element i for (int j= 0; j < nppel; j++) { b.append(' '); //Les indices sont stockés a partir de 0. ! b.append(ppel.getPtIndex(j) + 1); } writeln(b); |
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun
In directory sc8-pr-cvs1:/tmp/cvs-serv23146/commun
Modified Files:
DodicoCommandComposite.java DodicoDoubleDoubleSortedList.java
DodicoLib.java DodicoPermanentList.java dodico_en.fr_txt
Log Message:
Ajout de fonctionnalites au modele h2d
Index: DodicoCommandComposite.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoCommandComposite.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DodicoCommandComposite.java 25 Nov 2003 10:11:25 -0000 1.3
--- DodicoCommandComposite.java 11 Dec 2003 12:41:26 -0000 1.4
***************
*** 26,35 ****
return ((command_ == null) || (command_.size() == 0));
}
! public void addCmd(DodicoCommand _cmd) {
if (_cmd != null) {
if (command_ == null)
command_= new ArrayList(10);
command_.add(_cmd);
}
}
public void removeCmd(DodicoCommand _cmd) {
--- 26,37 ----
return ((command_ == null) || (command_.size() == 0));
}
! public boolean addCmd(DodicoCommand _cmd) {
if (_cmd != null) {
if (command_ == null)
command_= new ArrayList(10);
command_.add(_cmd);
+ return true;
}
+ return false;
}
public void removeCmd(DodicoCommand _cmd) {
Index: DodicoDoubleDoubleSortedList.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoDoubleDoubleSortedList.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DodicoDoubleDoubleSortedList.java 25 Nov 2003 10:11:25 -0000 1.4
--- DodicoDoubleDoubleSortedList.java 11 Dec 2003 12:41:26 -0000 1.5
***************
*** 21,24 ****
--- 21,31 ----
val_= new TDoubleArrayList();
}
+
+ public DodicoDoubleDoubleSortedList(DodicoDoubleDoubleSortedList _l) {
+ t_= new TDoubleArrayList(_l.t_.toNativeArray());
+ val_= new TDoubleArrayList(_l.val_.toNativeArray());
+ }
+
+
public boolean containsKey(double _key) {
return indexOfKey(_key) >= 0;
Index: DodicoLib.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoLib.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** DodicoLib.java 25 Nov 2003 10:11:25 -0000 1.18
--- DodicoLib.java 11 Dec 2003 12:41:26 -0000 1.19
***************
*** 8,11 ****
--- 8,14 ----
*/
package org.fudaa.dodico.commun;
+ import gnu.trove.TObjectDoubleHashMap;
+ import gnu.trove.TObjectDoubleIterator;
+
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
***************
*** 66,69 ****
--- 69,76 ----
System.out.println("DEBUG: " + _s);
}
+
+ public static void error(String _s) {
+ System.out.println("ERROR: " + _s);
+ }
public final static Object[] sort(Object[] _o) {
Arrays.sort(_o);
***************
*** 438,441 ****
--- 445,458 ----
else
return getConanicalPathFile(new File(_baseDir, _path));
+ }
+
+ public static TObjectDoubleHashMap copy(TObjectDoubleHashMap _m){
+ TObjectDoubleHashMap r=new TObjectDoubleHashMap(_m);
+ TObjectDoubleIterator it=_m.iterator();
+ for(int i=_m.size();i-->0;){
+ it.advance();
+ r.put(it.key(),it.value());
+ }
+ return r;
}
public static boolean copyFile(File _fileFrom, File _fileTo) {
Index: DodicoPermanentList.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoPermanentList.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DodicoPermanentList.java 25 Nov 2003 10:11:25 -0000 1.4
--- DodicoPermanentList.java 11 Dec 2003 12:41:26 -0000 1.5
***************
*** 14,17 ****
--- 14,21 ----
import java.util.List;
import java.util.Set;
+
+ import javax.swing.AbstractListModel;
+ import javax.swing.ComboBoxModel;
+ import javax.swing.JComboBox;
/**
* @author deniger
***************
*** 88,91 ****
--- 92,134 ----
public void trimToSize() {
throw new UnsupportedOperationException();
+ }
+
+ private class DodicoComboModel extends AbstractListModel implements ComboBoxModel{
+ Object select_;
+ /**
+ *
+ */
+ public Object getSelectedItem() {
+ return select_;
+ }
+
+ /**
+ *
+ */
+ public void setSelectedItem(Object anItem) {
+ if(anItem!=select_){
+ select_=anItem;
+ fireContentsChanged(this, -1, -1);
+ }
+ }
+
+ /**
+ *
+ */
+ public Object getElementAt(int arg0) {
+ return DodicoPermanentList.this.get(arg0);
+ }
+
+ /**
+ *
+ */
+ public int getSize() {
+ return DodicoPermanentList.this.size();
+ }
+
+ }
+
+ public ComboBoxModel createComboBoxModel(){
+ return new DodicoComboModel();
}
}
Index: dodico_en.fr_txt
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/dodico_en.fr_txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dodico_en.fr_txt 14 Nov 2003 08:22:19 -0000 1.4
--- dodico_en.fr_txt 11 Dec 2003 12:41:26 -0000 1.5
***************
*** 52,54 ****
Code inconnu=Unknown code
Maillage=Grid
! Fichier vide=Empty file
\ No newline at end of file
--- 52,55 ----
Code inconnu=Unknown code
Maillage=Grid
! Fichier vide=Empty file
! Le dossier {0} du serveur est introuvable=The folder {0} used by the computation code can't be found.
\ No newline at end of file
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/calcul
In directory sc8-pr-cvs1:/tmp/cvs-serv23146/calcul
Modified Files:
CalculExec.java CalculLauncher.java
CalculLauncherAbstract.java
Removed Files:
CalculLauncherExe.java
Log Message:
Ajout de fonctionnalites au modele h2d
Index: CalculExec.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/calcul/CalculExec.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CalculExec.java 25 Nov 2003 10:11:24 -0000 1.3
--- CalculExec.java 11 Dec 2003 12:41:26 -0000 1.4
***************
*** 14,17 ****
--- 14,18 ----
import com.memoire.fu.FuLib;
import org.fudaa.dodico.commun.DodicoLib;
+ import org.fudaa.dodico.commun.DodicoPreferences;
import org.fudaa.dodico.commun.DodicoUI;
import org.fudaa.dodico.commun.DodicoUIDefault;
***************
*** 30,49 ****
ProgressionInterface progress_;
DodicoUI ui_;
public CalculExec() {
outError_= System.err;
outStandard_= System.out;
}
! public void launch(File _f, String[] _params, CExecListener _l) {
! if ((_params != null) && (_params.length > getMaxArgsNb())) {
! // _mng.error("Nombre d'arguments maximum " + getMaxArgsNb());
! return;
! }
if (ui_ == null)
ui_= DodicoUIDefault.INSTANCE;
! String[] r= getLaunchArray(_f, _params, ui_);
! if (r == null)
! return;
! CExec ex= new CExec(r);
ex.setCatchExceptions(true);
ex.setErrStream(outError_);
ex.setOutStream(outStandard_);
--- 31,57 ----
ProgressionInterface progress_;
DodicoUI ui_;
+ String pathForExec_;
+ boolean changeWorkingDirectory_;
+ boolean launchInNewTerm_;
+ String exec_;
public CalculExec() {
outError_= System.err;
outStandard_= System.out;
}
! public void launch(File _f, CExecListener _l) {
if (ui_ == null)
ui_= DodicoUIDefault.INSTANCE;
! String[] cmd=getLaunchCmd(_f, ui_);
! if(launchInNewTerm_) cmd=getCmdWithNewTermCmd(cmd);
! CExec ex= new CExec(cmd);
ex.setCatchExceptions(true);
+ if (changeWorkingDirectory_) {
+ ex.setExecDirectory(_f.getParentFile());
+ }
+ // if (pathForExec_ != null){
+ // Runtime.getRuntime();
+ // ex.setEnvVariable(new String[] { "PATH=" + pathForExec_ });
+ // }
+
ex.setErrStream(outError_);
ex.setOutStream(outStandard_);
***************
*** 63,143 ****
}
}
! public abstract int getMaxArgsNb();
! /**
! * Doit renvoyer le tableau des parametres a executer a partir
! * du fichier des parametres et des arguments supplementaires.
! * @see #getWinParams(File, String[])
! * @see #getUnixParams(File, String[], List)
! */
! public abstract String[] getLaunchArray(
! File _paramsFile,
! String[] _codeArgs,
! DodicoUI _ui);
! public static boolean getParams(File _f, String[] _codeArgs, List _l) {
! if (FuLib.isWindows())
! return getWinParams(_f, _codeArgs, _l);
! else
! return getUnixParams(_f, _codeArgs, _l);
! }
! /**
! * Ajoute a la liste _l les elements suivant ["C:","repertoire","nom fichier","_codeArgs[0]","_codeArgs[i]"....]
! * Par exemple pour le fichier C:\toto\test.exe, renvoie [C:,\toto\,test.exe].
! * @param _codeArgs les arguments du code de calcul. peuvent être nuls.
! */
! public static boolean getWinParams(File _f, String[] _codeArgs, List _l) {
! if (_f.getParentFile() == null)
! return false;
! String parentPath= _f.getParentFile().getAbsolutePath();
! int index= parentPath.indexOf(":");
! if (index < 0)
! return false;
! int n= _codeArgs == null ? 0 : _codeArgs.length;
! _l.add(parentPath.substring(0, index + 1));
! _l.add(parentPath.substring(index + 1));
! _l.add(_f.getName());
! for (int i= 0; i < n; i++) {
! _l.add(_codeArgs[i]);
}
! return true;
! }
! public static String[] getParams(File _f, String[] _codeArgs) {
! int n= _codeArgs == null ? 0 : _codeArgs.length;
! ArrayList l= new ArrayList(n + 5);
! if (getParams(_f, _codeArgs, l)) {
! return DodicoLib.enTableau(l);
! } else
! return null;
! }
! public static String[] getWinParams(File _f, String[] _codeArgs) {
! int n= _codeArgs == null ? 0 : _codeArgs.length;
! ArrayList l= new ArrayList(n + 5);
! if (getWinParams(_f, _codeArgs, l)) {
! return DodicoLib.enTableau(l);
! } else
! return null;
! }
! public static String[] getUnixParams(File _f, String[] _codeArgs) {
! int n= _codeArgs == null ? 0 : _codeArgs.length;
! ArrayList l= new ArrayList(n + 5);
! if (getUnixParams(_f, _codeArgs, l)) {
! return DodicoLib.enTableau(l);
! } else
! return null;
}
! /**
! * Ajoute a la liste _l un tableau du style [repertoire_fichier,nom_fichier,_codeArgs[0],_codeArgs[i]....]
! * @param _codeArgs les arguments du code de calcul. peuvent être nuls.
! */
! public static boolean getUnixParams(File _f, String[] _codeArgs, List _l) {
! if (_f.getParentFile() == null)
! return false;
! int n= _codeArgs == null ? 0 : _codeArgs.length;
! _l.add(_f.getParentFile().getAbsolutePath());
! _l.add(_f.getName());
! for (int i= 0; i < n; i++) {
! _l.add(_codeArgs[i]);
}
! return true;
}
/**
* Permet de creer (si necessaire) un launcher special pour le code
--- 71,122 ----
}
}
! public String[] getTermCmd() {
! if (FuLib.isWindows()) {
! if (FuLib.getSystemProperty("os.name").indexOf("9") > 0) {
! String[] r= new String[2];
! r[0]= "command.com";
! r[1]= "/C";
! return r;
! }
! String[] r= new String[2];
! r[0]= "cmd.exe";
! r[1]= "/C";
! return r;
}
! String[] r= new String[2];
! r[0]= "xterm";
! r[1]= "-e";
! return r;
}
! public String[] getCmdWithNewTermCmd(String[] _cmd) {
! StringBuffer s= new StringBuffer(_cmd.length * 10);
! int n= _cmd.length;
! s.append(_cmd);
! for (int i= 1; i < n; i++) {
! s.append(DodicoLib.ESPACE).append(_cmd);
}
! String cmd=
! DodicoPreferences.DODICO.getStringProperty("cexec.term.launch", null);
! if (cmd != null) {
! String[] init= DodicoLib.parseString(cmd, DodicoLib.ESPACE);
! int nInit= init.length;
! String[] r= new String[nInit + 1];
! System.arraycopy(init, 0, r, 0, nInit);
! r[nInit]= s.toString();
! return r;
! }
! String[] deb=getTermCmd();
! if(FuLib.isLinux() || FuLib.isUnix()){
! s.append("sh -c");
! }
! String[] r=new String[deb.length+_cmd.length];
! System.arraycopy(deb, 0, r, 0, deb.length);
! System.arraycopy(_cmd, 0, r, deb.length, _cmd.length);
! return r;
}
+ public abstract String[] getLaunchCmd(
+ File _paramsFile,
+ DodicoUI _ui);
+
/**
* Permet de creer (si necessaire) un launcher special pour le code
***************
*** 159,166 ****
DodicoUI _ui) {
File serveurDir= new File("serveurs/" + _serveurName + "/");
- System.out.println(serveurDir.getAbsolutePath());
File launchFile= new File(serveurDir, _launchFile);
! if (!launchFile.exists()) {
! File in= new File(serveurDir, _launchtplFile);
File serveur= new File(serveurDir, _exeFile);
String newToken= serveur.getAbsolutePath();
--- 138,145 ----
DodicoUI _ui) {
File serveurDir= new File("serveurs/" + _serveurName + "/");
File launchFile= new File(serveurDir, _launchFile);
! File in= new File(serveurDir, _launchtplFile);
! if (!launchFile.exists() || (in.lastModified()>launchFile.lastModified())) {
!
File serveur= new File(serveurDir, _exeFile);
String newToken= serveur.getAbsolutePath();
***************
*** 227,230 ****
--- 206,245 ----
if (_dodicoUI != null)
ui_= _dodicoUI;
+ }
+ /**
+ *
+ */
+ public boolean isChangeWorkingDirectory() {
+ return changeWorkingDirectory_;
+ }
+ /**
+ *
+ */
+ public boolean isLauchInNewTerm() {
+ return launchInNewTerm_;
+ }
+ /**
+ *
+ */
+ public String getPathForExec() {
+ return pathForExec_;
+ }
+ /**
+ *
+ */
+ public void setChangeWorkingDirectory(boolean _b) {
+ changeWorkingDirectory_= _b;
+ }
+ /**
+ *
+ */
+ public void setLauchInNewTerm(boolean _b) {
+ launchInNewTerm_= _b;
+ }
+ /**
+ *
+ */
+ public void setPathForExec(String _string) {
+ pathForExec_= _string;
}
}
Index: CalculLauncher.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/calcul/CalculLauncher.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CalculLauncher.java 25 Nov 2003 10:11:24 -0000 1.3
--- CalculLauncher.java 11 Dec 2003 12:41:26 -0000 1.4
***************
*** 17,21 ****
public void execute();
public void stop();
- public void setArgs(String[] _args);
public boolean isFinished();
public void addListener(CalculListener _l);
--- 17,20 ----
Index: CalculLauncherAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/calcul/CalculLauncherAbstract.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CalculLauncherAbstract.java 25 Nov 2003 10:11:24 -0000 1.3
--- CalculLauncherAbstract.java 11 Dec 2003 12:41:26 -0000 1.4
***************
*** 8,16 ****
*/
package org.fudaa.dodico.calcul;
- import java.io.File;
- import java.io.PrintStream;
import java.util.ArrayList;
- import org.fudaa.dodico.commun.DodicoLib;
- import org.fudaa.dodico.commun.ProgressionInterface;
/**
* @author deniger
--- 8,12 ----
***************
*** 18,26 ****
*/
public abstract class CalculLauncherAbstract implements CalculLauncher {
- protected String[] args_;
protected ArrayList listeners_;
- public void setArgs(String[] _args) {
- args_= _args;
- }
public void addListener(CalculListener _l) {
if (listeners_ == null)
--- 14,18 ----
--- CalculLauncherExe.java DELETED ---
|
|
From: <de...@us...> - 2003-12-11 12:41:59
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe
In directory sc8-pr-cvs1:/tmp/cvs-serv22991/graphe
Modified Files:
Axe.java BGrapheInteraction.java BGraphePersonnaliseur.java
Graphe.java
Added Files:
CourbeAbstract.java CourbeDefault.java CourbeModel.java
GrapheComponent.java
Removed Files:
Courbe.java
Log Message:
Modification du paquetage graphe pour prendre en compte les modeles
--- NEW FILE: CourbeAbstract.java ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: CourbeDefault.java ---
/*
* @file Courbe.java
* @creation 1999-07-29
* @modification $Date: 2003/12/11 12:41:52 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.ebli.graphe;
import java.awt.Color;
import java.awt.FontMetrics;
import java.awt.Graphics2D;
import java.awt.Polygon;
import java.util.Vector;
/**
* Courbe
*
* @version $Revision: 1.1 $ $Date: 2003/12/11 12:41:52 $ by $Author: deniger $
* @author Guillaume Desnoix
* @see Graphe
*/
public class CourbeDefault extends CourbeAbstract{
public Vector valeurs;
public CourbeDefault() {
valeurs= new Vector(0, 1);
}
public static CourbeDefault parse(Lecteur lin) {
CourbeDefault r= new CourbeDefault();
String t= lin.get();
if (t.equals("courbe"))
t= lin.get();
if (!t.equals("{"))
System.err.println("Erreur de syntaxe: " + t);
t= lin.get();
while (!t.equals("") && !t.equals("}")) {
if (t.equals("titre"))
r.titre= lin.get();
else if (t.equals("type"))
r.type= lin.get();
else if (t.equals("trace"))
r.trace= lin.get();
else if (t.equals("axe")) {
try {
r.axe= Integer.parseInt(lin.get());
} catch (NumberFormatException e) {}
} else if (t.equals("marqueurs"))
r.marqueurs= lin.get().equals("oui");
else if (t.equals("aspect"))
r.aspect= Aspect.parse(lin);
else if (t.equals("valeurs"))
r.valeurs= Valeur.parse(lin);
else if (t.equals("visible"))
r.visible= lin.get().equals("oui");
else
System.err.println("Erreur de syntaxe: " + t);
t= lin.get();
}
return r;
}
public static CourbeDefault parseXY(Lecteur lin) {
CourbeDefault r= new CourbeDefault();
r.valeurs= Valeur.parseXY(lin);
return r;
}
void trieX() {
boolean b= true;
while (b) {
b= false;
for (int i= 0; i < valeurs.size() - 1; i++) {
Valeur o1= (Valeur)valeurs.elementAt(i);
Valeur o2= (Valeur)valeurs.elementAt(i + 1);
if (o1.s > o2.s) {
b= true;
valeurs.setElementAt(o1, i + 1);
valeurs.setElementAt(o2, i);
if (i >= 0)
i--;
if (i >= 0)
i--;
}
}
}
}
void trieY() {
boolean b= true;
while (b) {
b= false;
for (int i= 0; i < valeurs.size() - 1; i++) {
Valeur o1= (Valeur)valeurs.elementAt(i);
Valeur o2= (Valeur)valeurs.elementAt(i + 1);
if (o1.v > o2.v) {
b= true;
valeurs.setElementAt(o1, i + 1);
valeurs.setElementAt(o2, i);
if (i >= 0)
i--;
if (i >= 0)
i--;
}
}
}
}
double getMinX() {
int n= valeurs.size() - 1;
double r= Double.MAX_VALUE;
double v;
for (int i= n; i >= 0; i--) {
v= ((Valeur)valeurs.elementAt(i)).s;
if (v < r)
r= v;
}
if (r >= Double.MAX_VALUE)
r= 0;
return r;
}
double getMinY() {
int n= valeurs.size() - 1;
double r= Double.MAX_VALUE;
double v;
for (int i= n; i >= 0; i--) {
v= ((Valeur)valeurs.elementAt(i)).v;
if (v < r)
r= v;
}
if (r >= Double.MAX_VALUE)
r= 0;
return r;
}
double getMaxX() {
int n= valeurs.size() - 1;
double r= Double.MIN_VALUE;
double v;
for (int i= n; i >= 0; i--) {
v= ((Valeur)valeurs.elementAt(i)).s;
if (v > r)
r= v;
}
if (r <= Double.MIN_VALUE)
r= 0;
return r;
}
double getMaxY() {
int n= valeurs.size() - 1;
double r= Double.MIN_VALUE;
double v;
for (int i= n; i >= 0; i--) {
v= ((Valeur)valeurs.elementAt(i)).v;
if (v > r)
r= v;
}
if (r <= Double.MIN_VALUE)
r= 0;
return r;
}
public void dessine(
Graphics2D g,
int x,
int y,
int w,
int h,
Axe ax,
Axe ay,
boolean b) {
if (!visible)
return;
if (valeurs.size() == 0)
return;
int xp= 0;
int yp= 0;
if (type.equals("enveloppe")) {
trieX();
type= "enveloppex";
dessine(g, x, y, w, h, ax, ay, b);
trieY();
type= "enveloppey";
dessine(g, x, y, w, h, ax, ay, b);
return;
}
Valeur o0= (Valeur)valeurs.elementAt(0);
int x0=
x + (int) ((double)w * ((o0.s - ax.minimum) / (ax.maximum - ax.minimum)));
int y0=
y
+ h
- (int) ((double)h * ((o0.v - ay.minimum) / (ay.maximum - ay.minimum)));
Valeur o1= (Valeur)valeurs.elementAt(valeurs.size() - 1);
int x1=
x + (int) ((double)w * ((o1.s - ax.minimum) / (ax.maximum - ax.minimum)));
int y1=
y
+ h
- (int) ((double)h * ((o1.v - ay.minimum) / (ay.maximum - ay.minimum)));
Polygon polygon= new Polygon();
g.setColor(b ? aspect.contour : Color.gray);
if (trace.equals("lineaire")) {
for (int i= 0; i < valeurs.size(); i++) {
Valeur o= (Valeur)valeurs.elementAt(i);
int xe=
x
+ (int) ((double)w
* ((o.s - ax.minimum) / (ax.maximum - ax.minimum)));
int ye=
y
+ h
- (int) ((double)h
* ((o.v - ay.minimum) / (ay.maximum - ay.minimum)));
if (type.equals("nuage")) {
g.setColor(b ? aspect.contour : Color.gray);
g.drawLine(xe, ye, xe, ye);
} else if (type.equals("enveloppex")) {
int xg[]= { x0, xe, x1 };
int yg[]= { y0, ye, y1 };
g.setColor(b ? aspect.surface : Color.lightGray);
g.fillPolygon(xg, yg, 3);
} else if (type.equals("enveloppey")) {
int xg[]= { x0, xe, x1 };
int yg[]= { y0, ye, y1 };
g.setColor(b ? aspect.surface : Color.lightGray);
g.fillPolygon(xg, yg, 3);
} else if (type.equals("histogramme")) {
int l= aspect.largeur;
if (l < 0)
l= xe - xp;
else
l=
(int) ((double)w
* ((aspect.largeur - ax.minimum) / (ax.maximum - ax.minimum)));
g.setColor(b ? aspect.surface : Color.lightGray);
g.fillRect(xe - l / 2, ye, l, y + h - ye - 1);
g.setColor(b ? aspect.contour : Color.gray);
g.drawLine(xe - l / 2, y + h - 1, xe - l / 2, ye);
g.drawLine(xe - l / 2, ye, xe + l / 2, ye);
g.drawLine(xe + l / 2, ye, xe + l / 2, y + h - 1);
} else if (type.equals("fuseau")) {
int yeinf=
y
+ h
- (int) ((double)h
* ((o.vinf - ay.minimum) / (ay.maximum - ay.minimum)));
int yesup=
y
+ h
- (int) ((double)h
* ((o.vsup - ay.minimum) / (ay.maximum - ay.minimum)));
g.setColor(b ? aspect.surface : Color.lightGray);
g.drawLine(xe, yeinf, xe, yesup);
g.drawLine(xe - 2, yeinf, xe + 2, yeinf);
g.drawLine(xe - 2, yesup, xe + 2, yesup);
g.setColor(b ? aspect.contour : Color.gray);
g.drawLine(xe - 2, ye, xe + 2, ye);
} else if (type.equals("polygone")) {
polygon.addPoint(xe, ye);
} else if (i > 0) {
if (type.equals("aire")) {
int xg[]= { xp, xe, xe, xp };
int yg[]= { yp, ye, y + h - 1, y + h - 1 };
g.setColor(b ? aspect.surface : Color.lightGray);
g.fillPolygon(xg, yg, 4);
g.setColor(b ? aspect.contour : Color.gray);
}
g.drawLine(xp, yp, xe, ye);
}
xp= xe;
yp= ye;
}
if (type.equals("polygone")) {
g.setColor(b ? aspect.surface : Color.lightGray);
g.fillPolygon(polygon);
g.setColor(b ? aspect.contour : Color.gray);
g.drawPolygon(polygon);
}
}
g.setColor(aspect.texte);
if (marqueurs)
for (int i= 0; i < valeurs.size(); i++) {
Valeur o= (Valeur)valeurs.elementAt(i);
int xe=
x
+ (int) ((double)w
* ((o.s - ax.minimum) / (ax.maximum - ax.minimum)));
int ye=
y
+ h
- (int) ((double)h
* ((o.v - ay.minimum) / (ay.maximum - ay.minimum)));
g.drawRect(xe - 1, ye - 1, 2, 2);
}
g.setColor(aspect.texte);
FontMetrics fm= g.getFontMetrics();
for (int i= 0; i < valeurs.size(); i++) {
Valeur o= (Valeur)valeurs.elementAt(i);
int xe=
x
+ (int) ((double)w * ((o.s - ax.minimum) / (ax.maximum - ax.minimum)));
int ye=
y
+ h
- (int) ((double)h * ((o.v - ay.minimum) / (ay.maximum - ay.minimum)));
g.drawString(o.titre, xe - fm.stringWidth(o.titre) / 2, ye - 3);
}
/*
if((valeurs.size()>0)&&(!titre.equals("")))
{
g.setColor(b ? aspect.texte : Color.gray);
Valeur o=(Valeur)valeurs.elementAt(0);
int xe=x+(int)((double)w*((o.s-ax.minimum)/(ax.maximum-ax.minimum)));
int ye=y+h-(int)((double)h*((o.v-ay.minimum)/(ay.maximum-ay.minimum)));
g.drawString(titre,xe-3-fm.stringWidth(titre),ye+4);
}
*/
}
}
--- NEW FILE: CourbeModel.java ---
/*
* @file Courbe.java
* @creation 1999-07-29
* @modification $Date: 2003/12/11 12:41:52 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.ebli.graphe;
import java.awt.*;
import java.util.Vector;
/**
* Courbe
*
* @version $Revision: 1.1 $ $Date: 2003/12/11 12:41:52 $ by $Author: deniger $
* @author Guillaume Desnoix
* @see Graphe
*/
public class CourbeModel {
public String titre;
public boolean visible;
public String type;
public String trace;
public int axe;
public boolean marqueurs;
public Aspect aspect;
public Vector valeurs;
public CourbeModel() {
titre= "";
visible= true;
type= "courbe";
trace= "lineaire";
axe= 0;
marqueurs= true;
aspect= new Aspect();
aspect.contour= Color.red;
valeurs= new Vector(0, 1);
}
public static CourbeModel parse(Lecteur lin) {
CourbeModel r= new CourbeModel();
String t= lin.get();
if (t.equals("courbe"))
t= lin.get();
if (!t.equals("{"))
System.err.println("Erreur de syntaxe: " + t);
t= lin.get();
while (!t.equals("") && !t.equals("}")) {
if (t.equals("titre"))
r.titre= lin.get();
else if (t.equals("type"))
r.type= lin.get();
else if (t.equals("trace"))
r.trace= lin.get();
else if (t.equals("axe")) {
try {
r.axe= Integer.parseInt(lin.get());
} catch (NumberFormatException e) {}
} else if (t.equals("marqueurs"))
r.marqueurs= lin.get().equals("oui");
else if (t.equals("aspect"))
r.aspect= Aspect.parse(lin);
else if (t.equals("valeurs"))
r.valeurs= Valeur.parse(lin);
else if (t.equals("visible"))
r.visible= lin.get().equals("oui");
else
System.err.println("Erreur de syntaxe: " + t);
t= lin.get();
}
return r;
}
public static CourbeModel parseXY(Lecteur lin) {
CourbeModel r= new CourbeModel();
r.valeurs= Valeur.parseXY(lin);
return r;
}
void trieX() {
boolean b= true;
while (b) {
b= false;
for (int i= 0; i < valeurs.size() - 1; i++) {
Valeur o1= (Valeur)valeurs.elementAt(i);
Valeur o2= (Valeur)valeurs.elementAt(i + 1);
if (o1.s > o2.s) {
b= true;
valeurs.setElementAt(o1, i + 1);
valeurs.setElementAt(o2, i);
if (i >= 0)
i--;
if (i >= 0)
i--;
}
}
}
}
void trieY() {
boolean b= true;
while (b) {
b= false;
for (int i= 0; i < valeurs.size() - 1; i++) {
Valeur o1= (Valeur)valeurs.elementAt(i);
Valeur o2= (Valeur)valeurs.elementAt(i + 1);
if (o1.v > o2.v) {
b= true;
valeurs.setElementAt(o1, i + 1);
valeurs.setElementAt(o2, i);
if (i >= 0)
i--;
if (i >= 0)
i--;
}
}
}
}
double getMinX() {
int n= valeurs.size() - 1;
double r= Double.MAX_VALUE;
double v;
for (int i= n; i >= 0; i--) {
v= ((Valeur)valeurs.elementAt(i)).s;
if (v < r)
r= v;
}
if (r >= Double.MAX_VALUE)
r= 0;
return r;
}
double getMinY() {
int n= valeurs.size() - 1;
double r= Double.MAX_VALUE;
double v;
for (int i= n; i >= 0; i--) {
v= ((Valeur)valeurs.elementAt(i)).v;
if (v < r)
r= v;
}
if (r >= Double.MAX_VALUE)
r= 0;
return r;
}
double getMaxX() {
int n= valeurs.size() - 1;
double r= Double.MIN_VALUE;
double v;
for (int i= n; i >= 0; i--) {
v= ((Valeur)valeurs.elementAt(i)).s;
if (v > r)
r= v;
}
if (r <= Double.MIN_VALUE)
r= 0;
return r;
}
double getMaxY() {
int n= valeurs.size() - 1;
double r= Double.MIN_VALUE;
double v;
for (int i= n; i >= 0; i--) {
v= ((Valeur)valeurs.elementAt(i)).v;
if (v > r)
r= v;
}
if (r <= Double.MIN_VALUE)
r= 0;
return r;
}
void dessine(
Graphics g,
int x,
int y,
int w,
int h,
Axe ax,
Axe ay,
boolean b) {
if (!visible)
return;
if (valeurs.size() == 0)
return;
int xp= 0;
int yp= 0;
if (type.equals("enveloppe")) {
trieX();
type= "enveloppex";
dessine(g, x, y, w, h, ax, ay, b);
trieY();
type= "enveloppey";
dessine(g, x, y, w, h, ax, ay, b);
return;
}
Valeur o0= (Valeur)valeurs.elementAt(0);
int x0=
x + (int) ((double)w * ((o0.s - ax.minimum) / (ax.maximum - ax.minimum)));
int y0=
y
+ h
- (int) ((double)h * ((o0.v - ay.minimum) / (ay.maximum - ay.minimum)));
Valeur o1= (Valeur)valeurs.elementAt(valeurs.size() - 1);
int x1=
x + (int) ((double)w * ((o1.s - ax.minimum) / (ax.maximum - ax.minimum)));
int y1=
y
+ h
- (int) ((double)h * ((o1.v - ay.minimum) / (ay.maximum - ay.minimum)));
Polygon polygon= new Polygon();
g.setColor(b ? aspect.contour : Color.gray);
if (trace.equals("lineaire")) {
for (int i= 0; i < valeurs.size(); i++) {
Valeur o= (Valeur)valeurs.elementAt(i);
int xe=
x
+ (int) ((double)w
* ((o.s - ax.minimum) / (ax.maximum - ax.minimum)));
int ye=
y
+ h
- (int) ((double)h
* ((o.v - ay.minimum) / (ay.maximum - ay.minimum)));
if (type.equals("nuage")) {
g.setColor(b ? aspect.contour : Color.gray);
g.drawLine(xe, ye, xe, ye);
} else if (type.equals("enveloppex")) {
int xg[]= { x0, xe, x1 };
int yg[]= { y0, ye, y1 };
g.setColor(b ? aspect.surface : Color.lightGray);
g.fillPolygon(xg, yg, 3);
} else if (type.equals("enveloppey")) {
int xg[]= { x0, xe, x1 };
int yg[]= { y0, ye, y1 };
g.setColor(b ? aspect.surface : Color.lightGray);
g.fillPolygon(xg, yg, 3);
} else if (type.equals("histogramme")) {
int l= aspect.largeur;
if (l < 0)
l= xe - xp;
else
l=
(int) ((double)w
* ((aspect.largeur - ax.minimum) / (ax.maximum - ax.minimum)));
g.setColor(b ? aspect.surface : Color.lightGray);
g.fillRect(xe - l / 2, ye, l, y + h - ye - 1);
g.setColor(b ? aspect.contour : Color.gray);
g.drawLine(xe - l / 2, y + h - 1, xe - l / 2, ye);
g.drawLine(xe - l / 2, ye, xe + l / 2, ye);
g.drawLine(xe + l / 2, ye, xe + l / 2, y + h - 1);
} else if (type.equals("fuseau")) {
int yeinf=
y
+ h
- (int) ((double)h
* ((o.vinf - ay.minimum) / (ay.maximum - ay.minimum)));
int yesup=
y
+ h
- (int) ((double)h
* ((o.vsup - ay.minimum) / (ay.maximum - ay.minimum)));
g.setColor(b ? aspect.surface : Color.lightGray);
g.drawLine(xe, yeinf, xe, yesup);
g.drawLine(xe - 2, yeinf, xe + 2, yeinf);
g.drawLine(xe - 2, yesup, xe + 2, yesup);
g.setColor(b ? aspect.contour : Color.gray);
g.drawLine(xe - 2, ye, xe + 2, ye);
} else if (type.equals("polygone")) {
polygon.addPoint(xe, ye);
} else if (i > 0) {
if (type.equals("aire")) {
int xg[]= { xp, xe, xe, xp };
int yg[]= { yp, ye, y + h - 1, y + h - 1 };
g.setColor(b ? aspect.surface : Color.lightGray);
g.fillPolygon(xg, yg, 4);
g.setColor(b ? aspect.contour : Color.gray);
}
g.drawLine(xp, yp, xe, ye);
}
xp= xe;
yp= ye;
}
if (type.equals("polygone")) {
g.setColor(b ? aspect.surface : Color.lightGray);
g.fillPolygon(polygon);
g.setColor(b ? aspect.contour : Color.gray);
g.drawPolygon(polygon);
}
}
g.setColor(aspect.texte);
if (marqueurs)
for (int i= 0; i < valeurs.size(); i++) {
Valeur o= (Valeur)valeurs.elementAt(i);
int xe=
x
+ (int) ((double)w
* ((o.s - ax.minimum) / (ax.maximum - ax.minimum)));
int ye=
y
+ h
- (int) ((double)h
* ((o.v - ay.minimum) / (ay.maximum - ay.minimum)));
g.drawRect(xe - 1, ye - 1, 2, 2);
}
g.setColor(aspect.texte);
FontMetrics fm= g.getFontMetrics();
for (int i= 0; i < valeurs.size(); i++) {
Valeur o= (Valeur)valeurs.elementAt(i);
int xe=
x
+ (int) ((double)w * ((o.s - ax.minimum) / (ax.maximum - ax.minimum)));
int ye=
y
+ h
- (int) ((double)h * ((o.v - ay.minimum) / (ay.maximum - ay.minimum)));
g.drawString(o.titre, xe - fm.stringWidth(o.titre) / 2, ye - 3);
}
/*
if((valeurs.size()>0)&&(!titre.equals("")))
{
g.setColor(b ? aspect.texte : Color.gray);
Valeur o=(Valeur)valeurs.elementAt(0);
int xe=x+(int)((double)w*((o.s-ax.minimum)/(ax.maximum-ax.minimum)));
int ye=y+h-(int)((double)h*((o.v-ay.minimum)/(ay.maximum-ay.minimum)));
g.drawString(titre,xe-3-fm.stringWidth(titre),ye+4);
}
*/
}
}
--- NEW FILE: GrapheComponent.java ---
(This appears to be a binary file; contents omitted.)
Index: Axe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/Axe.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Axe.java 25 Nov 2003 10:06:43 -0000 1.5
--- Axe.java 11 Dec 2003 12:41:52 -0000 1.6
***************
*** 8,12 ****
*/
package org.fudaa.ebli.graphe;
! import java.awt.*;
import java.util.Vector;
/**
--- 8,14 ----
*/
package org.fudaa.ebli.graphe;
! import java.awt.Color;
! import java.awt.FontMetrics;
! import java.awt.Graphics2D;
import java.util.Vector;
/**
***************
*** 17,21 ****
* @see Graphe
*/
! public class Axe {
public static boolean DEBUG= BGraphe.DEBUG;
public String titre;
--- 19,23 ----
* @see Graphe
*/
! public class Axe{
public static boolean DEBUG= BGraphe.DEBUG;
public String titre;
***************
*** 87,91 ****
return r;
}
! void dessine(Graphics g, int x, int y, int w, int h) {
if (!visible)
return;
--- 89,93 ----
return r;
}
! void dessine(Graphics2D g, int x, int y, int w, int h) {
if (!visible)
return;
Index: BGrapheInteraction.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/BGrapheInteraction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BGrapheInteraction.java 25 Nov 2003 10:06:43 -0000 1.4
--- BGrapheInteraction.java 11 Dec 2003 12:41:52 -0000 1.5
***************
*** 39,43 ****
coordContext_.g= coordContextP_.g= g;
coordContext_.courbes=
! coordContextP_.courbes= g.getElementsParType(new Courbe().getClass());
coordContext_.axes=
coordContextP_.axes= g.getElementsParType(new Axe().getClass());
--- 39,43 ----
coordContext_.g= coordContextP_.g= g;
coordContext_.courbes=
! coordContextP_.courbes= g.getElementsParType(new CourbeDefault().getClass());
coordContext_.axes=
coordContextP_.axes= g.getElementsParType(new Axe().getClass());
***************
*** 111,115 ****
if (cx.cs == null) {
for (int i= 0; i < cx.courbes.length; i++) {
! Courbe c= (Courbe)cx.courbes[i];
if (!c.visible)
continue;
--- 111,115 ----
if (cx.cs == null) {
for (int i= 0; i < cx.courbes.length; i++) {
! CourbeDefault c= (CourbeDefault)cx.courbes[i];
if (!c.visible)
continue;
***************
*** 183,187 ****
int ivs;
Point vrs;
! Courbe cs;
}
}
--- 183,187 ----
int ivs;
Point vrs;
! CourbeDefault cs;
}
}
Index: BGraphePersonnaliseur.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/BGraphePersonnaliseur.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BGraphePersonnaliseur.java 25 Nov 2003 10:06:43 -0000 1.5
--- BGraphePersonnaliseur.java 11 Dec 2003 12:41:52 -0000 1.6
***************
*** 58,62 ****
graphe= p;
axes= graphe.getElementsParType(new Axe().getClass());
! courbes= graphe.getElementsParType(new Courbe().getClass());
listeners_= new Vector();
int nGraphe= 0;
--- 58,62 ----
graphe= p;
axes= graphe.getElementsParType(new Axe().getClass());
! courbes= graphe.getElementsParType(new CourbeDefault().getClass());
listeners_= new Vector();
int nGraphe= 0;
***************
*** 213,217 ****
String[] itCourbes= new String[courbes.length];
for (int i= 0; i < courbes.length; i++) {
! itCourbes[i]= ((Courbe)courbes[i]).titre;
if ((itCourbes[i] == null) || (itCourbes[i].trim().equals("")))
itCourbes[i]= "courbe " + (i + 1);
--- 213,217 ----
String[] itCourbes= new String[courbes.length];
for (int i= 0; i < courbes.length; i++) {
! itCourbes[i]= ((CourbeDefault)courbes[i]).titre;
if ((itCourbes[i] == null) || (itCourbes[i].trim().equals("")))
itCourbes[i]= "courbe " + (i + 1);
***************
*** 231,235 ****
tfCourbeTitre_.setColumns(8);
if (courbes.length > 0)
! tfCourbeTitre_.setText(((Courbe)courbes[0]).titre);
tfCourbeTitre_.setActionCommand("COURBETITRE");
tfCourbeTitre_.addActionListener(this);
--- 231,235 ----
tfCourbeTitre_.setColumns(8);
if (courbes.length > 0)
! tfCourbeTitre_.setText(((CourbeDefault)courbes[0]).titre);
tfCourbeTitre_.setActionCommand("COURBETITRE");
tfCourbeTitre_.addActionListener(this);
***************
*** 239,243 ****
cbCourbeVisible_.setActionCommand("COURBEVISIBLE");
if (courbes.length > 0)
! cbCourbeVisible_.setSelected(((Courbe)courbes[0]).visible);
cbCourbeVisible_.addActionListener(this);
pnCourbeEd.add(new BuLabel("Visible "), nCourbe++);
--- 239,243 ----
cbCourbeVisible_.setActionCommand("COURBEVISIBLE");
if (courbes.length > 0)
! cbCourbeVisible_.setSelected(((CourbeDefault)courbes[0]).visible);
cbCourbeVisible_.addActionListener(this);
pnCourbeEd.add(new BuLabel("Visible "), nCourbe++);
***************
*** 246,250 ****
cbCourbeMarqueurs_.setActionCommand("COURBEMARQUEURS");
if (courbes.length > 0)
! cbCourbeMarqueurs_.setSelected(((Courbe)courbes[0]).marqueurs);
cbCourbeMarqueurs_.addActionListener(this);
pnCourbeEd.add(new BuLabel("Marqueurs "), nCourbe++);
--- 246,250 ----
cbCourbeMarqueurs_.setActionCommand("COURBEMARQUEURS");
if (courbes.length > 0)
! cbCourbeMarqueurs_.setSelected(((CourbeDefault)courbes[0]).marqueurs);
cbCourbeMarqueurs_.addActionListener(this);
pnCourbeEd.add(new BuLabel("Marqueurs "), nCourbe++);
***************
*** 255,259 ****
if (courbes.length > 0)
btCourbeCouleur_.setIcon(
! new BuColorIcon(((Courbe)courbes[0]).aspect.contour));
btCourbeCouleur_.setActionCommand("COURBECOULEUR");
btCourbeCouleur_.addActionListener(this);
--- 255,259 ----
if (courbes.length > 0)
btCourbeCouleur_.setIcon(
! new BuColorIcon(((CourbeDefault)courbes[0]).aspect.contour));
btCourbeCouleur_.setActionCommand("COURBECOULEUR");
btCourbeCouleur_.addActionListener(this);
***************
*** 289,293 ****
if ((ind < 0) || (ind >= courbes.length))
return;
! Courbe c= (Courbe)courbes[ind];
tfCourbeTitre_.setText(c.titre);
cbCourbeVisible_.setSelected(c.visible);
--- 289,293 ----
if ((ind < 0) || (ind >= courbes.length))
return;
! CourbeDefault c= (CourbeDefault)courbes[ind];
tfCourbeTitre_.setText(c.titre);
cbCourbeVisible_.setSelected(c.visible);
***************
*** 336,344 ****
tfGrapheMargeH_.setValue(new Integer(m.haut));
} else if (prop.equals("COURBES")) {
! courbes= graphe.getElementsParType(new Courbe().getClass());
lsCourbes.removeAll();
String[] itCourbes= new String[courbes.length];
for (int i= 0; i < courbes.length; i++) {
! itCourbes[i]= ((Courbe)courbes[i]).titre;
if ((itCourbes[i] == null) || (itCourbes[i].trim().equals("")))
itCourbes[i]= "courbe " + (i + 1);
--- 336,344 ----
tfGrapheMargeH_.setValue(new Integer(m.haut));
} else if (prop.equals("COURBES")) {
! courbes= graphe.getElementsParType(new CourbeDefault().getClass());
lsCourbes.removeAll();
String[] itCourbes= new String[courbes.length];
for (int i= 0; i < courbes.length; i++) {
! itCourbes[i]= ((CourbeDefault)courbes[i]).titre;
if ((itCourbes[i] == null) || (itCourbes[i].trim().equals("")))
itCourbes[i]= "courbe " + (i + 1);
***************
*** 418,426 ****
String text= tfCourbeTitre_.getText();
int ind= lsCourbes.getSelectedIndex();
! Courbe c= (Courbe)courbes[ind];
c.titre= text;
String[] itCourbes= new String[courbes.length];
for (int i= 0; i < courbes.length; i++) {
! itCourbes[i]= ((Courbe)courbes[i]).titre;
if ((itCourbes[i] == null) || (itCourbes[i].trim().equals("")))
itCourbes[i]= "courbe " + (i + 1);
--- 418,426 ----
String text= tfCourbeTitre_.getText();
int ind= lsCourbes.getSelectedIndex();
! CourbeDefault c= (CourbeDefault)courbes[ind];
c.titre= text;
String[] itCourbes= new String[courbes.length];
for (int i= 0; i < courbes.length; i++) {
! itCourbes[i]= ((CourbeDefault)courbes[i]).titre;
if ((itCourbes[i] == null) || (itCourbes[i].trim().equals("")))
itCourbes[i]= "courbe " + (i + 1);
***************
*** 431,445 ****
} else if (cmd.equals("COURBEVISIBLE")) {
boolean selected= cbCourbeVisible_.isSelected();
! Courbe c= (Courbe)courbes[lsCourbes.getSelectedIndex()];
c.visible= selected;
firePropertyChange("courbeVisible", null, null);
} else if (cmd.equals("COURBEMARQUEURS")) {
boolean selected= cbCourbeMarqueurs_.isSelected();
! Courbe c= (Courbe)courbes[lsCourbes.getSelectedIndex()];
c.marqueurs= selected;
firePropertyChange("courbeMarqueurs", null, null);
} else if (cmd.equals("COURBECOULEUR")) {
// String s=(String)lsCourbes.getSelectedValue();
! Courbe crb= (Courbe)courbes[lsCourbes.getSelectedIndex()];
Color oldc= crb.aspect.contour;
Color c= new JColorChooser().showDialog(this, "Couleur", oldc);
--- 431,445 ----
} else if (cmd.equals("COURBEVISIBLE")) {
boolean selected= cbCourbeVisible_.isSelected();
! CourbeDefault c= (CourbeDefault)courbes[lsCourbes.getSelectedIndex()];
c.visible= selected;
firePropertyChange("courbeVisible", null, null);
} else if (cmd.equals("COURBEMARQUEURS")) {
boolean selected= cbCourbeMarqueurs_.isSelected();
! CourbeDefault c= (CourbeDefault)courbes[lsCourbes.getSelectedIndex()];
c.marqueurs= selected;
firePropertyChange("courbeMarqueurs", null, null);
} else if (cmd.equals("COURBECOULEUR")) {
// String s=(String)lsCourbes.getSelectedValue();
! CourbeDefault crb= (CourbeDefault)courbes[lsCourbes.getSelectedIndex()];
Color oldc= crb.aspect.contour;
Color c= new JColorChooser().showDialog(this, "Couleur", oldc);
Index: Graphe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/Graphe.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Graphe.java 25 Nov 2003 10:06:43 -0000 1.6
--- Graphe.java 11 Dec 2003 12:41:52 -0000 1.7
***************
*** 20,24 ****
*/
public class Graphe {
! public String titre;
public String soustitre;
public boolean legende;
--- 20,24 ----
*/
public class Graphe {
! public String titre;
public String soustitre;
public boolean legende;
***************
*** 26,30 ****
public int vitesse;
public Marges marges;
! public Vector elements;
public Image fond;
public boolean copyright;
--- 26,31 ----
public int vitesse;
public Marges marges;
! private Vector elements;
! private Vector axes;
public Image fond;
public boolean copyright;
***************
*** 70,74 ****
r.elements.addElement(Axe.parse(lin));
else if (t.equals("courbe"))
! r.elements.addElement(Courbe.parse(lin));
else if (t.equals("repartition"))
r.elements.addElement(Repartition.parse(lin));
--- 71,75 ----
r.elements.addElement(Axe.parse(lin));
else if (t.equals("courbe"))
! r.elements.addElement(CourbeDefault.parse(lin));
else if (t.equals("repartition"))
r.elements.addElement(Repartition.parse(lin));
***************
*** 85,89 ****
public static Graphe parseXY(Lecteur lin) {
Graphe r= new Graphe();
! Courbe c= Courbe.parseXY(lin);
Axe v= new Axe();
v.vertical= true;
--- 86,90 ----
public static Graphe parseXY(Lecteur lin) {
Graphe r= new Graphe();
! CourbeDefault c= CourbeDefault.parseXY(lin);
Axe v= new Axe();
v.vertical= true;
***************
*** 100,106 ****
return r;
}
public void ajoute(Object el) {
if (!((el instanceof Axe)
! || (el instanceof Courbe)
|| (el instanceof Repartition)
|| (el instanceof Contrainte))) {
--- 101,116 ----
return r;
}
+
+ private final void addGrapheComponent(GrapheComponent _c){
+ elements.add(_c);
+ }
+
+ public void ajoute(Axe a) {
+ axes.add(a);
+ }
+
public void ajoute(Object el) {
if (!((el instanceof Axe)
! || (el instanceof CourbeAbstract)
|| (el instanceof Repartition)
|| (el instanceof Contrainte))) {
***************
*** 174,178 ****
if (animation) {
for (int i= 0; i < elements.size(); i++)
! if (elements.elementAt(i) instanceof Courbe)
nc++;
if (nc > 0)
--- 184,188 ----
if (animation) {
for (int i= 0; i < elements.size(); i++)
! if (elements.elementAt(i) instanceof CourbeAbstract)
nc++;
if (nc > 0)
***************
*** 202,212 ****
h - marges.haut - marges.bas);
}
! } else if (o instanceof Courbe) {
! Courbe c= (Courbe)o;
Axe aay= null;
if (ay.isEmpty())
aay= new Axe();
else
! aay= (Axe)ay.get(c.axe);
if ((!animation) || (nr == nc)) {
Shape old_clip= g2d.getClip();
--- 212,222 ----
h - marges.haut - marges.bas);
}
! } else if (o instanceof CourbeAbstract) {
! CourbeAbstract c= (CourbeAbstract)o;
Axe aay= null;
if (ay.isEmpty())
aay= new Axe();
else
! aay= (Axe)ay.get(c.getAxeIdx());
if ((!animation) || (nr == nc)) {
Shape old_clip= g2d.getClip();
***************
*** 264,275 ****
for (int i= 0; i < elements.size(); i++) {
Object o= elements.elementAt(i);
! if (o instanceof Courbe) {
! Courbe c= (Courbe)o;
if (((!animation) || (nr == nc))
! && !"".equals(c.titre)
! && c.visible) {
! g2d.setColor(c.aspect.surface);
g2d.fillRect(x + w - marges.droite, yl + 5, 12, 4);
! g2d.setColor(c.aspect.contour);
g2d.drawLine(
x + w - marges.droite,
--- 274,286 ----
for (int i= 0; i < elements.size(); i++) {
Object o= elements.elementAt(i);
! if (o instanceof CourbeAbstract) {
! CourbeAbstract c= (CourbeAbstract)o;
if (((!animation) || (nr == nc))
! && !"".equals(c.getTitre())
! && c.isVisible()) {
! g2d.setColor(c.getAspectSurface());
!
g2d.fillRect(x + w - marges.droite, yl + 5, 12, 4);
! g2d.setColor(c.getAspectContour());
g2d.drawLine(
x + w - marges.droite,
***************
*** 285,290 ****
yl + 5 + 1);
// 8
! g2d.setColor(c.aspect.texte);
! g2d.drawString(c.titre, x + w - marges.droite + 15, yl + 8);
yl += 12;
}
--- 296,301 ----
yl + 5 + 1);
// 8
! g2d.setColor(c.getAspectTexte());
! g2d.drawString(c.getTitre(), x + w - marges.droite + 15, yl + 8);
yl += 12;
}
--- Courbe.java DELETED ---
|
|
From: <de...@us...> - 2003-12-11 12:41:56
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/test
In directory sc8-pr-cvs1:/tmp/cvs-serv22991/test
Added Files:
essai.gdf
Log Message:
Modification du paquetage graphe pour prendre en compte les modeles
--- NEW FILE: essai.gdf ---
graphe
{
legende oui
marges
{
droite 50
gauche 1
haut 1
bas 1
}
courbe
{
titre c1
valeurs
{
4 4
5 5
10 30
40 50
}
}
courbe
{
titre c2
valeurs
{
1 3
4 4
}
}
|
|
From: <de...@us...> - 2003-12-11 12:41:56
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/ressource In directory sc8-pr-cvs1:/tmp/cvs-serv22991/ressource Modified Files: ebli_en.fr_txt Log Message: Modification du paquetage graphe pour prendre en compte les modeles Index: ebli_en.fr_txt =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/ressource/ebli_en.fr_txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ebli_en.fr_txt 14 Nov 2003 08:30:17 -0000 1.4 --- ebli_en.fr_txt 11 Dec 2003 12:41:52 -0000 1.5 *************** *** 90,92 **** Modifier la couleur de tracé du calque sélectionné=Modify the foreground color of the selected layer Modifier la couleur de fond du calque sélectionné=Modify the background color of the selected layer ! calques sélectionnés=Selected layers \ No newline at end of file --- 90,97 ---- Modifier la couleur de tracé du calque sélectionné=Modify the foreground color of the selected layer Modifier la couleur de fond du calque sélectionné=Modify the background color of the selected layer ! calques sélectionnés=Selected layers ! Pas de calques sélectionnés=No layer selected ! Normal=Plain ! Gras=Bold ! Italique=Italic ! Gras Italique=Bold Italic \ No newline at end of file |
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/palette
In directory sc8-pr-cvs1:/tmp/cvs-serv22991/palette
Modified Files:
BSelecteurReduitFonte.java BSelecteurReduitPaletteCouleur.java
Added Files:
BSelecteurReduitFonteNewVersion.java
Log Message:
Modification du paquetage graphe pour prendre en compte les modeles
--- NEW FILE: BSelecteurReduitFonteNewVersion.java ---
(This appears to be a binary file; contents omitted.)
Index: BSelecteurReduitFonte.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BSelecteurReduitFonte.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BSelecteurReduitFonte.java 25 Nov 2003 10:06:45 -0000 1.4
--- BSelecteurReduitFonte.java 11 Dec 2003 12:41:52 -0000 1.5
***************
*** 28,31 ****
--- 28,32 ----
private JComboBox chStyle;
private JLabel lbExemple;
+
public BSelecteurReduitFonte() {
super();
***************
*** 71,74 ****
--- 72,77 ----
return true;
}
+
+
public void actionPerformed(ActionEvent _evt) {
JComponent source= (JComponent)_evt.getSource();
Index: BSelecteurReduitPaletteCouleur.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BSelecteurReduitPaletteCouleur.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BSelecteurReduitPaletteCouleur.java 25 Nov 2003 10:06:45 -0000 1.4
--- BSelecteurReduitPaletteCouleur.java 11 Dec 2003 12:41:52 -0000 1.5
***************
*** 104,107 ****
--- 104,113 ----
return true;
}
+
+ public void setSelectedPalette(BPaletteCouleur _s){
+ if(model_.contains(_s))
+ list_.setSelectedValue(_s,true);
+ else list_.getSelectionModel().clearSelection();
+ }
public void valueChanged(ListSelectionEvent _evt) {
Object v= list_.getSelectedValue();
|
|
From: <de...@us...> - 2003-12-11 12:41:55
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie
In directory sc8-pr-cvs1:/tmp/cvs-serv22991/geometrie
Modified Files:
GrBoite.java GrPolygone.java
Log Message:
Modification du paquetage graphe pour prendre en compte les modeles
Index: GrBoite.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrBoite.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GrBoite.java 25 Nov 2003 10:06:41 -0000 1.5
--- GrBoite.java 11 Dec 2003 12:41:52 -0000 1.6
***************
*** 25,36 ****
if (o == null)
o= new GrPoint(p.x, p.y, p.z);
if (e == null)
e= new GrPoint(p.x, p.y, p.z);
! o.x= Math.min(o.x, p.x);
! o.y= Math.min(o.y, p.y);
! o.z= Math.min(o.z, p.z);
! e.x= Math.max(e.x, p.x);
! e.y= Math.max(e.y, p.y);
! e.z= Math.max(e.z, p.z);
}
public final void ajuste(double x, double y, double z) {
--- 25,40 ----
if (o == null)
o= new GrPoint(p.x, p.y, p.z);
+ else{
+ o.x= Math.min(o.x, p.x);
+ o.y= Math.min(o.y, p.y);
+ o.z= Math.min(o.z, p.z);
+ }
if (e == null)
e= new GrPoint(p.x, p.y, p.z);
! else{
! e.x= Math.max(e.x, p.x);
! e.y= Math.max(e.y, p.y);
! e.z= Math.max(e.z, p.z);
! }
}
public final void ajuste(double x, double y, double z) {
Index: GrPolygone.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrPolygone.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GrPolygone.java 25 Nov 2003 10:06:42 -0000 1.6
--- GrPolygone.java 11 Dec 2003 12:41:52 -0000 1.7
***************
*** 110,113 ****
--- 110,119 ----
}
public final GrPoint centre() {
+ GrPoint r=new GrPoint();
+ centre(r);
+ return r;
+ }
+
+ public final void centre(GrPoint _p) {
double x= 0., y= 0., z= 0.;
double qt= 0.;
***************
*** 121,126 ****
qt += q;
}
! return new GrPoint(x / qt, y / qt, z / qt);
}
public boolean estConvexe() {
int n= nombre();
--- 127,133 ----
qt += q;
}
! _p.setCoordonnees(x / qt, y / qt, z / qt);
}
+
public boolean estConvexe() {
int n= nombre();
|
|
From: <de...@us...> - 2003-12-11 12:41:55
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque
In directory sc8-pr-cvs1:/tmp/cvs-serv22991/calque
Modified Files:
BArbreCalque.java BCalqueAffichage.java
EbliAdapteurSuiviSouris.java ZCalqueAffichageDonnees.java
ZCalqueAffichageDonneesAbstract.java
ZCalqueAffichageDonneesInterface.java ZCalquePoint.java
ZEbliFilleCalques.java
Log Message:
Modification du paquetage graphe pour prendre en compte les modeles
Index: BArbreCalque.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BArbreCalque.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** BArbreCalque.java 25 Nov 2003 10:06:36 -0000 1.7
--- BArbreCalque.java 11 Dec 2003 12:41:51 -0000 1.8
***************
*** 372,375 ****
--- 372,376 ----
class ZBArbreNormalMenu extends BuDynamicMenu {
BArbreCalqueModel arbre_;
+ boolean noLayer_;
/**
* Constructeur.
***************
*** 385,390 ****
protected void build() {
BCalque c= arbre_.getSelectedCalque();
! setEnabled(c != null);
! if ((getMenuComponentCount() == 0) && (c != null)) {
arbre_.fillMenu(this);
}
--- 386,397 ----
protected void build() {
BCalque c= arbre_.getSelectedCalque();
! if((c==null) && (!noLayer_)){
! noLayer_=true;
! removeAll();
! addMenuItem(EbliResource.getS("Pas de calques sélectionnés"),"NO_LAYER", false);
! }
! if ((noLayer_ || (getMenuComponentCount() == 0)) && (c != null)) {
! removeAll();
! noLayer_=false;
arbre_.fillMenu(this);
}
Index: BCalqueAffichage.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueAffichage.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BCalqueAffichage.java 25 Nov 2003 10:06:36 -0000 1.5
--- BCalqueAffichage.java 11 Dec 2003 12:41:51 -0000 1.6
***************
*** 9,12 ****
--- 9,13 ----
package org.fudaa.ebli.calque;
import org.fudaa.ebli.geometrie.*;
+ import org.fudaa.ebli.palette.BPaletteCouleur;
import org.fudaa.ebli.trace.*;
import com.memoire.bu.*;
***************
*** 37,40 ****
--- 38,45 ----
r.ajuste(q);
return r;
+ }
+
+ public BPaletteCouleur getPaletteCouleur(){
+ return null;
}
protected GrBoite getClipReel(Graphics _g) {
Index: EbliAdapteurSuiviSouris.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/EbliAdapteurSuiviSouris.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** EbliAdapteurSuiviSouris.java 25 Nov 2003 10:06:37 -0000 1.6
--- EbliAdapteurSuiviSouris.java 11 Dec 2003 12:41:51 -0000 1.7
***************
*** 57,61 ****
r.append(format_.format(c[i]));
else
! r.append((int)c[i]);
}
// System.out.println(c[0]+", "+c[1]);
--- 57,61 ----
r.append(format_.format(c[i]));
else
! r.append(c[i]);
}
// System.out.println(c[0]+", "+c[1]);
Index: ZCalqueAffichageDonnees.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonnees.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ZCalqueAffichageDonnees.java 25 Nov 2003 10:06:38 -0000 1.8
--- ZCalqueAffichageDonnees.java 11 Dec 2003 12:41:51 -0000 1.9
***************
*** 40,47 ****
}
public void clearSelection() {
! if ((selection_ != null) || (!selection_.isEmpty())) {
selection_.clear();
fireSelectionEvent();
}
}
public int[] getSelectedIndex() {
--- 40,56 ----
}
public void clearSelection() {
! if ((selection_ != null) && (!selection_.isEmpty())) {
selection_.clear();
fireSelectionEvent();
}
+ }
+
+ public void setSelection(int[] _idx){
+ if(selection_==null) selection_=creeSelection();
+ else selection_.clear();
+ for(int i=_idx.length-1;i>=0;i--){
+ selection_.add(_idx[i]);
+ }
+ fireSelectionEvent();
}
public int[] getSelectedIndex() {
Index: ZCalqueAffichageDonneesAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ZCalqueAffichageDonneesAbstract.java 25 Nov 2003 10:06:38 -0000 1.2
--- ZCalqueAffichageDonneesAbstract.java 11 Dec 2003 12:41:51 -0000 1.3
***************
*** 158,160 ****
--- 158,168 ----
return paletteIcone_;
}
+ /**
+ *
+ */
+ public void setForeground(Color _v) {
+ super.setForeground(_v);
+ paletteCouleur_=null;
+ }
+
}
Index: ZCalqueAffichageDonneesInterface.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ZCalqueAffichageDonneesInterface.java 25 Nov 2003 10:06:38 -0000 1.3
--- ZCalqueAffichageDonneesInterface.java 11 Dec 2003 12:41:51 -0000 1.4
***************
*** 19,23 ****
public boolean changeSelection(GrPolygone _p, int _action);
public boolean isSelectionEmpty();
! public abstract ZModeleDonnees modeleDonnees();
public String getName();
}
--- 19,25 ----
public boolean changeSelection(GrPolygone _p, int _action);
public boolean isSelectionEmpty();
! public ZModeleDonnees modeleDonnees();
! public void addSelectionListener(ZSelectionListener _l) ;
! public void removeSelectionListener(ZSelectionListener _l);
public String getName();
}
Index: ZCalquePoint.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalquePoint.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ZCalquePoint.java 25 Nov 2003 10:06:38 -0000 1.9
--- ZCalquePoint.java 11 Dec 2003 12:41:51 -0000 1.10
***************
*** 123,127 ****
_g.setColor(cs);
int nb= selection_.getMaxIndex();
! for (int i= nb; i >= 0; i--) {
if (selection_.isSelected(i)) {
modele_.point(p, i);
--- 123,129 ----
_g.setColor(cs);
int nb= selection_.getMaxIndex();
! int max=modele_.getNombre();
! if(nb>=max) nb=max-1;
! for (int i= selection_.getMinIndex(); i <=nb; i++) {
if (selection_.isSelected(i)) {
modele_.point(p, i);
Index: ZEbliFilleCalques.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliFilleCalques.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ZEbliFilleCalques.java 25 Nov 2003 10:06:38 -0000 1.17
--- ZEbliFilleCalques.java 11 Dec 2003 12:41:51 -0000 1.18
***************
*** 19,22 ****
--- 19,23 ----
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+ import java.awt.event.KeyEvent;
import java.awt.print.PageFormat;
import java.awt.print.Printable;
***************
*** 28,34 ****
--- 29,37 ----
import javax.swing.AbstractButton;
import javax.swing.Action;
+ import javax.swing.ActionMap;
import javax.swing.BorderFactory;
import javax.swing.DefaultCellEditor;
import javax.swing.Icon;
+ import javax.swing.InputMap;
import javax.swing.JColorChooser;
import javax.swing.JComponent;
***************
*** 38,41 ****
--- 41,45 ----
import javax.swing.JTable;
import javax.swing.JViewport;
+ import javax.swing.KeyStroke;
import javax.swing.event.InternalFrameEvent;
import javax.swing.event.TableModelListener;
***************
*** 71,74 ****
--- 75,79 ----
import org.fudaa.ebli.impression.EbliPrinter;
import org.fudaa.ebli.palette.BSelecteurReduitFonte;
+ import org.fudaa.ebli.palette.BSelecteurReduitFonteNewVersion;
import org.fudaa.ebli.palette.BSelecteurReduitPaletteCouleur;
import org.fudaa.ebli.repere.BControleNavigation;
***************
*** 270,283 ****
setTitle(EbliResource.EBLI.getString("Calques"));
setFrameIcon(EbliResource.EBLI.getIcon("calque"));
! if (_groupSelection)
buildButtonGroupSelection();
! if (_groupNavigation)
buildButtonGroupNavigation();
! if (_groupStandard)
buildButtonGroupStandard();
pack();
modelArbre_.refresh();
}
/**
* Methode a utiliser pour ajouter un calque et pour mettre a jour
* le model de l'arbre.
--- 275,309 ----
setTitle(EbliResource.EBLI.getString("Calques"));
setFrameIcon(EbliResource.EBLI.getIcon("calque"));
! if (_groupSelection) {
buildButtonGroupSelection();
! }
! if (_groupNavigation) {
buildButtonGroupNavigation();
! }
! if (_groupStandard) {
buildButtonGroupStandard();
+ }
pack();
modelArbre_.refresh();
}
/**
+ * Update the InputMap,ActionMap for the action _ac.
+ */
+ private void updateMapKeyStroke(Action[] _ac) {
+ if (_ac != null) {
+ InputMap thisMap=
+ getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+ ActionMap m= getActionMap();
+ for (int i= _ac.length - 1; i >= 0; i--) {
+ KeyStroke k= (KeyStroke)_ac[i].getValue(Action.ACCELERATOR_KEY);
+ if (k != null) {
+ Object o= _ac[i].getValue(Action.ACTION_COMMAND_KEY);
+ thisMap.put(k, o);
+ m.put(o, _ac[i]);
+ }
+ }
+ }
+ }
+ /**
* Methode a utiliser pour ajouter un calque et pour mettre a jour
* le model de l'arbre.
***************
*** 402,407 ****
EbliResource.EBLI.getString("Couleur du tracé"),
fg);
! if ((cqActif_ != null) && (fg != null))
cqActif_.setForeground(fg);
}
};
--- 428,434 ----
EbliResource.EBLI.getString("Couleur du tracé"),
fg);
! if ((cqActif_ != null) && (fg != null)) {
cqActif_.setForeground(fg);
+ }
}
};
***************
*** 436,440 ****
l.add(action);
//FONT
! BSelecteurReduitFonte srcft= new BSelecteurReduitFonte();
srcft.addPropertyChangeListener(modelArbre_);
EbliPaletteAction plAction=
--- 463,468 ----
l.add(action);
//FONT
! BSelecteurReduitFonteNewVersion srcft=
! new BSelecteurReduitFonteNewVersion();
srcft.addPropertyChangeListener(modelArbre_);
EbliPaletteAction plAction=
***************
*** 443,447 ****
EbliResource.EBLI.getIcon("fonte"),
srcft,
! "CHOOSE_FOOT");
plAction.putValue(
Action.SHORT_DESCRIPTION,
--- 471,482 ----
EbliResource.EBLI.getIcon("fonte"),
srcft,
! "CHOOSE_FOOT") {
! public void updateBeforeShow() {
! BCalque cq= getCalqueActif();
! if (cq != null)
! ((BSelecteurReduitFonteNewVersion)getPaletteContent()).setSelectedFont(
! cq.getFont());
! }
! };
plAction.putValue(
Action.SHORT_DESCRIPTION,
***************
*** 456,460 ****
EbliResource.EBLI.getIcon("palettecouleur"),
srcpl,
! "CHOOSE_COLOR_PALET");
plAction.putValue(
Action.SHORT_DESCRIPTION,
--- 491,509 ----
EbliResource.EBLI.getIcon("palettecouleur"),
srcpl,
! "CHOOSE_COLOR_PALET") {
! public void updateBeforeShow() {
! BCalque cq= getCalqueActif();
! if (cq instanceof BCalqueAffichage) {
! (
! (BSelecteurReduitPaletteCouleur)getPaletteContent())
! .setSelectedPalette(
! ((BCalqueAffichage)cq).getPaletteCouleur());
! } else
! (
! (BSelecteurReduitPaletteCouleur)getPaletteContent())
! .setSelectedPalette(
! null);
! }
! };
plAction.putValue(
Action.SHORT_DESCRIPTION,
***************
*** 463,466 ****
--- 512,516 ----
standardActionGroup_= new EbliActionInterface[l.size()];
l.toArray(standardActionGroup_);
+ this.updateMapKeyStroke(standardActionGroup_);
}
/**
***************
*** 482,485 ****
--- 532,536 ----
Action.SHORT_DESCRIPTION,
EbliResource.EBLI.getString("Restaurer la vue globale"));
+ restore.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('r'));
int i= 0;
navigationActionGroup_[i++]= restore;
***************
*** 492,495 ****
--- 543,547 ----
cqDepVueI_);
navigationActionGroup_[i++]= action;
+ action.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('m'));
//ZOOM ACTION
action=
***************
*** 502,505 ****
--- 554,558 ----
Action.SHORT_DESCRIPTION,
EbliResource.EBLI.getString("Zoom"));
+ action.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('z'));
navigationActionGroup_[i++]= action;
//REFERENCE
***************
*** 530,533 ****
--- 583,587 ----
addVetoableChangeListener(plAction);
navigationActionGroup_[i++]= plAction;
+ updateMapKeyStroke(navigationActionGroup_);
}
/**
***************
*** 544,547 ****
--- 598,602 ----
"POINT_SELECTION",
ZCalqueSelectionInteraction.PONCTUEL);
+ action.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('s'));
selectedActionGroup_[i++]= action;
action=
***************
*** 550,553 ****
--- 605,609 ----
"RECTANGLE_SELECTION",
ZCalqueSelectionInteraction.RECTANGLE);
+ action.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('r'));
selectedActionGroup_[i++]= action;
action=
***************
*** 556,560 ****
--- 612,618 ----
"POLYGON_SELECTION",
ZCalqueSelectionInteraction.POLYGONE);
+ action.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('p'));
selectedActionGroup_[i++]= action;
+ updateMapKeyStroke(selectedActionGroup_);
}
/**
***************
*** 583,591 ****
}
void setCalqueInteractionActif(BCalqueInteraction _b) {
- if (_b == null)
- System.err.println("layer interactif is null");
- if (EbliLib.DEBUG)
- System.out.println(
- "interactif layer " + (_b == null ? "null" : _b.getName()));
if (cqInteractionActif_ == _b) {
if (_b == cqSelectionI_)
--- 641,644 ----
***************
*** 612,616 ****
vc_.setDefaultCursor();
} else {
! System.err.println(getClass().getName() + " unknown layer " + _b);
}
}
--- 665,669 ----
vc_.setDefaultCursor();
} else {
! EbliLib.error(getClass().getName() + " unknown layer " + _b);
}
}
***************
*** 626,629 ****
--- 679,689 ----
}
}
+
+ /**
+ * Permet de changer le calque actif.
+ */
+ public final void setCalqueActif(BCalque c){
+ modelArbre_.setSelectionCalque(c);
+ }
/**
* @return ArbreCalque
***************
*** 661,665 ****
true)
.addActionListener(this);
! fillMenuWithToolsActions(_m);
}
protected JMenu buildLayerMenu() {
--- 721,727 ----
true)
.addActionListener(this);
! BuMenu m= new BuMenu(EbliResource.getS("Outils"), "TOOLS");
! fillMenuWithToolsActions(m);
! _m.add(m);
}
protected JMenu buildLayerMenu() {
***************
*** 798,801 ****
--- 860,864 ----
setCalqueInteractionActif(cqSelectionI_);
}
+
/** Methode pour vider la selection. */
public void clearSelections() {
|
|
From: <de...@us...> - 2003-12-11 12:41:55
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/dialog
In directory sc8-pr-cvs1:/tmp/cvs-serv22991/dialog
Modified Files:
EbliSimpleDialogPanel.java
Log Message:
Modification du paquetage graphe pour prendre en compte les modeles
Index: EbliSimpleDialogPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/dialog/EbliSimpleDialogPanel.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** EbliSimpleDialogPanel.java 25 Nov 2003 10:06:41 -0000 1.9
--- EbliSimpleDialogPanel.java 11 Dec 2003 12:41:52 -0000 1.10
***************
*** 24,27 ****
--- 24,28 ----
import java.awt.event.WindowListener;
import java.io.File;
+
import javax.swing.BorderFactory;
import javax.swing.JButton;
***************
*** 33,36 ****
--- 34,38 ----
import javax.swing.JTextField;
import javax.swing.border.EmptyBorder;
+
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuButton;
***************
*** 51,54 ****
--- 53,57 ----
import com.memoire.bu.BuVerticalLayout;
import com.memoire.fu.FuLib;
+
import org.fudaa.ebli.commun.EbliLib;
import org.fudaa.ebli.ressource.EbliResource;
***************
*** 404,408 ****
boolean _labelInSamePanel) {
BuPanel pn= new BuPanel();
! pn.setLayout(new BuHorizontalLayout(0, false, true));
JTextField r= new BuTextField(_initValue);
if (_initValue != null)
--- 407,414 ----
boolean _labelInSamePanel) {
BuPanel pn= new BuPanel();
! if (_label == null)
! pn.setLayout(new BuHorizontalLayout(0, false, true));
! else
! pn.setLayout(new BuHorizontalLayout(5, false, true));
JTextField r= new BuTextField(_initValue);
if (_initValue != null)
***************
*** 622,629 ****
* maj du layout et de la boite de dialogue.
*/
! public void actualiseAffichage() {
doLayout();
if (dialog_ != null)
dialog_.pack();
}
/**
--- 628,636 ----
* maj du layout et de la boite de dialogue.
*/
! public void updateGlobalView() {
doLayout();
if (dialog_ != null)
dialog_.pack();
+ dialog_.repaint();
}
/**
|
