Changeset 0c83303 in sasview


Ignore:
Timestamp:
Oct 29, 2018 3:56:39 PM (2 weeks ago)
Author:
piotr
Branches:
ESS_GUI, ESS_GUI_project_save
Children:
f5cec7c
Parents:
6216eb75
Message:

Minor improvements after RH's review. SASVIEW-275

Location:
src/sas/qtgui
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/MainWindow/GuiManager.py

    r722b7d6 r0c83303  
    836836        self.results_frame.setVisible(True) 
    837837        if output_data: 
    838             self.results_panel.onPlotResults(output_data) 
     838            self.results_panel.onPlotResults(output_data, optimizer=self.perspective().optimizer) 
    839839 
    840840    def actionAdd_Custom_Model(self): 
  • src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

    r7fb68060 r0c83303  
    15711571        if param_dict is None: 
    15721572            return 
    1573         if hasattr(res, 'convergence') and len(res.convergence)>0: 
    1574             self.communicate.resultPlotUpdateSignal.emit(result[0]) 
     1573        self.communicate.resultPlotUpdateSignal.emit(result[0]) 
    15751574 
    15761575        elapsed = result[1] 
  • src/sas/qtgui/Utilities/ResultPanel.py

    r6216eb75 r0c83303  
    5555        sys.modules['bumps.gui.plot_view'] = PlotView 
    5656 
    57     def onPlotResults(self, results): 
     57    def onPlotResults(self, results, optimizer="Unknown"): 
    5858        # Clear up previous results 
    5959        for view in (self.convergenceView, self.correlationView, 
     
    6666        result = results[0][0] 
    6767        filename = result.data.sas_data.filename 
    68         current_time = datetime.datetime.now().strftime("%I:%M%p, %B %d, %Y") 
    69         self.setWindowTitle(self.window_name + " - " + filename + " - " + current_time) 
    70         if hasattr(result, 'convergence'): 
     68        current_optimizer = optimizer 
     69        self.setWindowTitle(self.window_name + " - " + filename + " - " + current_optimizer) 
     70        if hasattr(result, 'convergence') and len(result.convergence) > 0: 
    7171            best, pop = result.convergence[:, 0], result.convergence[:, 1:] 
    7272            self.convergenceView.update(best, pop) 
     
    9292            for view in (self.correlationView, self.uncertaintyView, self.traceView): 
    9393                view.close() 
     94        # no tabs in the widget - possibly LM optimizer. Mark "closed" 
     95        if self.count()==0: 
     96            self.close() 
    9497 
    9598    def closeEvent(self, event): 
Note: See TracChangeset for help on using the changeset viewer.