Changeset 8e15dce in sasview for src/sas/sasgui

Timestamp:

May 10, 2017 9:39:17 AM (7 years ago)

Author:

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

e0ebd56

Parents:

914c49d5

Message:

Modified manipulations to clarify what is needed. Save sliced data as txt by default, instead of xml, to speed up data process. numpy → np.

File:

• src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) (3 diffs)

src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py

@@ -193 +193 @@
                                            name="Append to file name:")
             append_tool_tip = "Files will be saved as <SlicerType><FileName>"
-            append_tool_tip += "<AppendToText>.xml"
+            append_tool_tip += "<AppendToText>.txt"
             self.append_name.SetToolTipString(append_tool_tip)
             self.append_name.SetValue(self.default_value)
@@ -417 +417 @@
                         data_dic[item] = plot.plots[item]
 
-        # Save files as XML
+        # Save files as Text
         for item, data1d in data_dic.iteritems():
             base = '.'.join(item.split('.')[:-1])
-            file_name = base + append + ".xml"
+            file_name = base + append + ".txt"
             save_to = evt.path + "\\" + file_name
             writer.write(save_to, data1d)
@@ -439 +439 @@
         :param file_list: list of loaded file names to send to fit
         """
-        if fit != FIT_OPTIONS[0] and file_list is not None:
+        if fit in FIT_OPTIONS and fit != FIT_OPTIONS[0] and \
+                        file_list is not None:
             # Set perspective to fitting
             int = self.data_panel.perspective_cbox.FindString("Fitting")