Ignore:
Timestamp:
Sep 26, 2018 4:47:30 AM (3 years ago)
Author:
Laura Forster <Awork@…>
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:
428c3b2, a80e182
Parents:
20f4857 (diff), 6d87082 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'ESS_GUI' of https://github.com/SasView/sasview into ESS_GUI

File:
1 edited

Legend:

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

    r20f4857 r8eea1b1  
    138138        self.categoryManagerWidget = CategoryManager(self._parent, manager=self) 
    139139        self.grid_window = None 
     140        self.grid_window = BatchOutputPanel(parent=self) 
     141        self.grid_subwindow = self._workspace.workspace.addSubWindow(self.grid_window) 
     142        self.grid_subwindow.setVisible(False) 
     143        self.grid_window.windowClosedSignal.connect(lambda: self.grid_subwindow.setVisible(False)) 
     144 
    140145        self._workspace.toolBar.setVisible(LocalConfig.TOOLBAR_SHOW) 
    141146        self._workspace.actionHide_Toolbar.setText("Show Toolbar") 
     
    616621        Display/redisplay the batch fit viewer 
    617622        """ 
    618         if self.grid_window is None: 
    619             self.grid_window = BatchOutputPanel(parent=self, output_data=output_data) 
    620             subwindow = self._workspace.workspace.addSubWindow(self.grid_window) 
    621  
    622             #self.grid_window = BatchOutputPanel(parent=self, output_data=output_data) 
    623             self.grid_window.show() 
    624             return 
     623        self.grid_subwindow.setVisible(True) 
    625624        if output_data: 
    626625            self.grid_window.addFitResults(output_data) 
    627         self.grid_window.show() 
    628         if self.grid_window.windowState() == Qt.WindowMinimized: 
    629             self.grid_window.setWindowState(Qt.WindowActive) 
    630626 
    631627    def actionHide_Toolbar(self): 
Note: See TracChangeset for help on using the changeset viewer.