Changeset 133812c7 in sasview for src/sas/qtgui/Utilities

Timestamp:

Nov 12, 2018 6:47:59 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

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:

e5ae812

Parents:

ebcdb02

git-author:

Piotr Rozyczko <piotr.rozyczko@…> (10/31/18 06:34:14)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (11/12/18 06:47:59)

Message:

Merged ESS_GUI

Location:

src/sas/qtgui/Utilities

Files:

• GenericReader.py (modified) (1 diff)
• GuiUtils.py (modified) (3 diffs)
• ImageViewer.py (added)
• ReportDialog.py (modified) (5 diffs)
• UI/ImageViewerOptionsUI.ui (added)
• UI/ImageViewerUI.ui (added)

src/sas/qtgui/Utilities/GenericReader.py

@@ -41 +41 @@
         try:
             data = self.loader.read(self.path)
-            self.complete(data=data)
+            self.complete(data=[data])
         except:
             # Thread was interrupted, just proceed and re-raise.

src/sas/qtgui/Utilities/GuiUtils.py

@@ -162 +162 @@
     DEFAULT_PERSPECTIVE = custom_config.DEFAULT_PERSPECTIVE
     CLEANUP_PLOT = custom_config.CLEANUP_PLOT
+    SAS_OPENCL = custom_config.SAS_OPENCL
     # custom open_path
     open_folder = custom_config.DEFAULT_OPEN_FOLDER
@@ -182 +183 @@
     CLEANUP_PLOT = False
     DEFAULT_OPEN_FOLDER = PATH_APP
+    SAS_OPENCL = config.SAS_OPENCL
 
 #DEFAULT_STYLE = config.DEFAULT_STYLE
@@ -294 +296 @@
     # Plot fitting results (FittingWidget->GuiManager)
     resultPlotUpdateSignal = QtCore.pyqtSignal(list)
+
+    # show the plot as a regular in-workspace object
+    forcePlotDisplaySignal = QtCore.pyqtSignal(list)
 
 def updateModelItemWithPlot(item, update_data, name="", checkbox_state=None):

src/sas/qtgui/Utilities/ReportDialog.py

@@ -10 +10 @@
 
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
+import sas.qtgui.Utilities.ObjectLibrary as ObjectLibrary
 
 from sas.qtgui.Utilities.UI.ReportDialogUI import Ui_ReportDialogUI
@@ -27 +28 @@
 
         self.data_html, self.data_txt, self.data_images = report_list
+        #self.save_location = None
+        #if 'ReportDialog_directory' in ObjectLibrary.listObjects():
+        self.save_location = ObjectLibrary.getObject('ReportDialog_directory')
 
         # Fill in the table from input data
@@ -70 +74 @@
         """
         # Choose user's home directory
-        location = os.path.expanduser('~')
+        if self.save_location is None:
+            location = os.path.expanduser('~')
+        else:
+            location = self.save_location
         # Use a sensible filename default
         default_name = os.path.join(location, 'fit_report.pdf')
@@ -78 +85 @@
             'caption'  : 'Save Report',
             # don't use 'directory' in order to remember the previous user choice
-            #'directory': default_name,
+            'directory': default_name,
             'filter'   : 'PDF file (*.pdf);;HTML file (*.html);;Text file (*.txt)',
             'options'  : QtWidgets.QFileDialog.DontUseNativeDialog}
@@ -87 +94 @@
             return
         extension = filename_tuple[1]
+        self.save_location = os.path.dirname(filename)
+        # lifetime of this widget is short - keep the reference elsewhere
+        ObjectLibrary.addObject('ReportDialog_directory', self.save_location)
 
         try: