Changeset f3dc56c in sasview for src


Ignore:
Timestamp:
Jun 14, 2015 5:38:04 PM (9 years ago)
Author:
butler
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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
60f2f24, 66f21cd
Parents:
7116dffd
Message:

Added question mark help button to smearing sizer. All panels should
now have an appropriate help link.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/perspectives/fitting/fitpage.py

    r7116dffd rf3dc56c  
    292292        self.btFitHelp.Bind(wx.EVT_BUTTON, self._onFitHelp) 
    293293         
    294         #Resolution Smearing Help button 
    295         self.btSmearHelp = wx.Button(self, -1, '?', style=wx.BU_EXACTFIT) 
     294        #Resolution Smearing Help button (for now use same technique as 
     295        #used for dI help to get tiniest possible button that works 
     296        #both on MAC and PC.  Should completely rewrite the fitting sizer  
     297        #in future.  This is minimum to get out release 3.1 
     298        #        comment June 14, 2015     --- PDB 
     299        if sys.platform.count("win32") > 0: 
     300            size_q = (20, 15)  #on PC 
     301        else: 
     302            size_q = (30, 20)  #on MAC 
     303        self.btSmearHelp = wx.Button(self, -1, '?', style=wx.BU_EXACTFIT,\ 
     304                                     size=size_q) 
    296305        self.btSmearHelp.SetToolTipString("Resolution Smearing Help.") 
    297306        self.btSmearHelp.Bind(wx.EVT_BUTTON, self._onSmearHelp) 
     
    354363 
    355364        # add 4 types of smearing to the sizer 
     365        # Note from June 14, 2015 
     366        # removed the extra (10,10) spaces to make room for help.  Actually 
     367        # don't see the need for those anyway as the wx.LEFT, xx should take 
     368        # care of spacing anyway though it does not seem to work for some 
     369        # reason.  Currently leaving as we are in "code freeze" only making 
     370        # minimal changes necessary for release 3.1.  We probably want to clean 
     371        # up the whole fitpage (and basepage and fitpanel etc) eventually. 
     372        #                          ---- PDB 
    356373        sizer_smearer.Add(self.disable_smearer, 0, wx.LEFT, 10) 
    357         sizer_smearer.Add((10, 10)) 
     374#        sizer_smearer.Add((10, 10)) 
    358375        sizer_smearer.Add(self.enable_smearer) 
    359         sizer_smearer.Add((10, 10)) 
     376#        sizer_smearer.Add((10, 10)) 
    360377        sizer_smearer.Add(self.pinhole_smearer) 
    361         sizer_smearer.Add((10, 10)) 
     378#        sizer_smearer.Add((10, 10)) 
    362379        sizer_smearer.Add(self.slit_smearer) 
     380#        sizer_smearer.Add((10, 10)) 
     381        sizer_smearer.Add(self.btSmearHelp) 
    363382        sizer_smearer.Add((10, 10)) 
    364383 
Note: See TracChangeset for help on using the changeset viewer.