Ignore:
Timestamp:
Aug 8, 2016 7:01:52 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:
9b7c596
Parents:
05595c4
Message:

Move data type input to top and fix radiation type layout

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/perspectives/file_converter/converter_panel.py

    r05595c4 r489bb46  
    397397        y = 0 
    398398 
    399         q_label = wx.StaticText(self, -1, "Q-Axis Data: ") 
    400         input_grid.Add(q_label, (y,0), (1,1), wx.ALIGN_CENTER_VERTICAL, 5) 
    401  
    402         self.q_input = wx.FilePickerCtrl(self, -1, 
    403             size=(_STATICBOX_WIDTH-80, -1), 
    404             message="Chose the Q-Axis data file.") 
    405         input_grid.Add(self.q_input, (y,1), (1,1), wx.ALL, 5) 
    406         y += 1 
    407  
    408         iq_label = wx.StaticText(self, -1, "Intensity-Axis Data: ") 
    409         input_grid.Add(iq_label, (y,0), (1,1), wx.ALIGN_CENTER_VERTICAL, 5) 
    410  
    411         self.iq_input = wx.FilePickerCtrl(self, -1, 
    412             size=(_STATICBOX_WIDTH-80, -1), 
    413             message="Chose the Intensity-Axis data file.") 
    414         input_grid.Add(self.iq_input, (y,1), (1,1), wx.ALL, 5) 
    415         y += 1 
    416  
    417399        data_type_label = wx.StaticText(self, -1, "Input Format: ") 
    418400        input_grid.Add(data_type_label, (y,0), (1,1), 
     
    432414        y += 1 
    433415 
     416        q_label = wx.StaticText(self, -1, "Q-Axis Data: ") 
     417        input_grid.Add(q_label, (y,0), (1,1), wx.ALIGN_CENTER_VERTICAL, 5) 
     418 
     419        self.q_input = wx.FilePickerCtrl(self, -1, 
     420            size=(_STATICBOX_WIDTH-80, -1), 
     421            message="Chose the Q-Axis data file.") 
     422        input_grid.Add(self.q_input, (y,1), (1,1), wx.ALL, 5) 
     423        y += 1 
     424 
     425        iq_label = wx.StaticText(self, -1, "Intensity-Axis Data: ") 
     426        input_grid.Add(iq_label, (y,0), (1,1), wx.ALIGN_CENTER_VERTICAL, 5) 
     427 
     428        self.iq_input = wx.FilePickerCtrl(self, -1, 
     429            size=(_STATICBOX_WIDTH-80, -1), 
     430            message="Chose the Intensity-Axis data file.") 
     431        input_grid.Add(self.iq_input, (y,1), (1,1), wx.ALL, 5) 
     432        y += 1 
     433 
    434434        radiation_label = wx.StaticText(self, -1, "Radiation Type: ") 
    435         input_grid.Add(radiation_label, (y,0), (1,1), wx.ALL, 5) 
     435        input_grid.Add(radiation_label, (y,0), (1,1), wx.ALIGN_CENTER_VERTICAL, 5) 
    436436        radiation_input = wx.ComboBox(self, -1, 
    437437            choices=["Neutron", "X-Ray", "Muon", "Electron"], 
    438438            name="radiation", style=wx.CB_READONLY, value="Neutron") 
    439439        radiation_input.Bind(wx.EVT_COMBOBOX, self.radiationtype_changed) 
    440         input_grid.Add(radiation_input, (y,1), (1,1)) 
     440        input_grid.Add(radiation_input, (y,1), (1,1), wx.ALL, 5) 
    441441        y += 1 
    442442 
Note: See TracChangeset for help on using the changeset viewer.