# HG changeset patch # User cavaliet # Date 1414230851 -7200 # Node ID 9f6b2da245a300987af9ad3d44dd0e28ded5058c # Parent 7db9c7ec691a14b69a0745ca81cbb6d7514a5dc0 new cats diff -r 7db9c7ec691a -r 9f6b2da245a3 client/data/categories.json --- a/client/data/categories.json Sat Oct 25 06:44:33 2014 +0200 +++ b/client/data/categories.json Sat Oct 25 11:54:11 2014 +0200 @@ -1,210 +1,214 @@ { "categories": [ { - "label": "Mélodie", + "label": "Ça me raconte", "prelabel": "", "color": "rgb(205,200,63)", "code": "melodie", "subcategories": [ { "label": "Mélodieux", - "prelabel": "Mélodie", + "prelabel": "Ça me raconte", "color": "rgb(205,200,63)", - "code": "melodie-trop" + "code": "cameraconte-melodieux" }, { "label": "Consonnant", - "prelabel": "Mélodie", + "prelabel": "Ça me raconte", "color": "rgb(205,200,63)", - "code": "melodie-trop-peu" + "code": "cameraconte-consonnant" }, { "label": "Dissonnant", - "prelabel": "Mélodie", + "prelabel": "Ça me raconte", "color": "rgb(205,200,63)", - "code": "melodie-trop-peu" + "code": "cameraconte-dissonnant" + }, + { + "label": "Construction", + "prelabel": "Ça me raconte", + "color": "rgb(211,94,60)", + "code": "cameraconte-construction" + }, + { + "label": "Suspense", + "prelabel": "Ça me raconte", + "color": "rgb(211,94,60)", + "code": "cameraconte-suspens" + }, + { + "label": "Intriguant", + "prelabel": "Ça me raconte", + "color": "rgb(211,94,60)", + "code": "cameraconte-intriguant" + }, + { + "label": "Régulier", + "prelabel": "Ça me raconte", + "color": "rgb(211,94,60)", + "code": "cameraconte-regulier" } ] }, { - "label": "Rythme", + "label": "Ça me bouge", "prelabel": "", "color": "rgb(78,144,204)", "code": "rythme", "subcategories": [ { "label": "Lent", - "prelabel": "Rythme", + "prelabel": "Ça me bouge", "color": "rgb(78,144,204)", - "code": "rythme-lent" + "code": "camebouge-lent" }, { "label": "Rapide", - "prelabel": "Rythme", + "prelabel": "Ça me bouge", "color": "rgb(78,144,204)", - "code": "rythme-rapide" + "code": "camebouge-rapide" }, { "label": "Déstructuré", - "prelabel": "Rythme", + "prelabel": "Ça me bouge", "color": "rgb(78,144,204)", - "code": "rythme-destructure" + "code": "camebouge-destructure" }, { "label": "Ça swingue", - "prelabel": "Rythme", + "prelabel": "Ça me bouge", "color": "rgb(78,144,204)", - "code": "rythme-destructure" + "code": "camebouge-caswingue" } ] }, { - "label": "Narration", - "prelabel": "", - "color": "rgb(211,94,60)", - "code": "narration", - "subcategories": [ - { - "label": "Construction", - "prelabel": "Narration", - "color": "rgb(211,94,60)", - "code": "narration-trop" - }, - { - "label": "Suspense", - "prelabel": "Narration", - "color": "rgb(211,94,60)", - "code": "narration-trop-peu" - }, - { - "label": "Intriguant", - "prelabel": "Narration", - "color": "rgb(211,94,60)", - "code": "narration-intriguant" - }, - { - "label": "Régulier", - "prelabel": "Narration", - "color": "rgb(211,94,60)", - "code": "narration-dommage" - } - ] - }, - { - "label": "Interaction entre musiciens", - "prelabel": "", - "color": "rgb(197,163,202)", - "code": "interaction" - }, - { - "label": "Gestuelle", + "label": "Ça se bagarre", "prelabel": "", "color": "rgb(121,187,146)", "code": "gestuelle", "subcategories": [ { + "label": "Interaction entre musiciens", + "prelabel": "Ça se bagarre", + "color": "rgb(121,187,146)", + "code": "casebagarre-interaction" + }, + { "label": "Contact", - "prelabel": "Gestuelle", + "prelabel": "Ça se bagarre", "color": "rgb(121,187,146)", - "code": "gestuelle-dommage" + "code": "casebagarre-contact" }, { "label": "Théâtralité", "prelabel": "Gestuelle", "color": "rgb(121,187,146)", - "code": "gestuelle-trop" + "code": "casebagarre-theatralite" }, { "label": "Danse", "prelabel": "Gestuelle", "color": "rgb(121,187,146)", - "code": "gestuelle-trop-peu" + "code": "casebagarre-danse" } ] }, { - "label": "Instruments", + "label": "Ça sonne", "prelabel": "", "color": "rgb(137,199,214)", "code": "a-rejouer", "subcategories": [ { "label": "Piano", - "prelabel": "Instruments", + "prelabel": "Ça sonne", "color": "rgb(137,199,214)", - "code": "a-rejouer-plus-vite" + "code": "casonne-piano" }, { "label": "Clarinette", - "prelabel": "Instruments", + "prelabel": "Ça sonne", "color": "rgb(137,199,214)", - "code": "a-rejouer-plus-lentement" + "code": "casonne-clarinette" }, { "label": "Saxophone", - "prelabel": "Instruments", + "prelabel": "Ça sonne", "color": "rgb(137,199,214)", - "code": "a-rejouer-autre-instrument" + "code": "casonne-saxophone" }, { "label": "Batterie", - "prelabel": "Instruments", + "prelabel": "Ça sonne", "color": "rgb(137,199,214)", - "code": "a-rejouer-autre-instrument" + "code": "casonne-batterie" }, { "label": "Voix chantée", - "prelabel": "Instruments", + "prelabel": "Ça sonne", "color": "rgb(137,199,214)", - "code": "a-rejouer-autre-instrument" + "code": "casonne-voixchantee" }, { "label": "Guitare", - "prelabel": "Instruments", + "prelabel": "Ça sonne", "color": "rgb(137,199,214)", - "code": "a-rejouer-autre-instrument" + "code": "casonne-guitare" }, { "label": "Synthé", - "prelabel": "Instruments", + "prelabel": "Ça sonne", "color": "rgb(137,199,214)", - "code": "a-rejouer-autre-instrument" + "code": "casonne-synthe" }, { "label": "Voix parlée", - "prelabel": "Instruments", + "prelabel": "Ça sonne", "color": "rgb(137,199,214)", - "code": "a-rejouer-autre-instrument" + "code": "casonne-voixparlee" }, { "label": "Karlax", - "prelabel": "Instruments", + "prelabel": "Ça sonne", "color": "rgb(137,199,214)", - "code": "a-rejouer-autre-instrument" + "code": "casonne-karlax" }, { "label": "Boîte à rythme", - "prelabel": "Instruments", + "prelabel": "Ça sonne", "color": "rgb(137,199,214)", - "code": "a-rejouer-autre-instrument" + "code": "casonne-boitearythme" }, { "label": "Flûte", - "prelabel": "Instruments", + "prelabel": "Ça sonne", "color": "rgb(137,199,214)", - "code": "a-rejouer-autre-instrument" + "code": "casonne-flute" }, { "label": "Violon", - "prelabel": "Instruments", + "prelabel": "Ça sonne", "color": "rgb(137,199,214)", - "code": "a-rejouer-autre-instrument" + "code": "casonne-violon" }, { "label": "Flûte Scoatariu", - "prelabel": "Instruments", + "prelabel": "Ça sonne", + "color": "rgb(137,199,214)", + "code": "casonne-flutescoatariu" + }, + { + "label": "Violoncelle", + "prelabel": "Ça sonne", "color": "rgb(137,199,214)", - "code": "a-rejouer-autre-instrument" + "code": "casonne-violoncelle" + }, + { + "label": "Accordéon", + "prelabel": "Ça sonne", + "color": "rgb(137,199,214)", + "code": "casonne-accordeon" } ] }, diff -r 7db9c7ec691a -r 9f6b2da245a3 utils/pianoroll-client.py --- a/utils/pianoroll-client.py Sat Oct 25 06:44:33 2014 +0200 +++ b/utils/pianoroll-client.py Sat Oct 25 11:54:11 2014 +0200 @@ -48,6 +48,6 @@ with open(sys.argv[1], 'rU') as datafile: reader = csv.reader(datafile, delimiter=' ') - app = UDPSenderApplication(9090, "127.0.0.1", '/pianoroll/mons_vendredi24/', list(reader)) + app = UDPSenderApplication(9090, "127.0.0.1", '/pianoroll/mons_samedi25/', list(reader)) reactor.run()