Changeset a5c31fd in sasview

Timestamp:

Sep 6, 2018 5:39:53 AM (6 years ago)

Author:

Laura Forster <Awork@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, 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:

• src/sas/qtgui/MainWindow/GuiManager.py (modified) (1 diff)
• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (1 diff)
• setuptools-3.4.1.zip (deleted)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -123 +123 @@
         #self._workspace.workspace.addDockWidget(Qt.LeftDockWidgetArea, self.dockedFilesWidget)
         self._workspace.addDockWidget(Qt.LeftDockWidgetArea, self.dockedFilesWidget)
+        self._workspace.resizeDocks([self.dockedFilesWidget], [305], Qt.Horizontal)
 
         # Add the console window as another docked widget

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

@@ -2820 +2820 @@
         # TODO: add polidyspersity and magnetism
 
-
     def updateUndo(self):
         """