Changes in / [9ea43c82:02c11b04] in sasview


Ignore:
Location:
src/sas/qtgui
Files:
3 added
3 edited

Legend:

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

    rf0bb711 r9863343  
    384384        self._workspace.actionCombine_Batch_Fit.triggered.connect(self.actionCombine_Batch_Fit) 
    385385        self._workspace.actionFit_Options.triggered.connect(self.actionFit_Options) 
     386        self._workspace.actionGPU_Options.triggered.connect(self.actionGPU_Options) 
    386387        self._workspace.actionFit_Results.triggered.connect(self.actionFit_Results) 
    387388        self._workspace.actionChain_Fitting.triggered.connect(self.actionChain_Fitting) 
     
    620621        pass 
    621622 
     623    def actionGPU_Options(self): 
     624        """ 
     625        Load the OpenCL selection dialog if the fitting perspective is active 
     626        """ 
     627        if hasattr(self._current_perspective, "gpu_options_widget"): 
     628            self._current_perspective.gpu_options_widget.show() 
     629        pass 
     630 
    622631    def actionFit_Results(self): 
    623632        """ 
  • src/sas/qtgui/MainWindow/UI/MainWindowUI.ui

    rb00414d r06ce180  
    2525     <y>0</y> 
    2626     <width>915</width> 
    27      <height>21</height> 
     27     <height>26</height> 
    2828    </rect> 
    2929   </property> 
     
    103103    <addaction name="separator"/> 
    104104    <addaction name="actionFit_Options"/> 
     105    <addaction name="actionGPU_Options"/> 
    105106    <addaction name="actionFit_Results"/> 
    106107    <addaction name="separator"/> 
     
    499500   </property> 
    500501  </action> 
     502  <action name="actionGPU_Options"> 
     503   <property name="text"> 
     504    <string>GPU Options</string> 
     505   </property> 
     506   <property name="softKeyRole"> 
     507    <enum>QAction::NoSoftKey</enum> 
     508   </property> 
     509  </action> 
    501510 </widget> 
    502511 <resources/> 
  • src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py

    r377ade1 r14fa542  
    1111from sas.qtgui.Perspectives.Fitting.FittingWidget import FittingWidget 
    1212from sas.qtgui.Perspectives.Fitting.FittingOptions import FittingOptions 
     13from sas.qtgui.Perspectives.Fitting.GPUOptions import GPUOptions 
    1314from sas.qtgui.Perspectives.Fitting import ModelUtilities 
    1415 
     
    6061        # Listen to GUI Manager signal updating fit options 
    6162        self.fit_options_widget.fit_option_changed.connect(self.onFittingOptionsChange) 
     63 
     64        # GPU Options 
     65        self.gpu_options_widget = GPUOptions(self) 
    6266 
    6367        self.menu_manager = ModelUtilities.ModelManager() 
Note: See TracChangeset for help on using the changeset viewer.