Changeset a3b635b in sasview

Timestamp:

May 15, 2014 7:42:00 AM (11 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:

7a67f4da

Parents:

6b20c4e

Message:

I have the save and load project working locally, but I am need to download the built executable and test that before saying it is ready.

Location:

src/sans

Files:

• dataloader/readers/cansas_reader.py (modified) (3 diffs)
• guiframe/gui_manager.py (modified) (2 diffs)

src/sans/dataloader/readers/cansas_reader.py

@@ -535 +535 @@
         :param datainfo: Data1D object
         """
-        
         if not issubclass(datainfo.__class__, Data1D):
             raise RuntimeError, "The cansas writer expects a Data1D instance"
@@ -858 +857 @@
         
         # Return the document, and the SASentry node associated with
-        # the data we just wrote
-        
+        #      the data we just wrote
+        # If the calling function was not the cansas reader, return a minidom
+        #      object rather than an lxml object.
         frm = inspect.stack()[1]
-        mod = inspect.getmodule(frm[0])
-        mod_name = mod.__name__
+        mod_name = frm[1].replace("\\", ".").replace(".pyc", "")
+        mod_name = mod_name.replace(".py", "")
+        mod = mod_name.split("src.")
+        if len(mod) == 1:
+            mod_name = mod[0]
+        else:
+            mod_name = mod[1]
         if mod_name != "sans.dataloader.readers.cansas_reader":
-            string = self.to_string(doc, pp=True)
+            string = self.to_string(doc, pp=False)
             doc = parseString(string)
             node_name = entry_node.tag
             node_list = doc.getElementsByTagName(node_name)
             entry_node = node_list.item(0)
-        
+            
         return doc, entry_node
     
@@ -948 +953 @@
                                            conv(value, units=local_unit))
                         except:
+                            exc_type, exc_value, exc_traceback = sys.exc_info()
                             err_mess = "CanSAS reader: could not convert"
                             err_mess += " %s unit [%s]; expecting [%s]\n  %s" \
-                                % (variable, units, local_unit, sys.exc_value)
+                                % (variable, units, local_unit, exc_value)
                             self.errors.append(err_mess)
                             if optional:

src/sans/guiframe/gui_manager.py

@@ -1948 +1948 @@
                 if temp is not None:
                     doc = temp
-              
+            
             # Write the XML document
             extens = APPLICATION_STATE_EXTENSION
@@ -1962 +1962 @@
         except:
             msg = "Error occurred while saving: "
-            msg += "To save, at leat one application panel "
+            msg += "To save, at least one application panel "
             msg += "should have a data set.."
             wx.PostEvent(self, StatusEvent(status=msg))