Changeset 5251ec6 in sasview for src/sas/sasgui/perspectives/pr/pr.py

Timestamp:

Oct 11, 2018 2:20:56 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1249

Children:

98b9f32

Parents:

67ed543

Message:

improved support for py37 in sasgui

File:

• src/sas/sasgui/perspectives/pr/pr.py (modified) (26 diffs)

src/sas/sasgui/perspectives/pr/pr.py

@@ -18 +18 @@
 
 import sys
-import wx
 import logging
 import time
 import math
+
+import wx
 import numpy as np
 import pylab
+
 from sas.sasgui.guiframe.gui_manager import MDIFrame
 from sas.sasgui.guiframe.dataFitting import Data1D
@@ -33 +35 @@
 import sas.sascalc.dataloader
 
-from pr_widgets import load_error
 from sas.sasgui.guiframe.plugin_base import PluginBase
+
+from .inversion_state import Reader  # .prv file reader
+from .inversion_panel import InversionControl
+#from .inversion_panel import HelpDialog
+from .inversion_panel import PrDistDialog
+from .pr_thread import CalcPr
+from .pr_thread import EstimatePr
+from .pr_thread import EstimateNT
+from .pr_widgets import load_error
+from .pr_widgets import DataDialog
 
 logger = logging.getLogger(__name__)
@@ -106 +117 @@
         self.list_plot_id = []
 
-        # Associate the inversion state reader with .prv files
-        from inversion_state import Reader
-
         # Create a CanSAS/Pr reader
         self.state_reader = Reader(self.set_state)
@@ -151 +159 @@
                 msg = "Pr.set_state: datainfo parameter cannot "
                 msg += "be None in standalone mode"
-                raise RuntimeError, msg
+                raise RuntimeError(msg)
 
             # Ensuring that plots are coordinated correctly
@@ -184 +192 @@
                                                    title=self.current_plottable.title))
             self.control_panel.set_state(state)
-        except:
-            logger.error("prview.set_state: %s" % sys.exc_value)
+        except Exception as exc:
+            logger.error("prview.set_state: %s" % exc)
 
 
@@ -195 +203 @@
 
         """
-        from inversion_panel import HelpDialog
         dialog = HelpDialog(None, -1)
         if dialog.ShowModal() == wx.ID_OK:
@@ -369 +376 @@
         Redisplay P(r) with a different number of points
         """
-        from inversion_panel import PrDistDialog
         dialog = PrDistDialog(None, -1)
         dialog.set_content(self._pr_npts)
@@ -452 +458 @@
         # Notify the user if we could not read the file
         if dataread is None:
-            raise RuntimeError, "Invalid data"
+            raise RuntimeError("Invalid data")
 
         x = None
@@ -472 +478 @@
                 if dataread is None:
                     return x, y, err
-                raise RuntimeError, "This tool can only read 1D data"
+                raise RuntimeError("This tool can only read 1D data")
 
         self._current_file_data.x = x
@@ -511 +517 @@
                     data_y = np.append(data_y, y)
                     data_err = np.append(data_err, err)
-                except:
-                    logger.error(sys.exc_value)
+                except Exception as exc:
+                    logger.error(exc)
 
         if scale is not None:
@@ -562 +568 @@
                         data_y = np.append(data_y, y)
                         data_err = np.append(data_err, err)
-                    except:
-                        logger.error(sys.exc_value)
+                    except Exception as exc:
+                        logger.error(exc)
                 elif line.find("The 6 columns") >= 0:
                     data_started = True
@@ -720 +726 @@
             Start a calculation thread
         """
-        from pr_thread import CalcPr
-
         # If a thread is already started, stop it
         if self.calc_thread is not None and self.calc_thread.isrunning():
@@ -849 +853 @@
             try:
                 pr = self._create_file_pr(data)
-            except:
-                status = "Problem reading data: %s" % sys.exc_value
+            except Exception as exc:
+                status = "Problem reading data: %s" % exc
                 wx.PostEvent(self.parent, StatusEvent(status=status))
-                raise RuntimeError, status
+                raise RuntimeError(status)
 
             # If the file contains nothing, just return
             if pr is None:
-                raise RuntimeError, "Loaded data is invalid"
+                raise RuntimeError("Loaded data is invalid")
 
             self.pr = pr
@@ -906 +910 @@
             msg = "pr.save_data: the data being saved is not a"
             msg += " sas.data_info.Data1D object"
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
     def setup_plot_inversion(self, alpha, nfunc, d_max, q_min=None, q_max=None,
@@ -928 +932 @@
                 self.pr = pr
                 self.perform_inversion()
-        except:
-            wx.PostEvent(self.parent, StatusEvent(status=sys.exc_value))
+        except Exception as exc:
+            wx.PostEvent(self.parent, StatusEvent(status=exc))
 
     def estimate_plot_inversion(self, alpha, nfunc, d_max,
@@ -952 +956 @@
                 self.pr = pr
                 self.perform_estimate()
-        except:
-            wx.PostEvent(self.parent, StatusEvent(status=sys.exc_value))
+        except Exception as exc:
+            wx.PostEvent(self.parent, StatusEvent(status=exc))
 
     def _create_plot_pr(self, estimate=False):
@@ -1033 +1037 @@
                 self.pr = pr
                 self.perform_inversion()
-        except:
-            wx.PostEvent(self.parent, StatusEvent(status=sys.exc_value))
+        except Exception as exc:
+            wx.PostEvent(self.parent, StatusEvent(status=exc))
 
     def estimate_file_inversion(self, alpha, nfunc, d_max, data,
@@ -1056 +1060 @@
                 self.pr = pr
                 self.perform_estimate()
-        except:
-            wx.PostEvent(self.parent, StatusEvent(status=sys.exc_value))
+        except Exception as exc:
+            wx.PostEvent(self.parent, StatusEvent(status=exc))
 
     def _create_file_pr(self, data):
@@ -1085 +1089 @@
             self._current_file_data.err = data.dy
             x, y, err = data.x, data.y, data.dy
-        except:
-            load_error(sys.exc_value)
+        except Exception as exc:
+            load_error(exc)
             return None
 
@@ -1124 +1128 @@
             pr.slit_width = self.slit_width
             return pr
-        except:
-            load_error(sys.exc_value)
+        except Exception as exc:
+            load_error(exc)
         return None
 
@@ -1132 +1136 @@
             Perform parameter estimation
         """
-        from pr_thread import EstimatePr
-
         # If a thread is already started, stop it
         if self.estimation_thread is not None and \
@@ -1162 +1164 @@
             Perform parameter estimation
         """
-        from pr_thread import EstimateNT
-
         # If a thread is already started, stop it
         if self.estimation_thread is not None and self.estimation_thread.isrunning():
@@ -1239 +1239 @@
             Create and return a list of panel objects
         """
-        from inversion_panel import InversionControl
-
         self.parent = parent
         self.frame = MDIFrame(self.parent, None, 'None', (100, 200))
@@ -1262 +1260 @@
         if data_list is None:
             data_list = []
+        else:
+            data_list = list(data_list)  # force iterator to list
         if len(data_list) >= 1:
             if len(data_list) == 1:
@@ -1287 +1287 @@
                 msg += "Please select one.\n"
                 if len(data_list) > 1:
-                    from pr_widgets import DataDialog
                     dlg = DataDialog(data_list=data_1d_list, text=msg)
                     if dlg.ShowModal() == wx.ID_OK:
@@ -1306 +1305 @@
                     self.data_id = data.id
                     self.control_panel._change_file(evt=None, data=data)
-                except:
-                    msg = "Prview Set_data: " + str(sys.exc_value)
+                except Exception as exc:
+                    msg = "Prview Set_data: " + str(exc)
                     wx.PostEvent(self.parent, StatusEvent(status=msg, info="error"))
             else: