CopterExpress/clever-show
1
0
Fork 0
mirror of https://github.com/CopterExpress/clever-show.git synced 2026-05-26 07:07:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Server: correct send start_time logic

Browse Source
This commit is contained in:
Arthur Golubtsov
2019-10-08 19:55:14 +03:00
parent d81f521b75
commit 19b4d73da3
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Server/server.py
View File

@@ -238,10 +238,9 @@ class Server:
broadcast_client.close()
logging.info("Broadcast listener thread stopped, socked closed!")
def send_starttime(self, copter, dt=0):
timenow = self.time_now()
print('Now:', time.ctime(timenow), "+ dt =", dt)
copter.send_message("start", {"time": str(timenow + dt)})
def send_starttime(self, copter, start_time):
print('start_time: {}'.format(start_time))
copter.send_message("start", {"time": str(start_time)})
def requires_connect(f):

5
Server/server_qt.py
View File

@@ -198,16 +198,17 @@ class MainWindow(QtWidgets.QMainWindow):
@confirmation_required("This operation will takeoff selected copters with delay and start animation. Proceed?")
@pyqtSlot()
def send_starttime_selected(self, **kwargs):
time_now = server.time_now()
dt = self.ui.start_delay_spin.value()
logging.info('Wait {} seconds to start animation'.format(dt))
if self.ui.music_checkbox.isChecked():
music_dt = self.ui.music_delay_spin.value()
asyncio.ensure_future(self.play_music_at_time(music_dt+time.time()), loop=loop)
asyncio.ensure_future(self.play_music_at_time(music_dt+time_now), loop=loop)
logging.info('Wait {} seconds to play music'.format(music_dt))
self.selfcheck_selected()
for copter in self.model.user_selected():
if all_checks(copter):
server.send_starttime(copter.client, dt)
server.send_starttime(copter.client, dt+time_now)
@pyqtSlot()
def pause_resume_selected(self):