release 2.1.8

various fixes (e.g. RTRemote)
added customConfigPath
adjusted imports for better compatibility (android)

Author: Sebastian

README.md

@@ -1,9 +1,9 @@
 # RealTime OpenControl (RTOC)
 
-| [![Documentation Status](https://readthedocs.org/projects/realtimeopencontrol/badge/?version=latest)](https://realtimeopencontrol.readthedocs.io/en/latest/) | [![Builds v2.0](https://img.shields.io/badge/Builds%20version-1.6-brightgreen.svg?style=flat)](https://github.com/Haschtl/RealTimeOpenControl/releases) | [![PyPI pyversions](https://img.shields.io/pypi/pyversions/ansicolortags.svg)](https://pypi.python.org/pypi/RTOC/) | [![PyPI version fury.io](https://badge.fury.io/py/ansicolortags.svg)](https://pypi.python.org/pypi/RTOC/) | [![PyPI license](https://img.shields.io/pypi/l/ansicolortags.svg)](https://pypi.python.org/pypi/RTOC/) | [![GitHub release](https://img.shields.io/github/release/Naereen/StrapDown.js.svg)](https://github.com/Haschtl/RealTimeOpenControl/releases/) | [![Github all releases](https://img.shields.io/github/downloads/Naereen/StrapDown.js/total.svg)](https://github.com/Haschtl/RealTimeOpenControl/releases/) |
+| [![Documentation Status](https://readthedocs.org/projects/realtimeopencontrol/badge/?version=latest)](https://realtimeopencontrol.readthedocs.io/en/latest/) | [![Builds 2.1.8v](https://img.shields.io/badge/Builds%20version-1.6-brightgreen.svg?style=flat)](https://github.com/Haschtl/RealTimeOpenControl/releases) | [![PyPI pyversions](https://img.shields.io/pypi/pyversions/ansicolortags.svg)](https://pypi.python.org/pypi/RTOC/) | [![PyPI version fury.io](https://badge.fury.io/py/ansicolortags.svg)](https://pypi.python.org/pypi/RTOC/) | [![PyPI license](https://img.shields.io/pypi/l/ansicolortags.svg)](https://pypi.python.org/pypi/RTOC/) | [![GitHub release](https://img.shields.io/github/release/Naereen/StrapDown.js.svg)](https://github.com/Haschtl/RealTimeOpenControl/releases/) | [![Github all releases](https://img.shields.io/github/downloads/Naereen/StrapDown.js/total.svg)](https://github.com/Haschtl/RealTimeOpenControl/releases/) |
 
 
-### Version 2.0
+### Version 2.1.8
 ![Usecase](screenshots/RTOC-schematik.png)
 [Documentation](https://realtimeopencontrol.readthedocs.io/en/latest/)
 

RTOC.egg-info/PKG-INFO

@@ -1,17 +1,17 @@
 Metadata-Version: 2.1
 Name: RTOC
-Version: 2.1.1
+Version: 2.1.8
 Summary: RealTime OpenControl
 Home-page: https://github.com/Haschtl/RealTimeOpenControl
 Author: Sebastian Keller
 Author-email: sebastiankeller@online.de
 License: GNU
 Description: # RealTime OpenControl (RTOC)
 
-        | [![Documentation Status](https://readthedocs.org/projects/realtimeopencontrol/badge/?version=latest)](https://realtimeopencontrol.readthedocs.io/en/latest/) | [![Builds 2.1.1v](https://img.shields.io/badge/Builds%20version-1.6-brightgreen.svg?style=flat)](https://github.com/Haschtl/RealTimeOpenControl/releases) | [![PyPI pyversions](https://img.shields.io/pypi/pyversions/ansicolortags.svg)](https://pypi.python.org/pypi/RTOC/) | [![PyPI version fury.io](https://badge.fury.io/py/ansicolortags.svg)](https://pypi.python.org/pypi/RTOC/) | [![PyPI license](https://img.shields.io/pypi/l/ansicolortags.svg)](https://pypi.python.org/pypi/RTOC/) | [![GitHub release](https://img.shields.io/github/release/Naereen/StrapDown.js.svg)](https://github.com/Haschtl/RealTimeOpenControl/releases/) | [![Github all releases](https://img.shields.io/github/downloads/Naereen/StrapDown.js/total.svg)](https://github.com/Haschtl/RealTimeOpenControl/releases/) |
+        | [![Documentation Status](https://readthedocs.org/projects/realtimeopencontrol/badge/?version=latest)](https://realtimeopencontrol.readthedocs.io/en/latest/) | [![Builds 2.1.8v](https://img.shields.io/badge/Builds%20version-1.6-brightgreen.svg?style=flat)](https://github.com/Haschtl/RealTimeOpenControl/releases) | [![PyPI pyversions](https://img.shields.io/pypi/pyversions/ansicolortags.svg)](https://pypi.python.org/pypi/RTOC/) | [![PyPI version fury.io](https://badge.fury.io/py/ansicolortags.svg)](https://pypi.python.org/pypi/RTOC/) | [![PyPI license](https://img.shields.io/pypi/l/ansicolortags.svg)](https://pypi.python.org/pypi/RTOC/) | [![GitHub release](https://img.shields.io/github/release/Naereen/StrapDown.js.svg)](https://github.com/Haschtl/RealTimeOpenControl/releases/) | [![Github all releases](https://img.shields.io/github/downloads/Naereen/StrapDown.js/total.svg)](https://github.com/Haschtl/RealTimeOpenControl/releases/) |
 
 
-        ### Version 2.1.1
+        ### Version 2.1.8
         ![Usecase](screenshots/RTOC-schematik.png)
         [Documentation](https://realtimeopencontrol.readthedocs.io/en/latest/)
 
@@ -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: Telegram
 Provides-Extra: GUI
 Provides-Extra: Webserver
+Provides-Extra: Telegram
 Provides-Extra: ALL

RTOC.egg-info/requires.txt

@@ -4,7 +4,6 @@ python-nmap
 whaaaaat
 prompt_toolkit
 pycryptodomex
-psycopg2
 
 [ALL]
 pyqt5
@@ -23,6 +22,11 @@ flask
 matplotlib
 python-telegram-bot
 dash_table
+statsmodels
+scikit-learn
+scikit-metrics
+patsy
+psycopg2
 
 [GUI]
 pyqt5
@@ -45,3 +49,4 @@ dash_daq
 dash_table
 plotly
 flask
+psycopg2

RTOC/RTLogger/NetworkFunctions.py

@@ -6,11 +6,13 @@
 # import sys
 # import subprocess
 
+
 try:
     from .. import jsonsocket
 except (ImportError, SystemError, ValueError):
     jsonsocket = None
 
+
 import logging as log
 log.basicConfig(level=log.DEBUG)
 logging = log.getLogger(__name__)
@@ -28,7 +30,6 @@
         'Telegram for python not installed. Please install with "pip3 install python-telegram-bot"')
     telegramBot = None
 
-
 class NetworkFunctions:
     """
     This class contains all tcp-specific functions of RTLogger

RTOC/RTLogger/RTLogger.py

@@ -119,9 +119,12 @@ def __getitem__(self, key):
 
     def __setitem__(self, key, value):
         dict.__setitem__(self, key, value)
-        with open(self['documentfolder']+"/config.json", 'w', encoding="utf-8") as fp:
-            json.dump(self, fp,  sort_keys=False, indent=4, separators=(',', ': '))
-        logging.info('Config saved')
+        try:
+            with open(self['documentfolder']+"/config.json", 'w', encoding="utf-8") as fp:
+                json.dump(self, fp,  sort_keys=False, indent=4, separators=(',', ': '))
+                logging.info('Config saved')
+        except Exception:
+            logging.warning('Config could not be saved')
 
     def __delitem__(self, key):
         dict.__delitem__(self, key)
@@ -152,12 +155,12 @@ class RTLogger(DeviceFunctions, EventActionFunctions, ScriptFunctions, NetworkFu
         RT_data
         telegramBot
     """
-    def __init__(self, enableTCP=None, tcpport=None, isGUI=False, forceLocal=False):
+    def __init__(self, enableTCP=None, tcpport=None, isGUI=False, forceLocal=False, customConfigPath=None):
         self.run = True
         self.forceLocal = forceLocal
         self.isGUI = isGUI
         self.__config = _Config({})
-        self._load_config()
+        self._load_config(customConfigPath)
         self.pluginObjects = {}  # dict with all plugins
         self.pluginFunctions = {}
         self.pluginParameters = {}
@@ -319,17 +322,22 @@ def config(self, config):
         logging.info('Config changed and saved!')
         self.save_config()
 
-    def _load_config(self):
+    def _load_config(self, customPath=None):
         # self.lastEditedList = []
+        if customPath is None:
+            userpath = os.path.expanduser('~/.RTOC')
+            if not os.path.exists(userpath):
+                os.mkdir(userpath)
+            if not os.path.exists(userpath+'/backup'):
+                os.mkdir(userpath+'/backup')
+            configpath = userpath+"/config.json"
+        else:
+            configpath = os.path.realpath(customPath)
+            userpath = os.path.dirname(configpath)
 
-        userpath = os.path.expanduser('~/.RTOC')
-        if not os.path.exists(userpath):
-            os.mkdir(userpath)
-        if not os.path.exists(userpath+'/backup'):
-            os.mkdir(userpath+'/backup')
-        if os.path.exists(userpath+"/config.json"):
+        if os.path.exists(configpath):
             try:
-                with open(userpath+"/config.json", encoding="UTF-8") as jsonfile:
+                with open(configpath, encoding="UTF-8") as jsonfile:
                     self.__config = _Config(json.load(jsonfile, encoding="UTF-8"))
                 # newlist = []
                 # self.config['global']['documentfolder'] = userpath

RTOC/RTLogger/RTRemote.py

@@ -20,7 +20,7 @@
 class _SingleConnection(LoggerPlugin):
     def __init__(self, stream=None, plot=None, event=None, host='127.0.0.1', port=5050, name='RemoteDevice', password='', logger=None):
         # Plugin setup
-        super(_SingleConnection, self).__init__(stream, plot, event)
+        super(_SingleConnection, self).__init__(logger)
         self.setDeviceName(name)
         self.logger = logger
         self.host = host

RTOC/RTLogger/RT_data.py

@@ -1,6 +1,5 @@
 #!/usr/local/bin/python3
 # coding: utf-8
-import psycopg2
 import time
 from collections import deque
 import sys
@@ -15,6 +14,11 @@
 import psutil
 import copy
 import gzip
+try:
+    import psycopg2
+except Exception:
+    print('WARNING: psycopg2 is not installed, database disabled')
+    psycopg2 = None
 
 from PyQt5.QtCore import QTimer
 
@@ -822,6 +826,11 @@ def deviceNames(self):
 # Datenbank und backupJSON
 
     def _connect(self):
+        if psycopg2 is None:
+            self.status = 'psycopg2 not installed'
+            self._connection = None
+            self._cursor = None
+            return False
         try:
             self._connection = psycopg2.connect(
                 user=self.config['postgresql']['user'],
@@ -1430,6 +1439,10 @@ def __updateT(self):
                 self.logger.clearCB()
             # self.clear()
 
+    def createLocalBackupNow(self):
+        self.backupJSON(self.config['backup']['path'])
+        logging.info('Backup saved in path: '+self.config['backup']['path'])
+
     def stop(self):
         """
         Stops the repeated backup-thread.
@@ -1802,10 +1815,15 @@ def getGlobalXmin(self, database=True, fast=False):
         else:
             ans = time.time()
         #else:
-        x_local = column(self._signals.values(), 2)
-        x_local = [x for l in list(x_local) for x in l]
-        if list(x_local) != []:
-            ans = min(min(list(x_local)), ans)
+        try:
+            with localLock:
+                xdata = list(self._signals.values())
+                x_local = column(xdata, 2)
+                x_local = [x for l in list(x_local) for x in l]
+                if list(x_local) != []:
+                    ans = min(min(list(x_local)), ans)
+        except Exception:
+            logging.warning('Could not get local xmin, because _signals are in use')
 
         return ans
 
@@ -1840,11 +1858,15 @@ def getGlobalXmax(self, database=True, fast=False):
 
         # x_local = column(self._signals.values(), 2)
         # ans = max(max(x_local), ans)
-
-        x_local = column(self._signals.values(), 2)
-        x_local = [x for l in list(x_local) for x in l]
-        if list(x_local) != []:
-            ans = max(max(list(x_local)), ans)
+        try:
+            with localLock:
+                xdata = list(self._signals.values())
+                x_local = column(xdata, 2)
+                x_local = [x for l in list(x_local) for x in l]
+                if list(x_local) != []:
+                    ans = max(max(list(x_local)), ans)
+        except Exception:
+            logging.warning('Could not get local xmax, because _signals are in use')
 
         return ans
 

RTOC/RTLogger/scriptLibrary.py

@@ -41,7 +41,7 @@ def lsfit(self, x, y, func="linear", x0=None, n=None):
         y (list): Fitted y-values
         params (list): Identified parameters
     """
-    if n is None:
+    if n is None and self is not None:
         n = self.config['global']['recordLength']
     # Initial guess.
     if type(func) == str:  # automatic mode
@@ -384,7 +384,7 @@ def CCN():
 
     https://machinelearningmastery.com/time-series-prediction-lstm-recurrent-neural-networks-python-keras/
 
-    
+
     Estimate n values in future for a signal using Convolutional Neural Network model. You need to install the following python packages with pip3: ``pip3 install tensorflow keras``
 
     Args:
@@ -421,3 +421,35 @@ def CCN():
     x_input = x_input.reshape((1, 3, 1))
     yhat = model.predict(x_input, verbose=0)
     print(yhat)
+
+
+
+def PT2_estimation(x,y, n, k=100, t1=101, t2=100, t0=25):
+    """
+    Estimate n values in future for a signal with PT2-behavior.
+
+    Args:
+        x (list): List of x-values
+        y (list): List of y-values
+        n (int): Number of values to be estimated
+        k (float): Initial parameter for PT2
+        t1 (float): Initial parameter for PT2
+        t2 (float): Initial parameter for PT2
+        t0 (float): Initial parameter for PT2
+
+    Returns:
+        x (list): List of estimated x-values
+        y (list): List of estimated y-values
+    """
+    def _pt2(x, k, t1, t2, t0):
+        """
+        Verzögerungs-Übertragungsglied zweiter Ordnung. Z.b.: zur Temperaturanalyse
+        """
+        y = k*(1-(1/(t1-t2))*(t1*np.exp(-x/t1)-t2*np.exp(-x/t2)))+t0
+        return y
+
+    x, y, params = lsfit(None, x, y, func=_pt2, x0=[k, t1, t2, t0], n=None)
+    # perform fitting
+
+    # generate additional x-data
+    # calculate y-data

RTOC/RTOC.py

@@ -38,7 +38,7 @@
 
 if os.name == 'nt':
     import ctypes
-    myappid = 'RTOC.2.1.1'  # arbitrary string
+    myappid = 'RTOC.2.1.8'  # arbitrary string
     ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
 
 try:
@@ -163,7 +163,7 @@ class RTOC(QtWidgets.QMainWindow, Actions):
     """GUI-code is not documented."""
     foundRTOCServerCallback = QtCore.pyqtSignal(list)
 
-    def __init__(self, tcp=None, port=5050, forceLocal = False):
+    def __init__(self, tcp=None, port=5050, forceLocal = False, customConfigPath=None):
         super(RTOC, self).__init__()
         if getattr(sys, 'frozen', False):
             # frozen
@@ -181,7 +181,7 @@ def __init__(self, tcp=None, port=5050, forceLocal = False):
         self.forceQuit = False
         self.initPlotWidgets()
 
-        self.logger = RTLogger.RTLogger(tcp, port, True, forceLocal = forceLocal)
+        self.logger = RTLogger.RTLogger(tcp, port, True, forceLocal = forceLocal, customConfigPath=customConfigPath)
         self.config = self.logger.config
         self.settings = None  # window position settings
         self.loadPlotStyles()

RTOC/RTOC_GUI/RTOC_Import.py

@@ -7,7 +7,7 @@
 import os
 from io import StringIO
 import sys
-from PyQt5 import QtCore, QtGui, QtWidgets, QtPrintSupport
+from PyQt5 import QtCore, QtGui, QtWidgets
 from PyQt5.QtCore import QCoreApplication
 from PyQt5 import uic
 import traceback
@@ -16,6 +16,11 @@
 log.basicConfig(level=log.INFO)
 logging = log.getLogger(__name__)
 
+try:
+    from PyQt5 import QtPrintSupport
+except:
+    QtPrintSupport=None
+    print('QtPrintSupport is not available')
 try:
     import pandas as pd
 except ImportError:
@@ -96,8 +101,12 @@ def connectGUI(self):
         self.model.dataChanged.connect(self.finishedEdit)
         self.pushButtonLoad.triggered.connect(self.loadCsvAction)
         self.pushButtonWrite.triggered.connect(self.writeCsv)
-        self.pushButtonPreview.triggered.connect(self.handlePreview)
-        self.pushButtonPrint.triggered.connect(self.handlePrint)
+        if QtPrintSupport is not None:
+            self.pushButtonPreview.triggered.connect(self.handlePreview)
+            self.pushButtonPrint.triggered.connect(self.handlePrint)
+        else:
+            self.pushButtonPreview.setVisible(False)
+            self.pushButtonPrint.setVisible(False)
         self.pushClear.triggered.connect(self.clearList)
 
         self.pushAddRow.clicked.connect(self.addRow)

RTOC/RTOC_GUI/RTPlotWidget.py

@@ -43,11 +43,11 @@ def __init__(self, logger, selfself, id):
         self.self = selfself
         self.id = id
         self.logger = logger
-        self.config = self.self.config
+        self.config = self.logger.config
         self.plotStyles = self.self.plotStyles
         self.active = True
         self.lastActive = time.time()
-        self.updatePlotSamplerate = 10
+        self.updatePlotSamplerate = self.logger.config['GUI']['plotRate']
         self.signalObjects = []
         self.lastUpdate = time.time()
         self.deviceTreeWidgetItems = []

RTOC/RTOC_GUI/signalWidget.py

@@ -512,9 +512,9 @@ def updateEvents(self, offsetX, offsetY, scaleX, scaleY, ctime, current_time):
         for idx0, e in enumerate(self.plotWidget.self.eventWidget.events):
         # priority, time("%H:%M:%S %d.%m.%Y", text, devicename, signalname, value, id
             event = [e[1], e[2], e[0], e[5], e[6], e[3], e[4], e[7]]
-            event[0] = float(datetime.datetime.strptime(event[0], '%H:%M:%S %d.%m.%Y').timestamp())
             oldEvent = False
             if event[6] == self.signalname and event[5] == self.devicename:
+                event[0] = float(datetime.datetime.strptime(event[0], '%H:%M:%S %d.%m.%Y').timestamp())
                 for idx, eventItem in enumerate(self.eventItems):
                     if eventItem.id == event[7]:
                         # wenn schon geplottet, dann position anpassen
@@ -580,9 +580,9 @@ def updatePlot(self):
             #     # logging.info('')
             #     pass
             # else:
+            self.updateEvents(offsetX, offsetY, scaleX, scaleY, ctime, current_time)
             if len(clock) > 0 and len(y) > 0:
                 self.updateLabel(clock, y, signal[4])
-                self.updateEvents(offsetX, offsetY, scaleX, scaleY, ctime, current_time)
                 if self.active:
                     # if clock[len(clock)-1] <= current_time+10000 and clock[len(clock)-1] > current_time-10000:
                     if self.logger.config['GUI']['xRelative']: