preRelease 2.0b0

.gitignore

@@ -12,3 +12,6 @@ bokeh-master/
 RTOC.egg-info/
 test/
 src/
+docs/_build
+docs/_static
+docs/_templates

RTOC.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: RTOC
-Version: 1.9.9
+Version: 2.0b0
 Summary: RealTime OpenControl
 Home-page: https://github.com/Haschtl/RealTimeOpenControl
 Author: Sebastian Keller
@@ -19,7 +19,6 @@ Description: RealTime OpenControl enables simple real-time data recording, visua
         - Decentralized data recording (e.g. on Raspberry) and access via network connection (smart projects)
 
 Platform: UNKNOWN
-Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Environment :: Other Environment
 Classifier: Intended Audience :: Science/Research
@@ -29,6 +28,6 @@ Classifier: Topic :: Scientific/Engineering :: Visualization
 Classifier: Topic :: Software Development :: User Interfaces
 Requires-Python: >=3
 Provides-Extra: ALL
-Provides-Extra: Webserver
-Provides-Extra: Telegram
 Provides-Extra: GUI
+Provides-Extra: Telegram
+Provides-Extra: Webserver

RTOC.egg-info/SOURCES.txt

@@ -2,46 +2,71 @@ MANIFEST.in
 README.md
 setup.cfg
 setup.py
-RTOC/Console.py
 RTOC/LoggerPlugin.py
-RTOC/PluginDownloader.py
 RTOC/RTOC.py
-RTOC/RTOC_Import.py
-RTOC/RTOC_Web.py
+RTOC/Template.py
 RTOC/__init__.py
 RTOC/__main__.py
 RTOC/jsonsocket.py
+RTOC/requirenments.txt
 RTOC.egg-info/PKG-INFO
 RTOC.egg-info/SOURCES.txt
 RTOC.egg-info/dependency_links.txt
 RTOC.egg-info/entry_points.txt
 RTOC.egg-info/requires.txt
 RTOC.egg-info/top_level.txt
+RTOC/RTLogger/Console.py
+RTOC/RTLogger/Daemon.py
+RTOC/RTLogger/DeviceFunctions.py
+RTOC/RTLogger/EventActionFunctions.py
+RTOC/RTLogger/NetworkFunctions.py
 RTOC/RTLogger/RTLogger.py
+RTOC/RTLogger/RTOC_Web.py
+RTOC/RTLogger/RTOC_Web_standalone.py
 RTOC/RTLogger/RTRemote.py
+RTOC/RTLogger/RT_data.py
 RTOC/RTLogger/ScriptFunctions.py
 RTOC/RTLogger/__init__.py
+RTOC/RTLogger/__main__.py
+RTOC/RTLogger/favicon.ico
 RTOC/RTLogger/importCode.py
 RTOC/RTLogger/loggerlib.py
+RTOC/RTLogger/requirenments.txt
 RTOC/RTLogger/scriptLibrary.py
 RTOC/RTLogger/telegramBot.py
+RTOC/RTLogger/__pycache__/Console.cpython-36.pyc
+RTOC/RTLogger/__pycache__/Daemon.cpython-36.pyc
+RTOC/RTLogger/__pycache__/DeviceFunctions.cpython-36.pyc
+RTOC/RTLogger/__pycache__/EventActionFunctions.cpython-36.pyc
+RTOC/RTLogger/__pycache__/NetworkFunctions.cpython-36.pyc
 RTOC/RTLogger/__pycache__/RTLogger.cpython-36.pyc
+RTOC/RTLogger/__pycache__/RTOC_Web.cpython-36.pyc
+RTOC/RTLogger/__pycache__/RTOC_Web_standalone.cpython-36.pyc
 RTOC/RTLogger/__pycache__/RTRemote.cpython-36.pyc
+RTOC/RTLogger/__pycache__/RT_data.cpython-36.pyc
+RTOC/RTLogger/__pycache__/RT_database.cpython-36.pyc
+RTOC/RTLogger/__pycache__/RT_datalocal.cpython-36.pyc
 RTOC/RTLogger/__pycache__/ScriptFunctions.cpython-36.pyc
 RTOC/RTLogger/__pycache__/__init__.cpython-36.pyc
+RTOC/RTLogger/__pycache__/__main__.cpython-36.pyc
 RTOC/RTLogger/__pycache__/importCode.cpython-36.pyc
 RTOC/RTLogger/__pycache__/loggerlib.cpython-36.pyc
+RTOC/RTLogger/__pycache__/scriptLibrary.cpython-36.pyc
 RTOC/RTLogger/__pycache__/telegramBot.cpython-36.pyc
 RTOC/RTLogger/plugins/Generator.py
 RTOC/RTLogger/plugins/Funktionsgenerator/gen_function.ui
 RTOC/RTLogger/plugins/__pycache__/Generator.cpython-36.pyc
 RTOC/RTOC_GUI/Actions.py
+RTOC/RTOC_GUI/PluginDownloader.py
+RTOC/RTOC_GUI/RTOC_Import.py
 RTOC/RTOC_GUI/RTPlotActions.py
 RTOC/RTOC_GUI/RTPlotWidget.py
 RTOC/RTOC_GUI/__init__.py
 RTOC/RTOC_GUI/csvSignalWidget.py
 RTOC/RTOC_GUI/define.py
 RTOC/RTOC_GUI/eventWidget.py
+RTOC/RTOC_GUI/globalActionWidget.py
+RTOC/RTOC_GUI/globalEventWidget.py
 RTOC/RTOC_GUI/remoteWidget.py
 RTOC/RTOC_GUI/scriptHelpWidget.py
 RTOC/RTOC_GUI/scriptSubWidget.py
@@ -52,12 +77,16 @@ RTOC/RTOC_GUI/signalWidget.py
 RTOC/RTOC_GUI/styleMultiPlotGUI.py
 RTOC/RTOC_GUI/stylePlotGUI.py
 RTOC/RTOC_GUI/__pycache__/Actions.cpython-36.pyc
+RTOC/RTOC_GUI/__pycache__/PluginDownloader.cpython-36.pyc
+RTOC/RTOC_GUI/__pycache__/RTOC_Import.cpython-36.pyc
 RTOC/RTOC_GUI/__pycache__/RTPlotActions.cpython-36.pyc
 RTOC/RTOC_GUI/__pycache__/RTPlotWidget.cpython-36.pyc
 RTOC/RTOC_GUI/__pycache__/__init__.cpython-36.pyc
 RTOC/RTOC_GUI/__pycache__/csvSignalWidget.cpython-36.pyc
 RTOC/RTOC_GUI/__pycache__/define.cpython-36.pyc
 RTOC/RTOC_GUI/__pycache__/eventWidget.cpython-36.pyc
+RTOC/RTOC_GUI/__pycache__/globalActionWidget.cpython-36.pyc
+RTOC/RTOC_GUI/__pycache__/globalEventWidget.cpython-36.pyc
 RTOC/RTOC_GUI/__pycache__/remoteWidget.cpython-36.pyc
 RTOC/RTOC_GUI/__pycache__/scriptHelpWidget.cpython-36.pyc
 RTOC/RTOC_GUI/__pycache__/scriptSubWidget.cpython-36.pyc
@@ -72,6 +101,8 @@ RTOC/RTOC_GUI/ui/csveditor_signal.ui
 RTOC/RTOC_GUI/ui/darkmode.html
 RTOC/RTOC_GUI/ui/eventWidget.ui
 RTOC/RTOC_GUI/ui/getPlugins.ui
+RTOC/RTOC_GUI/ui/globalActionWidget.ui
+RTOC/RTOC_GUI/ui/globalEventWidget.ui
 RTOC/RTOC_GUI/ui/gridViewWidget.ui
 RTOC/RTOC_GUI/ui/lightmode.html
 RTOC/RTOC_GUI/ui/messtoolDialog.ui
@@ -109,6 +140,7 @@ RTOC/RTOC_GUI/ui/icons/checkbox_unchecked_hovered.png
 RTOC/RTOC_GUI/ui/icons/clear.png
 RTOC/RTOC_GUI/ui/icons/close_window.png
 RTOC/RTOC_GUI/ui/icons/close_window_hovered.png
+RTOC/RTOC_GUI/ui/icons/config_hovered.png
 RTOC/RTOC_GUI/ui/icons/crosshair.png
 RTOC/RTOC_GUI/ui/icons/cut.png
 RTOC/RTOC_GUI/ui/icons/delete_column.png
@@ -124,9 +156,11 @@ RTOC/RTOC_GUI/ui/icons/help.png
 RTOC/RTOC_GUI/ui/icons/hohe_prioritaet.png
 RTOC/RTOC_GUI/ui/icons/hohe_prioritaet_grey.png
 RTOC/RTOC_GUI/ui/icons/html.png
