Skip to content

Commit 9d3e4bf

Browse files
author
Sebastian Keller
committed
Fixed GUI-Crash if event is created without signals
Fixed NetWoRTOC import errors Fixed GUI-Darkmode-Bug Fixed TCP-Connection without password Added signal-memory-usage display added TCP-port-selection disabled reusing TCP-port RTLogger can handle None-Signals
1 parent 75a306e commit 9d3e4bf

25 files changed

+883
-306
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ devices/ // Directory for user-plugins
7878
plotStyles.json // Custom plotstyles for signals are stored in this file
7979
```
8080

81-
### Manuelle Installation
81+
### Install manually
8282

8383
To use RTOC, the following dependencies must be installed
8484

RTOC.egg-info/PKG-INFO

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
Metadata-Version: 1.2
22
Name: RTOC
3-
Version: 1.8.1
3+
Version: 1.8.6
44
Summary: RealTime OpenControl
55
Home-page: https://github.com/Haschtl/RealTimeOpenControl
66
Author: Sebastian Keller
77
Author-email: [email protected]
88
License: GNU
9-
Description: RealTime OpenControl is a universal measurement, plot and control-software.
10-
It's purpose is to put measurements from different devices (for example 3d-printers, multimeters, power supplies, microcontroller,...) into one tool.
11-
Its fully expandable for every device with Python-Plugins and a running TCP-server.
12-
You can also control the devices (if your plugin has this functionality) with python-scripts, which you can write and run at runtime! This makes it also possible to plot everything else.
13-
There are some example-plugins and example-scripts included.
14-
It also offers an extended plotting-GUI with multiple plots, measure-tools, style-adjustments.
9+
Description: 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.
10+
11+
In addition to data recording, events can also be recorded. These can, for example, trigger a telegram message.
12+
13+
Possible applications:
14+
15+
- Central measurement data recording of laboratory instruments with PC connection (e.g. power supply unit, multimeter, sensors, microcontroller)
16+
- Central recording of measurement data from Internet devices (e.g. mobile weather stations, drones, smartphones)
17+
- Remote monitoring and control of processes and devices with PC and Smartphone (Telegram) (e.g. 3D printing, heating, Custom-SmartHome)
18+
- Controlling between several devices (e.g.: power regulation of a power supply unit on the temperature sensor of a multimeter)
19+
- Decentralized data recording (e.g. on Raspberry) and access via network connection (smart projects)
1520

1621
Platform: UNKNOWN
1722
Classifier: Programming Language :: Python

RTOC.egg-info/SOURCES.txt

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ RTOC.egg-info/SOURCES.txt
1515
RTOC.egg-info/dependency_links.txt
1616
RTOC.egg-info/requires.txt
1717
RTOC.egg-info/top_level.txt
18+
RTOC/__pycache__/LoggerPlugin.cpython-36.pyc
19+
RTOC/__pycache__/RTLogger.cpython-36.pyc
20+
RTOC/__pycache__/RTOC.cpython-36.pyc
21+
RTOC/__pycache__/__init__.cpython-36.pyc
22+
RTOC/__pycache__/__main__.cpython-36.pyc
23+
RTOC/__pycache__/jsonsocket.cpython-36.pyc
24+
RTOC/__pycache__/telegramBot.cpython-36.pyc
1825
RTOC/data/Actions.py
1926
RTOC/data/RTPlotActions.py
2027
RTOC/data/RTPlotWidget.py
@@ -33,9 +40,29 @@ RTOC/data/signalEditWidget.py
3340
RTOC/data/signalWidget.py
3441
RTOC/data/styleMultiPlotGUI.py
3542
RTOC/data/stylePlotGUI.py
43+
RTOC/data/__pycache__/Actions.cpython-36.pyc
44+
RTOC/data/__pycache__/RTPlotActions.cpython-36.pyc
45+
RTOC/data/__pycache__/RTPlotWidget.cpython-36.pyc
46+
RTOC/data/__pycache__/ScriptFunctions.cpython-36.pyc
47+
RTOC/data/__pycache__/__init__.cpython-36.pyc
48+
RTOC/data/__pycache__/define.cpython-36.pyc
49+
RTOC/data/__pycache__/eventWidget.cpython-36.pyc
50+
RTOC/data/__pycache__/importCode.cpython-36.pyc
51+
RTOC/data/__pycache__/loggerlib.cpython-36.pyc
52+
RTOC/data/__pycache__/scriptHelpWidget.cpython-36.pyc
53+
RTOC/data/__pycache__/scriptLibrary.cpython-36.pyc
54+
RTOC/data/__pycache__/scriptSubWidget.cpython-36.pyc
55+
RTOC/data/__pycache__/scriptWidget.cpython-36.pyc
56+
RTOC/data/__pycache__/signalEditWidget.cpython-36.pyc
57+
RTOC/data/__pycache__/signalWidget.cpython-36.pyc
58+
RTOC/data/__pycache__/styleMultiPlotGUI.cpython-36.pyc
59+
RTOC/data/__pycache__/stylePlotGUI.cpython-36.pyc
3660
RTOC/data/lib/__init__.py
3761
RTOC/data/lib/general_lib.py
3862
RTOC/data/lib/pyqt_customlib.py
63+
RTOC/data/lib/__pycache__/__init__.cpython-36.pyc
64+
RTOC/data/lib/__pycache__/general_lib.cpython-36.pyc
65+
RTOC/data/lib/__pycache__/pyqt_customlib.cpython-36.pyc
3966
RTOC/data/ui/darkmode.html
4067
RTOC/data/ui/eventWidget.ui
4168
RTOC/data/ui/gridViewWidget.ui
@@ -44,6 +71,7 @@ RTOC/data/ui/messtoolDialog.ui
4471
RTOC/data/ui/plotToolsWidget.ui
4572
RTOC/data/ui/plotViewWidget.ui
4673
RTOC/data/ui/plotWidget.ui
74+
RTOC/data/ui/qtmodern.qss
4775
RTOC/data/ui/rtoc.ui
4876
RTOC/data/ui/scriptHelpWidget.ui
4977
RTOC/data/ui/scriptSubWidget.ui
@@ -151,46 +179,16 @@ RTOC/data/ui/icons/dark/up_arrow.png
151179
RTOC/data/ui/icons/dark/up_arrow_disabled.png
152180
RTOC/lang/en_en.qm
153181
RTOC/lang/en_en.ts
154-
RTOC/plugins/DPS5020.py
155182
RTOC/plugins/Generator.py
156-
RTOC/plugins/Generator2.py
157-
RTOC/plugins/HoldPeak VC820.py
158183
RTOC/plugins/NetWoRTOC.py
159-
RTOC/plugins/OctoTouch.py
160-
RTOC/plugins/System.py
161-
RTOC/plugins/Template.py
162-
RTOC/plugins/DPS5020/dps5020.ui
163184
RTOC/plugins/Funktionsgenerator/gen_function.ui
164-
RTOC/plugins/Octotouch/OctoprintApi.py
165-
RTOC/plugins/Octotouch/octotouch.ui
166-
RTOC/plugins/Octotouch/__pycache__/OctoprintApi.cpython-36.pyc
167-
RTOC/plugins/System/system.ui
168-
RTOC/plugins/Template/template.ui
169-
RTOC/plugins/holdPeak_VC820/portSelectWidget.ui
170-
RTOC/plugins/holdPeak_VC820/vc820py/.gitignore
171-
RTOC/plugins/holdPeak_VC820/vc820py/README.md
172-
RTOC/plugins/holdPeak_VC820/vc820py/generate_test.py
173-
RTOC/plugins/holdPeak_VC820/vc820py/raw2json.py
174-
RTOC/plugins/holdPeak_VC820/vc820py/rawtime2csv.py
175-
RTOC/plugins/holdPeak_VC820/vc820py/rawtime2json.py
176-
RTOC/plugins/holdPeak_VC820/vc820py/rawtime2raw.py
177-
RTOC/plugins/holdPeak_VC820/vc820py/read_from_serial.py
178-
RTOC/plugins/holdPeak_VC820/vc820py/read_multiple.py
179-
RTOC/plugins/holdPeak_VC820/vc820py/read_multiple_reader.py
180-
RTOC/plugins/holdPeak_VC820/vc820py/read_reader.py
181-
RTOC/plugins/holdPeak_VC820/vc820py/reader.py
182-
RTOC/plugins/holdPeak_VC820/vc820py/record_serial.py
183-
RTOC/plugins/holdPeak_VC820/vc820py/replay_rawtime.py
184-
RTOC/plugins/holdPeak_VC820/vc820py/ut61b.py
185-
RTOC/plugins/holdPeak_VC820/vc820py/vc820.py
186-
RTOC/plugins/holdPeak_VC820/vc820py/__pycache__/vc820.cpython-36.pyc
185+
RTOC/plugins/__pycache__/Generator.cpython-36.pyc
186+
RTOC/plugins/__pycache__/NetWoRTOC.cpython-36.pyc
187187
RTOC/plugins/netWoRTOC/gui.py
188188
RTOC/plugins/netWoRTOC/networkscan.py
189189
RTOC/plugins/netWoRTOC/networtoc.ui
190190
RTOC/plugins/netWoRTOC/repeat.png
191191
RTOC/plugins/netWoRTOC/repeat1.png
192192
RTOC/plugins/netWoRTOC/search.png
193193
RTOC/plugins/netWoRTOC/__pycache__/gui.cpython-36.pyc
194-
RTOC/plugins/netWoRTOC/__pycache__/networkscan.cpython-36.pyc
195-
RTOC/plugins/vc820py/-h
196-
RTOC/plugins/vc820py/__pycache__/vc820.cpython-36.pyc
194+
RTOC/plugins/netWoRTOC/__pycache__/networkscan.cpython-36.pyc

RTOC.egg-info/requires.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ pyqtgraph
44
markdown2
55
xlsxwriter
66
scipy
7-
qtmodern
87
python-telegram-bot
98
matplotlib
109
requests

RTOC/LoggerPlugin.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ def __init__(self, stream=None, plot=None, event=None):
2525
self.run = False # False -> stops thread
2626
self.smallGUI = False
2727
self.tcppassword = ''
28+
self.tcpport=5050
29+
self.tcpaddress=''
2830
self.xy = False
2931
self.widget = None
3032

@@ -100,12 +102,13 @@ def event(self, *args, **kwargs):
100102
else:
101103
print("No event connected")
102104

103-
def createTCPClient(self, address="localhost", password=None):
105+
def createTCPClient(self, address="localhost", password=None, tcpport=5050):
104106
self.tcpaddress = address
107+
self.tcpport = tcpport
108+
self.sock = jsonsocket.Client()
105109
if password != None:
106110
self.tcppassword = password
107111
self.sock.setKeyword(password)
108-
self.sock = jsonsocket.Client()
109112

110113
def sendTCP(self, *args, **kwargs):
111114
dataY = kwargs.get('y', None)
@@ -173,7 +176,7 @@ def sendTCP(self, *args, **kwargs):
173176
#dicti['password'] = hex_dig
174177
if self.sock:
175178
try:
176-
self.sock.connect(self.tcpaddress, 5050, self.tcppassword)
179+
self.sock.connect(self.tcpaddress, self.tcpport, self.tcppassword)
177180
self.sock.send(dicti)
178181
response = self.sock.recv()
179182
self.sock.close()

0 commit comments

Comments
 (0)