kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-20 16:20:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Element info query : fix wrong behavior

Browse Source
This commit is contained in:
Claveau Joshua
2020-04-18 18:11:56 +02:00
parent f3c4d94822
commit 8cd9b3ba6e
1 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
sources/dataBase/ui/elementquerywidget.cpp
View File

@@ -156,11 +156,33 @@ QString ElementQueryWidget::queryStr() const
if (ui->m_all_cb->checkState() == Qt::PartiallyChecked) if (ui->m_all_cb->checkState() == Qt::PartiallyChecked)
{ {
if (ui->m_terminal_cb->isChecked()) {where += " AND e.type = 'Terminale'";} bool b = false;
if (ui->m_simple_cb->isChecked()) {where += " AND e.type = 'Simple'";} where += " AND (";
if (ui->m_button_cb->isChecked()) {where += " AND e.sub_type = 'commutator'";} if (ui->m_terminal_cb->isChecked()) {
if (ui->m_coil_cb->isChecked()) {where += " AND e.sub_type = 'coil'";} if (b) where +=" OR";
if (ui->m_protection_cb->isChecked()) {where += " AND e.sub_type = 'protection'";} where += " e.type = 'Terminale'";
b = true;
}
if (ui->m_simple_cb->isChecked()) {
if (b) where +=" OR";
where += " e.type = 'Simple'";
b = true;
}
if (ui->m_button_cb->isChecked()) {
if (b) where +=" OR";
where += " e.sub_type = 'commutator'";
b = true;
}
if (ui->m_coil_cb->isChecked()) {
if (b) where +=" OR";
where += " e.sub_type = 'coil'";
b = true;
}
if (ui->m_protection_cb->isChecked()) {
if (b) where +=" OR";
where += " e.sub_type = 'protection'";
}
where += ")";
} }