Skip to content
Snippets Groups Projects
Commit a920650a authored by Jean-Marie Favreau's avatar Jean-Marie Favreau
Browse files

Petites améliorations

parent d491a818
No related branches found
No related tags found
No related merge requests found
......@@ -4,7 +4,7 @@
from gamme import GammeTemperee
# TODO: enlever la colonne lecture, et ajouter une table des longueur graphique
# TODO: ajouter une table des longueur graphique
# Cette classe permet de générer des exercices d'analyse de spectrogramme au
# format LaTeX à partir d'une partition donnée en paramètre.
......@@ -145,26 +145,24 @@ class GenerateurExercice(GammeTemperee):
result = ""
result += "\\begin{table}[H]\n\centering\n"
result += "\\begin{tabular}{|c||c|c||c|c||c|c|}\n"
result += "\\begin{tabular}{|c||c|c||c|c|}\n"
result += "\\hline\n"
result += " & \multicolumn{2}{c||}{Lecture} & \multicolumn{2}{c||}{Transcription} & \multicolumn{2}{c|}{Codage} \\\\ \n"
result += "\\textbf{Note} & \\textbf{Abscisses} (mm) & \\textbf{Ordonnées} (mm) & \\textbf{Fréquence} (Hz) & \\textbf{Durée} (s) &\\textbf{Note} & \\textbf{Durée} \\\\ \n"
result += " & \multicolumn{2}{c||}{Transcription} & \multicolumn{2}{c|}{Codage} \\\\ \n"
result += "\\textbf{Note} & \\textbf{Fréquence} (Hz) & \\textbf{Durée} (s) &\\textbf{Note} & \\textbf{Durée} \\\\ \n"
result += "\\hline \n"
for i, note in enumerate(partition):
result += str(i + 1) + " & "
if solution:
if isinstance(note[0], float):
result += " TODO & TODO & "
result += '{0:.2f}'.format(note[0]) + " & " + '{0:.2f}'.format(note[1]) + " & "
result += str(int(round(note[0]))) + " & " + '{0:.2f}'.format(note[1]) + " & "
result += self.frequenceToLaTeX(note[0]) + "& " + self.nomDuree(note[1]) + " \\\\\n"
result += "\\hline\n"
else:
result += " TODO & TODO & "
result += ', '.join(['{0:.2f}'.format(n) for n in note[0]]) + " & " + '{0:.2f}'.format(note[1])
result += " & " + ', '.join([self.frequenceToLaTeX(n) for n in note[0]]) + " & " + self.nomDuree(note[1]) + " \\\\\n"
result += "\\hline\n"
else:
result += " & & & & & \\\\\n"
result += " & & & \\\\\n"
result += "\\hline\n"
if not solution:
result += "\\hline\n"
......@@ -191,7 +189,7 @@ class GenerateurExercice(GammeTemperee):
result += "\\hline \n"
for note in notes:
result += self.toLaTeX(note[0], note[1]) + " & " + '{0:.2f}'.format(self.note(note[0], note[1])) + "\\\\\n"
result += self.toLaTeX(note[0], note[1]) + " & " + str(int(round(self.note(note[0], note[1])))) + "\\\\\n"
result += "\\hline\n"
result += "\\end{tabular}\n"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment