release 1.8.2

Author: Sebastian Keller

README.md

@@ -1,10 +1,10 @@
 # RealTime OpenControl (RTOC)
 
-### Version 1.8
+### Version 1.8.2
 
 [**This README is available in GERMAN here.**](misc/README_german.md)
 
-[Documentation](https://github.com/Haschtl/RealTimeOpenControl/wiki)
+[Documentation](https://git.kellerbase.de/haschtl/kellerlogger/wikis/RealTime-OpenControl-(RTOC))
 
 RealTime OpenControl enables simple real-time data recording, visualization and editing. The recording can be done with a local Python scripts or via TCP locally/from the network. Visualization and editing is available locally, in the network (TCP and HTML) and via Telegram on the smartphone.
 
@@ -92,22 +92,16 @@ The following packages should also be installed
 pip3 install python-telegram-bot matplotlib requests python-nmap bokeh pycryptdomex
 ```
 
-For the DPS5020 plugin the following dependency must be installed
-
-```python
-pip3 install minimalmodbus
-```
-
 The RTOC repository can then be cloned with
 
 ```shell
-git@github.com:Haschtl/RealTimeOpenControl.git
+git clone [email protected]:haschtl/kellerlogger
 ```
 
 Now RTOC can be started:
 
 ```shell
-cd RTOC
+cd kellerlogger
 // local RTOC-instance including GUI
 python3 RTOC
 // local RTOC-instance without GUI (only TCP-Server, [HTTP-Server, Telegram-Bot])
@@ -132,16 +126,20 @@ plotStyles.json // Custom plotstyles for signals are stored in this file
 ![Beispielschematik](screenshots/RTOC-schematik.png)
 
 ### Wiki
-[Read the Wiki for full documentation](https://github.com/Haschtl/RealTimeOpenControl/wiki)
+[Read the Wiki for full documentation](https://git.kellerbase.de/haschtl/kellerlogger/wikis/RealTime-OpenControl-(RTOC))
 
 ### Default/Example Plugins:
 
 - function generator: generates sine, square, sawtooth, random, AC, DC
+- NetWoRTOC: Control and data exchange between several RTOC-servers
+
+You can get more plugins from the [RTOC-plugin-repository](https://git.kellerbase.de/haschtl/rtoc-plugins):
 - System: For recording many system variables (CPU, Memory, Network,...)
 - Octoprint: Recording of 3D printers
 - DPS5020: power supply unit recording and control (possibly also DPS5005, ...)
 - HoldPeak VC820: Multimeter Measurement Recording (also other VC820)
-- NetWoRTOC: Control and data exchange between several RTOC-servers
+- ...
+
 
 ### First GUI-Run
 
@@ -161,7 +159,7 @@ The graphical user interface of RTOC offers a wealth of functions for data displ
     - Scaling, shifting of signals
     - Run multiple scripts in parallel
 
-[Complete GUI-tutorial here.]https://github.com/Haschtl/RealTimeOpenControl/wiki/GUI)
+[Complete GUI-tutorial here.](https://git.kellerbase.de/haschtl/kellerlogger/wikis/GUI)
 
 ### Write simple Python-Plugin
 
@@ -172,7 +170,7 @@ Python plugins are integrated into RTOC and can be used to
 
 Plugins can **not** access all measurements. This can be done with a TCP connection to RTOC.
 
-[Example-Plugins here.](https://github.com/Haschtl/RealTimeOpenControl/wiki/PlugIns)
+[Example-Plugins here.](https://git.kellerbase.de/haschtl/kellerlogger/wikis/PlugIns)
 
 ### Simple local TCP-Datastream
 
@@ -190,11 +188,11 @@ The client can
 
 The connection between RTOC server and client can be encrypted end-to-end (DES) with a password (min. 8 characters).
 
-[Example for TCP here.](https://github.com/Haschtl/RealTimeOpenControl/wiki/clientCommunication)
+[Example for TCP here.](https://git.kellerbase.de/haschtl/kellerlogger/wikis/clientCommunication)
 
 ### Include Telegram-messanger
 
-[Tutorial for Telegram here.](https://github.com/Haschtl/RealTimeOpenControl/wiki/telegram)
+[Tutorial for Telegram here.](https://git.kellerbase.de/haschtl/kellerlogger/wikis/telegram)
 
 ## Screenshots
 

RTOC.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: RTOC
-Version: 1.8
+Version: 1.8.1
 Summary: RealTime OpenControl
 Home-page: https://github.com/Haschtl/RealTimeOpenControl
 Author: Sebastian Keller

RTOC.egg-info/SOURCES.txt

@@ -15,12 +15,6 @@ RTOC.egg-info/SOURCES.txt
 RTOC.egg-info/dependency_links.txt
 RTOC.egg-info/requires.txt
 RTOC.egg-info/top_level.txt
-RTOC/__pycache__/LoggerPlugin.cpython-36.pyc
-RTOC/__pycache__/RTLogger.cpython-36.pyc
-RTOC/__pycache__/RTOC.cpython-36.pyc
-RTOC/__pycache__/__main__.cpython-36.pyc
-RTOC/__pycache__/jsonsocket.cpython-36.pyc
-RTOC/__pycache__/telegramBot.cpython-36.pyc
 RTOC/data/Actions.py
 RTOC/data/RTPlotActions.py
 RTOC/data/RTPlotWidget.py
@@ -39,29 +33,9 @@ RTOC/data/signalEditWidget.py
 RTOC/data/signalWidget.py
 RTOC/data/styleMultiPlotGUI.py
 RTOC/data/stylePlotGUI.py
-RTOC/data/__pycache__/Actions.cpython-36.pyc
-RTOC/data/__pycache__/RTPlotActions.cpython-36.pyc
-RTOC/data/__pycache__/RTPlotWidget.cpython-36.pyc
-RTOC/data/__pycache__/ScriptFunctions.cpython-36.pyc
-RTOC/data/__pycache__/__init__.cpython-36.pyc
-RTOC/data/__pycache__/define.cpython-36.pyc
-RTOC/data/__pycache__/eventWidget.cpython-36.pyc
-RTOC/data/__pycache__/importCode.cpython-36.pyc
-RTOC/data/__pycache__/loggerlib.cpython-36.pyc
-RTOC/data/__pycache__/scriptHelpWidget.cpython-36.pyc
-RTOC/data/__pycache__/scriptLibrary.cpython-36.pyc
-RTOC/data/__pycache__/scriptSubWidget.cpython-36.pyc
-RTOC/data/__pycache__/scriptWidget.cpython-36.pyc
-RTOC/data/__pycache__/signalEditWidget.cpython-36.pyc
-RTOC/data/__pycache__/signalWidget.cpython-36.pyc
-RTOC/data/__pycache__/styleMultiPlotGUI.cpython-36.pyc
-RTOC/data/__pycache__/stylePlotGUI.cpython-36.pyc
 RTOC/data/lib/__init__.py
 RTOC/data/lib/general_lib.py
 RTOC/data/lib/pyqt_customlib.py
-RTOC/data/lib/__pycache__/__init__.cpython-36.pyc
-RTOC/data/lib/__pycache__/general_lib.cpython-36.pyc
-RTOC/data/lib/__pycache__/pyqt_customlib.cpython-36.pyc
 RTOC/data/ui/darkmode.html
 RTOC/data/ui/eventWidget.ui
 RTOC/data/ui/gridViewWidget.ui
@@ -178,31 +152,20 @@ RTOC/data/ui/icons/dark/up_arrow_disabled.png
 RTOC/lang/en_en.qm
 RTOC/lang/en_en.ts
 RTOC/plugins/DPS5020.py
-RTOC/plugins/Deneb.py
-RTOC/plugins/Futtertrocknung.py
 RTOC/plugins/Generator.py
 RTOC/plugins/Generator2.py
-RTOC/plugins/Heliotherm.py
 RTOC/plugins/HoldPeak VC820.py
 RTOC/plugins/NetWoRTOC.py
 RTOC/plugins/OctoTouch.py
-RTOC/plugins/ReflowOfen.py
-RTOC/plugins/ReflowPlatte.py
 RTOC/plugins/System.py
 RTOC/plugins/Template.py
 RTOC/plugins/DPS5020/dps5020.ui
-RTOC/plugins/Deneb/deneb.ui
 RTOC/plugins/Funktionsgenerator/gen_function.ui
-RTOC/plugins/Heliotherm/heliotherm.ui
 RTOC/plugins/Octotouch/OctoprintApi.py
 RTOC/plugins/Octotouch/octotouch.ui
 RTOC/plugins/Octotouch/__pycache__/OctoprintApi.cpython-36.pyc
-RTOC/plugins/Reflow/reflow.ui
 RTOC/plugins/System/system.ui
 RTOC/plugins/Template/template.ui
-RTOC/plugins/__pycache__/Generator.cpython-36.pyc
-RTOC/plugins/__pycache__/Generator2.cpython-36.pyc
-RTOC/plugins/__pycache__/NetWoRTOC.cpython-36.pyc
 RTOC/plugins/holdPeak_VC820/portSelectWidget.ui
 RTOC/plugins/holdPeak_VC820/vc820py/.gitignore
 RTOC/plugins/holdPeak_VC820/vc820py/README.md

RTOC/RTLogger.py

@@ -34,6 +34,9 @@
     from LoggerPlugin import LoggerPlugin
     from telegramBot import telegramBot
 
+userpath = os.path.expanduser('~/Documents')
+if not os.path.exists(userpath):
+    os.mkdir(userpath)
 userpath = os.path.expanduser('~/Documents/RTOC')
 if not os.path.exists(userpath):
     os.mkdir(userpath)
@@ -128,6 +131,7 @@ def __init__(self, enableTCP=None):
         self.telegramBot = telegramBot(self)
         self.toggleTelegramBot()
         self.toggleHTMLPage()
+        self.load_autorun_plugins()
 
     def getDir(self, dir = None):
         if dir == None:
@@ -1039,12 +1043,27 @@ def load_config(self):
         with open(self.config['documentfolder']+"/config.json", 'w', encoding="utf-8") as fp:
             json.dump(conf, fp,  sort_keys=False, indent=4, separators=(',', ': '))
 
-
-
     def save_config(self):
         with open(self.config['documentfolder']+"/config.json", 'w', encoding="utf-8") as fp:
             json.dump(self.config, fp,  sort_keys=False, indent=4, separators=(',', ': '))
 
+    def load_autorun_plugins(self):
+        userpath = os.path.expanduser('~/Documents/RTOC/autorun_devices')
+        if not os.path.exists(userpath):
+            with open(userpath, 'w', encoding="UTF-8") as f:
+                f.write('')
+        else:
+            plugins = []
+            try:
+                with open(userpath, 'r', encoding="UTF-8") as f:
+                    content = f.readlines()
+                # you may also want to remove whitespace characters like `\n` at the end of each line
+                plugins = [x.strip() for x in content]
+            except:
+                print('error in '+userpath)
+            for p in plugins:
+                self.startPlugin(p)
+
     def getSignal(self, id):
         if id in self.signalIDs:
             idx = self.signalIDs.index(id)
@@ -1064,14 +1083,14 @@ def getSignalUnits(self, id):
             idx = self.signalIDs.index(id)
             return str(self.signalUnits[idx])
         else:
-            return []
+            return ''
 
     def getSignalNames(self, id):
         if id in self.signalIDs:
             idx = self.signalIDs.index(id)
             return self.signalNames[idx]
         else:
-            return [[], []]
+            return [[''], ['']]
 
 
 if __name__ == "__main__":

RTOC/RTOC.py

@@ -126,17 +126,26 @@ def __init__(self):
         self.tray_icon.setIcon(self.app_icon)
         self.tray_icon.activated.connect(self.systemTrayClickAction)
 
+        self.forceQuit = False
+        self.initPlotWidgets()
+
         self.logger = RTLogger.RTLogger()
+        self.config = self.logger.config
+        self.loadPlotStyles()
+        self.initScriptWidget()
+        self.newPlotWidget()
         self.logger.tr = self.tr
-        self.forceQuit = False
+
+        for id in self.logger.signalIDs:
+            name = self.logger.getSignalNames(id)
+            dataunit = self.logger.getSignalUnits(id)
+            self.addNewSignal(id, name[0], name[1], dataunit)
 
         self.logger.newSignalCallback = self.addNewSignal
         self.logger.callback = self.newDataCallback
         self.logger.clearCallback = self.clearData
         self.logger.stopDeviceCallback = self.remoteDeviceStop
         self.logger.startDeviceCallback = self.remoteDeviceStart
-        self.config = self.logger.config
-        self.loadPlotStyles()
 
         self.darkmode = self.config["darkmode"]
         self.signalTimeOut = self.config["signalInactivityTimeout"]
@@ -145,16 +154,14 @@ def __init__(self):
         self.connectButtons()
         self.initDeviceWidget()
         self.initPluginsWidget()
-        self.initPlotWidgets()
-        self.initScriptWidget()
         self.initTrayIcon()
         self.initEventsWidget()
 
         self.logger.scriptExecutedCallback = self.scriptWidget.executedCallback
         self.logger.handleScriptCallback = self.scriptWidget.triggeredScriptCallback
         self.logger.newEventCallback = self.eventWidget.update
-        if not self.config["pluginsWidget"]:
-            self.pluginsWidget.hide()
+        # if not self.config["pluginsWidget"]:
+        self.pluginsWidget.hide()
         if not self.config["scriptWidget"]:
             self.scriptDockWidget.hide()
         if not self.config["deviceWidget"]:
@@ -169,7 +176,6 @@ def __init__(self):
             self.actionTCPPassword.setText(self.tr('Passwort-Schutz: Aus'))
         else:
             self.actionTCPPassword.setText(self.tr('Passwort-Schutz: An'))
-        self.newPlotWidget()
 
         self.updateLabels()
         self.readSettings()
@@ -241,6 +247,9 @@ def initDeviceWidget(self):
             button.clicked.connect(partial(self.toggleDevice, plugin, button))
             self.deviceLayout.addWidget(button)
 
+            if self.logger.pluginStatus[plugin] == True:
+                button.setChecked(True)
+
     def initPluginsWidget(self):
         self.pluginsBox.removeItem(0)
 
@@ -249,7 +258,7 @@ def initScriptWidget(self):
         self.scriptLayout.addWidget(self.scriptWidget)
 
     def initPlotWidgets(self):
-        self.activePlotWidgetIndex = -1
+        self.activePlotWidgetIndex = 0
         self.plotWidgets = []
 
     def initEventsWidget(self):

RTOC/__init__.py

@@ -1,4 +1,4 @@
 from .data import *
 
 name = "RTOC"
-__version__ = "1.8"
+__version__ = "1.8.2"

RTOC/data/Actions.py

@@ -224,7 +224,7 @@ def showAboutMessage(self):
             "RealTime OpenControl (RTOC) ist eine freie OpenSource Software unter der BSD-3-Lizenz.\n\nAlle Symbole werden unter der 'Creative Commons Attribution-NoDerivs 3.0 Unported' Lizenz bereitgestellt von icons8 (https://icons8.de)\n\nCopyright (C) 2018 Sebastian Keller"))
 
     def showHelpWebsite(self):
-        url = "https://github.com/Haschtl/RealTimeOpenControl/wiki"
+        url = "https://git.kellerbase.de/haschtl/kellerlogger/wikis/RealTime-OpenControl-(RTOC)"
         import webbrowser
         webbrowser.open(url, new=0, autoraise=True)