Changeset fef38e8 in sasview for src/sas/qtgui/Plotting

Timestamp:

Sep 13, 2017 6:24:34 AM (7 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:

3c8242c

Parents:

9909967

Message:

Startup time improvements - hiding expensive imports and such

Location:

src/sas/qtgui/Plotting

Files:

• Fittings.py (modified) (2 diffs, 1 prop)
• Plotter.py (modified) (2 diffs)

src/sas/qtgui/Plotting/Fittings.py

@@ -14 +14 @@
 
 """
-from scipy import optimize
-
-
 class Parameter(object):
     """
@@ -84 +81 @@
             sum += item * item
         return sum
-
+    # This import takes a long time, which is why it's here not in the top of file
+    from scipy.optimize import leastsq
     p = [param() for param in pars]
+    #out, cov_x, info, mesg, success = optimize.leastsq(f, p, full_output=1)
     out, cov_x, info, mesg, success = optimize.leastsq(f, p, full_output=1)
     # Calculate chi squared

src/sas/qtgui/Plotting/Plotter.py

@@ -3 +3 @@
 import functools
 import copy
-
 import matplotlib.pyplot as plt
 from matplotlib.font_manager import FontProperties
-
 from sas.qtgui.Plotting.PlotterData import Data1D
-
 from sas.qtgui.Plotting.PlotterBase import PlotterBase
 from sas.qtgui.Plotting.AddText import AddText
@@ -390 +387 @@
         Deletes the selected plot from the chart
         """
-        if id not in self.plot_dict:
+        if id not in self.plot_dict.keys():
             return