Menu
▾
▴
fudaa-svn-commit
|
From: <cla...@us...> - 2008-10-16 13:33:28
|
Revision: 4071
http://fudaa.svn.sourceforge.net/fudaa/?rev=4071&view=rev
Author: clavreul
Date: 2008-10-16 13:33:20 +0000 (Thu, 16 Oct 2008)
Log Message:
-----------
images relatives
Modified Paths:
--------------
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeFilleNoteDeCalculs.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeFilleResultatsCombinaison.java
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeFilleNoteDeCalculs.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeFilleNoteDeCalculs.java 2008-10-15 22:33:24 UTC (rev 4070)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeFilleNoteDeCalculs.java 2008-10-16 13:33:20 UTC (rev 4071)
@@ -343,14 +343,14 @@
String chemRel = "";
String chemAbs = "";
if (_mode.equals("todisk")) {
- chemRel = name + "files" + AlbeLib.FILE_SEPARATOR + "cetmef-logo.gif";
- chemAbs = f + "files" + AlbeLib.FILE_SEPARATOR + "cetmef-logo.gif";
+ chemRel = name + "files" + AlbeLib.FILE_SEPARATOR + "logo-perso.gif";
+ chemAbs = f + "files" + AlbeLib.FILE_SEPARATOR + "logo-perso.gif";
} else if (_mode.equals("toscreen")) {
chemRel = AlbeLib.NOTE_DE_CALCULS_HTML_FILE + "files" + AlbeLib.FILE_SEPARATOR
- + "cetmef-logo.gif";
+ + "logo-perso.gif";
chemAbs = chemRel;
}
- BuPicture picture = new BuPicture(AlbeResource.ALBE.getIcon("cetmef-logo"));
+ BuPicture picture = new BuPicture(AlbeResource.ALBE.getIcon("logo-perso"));
FileOutputStream out = null;
try {
out = new FileOutputStream(chemAbs);
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeFilleResultatsCombinaison.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeFilleResultatsCombinaison.java 2008-10-15 22:33:24 UTC (rev 4070)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeFilleResultatsCombinaison.java 2008-10-16 13:33:20 UTC (rev 4071)
@@ -96,9 +96,13 @@
String[] deflexions_;
- /** nom du fichier pour l'exportation html des r\xE9sultats. */
+ /** nom du fichier pour l'exportation html des r\xE9sultats.
+ * @f_ : chemin complet
+ * @fRel_ : chemin relatif
+ */
String f_;
-
+ String fRel_;
+
/**
* constructeur.
*/
@@ -207,8 +211,8 @@
f_ = AlbeLib.getFileChoosenByUser(this, "Exporter les r\xE9sultats d\xE9taill\xE9s", "Enregistrer",
AlbeLib.USER_HOME
+ "resultatsAlbe_combinaison"
- + (typeCombi_ == AlbeLib.COMBINAISON_MANUELLE ? "manuelle" : (numCombi_ + "_" + AlbeRes
- .nomCombinaison(typeCombi_))) + ".html");
+ + (typeCombi_ == AlbeLib.COMBINAISON_MANUELLE ? "manuelle" : (numCombi_ + "_" + AlbeRes.nomCombinaison(typeCombi_))) + ".html");
+ fRel_ = "resultatsAlbe_combinaison"+ (typeCombi_ == AlbeLib.COMBINAISON_MANUELLE ? "manuelle" : (numCombi_ + "_" + AlbeRes.nomCombinaison(typeCombi_))) + ".html";
if (f_ == null) {
return;
}
@@ -327,15 +331,26 @@
/**
*
*/
- protected String addImgFromScript(final String _script, final String _imgname, final String _alt) {
+ /* protected String addImgFromScript(final String _script, final String _imgname, final String _alt) {
String html = "";
final String _img = f_ + "files" + AlbeLib.FILE_SEPARATOR + _imgname;
AlbeLib.exportGraphScriptToGif(_script, _img);
html += "<a href=\"" + _img + "\" target=\"_blank\"><img src=\"" + _img + "\" alt =\"" + _alt
+ "\"></a>" + CtuluLibString.LINE_SEP;
return html;
+ }*/
+
+ protected String addImgFromScript(final String _script, final String _imgname, final String _alt) {
+ String html = "";
+ final String _img =f_+ "files" + "/" + _imgname;
+ final String _imgRel=fRel_ + "files" + "/" + _imgname;
+ AlbeLib.exportGraphScriptToGif(_script, _img);
+ html += "<a href=\"" + _imgRel + "\" target=\"_blank\"><img src=\"" + _imgRel + "\" alt =\"" + _alt
+ + "\"></a>" + CtuluLibString.LINE_SEP;
+ return html;
}
+
/**
*
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cla...@us...> - 2008-10-16 13:40:54
|
Revision: 4072
http://fudaa.svn.sourceforge.net/fudaa/?rev=4072&view=rev
Author: clavreul
Date: 2008-10-16 13:40:50 +0000 (Thu, 16 Oct 2008)
Log Message:
-----------
astuces et logo
Modified Paths:
--------------
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/astuces.txt
Added Paths:
-----------
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/logo-perso.gif
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/astuces.txt
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/astuces.txt 2008-10-16 13:33:20 UTC (rev 4071)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/astuces.txt 2008-10-16 13:40:50 UTC (rev 4072)
@@ -15,4 +15,5 @@
La note de calculs est generee ou exportee sous forme de fichiers html. Des parties du contenu de la note de calcul peuvent etre facilement copiees d'un navigateur Internet vers un tableur ou un traitement de texte.
Les avertissements sont en deux categories : en vert les non-bloquants avertissant d'une incoherence potentielle dans les donnees mais permettant le lancement du calcul, en rouge les bloquants avertissant d'un probleme dans les donnees et empechant le lancement du calcul.
Pour sauvegarder le projet utiliser l'ic\xF4ne ou faire ctrl+S.
-La fenetre unite donne un certain nombre de conversions.
\ No newline at end of file
+La fenetre unite donne un certain nombre de conversions.
+Pour inserer un logo personnalis\xE9 dans une note de calcul au format html, il suffit de remplacer le fichier "logo-perso.gif" du sous-repertoire notefiles, par une image au format gif (a renommer en logo-perso.gif)
\ No newline at end of file
Added: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/logo-perso.gif
===================================================================
(Binary files differ)
Property changes on: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/logo-perso.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fa...@us...> - 2008-11-28 16:40:38
|
Revision: 4250
http://fudaa.svn.sourceforge.net/fudaa/?rev=4250&view=rev
Author: fargeix
Date: 2008-11-28 16:40:34 +0000 (Fri, 28 Nov 2008)
Log Message:
-----------
Correction d'un dysfonctionnement relatif ?\195?\160 l'affichage de l'aide dans Fudaa-Albe
Modified Paths:
--------------
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeImplementation.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeLancementCalculsFrame.java
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeImplementation.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeImplementation.java 2008-11-27 16:48:21 UTC (rev 4249)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeImplementation.java 2008-11-28 16:40:34 UTC (rev 4250)
@@ -174,13 +174,13 @@
/** titre du logiciel */
isAlbe_.name = "Albe";
/** version courante du logiciel */
- isAlbe_.version = "1.0";
+ isAlbe_.version = "1.1";
/** date de la version courante du logiciel */
- isAlbe_.date = "16/02/07";
+ isAlbe_.date = "28/11/08";
/** informations sur le droits r\xE9serv\xE9s */
isAlbe_.rights = "CETMEF (c) 2003";
/** email du responsable du logiciel */
- isAlbe_.contact = "Oli...@eq...";
+ isAlbe_.contact = "Cla...@de...";
/** informations sur la licence de d\xE9veloppement */
isAlbe_.license = "GPL2";
/** langage support\xE9 */
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeLancementCalculsFrame.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeLancementCalculsFrame.java 2008-11-27 16:48:21 UTC (rev 4249)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeLancementCalculsFrame.java 2008-11-28 16:40:34 UTC (rev 4250)
@@ -54,7 +54,7 @@
public AlbeLancementCalculsFrame(final BuCommonInterface _appli, final FudaaProjet _project,
final AlbeFilleParametres _fp) {
- super("Lancemement des calculs", "executer", _appli, _project);
+ super("Lancement des calculs", "executer", _appli, _project);
setSize(620, 410);
appli_ = _appli.getApp();
@@ -220,11 +220,12 @@
* affiche l'aide concernant le lancement des calculs.
*/
protected void aide() {
- String path = "file://" + AlbeImplementation.informationsSoftware().man
+ String path = /*"file://" +*/ AlbeImplementation.informationsSoftware().man
+ AlbeImplementation.informationsSoftware().name.toLowerCase() + "/" + AlbeMsg.URL009
+ ".html";
// String path = "aide/albe/" + helpfile_ + ".html";
- getImplementation().showHtml(path);
+ //getImplementation().showHtml(path);
+ getImplementation().displayURL(path);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X