diff --git a/revpipycontrol.e4p b/revpipycontrol.e4p index c0f911a..68fd5fa 100644 --- a/revpipycontrol.e4p +++ b/revpipycontrol.e4p @@ -1,7 +1,7 @@ - + en_US @@ -9,7 +9,7 @@ Python3 Console - 0.2.8 + 0.2.12 Sven Sager akira@narux.de diff --git a/revpipycontrol/revpilogfile.py b/revpipycontrol/revpilogfile.py index c7326d2..0de9088 100644 --- a/revpipycontrol/revpilogfile.py +++ b/revpipycontrol/revpilogfile.py @@ -5,6 +5,7 @@ # (c) Sven Sager, License: LGPLv3 # # -*- coding: utf-8 -*- +import pickle import tkinter @@ -76,7 +77,7 @@ class RevPiLogfile(tkinter.Frame): def get_applines(self): roll = self.applog.yview()[1] == 1.0 try: - for line in self.xmlcli.get_applines(): + for line in pickle.loads(self.xmlcli.get_applines().data): self.applog.insert(tkinter.END, line) except: pass @@ -86,13 +87,13 @@ class RevPiLogfile(tkinter.Frame): def get_applog(self): self.applog.delete(1.0, tkinter.END) - self.applog.insert(1.0, self.xmlcli.get_applog()) + self.applog.insert(1.0, pickle.loads(self.xmlcli.get_applog().data)) self.applog.see(tkinter.END) def get_plclines(self): roll = self.plclog.yview()[1] == 1.0 try: - for line in self.xmlcli.get_plclines(): + for line in pickle.loads(self.xmlcli.get_plclines().data): self.plclog.insert(tkinter.END, line) except: pass @@ -102,5 +103,5 @@ class RevPiLogfile(tkinter.Frame): def get_plclog(self): self.plclog.delete(1.0, tkinter.END) - self.plclog.insert(1.0, self.xmlcli.get_plclog()) + self.plclog.insert(1.0, pickle.loads(self.xmlcli.get_plclog().data)) self.plclog.see(tkinter.END) diff --git a/revpipycontrol/revpiprogram.py b/revpipycontrol/revpiprogram.py index 9c9c3aa..01abff2 100644 --- a/revpipycontrol/revpiprogram.py +++ b/revpipycontrol/revpiprogram.py @@ -178,6 +178,19 @@ class RevPiProgram(tkinter.Frame): btn["text"] = "Download" btn.grid(column=1, row=0, **cpad) + # Gruppe piControlReset + picon = tkinter.LabelFrame(self) + picon.columnconfigure(0, weight=1) + picon["text"] = "piControl Reset" + picon.grid(columnspan=2, pady=2, sticky="we") + lbl = tkinter.Label(picon) + lbl["text"] = "piControlReset ausführen" + lbl.grid(column=0, row=0, **cpadw) + btn = tkinter.Button(picon) + btn["command"] = self.picontrolreset + btn["text"] = "ausführen" + btn.grid(column=1, row=0, **cpad) + # Beendenbutton btn = tkinter.Button(self) btn["command"] = self.master.destroy @@ -367,6 +380,26 @@ class RevPiProgram(tkinter.Frame): fh.close() + def picontrolreset(self): + ask = tkmsg.askyesno( + parent=self.master, title="Frage...", + message="Soll piControlReset wirklich durchgeführt werden? \n" + "Das Prozessabbild und die Steuerung werden dann unterbrochen!!!" + ) + if ask: + ec = self.xmlcli.resetpicontrol() + if ec == 0: + tkmsg.showinfo( + parent=self.master, title="Erfolgreich", + message="piControlReset erfolgreich durchgeführt" + ) + else: + tkmsg.showerror( + parten=self.master, title="Fehler", + message="piControlReset konnte nicht erfolgreich " + "durchgeführt werden" + ) + def plcdownload(self): tdown = self.lst_typedown.index(self.var_typedown.get()) fh = None diff --git a/revpipycontrol/revpipycontrol.py b/revpipycontrol/revpipycontrol.py index 36e8e5e..4f518d6 100755 --- a/revpipycontrol/revpipycontrol.py +++ b/revpipycontrol/revpipycontrol.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 # # RevPiPyControl -# Version: 0.2.8 +# Version: 0.2.12 # # Webpage: https://revpimodio.org/revpipyplc/ # (c) Sven Sager, License: LGPLv3 diff --git a/setup.py b/setup.py index 61dcbf7..0af49cd 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ globsetup = { "author_email": "akira@narux.de", "url": "https://revpimodio.org/revpipyplc/", "license": "LGPLv3", - "version": "0.2.8", + "version": "0.2.12", "name": "revpipycontrol",