Changeset 1176137 in sasview for src/sas/sasgui/guiframe

Timestamp:

Apr 17, 2018 7:29:25 AM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

666454e, 1cf490b6, cd10013, c192960

Parents:

94f074c4 (diff), 91552b5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Butler <butlerpd@…> (04/17/18 07:29:25)

git-committer:

GitHub <noreply@…> (04/17/18 07:29:25)

Message:

Merge pull request #149 from SasView?/ticket-1079

Removing save button from OSX

closes #1079

Location:

src/sas/sasgui/guiframe

Files:

• report_dialog.py (modified) (5 diffs)
• local_perspectives/data_loader/data_loader.py (modified) (5 diffs)

src/sas/sasgui/guiframe/report_dialog.py

@@ -27 +27 @@
 class BaseReportDialog(wx.Dialog):
 
-    def __init__(self, report_list, *args, **kwds):
+    def __init__(self, report_list, imgRAM, fig_urls, *args, **kwds):
         """
         Initialization. The parameters added to Dialog are:
@@ -37 +37 @@
         kwds["image"] = 'Dynamic Image'
 
+        #MemoryFSHandle for storing images
+        self.imgRAM = imgRAM
+        #Images location in urls
+        self.fig_urls = fig_urls
         # title
         self.SetTitle("Report")
@@ -75 +79 @@
         hbox.Add(button_print)
 
-        button_save = wx.Button(self, wx.NewId(), "Save")
-        button_save.SetToolTipString("Save this report.")
-        button_save.Bind(wx.EVT_BUTTON, self.onSave, id=button_save.GetId())
-        hbox.Add(button_save)
+        if sys.platform != "darwin":
+            button_save = wx.Button(self, wx.NewId(), "Save")
+            button_save.SetToolTipString("Save this report.")
+            button_save.Bind(wx.EVT_BUTTON, self.onSave, id=button_save.GetId())
+            hbox.Add(button_save)
 
         # panel for report page
@@ -111 +116 @@
         printh.PrintText(self.report_html)
 
+
     def OnClose(self, event=None):
         """
@@ -116 +122 @@
         : event: Close button event
         """
+        for fig in self.fig_urls:
+            self.imgRAM.RemoveFile(fig)
+
         self.Close()
 

src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py

@@ -185 +185 @@
             try:
                 message = "Loading {}...\n".format(p_file)
-                self.load_update(output=output, message=message, info="info")
+                self.load_update(message=message, info="info")
                 temp = self.loader.load(p_file, format)
                 if not isinstance(temp, list):
@@ -201 +201 @@
                         else:
                             file_errors[basename] = [error_message]
-                        self.load_update(output=output,
-                            message=error_message, info="warning")
-
-                self.load_update(output=output,
-                message="Loaded {}\n".format(p_file),
-                info="info")
+
+                self.load_update(message="Loaded {}\n".format(p_file),
+                                 info="info")
 
             except NoKnownLoaderException as e:
                 exception_occurred = True
-                logger.error(e.message)
-
                 error_message = "Loading data failed!\n" + e.message
-                self.load_update(output=None, message=e.message, info="warning")
+                self.load_complete(output=None,
+                                   message=error_message,
+                                   info="warning")
 
             except Exception as e:
                 exception_occurred = True
-                logger.error(e.message)
-
                 file_err = "The Data file you selected could not be "
                 file_err += "loaded.\nMake sure the content of your file"
@@ -225 +220 @@
                 file_err += " following:\n"
                 file_err += e.message
-                file_errors[basename] = [file_err]
+                self.load_complete(output=None,
+                                   message=file_err,
+                                   info="error")
 
         if len(file_errors) > 0:
             error_message = ""
             for filename, error_array in file_errors.iteritems():
-                error_message += "The following errors occured whilst "
+                error_message += "The following issues were found whilst "
                 error_message += "loading {}:\n".format(filename)
                 for message in error_array:
                     error_message += message + "\n"
-                error_message += "\n"
-            if not exception_occurred: # Some data loaded but with errors
-                self.load_update(output=output, message=error_message, info="error")
-
-        if not exception_occurred: # Everything loaded as expected
+                error_message = error_message[:-1]
+            self.load_complete(output=output,
+                               message=error_message,
+                               info="error")
+
+        elif not exception_occurred: # Everything loaded as expected
             self.load_complete(output=output, message="Loading data complete!",
                                info="info")
@@ -244 +242 @@
             self.load_complete(output=None, message=error_message, info="error")
 
-
-    def load_update(self, output=None, message="", info="warning"):
+    def load_update(self, message="", info="warning"):
         """
         print update on the status bar
         """
         if message != "":
-            wx.PostEvent(self.parent, StatusEvent(status=message, info=info,
+            wx.PostEvent(self.parent, StatusEvent(status=message,
+                                                  info=info,
                                                   type="progress"))
 
@@ -257 +255 @@
          post message to status bar and return list of data
         """
-        wx.PostEvent(self.parent, StatusEvent(status=message, info=info,
+        wx.PostEvent(self.parent, StatusEvent(status=message,
+                                              info=info,
                                               type="stop"))
         if output is not None: