revpi/revpipycontrol
1
0
Fork 0
mirror of https://github.com/naruxde/revpipycontrol.git synced 2025-11-08 15:43:52 +01:00
Code Issues Releases Wiki Activity

Wertepr?fung f?r Optionen

Browse Source 
autoreloaddelay in Optionen ?bernommen
ACL Manager schlie?t beim Speichern automatisch
Legacy-Optionen f?r alte RevPiPyLoads laden
This commit is contained in:
Sven Sager
2018-04-03 12:05:37 +02:00
parent a8442b5969
commit e322b1d43b
18 changed files with 284 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/index.html
View File

@@ -25,15 +25,15 @@ Modules</h3>
<td><a style="color:#0000FF" href="revpiinfo.html">revpiinfo</a></td> <td><a style="color:#0000FF" href="revpiinfo.html">revpiinfo</a></td>
<td></td> <td></td>
</tr><tr> </tr><tr>
<td><a style="color:#0000FF" href="revpilegacy.html">revpilegacy</a></td>
<td></td>
</tr><tr>
<td><a style="color:#0000FF" href="revpilogfile.html">revpilogfile</a></td> <td><a style="color:#0000FF" href="revpilogfile.html">revpilogfile</a></td>
<td></td> <td></td>
</tr><tr> </tr><tr>
<td><a style="color:#0000FF" href="revpioption.html">revpioption</a></td> <td><a style="color:#0000FF" href="revpioption.html">revpioption</a></td>
<td></td> <td></td>
</tr><tr> </tr><tr>
<td><a style="color:#0000FF" href="revpioptionlegacy.html">revpioptionlegacy</a></td>
<td></td>
</tr><tr>
<td><a style="color:#0000FF" href="revpiplclist.html">revpiplclist</a></td> <td><a style="color:#0000FF" href="revpiplclist.html">revpiplclist</a></td>
<td></td> <td></td>
</tr><tr> </tr><tr>

6
doc/revpicheckclient.html
View File

@@ -17,7 +17,7 @@ Classes</h3>
<table> <table>
<tr> <tr>
<td><a style="color:#0000FF" href="#RevPiCheckClient">RevPiCheckClient</a></td> <td><a style="color:#0000FF" href="#RevPiCheckClient">RevPiCheckClient</a></td>
<td></td> <td>Baut Fenstererweiterung f&#252;r 'watch modus'.</td>
</tr> </tr>
</table> </table>
<h3 style="background-color:#FFFFFF;color:#FF0000"> <h3 style="background-color:#FFFFFF;color:#FF0000">
@@ -28,7 +28,9 @@ Functions</h3>
<hr /><hr /> <hr /><hr />
<a NAME="RevPiCheckClient" ID="RevPiCheckClient"></a> <a NAME="RevPiCheckClient" ID="RevPiCheckClient"></a>
<h2 style="background-color:#FFFFFF;color:#0000FF">RevPiCheckClient</h2> <h2 style="background-color:#FFFFFF;color:#0000FF">RevPiCheckClient</h2>
<p>
Baut Fenstererweiterung f&#252;r 'watch modus'.
</p>
<h3 style="background-color:#FFFFFF;color:#FF0000"> <h3 style="background-color:#FFFFFF;color:#FF0000">
Derived from</h3> Derived from</h3>
tkinter.Frame tkinter.Frame

6
doc/revpiinfo.html
View File

@@ -17,7 +17,7 @@ Classes</h3>
<table> <table>
<tr> <tr>
<td><a style="color:#0000FF" href="#RevPiInfo">RevPiInfo</a></td> <td><a style="color:#0000FF" href="#RevPiInfo">RevPiInfo</a></td>
<td></td> <td>Baut Frame f&#252;r Programminformationen.</td>
</tr> </tr>
</table> </table>
<h3 style="background-color:#FFFFFF;color:#FF0000"> <h3 style="background-color:#FFFFFF;color:#FF0000">
@@ -28,7 +28,9 @@ Functions</h3>
<hr /><hr /> <hr /><hr />
<a NAME="RevPiInfo" ID="RevPiInfo"></a> <a NAME="RevPiInfo" ID="RevPiInfo"></a>
<h2 style="background-color:#FFFFFF;color:#0000FF">RevPiInfo</h2> <h2 style="background-color:#FFFFFF;color:#0000FF">RevPiInfo</h2>
<p>
Baut Frame f&#252;r Programminformationen.
</p>
<h3 style="background-color:#FFFFFF;color:#FF0000"> <h3 style="background-color:#FFFFFF;color:#FF0000">
Derived from</h3> Derived from</h3>
tkinter.Frame tkinter.Frame

166
doc/revpilegacy.html Normal file
View File

@@ -0,0 +1,166 @@
<!DOCTYPE html>
<html><head>
<title>revpilegacy</title>
<meta charset="UTF-8">
</head>
<body style="background-color:#FFFFFF;color:#000000"><a NAME="top" ID="top"></a>
<h1 style="background-color:#FFFFFF;color:#0000FF">
revpilegacy</h1>
<h3 style="background-color:#FFFFFF;color:#FF0000">
Global Attributes</h3>
<table>
<tr><td>_</td></tr>
</table>
<h3 style="background-color:#FFFFFF;color:#FF0000">
Classes</h3>
<table>
<tr>
<td><a style="color:#0000FF" href="#RevPiOption">RevPiOption</a></td>
<td>Optionen f&#252;r RevPiPyload vor 0.6.0.</td>
</tr>
</table>
<h3 style="background-color:#FFFFFF;color:#FF0000">
Functions</h3>
<table>
<tr><td>None</td></tr>
</table>
<hr /><hr />
<a NAME="RevPiOption" ID="RevPiOption"></a>
<h2 style="background-color:#FFFFFF;color:#0000FF">RevPiOption</h2>
<p>
Optionen f&#252;r RevPiPyload vor 0.6.0.
</p>
<h3 style="background-color:#FFFFFF;color:#FF0000">
Derived from</h3>
tkinter.Frame
<h3 style="background-color:#FFFFFF;color:#FF0000">
Class Attributes</h3>
<table>
<tr><td>None</td></tr>
</table>
<h3 style="background-color:#FFFFFF;color:#FF0000">
Class Methods</h3>
<table>
<tr><td>None</td></tr>
</table>
<h3 style="background-color:#FFFFFF;color:#FF0000">
Methods</h3>
<table>
<tr>
<td><a style="color:#0000FF" href="#RevPiOption.__init__">RevPiOption</a></td>
<td>Init RevPiOption-Class.</td>
</tr><tr>
<td><a style="color:#0000FF" href="#RevPiOption._changesdone">_changesdone</a></td>
<td>Pr&#252;ft ob sich die Einstellungen ge&#228;ndert haben.</td>
</tr><tr>
<td><a style="color:#0000FF" href="#RevPiOption._checkclose">_checkclose</a></td>
<td>Pr&#252;ft ob Fenster beendet werden soll.</td>
</tr><tr>
<td><a style="color:#0000FF" href="#RevPiOption._createwidgets">_createwidgets</a></td>
<td>Erstellt Widgets.</td>
</tr><tr>
<td><a style="color:#0000FF" href="#RevPiOption._loadappdata">_loadappdata</a></td>
<td>L&#228;d aktuelle Einstellungen vom RevPi.</td>
</tr><tr>
<td><a style="color:#0000FF" href="#RevPiOption._setappdata">_setappdata</a></td>
<td>Speichert ge&#228;nderte Einstellungen auf RevPi.</td>
</tr><tr>
<td><a style="color:#0000FF" href="#RevPiOption.askxmlon">askxmlon</a></td>
<td>Fragt Nuter, ob wirklicht abgeschaltet werden soll.</td>
</tr><tr>
<td><a style="color:#0000FF" href="#RevPiOption.xmlmod2_tail">xmlmod2_tail</a></td>
<td>Passt XML-Optionszugriff an.</td>
</tr><tr>
<td><a style="color:#0000FF" href="#RevPiOption.xmlmod_tail">xmlmod_tail</a></td>
<td>Passt XML-Optionszugriff an.</td>
</tr>
</table>
<h3 style="background-color:#FFFFFF;color:#FF0000">
Static Methods</h3>
<table>
<tr><td>None</td></tr>
</table>
<a NAME="RevPiOption.__init__" ID="RevPiOption.__init__"></a>
<h3 style="background-color:#FFFFFF;color:#FF0000">
RevPiOption (Constructor)</h3>
<b>RevPiOption</b>(<i>master, xmlcli</i>)
<p>
Init RevPiOption-Class.
</p><dl>
<dt>Returns:</dt>
<dd>
None
</dd>
</dl><a NAME="RevPiOption._changesdone" ID="RevPiOption._changesdone"></a>
<h3 style="background-color:#FFFFFF;color:#FF0000">
RevPiOption._changesdone</h3>
<b>_changesdone</b>(<i></i>)
<p>
Pr&#252;ft ob sich die Einstellungen ge&#228;ndert haben.
</p><dl>
<dt>Returns:</dt>
<dd>
True, wenn min. eine Einstellung ge&#228;ndert wurde
</dd>
</dl><a NAME="RevPiOption._checkclose" ID="RevPiOption._checkclose"></a>
<h3 style="background-color:#FFFFFF;color:#FF0000">
RevPiOption._checkclose</h3>
<b>_checkclose</b>(<i>event=None</i>)
<p>
Pr&#252;ft ob Fenster beendet werden soll.
</p><dl>
<dt><i>event</i></dt>
<dd>
tkinter-Event
</dd>
</dl><a NAME="RevPiOption._createwidgets" ID="RevPiOption._createwidgets"></a>
<h3 style="background-color:#FFFFFF;color:#FF0000">
RevPiOption._createwidgets</h3>
<b>_createwidgets</b>(<i></i>)
<p>
Erstellt Widgets.
</p><a NAME="RevPiOption._loadappdata" ID="RevPiOption._loadappdata"></a>
<h3 style="background-color:#FFFFFF;color:#FF0000">
RevPiOption._loadappdata</h3>
<b>_loadappdata</b>(<i>refresh=False</i>)
<p>
L&#228;d aktuelle Einstellungen vom RevPi.
</p><dl>
<dt><i>refresh</i></dt>
<dd>
Wenn True, werden Einstellungen heruntergeladen.
</dd>
</dl><a NAME="RevPiOption._setappdata" ID="RevPiOption._setappdata"></a>
<h3 style="background-color:#FFFFFF;color:#FF0000">
RevPiOption._setappdata</h3>
<b>_setappdata</b>(<i></i>)
<p>
Speichert ge&#228;nderte Einstellungen auf RevPi.
</p><dl>
<dt>Returns:</dt>
<dd>
None
</dd>
</dl><a NAME="RevPiOption.askxmlon" ID="RevPiOption.askxmlon"></a>
<h3 style="background-color:#FFFFFF;color:#FF0000">
RevPiOption.askxmlon</h3>
<b>askxmlon</b>(<i></i>)
<p>
Fragt Nuter, ob wirklicht abgeschaltet werden soll.
</p><a NAME="RevPiOption.xmlmod2_tail" ID="RevPiOption.xmlmod2_tail"></a>
<h3 style="background-color:#FFFFFF;color:#FF0000">
RevPiOption.xmlmod2_tail</h3>
<b>xmlmod2_tail</b>(<i></i>)
<p>
Passt XML-Optionszugriff an.
</p><a NAME="RevPiOption.xmlmod_tail" ID="RevPiOption.xmlmod_tail"></a>
<h3 style="background-color:#FFFFFF;color:#FF0000">
RevPiOption.xmlmod_tail</h3>
<b>xmlmod_tail</b>(<i></i>)
<p>
Passt XML-Optionszugriff an.
</p>
<div align="right"><a style="color:#0000FF" href="#top">Up</a></div>
<hr />
</body></html>