+RTOC/RTOC_GUI/ui/icons/icons8-job-liste-senden-filled-96.png
 RTOC/RTOC_GUI/ui/icons/icons8-stornieren-480.png
 RTOC/RTOC_GUI/ui/icons/icons8-telegram-app.png
 RTOC/RTOC_GUI/ui/icons/icons8-transfer.png
+RTOC/RTOC_GUI/ui/icons/icons8-viele-bearbeiten-filled-100.png
 RTOC/RTOC_GUI/ui/icons/internet.png
 RTOC/RTOC_GUI/ui/icons/invert.png
 RTOC/RTOC_GUI/ui/icons/labels.png
@@ -175,23 +209,33 @@ RTOC/RTOC_GUI/ui/icons/x.png
 RTOC/RTOC_GUI/ui/icons/xaxislabel.png
 RTOC/RTOC_GUI/ui/icons/xtimebase.png
 RTOC/RTOC_GUI/ui/icons/y.png
-RTOC/__pycache__/Console.cpython-36.pyc
 RTOC/__pycache__/LoggerPlugin.cpython-36.pyc
 RTOC/__pycache__/PluginDownloader.cpython-36.pyc
 RTOC/__pycache__/RTOC.cpython-36.pyc
 RTOC/__pycache__/RTOC_Import.cpython-36.pyc
+RTOC/__pycache__/Template.cpython-36.pyc
 RTOC/__pycache__/__init__.cpython-36.pyc
 RTOC/__pycache__/__main__.cpython-36.pyc
 RTOC/__pycache__/jsonsocket.cpython-36.pyc
+RTOC/data/icon.ico
 RTOC/data/icon.png
-RTOC/data/testdaten2.csv
+RTOC/lang/ar_ar.po
+RTOC/lang/de_de.po
+RTOC/lang/de_de.ts
+RTOC/lang/en_en.po
 RTOC/lang/en_en.qm
 RTOC/lang/en_en.ts
-RTOC/lib/Daemon.py
+RTOC/lang/en_en_old.qm
+RTOC/lang/en_en_old.ts
+RTOC/lang/es_es.po
+RTOC/lang/fr_fr.po
+RTOC/lang/it_it.po
+RTOC/lang/ja_ja.po
+RTOC/lang/pt_pt.po
+RTOC/lang/ru_ru.po
 RTOC/lib/__init__.py
 RTOC/lib/general_lib.py
 RTOC/lib/pyqt_customlib.py
-RTOC/lib/__pycache__/Daemon.cpython-36.pyc
 RTOC/lib/__pycache__/__init__.cpython-36.pyc
 RTOC/lib/__pycache__/general_lib.cpython-36.pyc
 RTOC/lib/__pycache__/pyqt_customlib.cpython-36.pyc

RTOC.egg-info/requires.txt

@@ -2,7 +2,8 @@ numpy
 requests
 python-nmap
 whaaaaat
-pycryptodomex
+prompt_toolkitpycryptodomex
+psycopg2
 
 [ALL]
 pyqt5
@@ -13,9 +14,14 @@ pandas
 scipy
 ezodf
 xlsxwriter
-bokeh
+dash
+gevent
+dash_daq
+plotly
+flask
 matplotlib
 python-telegram-bot
+dash_table
 
 [GUI]
 pyqt5
@@ -32,4 +38,9 @@ matplotlib
 python-telegram-bot
 
 [Webserver]
-bokeh
+dash
+gevent
+dash_daq
+dash_table
+plotly
+flask

RTOC/RTLogger/__main__.py

@@ -57,7 +57,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("1.9.9")
+                logging.info("2.0b0")
             elif opt in ('-s', '--server'):
                 if os.name == 'nt':
                     logging.info(

RTOC/RTLogger/requirenments.txt

@@ -167,7 +167,7 @@ requests==2.19.1
 requests-toolbelt==0.8.0
 retrying==1.3.3
 rope==0.10.7
-RTOC==1.9.9
+RTOC==2.0b0
 scapy==2.4.0
 scapy-python3==0.26
 scikit-learn==0.19.1

RTOC/RTOC.py

@@ -26,7 +26,7 @@
 
 if os.name == 'nt':
     import ctypes
-    myappid = 'RTOC.1.9.9'  # arbitrary string
+    myappid = 'RTOC.2.0b0'  # arbitrary string
     ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
 
 try:

RTOC/RTOC_GUI/Actions.py

@@ -331,7 +331,7 @@ def importDataTriggered(self):
                     self.importData(fileName)
 
     def showAboutMessage(self):
-        pyqtlib.info_message(self.tr("Über"), "RealTime OpenControl 1.9.9", self.tr(
+        pyqtlib.info_message(self.tr("Über"), "RealTime OpenControl 2.0b0", self.tr(
             "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):

RTOC/__init__.py

@@ -1,2 +1,2 @@
 name = "RTOC"
-__version__ = "1.9.9"
+__version__ = "2.0b0"

RTOC/__main__.py

@@ -44,7 +44,7 @@ def main():
                     'RTOC.py [-h] [-r <Remoteadress>]\n -h: Hilfe\n-r (--remote) <Remoteadresse>: TCP-Client zu RTOC-Server\nFür Optionen ohne GUI verwende "python3 -m RTOC.RTLogger -h"')
                 sys.exit(0)
             elif opt == '-v':
-                logging.info("1.9.9")
+                logging.info("2.0b0")
             elif opt in ("-r", "--remote"):
                 remotepath = arg
                 startRemoteRTOC(remotepath)

RTOC/requirenments.txt

@@ -167,7 +167,7 @@ requests==2.20.0
 requests-toolbelt==0.8.0
 retrying==1.3.3
 rope==0.11.0
-RTOC==1.9.9
+RTOC==2.0b0
 scapy==2.4.0
 scapy-python3==0.26
 scikit-learn==0.19.1

docs/INSTALLATION.rst

@@ -2,6 +2,15 @@
 Installation
 *************
 
+Python3 needs to be installed on your target-computer. Download python3 from the official website: `www.python.org <https://www.python.org/downloads/>`_
+
+After installing python3, you are able to run python in a terminal. (``cmd.exe`` on windows)
+.. code-block:: bash
+
+  $ python3 --version
+  Python 3.6.3
+
+
 Installing with Python3 (recommended)
 ======================================================
 

docs/SCRIPT.rst

@@ -74,10 +74,13 @@ You can use the default ``print()`` function for text-output in console, GUI and
 You can define variables **global**. This ensures, this variable will remain until the next call of this script. Example
 
 .. code-block:: python
+
   global VARNAME = 0
 
 If-else conditions aren't always suitable for real-time operations. You cannot trigger rising/falling for example. Therefore you can use a trigger to call the code inside a condition only once
+
 .. code-block:: python
+
   trig CONDITION:
     print('Hello')
 
@@ -97,7 +100,7 @@ Event/Action system
 The Event/Action System allows Python code to be executed when events occur. These pieces of code have the same possibilities as scripts.
 
 Global actions
-+++++++++++++++++++++++
+----------------
 Global actions are stored in the file :ref:`globalActions.json`.
 
 Example
@@ -127,7 +130,7 @@ Parameter         Datatype            Definition
 ===============   =================== =========================================================
 
 Global events
-+++++++++++++++++++++++
+---------------------
 Global events are stored in the file :ref:`globalEvents.json` unlike events created in plugins.
 
 Example

docs/USERDATA.rst

@@ -6,7 +6,7 @@ Document-Tree
 ========================================
 User data is stored in the home directory of the current user
   - home/USER/.RTOC/ on linux
-  - C:\\user\\USER\\.RTOC\\ on windows
+  - C:\\user\\USER\\ .RTOC\\ on windows
 
 It contains the following files
 ::

docs/conf.py

@@ -28,7 +28,7 @@
 # The short X.Y version
 version = ''
 # The full version, including alpha/beta/rc tags
-release = '1.9.9'
+release = '2.0b0'
 
 
 # -- General configuration ---------------------------------------------------

setup.py

@@ -43,7 +43,7 @@
     author='Sebastian Keller',
     author_email='sebastiankeller@online.de',
     classifiers=[
-        "Programming Language :: Python",
+        # "Programming Language :: Python",
         "Programming Language :: Python :: 3",
         # "Development Status :: 2.3",
         "Environment :: Other Environment",
@@ -85,9 +85,9 @@
 path = os.path.split(__file__)[0]
 # sys.path.insert(0, os.path.join(path, 'tools'))
 
-version = "1.9.9"
-forcedVersion = "1.9.9"
-gitVersion = "1.9.9"
+version = "2.0b0"
+forcedVersion = "2.0b0"
+gitVersion = "2.0b0"
 initVersion = 1.0