[Fudaa-svn-commit] SF.net SVN: fudaa:[4071] trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe

[<cla...@us...>]

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.