use some of those properties

This commit is contained in:
Jakob Ketterl 2019-05-05 15:51:33 +02:00
parent 6c82c36915
commit 716542107f
3 changed files with 44 additions and 51 deletions

View File

@ -1,10 +1,18 @@
class Property(object): class Property(object):
def __init__(self, value = None): def __init__(self, value = None):
self.value = value self.value = value
self.callbacks = []
def getValue(self): def getValue(self):
return self.value return self.value
def setValue(self, value): def setValue(self, value):
self.value = value self.value = value
for c in self.callbacks:
c(self.value)
return self
def wire(self, callback):
self.callbacks.append(callback)
if not self.value is None: callback(self.value)
return self
class PropertyManager(object): class PropertyManager(object):
sharedInstance = None sharedInstance = None

View File

@ -85,16 +85,8 @@ class WebSocketMessageHandler(object):
if message["type"] == "dspcontrol": if message["type"] == "dspcontrol":
if "params" in message: if "params" in message:
params = message["params"] params = message["params"]
for key in params: for key, value in params.items():
methodname = "set_" + key self.dsp.setProperty(key, value)
if hasattr(self.dsp, methodname):
method = getattr(self.dsp, methodname)
if callable(method):
method(params[key])
else:
print("method {0} is not callable".format(methodname))
else:
print("dsp has no method {0}".format(methodname))
if "action" in message and message["action"] == "start": if "action" in message and message["action"] == "start":
self.dsp.start() self.dsp.start()

View File

@ -72,18 +72,6 @@ class SpectrumThread(threading.Thread):
else: spectrum_thread_counter+=1 else: spectrum_thread_counter+=1
for c in self.clients: for c in self.clients:
c.write_spectrum_data(data) c.write_spectrum_data(data)
'''
correction=0
for i in range(0,len(clients)):
i-=correction
if (clients[i].ws_started):
if clients[i].spectrum_queue.full():
print "[openwebrx-spectrum] client spectrum queue full, closing it."
close_client(i, False)
correction+=1
else:
clients[i].spectrum_queue.put([data]) # add new string by "reference" to all clients
'''
print("spectrum thread shut down") print("spectrum thread shut down")
@ -109,18 +97,45 @@ class DspThread(threading.Thread):
self.dsp = csdr.dsp() self.dsp = csdr.dsp()
#dsp_initialized=False #dsp_initialized=False
self.dsp.set_audio_compression(pm.getPropertyValue("audio_compression")) pm.getProperty("audio_compression").wire(self.dsp.set_audio_compression)
self.dsp.set_fft_compression(pm.getPropertyValue("fft_compression")) #used by secondary chains pm.getProperty("fft_compression").wire(self.dsp.set_fft_compression)
self.dsp.set_format_conversion(pm.getPropertyValue("format_conversion")) pm.getProperty("format_conversion").wire(self.dsp.set_format_conversion)
self.dsp.set_offset_freq(0) self.dsp.set_offset_freq(0)
self.dsp.set_bpf(-4000,4000) self.dsp.set_bpf(-4000,4000)
self.dsp.set_secondary_fft_size(pm.getPropertyValue("digimodes_fft_size")) pm.getProperty("digimodes_fft_size").wire(self.dsp.set_secondary_fft_size)
self.dsp.nc_port=pm.getPropertyValue("iq_server_port") self.dsp.nc_port=pm.getPropertyValue("iq_server_port")
self.dsp.csdr_dynamic_bufsize = pm.getPropertyValue("csdr_dynamic_bufsize") self.dsp.csdr_dynamic_bufsize = pm.getPropertyValue("csdr_dynamic_bufsize")
self.dsp.csdr_print_bufsizes = pm.getPropertyValue("csdr_print_bufsizes") self.dsp.csdr_print_bufsizes = pm.getPropertyValue("csdr_print_bufsizes")
self.dsp.csdr_through = pm.getPropertyValue("csdr_through") self.dsp.csdr_through = pm.getPropertyValue("csdr_through")
self.dsp.set_samp_rate(pm.getPropertyValue("samp_rate"))
pm.getProperty("samp_rate").wire(self.dsp.set_samp_rate)
#do_secondary_demod=False #do_secondary_demod=False
self.localProps = PropertyManager()
self.localProps.getProperty("output_rate").wire(self.dsp.set_output_rate)
self.localProps.getProperty("offset_freq").wire(self.dsp.set_offset_freq)
self.localProps.getProperty("squelch_level").wire(self.dsp.set_squelch_level)
def set_low_cut(cut):
bpf = self.dsp.get_bpf()
bpf[0] = cut
self.dsp.set_bpf(*bpf)
self.localProps.getProperty("low_cut").wire(set_low_cut)
def set_high_cut(cut):
bpf = self.dsp.get_bpf()
bpf[1] = cut
self.dsp.set_bpf(*bpf)
self.localProps.getProperty("high_cut").wire(set_high_cut)
def set_mod(mod):
if (self.dsp.get_demodulator() == mod): return
self.dsp.stop()
self.dsp.set_demodulator(mod)
self.dsp.start()
self.localProps.getProperty("mod").wire(set_mod)
super().__init__() super().__init__()
def run(self): def run(self):
@ -132,27 +147,5 @@ class DspThread(threading.Thread):
def stop(self): def stop(self):
self.doRun = False self.doRun = False
def set_output_rate(self, samp_rate): def setProperty(self, prop, value):
self.dsp.set_output_rate(samp_rate) self.localProps.getProperty(prop).setValue(value)
def set_low_cut(self, cut):
bpf = self.dsp.get_bpf()
bpf[0] = cut
self.dsp.set_bpf(*bpf)
def set_high_cut(self, cut):
bpf = self.dsp.get_bpf()
bpf[1] = cut
self.dsp.set_bpf(*bpf)
def set_offset_freq(self, freq):
self.dsp.set_offset_freq(freq)
def set_mod(self, mod):
if (self.dsp.get_demodulator() == mod): return
self.dsp.stop()
self.dsp.set_demodulator(mod)
self.dsp.start()
def set_squelch_level(self, lvl):
self.dsp.set_squelch_level(lvl)