Changeset 13b9a63 in sasview

Timestamp:

Jul 20, 2016 9:52:08 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:

55775e8

Parents:

11794f2

Message:

Change some text

Files:

• docs/sphinx-docs/source/user/sasgui/perspectives/file_converter/file_converter_help.rst (modified) (1 diff)
• src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) (3 diffs)
• src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified) (1 diff)

docs/sphinx-docs/source/user/sasgui/perspectives/file_converter/file_converter_help.rst

@@ -14 +14 @@
 *   Single column ASCII data, with lines that end with a digit, comma or
     semi-colon.
-*   `BSL format
+*   `BSL formatted
     <http://www.diamond.ac.uk/Beamlines/Soft-Condensed-Matter/small-angle/
-    SAXS-Software/CCP13/BSL.html>`_ data and .QAX files
+    SAXS-Software/CCP13/BSL.html>`_ data files
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ

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

@@ -233 +233 @@
         vbox = wx.BoxSizer(wx.VERTICAL)
 
-        instructions = ("Select either 1 column ASCII files or BSL files "
-            "containing the Q Axis and Intensity 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 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.")
         instruction_label = wx.StaticText(self, -1, instructions,
             size=(_STATICBOX_WIDTH+40, -1))
@@ -250 +251 @@
         y = 0
 
-        q_label = wx.StaticText(self, -1, "Q Axis: ")
+        q_label = wx.StaticText(self, -1, "Q-Axis Data: ")
         input_grid.Add(q_label, (y,0), (1,1), wx.ALIGN_CENTER_VERTICAL, 5)
 
         self.q_input = wx.FilePickerCtrl(self, -1,
             size=(_STATICBOX_WIDTH-80, -1),
-            message="Chose the Q Axis data file.")
+            message="Chose the Q-Axis data file.")
         input_grid.Add(self.q_input, (y,1), (1,1), wx.ALL, 5)
         y += 1
 
-        iq_label = wx.StaticText(self, -1, "Intensity Data: ")
+        iq_label = wx.StaticText(self, -1, "Intensity-Axis Data: ")
         input_grid.Add(iq_label, (y,0), (1,1), wx.ALIGN_CENTER_VERTICAL, 5)
 
         self.iq_input = wx.FilePickerCtrl(self, -1,
             size=(_STATICBOX_WIDTH-80, -1),
-            message="Chose the Intensity data file.")
+            message="Chose the Intensity-Axis data file.")
         input_grid.Add(self.iq_input, (y,1), (1,1), wx.ALL, 5)
         y += 1
@@ -276 +277 @@
         ascii_btn.Bind(wx.EVT_RADIOBUTTON, self.datatype_changed)
         radio_sizer.Add(ascii_btn)
-        bsl_btn = wx.RadioButton(self, -1, "BSL", name="bsl")
+        bsl_btn = wx.RadioButton(self, -1, "BSL/OTOKO", name="bsl")
         bsl_btn.Bind(wx.EVT_RADIOBUTTON, self.datatype_changed)
         radio_sizer.Add(bsl_btn)

src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst

@@ -14 +14 @@
 *   Single column ASCII data, with lines that end with a digit, comma or
     semi-colon.
-*   `BSL format
+*   `BSL formatted
     <http://www.diamond.ac.uk/Beamlines/Soft-Condensed-Matter/small-angle/
-    SAXS-Software/CCP13/BSL.html>`_ data and .QAX files
+    SAXS-Software/CCP13/BSL.html>`_ data files
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