Changeset c8e1996 in sasview for src/sas/sasgui/perspectives/fitting/fitpanel.py

Timestamp:

Oct 20, 2016 3:54:06 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.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

880e845, cf1910f

Parents:

8b645cc

Message:

Fixes #738: No errors are thrown on loading projects with fits, plus linting.

File:

• src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) (10 diffs)

src/sas/sasgui/perspectives/fitting/fitpanel.py

@@ -187 +187 @@
         """
 
-        # get number of pages
-        nop = self.GetPageCount()
         # use while-loop, for-loop will not do the job well.
-        while (nop > 0):
+        while (self.GetPageCount() > 0):
             # delete the first page until no page exists
             page = self.GetPage(0)
@@ -197 +195 @@
             self._close_helper(selected_page=page)
             self.DeletePage(0)
-            nop = self.GetPageCount()
         # Clear list of names
         self.fit_page_name = {}
@@ -240 +237 @@
         # close all panels only when svs file opened
         self.close_all()
-        self._manager.mypanels = []
         self.sim_page = None
         self.batch_page = None
@@ -248 +244 @@
         close page and remove all references to the closed page
         """
-        nbr_page = self.GetPageCount()
         selected_page = self.GetPage(self.GetSelection())
-        if nbr_page == 1:
+        if self.GetPageCount() == 1:
             if selected_page.get_data() is not None:
                 if event is not None:
@@ -293 +288 @@
         copy a dictionary of model into its own dictionary
 
-        :param m_dict: dictionnary made of model name as key and model class
+        :param dict: dictionnary made of model name as key and model class
             as value
         """
@@ -320 +315 @@
         if caption == "Const & Simul Fit":
             self.sim_page = SimultaneousFitPage(self, page_finder=page_finder,
-                                                 id= wx.ID_ANY, batch_on=False)
+                                                 id=wx.ID_ANY, batch_on=False)
             self.sim_page.window_caption = caption
             self.sim_page.window_name = caption
@@ -397 +392 @@
             raise ValueError, "Fitpanel delete_data expect list of id"
         else:
-            n = self.GetPageCount()
             for page in self.opened_pages.values():
                 pos = self.GetPageIndex(page)
@@ -441 +435 @@
         if data_1d_list and data_2d_list:
             # need to warning the user that this batch is a special case
-            from sas.sasgui.perspectives.fitting.fitting_widgets import BatchDataDialog
+            from sas.sasgui.perspectives.fitting.fitting_widgets import \
+                BatchDataDialog
             dlg = BatchDataDialog(self)
             if dlg.ShowModal() == wx.ID_OK:
@@ -461 +456 @@
                 page = self.add_empty_page()
             if data_1d_list and not data_2d_list:
-                #only on type of data
+                # only on type of data
                 page.fill_data_combobox(data_1d_list)
             elif not data_1d_list and data_2d_list:
@@ -477 +472 @@
         Add a fitting page on the notebook contained by fitpanel
 
-        :param data: data to fit
+        :param data_list: data to fit
 
         :return panel : page just added for further used.