Version 11.04a

lukasmonk · Dec 7, 2017 · 9ecc1ce · 9ecc1ce
1 parent 2afabbc
commit 9ecc1ce
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/Code/Init.py b/Code/Init.py
@@ -9,7 +9,7 @@
 from Code.Constantes import *
 
 DEBUG = False
-VERSION = "11.04"
+VERSION = "11.04a"
 
 if DEBUG:
     prlkn("DEBUG " * 20)

diff --git a/Code/QT/WBase.py b/Code/QT/WBase.py
@@ -369,8 +369,8 @@ def gridDato(self, grid, fila, oColumna):
         NAG_0, NAG_1, NAG_2, NAG_3, NAG_4, NAG_5, NAG_6 = range(7)
 
         color_nag = NAG_0
-        liNAGs = jg.critica.strip().split(" ") if jg.critica else []
-        for critica in liNAGs:
+        stNAGS = set(jg.critica.strip().split(" ") if jg.critica else [])
+        for critica in stNAGS:
             if critica in ("1", "2", "3", "4", "5", "6"):
                 color_nag = critica
                 break
@@ -397,20 +397,21 @@ def gridDato(self, grid, fila, oColumna):
                     info = "(%+0.2f)" % float(pts / 100.0)
 
             nag, color_nag = mrm.setNAG_Color(self.configuracion, rm)
-            liNAGs.append(nag)
+            stNAGS.add(str(nag))
 
         criticaDirecta = jg.criticaDirecta
         if criticaDirecta:
             nag = {"??": NAG_4, "?": NAG_2, "!!": NAG_3, "!": NAG_1, "!?": NAG_5, "?!": NAG_6}.get(criticaDirecta,
                                                                                                    NAG_0)
-            liNAGs.append(nag)
+            stNAGS.add(str(nag))
             color_nag = nag
 
 
+
         if jg.siApertura or jg.critica or jg.comentario or jg.variantes:
             siA = jg.siApertura
             nR = 0
-            if jg.critica and nag == NAG_0:
+            if jg.critica:
                 nR += 1
             if jg.comentario:
                 nR += 1
@@ -431,7 +432,7 @@ def gridDato(self, grid, fila, oColumna):
                  NAG_5: c.color_nag5,
                  NAG_6: c.color_nag6}[color_nag]
 
-        return pgn, color, info, indicadorInicial, liNAGs
+        return pgn, color, info, indicadorInicial, stNAGS
 
 
     def gridPonValor(self, grid, fila, oColumna, valor):

diff --git a/bug.log b/bug.log
@@ -1 +1 @@
-Version 11.04
+Version 11.04a