diff -r 3d88d53f8c2b -r 033967644b1f UI/Browser.py --- a/UI/Browser.py Thu Mar 09 19:28:59 2017 +0100 +++ b/UI/Browser.py Fri Mar 10 17:32:19 2017 +0100 @@ -640,26 +640,26 @@ """ self.__model.interpreterChanged(interpreter) - def wantedItem(self, itm, filter=None): + def wantedItem(self, itm, filterList=None): """ Public method to check type of an item. @param itm the item to check (BrowserItem) - @param filter list of classes to check against + @param filterList list of classes to check against @return flag indicating item is a valid type (boolean) """ - if filter is None: - filter = self.selectedItemsFilter - for typ in filter: + if filterList is None: + filterList = self.selectedItemsFilter + for typ in filterList: if isinstance(itm, typ): return True return False - def getSelectedItems(self, filter=None): + def getSelectedItems(self, filterList=None): """ Public method to get the selected items. - @param filter list of classes to check against + @param filterList list of classes to check against @return list of selected items (list of BroweserItem) """ selectedItems = [] @@ -667,15 +667,15 @@ for index in indexes: if index.column() == 0: itm = self.model().item(index) - if self.wantedItem(itm, filter): + if self.wantedItem(itm, filterList): selectedItems.append(itm) return selectedItems - def getSelectedItemsCount(self, filter=None): + def getSelectedItemsCount(self, filterList=None): """ Public method to get the count of items selected. - @param filter list of classes to check against + @param filterList list of classes to check against @return count of items selected (integer) """ count = 0 @@ -683,15 +683,15 @@ for index in indexes: if index.column() == 0: itm = self.model().item(index) - if self.wantedItem(itm, filter): + if self.wantedItem(itm, filterList): count += 1 return count - def getSelectedItemsCountCategorized(self, filter=None): + def getSelectedItemsCountCategorized(self, filterList=None): """ Public method to get a categorized count of selected items. - @param filter list of classes to check against + @param filterList list of classes to check against @return a dictionary containing the counts of items belonging to the individual filter classes. The keys of the dictionary are the string representation of the classes given in the @@ -699,18 +699,18 @@ an additional entry with key "sum", that stores the sum of all selected entries fulfilling the filter criteria. """ - if filter is None: - filter = self.selectedItemsFilter + if filterList is None: + filterList = self.selectedItemsFilter categories = {} categories["sum"] = 0 - for typ in filter: + for typ in filterList: categories[str(typ)] = 0 indexes = self.selectedIndexes() for index in indexes: if index.column() == 0: itm = self.model().item(index) - for typ in filter: + for typ in filterList: if isinstance(itm, typ): categories["sum"] += 1 categories[str(typ)] += 1