From ae495be3818cfc5a3ac5af8f81208ba2560a8eec Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Thu, 12 Feb 2009 20:41:05 +0000 Subject: removing sensors from release version; adding keyboard input --- diff --git a/alsaaudio.so b/alsaaudio.so deleted file mode 100644 index 1c1f834..0000000 --- a/alsaaudio.so +++ /dev/null Binary files differ diff --git a/audiograb.py b/audiograb.py deleted file mode 100755 index 74a531e..0000000 --- a/audiograb.py +++ /dev/null @@ -1,335 +0,0 @@ -#! /usr/bin/python -# Author: Arjun Sarwal arjun@laptop.org -# Copyright (C) 2007, OLPC -# -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - -import signal, os -import time -import audioop -import subprocess -from struct import * -from string import * -from numpy.oldnumeric import * -from numpy.fft import * -import alsaaudio -from alsaaudio import Mixer - -class AudioGrab(): - - def __init__(self): - - self.rate=4000 #Default sampling rate at startup of device - self.handoff_state = True - - self.sensor_type = 0 - self.sensor_val1 = -1 - - self.inp = alsaaudio.PCM(alsaaudio.PCM_CAPTURE, alsaaudio.PCM_NORMAL) - self.inp.setformat(alsaaudio.PCM_FORMAT_S16_LE) - self.inp.setchannels(1) - self.inp.setperiodsize(160) - - # test to see if DC Mode is enabled - try: - self.dcmode = Mixer('DC Mode Enable') - self.bias = Mixer('V_REFOUT Enable') - self.has_dcmode = True - except: - print "DC Mode unavailable" - self.has_dcmode = False - - def _final_calculate_sensor_val(self, raw_buffer): - """This function is used to compute the sensor value to be returned from the raw buffer value""" - sensor_val1 = 0 - buf = str(raw_buffer) - if self.sensor_type ==1 : - integer_buffer = list(unpack( str(int(len(buf))/2)+'h' , buf)) - integer_buffer = integer_buffer[0:128] - fftx = real_fft(integer_buffer, 128,-1) - fftx=fftx[10:len(fftx)] - buffers=[abs(y) for y in fftx] - max_val1=10 - max_buffers = max(buffers) - for x in range(0,len(buffers)): - if buffers[x]==max_buffers: - max_val1=x - sensor_val1= (max_val1*1.75) - if sensor_val1>=100: - sensor_val1=100 - #(above)mapping values from 40 to 120 to values 0-100 as index 40 to 120 were found most responsive to voice and whistle - - #elif self.sensor_type == 1: - # sensor_val1 = (audioop.rms(buf, 2)*0.0030466) - elif self.sensor_type==0: - sensor_val1 = (audioop.rms(buf, 2)*0.0030466) - elif self.sensor_type==2: - sensor_val1 = (audioop.avg(buf, 2)*0.00152333) + 50.0 - elif self.sensor_type==3: - sensor_val1 = (audioop.rms(buf, 2)*0.0030466) - - sensor_val1=(sensor_val1*3.0) #To return a value between 0 and 300 - return sensor_val1 - - def get_sensor_val(self, sensor_type = 0): - """Calculates sensor value based upon appropriate mode and puts it in the queue""" - data_buffer = self.read_samples(sensor_type) - final_sensor_val = self._final_calculate_sensor_val(data_buffer) - return final_sensor_val - - def read_samples(self, sensor_type =0): - self.set_sensor_type(sensor_type) - l,data = self.inp.read() - return data - - def mute_master(self): - """Mutes the Master Control""" - os.system("amixer set Master mute") - - def unmute_master(self): - """Unmutes the Master Control""" - os.system("amixer set Master unmute") - - def mute_PCM(self): - """Mutes the PCM Control""" - os.system("amixer set PCM mute") - - def unmute_PCM(self): - """Unmutes the PCM Control""" - os.system("amixer set PCM unmute") - - def mute_mic(self): - """Mutes the Mic Control""" - os.system("amixer set Mic mute") - - def unmute_mic(self): - """Unmutes the Mic Control""" - os.system("amixer set Mic unmute") - - def set_master(self, master_val ): - """Sets the Master gain slider settings - master_val must be given as an integer between 0 and 100 indicating the - percentage of the slider to be set""" - os.system("amixer set Master " + str(master_val) + "%") - - def get_master(self): - """Gets the Master gain slider settings. The value returned is an integer between 0-100 - and is an indicative of the percentage 0 - 100%""" - p = str(subprocess.Popen(["amixer", "get", "Master"], stdout=subprocess.PIPE).communicate()[0]) - p = p[find(p,"Front Left:"):] - p = p[find(p,"[")+1:] - p = p[:find(p,"%]")] - return int(p) - - def get_mix_for_recording(self): - """Returns True if Mix is set as recording device and False if it isn't """ - p = str(subprocess.Popen(["amixer", "get", "Mix", "capture", "cap"], stdout=subprocess.PIPE).communicate()[0]) - p = p[find(p,"Mono:"):] - p = p[find(p,"[")+1:] - p = p[:find(p,"]")] - if p=="on" : - return True - else: - return False - - def get_mic_for_recording(self): - """Returns True if mic is set as recording device and False if it isn't """ - p = str(subprocess.Popen(["amixer", "get", "Mic", "capture", "cap"], stdout=subprocess.PIPE).communicate()[0]) - p = p[find(p,"Mono:"):] - p = p[find(p,"[")+1:] - p = p[:find(p,"]")] - if p=="on" : - return True - else: - return False - - def set_mic_for_recording(self): - """Sets Mic as the default recording source""" - os.system("amixer set Mic capture cap") - - def set_mix_for_recording(self): - """Sets Mix as the default recording source""" - os.system("amixer set Mix capture cap") - - def set_bias(self,bias_state=False): - """Sets the Bias control - pass False to disable and True to enable""" - if self.has_dcmode: - if bias_state==False: - self.bias.setmute(1) - else: - self.bias.setmute(0) - - def get_bias(self): - """Returns the setting of Bias control - i.e. True: Enabled and False: Disabled""" - if self.has_dcmode: - p = str(subprocess.Popen(["amixer", "get", "'V_REFOUT Enable'"], stdout=subprocess.PIPE).communicate()[0]) - p = p[find(p,"Mono:"):] - p = p[find(p,"[")+1:] - p = p[:find(p,"]")] - if p=="on" : - return True - else: - return False - else: return False - - def set_dc_mode(self, dc_mode = False): - """Sets the DC Mode Enable control - pass False to mute and True to unmute""" - if self.has_dcmode: - if dc_mode==False: - self.dcmode.setmute(1) - else: - self.dcmode.setmute(0) - - def get_dc_mode(self): - """Returns the setting of DC Mode Enable control - i .e. True: Unmuted and False: Muted""" - if self.has_dcmode: - p = str(subprocess.Popen(["amixer", "get", "'DC Mode Enable'"], stdout=subprocess.PIPE).communicate()[0]) - p = p[find(p,"Mono:"):] - p = p[find(p,"[")+1:] - p = p[:find(p,"]")] - if p=="on" : - return True - else: - return False - else: return False - - def set_mic_boost(self, mic_boost=False): - """Sets the Mic Boost +20dB control - pass False to mute and True to unmute""" - if mic_boost==False: - mb_str="mute" - else: - mb_str="unmute" - os.system("amixer set 'Mic Boost (+20dB)' " + mb_str) - - def get_mic_boost(self): - """Returns the setting of Mic Boost +20dB control - i.e. True: Unmuted and False: Muted""" - p = str(subprocess.Popen(["amixer", "get", "'Mic Boost (+20dB)'"], stdout=subprocess.PIPE).communicate()[0]) - p = p[find(p,"Mono:"):] - p = p[find(p,"[")+1:] - p = p[:find(p,"]")] - if p=="on" : - return True - else: - return False - - def set_capture_gain(self, capture_val): - """Sets the Capture gain slider settings - capture_val must be given as an integer between 0 and 100 indicating the - percentage of the slider to be set""" - os.system("amixer set Capture " + str(capture_val) + "%") - - def get_capture_gain(self): - """Gets the Capture gain slider settings. The value returned is an integer between 0-100 - and is an indicative of the percentage 0 - 100%""" - p = str(subprocess.Popen(["amixer", "get", "Capture"], stdout=subprocess.PIPE).communicate()[0]) - p = p[find(p,"Front Left:"):] - p = p[find(p,"[")+1:] - p = p[:find(p,"%]")] - return int(p) - - def set_PCM_gain(self, PCM_val): - """Sets the PCM gain slider settings - PCM_val must be given as an integer between 0 and 100 indicating the - percentage of the slider to be set""" - os.system("amixer set PCM " + str(PCM_val) + "%") - - def get_PCM_gain(self): - """Gets the PCM gain slider settings. The value returned is an indicative of the percentage 0 - 100%""" - p = str(subprocess.Popen(["amixer", "get", "PCM"], stdout=subprocess.PIPE).communicate()[0]) - p = p[find(p,"Front Left:"):] - p = p[find(p,"[")+1:] - p = p[:find(p,"%]")] - return int(p) - - def set_mic_gain(self, mic_val): - """Sets the MIC gain slider settings - mic_val must be given as an integer between 0 and 100 indicating the - percentage of the slider to be set""" - os.system("amixer set Mic " + str(mic_val) + "%") - - def get_mic_gain(self): - """Gets the MIC gain slider settings. The value returned is an indicative of the percentage 0 - 100%""" - p = str(subprocess.Popen(["amixer", "get", "Mic"], stdout=subprocess.PIPE).communicate()[0]) - p = p[find(p,"Mono:"):] - p = p[find(p,"[")+1:] - p = p[:find(p,"%]")] - return int(p) - - def set_sampling_rate(self, sr): - """Sets the sampling rate of the capture device - Sampling rate must be given as an integer for example 16000 for setting 16Khz sampling rate - The sampling rate would be set in the device to the nearest available""" - caps_str = "audio/x-raw-int,rate=%d,channels=1,depth=16" % (sr, ) - self.caps1.set_property("caps", gst.caps_from_string(caps_str) ) - - def get_sampling_rate(self): - """Gets the sampling rate of the capture device""" - return int(self.caps1.get_property("caps")[0]['rate'] ) - - def set_callable1(self, callable1): - """Sets the callable to the drawing function for giving the - data at the end of idle-add""" - self.callable1 = callable1 - - def save_settings(self): - """Save audio device settings at startup""" - - def save_settings_temp(self): - """Save settings temporarily. For example if activity is going to be inactive for some time""" - - def apply_settings_temp(self): - """Re-apply settings that were saved temporarily. For example Activity becomes active again""" - - def apply_settings(self): - """Apply settings that were saved at the beginning. Ideally should be called on quitting, and after pipeline has been stopped""" - - def set_sensor_type(self, sensor_type=1): - """Set the type of sensor you want to use. Set sensor_type according to the following - 0 - AC coupling with Bias On --> The default settings. The internal MIC uses these - 1 - AC coupling with Bias On , FFT mode --> slightly more gain than type (1), FFTs are calculated in this mode - 2 - DC coupling with Bias On --> Used with resistive sensors. For example an LDR, NTC - 3 - DC coupling with Bias Off --> Used when using a voltage output sensor. For example LM35 which gives output proportional to temperature""" - if sensor_type==0: - self.set_dc_mode(False) - self.set_bias(True) - self.set_capture_gain(40) - self.set_mic_boost(True) - elif sensor_type==1: - self.set_dc_mode(False) - self.set_bias(True) - self.set_capture_gain(70) - self.set_mic_boost(True) - elif sensor_type==2: - self.set_dc_mode(True) - self.set_bias(True) - self.set_capture_gain(0) - self.set_mic_boost(False) - elif sensor_type==3: - self.set_dc_mode(True) - self.set_bias(False) - self.set_capture_gain(0) - self.set_mic_boost(False) - - self.sensor_type = sensor_type - - diff --git a/icons/htmloff.svg b/icons/htmloff.svg new file mode 100644 index 0000000..50f4d27 --- /dev/null +++ b/icons/htmloff.svg @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/icons/htmlon.svg b/icons/htmlon.svg new file mode 100644 index 0000000..9fd905c --- /dev/null +++ b/icons/htmlon.svg @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/es/sensors/pitch.svg b/images/en/sensors/hres.svg index caf5bed..630111c 100644 --- a/images/es/sensors/pitch.svg +++ b/images/en/sensors/hres.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">tono + style="font-size:16px">hres diff --git a/images/en/sensors/resistance.svg b/images/en/sensors/kbinput.svg index ed3a744..1ffc165 100644 --- a/images/en/sensors/resistance.svg +++ b/images/en/sensors/kbinput.svg @@ -5,8 +5,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" - width="105" - height="21" + width="87" + height="60" id="svg2"> @@ -23,24 +23,33 @@ + style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#c00000;stroke-width:2;stroke-opacity:1" /> + style="font-size:18px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> resistance + style="font-size:18px">query + + + kb diff --git a/images/en/sensors/volume.svg b/images/en/sensors/keyboard.svg index 74e5ccc..9ce2adc 100644 --- a/images/en/sensors/volume.svg +++ b/images/en/sensors/keyboard.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">volume + style="font-size:16px">keyboard diff --git a/images/en/sensors/sensorsgroup.svg b/images/en/sensors/sensorsgroup.svg index d06ac17..6d94c39 100644 --- a/images/en/sensors/sensorsgroup.svg +++ b/images/en/sensors/sensorsgroup.svg @@ -29,7 +29,7 @@ id="linearGradient2487" xlink:href="#linearGradient3712" gradientUnits="userSpaceOnUse" - gradientTransform="translate(-32.50255,-122.50501)" /> + gradientTransform="translate(-32.50255,109.49499)" /> + gradientTransform="translate(-32.50255,109.25224)" /> + gradientTransform="translate(-32.502549,135.82996)" /> + gradientTransform="translate(-32.502549,135.5872)" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Sensors + style="font-size:20px">Keyboard + d="M 79.87,36.918183 C 90.59,36.918183 90.59,36.918183 90.59,36.918183 L 94.275,39.598183 L 96.62,43.618183 L 96.62,66.398183 L 94.275,70.418183 L 90.59,73.098183 L 79.2,73.098183 L 79.2,73.098183 L 79.2,75.778183 L 65.8,75.778183 L 65.8,73.098183 L 54.41,73.098183 L 50.725,70.418183 L 48.38,66.398183 L 48.38,43.618183 L 50.725,39.598183 L 54.41,36.918183 L 65.13,36.918183 L 65.13,40.268183 L 79.87,40.268183 L 79.87,36.918183 z" + id="path10" + style="fill:url(#linearGradient3208);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + x="47.556904" + y="36.248184" + id="text12" + style="font-size:8.03999996px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> pitch + x="72.346893" + y="54.338181" + id="tspan14" + style="font-size:12.06000042px">query + + + kb + d="M 37.998269,86.158913 L 41.33177,86.158913 L 41.33177,88.825713 L 45.998669,88.825713 L 45.998669,86.158913 L 107.00173,86.158913 L 107.00173,99.492913 L 45.998669,99.492913 L 45.998669,96.826113 L 41.33177,96.826113 L 41.33177,99.492913 L 37.998269,99.492913 L 37.998269,86.158913 z" + id="path2425" + style="fill:url(#linearGradient2431);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-opacity:1" /> volume + x="72.5" + y="96.172256" + id="tspan2429" + style="font-size:11px">keyboard + + + + vres + + + + + + hres + + + + + + + + + + + x + + diff --git a/images/en/sensors/sensorsgroupxo.svg b/images/en/sensors/sensorsgroupxo.svg deleted file mode 100644 index abad056..0000000 --- a/images/en/sensors/sensorsgroupxo.svg +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - - - - - - - - - - - - - - X - - Sensors - - - - pitch - - - - voltage - - - - volume - - - - resistance - - diff --git a/images/en/sensors/sensorsmask.svg b/images/en/sensors/sensorsmask.svg index 93bd513..a36f7d1 100644 --- a/images/en/sensors/sensorsmask.svg +++ b/images/en/sensors/sensorsmask.svg @@ -3,36 +3,116 @@ + id="svg2646"> + id="defs2659"> + + + + + + + + + + + + + + - - + + + + + diff --git a/images/en/sensors/sensorsmaskxo.svg b/images/en/sensors/sensorsmaskxo.svg deleted file mode 100644 index 2adecbc..0000000 --- a/images/en/sensors/sensorsmaskxo.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - diff --git a/images/fi/sensors/pitch.svg b/images/en/sensors/vres.svg index 529d615..cd25565 100644 --- a/images/fi/sensors/pitch.svg +++ b/images/en/sensors/vres.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">pitch + style="font-size:16px">vres diff --git a/images/fr/sensors/pitch.svg b/images/es/sensors/hres.svg index 529d615..630111c 100644 --- a/images/fr/sensors/pitch.svg +++ b/images/es/sensors/hres.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">pitch + style="font-size:16px">hres diff --git a/images/en/sensors/volume.svg b/images/es/sensors/kbinput.svg index 74e5ccc..c0dbf9e 100644 --- a/images/en/sensors/volume.svg +++ b/images/es/sensors/kbinput.svg @@ -5,8 +5,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" - width="105" - height="21" + width="87" + height="60" id="svg2"> @@ -23,24 +23,33 @@ + style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#c00000;stroke-width:2;stroke-opacity:1" /> + style="font-size:18px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> volume + style="font-size:18px">leer + + + tecla diff --git a/images/en/sensors/voltage.svg b/images/es/sensors/keyboard.svg index 1f49262..5949e22 100644 --- a/images/en/sensors/voltage.svg +++ b/images/es/sensors/keyboard.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">voltage + style="font-size:16px">teclado diff --git a/images/es/sensors/resistance.svg b/images/es/sensors/resistance.svg deleted file mode 100644 index 9b83e0a..0000000 --- a/images/es/sensors/resistance.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - resistencia - - diff --git a/images/es/sensors/sensorsgroup.svg b/images/es/sensors/sensorsgroup.svg index 3b8328f..dae8c20 100644 --- a/images/es/sensors/sensorsgroup.svg +++ b/images/es/sensors/sensorsgroup.svg @@ -29,7 +29,7 @@ id="linearGradient2487" xlink:href="#linearGradient3712" gradientUnits="userSpaceOnUse" - gradientTransform="translate(-32.50255,-122.50501)" /> + gradientTransform="translate(-32.50255,109.49499)" /> + gradientTransform="translate(-32.50255,109.25224)" /> + gradientTransform="translate(-32.502549,135.82996)" /> + gradientTransform="translate(-32.502549,135.5872)" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Sensores + style="font-size:20px">Teclado + d="M 79.87,36.918183 C 90.59,36.918183 90.59,36.918183 90.59,36.918183 L 94.275,39.598183 L 96.62,43.618183 L 96.62,66.398183 L 94.275,70.418183 L 90.59,73.098183 L 79.2,73.098183 L 79.2,73.098183 L 79.2,75.778183 L 65.8,75.778183 L 65.8,73.098183 L 54.41,73.098183 L 50.725,70.418183 L 48.38,66.398183 L 48.38,43.618183 L 50.725,39.598183 L 54.41,36.918183 L 65.13,36.918183 L 65.13,40.268183 L 79.87,40.268183 L 79.87,36.918183 z" + id="path10" + style="fill:url(#linearGradient3208);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + x="47.556904" + y="36.248184" + id="text12" + style="font-size:8.03999996px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> tono + x="72.346893" + y="54.338181" + id="tspan14" + style="font-size:12.06000042px">leer + + + tecla + d="M 37.998269,86.158913 L 41.33177,86.158913 L 41.33177,88.825713 L 45.998669,88.825713 L 45.998669,86.158913 L 107.00173,86.158913 L 107.00173,99.492913 L 45.998669,99.492913 L 45.998669,96.826113 L 41.33177,96.826113 L 41.33177,99.492913 L 37.998269,99.492913 L 37.998269,86.158913 z" + id="path2425" + style="fill:url(#linearGradient2431);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-opacity:1" /> volumen + x="72.5" + y="96.172256" + id="tspan2429" + style="font-size:11px">teclado + + + + vres + + + + + + hres + + + + + + + + + + + x + + diff --git a/images/es/sensors/sensorsgroupxo.svg b/images/es/sensors/sensorsgroupxo.svg deleted file mode 100644 index 7bf8afa..0000000 --- a/images/es/sensors/sensorsgroupxo.svg +++ /dev/null @@ -1,199 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - X - - - Sensores - - - - tono - - - - voltaje - - - - volumen - - - - resistencia - - diff --git a/images/es/sensors/sensorsmask.svg b/images/es/sensors/sensorsmask.svg index 954f0a7..a36f7d1 100644 --- a/images/es/sensors/sensorsmask.svg +++ b/images/es/sensors/sensorsmask.svg @@ -92,15 +92,27 @@ id="rect2650" style="opacity:1;fill:#080808;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> - - + + + + + diff --git a/images/es/sensors/sensorsmaskxo.svg b/images/es/sensors/sensorsmaskxo.svg deleted file mode 100644 index 2adecbc..0000000 --- a/images/es/sensors/sensorsmaskxo.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - diff --git a/images/es/sensors/voltage.svg b/images/es/sensors/voltage.svg deleted file mode 100644 index b2c6c98..0000000 --- a/images/es/sensors/voltage.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - voltaje - - diff --git a/images/es/sensors/volume.svg b/images/es/sensors/volume.svg deleted file mode 100644 index d119053..0000000 --- a/images/es/sensors/volume.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - volumen - - diff --git a/images/en/sensors/pitch.svg b/images/es/sensors/vres.svg index 529d615..cd25565 100644 --- a/images/en/sensors/pitch.svg +++ b/images/es/sensors/vres.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">pitch + style="font-size:16px">vres diff --git a/images/es/sensors/pitch.svg b/images/fi/sensors/hres.svg index caf5bed..630111c 100644 --- a/images/es/sensors/pitch.svg +++ b/images/fi/sensors/hres.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">tono + style="font-size:16px">hres diff --git a/images/en/sensors/volume.svg b/images/fi/sensors/kbinput.svg index 74e5ccc..1ffc165 100644 --- a/images/en/sensors/volume.svg +++ b/images/fi/sensors/kbinput.svg @@ -5,8 +5,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" - width="105" - height="21" + width="87" + height="60" id="svg2"> @@ -23,24 +23,33 @@ + style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#c00000;stroke-width:2;stroke-opacity:1" /> + style="font-size:18px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> volume + style="font-size:18px">query + + + kb diff --git a/images/en/sensors/voltage.svg b/images/fi/sensors/keyboard.svg index 1f49262..9ce2adc 100644 --- a/images/en/sensors/voltage.svg +++ b/images/fi/sensors/keyboard.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">voltage + style="font-size:16px">keyboard diff --git a/images/fi/sensors/resistance.svg b/images/fi/sensors/resistance.svg deleted file mode 100644 index ed3a744..0000000 --- a/images/fi/sensors/resistance.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - resistance - - diff --git a/images/fi/sensors/sensorsgroup.svg b/images/fi/sensors/sensorsgroup.svg index d06ac17..6d94c39 100644 --- a/images/fi/sensors/sensorsgroup.svg +++ b/images/fi/sensors/sensorsgroup.svg @@ -29,7 +29,7 @@ id="linearGradient2487" xlink:href="#linearGradient3712" gradientUnits="userSpaceOnUse" - gradientTransform="translate(-32.50255,-122.50501)" /> + gradientTransform="translate(-32.50255,109.49499)" /> + gradientTransform="translate(-32.50255,109.25224)" /> + gradientTransform="translate(-32.502549,135.82996)" /> + gradientTransform="translate(-32.502549,135.5872)" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Sensors + style="font-size:20px">Keyboard + d="M 79.87,36.918183 C 90.59,36.918183 90.59,36.918183 90.59,36.918183 L 94.275,39.598183 L 96.62,43.618183 L 96.62,66.398183 L 94.275,70.418183 L 90.59,73.098183 L 79.2,73.098183 L 79.2,73.098183 L 79.2,75.778183 L 65.8,75.778183 L 65.8,73.098183 L 54.41,73.098183 L 50.725,70.418183 L 48.38,66.398183 L 48.38,43.618183 L 50.725,39.598183 L 54.41,36.918183 L 65.13,36.918183 L 65.13,40.268183 L 79.87,40.268183 L 79.87,36.918183 z" + id="path10" + style="fill:url(#linearGradient3208);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + x="47.556904" + y="36.248184" + id="text12" + style="font-size:8.03999996px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> pitch + x="72.346893" + y="54.338181" + id="tspan14" + style="font-size:12.06000042px">query + + + kb + d="M 37.998269,86.158913 L 41.33177,86.158913 L 41.33177,88.825713 L 45.998669,88.825713 L 45.998669,86.158913 L 107.00173,86.158913 L 107.00173,99.492913 L 45.998669,99.492913 L 45.998669,96.826113 L 41.33177,96.826113 L 41.33177,99.492913 L 37.998269,99.492913 L 37.998269,86.158913 z" + id="path2425" + style="fill:url(#linearGradient2431);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-opacity:1" /> volume + x="72.5" + y="96.172256" + id="tspan2429" + style="font-size:11px">keyboard + + + + vres + + + + + + hres + + + + + + + + + + + x + + diff --git a/images/fi/sensors/sensorsgroupxo.svg b/images/fi/sensors/sensorsgroupxo.svg deleted file mode 100644 index abad056..0000000 --- a/images/fi/sensors/sensorsgroupxo.svg +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - - - - - - - - - - - - - - X - - Sensors - - - - pitch - - - - voltage - - - - volume - - - - resistance - - diff --git a/images/fi/sensors/sensorsmask.svg b/images/fi/sensors/sensorsmask.svg index 93bd513..a36f7d1 100644 --- a/images/fi/sensors/sensorsmask.svg +++ b/images/fi/sensors/sensorsmask.svg @@ -3,36 +3,116 @@ + id="svg2646"> + id="defs2659"> + + + + + + + + + + + + + + - - + + + + + diff --git a/images/fi/sensors/sensorsmaskxo.svg b/images/fi/sensors/sensorsmaskxo.svg deleted file mode 100644 index 2adecbc..0000000 --- a/images/fi/sensors/sensorsmaskxo.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - diff --git a/images/fi/sensors/voltage.svg b/images/fi/sensors/voltage.svg deleted file mode 100644 index 1f49262..0000000 --- a/images/fi/sensors/voltage.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - voltage - - diff --git a/images/fi/sensors/volume.svg b/images/fi/sensors/volume.svg deleted file mode 100644 index 74e5ccc..0000000 --- a/images/fi/sensors/volume.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - volume - - diff --git a/images/es/sensors/pitch.svg b/images/fi/sensors/vres.svg index caf5bed..cd25565 100644 --- a/images/es/sensors/pitch.svg +++ b/images/fi/sensors/vres.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">tono + style="font-size:16px">vres diff --git a/images/es/sensors/pitch.svg b/images/fr/sensors/hres.svg index caf5bed..630111c 100644 --- a/images/es/sensors/pitch.svg +++ b/images/fr/sensors/hres.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">tono + style="font-size:16px">hres diff --git a/images/en/sensors/volume.svg b/images/fr/sensors/kbinput.svg index 74e5ccc..1ffc165 100644 --- a/images/en/sensors/volume.svg +++ b/images/fr/sensors/kbinput.svg @@ -5,8 +5,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" - width="105" - height="21" + width="87" + height="60" id="svg2"> @@ -23,24 +23,33 @@ + style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#c00000;stroke-width:2;stroke-opacity:1" /> + style="font-size:18px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> volume + style="font-size:18px">query + + + kb diff --git a/images/en/sensors/voltage.svg b/images/fr/sensors/keyboard.svg index 1f49262..9ce2adc 100644 --- a/images/en/sensors/voltage.svg +++ b/images/fr/sensors/keyboard.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">voltage + style="font-size:16px">keyboard diff --git a/images/fr/sensors/resistance.svg b/images/fr/sensors/resistance.svg deleted file mode 100644 index ed3a744..0000000 --- a/images/fr/sensors/resistance.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - resistance - - diff --git a/images/fr/sensors/sensorsgroup.svg b/images/fr/sensors/sensorsgroup.svg index d06ac17..6d94c39 100644 --- a/images/fr/sensors/sensorsgroup.svg +++ b/images/fr/sensors/sensorsgroup.svg @@ -29,7 +29,7 @@ id="linearGradient2487" xlink:href="#linearGradient3712" gradientUnits="userSpaceOnUse" - gradientTransform="translate(-32.50255,-122.50501)" /> + gradientTransform="translate(-32.50255,109.49499)" /> + gradientTransform="translate(-32.50255,109.25224)" /> + gradientTransform="translate(-32.502549,135.82996)" /> + gradientTransform="translate(-32.502549,135.5872)" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Sensors + style="font-size:20px">Keyboard + d="M 79.87,36.918183 C 90.59,36.918183 90.59,36.918183 90.59,36.918183 L 94.275,39.598183 L 96.62,43.618183 L 96.62,66.398183 L 94.275,70.418183 L 90.59,73.098183 L 79.2,73.098183 L 79.2,73.098183 L 79.2,75.778183 L 65.8,75.778183 L 65.8,73.098183 L 54.41,73.098183 L 50.725,70.418183 L 48.38,66.398183 L 48.38,43.618183 L 50.725,39.598183 L 54.41,36.918183 L 65.13,36.918183 L 65.13,40.268183 L 79.87,40.268183 L 79.87,36.918183 z" + id="path10" + style="fill:url(#linearGradient3208);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + x="47.556904" + y="36.248184" + id="text12" + style="font-size:8.03999996px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> pitch + x="72.346893" + y="54.338181" + id="tspan14" + style="font-size:12.06000042px">query + + + kb + d="M 37.998269,86.158913 L 41.33177,86.158913 L 41.33177,88.825713 L 45.998669,88.825713 L 45.998669,86.158913 L 107.00173,86.158913 L 107.00173,99.492913 L 45.998669,99.492913 L 45.998669,96.826113 L 41.33177,96.826113 L 41.33177,99.492913 L 37.998269,99.492913 L 37.998269,86.158913 z" + id="path2425" + style="fill:url(#linearGradient2431);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-opacity:1" /> volume + x="72.5" + y="96.172256" + id="tspan2429" + style="font-size:11px">keyboard + + + + vres + + + + + + hres + + + + + + + + + + + x + + diff --git a/images/fr/sensors/sensorsgroupxo.svg b/images/fr/sensors/sensorsgroupxo.svg deleted file mode 100644 index abad056..0000000 --- a/images/fr/sensors/sensorsgroupxo.svg +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - - - - - - - - - - - - - - X - - Sensors - - - - pitch - - - - voltage - - - - volume - - - - resistance - - diff --git a/images/fr/sensors/sensorsmask.svg b/images/fr/sensors/sensorsmask.svg index 93bd513..a36f7d1 100644 --- a/images/fr/sensors/sensorsmask.svg +++ b/images/fr/sensors/sensorsmask.svg @@ -3,36 +3,116 @@ + id="svg2646"> + id="defs2659"> + + + + + + + + + + + + + + - - + + + + + diff --git a/images/fr/sensors/sensorsmaskxo.svg b/images/fr/sensors/sensorsmaskxo.svg deleted file mode 100644 index 2adecbc..0000000 --- a/images/fr/sensors/sensorsmaskxo.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - diff --git a/images/fr/sensors/voltage.svg b/images/fr/sensors/voltage.svg deleted file mode 100644 index 1f49262..0000000 --- a/images/fr/sensors/voltage.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - voltage - - diff --git a/images/fr/sensors/volume.svg b/images/fr/sensors/volume.svg deleted file mode 100644 index 74e5ccc..0000000 --- a/images/fr/sensors/volume.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - volume - - diff --git a/images/es/sensors/pitch.svg b/images/fr/sensors/vres.svg index caf5bed..cd25565 100644 --- a/images/es/sensors/pitch.svg +++ b/images/fr/sensors/vres.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">tono + style="font-size:16px">vres diff --git a/images/es/sensors/pitch.svg b/images/mn/sensors/hres.svg index caf5bed..630111c 100644 --- a/images/es/sensors/pitch.svg +++ b/images/mn/sensors/hres.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">tono + style="font-size:16px">hres diff --git a/images/en/sensors/volume.svg b/images/mn/sensors/kbinput.svg index 74e5ccc..1ffc165 100644 --- a/images/en/sensors/volume.svg +++ b/images/mn/sensors/kbinput.svg @@ -5,8 +5,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" - width="105" - height="21" + width="87" + height="60" id="svg2"> @@ -23,24 +23,33 @@ + style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#c00000;stroke-width:2;stroke-opacity:1" /> + style="font-size:18px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> volume + style="font-size:18px">query + + + kb diff --git a/images/en/sensors/voltage.svg b/images/mn/sensors/keyboard.svg index 1f49262..9ce2adc 100644 --- a/images/en/sensors/voltage.svg +++ b/images/mn/sensors/keyboard.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">voltage + style="font-size:16px">keyboard diff --git a/images/mn/sensors/pitch.svg b/images/mn/sensors/pitch.svg deleted file mode 100644 index 529d615..0000000 --- a/images/mn/sensors/pitch.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - pitch - - diff --git a/images/mn/sensors/resistance.svg b/images/mn/sensors/resistance.svg deleted file mode 100644 index ed3a744..0000000 --- a/images/mn/sensors/resistance.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - resistance - - diff --git a/images/mn/sensors/sensorsgroup.svg b/images/mn/sensors/sensorsgroup.svg index d06ac17..6d94c39 100644 --- a/images/mn/sensors/sensorsgroup.svg +++ b/images/mn/sensors/sensorsgroup.svg @@ -29,7 +29,7 @@ id="linearGradient2487" xlink:href="#linearGradient3712" gradientUnits="userSpaceOnUse" - gradientTransform="translate(-32.50255,-122.50501)" /> + gradientTransform="translate(-32.50255,109.49499)" /> + gradientTransform="translate(-32.50255,109.25224)" /> + gradientTransform="translate(-32.502549,135.82996)" /> + gradientTransform="translate(-32.502549,135.5872)" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Sensors + style="font-size:20px">Keyboard + d="M 79.87,36.918183 C 90.59,36.918183 90.59,36.918183 90.59,36.918183 L 94.275,39.598183 L 96.62,43.618183 L 96.62,66.398183 L 94.275,70.418183 L 90.59,73.098183 L 79.2,73.098183 L 79.2,73.098183 L 79.2,75.778183 L 65.8,75.778183 L 65.8,73.098183 L 54.41,73.098183 L 50.725,70.418183 L 48.38,66.398183 L 48.38,43.618183 L 50.725,39.598183 L 54.41,36.918183 L 65.13,36.918183 L 65.13,40.268183 L 79.87,40.268183 L 79.87,36.918183 z" + id="path10" + style="fill:url(#linearGradient3208);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + x="47.556904" + y="36.248184" + id="text12" + style="font-size:8.03999996px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> pitch + x="72.346893" + y="54.338181" + id="tspan14" + style="font-size:12.06000042px">query + + + kb + d="M 37.998269,86.158913 L 41.33177,86.158913 L 41.33177,88.825713 L 45.998669,88.825713 L 45.998669,86.158913 L 107.00173,86.158913 L 107.00173,99.492913 L 45.998669,99.492913 L 45.998669,96.826113 L 41.33177,96.826113 L 41.33177,99.492913 L 37.998269,99.492913 L 37.998269,86.158913 z" + id="path2425" + style="fill:url(#linearGradient2431);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-opacity:1" /> volume + x="72.5" + y="96.172256" + id="tspan2429" + style="font-size:11px">keyboard + + + + vres + + + + + + hres + + + + + + + + + + + x + + diff --git a/images/mn/sensors/sensorsgroupxo.svg b/images/mn/sensors/sensorsgroupxo.svg deleted file mode 100644 index abad056..0000000 --- a/images/mn/sensors/sensorsgroupxo.svg +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - - - - - - - - - - - - - - X - - Sensors - - - - pitch - - - - voltage - - - - volume - - - - resistance - - diff --git a/images/mn/sensors/sensorsmask.svg b/images/mn/sensors/sensorsmask.svg index 93bd513..a36f7d1 100644 --- a/images/mn/sensors/sensorsmask.svg +++ b/images/mn/sensors/sensorsmask.svg @@ -3,36 +3,116 @@ + id="svg2646"> + id="defs2659"> + + + + + + + + + + + + + + - - + + + + + diff --git a/images/mn/sensors/sensorsmaskxo.svg b/images/mn/sensors/sensorsmaskxo.svg deleted file mode 100644 index 2adecbc..0000000 --- a/images/mn/sensors/sensorsmaskxo.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - diff --git a/images/mn/sensors/voltage.svg b/images/mn/sensors/voltage.svg deleted file mode 100644 index 1f49262..0000000 --- a/images/mn/sensors/voltage.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - voltage - - diff --git a/images/mn/sensors/volume.svg b/images/mn/sensors/volume.svg deleted file mode 100644 index 74e5ccc..0000000 --- a/images/mn/sensors/volume.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - volume - - diff --git a/images/es/sensors/pitch.svg b/images/mn/sensors/vres.svg index caf5bed..cd25565 100644 --- a/images/es/sensors/pitch.svg +++ b/images/mn/sensors/vres.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">tono + style="font-size:16px">vres diff --git a/images/es/sensors/pitch.svg b/images/pt/sensors/hres.svg index caf5bed..630111c 100644 --- a/images/es/sensors/pitch.svg +++ b/images/pt/sensors/hres.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">tono + style="font-size:16px">hres diff --git a/images/en/sensors/volume.svg b/images/pt/sensors/kbinput.svg index 74e5ccc..1ffc165 100644 --- a/images/en/sensors/volume.svg +++ b/images/pt/sensors/kbinput.svg @@ -5,8 +5,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" - width="105" - height="21" + width="87" + height="60" id="svg2"> @@ -23,24 +23,33 @@ + style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#c00000;stroke-width:2;stroke-opacity:1" /> + style="font-size:18px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> volume + style="font-size:18px">query + + + kb diff --git a/images/en/sensors/voltage.svg b/images/pt/sensors/keyboard.svg index 1f49262..9ce2adc 100644 --- a/images/en/sensors/voltage.svg +++ b/images/pt/sensors/keyboard.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">voltage + style="font-size:16px">keyboard diff --git a/images/pt/sensors/pitch.svg b/images/pt/sensors/pitch.svg deleted file mode 100644 index 529d615..0000000 --- a/images/pt/sensors/pitch.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - pitch - - diff --git a/images/pt/sensors/resistance.svg b/images/pt/sensors/resistance.svg deleted file mode 100644 index ed3a744..0000000 --- a/images/pt/sensors/resistance.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - resistance - - diff --git a/images/pt/sensors/sensorsgroup.svg b/images/pt/sensors/sensorsgroup.svg index d06ac17..6d94c39 100644 --- a/images/pt/sensors/sensorsgroup.svg +++ b/images/pt/sensors/sensorsgroup.svg @@ -29,7 +29,7 @@ id="linearGradient2487" xlink:href="#linearGradient3712" gradientUnits="userSpaceOnUse" - gradientTransform="translate(-32.50255,-122.50501)" /> + gradientTransform="translate(-32.50255,109.49499)" /> + gradientTransform="translate(-32.50255,109.25224)" /> + gradientTransform="translate(-32.502549,135.82996)" /> + gradientTransform="translate(-32.502549,135.5872)" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Sensors + style="font-size:20px">Keyboard + d="M 79.87,36.918183 C 90.59,36.918183 90.59,36.918183 90.59,36.918183 L 94.275,39.598183 L 96.62,43.618183 L 96.62,66.398183 L 94.275,70.418183 L 90.59,73.098183 L 79.2,73.098183 L 79.2,73.098183 L 79.2,75.778183 L 65.8,75.778183 L 65.8,73.098183 L 54.41,73.098183 L 50.725,70.418183 L 48.38,66.398183 L 48.38,43.618183 L 50.725,39.598183 L 54.41,36.918183 L 65.13,36.918183 L 65.13,40.268183 L 79.87,40.268183 L 79.87,36.918183 z" + id="path10" + style="fill:url(#linearGradient3208);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + x="47.556904" + y="36.248184" + id="text12" + style="font-size:8.03999996px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> pitch + x="72.346893" + y="54.338181" + id="tspan14" + style="font-size:12.06000042px">query + + + kb + d="M 37.998269,86.158913 L 41.33177,86.158913 L 41.33177,88.825713 L 45.998669,88.825713 L 45.998669,86.158913 L 107.00173,86.158913 L 107.00173,99.492913 L 45.998669,99.492913 L 45.998669,96.826113 L 41.33177,96.826113 L 41.33177,99.492913 L 37.998269,99.492913 L 37.998269,86.158913 z" + id="path2425" + style="fill:url(#linearGradient2431);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-opacity:1" /> volume + x="72.5" + y="96.172256" + id="tspan2429" + style="font-size:11px">keyboard + + + + vres + + + + + + hres + + + + + + + + + + + x + + diff --git a/images/pt/sensors/sensorsgroupxo.svg b/images/pt/sensors/sensorsgroupxo.svg deleted file mode 100644 index abad056..0000000 --- a/images/pt/sensors/sensorsgroupxo.svg +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - - - - - - - - - - - - - - X - - Sensors - - - - pitch - - - - voltage - - - - volume - - - - resistance - - diff --git a/images/pt/sensors/sensorsmask.svg b/images/pt/sensors/sensorsmask.svg index 93bd513..a36f7d1 100644 --- a/images/pt/sensors/sensorsmask.svg +++ b/images/pt/sensors/sensorsmask.svg @@ -3,36 +3,116 @@ + id="svg2646"> + id="defs2659"> + + + + + + + + + + + + + + - - + + + + + diff --git a/images/pt/sensors/sensorsmaskxo.svg b/images/pt/sensors/sensorsmaskxo.svg deleted file mode 100644 index 2adecbc..0000000 --- a/images/pt/sensors/sensorsmaskxo.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - diff --git a/images/pt/sensors/voltage.svg b/images/pt/sensors/voltage.svg deleted file mode 100644 index 1f49262..0000000 --- a/images/pt/sensors/voltage.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - voltage - - diff --git a/images/pt/sensors/volume.svg b/images/pt/sensors/volume.svg deleted file mode 100644 index 74e5ccc..0000000 --- a/images/pt/sensors/volume.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - volume - - diff --git a/images/es/sensors/pitch.svg b/images/pt/sensors/vres.svg index caf5bed..cd25565 100644 --- a/images/es/sensors/pitch.svg +++ b/images/pt/sensors/vres.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">tono + style="font-size:16px">vres diff --git a/images/es/sensors/pitch.svg b/images/ru/sensors/hres.svg index caf5bed..630111c 100644 --- a/images/es/sensors/pitch.svg +++ b/images/ru/sensors/hres.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">tono + style="font-size:16px">hres diff --git a/images/en/sensors/volume.svg b/images/ru/sensors/kbinput.svg index 74e5ccc..1ffc165 100644 --- a/images/en/sensors/volume.svg +++ b/images/ru/sensors/kbinput.svg @@ -5,8 +5,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" - width="105" - height="21" + width="87" + height="60" id="svg2"> @@ -23,24 +23,33 @@ + style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#c00000;stroke-width:2;stroke-opacity:1" /> + style="font-size:18px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> volume + style="font-size:18px">query + + + kb diff --git a/images/en/sensors/voltage.svg b/images/ru/sensors/keyboard.svg index 1f49262..9ce2adc 100644 --- a/images/en/sensors/voltage.svg +++ b/images/ru/sensors/keyboard.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">voltage + style="font-size:16px">keyboard diff --git a/images/ru/sensors/pitch.svg b/images/ru/sensors/pitch.svg deleted file mode 100644 index 529d615..0000000 --- a/images/ru/sensors/pitch.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - pitch - - diff --git a/images/ru/sensors/resistance.svg b/images/ru/sensors/resistance.svg deleted file mode 100644 index ed3a744..0000000 --- a/images/ru/sensors/resistance.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - resistance - - diff --git a/images/ru/sensors/sensorsgroup.svg b/images/ru/sensors/sensorsgroup.svg index d06ac17..6d94c39 100644 --- a/images/ru/sensors/sensorsgroup.svg +++ b/images/ru/sensors/sensorsgroup.svg @@ -29,7 +29,7 @@ id="linearGradient2487" xlink:href="#linearGradient3712" gradientUnits="userSpaceOnUse" - gradientTransform="translate(-32.50255,-122.50501)" /> + gradientTransform="translate(-32.50255,109.49499)" /> + gradientTransform="translate(-32.50255,109.25224)" /> + gradientTransform="translate(-32.502549,135.82996)" /> + gradientTransform="translate(-32.502549,135.5872)" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Sensors + style="font-size:20px">Keyboard + d="M 79.87,36.918183 C 90.59,36.918183 90.59,36.918183 90.59,36.918183 L 94.275,39.598183 L 96.62,43.618183 L 96.62,66.398183 L 94.275,70.418183 L 90.59,73.098183 L 79.2,73.098183 L 79.2,73.098183 L 79.2,75.778183 L 65.8,75.778183 L 65.8,73.098183 L 54.41,73.098183 L 50.725,70.418183 L 48.38,66.398183 L 48.38,43.618183 L 50.725,39.598183 L 54.41,36.918183 L 65.13,36.918183 L 65.13,40.268183 L 79.87,40.268183 L 79.87,36.918183 z" + id="path10" + style="fill:url(#linearGradient3208);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + x="47.556904" + y="36.248184" + id="text12" + style="font-size:8.03999996px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> pitch + x="72.346893" + y="54.338181" + id="tspan14" + style="font-size:12.06000042px">query + + + kb + d="M 37.998269,86.158913 L 41.33177,86.158913 L 41.33177,88.825713 L 45.998669,88.825713 L 45.998669,86.158913 L 107.00173,86.158913 L 107.00173,99.492913 L 45.998669,99.492913 L 45.998669,96.826113 L 41.33177,96.826113 L 41.33177,99.492913 L 37.998269,99.492913 L 37.998269,86.158913 z" + id="path2425" + style="fill:url(#linearGradient2431);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-opacity:1" /> volume + x="72.5" + y="96.172256" + id="tspan2429" + style="font-size:11px">keyboard + + + + vres + + + + + + hres + + + + + + + + + + + x + + diff --git a/images/ru/sensors/sensorsgroupxo.svg b/images/ru/sensors/sensorsgroupxo.svg deleted file mode 100644 index abad056..0000000 --- a/images/ru/sensors/sensorsgroupxo.svg +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - - - - - - - - - - - - - - X - - Sensors - - - - pitch - - - - voltage - - - - volume - - - - resistance - - diff --git a/images/ru/sensors/sensorsmask.svg b/images/ru/sensors/sensorsmask.svg index 93bd513..a36f7d1 100644 --- a/images/ru/sensors/sensorsmask.svg +++ b/images/ru/sensors/sensorsmask.svg @@ -3,36 +3,116 @@ + id="svg2646"> + id="defs2659"> + + + + + + + + + + + + + + - - + + + + + diff --git a/images/ru/sensors/sensorsmaskxo.svg b/images/ru/sensors/sensorsmaskxo.svg deleted file mode 100644 index 2adecbc..0000000 --- a/images/ru/sensors/sensorsmaskxo.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - diff --git a/images/ru/sensors/voltage.svg b/images/ru/sensors/voltage.svg deleted file mode 100644 index 1f49262..0000000 --- a/images/ru/sensors/voltage.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - voltage - - diff --git a/images/ru/sensors/volume.svg b/images/ru/sensors/volume.svg deleted file mode 100644 index 74e5ccc..0000000 --- a/images/ru/sensors/volume.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - volume - - diff --git a/images/es/sensors/pitch.svg b/images/ru/sensors/vres.svg index caf5bed..cd25565 100644 --- a/images/es/sensors/pitch.svg +++ b/images/ru/sensors/vres.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">tono + style="font-size:16px">vres diff --git a/images/es/sensors/pitch.svg b/images/tr/sensors/hres.svg index caf5bed..630111c 100644 --- a/images/es/sensors/pitch.svg +++ b/images/tr/sensors/hres.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">tono + style="font-size:16px">hres diff --git a/images/en/sensors/volume.svg b/images/tr/sensors/kbinput.svg index 74e5ccc..1ffc165 100644 --- a/images/en/sensors/volume.svg +++ b/images/tr/sensors/kbinput.svg @@ -5,8 +5,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" - width="105" - height="21" + width="87" + height="60" id="svg2"> @@ -23,24 +23,33 @@ + style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#c00000;stroke-width:2;stroke-opacity:1" /> + style="font-size:18px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> volume + style="font-size:18px">query + + + kb diff --git a/images/en/sensors/voltage.svg b/images/tr/sensors/keyboard.svg index 1f49262..9ce2adc 100644 --- a/images/en/sensors/voltage.svg +++ b/images/tr/sensors/keyboard.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">voltage + style="font-size:16px">keyboard diff --git a/images/tr/sensors/pitch.svg b/images/tr/sensors/pitch.svg deleted file mode 100644 index 529d615..0000000 --- a/images/tr/sensors/pitch.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - pitch - - diff --git a/images/tr/sensors/resistance.svg b/images/tr/sensors/resistance.svg deleted file mode 100644 index ed3a744..0000000 --- a/images/tr/sensors/resistance.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - resistance - - diff --git a/images/tr/sensors/sensorsgroup.svg b/images/tr/sensors/sensorsgroup.svg index d06ac17..6d94c39 100644 --- a/images/tr/sensors/sensorsgroup.svg +++ b/images/tr/sensors/sensorsgroup.svg @@ -29,7 +29,7 @@ id="linearGradient2487" xlink:href="#linearGradient3712" gradientUnits="userSpaceOnUse" - gradientTransform="translate(-32.50255,-122.50501)" /> + gradientTransform="translate(-32.50255,109.49499)" /> + gradientTransform="translate(-32.50255,109.25224)" /> + gradientTransform="translate(-32.502549,135.82996)" /> + gradientTransform="translate(-32.502549,135.5872)" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Sensors + style="font-size:20px">Keyboard + d="M 79.87,36.918183 C 90.59,36.918183 90.59,36.918183 90.59,36.918183 L 94.275,39.598183 L 96.62,43.618183 L 96.62,66.398183 L 94.275,70.418183 L 90.59,73.098183 L 79.2,73.098183 L 79.2,73.098183 L 79.2,75.778183 L 65.8,75.778183 L 65.8,73.098183 L 54.41,73.098183 L 50.725,70.418183 L 48.38,66.398183 L 48.38,43.618183 L 50.725,39.598183 L 54.41,36.918183 L 65.13,36.918183 L 65.13,40.268183 L 79.87,40.268183 L 79.87,36.918183 z" + id="path10" + style="fill:url(#linearGradient3208);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + x="47.556904" + y="36.248184" + id="text12" + style="font-size:8.03999996px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> pitch + x="72.346893" + y="54.338181" + id="tspan14" + style="font-size:12.06000042px">query + + + kb + d="M 37.998269,86.158913 L 41.33177,86.158913 L 41.33177,88.825713 L 45.998669,88.825713 L 45.998669,86.158913 L 107.00173,86.158913 L 107.00173,99.492913 L 45.998669,99.492913 L 45.998669,96.826113 L 41.33177,96.826113 L 41.33177,99.492913 L 37.998269,99.492913 L 37.998269,86.158913 z" + id="path2425" + style="fill:url(#linearGradient2431);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-opacity:1" /> volume + x="72.5" + y="96.172256" + id="tspan2429" + style="font-size:11px">keyboard + + + + vres + + + + + + hres + + + + + + + + + + + x + + diff --git a/images/tr/sensors/sensorsgroupxo.svg b/images/tr/sensors/sensorsgroupxo.svg deleted file mode 100644 index abad056..0000000 --- a/images/tr/sensors/sensorsgroupxo.svg +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - - - - - - - - - - - - - - X - - Sensors - - - - pitch - - - - voltage - - - - volume - - - - resistance - - diff --git a/images/tr/sensors/sensorsmask.svg b/images/tr/sensors/sensorsmask.svg index 93bd513..a36f7d1 100644 --- a/images/tr/sensors/sensorsmask.svg +++ b/images/tr/sensors/sensorsmask.svg @@ -3,36 +3,116 @@ + id="svg2646"> + id="defs2659"> + + + + + + + + + + + + + + - - + + + + + diff --git a/images/tr/sensors/sensorsmaskxo.svg b/images/tr/sensors/sensorsmaskxo.svg deleted file mode 100644 index 2adecbc..0000000 --- a/images/tr/sensors/sensorsmaskxo.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - diff --git a/images/tr/sensors/voltage.svg b/images/tr/sensors/voltage.svg deleted file mode 100644 index 1f49262..0000000 --- a/images/tr/sensors/voltage.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - voltage - - diff --git a/images/tr/sensors/volume.svg b/images/tr/sensors/volume.svg deleted file mode 100644 index 74e5ccc..0000000 --- a/images/tr/sensors/volume.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - volume - - diff --git a/images/es/sensors/pitch.svg b/images/tr/sensors/vres.svg index caf5bed..cd25565 100644 --- a/images/es/sensors/pitch.svg +++ b/images/tr/sensors/vres.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">tono + style="font-size:16px">vres diff --git a/taproject.py b/taproject.py index e311fd7..af114cb 100644 --- a/taproject.py +++ b/taproject.py @@ -112,7 +112,8 @@ def load_spr(tw,b): setimage(spr, tw.media_shapes['audioon']) dsobject.destroy() except: - print "couldn't open dsobject (" + str(spr.ds_id) + ")" + pass + # print "couldn't open dsobject (" + str(spr.ds_id) + ")" setlayer(spr,650) return spr diff --git a/tasetup.py b/tasetup.py index 3d689e2..a2e64a1 100644 --- a/tasetup.py +++ b/tasetup.py @@ -256,7 +256,7 @@ def setup_selector(tw,name,y,blockdescriptions): setlayer(spr,800) spr.offshape = offshape spr.onshape = onshape - print 'setting up selector ' + name + # print 'setting up selector ' + name # some sensor inputs are hardware dependent if name == 'sensors' and os.path.exists('/sys/power/olpc-pm'): spr.group = load_image(tw.path, name,name+'group'+'xo') diff --git a/tawindow.py b/tawindow.py index ca552cd..0b3744f 100644 --- a/tawindow.py +++ b/tawindow.py @@ -516,7 +516,7 @@ def runbutton(tw, time): # no start block, so run a stack that isn't a hat for b in blocks(tw): if find_block_to_run(tw, b): - print "running " + b.proto.name + # print "running " + b.proto.name tw.step_time = time run_stack(tw, b) return -- cgit v0.9.1