# HG changeset patch # User cavaliet # Date 1414152214 -7200 # Node ID 726ee64f18a93ad341aa1b3a66c3415ce935ec16 # Parent cb4df234fd799388c6901bcf07446772b896ac87 new cat, new colors, links to embed... diff -r cb4df234fd79 -r 726ee64f18a9 annot-server/static/js/pianoroll.js --- a/annot-server/static/js/pianoroll.js Thu Oct 23 17:51:55 2014 +0200 +++ b/annot-server/static/js/pianoroll.js Fri Oct 24 14:03:34 2014 +0200 @@ -14,28 +14,12 @@ var lineInterval = 5000; // means line every 5 seconds var nbLines = -1; var noteHeight = 110; -var noteColor = [0x2222FF, 0xB74141, - 0x2222FF, 0xB74141, - 0x2222FF, 0xB74141, - 0x2222FF, 0xB74141, - 0x2222FF, 0xB74141, - 0x2222FF, 0xB74141, - 0x2222FF, 0xB74141, - 0x2222FF, 0xB74141, - 0x2222FF, 0xB74141, - 0x2222FF, 0xB74141, - 0x2222FF, 0xB74141, - 0x2222FF, 0xB74141, - 0x2222FF, 0xB74141, - 0x2222FF, 0xB74141, - 0x2222FF, 0xB74141, - 0x2222FF, 0xB74141, - 0x2222FF, 0xB74141, - 0x2222FF, 0xB74141, - 0x2222FF, 0xB74141, - 0x2222FF, 0xB74141, - 0x2222FF, 0xB74141, - 0x2222FF, 0xB74141]; +var noteColor = [0xB90000, 0x4BDD71, 0xAF931E, 0x1C28BA, 0x536991, + 0xB90000, 0x4BDD71, 0xAF931E, 0x1C28BA, 0x536991, + 0xB90000, 0x4BDD71, 0xAF931E, 0x1C28BA, 0x536991, + 0xB90000, 0x4BDD71, 0xAF931E, 0x1C28BA, 0x536991, + 0xB90000, 0x4BDD71, 0xAF931E, 0x1C28BA, 0x536991, + 0xB90000, 0x4BDD71, 0xAF931E, 0x1C28BA, 0x536991]; //var speed = 1; // container -x position at each frame. Speed = 1 ~ 100px for 2 seconds //var zeroTime = new Date("2014-10-06T12:16:43.000000Z").getTime(); var noteDict = [{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{}]; diff -r cb4df234fd79 -r 726ee64f18a9 annot-server/webapp/views.py --- a/annot-server/webapp/views.py Thu Oct 23 17:51:55 2014 +0200 +++ b/annot-server/webapp/views.py Fri Oct 24 14:03:34 2014 +0200 @@ -61,6 +61,11 @@ return render_template('pianoroll.html', logging=True) +@app.route('/liens') +def page_liens(): + return render_template('liens.html') + + @app.route('/api/test', methods=['PUT', 'POST']) def new(): return jsonify(request.get_json(force=False)) diff -r cb4df234fd79 -r 726ee64f18a9 client/data/categories.json --- a/client/data/categories.json Thu Oct 23 17:51:55 2014 +0200 +++ b/client/data/categories.json Fri Oct 24 14:03:34 2014 +0200 @@ -7,46 +7,22 @@ "code": "melodie", "subcategories": [ { - "label": "Bon", - "prelabel": "Mélodie", - "color": "rgb(205,200,63)", - "code": "melodie-bon" - }, - { - "label": "Mauvais", - "prelabel": "Mélodie", - "color": "rgb(205,200,63)", - "code": "melodie-mauvais" - }, - { - "label": "Trop", + "label": "Mélodieux", "prelabel": "Mélodie", "color": "rgb(205,200,63)", "code": "melodie-trop" }, { - "label": "Trop peu", + "label": "Consonnant", "prelabel": "Mélodie", "color": "rgb(205,200,63)", "code": "melodie-trop-peu" }, { - "label": "Dommage", + "label": "Dissonnant", "prelabel": "Mélodie", "color": "rgb(205,200,63)", - "code": "melodie-dommage" - }, - { - "label": "C'est bienvenu", - "prelabel": "Mélodie", - "color": "rgb(205,200,63)", - "code": "melodie-c-est-bienvenu" - }, - { - "label": "Intriguant", - "prelabel": "Mélodie", - "color": "rgb(205,200,63)", - "code": "melodie-intriguant" + "code": "melodie-trop-peu" } ] }, @@ -57,46 +33,28 @@ "code": "rythme", "subcategories": [ { - "label": "Bon", + "label": "Lent", "prelabel": "Rythme", "color": "rgb(78,144,204)", - "code": "rythme-bon" - }, - { - "label": "Mauvais", - "prelabel": "Rythme", - "color": "rgb(78,144,204)", - "code": "rythme-mauvais" - }, - { - "label": "Trop", - "prelabel": "Rythme", - "color": "rgb(78,144,204)", - "code": "rythme-trop" + "code": "rythme-lent" }, { - "label": "Trop peu", - "prelabel": "Rythme", - "color": "rgb(78,144,204)", - "code": "rythme-trop-peu" - }, - { - "label": "Dommage", + "label": "Rapide", "prelabel": "Rythme", "color": "rgb(78,144,204)", - "code": "rythme-dommage" + "code": "rythme-rapide" }, { - "label": "C'est bienvenu", + "label": "Déstructuré", "prelabel": "Rythme", "color": "rgb(78,144,204)", - "code": "rythme-bienvenu" + "code": "rythme-destructure" }, { - "label": "Intriguant", + "label": "Ça swingue", "prelabel": "Rythme", "color": "rgb(78,144,204)", - "code": "rythme-intriguant" + "code": "rythme-destructure" } ] }, @@ -107,46 +65,28 @@ "code": "narration", "subcategories": [ { - "label": "Bon", - "prelabel": "Narration", - "color": "rgb(211,94,60)", - "code": "narration-bon" - }, - { - "label": "Mauvais", - "prelabel": "Narration", - "color": "rgb(211,94,60)", - "code": "narration-mauvais" - }, - { - "label": "Trop", + "label": "Construction", "prelabel": "Narration", "color": "rgb(211,94,60)", "code": "narration-trop" }, { - "label": "Trop peu", + "label": "Suspense", "prelabel": "Narration", "color": "rgb(211,94,60)", "code": "narration-trop-peu" }, { - "label": "Dommage", - "prelabel": "Narration", - "color": "rgb(211,94,60)", - "code": "narration-dommage" - }, - { - "label": "C'est bienvenu", - "prelabel": "Narration", - "color": "rgb(211,94,60)", - "code": "narration-c-est-bienvenu" - }, - { "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" } ] }, @@ -154,51 +94,7 @@ "label": "Interaction entre musiciens", "prelabel": "", "color": "rgb(197,163,202)", - "code": "interaction", - "subcategories": [ - { - "label": "Bon", - "prelabel": "Interaction entre musiciens", - "color": "rgb(197,163,202)", - "code": "interaction-entre-musiciens-bon" - }, - { - "label": "Mauvais", - "prelabel": "Interaction entre musiciens", - "color": "rgb(197,163,202)", - "code": "interaction-entre-musiciens-mauvais" - }, - { - "label": "Trop", - "prelabel": "Interaction entre musiciens", - "color": "rgb(197,163,202)", - "code": "interaction-entre-musiciens-trop" - }, - { - "label": "Trop peu", - "prelabel": "Interaction entre musiciens", - "color": "rgb(197,163,202)", - "code": "interaction-entre-musiciens-trop-peu" - }, - { - "label": "Dommage", - "prelabel": "Interaction entre musiciens", - "color": "rgb(197,163,202)", - "code": "interaction-entre-musiciens-dommage" - }, - { - "label": "C'est bienvenu", - "prelabel": "Interaction entre musiciens", - "color": "rgb(197,163,202)", - "code": "interaction-entre-musiciens-c-est-bienvenu" - }, - { - "label": "Intriguant", - "prelabel": "Interaction entre musiciens", - "color": "rgb(197,163,202)", - "code": "interaction-entre-musiciens-intriguant" - } - ] + "code": "interaction" }, { "label": "Gestuelle", @@ -207,71 +103,133 @@ "code": "gestuelle", "subcategories": [ { - "label": "Bon", + "label": "Contact", "prelabel": "Gestuelle", "color": "rgb(121,187,146)", - "code": "gestuelle-bon" + "code": "gestuelle-dommage" }, { - "label": "Mauvais", - "prelabel": "Gestuelle", - "color": "rgb(121,187,146)", - "code": "gestuelle-mauvais" - }, - { - "label": "Trop", + "label": "Théâtralité", "prelabel": "Gestuelle", "color": "rgb(121,187,146)", "code": "gestuelle-trop" }, { - "label": "Trop peu", + "label": "Danse", "prelabel": "Gestuelle", "color": "rgb(121,187,146)", "code": "gestuelle-trop-peu" + } + ] + }, + { + "label": "Instruments", + "prelabel": "", + "color": "rgb(137,199,214)", + "code": "a-rejouer", + "subcategories": [ + { + "label": "Piano", + "prelabel": "Instruments", + "color": "rgb(137,199,214)", + "code": "a-rejouer-plus-vite" }, { - "label": "Dommage", - "prelabel": "Gestuelle", - "color": "rgb(121,187,146)", - "code": "gestuelle-dommage" + "label": "Clarinette", + "prelabel": "Instruments", + "color": "rgb(137,199,214)", + "code": "a-rejouer-plus-lentement" + }, + { + "label": "Saxophone", + "prelabel": "Instruments", + "color": "rgb(137,199,214)", + "code": "a-rejouer-autre-instrument" + }, + { + "label": "Batterie", + "prelabel": "Instruments", + "color": "rgb(137,199,214)", + "code": "a-rejouer-autre-instrument" + }, + { + "label": "Voix chantée", + "prelabel": "Instruments", + "color": "rgb(137,199,214)", + "code": "a-rejouer-autre-instrument" }, { - "label": "C'est bienvenu", - "prelabel": "Gestuelle", - "color": "rgb(121,187,146)", - "code": "gestuelle-c-est-bienvenu" + "label": "Guitare", + "prelabel": "Instruments", + "color": "rgb(137,199,214)", + "code": "a-rejouer-autre-instrument" + }, + { + "label": "Synthé", + "prelabel": "Instruments", + "color": "rgb(137,199,214)", + "code": "a-rejouer-autre-instrument" + }, + { + "label": "Voix parlée", + "prelabel": "Instruments", + "color": "rgb(137,199,214)", + "code": "a-rejouer-autre-instrument" }, { - "label": "Intriguant", - "prelabel": "Gestuelle", - "color": "rgb(121,187,146)", - "code": "gestuelle-intriguant" + "label": "Karlax", + "prelabel": "Instruments", + "color": "rgb(137,199,214)", + "code": "a-rejouer-autre-instrument" + }, + { + "label": "Boîte à rythme", + "prelabel": "Instruments", + "color": "rgb(137,199,214)", + "code": "a-rejouer-autre-instrument" + }, + { + "label": "Flûte", + "prelabel": "Instruments", + "color": "rgb(137,199,214)", + "code": "a-rejouer-autre-instrument" + }, + { + "label": "Violon", + "prelabel": "Instruments", + "color": "rgb(137,199,214)", + "code": "a-rejouer-autre-instrument" + }, + { + "label": "Flûte Scoatariu", + "prelabel": "Instruments", + "color": "rgb(137,199,214)", + "code": "a-rejouer-autre-instrument" } ] }, { "label": "À Rejouer", "prelabel": "", - "color": "rgb(137,199,214)", + "color": "rgb(222,139,83)", "code": "a-rejouer", "subcategories": [ { "label": "Plus vite", "prelabel": "À Rejouer", - "color": "rgb(137,199,214)", + "color": "rgb(222,139,83)", "code": "a-rejouer-plus-vite" }, { "label": "Plus lentement", "prelabel": "À Rejouer", - "color": "rgb(137,199,214)", + "color": "rgb(222,139,83)", "code": "a-rejouer-plus-lentement" }, { "label": "Avec un autre instrument", "prelabel": "À Rejouer", - "color": "rgb(137,199,214)", + "color": "rgb(222,139,83)", "code": "a-rejouer-autre-instrument" } ] diff -r cb4df234fd79 -r 726ee64f18a9 utils/create_url_polemics_param.py --- a/utils/create_url_polemics_param.py Thu Oct 23 17:51:55 2014 +0200 +++ b/utils/create_url_polemics_param.py Fri Oct 24 14:03:34 2014 +0200 @@ -37,7 +37,7 @@ #else: output.append({"name": c["code"],"keywords": [ c["label"] ], "color" : c["color"] }) - base_url = "http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/embediframe/?project_id=" + options.project_id + "&polemic=all&polemics_list=" + base_url = "http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/embediframe/?project_id=" + options.project_id + "&polemic=all&polemic__max_elements=200&polemics_list=" output_str = json.dumps(output, separators=(',',':')) print "SIMPLE JSON DUMPS :" diff -r cb4df234fd79 -r 726ee64f18a9 utils/pianoroll-client.py --- a/utils/pianoroll-client.py Thu Oct 23 17:51:55 2014 +0200 +++ b/utils/pianoroll-client.py Fri Oct 24 14:03:34 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/test_mercredi22/', list(reader)) + app = UDPSenderApplication(9090, "127.0.0.1", '/pianoroll/mons_vendredi24/', list(reader)) reactor.run()