realAscot/qelectrotech-source-mirror
realAscot/qelectrotech-source-mirror
1
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-09-13 20:23:04 +02:00
Code Packages Releases 1 Activity

Search and replace : improve the search for conductor.

Browse Source 
Minor gui change of conductor properties widget


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5647 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun 2018-12-13 17:34:41 +00:00
parent 87774c7296
commit 7a17200cf6
3 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sources/SearchAndReplace/ui/searchandreplacewidget.cpp
View File

@ -288,6 +288,7 @@ void SearchAndReplaceWidget::fillItemsList()
QTreeWidgetItem *qtwi = new QTreeWidgetItem(m_conductor_qtwi);
qtwi->setText(0, c->properties().text);
qtwi->setCheckState(0, Qt::Checked);
qtwi->setData(0, Qt::UserRole, searchTerms(c));
m_conductor_hash.insert(qtwi, QPointer<Conductor>(c));
}
m_conductor_qtwi->sortChildren(0, Qt::AscendingOrder);
@ -369,23 +370,6 @@ void SearchAndReplaceWidget::search()
}
bool match = false;
Qt::MatchFlags flags;
//Search on the text displayed at column 0 of each item
if (ui->m_mode_cb->currentIndex() == 0) {
flags = Qt::MatchContains | Qt::MatchRecursive; //Contain string
} else {
flags = Qt::MatchFixedString | Qt::MatchRecursive; //entire word
}
if (ui->m_case_sensitive_cb->isChecked()) {
flags = flags | Qt::MatchCaseSensitive;
}
for (QTreeWidgetItem *qtwi : ui->m_tree_widget->findItems(str, flags))
{
match = true;
qtwi->setHidden(false);
setVisibleAllParents(qtwi);
}
//Extended search,
//on each string stored in column 0 with role : UserRole
@ -393,6 +377,7 @@ void SearchAndReplaceWidget::search()
qtwi_list.append(m_diagram_hash.keys());
qtwi_list.append(m_element_hash.keys());
qtwi_list.append(m_text_hash.keys());
qtwi_list.append(m_conductor_hash.keys());
for (QTreeWidgetItem *qtwi : qtwi_list)
{
QStringList list = qtwi->data(0, Qt::UserRole).toStringList();
@ -653,7 +638,7 @@ void SearchAndReplaceWidget::activateNextChecked()
* @param diagram
* @return All QStrings use as terms for search.
*/
QStringList SearchAndReplaceWidget::searchTerms(Diagram *diagram) const
QStringList SearchAndReplaceWidget::searchTerms(Diagram *diagram)
{
QStringList list;
TitleBlockProperties prop = diagram->border_and_titleblock.exportTitleBlock();
@ -677,7 +662,7 @@ QStringList SearchAndReplaceWidget::searchTerms(Diagram *diagram) const
* @param element
* @return All QString use as terms for search
*/
QStringList SearchAndReplaceWidget::searchTerms(Element *element) const
QStringList SearchAndReplaceWidget::searchTerms(Element *element)
{
QStringList list;
DiagramContext context = element->elementInformations();
@ -692,6 +677,23 @@ QStringList SearchAndReplaceWidget::searchTerms(Element *element) const
return list;
}
/**
* @brief SearchAndReplaceWidget::searchTerms
* @param conductor
* @return all QString use as terms for search.
*/
QStringList SearchAndReplaceWidget::searchTerms(Conductor *conductor)
{
QStringList list;
ConductorProperties properties = conductor->properties();
list.append(properties.text);
list.append(properties.m_function);
list.append(properties.m_tension_protocol);
return list;
}
void SearchAndReplaceWidget::on_m_quit_button_clicked() {
this->setHidden(true);
}

6
sources/SearchAndReplace/ui/searchandreplacewidget.h
View File

@ -60,8 +60,10 @@ class SearchAndReplaceWidget : public QWidget
void setChildCheckState(QTreeWidgetItem *item, Qt::CheckState check, bool deep = true);
void updateParentCheckState(QTreeWidgetItem *item, bool all_parents = true);
void activateNextChecked();
QStringList searchTerms(Diagram *diagram) const;
QStringList searchTerms(Element *element) const;
static QStringList searchTerms(Diagram *diagram);
static QStringList searchTerms(Element *element);
static QStringList searchTerms(Conductor *conductor);
static QStringList searchTerms(QString str);
private slots:
void on_m_quit_button_clicked();

2
sources/ui/conductorpropertieswidget.ui
View File

@ -17,7 +17,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<widget class="QWidget" name="type">
<attribute name="title">