Changeset 523ea30 in sasview


Ignore:
Timestamp:
Jul 7, 2016 11:48:30 AM (7 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:
c3e1dff
Parents:
bd9f10e
Message:

Move background input below qrange input

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/perspectives/corfunc/corfunc_panel.py

    rbd9f10e r523ea30  
    322322        q_sizer.Add(explanation_label, (0,0), (1,4), wx.LEFT | wx.EXPAND, 5) 
    323323 
    324         background_label = wx.StaticText(self, -1, "Background:", size=(80,20)) 
    325         q_sizer.Add(background_label, (1,0), (1,1), wx.LEFT | wx.EXPAND, 5) 
    326  
    327         self._background_input = ModelTextCtrl(self, -1, size=(50,20), 
    328             style=wx.TE_PROCESS_ENTER, name='background_input', 
    329             text_enter_callback=self._on_enter_input) 
    330         self._background_input.SetToolTipString(("A background value to " 
    331             "subtract from all intensity values")) 
    332         q_sizer.Add(self._background_input, (1,1), (1,1), 
    333             wx.RIGHT | wx.EXPAND, 5) 
    334  
    335         background_button = wx.Button(self, wx.NewId(), "Calculate", 
    336             size=(75, 25)) 
    337         background_button.Bind(wx.EVT_BUTTON, self._compute_background) 
    338         q_sizer.Add(background_button, (1, 2), (1, 1), wx.RIGHT | wx.EXPAND, 5) 
    339  
    340324        qrange_label = wx.StaticText(self, -1, "Q Range:", size=(50,20)) 
    341         q_sizer.Add(qrange_label, (2,0), (1,1), wx.LEFT | wx.EXPAND, 5) 
     325        q_sizer.Add(qrange_label, (1,0), (1,1), wx.LEFT | wx.EXPAND, 5) 
    342326 
    343327        # Lower Q Range 
     
    353337            "for Guinier back extrapolation")) 
    354338 
    355         q_sizer.Add(qmin_label, (3, 0), (1, 1), wx.LEFT | wx.EXPAND, 5) 
    356         q_sizer.Add(qmin_lower, (3, 1), (1, 1), wx.LEFT, 5) 
    357         q_sizer.Add(qmin_dash_label, (3, 2), (1, 1), wx.CENTER | wx.EXPAND, 5) 
    358         q_sizer.Add(self._qmin_input, (3, 3), (1, 1), wx.LEFT, 5) 
     339        q_sizer.Add(qmin_label, (2, 0), (1, 1), wx.LEFT | wx.EXPAND, 5) 
     340        q_sizer.Add(qmin_lower, (2, 1), (1, 1), wx.LEFT, 5) 
     341        q_sizer.Add(qmin_dash_label, (2, 2), (1, 1), wx.CENTER | wx.EXPAND, 5) 
     342        q_sizer.Add(self._qmin_input, (2, 3), (1, 1), wx.LEFT, 5) 
    359343 
    360344        # Upper Q range 
     
    375359        self._qmax2_input.SetToolTipString(qmax_tooltip) 
    376360 
    377         q_sizer.Add(qmax_label, (4, 0), (1, 1), wx.LEFT | wx.EXPAND, 5) 
    378         q_sizer.Add(self._qmax1_input, (4, 1), (1, 1), wx.LEFT, 5) 
    379         q_sizer.Add(qmax_dash_label, (4, 2), (1, 1), wx.CENTER | wx.EXPAND, 5) 
    380         q_sizer.Add(self._qmax2_input, (4,3), (1, 1), wx.LEFT, 5) 
     361        q_sizer.Add(qmax_label, (3, 0), (1, 1), wx.LEFT | wx.EXPAND, 5) 
     362        q_sizer.Add(self._qmax1_input, (3, 1), (1, 1), wx.LEFT, 5) 
     363        q_sizer.Add(qmax_dash_label, (3, 2), (1, 1), wx.CENTER | wx.EXPAND, 5) 
     364        q_sizer.Add(self._qmax2_input, (3,3), (1, 1), wx.LEFT, 5) 
     365 
     366        background_label = wx.StaticText(self, -1, "Background:", size=(80,20)) 
     367        q_sizer.Add(background_label, (4,0), (1,1), wx.LEFT | wx.EXPAND, 5) 
     368 
     369        self._background_input = ModelTextCtrl(self, -1, size=(50,20), 
     370            style=wx.TE_PROCESS_ENTER, name='background_input', 
     371            text_enter_callback=self._on_enter_input) 
     372        self._background_input.SetToolTipString(("A background value to " 
     373            "subtract from all intensity values")) 
     374        q_sizer.Add(self._background_input, (4,1), (1,1), 
     375            wx.RIGHT, 5) 
     376 
     377        background_button = wx.Button(self, wx.NewId(), "Calculate", 
     378            size=(75, 20)) 
     379        background_button.Bind(wx.EVT_BUTTON, self._compute_background) 
     380        q_sizer.Add(background_button, (4, 2), (1, 1), wx.RIGHT, 5) 
    381381 
    382382        qbox_sizer.Add(q_sizer, wx.TOP, 0) 
Note: See TracChangeset for help on using the changeset viewer.