Changeset f3dc56c in sasview

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:

• src/sas/perspectives/fitting/fitpage.py (modified) (2 diffs)

src/sas/perspectives/fitting/fitpage.py

@@ -292 +292 @@
         self.btFitHelp.Bind(wx.EVT_BUTTON, self._onFitHelp)
         
-        #Resolution Smearing Help button
-        self.btSmearHelp = wx.Button(self, -1, '?', style=wx.BU_EXACTFIT)
+        #Resolution Smearing Help button (for now use same technique as
+        #used for dI help to get tiniest possible button that works
+        #both on MAC and PC.  Should completely rewrite the fitting sizer 
+        #in future.  This is minimum to get out release 3.1
+        #        comment June 14, 2015     --- PDB
+        if sys.platform.count("win32") > 0:
+            size_q = (20, 15)  #on PC
+        else:
+            size_q = (30, 20)  #on MAC
+        self.btSmearHelp = wx.Button(self, -1, '?', style=wx.BU_EXACTFIT,\
+                                     size=size_q)
         self.btSmearHelp.SetToolTipString("Resolution Smearing Help.")
         self.btSmearHelp.Bind(wx.EVT_BUTTON, self._onSmearHelp)
@@ -354 +363 @@
 
         # add 4 types of smearing to the sizer
+        # Note from June 14, 2015
+        # removed the extra (10,10) spaces to make room for help.  Actually
+        # don't see the need for those anyway as the wx.LEFT, xx should take
+        # care of spacing anyway though it does not seem to work for some
+        # reason.  Currently leaving as we are in "code freeze" only making
+        # minimal changes necessary for release 3.1.  We probably want to clean
+        # up the whole fitpage (and basepage and fitpanel etc) eventually.
+        #                          ---- PDB
         sizer_smearer.Add(self.disable_smearer, 0, wx.LEFT, 10)
-        sizer_smearer.Add((10, 10))
+#        sizer_smearer.Add((10, 10))
         sizer_smearer.Add(self.enable_smearer)
-        sizer_smearer.Add((10, 10))
+#        sizer_smearer.Add((10, 10))
         sizer_smearer.Add(self.pinhole_smearer)
-        sizer_smearer.Add((10, 10))
+#        sizer_smearer.Add((10, 10))
         sizer_smearer.Add(self.slit_smearer)
+#        sizer_smearer.Add((10, 10))
+        sizer_smearer.Add(self.btSmearHelp)
         sizer_smearer.Add((10, 10))