Ignore:
Timestamp:
Nov 12, 2018 6:47:59 AM (5 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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Utilities/GuiUtils.py

    r17e2d502 r133812c7  
    162162    DEFAULT_PERSPECTIVE = custom_config.DEFAULT_PERSPECTIVE 
    163163    CLEANUP_PLOT = custom_config.CLEANUP_PLOT 
     164    SAS_OPENCL = custom_config.SAS_OPENCL 
    164165    # custom open_path 
    165166    open_folder = custom_config.DEFAULT_OPEN_FOLDER 
     
    182183    CLEANUP_PLOT = False 
    183184    DEFAULT_OPEN_FOLDER = PATH_APP 
     185    SAS_OPENCL = config.SAS_OPENCL 
    184186 
    185187#DEFAULT_STYLE = config.DEFAULT_STYLE 
     
    294296    # Plot fitting results (FittingWidget->GuiManager) 
    295297    resultPlotUpdateSignal = QtCore.pyqtSignal(list) 
     298 
     299    # show the plot as a regular in-workspace object 
     300    forcePlotDisplaySignal = QtCore.pyqtSignal(list) 
    296301 
    297302def updateModelItemWithPlot(item, update_data, name="", checkbox_state=None): 
Note: See TracChangeset for help on using the changeset viewer.