Changeset 0c83303 in sasview for src/sas

Timestamp:

Oct 29, 2018 3:56:39 PM (6 years ago)

Author:

piotr

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

f5cec7c

Parents:

6216eb75

Message:

Minor improvements after RH's review. SASVIEW-275

Location:

src/sas/qtgui

Files:

• MainWindow/GuiManager.py (modified) (1 diff)
• Perspectives/Fitting/FittingWidget.py (modified) (1 diff)
• Utilities/ResultPanel.py (modified) (3 diffs)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -836 +836 @@
         self.results_frame.setVisible(True)
         if output_data:
-            self.results_panel.onPlotResults(output_data)
+            self.results_panel.onPlotResults(output_data, optimizer=self.perspective().optimizer)
 
     def actionAdd_Custom_Model(self):

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

@@ -1571 +1571 @@
         if param_dict is None:
             return
-        if hasattr(res, 'convergence') and len(res.convergence)>0:
-            self.communicate.resultPlotUpdateSignal.emit(result[0])
+        self.communicate.resultPlotUpdateSignal.emit(result[0])
 
         elapsed = result[1]

src/sas/qtgui/Utilities/ResultPanel.py

@@ -55 +55 @@
         sys.modules['bumps.gui.plot_view'] = PlotView
 
-    def onPlotResults(self, results):
+    def onPlotResults(self, results, optimizer="Unknown"):
         # Clear up previous results
         for view in (self.convergenceView, self.correlationView,
@@ -66 +66 @@
         result = results[0][0]
         filename = result.data.sas_data.filename
-        current_time = datetime.datetime.now().strftime("%I:%M%p, %B %d, %Y")
-        self.setWindowTitle(self.window_name + " - " + filename + " - " + current_time)
-        if hasattr(result, 'convergence'):
+        current_optimizer = optimizer
+        self.setWindowTitle(self.window_name + " - " + filename + " - " + current_optimizer)
+        if hasattr(result, 'convergence') and len(result.convergence) > 0:
             best, pop = result.convergence[:, 0], result.convergence[:, 1:]
             self.convergenceView.update(best, pop)
@@ -92 +92 @@
             for view in (self.correlationView, self.uncertaintyView, self.traceView):
                 view.close()
+        # no tabs in the widget - possibly LM optimizer. Mark "closed"
+        if self.count()==0:
+            self.close()
 
     def closeEvent(self, event):