Changes in / [03e04a4:4bddb9ca] in sasview
- Location:
- src/sas/qtgui
- Files:
-
- 3 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/MainWindow/GuiManager.py
r060413c r8e2cd79 27 27 from sas.qtgui.MainWindow.AboutBox import AboutBox 28 28 from sas.qtgui.MainWindow.WelcomePanel import WelcomePanel 29 from sas.qtgui.MainWindow.CategoryManager import CategoryManager30 29 31 30 from sas.qtgui.MainWindow.DataManager import DataManager … … 135 134 self.ackWidget = Acknowledgements() 136 135 self.aboutWidget = AboutBox() 137 self.categoryManagerWidget = CategoryManager(self._parent, manager=self)138 136 self.welcomePanel = WelcomePanel() 139 137 self.grid_window = None … … 421 419 self._workspace.actionHide_Toolbar.triggered.connect(self.actionHide_Toolbar) 422 420 self._workspace.actionStartup_Settings.triggered.connect(self.actionStartup_Settings) 423 self._workspace.actionCateg ory_Manager.triggered.connect(self.actionCategory_Manager)421 self._workspace.actionCategry_Manager.triggered.connect(self.actionCategry_Manager) 424 422 # Tools 425 423 self._workspace.actionData_Operation.triggered.connect(self.actionData_Operation) … … 613 611 pass 614 612 615 def actionCategory_Manager(self): 616 """ 617 """ 618 self.categoryManagerWidget.show() 613 def actionCategry_Manager(self): 614 """ 615 """ 616 print("actionCategry_Manager TRIGGERED") 617 pass 619 618 620 619 #============ TOOLS ================= -
src/sas/qtgui/MainWindow/MainWindow.py
r3d18691 re4335ae 27 27 except Exception as ex: 28 28 import logging 29 logging.error("Application failed with: " +str(ex))30 print("Application failed with: ", str(ex))29 logging.error("Application failed with: " + str(ex)) 30 print("Application failed with: ", ex) 31 31 32 32 def closeEvent(self, event): -
src/sas/qtgui/MainWindow/UI/MainWindowUI.ui
r3d18691 r2b39fea 75 75 <addaction name="actionStartup_Settings"/> 76 76 <addaction name="separator"/> 77 <addaction name="actionCateg ory_Manager"/>77 <addaction name="actionCategry_Manager"/> 78 78 </widget> 79 79 <widget class="QMenu" name="menuTool"> … … 324 324 </property> 325 325 </action> 326 <action name="actionCateg ory_Manager">326 <action name="actionCategry_Manager"> 327 327 <property name="text"> 328 328 <string>Category Manager</string> -
src/sas/qtgui/Perspectives/Fitting/FittingWidget.py
r060413c r97df8a9 373 373 self.cbCategory.addItem(CATEGORY_DEFAULT) 374 374 self.cbCategory.addItems(category_list) 375 if CATEGORY_STRUCTURE not in category_list: 376 self.cbCategory.addItem(CATEGORY_STRUCTURE) 375 self.cbCategory.addItem(CATEGORY_STRUCTURE) 377 376 self.cbCategory.setCurrentIndex(0) 378 377 … … 524 523 self.communicate.copyFitParamsSignal.connect(self.onParameterCopy) 525 524 self.communicate.pasteFitParamsSignal.connect(self.onParameterPaste) 526 527 # Communicator signal528 self.communicate.updateModelCategoriesSignal.connect(self.onCategoriesChanged)529 525 530 526 def modelName(self): … … 1935 1931 # custom kernel load requires full path 1936 1932 name = os.path.join(ModelUtilities.find_plugins_dir(), model_name+".py") 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) 1933 kernel_module = generate.load_kernel_module(name) 1944 1934 1945 1935 if hasattr(kernel_module, 'parameters'): … … 2258 2248 self.createNewIndex(residuals_plot) 2259 2249 2260 def onCategoriesChanged(self):2261 """2262 Reload the category/model comboboxes2263 """2264 # Store the current combo indices2265 current_cat = self.cbCategory.currentText()2266 current_model = self.cbModel.currentText()2267 2268 # reread the category file and repopulate the combo2269 self.cbCategory.blockSignals(True)2270 self.cbCategory.clear()2271 self.readCategoryInfo()2272 self.initializeCategoryCombo()2273 2274 # Scroll back to the original index in Categories2275 new_index = self.cbCategory.findText(current_cat)2276 if new_index != -1:2277 self.cbCategory.setCurrentIndex(new_index)2278 self.cbCategory.blockSignals(False)2279 # ...and in the Models2280 self.cbModel.blockSignals(True)2281 new_index = self.cbModel.findText(current_model)2282 if new_index != -1:2283 self.cbModel.setCurrentIndex(new_index)2284 self.cbModel.blockSignals(False)2285 2286 return2287 2288 2250 def calcException(self, etype, value, tb): 2289 2251 """ -
src/sas/qtgui/Utilities/GuiUtils.py
r3d18691 r8e2cd79 260 260 # Fitting parameter paste from clipboard 261 261 pasteFitParamsSignal = QtCore.pyqtSignal() 262 # Notify about new categories/models from category manager263 updateModelCategoriesSignal = QtCore.pyqtSignal()264 262 265 263 def updateModelItemWithPlot(item, update_data, name=""): -
src/sas/qtgui/Utilities/PluginDefinition.py
r060413c rc5e0d84 30 30 self.pd_parameter_dict = {} 31 31 32 # Initialize signals 33 self.addSignals() 34 32 35 # Initialize widgets 33 36 self.addWidgets() 34 35 # Wait for all widgets to finish processing36 QtWidgets.QApplication.processEvents()37 38 # Initialize signals39 self.addSignals()40 37 41 38 def addTooltip(self): … … 163 160 # keep in mind that this is called every time the text changes. 164 161 # mind the performance! 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() 162 self.addTooltip() 163 self.model['text'] = self.txtFunction.toPlainText().lstrip().rstrip() 164 self.modelModified.emit() 170 165 171 166 def onOverwrite(self):
Note: See TracChangeset
for help on using the changeset viewer.