6
doc/revpilogfile.html
View File

@@ -17,7 +17,7 @@ Classes</h3>
<table> <table>
<tr> <tr>
<td><a style="color:#0000FF" href="#RevPiLogfile">RevPiLogfile</a></td> <td><a style="color:#0000FF" href="#RevPiLogfile">RevPiLogfile</a></td>
<td></td> <td>Baut Fenster f&#252;r Logfiles.</td>
</tr> </tr>
</table> </table>
<h3 style="background-color:#FFFFFF;color:#FF0000"> <h3 style="background-color:#FFFFFF;color:#FF0000">
@@ -28,7 +28,9 @@ Functions</h3>
<hr /><hr /> <hr /><hr />
<a NAME="RevPiLogfile" ID="RevPiLogfile"></a> <a NAME="RevPiLogfile" ID="RevPiLogfile"></a>
<h2 style="background-color:#FFFFFF;color:#0000FF">RevPiLogfile</h2> <h2 style="background-color:#FFFFFF;color:#0000FF">RevPiLogfile</h2>
<p>
Baut Fenster f&#252;r Logfiles.
</p>
<h3 style="background-color:#FFFFFF;color:#FF0000"> <h3 style="background-color:#FFFFFF;color:#FF0000">
Derived from</h3> Derived from</h3>
tkinter.Frame tkinter.Frame

20
doc/revpioption.html
View File

