diff --git a/boomwhackers-8+5+c.json b/boomwhackers-8+5+c.json
index 3e1da36ffb3e66725a3ba343d0c9b2d15d056d13..ff4ba81091a9edecca38a1c0253d62bd36e9a071 100644
--- a/boomwhackers-8+5+c.json
+++ b/boomwhackers-8+5+c.json
@@ -5,13 +5,13 @@
"fa1": { "couleur": [81, 255, 0], "capsule": "1", "court": "1" },
"sol1": { "couleur": [0, 118, 88], "capsule": "1", "court": "1" },
"la1": { "couleur": [140, 0, 255], "capsule": "1", "court": "1" },
- "si1": { "couleur": [221, 0, 115], "capsule": "1", "court": "1" },
+ "si1": { "couleur": [221, 86, 147], "capsule": "1", "court": "1" },
"dod1": { "couleur": [255, 0, 0], "capsule": "1", "court": "1", "alteration": "\\#" },
"mib1": { "couleur": [255, 238, 0], "capsule": "1", "court": "1", "alteration" : "b"},
"fad1": { "couleur": [81, 255, 0], "capsule": "1", "court": "1", "alteration": "\\#" },
"sold1": { "couleur": [0, 118, 88], "capsule": "1", "court": "1", "alteration": "\\#" },
- "sib1": { "couleur": [221, 0, 115], "capsule": "1", "court": "1", "alteration" : "b" },
+ "sib1": { "couleur": [221, 86, 147], "capsule": "1", "court": "1", "alteration" : "b" },
"do2": { "couleur": [255, 0, 0], "capsule": "0", "court": "1" },
"re2": { "couleur": [255, 170, 20], "capsule": "0", "court": "1" },
@@ -19,13 +19,13 @@
"fa2": { "couleur": [81, 255, 0], "capsule": "0", "court": "1" },
"sol2": { "couleur": [0, 118, 88], "capsule": "0", "court": "1" },
"la2": { "couleur": [140, 0, 255], "capsule": "0", "court": "1" },
- "si2": { "couleur": [221, 0, 115], "capsule": "0", "court": "1" },
+ "si2": { "couleur": [221, 86, 147], "capsule": "0", "court": "1" },
"do3": { "couleur": [255, 0, 0], "capsule": "0", "court": "0" },
"dod2": { "couleur": [255, 0, 0], "capsule": "0", "court": "1", "alteration": "\\#" },
"mib2": { "couleur": [255, 238, 0], "capsule": "0", "court": "1", "alteration" : "b"},
"fad2": { "couleur": [81, 255, 0], "capsule": "0", "court": "1", "alteration": "\\#" },
"sold2": { "couleur": [0, 118, 88], "capsule": "0", "court": "1", "alteration": "\\#" },
- "sib2": { "couleur": [221, 0, 115], "capsule": "0", "court": "1", "alteration" : "b" }
+ "sib2": { "couleur": [221, 86, 147], "capsule": "0", "court": "1", "alteration" : "b" }
}
diff --git a/boomwhackers-8+5.json b/boomwhackers-8+5.json
index 8c57bbb030285ae947139e3cca010c05463ed91e..00586d131882751dd0e910de9572f049ba2cb7e0 100644
--- a/boomwhackers-8+5.json
+++ b/boomwhackers-8+5.json
@@ -1,31 +1,18 @@
{
- "do1": { "couleur": [255, 0, 0], "capsule": "1", "court": "1" },
- "re1": { "couleur": [255, 170, 20], "capsule": "1", "court": "1" },
- "mi1": { "couleur": [255, 238, 0], "capsule": "1", "court": "1" },
- "fa1": { "couleur": [81, 255, 0], "capsule": "1", "court": "1" },
- "sol1": { "couleur": [0, 118, 88], "capsule": "1", "court": "1" },
- "la1": { "couleur": [140, 0, 255], "capsule": "1", "court": "1" },
- "si1": { "couleur": [221, 0, 115], "capsule": "1", "court": "1" },
-
- "dod1": { "couleur": [255, 0, 0], "capsule": "1", "court": "1", "alteration": "#" },
- "mib1": { "couleur": [255, 238, 0], "capsule": "1", "court": "1", "alteration" : "b"},
- "fad1": { "couleur": [81, 255, 0], "capsule": "1", "court": "1", "alteration": "#" },
- "sold1": { "couleur": [0, 118, 88], "capsule": "1", "court": "1", "alteration": "#" },
- "sib1": { "couleur": [221, 0, 115], "capsule": "1", "court": "1", "alteration" : "b" },
-
- "do2": { "couleur": [255, 0, 0], "capsule": "1", "court": "1" },
- "re2": { "couleur": [255, 170, 20], "capsule": "0", "court": "1" },
- "mi2": { "couleur": [255, 238, 0], "capsule": "0", "court": "1" },
- "fa2": { "couleur": [81, 255, 0], "capsule": "0", "court": "1" },
- "sol2": { "couleur": [0, 118, 88], "capsule": "0", "court": "1" },
- "la2": { "couleur": [140, 0, 255], "capsule": "0", "court": "1" },
- "si2": { "couleur": [221, 0, 115], "capsule": "0", "court": "1" },
- "do3": { "couleur": [255, 0, 0], "capsule": "0", "court": "0" },
-
- "dod2": { "couleur": [255, 0, 0], "capsule": "0", "court": "1", "alteration": "#" },
- "mib2": { "couleur": [255, 238, 0], "capsule": "0", "court": "1", "alteration" : "b"},
- "fad2": { "couleur": [81, 255, 0], "capsule": "0", "court": "1", "alteration": "#" },
- "sold2": { "couleur": [0, 118, 88], "capsule": "0", "court": "1", "alteration": "#" },
- "sib2": { "couleur": [221, 0, 115], "capsule": "0", "court": "1", "alteration" : "b" }
+ "do1": { "couleur": [255, 0, 0], "capsule": "0", "court": "1" },
+ "re1": { "couleur": [255, 170, 20], "capsule": "0", "court": "1" },
+ "mi1": { "couleur": [255, 238, 0], "capsule": "0", "court": "1" },
+ "fa1": { "couleur": [81, 255, 0], "capsule": "0", "court": "1" },
+ "sol1": { "couleur": [0, 118, 88], "capsule": "0", "court": "1" },
+ "la1": { "couleur": [140, 0, 255], "capsule": "0", "court": "1" },
+ "si1": { "couleur": [221, 86, 147], "capsule": "0", "court": "1" },
+ "do2": { "couleur": [255, 0, 0], "capsule": "0", "court": "0" },
+
+ "dod1": { "couleur": [255, 0, 0], "capsule": "0", "court": "1", "alteration": "#" },
+ "mib1": { "couleur": [255, 238, 0], "capsule": "0", "court": "1", "alteration" : "b"},
+ "fad1": { "couleur": [81, 255, 0], "capsule": "0", "court": "1", "alteration": "#" },
+ "sold1": { "couleur": [0, 118, 88], "capsule": "0", "court": "1", "alteration": "#" },
+ "sib1": { "couleur": [221, 86, 147], "capsule": "0", "court": "1", "alteration" : "b" },
+
}
diff --git a/boomwhackers-8.json b/boomwhackers-8.json
index 4ccc82a347bcc0feffbe9d425febc09780657ec8..23a99975b68ab62b7c646b542dbd11b3da10a388 100644
--- a/boomwhackers-8.json
+++ b/boomwhackers-8.json
@@ -5,12 +5,7 @@
"fa1": { "couleur": [81, 255, 0], "capsule": "0", "court": "1" },
"sol1": { "couleur": [0, 118, 88], "capsule": "0", "court": "1" },
"la1": { "couleur": [140, 0, 255], "capsule": "0", "court": "1" },
- "si1": { "couleur": [221, 0, 115], "capsule": "0", "court": "1" },
- "do2": { "couleur": [255, 0, 0], "capsule": "0", "court": "0" },
-
- "dod1": { "couleur": [255, 0, 0], "capsule": "0", "court": "1", "alteration": "#" },
- "mib1": { "couleur": [255, 238, 0], "capsule": "0", "court": "1", "alteration" : "♭"},
- "fad1": { "couleur": [81, 255, 0], "capsule": "0", "court": "1", "alteration": "#" },
- "sold1": { "couleur": [0, 118, 88], "capsule": "0", "court": "1", "alteration": "#" },
- "sib1": { "couleur": [221, 0, 115], "capsule": "0", "court": "1", "alteration" : "♭" },
+ "si1": { "couleur": [221, 86, 147], "capsule": "0", "court": "1" },
+ "do2": { "couleur": [255, 0, 0], "capsule": "0", "court": "0" }
+
}
diff --git a/musique/exercice.py b/musique/exercice.py
index 73303f12ca9dffd8e4233f06269b4e2723ac1145..7d25f9ca31225e429d54a13f3a7e512d93c30f15 100644
--- a/musique/exercice.py
+++ b/musique/exercice.py
@@ -242,11 +242,12 @@ class GenerateurExercice(GammeTemperee):
result += "\\hline \n"
for i, note in enumerate(partition):
result += str(i + 1) + " & "
- if solution:
+ if solution or i < 3:
if isinstance(note[0], float):
if note[0] > 0:
result += self.frequenceToLaTeX(note[0],
self.minOctave, self.maxOctave) + "& " + self.nomDuree(note[1]) + " \\\\\n"
+ result += "\\hline\n"
else:
result += " & " + self.nomDuree(note[1]) + " \\\\\n"
result += "\\hline\n"
@@ -412,7 +413,7 @@ class GenerateurExercice(GammeTemperee):
if beamer:
result += "\\frame{"
- result += "\\frametitle{Partition graphique}"
+ result += "\\frametitle{Représentation graphique}"
frequences = self.notesDansPartition(partitions)
@@ -440,7 +441,13 @@ class GenerateurExercice(GammeTemperee):
if self.estDessinable(partitions):
p = partitions[0]
-
+ if beamer:
+ result += self.ensembleDesNotesGraphiques(frequences, radius, beamer)
+ result += "}"
+ result += "\\frame{"
+ result += "\\frametitle{Représentation graphique}"
+
+
result += self.ensembleDesNotesGraphiques(frequences, radius, beamer)
if not beamer: