Changeset 3a5f7c8 in sasview for src/sas

Timestamp:

Jul 1, 2015 4:44:53 PM (9 years ago)

Author:

Doucet, Mathieu <doucetm@…>

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:

f21d496, 686fd10

Parents:

0e33a8d

Message:

Fix errors from loading data file with "process" information

Location:

src/sas

Files:

• dataloader/data_info.py (modified) (1 diff)
• guiframe/data_panel.py (modified) (1 diff)

src/sas/dataloader/data_info.py

@@ -439 +439 @@
         self.notes = []
 
+    def is_empty(self):
+        """
+            Return True if the object is empty
+        """
+        return len(self.name) == 0 and len(self.date) == 0 and len(self.description) == 0 \
+            and len(self.term) == 0 and len(self.notes) == 0
+            
+    def single_line_desc(self):
+        """
+            Return a single line string representing the process
+        """
+        return "%s %s %s" % (self.name, self.date, self.description)
+     
     def __str__(self):
         _str = "Process:\n"

src/sas/guiframe/data_panel.py

@@ -686 +686 @@
                         self.tree_ctrl.DeleteChildren(d_p_c) 
                         for process in process_list:
-                            _ = self.tree_ctrl.AppendItem(d_p_c,
-                                                              process.__str__())
+                            if not process.is_empty():
+                                _ = self.tree_ctrl.AppendItem(d_p_c,
+                                                              process.single_line_desc())
                 wx.CallAfter(self.append_theory, state_id, theory_list)
             # Sort by data name