mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-12-18 05:00:33 +01:00
Modification du filtre : recherche sur plusieur mot (sepration caractere +)
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3378 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
@@ -507,6 +507,20 @@ bool ElementsPanel::matchesCurrentFilter(const QTreeWidgetItem *item) const {
|
||||
return(item_matches);
|
||||
}
|
||||
|
||||
/**
|
||||
@return true if \a item matches the filter, false otherwise
|
||||
*/
|
||||
bool ElementsPanel::matchesFilter(const QTreeWidgetItem *item, QString filter) const {
|
||||
if (!item) return(false);
|
||||
|
||||
// no filter => we consider the item matches
|
||||
if (filter.isEmpty()) return(true);
|
||||
|
||||
bool item_matches = item -> text(0).contains(filter, Qt::CaseInsensitive);
|
||||
|
||||
return(item_matches);
|
||||
}
|
||||
|
||||
/**
|
||||
Reloads the following collections:
|
||||
* common collection
|
||||
@@ -818,14 +832,38 @@ bool ElementsPanel::scrollToElement(const ElementsLocation &location) {
|
||||
return(true);
|
||||
}
|
||||
|
||||
/**
|
||||
Build filter list for multiple filter
|
||||
*/
|
||||
void ElementsPanel::buildFilterList() {
|
||||
if (filter_.isEmpty()) return;
|
||||
filter_list_ = filter_.split( '+' );
|
||||
/*
|
||||
qDebug() << "*******************";
|
||||
foreach( QString filter , filter_list_ ) {
|
||||
filter = filter.trimmed();
|
||||
qDebug() << filter;
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
/**
|
||||
Apply the current filter to a given item.
|
||||
*/
|
||||
void ElementsPanel::applyCurrentFilter(const QList<QTreeWidgetItem *> &items) {
|
||||
if (filter_.isEmpty()) return;
|
||||
buildFilterList();
|
||||
QList<QTreeWidgetItem *> matching_items;
|
||||
|
||||
foreach (QTreeWidgetItem *item, items) {
|
||||
bool item_matches = matchesCurrentFilter(item);
|
||||
bool item_matches = true;
|
||||
|
||||
foreach( QString filter , filter_list_ ) {
|
||||
filter = filter.trimmed();
|
||||
if ( !filter.isEmpty() ) {
|
||||
item_matches &= matchesFilter(item, filter);
|
||||
}
|
||||
}
|
||||
if (item_matches) matching_items << item;
|
||||
item -> setHidden(!item_matches);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user