Changeset 3d18691 in sasview


Ignore:
Timestamp:
Aug 6, 2018 9:37:19 AM (4 months ago)
Author:
Piotr Rozyczko <rozyczko@…>
Branches:
ESS_GUI, ESS_GUI_Invariant, ESS_GUI_Pr_fixes, ESS_GUI_batch_fitting, ESS_GUI_iss879, ESS_GUI_ordering
Children:
060413c
Parents:
97df8a9
git-author:
wpotrzebowski <Wojciech.Potrzebowski@…> (10/27/17 04:35:49)
git-committer:
Piotr Rozyczko <rozyczko@…> (08/06/18 09:37:19)
Message:

New category manager design

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

Legend:

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

    r8e2cd79 r3d18691  
    2727from sas.qtgui.MainWindow.AboutBox import AboutBox 
    2828from sas.qtgui.MainWindow.WelcomePanel import WelcomePanel 
     29from sas.qtgui.MainWindow.CategoryManager import CategoryManager 
    2930 
    3031from sas.qtgui.MainWindow.DataManager import DataManager 
     
    134135        self.ackWidget = Acknowledgements() 
    135136        self.aboutWidget = AboutBox() 
     137        self.categoryManagerWidget = CategoryManager(self._parent, manager=self) 
    136138        self.welcomePanel = WelcomePanel() 
    137139        self.grid_window = None 
    138140        self._workspace.toolBar.setVisible(LocalConfig.TOOLBAR_SHOW) 
    139141        self._workspace.actionHide_Toolbar.setText("Show Toolbar") 
     142        self.categoryManagerWidget = CategoryManager() 
    140143 
    141144        # Add calculators - floating for usability 
     
    419422        self._workspace.actionHide_Toolbar.triggered.connect(self.actionHide_Toolbar) 
    420423        self._workspace.actionStartup_Settings.triggered.connect(self.actionStartup_Settings) 
    421         self._workspace.actionCategry_Manager.triggered.connect(self.actionCategry_Manager) 
     424        self._workspace.actionCategory_Manager.triggered.connect(self.actionCategory_Manager) 
    422425        # Tools 
    423426        self._workspace.actionData_Operation.triggered.connect(self.actionData_Operation) 
     
    611614        pass 
    612615 
    613     def actionCategry_Manager(self): 
    614         """ 
    615         """ 
    616         print("actionCategry_Manager TRIGGERED") 
    617         pass 
     616    def actionCategory_Manager(self): 
     617        """ 
     618        """ 
     619        self.categoryManagerWidget.show() 
    618620 
    619621    #============ TOOLS ================= 
  • src/sas/qtgui/MainWindow/MainWindow.py

    re4335ae r3d18691  
    2727        except Exception as ex: 
    2828            import logging 
    29             logging.error("Application failed with: " + str(ex)) 
    30             print("Application failed with: ", ex) 
     29            logging.error("Application failed with: "+str(ex)) 
     30            print("Application failed with: ", str(ex)) 
    3131 
    3232    def closeEvent(self, event): 
  • src/sas/qtgui/MainWindow/UI/MainWindowUI.ui

    r2b39fea r3d18691  
    7575    <addaction name="actionStartup_Settings"/> 
    7676    <addaction name="separator"/> 
    77     <addaction name="actionCategry_Manager"/> 
     77    <addaction name="actionCategory_Manager"/> 
    7878   </widget> 
    7979   <widget class="QMenu" name="menuTool"> 
     
    324324   </property> 
    325325  </action> 
    326   <action name="actionCategry_Manager"> 
     326  <action name="actionCategory_Manager"> 
    327327   <property name="text"> 
    328328    <string>Category Manager</string> 
  • src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

    r97df8a9 r3d18691  
    373373        self.cbCategory.addItem(CATEGORY_DEFAULT) 
    374374        self.cbCategory.addItems(category_list) 
    375         self.cbCategory.addItem(CATEGORY_STRUCTURE) 
     375        if CATEGORY_STRUCTURE not in category_list: 
     376            self.cbCategory.addItem(CATEGORY_STRUCTURE) 
    376377        self.cbCategory.setCurrentIndex(0) 
    377378 
     
    523524        self.communicate.copyFitParamsSignal.connect(self.onParameterCopy) 
    524525        self.communicate.pasteFitParamsSignal.connect(self.onParameterPaste) 
     526 
     527        # Communicator signal 
     528        self.communicate.updateModelCategoriesSignal.connect(self.onCategoriesChanged) 
    525529 
    526530    def modelName(self): 
     
    22482252        self.createNewIndex(residuals_plot) 
    22492253 
     2254    def onCategoriesChanged(self): 
     2255            """ 
     2256            Reload the category/model comboboxes 
     2257            """ 
     2258            # Store the current combo indices 
     2259            current_cat = self.cbCategory.currentText() 
     2260            current_model = self.cbModel.currentText() 
     2261 
     2262            # reread the category file and repopulate the combo 
     2263            self.cbCategory.blockSignals(True) 
     2264            self.cbCategory.clear() 
     2265            self.readCategoryInfo() 
     2266            self.initializeCategoryCombo() 
     2267 
     2268            # Scroll back to the original index in Categories 
     2269            new_index = self.cbCategory.findText(current_cat) 
     2270            if new_index != -1: 
     2271                self.cbCategory.setCurrentIndex(new_index) 
     2272            self.cbCategory.blockSignals(False) 
     2273            # ...and in the Models 
     2274            self.cbModel.blockSignals(True) 
     2275            new_index = self.cbModel.findText(current_model) 
     2276            if new_index != -1: 
     2277                self.cbModel.setCurrentIndex(new_index) 
     2278            self.cbModel.blockSignals(False) 
     2279 
     2280            return 
     2281 
    22502282    def calcException(self, etype, value, tb): 
    22512283        """ 
  • src/sas/qtgui/Utilities/GuiUtils.py

    r8e2cd79 r3d18691  
    260260    # Fitting parameter paste from clipboard 
    261261    pasteFitParamsSignal = QtCore.pyqtSignal() 
     262    # Notify about new categories/models from category manager 
     263    updateModelCategoriesSignal = QtCore.pyqtSignal() 
    262264 
    263265def updateModelItemWithPlot(item, update_data, name=""): 
Note: See TracChangeset for help on using the changeset viewer.