From 1126b9525a7cb5c00ae4caed1a86a25e51d3fa79 Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <J-Marie.Favreau@uca.fr>
Date: Tue, 29 Jan 2019 15:58:30 +0100
Subject: [PATCH] Glue pour les silences
---
musique/exercice.py | 3 +++
musique/gamme.py | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/musique/exercice.py b/musique/exercice.py
index 0b9b151..cd8850a 100644
--- a/musique/exercice.py
+++ b/musique/exercice.py
@@ -204,6 +204,9 @@ class GenerateurExercice(GammeTemperee):
if note[0] > 0:
result += str(int(round(note[0]))) + " & " + '{0:.2f}'.format(note[1]).replace(".", ",") + " & "
result += self.frequenceToLaTeX(note[0]) + "& " + self.nomDuree(note[1]) + " \\\\\n"
+ else:
+ result += " & "+ '{0:.2f}'.format(note[1]).replace(".", ",") + " & "
+ result += " & " + self.nomDuree(note[1]) + " \\\\\n"
result += "\\hline\n"
else:
result += ', '.join(['{0:.2f}'.format(n) for n in note[0]]) + " & " + '{0:.2f}'.format(note[1]).replace(".", ",")
diff --git a/musique/gamme.py b/musique/gamme.py
index 255ccb0..221aac8 100644
--- a/musique/gamme.py
+++ b/musique/gamme.py
@@ -67,7 +67,7 @@ class GammeTemperee:
notes = [ ["do"], ["do$\\sharp$", "ré$\\flat$"], ["ré"], ["ré$\\sharp$", "mi$\\flat$"],
["mi"], ["fa"], ["fa$\\sharp$", "sol$\\flat$"], ["sol"], ["sol$\\sharp$", "la$\\flat$"],
["la"], ["la$\\sharp$", "si$\\flat$"], ["si"]]
- return ", ".join([n + "$^" + str(octave) + "$" for n in notes[idNote]])
+ return ", ".join([n + " $^" + str(octave) + "$" for n in notes[idNote]])
# definition de la frequence du silence
def silence(self):
--
GitLab