diff --git a/boomwhackers-8+5+c.json b/boomwhackers-8+5+c.json index ff4ba81091a9edecca38a1c0253d62bd36e9a071..767b18f5c0877506a91ba247b51afc0a54dd8b9c 100644 --- a/boomwhackers-8+5+c.json +++ b/boomwhackers-8+5+c.json @@ -1,5 +1,5 @@ { - "do1": { "couleur": [255, 0, 0], "capsule": "1", "court": "1" }, + "do1": { "couleur": [255, 0, 0], "capsule": "1", "court": "0" }, "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" }, @@ -13,14 +13,14 @@ "sold1": { "couleur": [0, 118, 88], "capsule": "1", "court": "1", "alteration": "\\#" }, "sib1": { "couleur": [221, 86, 147], "capsule": "1", "court": "1", "alteration" : "b" }, - "do2": { "couleur": [255, 0, 0], "capsule": "0", "court": "1" }, + "do2": { "couleur": [255, 0, 0], "capsule": "0", "court": "0" }, "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, 86, 147], "capsule": "0", "court": "1" }, - "do3": { "couleur": [255, 0, 0], "capsule": "0", "court": "0" }, + "do3": { "couleur": [255, 0, 0], "capsule": "0", "court": "1" }, "dod2": { "couleur": [255, 0, 0], "capsule": "0", "court": "1", "alteration": "\\#" }, "mib2": { "couleur": [255, 238, 0], "capsule": "0", "court": "1", "alteration" : "b"}, diff --git a/boomwhackers-8+5.json b/boomwhackers-8+5.json index 00586d131882751dd0e910de9572f049ba2cb7e0..2a980ccf3eec167a43641c010d535255a8154dfa 100644 --- a/boomwhackers-8+5.json +++ b/boomwhackers-8+5.json @@ -1,12 +1,12 @@ { - "do1": { "couleur": [255, 0, 0], "capsule": "0", "court": "1" }, + "do1": { "couleur": [255, 0, 0], "capsule": "0", "court": "0" }, "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" }, + "do2": { "couleur": [255, 0, 0], "capsule": "0", "court": "1" }, "dod1": { "couleur": [255, 0, 0], "capsule": "0", "court": "1", "alteration": "#" }, "mib1": { "couleur": [255, 238, 0], "capsule": "0", "court": "1", "alteration" : "b"}, diff --git a/boomwhackers-8.json b/boomwhackers-8.json index 23a99975b68ab62b7c646b542dbd11b3da10a388..f143d77e5f5eb4cd5cdb3882827742568b136c17 100644 --- a/boomwhackers-8.json +++ b/boomwhackers-8.json @@ -1,11 +1,11 @@ { - "do1": { "couleur": [255, 0, 0], "capsule": "0", "court": "1" }, + "do1": { "couleur": [255, 0, 0], "capsule": "0", "court": "0" }, "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" } + "do2": { "couleur": [255, 0, 0], "capsule": "0", "court": "1" } } diff --git a/musique/exercice.py b/musique/exercice.py index 7d25f9ca31225e429d54a13f3a7e512d93c30f15..821c0cc65d0bce2112e8e088c06ca0927e3771e0 100644 --- a/musique/exercice.py +++ b/musique/exercice.py @@ -349,12 +349,12 @@ class GenerateurExercice(GammeTemperee): str(x) + "," + str(y) + ") circle (" + str(rayon) + ");" if "alteration" in boomwhacker: if (boomwhacker["couleur"][0] + boomwhacker["couleur"][1] + boomwhacker["couleur"][2]) > 128 * 3: - result += "\\draw (" + str(x) + "," + str(y) + ") node{" + str(boomwhacker["alteration"]) + "};" + result += "\\draw (" + str(x) + "," + str(y) + ") node{\\footnotesize " + str(boomwhacker["alteration"]) + "};" else: - result += "\\draw[color=white] (" + str(x) + "," + str(y) + ") node{" + str(boomwhacker["alteration"]) + "};" + result += "\\draw[color=white] (" + str(x) + "," + str(y) + ") node{\\footnotesize " + str(boomwhacker["alteration"]) + "};" if boomwhacker["capsule"] == "1": - result += "\\fill [black] (" + str(x - r) + "," + str(y - 1.2 * r) + \ - ") rectangle (" + str(x + r) + ", " + str(y - 1.9 * r) + ");" + result += "\\fill [black] (" + str(x - r/2) + "," + str(y - 1.2 * r) + \ + ") rectangle (" + str(x + r/2) + ", " + str(y - 1.9 * r) + ");" return result @@ -427,7 +427,7 @@ class GenerateurExercice(GammeTemperee): stepx = 2 stepy = 2.5 - radius = stepx * 0.22 + radius = stepx * 0.18 # if the notes are all short, we increase space between circles maxSpace = max(self.dureeEnNoires(note[1]) for note in partitions[0])