Changeset 9706d88 in sasview for src/sas/sasgui/perspectives

Timestamp:

Sep 22, 2017 12:21:37 PM (7 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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

d3b0c77, 574adc7

Parents:

ab0b93f

Message:

merge fixups

Location:

src/sas/sasgui/perspectives/fitting

Files:

• fitpage.py (modified) (1 diff)
• fitting.py (modified) (4 diffs)

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

@@ -1726 +1726 @@
                 and not self.temp_multi_functional:
             return None
-        print("_set_fun_box_list", self.model.name)
         # Get the func name list
         list = self.model.fun_list

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

@@ -51 +51 @@
 from sas.sasgui.perspectives.calculator.model_editor import TextDialog
 from sas.sasgui.perspectives.calculator.model_editor import EditorWindow
+from sas.sasgui.perspectives.calculator.pyconsole import PyConsole
 
 from .fitting_widgets import DataDialog
@@ -242 +243 @@
         Get the python editor panel
         """
-        from sas.sasgui.perspectives.calculator.pyconsole import PyConsole
-
         event_id = event.GetId()
         label = self.edit_menu.GetLabel(event_id)
@@ -368 +367 @@
                         if model and new_model != model:
                             page._on_select_model(keep_pars=True)
-                    if hasattr(page, 'structurebox'):
+                    if hasattr(page, "structurebox"):
                         selected_name = page.structurebox.GetStringSelection()
 
@@ -1769 +1768 @@
             @param unsmeared_error: data error, rescaled to unsmeared model
         """
-<<<<<<< HEAD
-
-=======
->>>>>>> master
         number_finite = np.count_nonzero(np.isfinite(y))
         np.nan_to_num(y)