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

make receiver details dynamic

Browse Source
This commit is contained in:
Jakob Ketterl 2019-05-05 17:52:26 +02:00
parent 0da62dad82
commit cb0d59de61
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/index.wrx
View File

@ -50,8 +50,8 @@
<img id="webrx-rx-avatar" src="static/gfx/openwebrx-avatar.png" onclick="toggle_rx_photo();"/> <img id="webrx-rx-avatar" src="static/gfx/openwebrx-avatar.png" onclick="toggle_rx_photo();"/>
</div> </div>
<div id="webrx-rx-texts"> <div id="webrx-rx-texts">
<div id="webrx-rx-title" onclick="toggle_rx_photo();">%[RX_TITLE]</div> <div id="webrx-rx-title" onclick="toggle_rx_photo();"></div>
<div id="webrx-rx-desc" onclick="toggle_rx_photo();">%[RX_LOC] | Loc: %[RX_QRA], ASL: %[RX_ASL] m, <a href="https://www.google.hu/maps/place/%[RX_GPS]" target="_blank" onclick="dont_toggle_rx_photo();">[maps]</a></div> <div id="webrx-rx-desc" onclick="toggle_rx_photo();"></div>
</div> </div>
<div id="openwebrx-rx-details-arrow"> <div id="openwebrx-rx-details-arrow">
<a id="openwebrx-rx-details-arrow-up" onclick="toggle_rx_photo();"><img src="static/gfx/openwebrx-rx-details-arrow-up.png" /></a> <a id="openwebrx-rx-details-arrow-up" onclick="toggle_rx_photo();"><img src="static/gfx/openwebrx-rx-details-arrow-up.png" /></a>
@ -65,8 +65,8 @@
</ul> </ul>
</section> </section>
</div> </div>
<div id="webrx-rx-photo-title">%[RX_PHOTO_TITLE]</div> <div id="webrx-rx-photo-title"></div>
<div id="webrx-rx-photo-desc">%[RX_PHOTO_DESC]</div> <div id="webrx-rx-photo-desc"></div>
</div> </div>
</div> </div>
<div id="webrx-main-container"> <div id="webrx-main-container">

7
htdocs/openwebrx.js
View File

@ -1182,6 +1182,13 @@ function on_ws_recv(evt)
waterfall_init(); waterfall_init();
audio_preinit(); audio_preinit();
break; break;
case "receiver_details":
var r = json.value;
e('webrx-rx-title').innerHTML = r.receiver_name;
e('webrx-rx-desc').innerHTML = r.receiver_location + ' | Loc: ' + r.receiver_qra + ', ASL: ' + r.receiver_asl + ' m, <a href="https://www.google.hu/maps/place/' + r.receiver_gps[0] + ',' + r.receiver_gps[1] + '" target="_blank" onclick="dont_toggle_rx_photo();">[maps]</a>';
e('webrx-rx-photo-title').innerHTML = r.photo_title;
e('webrx-rx-photo-desc').innerHTML = r.photo_desc;
break;
case "smeter": case "smeter":
setSmeterAbsoluteValue(json.value); setSmeterAbsoluteValue(json.value);
break; break;

7
owrx/controllers.py
View File

@ -78,6 +78,13 @@ class WebSocketMessageHandler(object):
conn.send({"type":"config","value":config}) conn.send({"type":"config","value":config})
print("client connection intitialized") print("client connection intitialized")
receiver_details = dict((key, pm.getPropertyValue(key)) for key in ["receiver_name", "receiver_location",
"receiver_qra", "receiver_asl",
"receiver_gps", "photo_title",
"photo_desc"]
)
conn.send({"type":"receiver_details","value":receiver_details})
self.forwarder = SpectrumForwarder(conn) self.forwarder = SpectrumForwarder(conn)
SpectrumThread.getSharedInstance().add_client(self.forwarder) SpectrumThread.getSharedInstance().add_client(self.forwarder)
CpuUsageThread.getSharedInstance().add_client(self.forwarder) CpuUsageThread.getSharedInstance().add_client(self.forwarder)