Showing the changes to python (1 of 1 file). Show all
Unified · Split
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | #! /usr/bin/env python |
| 2 | 2 | |
| 3 | −def get_keyboard_edges(firstnote = 21, lastnote = 108, y0 = 0, y1 = 1): | |
| 3 | +def get_keyboard_edges(firstnote = 21, lastnote = 108): | |
| 4 | 4 | octaves = 10 |
| 5 | 5 | |
| 6 | 6 | # build template of white notes |
| @@ -22,18 +22,7 @@ def get_keyboard_edges(firstnote = 21, lastnote = 108, y0 = 0, y1 = 1): · 15 unmodified lines | ||
| 22 | 22 | if curnote > firstnote-1 and curnote < lastnote+1: |
| 23 | 23 | xw = xw + [curnote] |
| 24 | 24 | |
| 25 | − xwdelta = [1/2. * scalew for i in range(len(xw))] | |
| 26 | − yw = [y0+(y1-y0)*1/2. for i in range(len(xw))] | |
| 27 | − ywdelta = [(y1-y0)*1/2. for i in range(len(xw))] | |
| 28 | − | |
| 29 | − xbdelta = [2/3. * scaleb for i in range(len(xb))] | |
| 30 | − yb = [y0+(y1-y0)*2/3. for i in range(len(xb))] | |
| 31 | − ybdelta = [(y1-y0)*1/3. for i in range(len(xb))] | |
| 32 | − | |
| 33 | − whites,white_height = xw,yw | |
| 34 | − blacks,black_height = xb,yb | |
| 35 | − | |
| 36 | − return blacks,whites, 2/3. *scaleb, 1/2. * scalew | |
| 25 | + return xb, xw, 2/3. *scaleb, 1/2. * scalew | |
| 37 | 26 | |
| 38 | 27 | def create_keyboard_patches(firstnote, lastnote, ax = None): |
| 39 | 28 | import numpy as np |
| @@ -69,17 +58,6 @@ def create_keyboard_patches(firstnote, lastnote, ax = None): · 29 unmodified lines | ||
| 69 | 58 | |
| 70 | 59 | if __name__ == '__main__': |
| 71 | 60 | |
| 72 | − if 0: | |
| 73 | − from aubio.gnuplot import gnuplot_create | |
| 74 | − import Gnuplot | |
| 75 | − whites = Gnuplot.Data(blacks, yw,xwdelta,ywdelta,with_ = 'boxxyerrorbars') | |
| 76 | − blacks = Gnuplot.Data(whites, yb,xbdelta,ybdelta,with_ = 'boxxyerrorbars fill solid') | |
| 77 | − g = gnuplot_create('','') | |
| 78 | − #g('set style fill solid .5') | |
| 79 | − #g('set xrange [60-.5:72+.5]') | |
| 80 | − #g('set yrange [-0.1:1.1]') | |
| 81 | − g.plot(whites,blacks) | |
| 82 | − else: | |
| 83 | − import matplotlib.pyplot as plt | |
| 84 | − create_keyboard_patches(firstnote = 61, lastnote = 108) | |
| 85 | − plt.show() | |
| 61 | + import matplotlib.pyplot as plt | |
| 62 | + create_keyboard_patches(firstnote = 58, lastnote = 84) | |
| 63 | + plt.show() | |