cifrado r98 - in trunk: . package/cifrado

[bersace svn gnome org]

Author: bersace
Date: Fri Apr 18 10:21:15 2008
New Revision: 98
URL: http://svn.gnome.org/viewvc/cifrado?rev=98&view=rev

Log:
Ajoute un paramÃtre 'variables' Ã Emission.convertir().
Ne pas sauvegarder les variables dont la valeur est "".


Modified:
   trunk/ChangeLog
   trunk/package/cifrado/cifrado.py
   trunk/package/cifrado/emission.py

Modified: trunk/package/cifrado/cifrado.py
==============================================================================
--- trunk/package/cifrado/cifrado.py	(original)
+++ trunk/package/cifrado/cifrado.py	Fri Apr 18 10:21:15 2008
@@ -784,7 +784,9 @@
     def actualiser_substitutions(self):
         em = self.get_em_crt()
         if em is None:
-            pass
+            return
+        
+        print em
 
         # substitutions
         msg = self.get_msg_crt()
@@ -961,7 +963,8 @@
                        justify=True)
 
         # ChiffrÃ
-        layout = self.layout_text(contexte, em.convertir(message.message),
+        layout = self.layout_text(contexte, em.convertir(message.message,
+                                                         message.lister_variables()),
                                   font=police,
                                   justify=True)
         w,h = layout.get_size()

Modified: trunk/package/cifrado/emission.py
==============================================================================
--- trunk/package/cifrado/emission.py	(original)
+++ trunk/package/cifrado/emission.py	Fri Apr 18 10:21:15 2008
@@ -76,14 +76,19 @@
     def set_val(self, var, val):
         self.subs[var] = val
 
-    def convertir(self, texte):
-        for var in self.subs:
-            texte = texte.replace(var, self.subs[var])
+    def convertir(self, texte, variables):
+        # substitution
+        for var in variables:
+            print var, self.get_val(var)
+            texte = texte.replace(var, self.get_val(var))
+
+        # conversion
         iter = self.codeurs.get_iter_first()
         while iter is not None and self.codeurs.iter_is_valid(iter):
             codeur = self.codeurs.get_value(iter, COL_COD)
             texte = codeur.convertir(texte)
             iter = self.codeurs.iter_next(iter)
+
         return texte
 
     def get_dernier_codeur(self):
@@ -113,9 +118,10 @@
             iter = self.codeurs.iter_next(iter)
 
         for var in self.subs:
-            s = doc.createElement('substitution')
-            s.setAttribute('variable', var)
-            s.setAttribute('valeur', self.subs[var])
-            e.appendChild(s)
+            if not self.get_val(var) == "":
+                s = doc.createElement('substitution')
+                s.setAttribute('variable', var)
+                s.setAttribute('valeur', self.get_val(var))
+                e.appendChild(s)
 
         return e