docs

piControlReset hinzugef?gt

revpipycontrol.api

@@ -50,6 +50,7 @@ revpiprogram.RevPiProgram.create_filelist?4(rootdir)
 revpiprogram.RevPiProgram.getpictoryrsc?4()
 revpiprogram.RevPiProgram.getprocimg?4()
 revpiprogram.RevPiProgram.myapp?7
+revpiprogram.RevPiProgram.picontrolreset?4()
 revpiprogram.RevPiProgram.plcdownload?4()
 revpiprogram.RevPiProgram.plcupload?4()
 revpiprogram.RevPiProgram.root?7

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-03-23, 10:40:08 -->
+<!-- Saved: 2017-04-11, 12:38:06 -->
 <!-- Copyright (C) 2017 Sven Sager, akira@narux.de -->
 <Project version="5.1">
   <Language>en_US</Language>
@@ -9,7 +9,7 @@
   <ProgLanguage mixed="0">Python3</ProgLanguage>
   <ProjectType>Console</ProjectType>
   <Description></Description>
-  <Version>0.2.8</Version>
+  <Version>0.2.12</Version>
   <Author>Sven Sager</Author>
   <Email>akira@narux.de</Email>
   <Eol index="-1"/>

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)

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

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

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",