@@ -17,7 +17,7 @@ Classes</h3>
<table> <table>
<tr> <tr>
<td><a style="color:#0000FF" href="#RevPiOption">RevPiOption</a></td> <td><a style="color:#0000FF" href="#RevPiOption">RevPiOption</a></td>
<td></td> <td>Zeigt Optionen von RevPiPyLoad an.</td>
</tr> </tr>
</table> </table>
<h3 style="background-color:#FFFFFF;color:#FF0000"> <h3 style="background-color:#FFFFFF;color:#FF0000">
@@ -28,7 +28,9 @@ Functions</h3>
<hr /><hr /> <hr /><hr />
<a NAME="RevPiOption" ID="RevPiOption"></a> <a NAME="RevPiOption" ID="RevPiOption"></a>
<h2 style="background-color:#FFFFFF;color:#0000FF">RevPiOption</h2> <h2 style="background-color:#FFFFFF;color:#0000FF">RevPiOption</h2>
<p>
Zeigt Optionen von RevPiPyLoad an.
</p>
<h3 style="background-color:#FFFFFF;color:#FF0000"> <h3 style="background-color:#FFFFFF;color:#FF0000">
Derived from</h3> Derived from</h3>
tkinter.Frame tkinter.Frame
@@ -55,6 +57,9 @@ Methods</h3>
<td><a style="color:#0000FF" href="#RevPiOption._checkclose">_checkclose</a></td> <td><a style="color:#0000FF" href="#RevPiOption._checkclose">_checkclose</a></td>
<td>Pr&#252;ft ob Fenster beendet werden soll.</td> <td>Pr&#252;ft ob Fenster beendet werden soll.</td>
</tr><tr> </tr><tr>
<td><a style="color:#0000FF" href="#RevPiOption._checkvalues">_checkvalues</a></td>
<td>Pr&#252;ft alle Werte auf G&#252;ltigkeit.</td>
</tr><tr>
<td><a style="color:#0000FF" href="#RevPiOption._createwidgets">_createwidgets</a></td> <td><a style="color:#0000FF" href="#RevPiOption._createwidgets">_createwidgets</a></td>
<td>Erstellt Widgets.</td> <td>Erstellt Widgets.</td>
</tr><tr> </tr><tr>
@@ -112,6 +117,17 @@ Pr&#252;ft ob Fenster beendet werden soll.
<dd> <dd>
tkinter-Event tkinter-Event
</dd> </dd>
</dl><a NAME="RevPiOption._checkvalues" ID="RevPiOption._checkvalues"></a>
<h3 style="background-color:#FFFFFF;color:#FF0000">
RevPiOption._checkvalues</h3>
<b>_checkvalues</b>(<i></i>)
<p>
Pr&#252;ft alle Werte auf G&#252;ltigkeit.
</p><dl>
<dt>Returns:</dt>
<dd>
True, wenn alle Werte g&#252;ltig sind
</dd>
</dl><a NAME="RevPiOption._createwidgets" ID="RevPiOption._createwidgets"></a> </dl><a NAME="RevPiOption._createwidgets" ID="RevPiOption._createwidgets"></a>
<h3 style="background-color:#FFFFFF;color:#FF0000"> <h3 style="background-color:#FFFFFF;color:#FF0000">
RevPiOption._createwidgets</h3> RevPiOption._createwidgets</h3>

6
doc/revpiprogram.html
View File

@@ -17,7 +17,7 @@ Classes</h3>
<table> <table>
<tr> <tr>
<td><a style="color:#0000FF" href="#RevPiProgram">RevPiProgram</a></td> <td><a style="color:#0000FF" href="#RevPiProgram">RevPiProgram</a></td>
<td></td> <td>Zeigt Programmfenster an.</td>
</tr> </tr>
</table> </table>
<h3 style="background-color:#FFFFFF;color:#FF0000"> <h3 style="background-color:#FFFFFF;color:#FF0000">
@@ -28,7 +28,9 @@ Functions</h3>
<hr /><hr /> <hr /><hr />
<a NAME="RevPiProgram" ID="RevPiProgram"></a> <a NAME="RevPiProgram" ID="RevPiProgram"></a>
<h2 style="background-color:#FFFFFF;color:#0000FF">RevPiProgram</h2> <h2 style="background-color:#FFFFFF;color:#0000FF">RevPiProgram</h2>
<p>
Zeigt Programmfenster an.
</p>
<h3 style="background-color:#FFFFFF;color:#FF0000"> <h3 style="background-color:#FFFFFF;color:#FF0000">
Derived from</h3> Derived from</h3>
tkinter.Frame tkinter.Frame

6
doc/revpipycontrol.html
View File

@@ -17,7 +17,7 @@ Classes</h3>
<table> <table>
<tr> <tr>
<td><a style="color:#0000FF" href="#RevPiPyControl">RevPiPyControl</a></td> <td><a style="color:#0000FF" href="#RevPiPyControl">RevPiPyControl</a></td>
<td></td> <td>Baut Hauptprogramm auf.</td>
</tr> </tr>
</table> </table>
<h3 style="background-color:#FFFFFF;color:#FF0000"> <h3 style="background-color:#FFFFFF;color:#FF0000">
@@ -28,7 +28,9 @@ Functions</h3>
<hr /><hr /> <hr /><hr />
<a NAME="RevPiPyControl" ID="RevPiPyControl"></a> <a NAME="RevPiPyControl" ID="RevPiPyControl"></a>
<h2 style="background-color:#FFFFFF;color:#0000FF">RevPiPyControl</h2> <h2 style="background-color:#FFFFFF;color:#0000FF">RevPiPyControl</h2>
<p>
Baut Hauptprogramm auf.
</p>
<h3 style="background-color:#FFFFFF;color:#FF0000"> <h3 style="background-color:#FFFFFF;color:#FF0000">
Derived from</h3> Derived from</h3>
tkinter.Frame tkinter.Frame

21
revpipycontrol.api
View File

@@ -53,6 +53,16 @@ revpiinfo.RevPiInfo._createwidgets?5(extended=False)
revpiinfo.RevPiInfo.visitwebsite?4(event=None) revpiinfo.RevPiInfo.visitwebsite?4(event=None)
revpiinfo.RevPiInfo?1(master, xmlcli, version) revpiinfo.RevPiInfo?1(master, xmlcli, version)
revpiinfo._?8 revpiinfo._?8
revpilegacy.RevPiOption._changesdone?5()
revpilegacy.RevPiOption._checkclose?5(event=None)
revpilegacy.RevPiOption._createwidgets?5()
revpilegacy.RevPiOption._loadappdata?5(refresh=False)
revpilegacy.RevPiOption._setappdata?5()
revpilegacy.RevPiOption.askxmlon?4()
revpilegacy.RevPiOption.xmlmod2_tail?4()
revpilegacy.RevPiOption.xmlmod_tail?4()
revpilegacy.RevPiOption?1(master, xmlcli)
revpilegacy._?8
revpilogfile.RevPiLogfile._checkclose?5(event=None) revpilogfile.RevPiLogfile._checkclose?5(event=None)
revpilogfile.RevPiLogfile._createwidgets?5() revpilogfile.RevPiLogfile._createwidgets?5()
revpilogfile.RevPiLogfile._load_log?5(textwidget, xmlcall, startposition, full) revpilogfile.RevPiLogfile._load_log?5(textwidget, xmlcall, startposition, full)
@@ -64,6 +74,7 @@ revpilogfile.RevPiLogfile?1(master, xmlcli)
revpilogfile._?8 revpilogfile._?8
revpioption.RevPiOption._changesdone?5() revpioption.RevPiOption._changesdone?5()
revpioption.RevPiOption._checkclose?5(event=None) revpioption.RevPiOption._checkclose?5(event=None)
revpioption.RevPiOption._checkvalues?5()
revpioption.RevPiOption._createwidgets?5() revpioption.RevPiOption._createwidgets?5()
revpioption.RevPiOption._loadappdata?5(refresh=False) revpioption.RevPiOption._loadappdata?5(refresh=False)
revpioption.RevPiOption._setappdata?5() revpioption.RevPiOption._setappdata?5()
@@ -72,16 +83,6 @@ revpioption.RevPiOption.btn_slaveacl?4()
revpioption.RevPiOption.btn_xmlacl?4() revpioption.RevPiOption.btn_xmlacl?4()
revpioption.RevPiOption?1(master, xmlcli) revpioption.RevPiOption?1(master, xmlcli)
revpioption._?8 revpioption._?8
revpioptionlegacy.RevPiOption._changesdone?5()
revpioptionlegacy.RevPiOption._checkclose?5(event=None)
revpioptionlegacy.RevPiOption._createwidgets?5()
revpioptionlegacy.RevPiOption._loadappdata?5(refresh=False)
revpioptionlegacy.RevPiOption._setappdata?5()
revpioptionlegacy.RevPiOption.askxmlon?4()
revpioptionlegacy.RevPiOption.xmlmod2_tail?4()
revpioptionlegacy.RevPiOption.xmlmod_tail?4()
revpioptionlegacy.RevPiOption?1(master, xmlcli)
revpioptionlegacy._?8
revpiplclist.RevPiPlcList._checkclose?5(event=None) revpiplclist.RevPiPlcList._checkclose?5(event=None)
revpiplclist.RevPiPlcList._createwidgets?5() revpiplclist.RevPiPlcList._createwidgets?5()
revpiplclist.RevPiPlcList._saveappdata?5() revpiplclist.RevPiPlcList._saveappdata?5()

