Changeset 028a0e8 in sasview

Timestamp:

Aug 8, 2010 3:05:44 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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:

4da35bc

Parents:

b35d3d1

Message:

fixed minor bug on saving

Files:

• guiframe/data_loader.py (modified) (1 diff)
• guiframe/gui_manager.py (modified) (1 diff)
• sansview/perspectives/fitting/pagestate.py (modified) (1 diff)

guiframe/data_loader.py

@@ -172 +172 @@
     # Notify user if the loader completed the load but no data came out
     if output == None:
-        load_error("The data file appears to be empty.")
+        basename  = os.path.basename(path)
+        if  not basename.endswith('.svs'):
+            load_error("The data file appears to be empty.")
         return
   

guiframe/gui_manager.py

@@ -752 +752 @@
                     if self.panels[item].window_name == 'Invariant':
                         data = self.panels[item]._data
-                        state = self.panels[item].state
-                        new_doc =self.panels[item]._manager.state_reader.write_toXML(data,state)
-                        if hasattr(doc, "firstChild"):
-                            doc.firstChild.appendChild (new_doc.firstChild.firstChild)  
-                        else:
-                            doc = new_doc 
+                        if data != None:
+                            state = self.panels[item].state
+                            new_doc =self.panels[item]._manager.state_reader.write_toXML(data,state)
+                            if hasattr(doc, "firstChild"):
+                                doc.firstChild.appendChild (new_doc.firstChild.firstChild)  
+                            else:
+                                doc = new_doc 
                     elif self.panels[item].window_name == 'pr_control':
                         data = self.panels[item].manager.current_plottable
-                        state = self.panels[item].get_state()
-                        new_doc =self.panels[item].manager.state_reader.write_toXML(data,state)
-                        if hasattr(doc, "firstChild"):
-                            doc.firstChild.appendChild (new_doc.firstChild.firstChild)  
-                        else:
-                            doc = new_doc 
+                        if data != None:
+                            state = self.panels[item].get_state()
+                            new_doc =self.panels[item].manager.state_reader.write_toXML(data,state)
+                            if hasattr(doc, "firstChild"):
+                                doc.firstChild.appendChild (new_doc.firstChild.firstChild)  
+                            else:
+                                doc = new_doc 
                     elif self.panels[item].window_name == 'Fit panel':
                         for index in range(self.panels[item].GetPageCount()):

sansview/perspectives/fitting/pagestate.py

@@ -1195 +1195 @@
         else:  
             #make sure title and data run is filled up.
-            #if state.data.title == None or state.data.title=='': state.data.title = state.data.name
-            #if state.data.run_name == None or state.data.run_name=={}: 
-            #    state.data.run = [str(state.data.name)]
-            #    state.data.run_name[0] = state.data.name
+            if state.data.title == None or state.data.title=='': state.data.title = state.data.name
+            if state.data.run_name == None or state.data.run_name=={}: 
+                state.data.run = [str(state.data.name)]
+                state.data.run_name[0] = state.data.name
    
             if issubclass(state.data.__class__, DataLoader.data_info.Data1D):
+
                 data = state.data
                 doc, sasentry = self._to_xml_doc(data)