Changeset 98fdccd in sasview

Timestamp:

Jan 5, 2012 5:40:41 PM (13 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:

82c11d3

Parents:

011e0e4

Message:

ordered grids by data_name

Files:

• fittingview/src/sans/perspectives/fitting/fitting.py (modified) (2 diffs)
• sansguiframe/src/sans/guiframe/data_panel.py (modified) (1 diff)
• sansguiframe/src/sans/guiframe/data_processor.py (modified) (5 diffs)

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -1380 +1380 @@
                     if key not in param_list and key not in ["Chi2", "Data"]:
                         batch_outputs[key].append(EMPTY)
-                for key in batch_inputs.keys():
-                    if key not in param_list and key not in ["Chi2", "Data"]:
-                        batch_inputs[key].append(EMPTY)
+                #for key in batch_inputs.keys():
+                    #if key not in param_list and key not in ["Chi2", "Data"]:
+                        #batch_inputs[key].append(EMPTY)
                                 
                 self.page_finder[pid].set_batch_result(batch_inputs=batch_inputs,
@@ -1470 +1470 @@
             if key not in batch_inputs.keys():
                 batch_inputs[key] = []
-            if key.lower().strip() != "loader":
-                batch_inputs[key].append(value)
+            #if key.lower().strip() != "loader":
+            batch_inputs[key].append(value)
         param = "temperature"
         if hasattr(data.sample, param):

sansguiframe/src/sans/guiframe/data_panel.py

@@ -582 +582 @@
                             i_t_c = self.tree_ctrl.AppendItem(d_p_c,
                                                               process.__str__())
-                self.append_theory(state_id, theory_list)
+                wx.CallAfter(self.append_theory, state_id, theory_list)
         self.enable_remove()
         self.enable_import()

sansguiframe/src/sans/guiframe/data_processor.py

@@ -644 +644 @@
         if data_outputs is None or data_outputs == {}:
             return
-        
+        inputs, outputs = self.get_odered_results(data_inputs, data_outputs)
         for pos in range(self.GetPageCount()):
             grid = self.GetPage(pos)
             if grid.data is None:
                 #Found empty page
-                grid.set_data(data_inputs=data_inputs, 
-                              data_outputs=data_outputs,
+                grid.set_data(data_inputs=inputs, 
+                              data_outputs=outputs,
                               details=details,
                               file_name=file_name) 
@@ -657 +657 @@
                 
         grid, pos = self.add_empty_page()
-        grid.set_data(data_inputs=data_inputs, 
-                      data_outputs=data_outputs,
+        grid.set_data(data_inputs=inputs, 
+                      data_outputs=outputs,
                       file_name=file_name,
                       details=details)
+        
+    def get_odered_results(self, inputs, outputs=None):
+        """
+        Get ordered the results
+        """
+        # Let's re-order the data from the keys in 'Data' name.
+        if outputs == None:
+            return
+        to_be_sort = [str(item.label) for item in outputs['Data']]
+        inds = numpy.lexsort((to_be_sort, to_be_sort))
+        for key in outputs.keys():
+            key_list = outputs[key]
+            temp_key = [item for item in key_list]
+            for ind in inds:
+                temp_key[ind] = key_list[inds[ind]]
+            outputs[key] = temp_key
+        for key in inputs.keys():
+            key_list = inputs[key]
+            if len(key_list) > 0:
+                temp_key = [item for item in key_list]
+                for ind in inds:
+                    temp_key[ind] = key_list[inds[ind]]
+                inputs[key] = temp_key
+        return inputs, outputs
     
     def add_column(self):
@@ -670 +694 @@
         grid.AppendCols(1, True)
         
-   
-
-
-
 class GridPanel(SPanel):
     def __init__(self, parent, data_inputs=None,
@@ -706 +726 @@
         self.layout_plotting_area()
         self.SetSizer(self.vbox)
-  
+
     def set_xaxis(self, label="", x=None):
         """
@@ -1088 +1108 @@
         menubar.Append(self.edit, "&Edit")
         self.Bind(wx.EVT_CLOSE, self.on_close)
-        
     def GetLabelText(self, id):
         """