4
revpipycontrol.e4p
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Project SYSTEM "Project-5.1.dtd"> <!DOCTYPE Project SYSTEM "Project-5.1.dtd">
<!-- eric project file for project revpipycontrol --> <!-- eric project file for project revpipycontrol -->
<!-- Saved: 2018-03-12, 15:45:28 --> <!-- Saved: 2018-04-03, 12:04:56 -->
<!-- Copyright (C) 2018 Sven Sager, akira@narux.de --> <!-- Copyright (C) 2018 Sven Sager, akira@narux.de -->
<Project version="5.1"> <Project version="5.1">
<Language>en_US</Language> <Language>en_US</Language>
@@ -23,8 +23,8 @@
<Source>revpipycontrol/revpiprogram.py</Source> <Source>revpipycontrol/revpiprogram.py</Source>
<Source>revpipycontrol/mytools.py</Source> <Source>revpipycontrol/mytools.py</Source>
<Source>revpipycontrol/revpiinfo.py</Source> <Source>revpipycontrol/revpiinfo.py</Source>
<Source>revpipycontrol/revpioptionlegacy.py</Source>
<Source>revpipycontrol/aclmanager.py</Source> <Source>revpipycontrol/aclmanager.py</Source>
<Source>revpipycontrol/revpilegacy.py</Source>
</Sources> </Sources>
<Forms/> <Forms/>
<Translations/> <Translations/>

1
revpipycontrol/aclmanager.py
View File

@@ -376,6 +376,7 @@ class AclManager(ttk.Frame):
def _save(self): def _save(self):
u"""Übernimt die Änderungen.""" u"""Übernimt die Änderungen."""
self.__oldacl = self.__acl.acl self.__oldacl = self.__acl.acl
self._checkclose()
def _savefields(self): def _savefields(self):
u"""Übernimmt neuen ACL Eintrag.""" u"""Übernimmt neuen ACL Eintrag."""

3
revpipycontrol/revpicheckclient.py
View File

@@ -7,6 +7,7 @@
# #
# Thranks to: http://stackoverflow.com/questions/3085696/adding-a- # Thranks to: http://stackoverflow.com/questions/3085696/adding-a-
# scrollbar-to-a-group-of-widgets-in-tkinter # scrollbar-to-a-group-of-widgets-in-tkinter
u"""Fenstererweiterung für den 'watch modus'."""
import pickle import pickle
import tkinter import tkinter
import tkinter.messagebox as tkmsg import tkinter.messagebox as tkmsg
@@ -20,6 +21,8 @@ _ = gettrans()
class RevPiCheckClient(tkinter.Frame): class RevPiCheckClient(tkinter.Frame):
u"""Baut Fenstererweiterung für 'watch modus'."""
def __init__(self, master, xmlcli, xmlmode=0): def __init__(self, master, xmlcli, xmlmode=0):
"""Instantiiert MyApp-Klasse.""" """Instantiiert MyApp-Klasse."""
super().__init__(master) super().__init__(master)

3
revpipycontrol/revpiinfo.py
View File

@@ -5,6 +5,7 @@
# Webpage: https://revpimodio.org/revpipyplc/ # Webpage: https://revpimodio.org/revpipyplc/
# (c) Sven Sager, License: LGPLv3 # (c) Sven Sager, License: LGPLv3
# #
u"""Programminformationen anzeigen."""
import tkinter import tkinter
import tkinter.font as tkf import tkinter.font as tkf
import webbrowser import webbrowser
@@ -16,6 +17,8 @@ _ = gettrans()
class RevPiInfo(tkinter.Frame): class RevPiInfo(tkinter.Frame):
u"""Baut Frame für Programminformationen."""
def __init__(self, master, xmlcli, version): def __init__(self, master, xmlcli, version):
u"""Init RevPiLogfile-Class.""" u"""Init RevPiLogfile-Class."""
self.master = master self.master = master

3
revpipycontrol/revpioptionlegacy.py → revpipycontrol/revpilegacy.py
View File

@@ -5,6 +5,7 @@
# Webpage: https://revpimodio.org/revpipyplc/ # Webpage: https://revpimodio.org/revpipyplc/
# (c) Sven Sager, License: LGPLv3 # (c) Sven Sager, License: LGPLv3
# #
u"""Alte Klassen laden hier, bevor sie entsorgt werden."""
import tkinter import tkinter
import tkinter.messagebox as tkmsg import tkinter.messagebox as tkmsg
from mytools import gettrans from mytools import gettrans
@@ -15,6 +16,8 @@ _ = gettrans()
class RevPiOption(tkinter.Frame): class RevPiOption(tkinter.Frame):
u"""Optionen für RevPiPyload vor 0.6.0."""
def __init__(self, master, xmlcli): def __init__(self, master, xmlcli):
u"""Init RevPiOption-Class. u"""Init RevPiOption-Class.
@return None""" @return None"""

3
revpipycontrol/revpilogfile.py
View File

@@ -5,6 +5,7 @@
# Webpage: https://revpimodio.org/revpipyplc/ # Webpage: https://revpimodio.org/revpipyplc/
# (c) Sven Sager, License: LGPLv3 # (c) Sven Sager, License: LGPLv3
# #
u"""Zeigt die Logfiles an."""
import tkinter import tkinter
from mytools import gettrans from mytools import gettrans
@@ -14,6 +15,8 @@ _ = gettrans()
class RevPiLogfile(tkinter.Frame): class RevPiLogfile(tkinter.Frame):
u"""Baut Fenster für Logfiles."""
def __init__(self, master, xmlcli): def __init__(self, master, xmlcli):
u"""Init RevPiLogfile-Class.""" u"""Init RevPiLogfile-Class."""
super().__init__(master) super().__init__(master)

36
revpipycontrol/revpioption.py
View File

