Changeset edc7852 in sasview

Timestamp:

May 22, 2017 4:03:30 PM (8 years ago)

Author:

krzywon

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

47d93073

Parents:

324e0bf

Message:

Incorporate log binning into sector parameter window.

File:

• src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) (5 diffs)

src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py

@@ -20 +20 @@
                 "BoxInteractorX": "SlabX",
                 "BoxInteractorY": "SlabY"}
+BINNING_OPTIONS = {"Linear" : 0,
+                   "Logarithmic" : 10,}
 
 
@@ -47 +49 @@
         self.path = None
         self.fitting_options = None
+        self.bin_ctl = None
         self.type_list = []
         self.loaded_data = []
@@ -101 +104 @@
             keys.sort()
             for item in keys:
+                ix = 0
                 iy += 1
-                ix = 0
-                if item not in ["count", "errors"]:
+                if item not in ["count", "errors", "binning base"]:
                     text = wx.StaticText(self, -1, item, style=wx.ALIGN_LEFT)
                     self.bck.Add(text, (iy, ix), (1, 1),
@@ -121 +124 @@
                     self.bck.Add((20, 20), (iy, ix), (1, 1),
                                  wx.EXPAND | wx.ADJUST_MINSIZE, 0)
+                elif item == 'binning base':
+                    text = wx.StaticText(self, -1, item, style=wx.ALIGN_LEFT)
+                    self.bck.Add(text, (iy, ix), (1, 1),
+                                 wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
+                    options = BINNING_OPTIONS.keys()
+                    self.bin_ctl = wx.ComboBox(parent=self, choices=options)
+                    hint_msg = "Modify the value of %s to change" % item
+                    hint_msg += " the 2D slicer"
+                    self.bin_ctl.SetToolTipString(hint_msg)
+                    ix = 1
+                    result = ""
+                    value = 0
+                    for name, value in BINNING_OPTIONS.items():
+                        if value == params[item]:
+                            result = name
+                            break
+                    index = self.bin_ctl.FindString(result)
+                    self.bin_ctl.SetSelection(index)
+                    self.parameters.append([item, self.bin_ctl])
+                    self.Bind(wx.EVT_COMBOBOX, self.on_text_enter)
+                    self.bck.Add(self.bin_ctl, (iy, ix), (1, 1),
+                                 wx.EXPAND | wx.ADJUST_MINSIZE, 0)
+                    ix = 3
+                    self.bck.Add((20, 20), (iy, ix), (1, 1),
+                                 wx.EXPAND | wx.ADJUST_MINSIZE, 0)
                 else:
                     text = wx.StaticText(self, -1, item + " : ",
@@ -251 +279 @@
         for item in self.parameters:
             try:
+                if item[0] == "binning base":
+                    title = self.bin_ctl.GetValue()
+                    params["binning base"] = BINNING_OPTIONS.get(title)
+                    continue
                 params[item[0]] = float(item[1].GetValue())
                 item[1].SetBackgroundColour(