Changeset c736154 in sasview for src/sas/qtgui

Timestamp:

Feb 14, 2018 3:21:42 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:

6e58f2f

Parents:

6ca0da0

Message:

Fixed inter-branch contamination

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• ConstraintWidget.py (modified) (2 diffs)
• FittingWidget.py (modified) (2 diffs)

src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py

@@ -348 +348 @@
         self.parent.communicate.statusBarUpdateSignal.emit(msg)
 
-        pass
-
     def onFitFailed(self, reason):
         """
@@ -363 +361 @@
         msg = "Fitting failed: %s s.\n" % reason
         self.parent.communicate.statusBarUpdateSignal.emit(msg)
-        pass
  
     def isTabImportable(self, tab):

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -24 +24 @@
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
 import sas.qtgui.Utilities.LocalConfig as LocalConfig
-from sas.qtgui.Utilities.GridPanel import  BatchOutputPanel
 from sas.qtgui.Utilities.CategoryInstaller import CategoryInstaller
 from sas.qtgui.Plotting.PlotterData import Data1D
@@ -1169 +1168 @@
         self.setFittingStopped()
 
-        # Show the grid panel
-        grid_window = BatchOutputPanel(parent=self, output_data=result[0])
-        grid_window.show()
-
     def fitComplete(self, result):
         """