codestyle

revpipycontrol.e4p

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Project SYSTEM "Project-5.1.dtd">
 <!-- eric project file for project revpipycontrol -->
-<!-- Saved: 2017-07-06, 13:33:38 -->
+<!-- Saved: 2017-12-20, 14:05:18 -->
 <!-- Copyright (C) 2017 Sven Sager, akira@narux.de -->
 <Project version="5.1">
   <Language>en_US</Language>
@@ -9,10 +9,10 @@
   <ProgLanguage mixed="0">Python3</ProgLanguage>
   <ProjectType>Console</ProjectType>
   <Description></Description>
-  <Version>0.4.2</Version>
+  <Version>0.5.0</Version>
   <Author>Sven Sager</Author>
   <Email>akira@narux.de</Email>
-  <Eol index="-1"/>
+  <Eol index="1"/>
   <Sources>
     <Source>revpipycontrol/revpipycontrol.py</Source>
     <Source>revpipycontrol/revpicheckclient.py</Source>

revpipycontrol/mytools.py

@@ -1,10 +1,11 @@
+# -*- coding: utf-8 -*-
 #
 # RevPiPyControl
 #
 # Webpage: https://revpimodio.org/revpipyplc/
 # (c) Sven Sager, License: LGPLv3
 #
-# -*- coding: utf-8 -*-
+"""Tools-Sammlung."""
 import gettext
 import locale
 import sys
@@ -29,7 +30,12 @@ def addroot(filename):
 
 
 def gettrans(proglang=None):
+    u"""Wertet die Sprache des OS aus und gibt Übersetzung zurück.
 
+    @param proglang Bestimmte Sprache laden
+    @return gettext Übersetzung für Zuweisung an '_'
+
+    """
     # Sprache auswählen
     if proglang is None:
         # Autodetect Language or switch to static

revpipycontrol/revpicheckclient.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # RevPiPyControl
 #
@@ -6,7 +7,6 @@
 #
 # Thranks to: http://stackoverflow.com/questions/3085696/adding-a-
 # scrollbar-to-a-group-of-widgets-in-tkinter
-
 import pickle
 import tkinter
 import tkinter.messagebox as tkmsg

revpipycontrol/revpiinfo.py

@@ -1,10 +1,10 @@
+# -*- coding: utf-8 -*-
 #
 # RevPiPyControl
 #
 # Webpage: https://revpimodio.org/revpipyplc/
 # (c) Sven Sager, License: LGPLv3
 #
-# -*- coding: utf-8 -*-
 import tkinter
 import tkinter.font as tkf
 import webbrowser

revpipycontrol/revpilogfile.py

@@ -1,10 +1,10 @@
+# -*- coding: utf-8 -*-
 #
 # RevPiPyControl
 #
 # Webpage: https://revpimodio.org/revpipyplc/
 # (c) Sven Sager, License: LGPLv3
 #
-# -*- coding: utf-8 -*-
 import tkinter
 from mytools import gettrans
 
@@ -57,6 +57,7 @@ class RevPiLogfile(tkinter.Frame):
         self.btnapplog["command"] = self.btn_clearplc
         self.btnapplog["text"] = _("Clear screen")
         self.btnapplog.grid(column=1, row=0, sticky="e")
+
         self.plclog = tkinter.Text(self)
         self.plcscr = tkinter.Scrollbar(self)
         self.plclog.grid(sticky="wnse", columnspan=2, column=0, row=1)
@@ -72,6 +73,7 @@ class RevPiLogfile(tkinter.Frame):
         self.btnapplog["command"] = self.btn_clearapp
         self.btnapplog["text"] = _("Clear screen")
         self.btnapplog.grid(column=4, row=0, sticky="e")
+
         self.applog = tkinter.Text(self)
         self.appscr = tkinter.Scrollbar(self)
         self.applog.grid(sticky="nesw", columnspan=2, column=3, row=1)
@@ -150,13 +152,13 @@ class RevPiLogfile(tkinter.Frame):
         if full:
             textwidget.delete(1.0, tkinter.END)
 
-        if bytebuff == b'\x16':  # 
+        if bytebuff == b'\x16':  # 'ESC'
             # Kein Zugriff auf Logdatei
             textwidget.delete(1.0, tkinter.END)
             textwidget.insert(
                 tkinter.END, _("Can not access log file on the RevPi")
             )
-        elif bytebuff == b'\x19':  # 
+        elif bytebuff == b'\x19':  # 'EndOfMedia'
             # Logdatei neu begonnen
             startposition = 0
         else:

revpipycontrol/revpioption.py

@@ -1,10 +1,10 @@
+# -*- coding: utf-8 -*-
 #
 # RevPiPyControl
 #
 # Webpage: https://revpimodio.org/revpipyplc/
 # (c) Sven Sager, License: LGPLv3
 #
-# -*- coding: utf-8 -*-
 import tkinter
 import tkinter.messagebox as tkmsg
 from mytools import gettrans

revpipycontrol/revpiplclist.py

