Changeset 6f16e25 in sasview for src/sas/perspectives/fitting/fitting_widgets.py

Timestamp:

Oct 21, 2015 8:35:00 AM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

85130cb

Parents:

2d88fc4

Message:

clean up wx id handling in fitting perspective

File:

• src/sas/perspectives/fitting/fitting_widgets.py (modified) (7 diffs)

src/sas/perspectives/fitting/fitting_widgets.py

@@ -41 +41 @@
         """
         vbox = wx.BoxSizer(wx.VERTICAL)
-        box_description = wx.StaticBox(self, -1, str("Hint"))
+        box_description = wx.StaticBox(self, wx.ID_ANY, str("Hint"))
         hint_sizer = wx.StaticBoxSizer(box_description, wx.VERTICAL)
         selection_sizer = wx.GridBagSizer(5, 5)
         button_sizer = wx.BoxSizer(wx.HORIZONTAL)
-        self.data_1d_selected = wx.RadioButton(self, -1, 'Data1D',
+        self.data_1d_selected = wx.RadioButton(self, wx.ID_ANY, 'Data1D',
                                                 style=wx.RB_GROUP)
-        self.data_2d_selected = wx.RadioButton(self, -1, 'Data2D')
+        self.data_2d_selected = wx.RadioButton(self, wx.ID_ANY, 'Data2D')
         self.data_1d_selected.SetValue(True)
         self.data_2d_selected.SetValue(False)
@@ -55 +55 @@
         hint = "Selected Data set contains both 1D and 2D Data.\n"
         hint += "Please select on type of analysis before proceeding.\n"
-        hint_sizer.Add(wx.StaticText(self, -1, hint))
+        hint_sizer.Add(wx.StaticText(self, wx.ID_ANY, hint))
         #draw area containing radio buttons
         ix = 0
@@ -72 +72 @@
         vbox.Add(hint_sizer, 0, wx.EXPAND | wx.ALL, 10)
         vbox.Add(selection_sizer, 0, wx.TOP | wx.BOTTOM, 10)
-        vbox.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0)
+        vbox.Add(wx.StaticLine(self, wx.ID_ANY), 0, wx.EXPAND, 0)
         vbox.Add(button_sizer, 0, wx.TOP | wx.BOTTOM, 10)
         self.SetSizer(vbox)
@@ -103 +103 @@
             return
         select_data_text = " %s Data selected.\n" % str(self._nb_selected_data)
-        self._data_text_ctrl = wx.StaticText(self, -1, str(select_data_text))
+        self._data_text_ctrl = wx.StaticText(self, wx.ID_ANY, str(select_data_text))
 
         self._data_text_ctrl.SetForegroundColour('blue')
@@ -126 +126 @@
             text += "for adequate plot display size. \n"
             text += "unchecked data won't be send to fitting . \n"
-        text_ctrl = wx.StaticText(self, -1, str(text))
+        text_ctrl = wx.StaticText(self, wx.ID_ANY, str(text))
         self._sizer_txt.Add(text_ctrl)
         iy = 0
@@ -133 +133 @@
         for i in range(len(data_list)):
             data_count += 1
-            cb = wx.CheckBox(self._panel, -1, str(data_list[i].name), (10, 10))
+            cb = wx.CheckBox(self._panel, wx.ID_ANY, str(data_list[i].name), (10, 10))
             wx.EVT_CHECKBOX(self, cb.GetId(), self._count_selected_data)
             if data_count <= MAX_NBR_DATA:
@@ -153 +153 @@
         self._sizer_button.Add(button_OK, 0,
                                 wx.LEFT | wx.RIGHT | wx.ADJUST_MINSIZE, 10)
-        static_line = wx.StaticLine(self, -1)
+        static_line = wx.StaticLine(self, wx.ID_ANY)
         self._sizer_txt.Add(self._panel, 0, wx.EXPAND | wx.ALL, 10)
         self._sizer_main.Add(self._sizer_txt, 0, wx.EXPAND | wx.ALL, 10)