Changeset 13b9a63 in sasview


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • docs/sphinx-docs/source/user/sasgui/perspectives/file_converter/file_converter_help.rst

    r11794f2 r13b9a63  
    1414*   Single column ASCII data, with lines that end with a digit, comma or 
    1515    semi-colon. 
    16 *   `BSL format 
     16*   `BSL formatted 
    1717    <http://www.diamond.ac.uk/Beamlines/Soft-Condensed-Matter/small-angle/ 
    18     SAXS-Software/CCP13/BSL.html>`_ data and .QAX files 
     18    SAXS-Software/CCP13/BSL.html>`_ data files 
    1919 
    2020.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
  • src/sas/sasgui/perspectives/file_converter/converter_panel.py

    r11794f2 r13b9a63  
    233233        vbox = wx.BoxSizer(wx.VERTICAL) 
    234234 
    235         instructions = ("Select either 1 column ASCII files or BSL files " 
    236             "containing the Q Axis and Intensity data, chose where to save " 
    237             "the converted file, then click Convert to convert them to CanSAS " 
    238             "XML format. If required, metadata can also be input below.") 
     235        instructions = ("Select either single column ASCII files or BSL/OTOKO" 
     236            " files containing the Q-Axis and Intensity-axis data, chose where" 
     237            " to save the converted file, then click Convert to convert them " 
     238            "to CanSAS XML format. If required, metadata can also be input " 
     239            "below.") 
    239240        instruction_label = wx.StaticText(self, -1, instructions, 
    240241            size=(_STATICBOX_WIDTH+40, -1)) 
     
    250251        y = 0 
    251252 
    252         q_label = wx.StaticText(self, -1, "Q Axis: ") 
     253        q_label = wx.StaticText(self, -1, "Q-Axis Data: ") 
    253254        input_grid.Add(q_label, (y,0), (1,1), wx.ALIGN_CENTER_VERTICAL, 5) 
    254255 
    255256        self.q_input = wx.FilePickerCtrl(self, -1, 
    256257            size=(_STATICBOX_WIDTH-80, -1), 
    257             message="Chose the Q Axis data file.") 
     258            message="Chose the Q-Axis data file.") 
    258259        input_grid.Add(self.q_input, (y,1), (1,1), wx.ALL, 5) 
    259260        y += 1 
    260261 
    261         iq_label = wx.StaticText(self, -1, "Intensity Data: ") 
     262        iq_label = wx.StaticText(self, -1, "Intensity-Axis Data: ") 
    262263        input_grid.Add(iq_label, (y,0), (1,1), wx.ALIGN_CENTER_VERTICAL, 5) 
    263264 
    264265        self.iq_input = wx.FilePickerCtrl(self, -1, 
    265266            size=(_STATICBOX_WIDTH-80, -1), 
    266             message="Chose the Intensity data file.") 
     267            message="Chose the Intensity-Axis data file.") 
    267268        input_grid.Add(self.iq_input, (y,1), (1,1), wx.ALL, 5) 
    268269        y += 1 
     
    276277        ascii_btn.Bind(wx.EVT_RADIOBUTTON, self.datatype_changed) 
    277278        radio_sizer.Add(ascii_btn) 
    278         bsl_btn = wx.RadioButton(self, -1, "BSL", name="bsl") 
     279        bsl_btn = wx.RadioButton(self, -1, "BSL/OTOKO", name="bsl") 
    279280        bsl_btn.Bind(wx.EVT_RADIOBUTTON, self.datatype_changed) 
    280281        radio_sizer.Add(bsl_btn) 
  • src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst

    r11794f2 r13b9a63  
    1414*   Single column ASCII data, with lines that end with a digit, comma or 
    1515    semi-colon. 
    16 *   `BSL format 
     16*   `BSL formatted 
    1717    <http://www.diamond.ac.uk/Beamlines/Soft-Condensed-Matter/small-angle/ 
    18     SAXS-Software/CCP13/BSL.html>`_ data and .QAX files 
     18    SAXS-Software/CCP13/BSL.html>`_ data files 
    1919 
    2020.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
Note: See TracChangeset for help on using the changeset viewer.