Allow setting the time in the loop fix #64

This commit is contained in:
Ruben van de Ven 2019-07-10 15:24:02 +02:00
parent 1e76c44862
commit 6c7e657f81
6 changed files with 49 additions and 4 deletions

View file

@ -170,6 +170,9 @@ class CentralCommand(object):
# status['logbookId'] = selected_id # status['logbookId'] = selected_id
return status return status
def setLoopTime(self, secondsAgo: int):
self.timer.setMark('start', time.time() - secondsAgo)
def commandHugvey(self, hv_id, msg): def commandHugvey(self, hv_id, msg):
""" """

View file

@ -75,6 +75,8 @@ def getWebSocketHandler(central_command):
self.msgChangeLightStatus(msg['hugvey'], bool(msg['light_status'])) self.msgChangeLightStatus(msg['hugvey'], bool(msg['light_status']))
elif msg['action'] == 'play_msg': elif msg['action'] == 'play_msg':
self.msgPlayMsg(msg['hugvey'], msg['msg_id'], msg['reloadStory']) self.msgPlayMsg(msg['hugvey'], msg['msg_id'], msg['reloadStory'])
elif msg['action'] == 'loop_time':
self.msgSetLoopTime(msg['time'])
else: else:
# self.send({'alert': 'Unknown request: {}'.format(message)}) # self.send({'alert': 'Unknown request: {}'.format(message)})
logger.warn('Unknown request: {}'.format(message)) logger.warn('Unknown request: {}'.format(message))
@ -134,6 +136,20 @@ def getWebSocketHandler(central_command):
def msgChangeLanguage(self, hv_id, lang_code): def msgChangeLanguage(self, hv_id, lang_code):
central_command.hugveys[hv_id].eventQueue.put_nowait({'event': 'change_language', 'lang_code': lang_code}) central_command.hugveys[hv_id].eventQueue.put_nowait({'event': 'change_language', 'lang_code': lang_code})
def msgSetLoopTime(self, loop_time):
parts = loop_time.split(":")
if len(parts) == 2:
h, m = parts
s = 0
elif len(parts) == 3:
h, m, s = parts
else:
logger.critical(f"Invalid time to set: {loop_time}")
return
seconds = int(h)*3600+int(m)*60+int(s)
central_command.setLoopTime(seconds)
def msgChangeLightId(self, hv_id, lightId): def msgChangeLightId(self, hv_id, lightId):
central_command.hugveys[hv_id].eventQueue.put_nowait({'event': 'change_light', 'light_id': lightId}) central_command.hugveys[hv_id].eventQueue.put_nowait({'event': 'change_light', 'light_id': lightId})

View file

@ -370,3 +370,11 @@ body.showTimeline #toggleTimeline {
font-weight: bold; } font-weight: bold; }
#variables .name::after { #variables .name::after {
content: " - "; } content: " - "; }
.loop_time {
cursor: pointer; }
#time_update {
display: none; }
#time_update.visible {
display: block; }

View file

@ -16,10 +16,12 @@
<div id="interface" class='showStatus'> <div id="interface" class='showStatus'>
<div id='status'> <div id='status'>
<div id='overview'> <div id='overview'>
<dl> <span class="loop_time" onclick="document.getElementById('time_update').classList.toggle('visible')">{{loop_timer}}</span> (up: {{uptime}})
<dt>Timer</dt> <div id='time_update'>
<dd>{{loop_timer}} (up: {{uptime}})</dd> <input type="time" step="1" value="00:00:00" name="loop_time_value" id="loop_time_value" />
</dl> <input type="button" onclick="panopticon.change_loop_time(document.getElementById('loop_time_value').value)" value="set time">
</div>
<ul id='languages'> <ul id='languages'>
<li v-for="lang in languages" :title="lang.file" <li v-for="lang in languages" :title="lang.file"

View file

@ -147,6 +147,11 @@ class Panopticon {
this.hugveys.selectedId = hv_id; this.hugveys.selectedId = hv_id;
this.send({ action: 'selection', selected_id: hv_id }); this.send({ action: 'selection', selected_id: hv_id });
} }
change_loop_time(newTime) {
console.log('update', newTime);
this.send({ action: 'loop_time', time: newTime });
}
updateSelectedHugvey() { updateSelectedHugvey() {
let hv = null; let hv = null;

View file

@ -597,4 +597,15 @@ img.icon{
content:" - "; content:" - ";
} }
} }
}
.loop_time{
cursor:pointer;
}
#time_update{
display:none;
&.visible{
display:block;
}
} }