|
@@ -5,7 +5,7 @@ from clock import Clock
|
|
|
from slides import Slides
|
|
from slides import Slides
|
|
|
from preguntas import Preg
|
|
from preguntas import Preg
|
|
|
from enum import Enum
|
|
from enum import Enum
|
|
|
-#from websocket import ws
|
|
|
|
|
|
|
+from websocket import Websocket
|
|
|
import time
|
|
import time
|
|
|
import signal
|
|
import signal
|
|
|
import sys
|
|
import sys
|
|
@@ -28,15 +28,16 @@ class Main(object):
|
|
|
self.k = Keyboard(self.next,self.prev,self.toggle)
|
|
self.k = Keyboard(self.next,self.prev,self.toggle)
|
|
|
self.k.setDaemon(True)
|
|
self.k.setDaemon(True)
|
|
|
|
|
|
|
|
- #self.ws = Websocket()
|
|
|
|
|
self.c = Clock(self.timerTick)
|
|
self.c = Clock(self.timerTick)
|
|
|
self.c.setDaemon(True)
|
|
self.c.setDaemon(True)
|
|
|
|
|
|
|
|
|
|
+ self.ws = Websocket()
|
|
|
|
|
+ self.ws.setDaemon(True)
|
|
|
|
|
+
|
|
|
self.slides = Slides("../node/")
|
|
self.slides = Slides("../node/")
|
|
|
self.preg = Preg()
|
|
self.preg = Preg()
|
|
|
|
|
|
|
|
- #self.ws.start()
|
|
|
|
|
-
|
|
|
|
|
|
|
+ self.ws.start()
|
|
|
self.k.start()
|
|
self.k.start()
|
|
|
self.c.start()
|
|
self.c.start()
|
|
|
|
|
|
|
@@ -53,7 +54,6 @@ class Main(object):
|
|
|
self.s.send(self.slides.prev())
|
|
self.s.send(self.slides.prev())
|
|
|
|
|
|
|
|
def toggle(self):
|
|
def toggle(self):
|
|
|
- print("toggle")
|
|
|
|
|
if self.mode == Mode.diapo:
|
|
if self.mode == Mode.diapo:
|
|
|
if len(self.preg.preg) == 0:
|
|
if len(self.preg.preg) == 0:
|
|
|
print("NO preg")
|
|
print("NO preg")
|