Changeset 3e5648b in sasview for src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py

Timestamp:

Apr 10, 2017 1:00:32 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:

6e6dd4c

Parents:

6267876

git-author:

Jeff Krzywon <krzywon@…> (04/10/17 13:00:32)

git-committer:

krzywon <krzywon@…> (04/10/17 13:00:32)

Message:

Resolve merge conflicts and 2 small fixes to slicer panel. #467

File:

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

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

@@ -14 +14 @@
 
 FIT_OPTIONS = ["No fitting", "Fitting", "Batch Fitting"]
+CONVERT_KEYS = ["SectorInteractor", "AnnulusInteractor", "BoxInteractorX",
+                "BoxInteractorY"]
 CONVERT_DICT = {"SectorInteractor": "SectorQ",
                 "AnnulusInteractor": "AnnulusPhi",
@@ -138 +140 @@
             self.bck.Add(text, (iy, ix), (1, 1),
                          wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
-            self.type_list = CONVERT_DICT.keys()
+            self.type_list = CONVERT_KEYS
             self.type_select = wx.ComboBox(parent=self, choices=self.type_list)
             self.type_select.Bind(wx.EVT_COMBOBOX, self.on_change_slicer)
@@ -331 +333 @@
         Populate the check list from the currently plotted 2D data
         """
+        # Reinitialize loaded data list on redraw
+        self.loaded_data = []
         # Iterate over the loaded plots and find all 2D panels
         for key, value in self.main_window.plot_panels.iteritems():