@@ -5,6 +5,7 @@
# Webpage: https://revpimodio.org/revpipyplc/ # Webpage: https://revpimodio.org/revpipyplc/
# (c) Sven Sager, License: LGPLv3 # (c) Sven Sager, License: LGPLv3
# #
u"""Optionsfenster."""
import tkinter import tkinter
import tkinter.messagebox as tkmsg import tkinter.messagebox as tkmsg
from aclmanager import AclManager from aclmanager import AclManager
@@ -16,6 +17,8 @@ _ = gettrans()
class RevPiOption(tkinter.Frame): class RevPiOption(tkinter.Frame):
u"""Zeigt Optionen von RevPiPyLoad an."""
def __init__(self, master, xmlcli): def __init__(self, master, xmlcli):
u"""Init RevPiOption-Class. u"""Init RevPiOption-Class.
@return None""" @return None"""
@@ -76,6 +79,19 @@ class RevPiOption(tkinter.Frame):
if ask: if ask:
self.master.destroy() self.master.destroy()
def _checkvalues(self):
u"""Prüft alle Werte auf Gültigkeit.
@return True, wenn alle Werte gültig sind"""
if not self.var_reload_delay.get().isdigit():
tkmsg.showerror(
_("Error"),
_("The value of 'restart delay' ist not valid."),
parent=self.master
)
return False
return True
def _createwidgets(self): def _createwidgets(self):
u"""Erstellt Widgets.""" u"""Erstellt Widgets."""
self.master.wm_title(_("RevPi Python PLC Options")) self.master.wm_title(_("RevPi Python PLC Options"))
@@ -102,17 +118,27 @@ class RevPiOption(tkinter.Frame):
ckb_start["text"] = _("Start program automatically") ckb_start["text"] = _("Start program automatically")
ckb_start["state"] = xmlstate ckb_start["state"] = xmlstate
ckb_start["variable"] = self.var_start ckb_start["variable"] = self.var_start
ckb_start.grid(**cpadw) ckb_start.grid(columnspan=2, **cpadw)
ckb_reload = tkinter.Checkbutton(stst) ckb_reload = tkinter.Checkbutton(stst)
ckb_reload["text"] = _("Restart program after exit") ckb_reload["text"] = _("Restart program after exit")
ckb_reload["state"] = xmlstate ckb_reload["state"] = xmlstate
ckb_reload["variable"] = self.var_reload ckb_reload["variable"] = self.var_reload
ckb_reload.grid(**cpadw) ckb_reload.grid(columnspan=2, **cpadw)
lbl = tkinter.Label(stst)
lbl["text"] = _("Restart after n seconds of delay")
lbl.grid(**cpadw)
sbx = tkinter.Spinbox(stst)
sbx["to"] = 60
sbx["from_"] = 5
sbx["textvariable"] = self.var_reload_delay
sbx["width"] = 4
sbx.grid(column=1, row=2, **cpade)
lbl = tkinter.Label(stst) lbl = tkinter.Label(stst)
lbl["text"] = _("Set process image to NULL if program terminates...") lbl["text"] = _("Set process image to NULL if program terminates...")
lbl.grid(**cpadw) lbl.grid(columnspan=2, **cpadw)
ckb_zexit = tkinter.Checkbutton(stst, justify="left") ckb_zexit = tkinter.Checkbutton(stst, justify="left")
ckb_zexit["state"] = xmlstate ckb_zexit["state"] = xmlstate
@@ -263,6 +289,10 @@ class RevPiOption(tkinter.Frame):
self._checkclose() self._checkclose()
return None return None
# Gültigkeitsprüfung
if not self._checkvalues():
return None
ask = tkmsg.askyesnocancel( ask = tkmsg.askyesnocancel(
_("Question"), _("Question"),
_("The settings are now saved on the Revolution Pi. \n\n" _("The settings are now saved on the Revolution Pi. \n\n"

3
revpipycontrol/revpiprogram.py
View File

@@ -5,6 +5,7 @@
# Webpage: https://revpimodio.org/revpipyplc/ # Webpage: https://revpimodio.org/revpipyplc/
# (c) Sven Sager, License: LGPLv3 # (c) Sven Sager, License: LGPLv3
# #
u"""PLC Programm und Konfig hoch und runterladen."""
import gzip import gzip
import os import os
import pickle import pickle
@@ -34,6 +35,8 @@ savefile = os.path.join(homedir, ".revpipyplc", "programpath.dat")
class RevPiProgram(tkinter.Frame): class RevPiProgram(tkinter.Frame):
u"""Zeigt Programmfenster an."""
def __init__(self, master, xmlcli, xmlmode, revpi): def __init__(self, master, xmlcli, xmlmode, revpi):
u"""Init RevPiProgram-Class. u"""Init RevPiProgram-Class.
@return None""" @return None"""

17
revpipycontrol/revpipycontrol.py
View File

@@ -12,6 +12,7 @@ import revpicheckclient
import revpiinfo import revpiinfo
import revpilogfile import revpilogfile
import revpioption import revpioption
import revpilegacy
import revpiplclist import revpiplclist
import revpiprogram import revpiprogram
import socket import socket
@@ -29,6 +30,8 @@ pycontrolversion = "0.6.0"
class RevPiPyControl(tkinter.Frame): class RevPiPyControl(tkinter.Frame):
u"""Baut Hauptprogramm auf."""
def __init__(self, master=None): def __init__(self, master=None):
u"""Init RevPiPyControl-Class. u"""Init RevPiPyControl-Class.
@param master tkinter master""" @param master tkinter master"""
@@ -40,6 +43,7 @@ class RevPiPyControl(tkinter.Frame):
self.dict_conn = revpiplclist.get_connections() self.dict_conn = revpiplclist.get_connections()
self.errcount = 0 self.errcount = 0
self.revpiname = None self.revpiname = None
self.revpipyversion = [0, 0, 0]
self.xmlfuncs = [] self.xmlfuncs = []
self.xmlmode = 0 self.xmlmode = 0
@@ -203,6 +207,7 @@ class RevPiPyControl(tkinter.Frame):
try: try:
self.xmlfuncs = sp.system.listMethods() self.xmlfuncs = sp.system.listMethods()
self.xmlmode = sp.xmlmodus() self.xmlmode = sp.xmlmodus()
self.revpipyversion = list(map(int, sp.version().split(".")))
except: except:
self.servererror() self.servererror()
else: else:
@@ -319,8 +324,16 @@ class RevPiPyControl(tkinter.Frame):
win = tkinter.Toplevel(self) win = tkinter.Toplevel(self)
win.focus_set() win.focus_set()
win.grab_set() win.grab_set()
self.tkoptions = \
revpioption.RevPiOption(win, self.cli) # Gegenstelle prüfen und passende Optionen laden
print(self.revpipyversion)
if self.revpipyversion[0] == 0 and self.revpipyversion[1] < 6:
self.tkoptions = \
revpilegacy.RevPiOption(win, self.cli)
else:
self.tkoptions = \
revpioption.RevPiOption(win, self.cli)
self.wait_window(win) self.wait_window(win)
if self.tkoptions.dc is not None and self.tkoptions.dorestart: if self.tkoptions.dc is not None and self.tkoptions.dorestart: