release 2.0.2

Author: Sebastian

RTOC.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: RTOC
-Version: 2.0.1
+Version: 2.0.2
 Summary: RealTime OpenControl
 Home-page: https://github.com/Haschtl/RealTimeOpenControl
 Author: Sebastian Keller
@@ -159,7 +159,7 @@ Classifier: Topic :: Scientific/Engineering :: Visualization
 Classifier: Topic :: Software Development :: User Interfaces
 Requires-Python: >=3
 Description-Content-Type: text/markdown
-Provides-Extra: ALL
-Provides-Extra: Telegram
-Provides-Extra: Webserver
 Provides-Extra: GUI
+Provides-Extra: Webserver
+Provides-Extra: Telegram
+Provides-Extra: ALL

RTOC/LoggerPlugin.py

@@ -80,7 +80,7 @@ def getDir(self, dir=None):
 
         return packagedir
 
-    def stream(self, y, snames, dname=None, unit=None, x=None, slist=None, sdict=None):
+    def stream(self, y=[], snames=[], dname=None, unit=None, x=None, slist=None, sdict=None):
         """
         Use this function to send new measurements to RTOC. You can send multiple signals at once.
 
@@ -543,39 +543,55 @@ def __updateT(self, func):
 
 
 class _perpetualTimer():
+    thread_counter = 0
+
     def __init__(self, hFunction, samplerate=1, lock=None):
         self._samplerate = samplerate
         self._lock = lock
         self._hFunction = hFunction
         self._thread = None
 
     def _handle_function(self):
-        start = time.time()
+        self.thread_counter -= 1
+        if self.thread_counter != 0:
+            logging.warning('there should not be a running thread, but unfortunately it is.')
+            print(self.thread_counter)
+
         with self._lock:
+            start = time.time()
             self._hFunction()
-        diff = time.time() - start
-        timedelta = 1/self._samplerate - diff
-        if timedelta < 0:
-            timedelta = 0
+            diff = time.time() - start
+            timedelta = 1/self._samplerate - diff
+            if timedelta < 0:
+                timedelta = 0
         self._thread = Timer(timedelta, self._handle_function)
+        self.thread_counter += 1
         self._thread.start()
 
     def setSamplerate(self, rate):
         if rate != self._samplerate:
             self._samplerate = rate
-            if self._thread is not None:
-                self.cancel()
-            self._thread = Timer(1/self._samplerate, self._handle_function)
-            self._thread.start()
+            self.cancel()
+            if self.thread_counter == 0:
+                self._thread = Timer(1/self._samplerate, self._handle_function)
+                self.thread_counter += 1
+                self._thread.start()
+            else:
+                logging.warning('Thread should have stopped before changing samplerate, but it didnt.')
 
     def getSamplerate(self):
         return self._samplerate
 
     def start(self):
+        logging.info('Starting perpetual timer')
+        self.cancel()
         self._thread = Timer(0, self._handle_function)
+        self.thread_counter += 1
         self._thread.start()
 
     def cancel(self):
         if self._thread is not None:
-            self._thread.cancel()
-            self._thread = None
+            with self._lock:
+                self._thread.cancel()
+                self.thread_counter -= 1
+                self._thread = None

RTOC/RTLogger/DeviceFunctions.py

@@ -322,3 +322,5 @@ def analysePlugin(self, object, name):
                     origParName = "self.pluginObjects['"+name+"']."+str(element)
 
                     self.pluginParameters[name+"." +element] = origParName
+
+        # print(self.pluginFunctions)

RTOC/RTLogger/NetworkFunctions.py

@@ -88,8 +88,8 @@ def toggleTcpServer(self, value=None):
                 self.__tcpserver.start()
                 logging.info("TCPServer gestartet")
                 return True
-            except OSError:
-                logging.error("Port already in use. Cannot start TCP-Server")
+            except OSError as error:
+                logging.error("Port already in use. Cannot start TCP-Server:\n{}".format(error))
                 self.tcpRunning = False
                 # self.config['tcp']['active'] = False
                 return False
@@ -345,7 +345,7 @@ def getPluginDict(self):
             for fun in self.pluginFunctions.keys():
                 hiddenFuncs = ["loadGUI", "updateT", "stream", "plot", "event", "createTCPClient", "sendTCP", "close", "cancel", "start", "setSamplerate","setDeviceName",'setPerpetualTimer','setInterval','getDir']
 
-                if fun not in [name+'.'+i for i in hiddenFuncs]:
+                if fun.startswith(name+".") and fun not in [name+'.'+i for i in hiddenFuncs]:
                     dict[name]['functions'].append(fun.replace(name+".", ''))
             for fun in self.pluginParameters.keys():
                 hiddenParams = ["run", "smallGUI", 'widget', 'samplerate','lockPerpetialTimer']

RTOC/RTLogger/RTLogger.py

@@ -82,7 +82,8 @@
     "telegram": {
         "active": False,
         "token": "",
-        "eventlevel": 0,
+        "default_eventlevel": 0,
+        "default_permission": 'blocked', # or 'read' or 'write' or 'admin'
         "chat_ids": {},
         "inlineMenu": False,
         "onlyAdmin": False

RTOC/RTLogger/RTRemote.py

@@ -1,5 +1,5 @@
 import time
-from threading import Thread
+# from threading import Thread
 import traceback
 import json
 import socket
@@ -145,8 +145,8 @@ def updateEvents(self, newEventList):
             if evID not in self.eventlist.keys():
                 # self.eventlist[evID] = newEventList[evID]
                 ev = newEventList[evID]
-                self.event(x=ev[4], text=ev[3], sname=str(ev[0]),
-                           dname=self.name+":"+str(ev[1]), priority=ev[6])
+                self.event(x=ev[4], text=ev[3], sname=str(ev[1]),
+                           dname=self.name+":"+str(ev[0]), priority=ev[6])
 
         self.eventlist = newEventList
 

RTOC/RTLogger/RT_data.py

@@ -772,12 +772,15 @@ def events(self, beauty=False):
         Returns:
             dict: {EVENT_ID: [DEVICE_ID,SIGNAL_ID,EVENT_ID,TEXT,TIME,VALUE,PRIORITY, ID],...}
         """
-        ev = {}
-        for evID in self._events.keys():
-            name = self.getEventName(evID)
-            old = self._events[evID]
-            ev[evID]=[name[0],name[1],*old[2:]]
-        return ev
+        if beauty:
+            ev = {}
+            for evID in self._events.keys():
+                name = self.getEventName(evID)
+                old = self._events[evID]
+                ev[evID]=[name[0],name[1],*old[2:]]
+            return ev
+        else:
+            return dict(self._events)
 
     def signals(self):
         """
@@ -1123,11 +1126,12 @@ def _addSQLSignal(self, sigID, signal):
         dev = self._SQLdeviceExists(devicename)
         if dev is False:
             self._SQLcreateDevice(signal[0], devicename)
-        sigID = self._SQLcreateSignal(sigID, signalname, devicename, x, y, unit)
+        if not self.signalExists(signalname, devicename):
+            sigID = self._SQLcreateSignal(sigID, signalname, devicename, x, y, unit)
         # add data
-        sql = 'UPDATE '+SIGNAL_TABLE_NAME+' SET X = ARRAY'+str(x)+' WHERE ID ='+str(sigID)+';'
+        sql = 'UPDATE '+SIGNAL_TABLE_NAME+' SET X = ARRAY'+str(x)+'::NUMERIC[] WHERE ID ='+str(sigID)+';'
         sql += '\nUPDATE '+SIGNAL_TABLE_NAME + \
-            ' SET Y = ARRAY'+str(y)+' WHERE ID ='+str(sigID)+';'
+            ' SET Y = ARRAY'+str(y)+'::NUMERIC[] WHERE ID ='+str(sigID)+';'
         sql += '\nUPDATE '+SIGNAL_TABLE_NAME+' SET UNIT = \'' + \
             str(unit)+'\' WHERE ID ='+str(sigID)+';'
         self._execute_n_commit(sql)
@@ -1193,10 +1197,11 @@ def _SQLcreateEvent(self, devID, sigID, evID, strung, x, value, priority, eventi
         if check_devID == -1:
             self._SQLcreateDevice(devID, devicename)
             devID = self._SQLgetDeviceID(devicename)
-        check_sigID = self._SQLgetSignalID(devicename, signalname)
-        if check_sigID == -1:
-            self._SQLcreateSignal(sigID, devicename, signalname)
-            sigID = self._SQLgetSignalID(devicename, signalname)
+        # check_sigID = self._SQLgetSignalID(devicename, signalname)
+        # if check_sigID == -1:
+        if not self.signalExists(signalname, devicename):
+            sigID = self._SQLcreateSignal(sigID, devicename, signalname)
+            # sigID = self._SQLgetSignalID(devicename, signalname)
         if devID != -1 and sigID != -1:
             sql = '''INSERT INTO '''+EVENT_TABLE_NAME+'''(ID, TIME, TEXT, DEVICE_ID, SIGNAL_ID, PRIORITY, VALUE, EVENT_ID)
                     VALUES
@@ -1837,12 +1842,13 @@ def getSignalInfo(self, sigID, database=True):
         #else:
         signal = self.getSignal(sigID)
         if signal is not None:
-            xminLocal = min(signal[2])
-            xmaxLocal = max(signal[2])
-            sigLenLocal = len(list(signal[2]))
-            xmin = min([xminLocal, xmin])
-            xmax = max([xmaxLocal, xmax])
-            sigLen = max([sigLenLocal, sigLen])
+            if len(signal[2])>0:
+                xminLocal = min(signal[2])
+                xmaxLocal = max(signal[2])
+                sigLenLocal = len(list(signal[2]))
+                xmin = min([xminLocal, xmin])
+                xmax = max([xmaxLocal, xmax])
+                sigLen = max([sigLenLocal, sigLen])
 
         return float(xmin), float(xmax), int(sigLen)
 
@@ -1978,24 +1984,37 @@ def getSignal(self, sigID, xmin=None, xmax=None, database=False, maxN=None):
         if xmin == None:
             xmin = 0
         if xmax == None:
-            xmax = time.time()*2
+            xmax = float(time.time())*2
 
+        signal = None
         if self.logger.config['postgresql']['active'] and database:
             signal = self._getSQLSignal(sigID, None,  xmin=xmin, xmax=xmax, maxN=maxN)  # sigLen)
             if signal == None:
                 logging.warning('Could not find {} in database'.format(sigID))
                 database = False
 
-        if database:
+        if sigID in self._signals:
+            # signal = copy.deepcopy(self._signals[sigID])
+            signal_local = list(self._signals[sigID])
+            if signal is None:
+                signal = signal_local
+            else:
+                for idx, x in enumerate(signal_local[2]):
+                    if x > signal[2][-1]:
+                        signal[2] += list(signal_local[2])[idx:]
+                        signal[3] += list(signal_local[3])[idx:]
+                        break
+
+        if signal is not None:
             for idx, x in enumerate(signal[2]):
                 if x > xmin:
-                    signal[2] = signal[2][idx:]
-                    signal[3] = signal[3][idx:]
+                    signal[2] = list(signal[2])[idx:]
+                    signal[3] = list(signal[3])[idx:]
                     break
             for idx, x in enumerate(signal[2]):
                 if x > xmax:
-                    signal[2] = signal[2][0:idx-1]
-                    signal[3] = signal[3][0:idx-1]
+                    signal[2] = list(signal[2])[0:idx-1]
+                    signal[3] = list(signal[3])[0:idx-1]
                     break
             if maxN != None and type(maxN) == int:
                 if len(signal[2]) > maxN:
@@ -2010,33 +2029,7 @@ def getSignal(self, sigID, xmin=None, xmax=None, database=False, maxN=None):
                     signal[3] = newY
             return signal
         else:
-            if sigID in self._signals:
-                # signal = copy.deepcopy(self._signals[sigID])
-                signal = list(self._signals[sigID])
-                for idx, x in enumerate(signal[2]):
-                    if x > xmin:
-                        signal[2] = list(signal[2])[idx:]
-                        signal[3] = list(signal[3])[idx:]
-                        break
-                for idx, x in enumerate(signal[2]):
-                    if x > xmax:
-                        signal[2] = list(signal[2])[0:idx-1]
-                        signal[3] = list(signal[3])[0:idx-1]
-                        break
-                if maxN != None and type(maxN) == int:
-                    if len(signal[2]) > maxN:
-                        overRatio = int(len(signal[2])/maxN)
-                        newX = []
-                        newY = []
-                        for idx, i in enumerate(signal[2]):
-                            if idx % overRatio == 0:
-                                newX.append(signal[2][idx])
-                                newY.append(signal[3][idx])
-                        signal[2] = newX
-                        signal[3] = newY
-                return signal
-            else:
-                return None
+            return None
 
     def getSignal_byName(self, devicename, signalname, xmin=None, xmax=None, database=False, maxN=None):
         """

RTOC/RTLogger/__main__.py

@@ -56,7 +56,7 @@ def main():
                     'RTOC.RTLogger [-h, -s, -l, -w]\n -h: Hilfe\n-s (--server) [COMMAND]: TCP-Server ohne GUI\n\t- start: Starts the RTOC-daemon\n\t- stop: Stops the RTOC-daemon\n\t- restart: Restarts the RTOC-daemon\n-w Startet RTLogger mit Website\n-p (--port): Starte TCP-Server auf anderem Port (Standart: 5050)\n-c (--config [OPTION=value]): Configure RTOC, type "-c list" to see all options')
                 sys.exit(0)
             elif opt == '-v':
-                logging.info("2.0.1")
+                logging.info("2.0.2")
             elif opt in ('-s', '--server'):
                 if os.name == 'nt':
                     logging.info(