Changeset 51af54b in sasview

Timestamp:

May 16, 2014 8:37:47 AM (10 years ago)

Author:

Jeff Krzywon <jeffery.krzywon@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

d497189

Parents:

bb1b892

Message:

Fixing project save/load and changed up an poorly worded error message.

Location:

src/sans

Files:

• dataloader/readers/cansas_reader.py (modified) (1 diff)
• guiframe/gui_manager.py (modified) (1 diff)

src/sans/dataloader/readers/cansas_reader.py

@@ -860 +860 @@
         # If the calling function was not the cansas reader, return a minidom
         #      object rather than an lxml object.        
-        
         frm = inspect.stack()[1]
         mod_name = frm[1].replace("\\", "/").replace(".pyc", "")
         mod_name = mod_name.replace(".py", "")
-        mod = mod_name.split("/readers/")
+        mod = mod_name.split("sans/")
         mod_name = mod[1]
-        if mod_name != "cansas_reader":
+        if mod_name != "dataloader/readers/cansas_reader":
             string = self.to_string(doc, pp=False)
             doc = parseString(string)

src/sans/guiframe/gui_manager.py

@@ -1958 +1958 @@
                 wx.PostEvent(self, StatusEvent(status="Completed Saving."))
             else:
-                msg = "%s cannot read %s\n" % (str(APPLICATION_NAME), str(path))
+                msg = "No perspective windows are loaded. "
+                msg += "No data was saved to %s\n" % (str(path))
                 logging.error(msg)
+                wx.PostEvent(self,StatusEvent(status=msg))
         except:
             msg = "Error occurred while saving: "