HGKeeper

Merged default in svghmi
svghmi
2019-07-15, Edouard Tisserant

ad94a928d87d

Parents 535eb0b8bd9d e5ce6c4a8672
Children 55c43933ff51

Merged default in svghmi

6 files changed, 14 insertions(+), 15 deletions(-)

+1 -0

BeremizIDE.py

+4 -4

PLCControler.py

+6 -6

graphics/GraphicCommons.py

+0 -1

runtime/PLCObject.py

+3 -3

runtime/PyroServer.py

+0 -1

wxglade_hmi/wxglade_hmi.py

~~--- a/BeremizIDE.py Fri Jul 12 11:58:22 2019 +0200~~

+++ b/BeremizIDE.py Mon Jul 15 09:05:00 2019 +0200

@@ -624,6 +624,7 @@

def OnCloseFrame(self, event):

if self.TryCloseFrame():

+ self.LogConsole.Disconnect(-1, -1, wx.wxEVT_KILL_FOCUS)

event.Skip()

else:

# prevent event to continue, i.e. cancel closing

~~--- a/PLCControler.py Fri Jul 12 11:58:22 2019 +0200~~

+++ b/PLCControler.py Mon Jul 15 09:05:00 2019 +0200

@@ -542,12 +542,12 @@

orig_type = pou.getpouType()

if orig_type == 'function' and pou_type in ['functionBlock', 'program']:

~~- # delete return type~~

+ # delete return type

return_type_obj = new_pou.interface.getreturnType()

new_pou.interface.remove(return_type_obj)

~~- # To be ultimately correct we could re-create an~~

~~- # output variable with same name+_out or so~~

~~- # but in any case user will have to connect/assign~~

+ # To be ultimately correct we could re-create an

+ # output variable with same name+_out or so

+ # but in any case user will have to connect/assign

# this output, so better leave it as-is

new_pou.setpouType(pou_type)

~~--- a/graphics/GraphicCommons.py Fri Jul 12 11:58:22 2019 +0200~~

+++ b/graphics/GraphicCommons.py Mon Jul 15 09:05:00 2019 +0200

@@ -1969,17 +1969,17 @@

# filter duplicates, add corner to diagonals

self.Points = []

~~- lx,ly = None,None~~

+ lx, ly = None, None

for x, y in points:

ex, ey = lx == x, ly == y

if ex and ey:

# duplicate

continue

~~- if (lx,ly) != (None,None) and not ex and not ey:~~

+ if (lx, ly) != (None, None) and not ex and not ey:

# diagonal

self.Points.append(wx.Point(lx, y))

self.Points.append(wx.Point(x, y))

~~- lx,ly = x,y~~

+ lx, ly = x, y

# Calculate the start and end directions

self.StartPoint = [None, vector(self.Points[0], self.Points[1])]

@@ -1995,8 +1995,8 @@

self.Segments = []

i = 0

while True:

~~- l = len(self.Points)~~

~~- if i > l - 2:~~

+ lp = len(self.Points)

+ if i > lp - 2:

break

segment = vector(self.Points[i], self.Points[i + 1])

@@ -2011,7 +2011,7 @@

continue

# remove corner when two segments are in opposite direction

~~- if i < l - 2:~~

+ if i < lp - 2:

next = vector(self.Points[i + 1], self.Points[i + 2])

if is_null_vector(add_vectors(segment, next)):

self.Points.pop(i+1)

~~--- a/runtime/PLCObject.py Fri Jul 12 11:58:22 2019 +0200~~

+++ b/runtime/PLCObject.py Mon Jul 15 09:05:00 2019 +0200

@@ -125,7 +125,6 @@

for callee in self.statuschange:

callee(self.PLCStatus)

~~- #@RunInMain~~

def LogMessage(self, *args):

if len(args) == 2:

level, msg = args

~~--- a/runtime/PyroServer.py Fri Jul 12 11:58:22 2019 +0200~~

+++ b/runtime/PyroServer.py Mon Jul 15 09:05:00 2019 +0200

@@ -62,10 +62,10 @@

self.daemon.connect(pyro_obj, "PLCObject")

when_ready()

~~- self.piper,self.pipew = os.pipe()~~

~~- self.daemon.requestLoop(others=[self.piper], callback=lambda x:None)~~

+ self.piper, self.pipew = os.pipe()

+ self.daemon.requestLoop(others=[self.piper], callback=lambda x: None)

self.piper, self.pipew = None, None

~~- if hasattr(self,'sock'):~~

+ if hasattr(self, 'sock'):

self.daemon.sock.close()

self.Unpublish()

~~--- a/wxglade_hmi/wxglade_hmi.py Fri Jul 12 11:58:22 2019 +0200~~

+++ b/wxglade_hmi/wxglade_hmi.py Mon Jul 15 09:05:00 2019 +0200

@@ -32,7 +32,6 @@

import wx

~~-import util.paths as paths~~

from py_ext import PythonFileCTNMixin

beremiz