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

Timestamp:

Nov 15, 2017 4:33:09 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

d4881f6a

Parents:

7c487846

Message:

Initial commit of the P(r) inversion perspective.
Code merged from Jeff Krzywon's ESS_GUI_Pr branch.
Also, minor 2to3 mods to sascalc/sasgui to enble error free setup.

File:

• src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) (8 diffs, 1 prop)

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

@@ -94 +94 @@
             batch_state = self.sim_page.set_state()
 
-        for uid, page in self.opened_pages.iteritems():
+        for uid, page in self.opened_pages.items():
             data = page.get_data()
             # state must be cloned
@@ -135 +135 @@
         if uid not in self.opened_pages:
             msg = "Fitpanel cannot find ID: %s in self.opened_pages" % str(uid)
-            raise ValueError, msg
+            raise ValueError(msg)
         else:
             return self.opened_pages[uid]
@@ -217 +217 @@
         page_is_opened = False
         if state is not None:
-            for uid, panel in self.opened_pages.iteritems():
+            for uid, panel in self.opened_pages.items():
                 # Don't return any panel is the exact same page is created
                 if uid == panel.uid and panel.data == state.data:
@@ -396 +396 @@
         """
         if data.__class__.__name__ != "list":
-            raise ValueError, "Fitpanel delete_data expect list of id"
+            raise ValueError("Fitpanel delete_data expect list of id")
         else:
-            for page in self.opened_pages.values():
+            for page in list(self.opened_pages.values()):
                 pos = self.GetPageIndex(page)
                 temp_data = page.get_data()
@@ -433 +433 @@
                 data_2d_list.append(data)
         page = None
-        for p in self.opened_pages.values():
+        for p in list(self.opened_pages.values()):
             # check if there is an empty page to fill up
             if not check_data_validity(p.get_data()) and p.batch_on:
@@ -503 +503 @@
                 return None
         focused_page = self.GetPage(self.GetSelection())
-        for page in self.opened_pages.values():
+        for page in list(self.opened_pages.values()):
             # check if the selected data existing in the fitpanel
             pos = self.GetPageIndex(page)
@@ -592 +592 @@
         if selected_page in page_finder:
             # Delete the name of the page into the list of open page
-            for uid, list in self.opened_pages.iteritems():
+            for uid, list in self.opened_pages.items():
                 # Don't return any panel is the exact same page is created
                 if flag and selected_page.uid == uid:
@@ -600 +600 @@
 
         # Delete the name of the page into the list of open page
-        for uid, list in self.opened_pages.iteritems():
+        for uid, list in self.opened_pages.items():
             # Don't return any panel is the exact same page is created
             if selected_page.uid == uid: