joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

introduce subscription concept to simplify unsubscribing from events

Browse Source
This commit is contained in:
Jakob Ketterl
2019-05-18 21:38:15 +02:00
parent ff8f03c983
commit e6150e4aca
4 changed files with 97 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
owrx/connection.py
View File

@ -19,7 +19,7 @@ class OpenWebRxClient(object):
self.dsp = None
self.sdr = None
self.configProps = None
self.configSub = None
pm = PropertyManager.getSharedInstance()
@ -39,11 +39,6 @@ class OpenWebRxClient(object):
CpuUsageThread.getSharedInstance().add_client(self)
def sendConfig(self, key, value):
config = dict((key, self.configProps[key]) for key in OpenWebRxClient.config_keys)
# TODO mathematical properties? hmmmm
config["start_offset_freq"] = self.configProps["start_freq"] - self.configProps["center_freq"]
self.write_config(config)
def setSdr(self, id = None):
next = SdrService.getSource(id)
if (next == self.sdr):
@ -51,16 +46,23 @@ class OpenWebRxClient(object):
self.stopDsp()
if self.configProps is not None:
self.configProps.unwire(self.sendConfig)
if self.configSub is not None:
self.configSub.cancel()
self.configSub = None
self.sdr = next
# send initial config
self.configProps = self.sdr.getProps().collect(*OpenWebRxClient.config_keys).defaults(PropertyManager.getSharedInstance())
configProps = self.sdr.getProps().collect(*OpenWebRxClient.config_keys).defaults(PropertyManager.getSharedInstance())
self.configProps.wire(self.sendConfig)
self.sendConfig(None, None)
def sendConfig(key, value):
config = dict((key, configProps[key]) for key in OpenWebRxClient.config_keys)
# TODO mathematical properties? hmmmm
config["start_offset_freq"] = configProps["start_freq"] - configProps["center_freq"]
self.write_config(config)
self.configSub = configProps.wire(sendConfig)
sendConfig(None, None)
self.sdr.addSpectrumClient(self)
@ -73,6 +75,9 @@ class OpenWebRxClient(object):
self.stopDsp()
CpuUsageThread.getSharedInstance().remove_client(self)
ClientRegistry.getSharedInstance().removeClient(self)
if self.configSub is not None:
self.configSub.cancel()
self.configSub = None
self.conn.close()
logger.debug("connection closed")