PLCGenerator.py
changeset 1766 c1e5b9f19483
parent 1765 ccf59c1f0b45
child 1767 c74815729afd
--- a/PLCGenerator.py	Thu Aug 17 16:26:32 2017 +0300
+++ b/PLCGenerator.py	Thu Aug 17 17:25:17 2017 +0300
@@ -717,8 +717,7 @@
                                          InOutVariableClass)):
                     expression = instance.getexpression()
                     var_type = self.GetVariableType(expression)
-                    if (isinstance(pou, TransitionObjClass)
-                        and expression == pou.getname()):
+                    if isinstance(pou, TransitionObjClass) and expression == pou.getname():
                         var_type = "BOOL"
                     elif (not isinstance(pou, (TransitionObjClass, ActionObjClass)) and
                           pou.getpouType() == "function" and expression == pou.getname()):
@@ -1158,9 +1157,9 @@
         else:
             for i, variable in enumerate(output_variables):
                 blockPointx, blockPointy = variable.connectionPointOut.getrelPositionXY()
-                if (connectionPoint is None or
-                    block.getx() + blockPointx == connectionPoint.getx() and
-                    block.gety() + blockPointy == connectionPoint.gety()):
+                if connectionPoint is None or \
+                   block.getx() + blockPointx == connectionPoint.getx() and \
+                   block.gety() + blockPointy == connectionPoint.gety():
                     output_variable = variable
                     output_parameter = variable.getformalParameter()
                     output_idx = i