Changeset 060413c in sasview


Ignore:
Timestamp:
Aug 6, 2018 9:48:06 AM (2 weeks ago)
Author:
Piotr Rozyczko <rozyczko@…>
Branches:
ESS_GUI, ESS_GUI_beta_approx, ESS_GUI_iss976
Children:
03e04a4
Parents:
3d18691
Message:

More CR and merge fixes.

Location:
src/sas/qtgui
Files:
3 edited

Legend:

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

    r3d18691 r060413c  
    140140        self._workspace.toolBar.setVisible(LocalConfig.TOOLBAR_SHOW) 
    141141        self._workspace.actionHide_Toolbar.setText("Show Toolbar") 
    142         self.categoryManagerWidget = CategoryManager() 
    143142 
    144143        # Add calculators - floating for usability 
  • src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

    r3d18691 r060413c  
    19351935            # custom kernel load requires full path 
    19361936            name = os.path.join(ModelUtilities.find_plugins_dir(), model_name+".py") 
    1937         kernel_module = generate.load_kernel_module(name) 
     1937        try: 
     1938            kernel_module = generate.load_kernel_module(name) 
     1939        except ModuleNotFoundError: 
     1940            # maybe it's a recategorised custom model? 
     1941            name = os.path.join(ModelUtilities.find_plugins_dir(), model_name+".py") 
     1942            # If this rises, it's a valid problem. 
     1943            kernel_module = generate.load_kernel_module(name) 
    19381944 
    19391945        if hasattr(kernel_module, 'parameters'): 
  • src/sas/qtgui/Utilities/PluginDefinition.py

    rc5e0d84 r060413c  
    3030        self.pd_parameter_dict = {} 
    3131 
     32        # Initialize widgets 
     33        self.addWidgets() 
     34 
     35        # Wait for all widgets to finish processing 
     36        QtWidgets.QApplication.processEvents() 
     37 
    3238        # Initialize signals 
    3339        self.addSignals() 
    34  
    35         # Initialize widgets 
    36         self.addWidgets() 
    3740 
    3841    def addTooltip(self): 
     
    160163        # keep in mind that this is called every time the text changes. 
    161164        # mind the performance! 
    162         self.addTooltip() 
    163         self.model['text'] = self.txtFunction.toPlainText().lstrip().rstrip() 
    164         self.modelModified.emit() 
     165        #self.addTooltip() 
     166        new_text = self.txtFunction.toPlainText().lstrip().rstrip() 
     167        if new_text != self.model['text']: 
     168            self.model['text'] = new_text 
     169            self.modelModified.emit() 
    165170 
    166171    def onOverwrite(self): 
Note: See TracChangeset for help on using the changeset viewer.