Changeset f5c52b0 in sasview

Timestamp:

Aug 9, 2016 9:55:57 AM (8 years ago)

Author:

lewis

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

Children:

d889d80

Parents:

785fa53

Message:

Update instructions to reflect new BSL functionality

File:

• src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) (3 diffs)

src/sas/sasgui/perspectives/file_converter/converter_panel.py

@@ -486 +486 @@
             self.on_collapsible_pane(None)
             self.metadata_section.Disable()
-            self.output.SetWildcard("Red2D (*.dat)|*.dat")
+            self.output.SetWildcard("IGOR/DAT 2D file in Q_map (*.dat)|*.DAT")
         else:
             self.q_input.Enable()
@@ -510 +510 @@
         vbox = wx.BoxSizer(wx.VERTICAL)
 
-        instructions = ("Select either single column ASCII files or BSL/OTOKO"
-            " files containing the Q-Axis and Intensity-axis data, chose where"
-            " to save the converted file, then click Convert to convert them "
-            "to CanSAS XML format. If required, metadata can also be input "
-            "below.")
+        instructions = ("Select either single column ASCII files or 1D OTOKO "
+        "files containing the Q-Axis and Intensity-Axis data, or a 2D BSL file"
+        ", then chose where to save the converted file, and click Convert.\n"
+        "ASCII and OTOKO files will be converted to CanSAS XML, and OTKO files"
+        " to IGOR/DAT 2D Q_map files.\nCanSAS metadata can also be optionally "
+        "input below.")
+
         instruction_label = wx.StaticText(self, -1, instructions,
             size=(_STATICBOX_WIDTH+40, -1))
@@ -652 +654 @@
 
     def __init__(self, parent=None, title='File Converter', base=None,
-        manager=None, size=(PANEL_SIZE * 1.05, PANEL_SIZE / 1.25),
+        manager=None, size=(PANEL_SIZE * 1.05, PANEL_SIZE / 1.1),
         *args, **kwargs):
         kwargs['title'] = title