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

improve event handling

Browse Source
This commit is contained in:
Jakob Ketterl 2021-03-27 23:40:10 +01:00
parent 29c0f7148a
commit 65443eb0ba
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
owrx/connection.py
View File

@ -194,18 +194,23 @@ class OpenWebRxReceiverClient(OpenWebRxClient, SdrSourceEventClient):
def sendBookmarks(*args): def sendBookmarks(*args):
cf = configProps["center_freq"] cf = configProps["center_freq"]
srh = configProps["samp_rate"] / 2 srh = configProps["samp_rate"] / 2
frequencyRange = (cf - srh, cf + srh) dial_frequencies = []
self.write_dial_frequencies(Bandplan.getSharedInstance().collectDialFrequencies(frequencyRange)) bookmarks = []
bookmarks = [b.__dict__() for b in Bookmarks.getSharedInstance().getBookmarks(frequencyRange)] if "center_freq" in configProps and "samp_rate" in configProps:
frequencyRange = (cf - srh, cf + srh)
dial_frequencies = Bandplan.getSharedInstance().collectDialFrequencies(frequencyRange)
bookmarks = [b.__dict__() for b in Bookmarks.getSharedInstance().getBookmarks(frequencyRange)]
self.write_dial_frequencies(dial_frequencies)
self.write_bookmarks(bookmarks) self.write_bookmarks(bookmarks)
def updateBookmarkSubscription(*args): def updateBookmarkSubscription(*args):
if self.bookmarkSub is not None: if self.bookmarkSub is not None:
self.bookmarkSub.cancel() self.bookmarkSub.cancel()
cf = configProps["center_freq"] if "center_freq" in configProps and "samp_rate" in configProps:
srh = configProps["samp_rate"] / 2 cf = configProps["center_freq"]
frequencyRange = (cf - srh, cf + srh) srh = configProps["samp_rate"] / 2
self.bookmarkSub = Bookmarks.getSharedInstance().subscribe(frequencyRange, sendBookmarks) frequencyRange = (cf - srh, cf + srh)
self.bookmarkSub = Bookmarks.getSharedInstance().subscribe(frequencyRange, sendBookmarks)
sendBookmarks() sendBookmarks()
self.configSubs.append(configProps.wire(sendConfig)) self.configSubs.append(configProps.wire(sendConfig))
@ -344,6 +349,7 @@ class OpenWebRxReceiverClient(OpenWebRxClient, SdrSourceEventClient):
self.configSubs.pop().cancel() self.configSubs.pop().cancel()
if self.bookmarkSub is not None: if self.bookmarkSub is not None:
self.bookmarkSub.cancel() self.bookmarkSub.cancel()
self.bookmarkSub = None
super().close() super().close()
def stopDsp(self): def stopDsp(self):