# HG changeset patch
# User Laurent Bessard
# Date 1368521817 -7200
# Node ID d81d99fd193227906eddc4bdad3d4aa982992678
# Parent  f794fbff8f024a50af1a34e44ffadb6cff348dfd
Fixed bug in loading block in Viewer when block interface has changed

diff -r f794fbff8f02 -r d81d99fd1932 editors/Viewer.py
--- a/editors/Viewer.py	Tue May 14 00:30:35 2013 +0200
+++ b/editors/Viewer.py	Tue May 14 10:56:57 2013 +0200
@@ -1248,12 +1248,13 @@
                         output_name = output_connector["name"])
                 else:
                     connector = connectors["outputs"][i]
-                if output_connector.get("negated", False):
-                    connector.SetNegated(True)
-                if output_connector.get("edge", "none") != "none":
-                    connector.SetEdge(output_connector["edge"])
-                if connectors["outputs"].index(connector) == i:
-                    connector.SetPosition(wx.Point(*output_connector["position"]))
+                if connector is not None:
+                    if output_connector.get("negated", False):
+                        connector.SetNegated(True)
+                    if output_connector.get("edge", "none") != "none":
+                        connector.SetEdge(output_connector["edge"])
+                    if connectors["outputs"].index(connector) == i:
+                        connector.SetPosition(wx.Point(*output_connector["position"]))
         for i, input_connector in enumerate(instance["inputs"]):
             if i < len(connectors["inputs"]):
                 if isinstance(element, FBD_Block):
@@ -1262,13 +1263,14 @@
                         input_name = input_connector["name"])
                 else:
                     connector = connectors["inputs"][i]
-                if connectors["inputs"].index(connector) == i:
-                    connector.SetPosition(wx.Point(*input_connector["position"]))
-                if input_connector.get("negated", False):
-                    connector.SetNegated(True)
-                if input_connector.get("edge", "none") != "none":
-                    connector.SetEdge(input_connector["edge"])
-                self.CreateWires(connector, instance["id"], input_connector["links"], ids, selection)
+                if connector is not None:
+                    if connectors["inputs"].index(connector) == i:
+                        connector.SetPosition(wx.Point(*input_connector["position"]))
+                    if input_connector.get("negated", False):
+                        connector.SetNegated(True)
+                    if input_connector.get("edge", "none") != "none":
+                        connector.SetEdge(input_connector["edge"])
+                    self.CreateWires(connector, instance["id"], input_connector["links"], ids, selection)
         element.RefreshConnectors()
         if selection is not None and selection[0].get(instance["id"], False):
             self.SelectInGroup(element)
diff -r f794fbff8f02 -r d81d99fd1932 graphics/FBD_Objects.py
--- a/graphics/FBD_Objects.py	Tue May 14 00:30:35 2013 +0200
+++ b/graphics/FBD_Objects.py	Tue May 14 10:56:57 2013 +0200
@@ -190,7 +190,9 @@
             for output in self.Outputs:
                 if output_name == output.GetName():
                     return output
-        return self.FindNearestConnector(position, self.Inputs + self.Outputs)
+        if input_name is None and output_name is None:
+            return self.FindNearestConnector(position, self.Inputs + self.Outputs)
+        return None
         
     def GetInputTypes(self):
         return tuple([input.GetType(True) for input in self.Inputs if input.GetName() != "EN"])