@@ -1,17 +1,17 @@
+# -*- coding: utf-8 -*-
 #
 # RevPiPyControl
 #
 # Webpage: https://revpimodio.org/revpipyplc/
 # (c) Sven Sager, License: LGPLv3
 #
-# -*- coding: utf-8 -*-
+u"""Fenster um RevPi-Verbindungen einzurichten."""
 import os.path
 import pickle
 import tkinter
 import tkinter.messagebox as tkmsg
 from mytools import gettrans
-from os import environ
+from os import environ, makedirs
-from os import makedirs
 from sys import platform
 
 # Übersetzungen laden
@@ -38,6 +38,8 @@ def get_connections():
 
 class RevPiPlcList(tkinter.Frame):
 
+    u"""TK Fenster."""
+
     def __init__(self, master):
         u"""Init RevPiPlcList-class.
         @param master tkinter master"""
@@ -92,11 +94,13 @@ class RevPiPlcList(tkinter.Frame):
 
         # Eingabefelder für Adresse und Namen
         tkinter.Label(self, text=_("Name")).grid(
-            column=2, row=0, sticky="wn", padx=5, pady=5)
+            column=2, row=0, sticky="wn", padx=5, pady=5
+        )
         self.txt_name = tkinter.Entry(self, textvariable=self.var_name)
         self.txt_name.bind("<KeyRelease>", self.evt_keypress)
         self.txt_name.grid(
-            column=3, row=0, columnspan=3, sticky="n", padx=5, pady=5)
+            column=3, row=0, columnspan=3, sticky="n", padx=5, pady=5
+        )
 
         tkinter.Label(self, text=_("IP address")).grid(
             column=2, row=1, sticky="wn", padx=5, pady=5
@@ -104,34 +108,42 @@ class RevPiPlcList(tkinter.Frame):
         self.txt_address = tkinter.Entry(self, textvariable=self.var_address)
         self.txt_address.bind("<KeyRelease>", self.evt_keypress)
         self.txt_address.grid(
-            column=3,  row=1, columnspan=3, sticky="n", padx=5, pady=5)
+            column=3,  row=1, columnspan=3, sticky="n", padx=5, pady=5
+        )
 
         tkinter.Label(self, text=_("Port")).grid(
-            column=2, row=2, sticky="wn", padx=5, pady=5)
+            column=2, row=2, sticky="wn", padx=5, pady=5
+        )
         self.txt_port = tkinter.Entry(self, textvariable=self.var_port)
         self.txt_port.bind("<KeyRelease>", self.evt_keypress)
         self.txt_port.grid(
-            column=3, row=2, columnspan=3, sticky="n", padx=5, pady=5)
+            column=3, row=2, columnspan=3, sticky="n", padx=5, pady=5
+        )
 
         # Listenbutton
         self.btn_new = tkinter.Button(
-            self, text=_("New"), command=self.evt_btnnew)
+            self, text=_("New"), command=self.evt_btnnew
+        )
         self.btn_new.grid(column=2, row=3, sticky="s")
         self.btn_add = tkinter.Button(
-            self, text=_("Apply"), command=self.evt_btnadd,
+            self, text=_("Apply"),
-            state="disabled")
+            command=self.evt_btnadd, state="disabled"
+        )
         self.btn_add.grid(column=3, row=3, sticky="s")
         self.btn_remove = tkinter.Button(
-            self, text=_("Remove"), command=self.evt_btnremove,
+            self, text=_("Remove"),
-            state="disabled")
+            command=self.evt_btnremove, state="disabled"
+        )
         self.btn_remove.grid(column=4, row=3, sticky="s")
 
         # Fensterbuttons
         self.btn_save = tkinter.Button(
-            self, text=_("Save"), command=self.evt_btnsave)
+            self, text=_("Save"), command=self.evt_btnsave
+        )
         self.btn_save.grid(column=3, row=9, sticky="se")
         self.btn_close = tkinter.Button(
-            self, text=_("Close"), command=self._checkclose)
+            self, text=_("Close"), command=self._checkclose
+        )
         self.btn_close.grid(column=4, row=9, sticky="se")
 
     def _saveappdata(self):
@@ -220,7 +232,6 @@ class RevPiPlcList(tkinter.Frame):
             self.var_port.set(self._connections[item][1])
 
             self.btn_add["state"] == "normal"
-
             self.btn_remove["state"] = "normal"
         else:
             self.btn_remove["state"] = "disabled"

revpipycontrol/revpiprogram.py

@@ -1,10 +1,10 @@
+# -*- coding: utf-8 -*-
 #
 # RevPiPyControl
 #
 # Webpage: https://revpimodio.org/revpipyplc/
 # (c) Sven Sager, License: LGPLv3
 #
-# -*- coding: utf-8 -*-
 import gzip
 import os
 import pickle
@@ -121,8 +121,9 @@ class RevPiProgram(tkinter.Frame):
         lbl["text"] = _("Download PLC program as:")
         lbl.grid(column=0, row=r, **cpadw)
         opt = tkinter.OptionMenu(
-            prog, self.var_typedown, *self.lst_typedown,
+            prog, self.var_typedown, command=self._evt_optdown,
-            command=self._evt_optdown)
+            *self.lst_typedown
+        )
         opt["width"] = 10
         opt.grid(column=1, row=r, **cpad)
 
@@ -131,6 +132,7 @@ class RevPiProgram(tkinter.Frame):
         self.ckb_picdown["text"] = _("include piCtory configuration")
         self.ckb_picdown["variable"] = self.var_picdown
         self.ckb_picdown.grid(column=0, row=r, **cpadw)
+
         btn = tkinter.Button(prog)
         btn["command"] = self.plcdownload
         btn["text"] = _("Download")
@@ -140,9 +142,11 @@ class RevPiProgram(tkinter.Frame):
         lbl = tkinter.Label(prog)
         lbl["text"] = _("Upload PLC program as:")
         lbl.grid(column=0, row=r, **cpadw)
+
         opt = tkinter.OptionMenu(
-            prog, self.var_typeup, *self.lst_typeup,
+            prog, self.var_typeup, command=self._evt_optup,
-            command=self._evt_optup)
+            *self.lst_typeup
+        )
         opt["state"] = self.xmlstate
         opt["width"] = 10
         opt.grid(column=1, row=r, **cpad)
@@ -160,6 +164,7 @@ class RevPiProgram(tkinter.Frame):
         self.ckb_picup["text"] = _("includes piCtory configuration")
         self.ckb_picup["variable"] = self.var_picup
         self.ckb_picup.grid(column=0, row=r, **cpadw)
+
         btn = tkinter.Button(prog)
         btn["command"] = self.plcupload
         btn["state"] = self.xmlstate
@@ -175,13 +180,16 @@ class RevPiProgram(tkinter.Frame):
         lbl = tkinter.Label(picto)
         lbl["text"] = _("Download piCtory configuration")
         lbl.grid(column=0, row=0, **cpadw)
+
         btn = tkinter.Button(picto)
         btn["command"] = self.getpictoryrsc
         btn["text"] = _("Download")
         btn.grid(column=1, row=0, **cpad)
+
         lbl = tkinter.Label(picto)
         lbl["text"] = _("Upload piCtory configuration")
         lbl.grid(column=0, row=1, **cpadw)
+
         btn = tkinter.Button(picto)
         btn["command"] = self.setpictoryrsc
         btn["state"] = self.xmlstate
@@ -193,9 +201,11 @@ class RevPiProgram(tkinter.Frame):
         proc.columnconfigure(0, weight=1)
         proc["text"] = _("piControl0 process image")
         proc.grid(columnspan=2, pady=2, sticky="we")
+
         lbl = tkinter.Label(proc)
         lbl["text"] = _("Download process image dump")
         lbl.grid(column=0, row=0, **cpadw)
+
         btn = tkinter.Button(proc)
         btn["command"] = self.getprocimg
         btn["text"] = _("Download")
@@ -206,9 +216,11 @@ class RevPiProgram(tkinter.Frame):
         picon.columnconfigure(0, weight=1)
         picon["text"] = _("Reset piControl")
         picon.grid(columnspan=2, pady=2, sticky="we")
+
         lbl = tkinter.Label(picon)
         lbl["text"] = _("Execute piControlReset")
         lbl.grid(column=0, row=0, **cpadw)
+
         btn = tkinter.Button(picon)
         btn["command"] = self.picontrolreset
         btn["text"] = _("execute")

revpipycontrol/revpipycontrol.py

@@ -1,4 +1,5 @@
 #!/usr/bin/python3
+# -*- coding: utf-8 -*-
 #
 # RevPiPyControl
 # Version: see global var pycontrolverion
@@ -6,7 +7,6 @@
 # Webpage: https://revpimodio.org/revpipyplc/
 # (c) Sven Sager, License: LGPLv3
 #
-# -*- coding: utf-8 -*-
 import revpicheckclient
 import revpiinfo
 import revpilogfile
@@ -23,7 +23,7 @@ from xmlrpc.client import ServerProxy
 # Übersetzung laden
 _ = gettrans()
 
-pycontrolversion = "0.4.2"
+pycontrolversion = "0.5.0"
 
 
 class RevPiPyControl(tkinter.Frame):

setup.py

@@ -1,8 +1,7 @@
-#! /usr/bin/env python3
+# -*- coding: utf-8 -*-
 #
 # (c) Sven Sager, License: LGPLv3
 #
-# -*- coding: utf-8 -*-
 """Setupscript fuer RevPiPyLoad."""
 import distutils.command.install_egg_info
 from sys import platform
@@ -23,7 +22,7 @@ globsetup = {
     "author_email": "akira@narux.de",
     "url": "https://revpimodio.org/revpipyplc/",
     "license": "LGPLv3",
-    "version": "0.4.2",
+    "version": "0.5.0",
 
     "name": "revpipycontrol",