Mercurial Repositories > eric / file diff

--- a/eric6/Graphics/UMLDialog.py	Sun May 02 15:09:29 2021 +0200
+++ b/eric6/Graphics/UMLDialog.py	Sun May 02 17:26:47 2021 +0200
@@ -269,20 +269,24 @@
     
     # TODO: add loading of file in JSON format
     # TODO: eric7: delete the current one
-    def load(self):
+    def load(self, filename=""):
         """
         Public method to load a diagram from a file.
         
-        @return flag indicating success (boolean)
+        @param filename name of the file to be loaded
+        @type str
+        @return flag indicating success
+        @rtype bool
         """
-        filename = E5FileDialog.getOpenFileName(
-            self,
-            self.tr("Load Diagram"),
-            "",
-            self.tr("Eric Graphics File (*.e5g);;All Files (*)"))
         if not filename:
-            # Cancelled by user
-            return False
+            filename = E5FileDialog.getOpenFileName(
+                self,
+                self.tr("Load Diagram"),
+                "",
+                self.tr("Eric Graphics File (*.e5g);;All Files (*)"))
+            if not filename:
+                # Cancelled by user
+                return False
         
         try:
             with open(filename, "r", encoding="utf-8") as f:
@@ -322,9 +326,9 @@
                 return False
             try:
                 diagramType, diagramTypeString = value.strip().split(None, 1)
-                self.__diagramType = UMLDialogType(int(self.__diagramType))
+                self.__diagramType = UMLDialogType(int(diagramType))
                 self.__diagramTypeString = diagramTypeString[1:-1]
-                # remove opening an closing bracket
+                # remove opening and closing bracket
             except ValueError:
                 self.__showInvalidDataMessage(filename, linenum)
                 return False