Changeset a5c31fd in sasview


Ignore:
Timestamp:
Sep 6, 2018 5:39:53 AM (7 months ago)
Author:
Laura Forster <Awork@…>
Branches:
ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_iss879, ESS_GUI_ordering, ESS_GUI_sync_sascalc
Children:
dda8f16
Parents:
47471ec (diff), f84d793 (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

Files:
1 deleted
2 edited

Legend:

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

    r6da3e3d rf84d793  
    123123        #self._workspace.workspace.addDockWidget(Qt.LeftDockWidgetArea, self.dockedFilesWidget) 
    124124        self._workspace.addDockWidget(Qt.LeftDockWidgetArea, self.dockedFilesWidget) 
     125        self._workspace.resizeDocks([self.dockedFilesWidget], [305], Qt.Horizontal) 
    125126 
    126127        # Add the console window as another docked widget 
  • src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

    r6da3e3d rf84d793  
    28202820        # TODO: add polidyspersity and magnetism 
    28212821 
    2822  
    28232822    def updateUndo(self): 
    28242823        """ 
Note: See TracChangeset for help on using the changeset viewer.