diff --git a/sources/SearchAndReplace/searchandreplaceworker.cpp b/sources/SearchAndReplace/searchandreplaceworker.cpp index 1d8266327..4974d71da 100644 --- a/sources/SearchAndReplace/searchandreplaceworker.cpp +++ b/sources/SearchAndReplace/searchandreplaceworker.cpp @@ -123,7 +123,8 @@ void SearchAndReplaceWorker::replaceElement(QList list) //We apply change only for master, slave, and terminal element. if (elmt->linkType() == Element::Master || elmt->linkType() == Element::Simple || - elmt->linkType() == Element::Terminale) + elmt->linkType() == Element::Terminale || + elmt->linkType() == Element::Thumbnail) { DiagramContext old_context; DiagramContext new_context = old_context = elmt->elementInformations(); diff --git a/sources/dataBase/projectdatabase.cpp b/sources/dataBase/projectdatabase.cpp index b0261be0f..360054e33 100644 --- a/sources/dataBase/projectdatabase.cpp +++ b/sources/dataBase/projectdatabase.cpp @@ -118,7 +118,7 @@ void projectDataBase::addElement(Element *element) m_insert_elements_query.bindValue(":uuid", element->uuid().toString()); m_insert_elements_query.bindValue(":diagram_uuid", element->diagram()->uuid().toString()); m_insert_elements_query.bindValue(":pos", element->diagram()->convertPosition(element->scenePos()).toString()); - m_insert_elements_query.bindValue(":type", element->linkTypeToString()); + m_insert_elements_query.bindValue(":type", element->elementData().typeToString()); m_insert_elements_query.bindValue(":sub_type", element->kindInformations()["type"].toString()); if (!m_insert_elements_query.exec()) { qDebug() << "projectDataBase::addElement insert element error : " << m_insert_elements_query.lastError(); @@ -440,7 +440,7 @@ void projectDataBase::populateElementInfoTable() for (auto *diagram : m_project->diagrams()) { ElementProvider ep(diagram); - QList elements_list = ep.find(Element::Simple | Element::Terminale | Element::Master| Element::Thumbnail); + QList elements_list = ep.find(Element::Simple | Element::Terminale | Element::Master | Element::Thumbnail); //Insert all value into the database for (auto elmt : elements_list) diff --git a/sources/dataBase/ui/elementquerywidget.cpp b/sources/dataBase/ui/elementquerywidget.cpp index be7678260..05973de22 100644 --- a/sources/dataBase/ui/elementquerywidget.cpp +++ b/sources/dataBase/ui/elementquerywidget.cpp @@ -45,7 +45,7 @@ ElementQueryWidget::ElementQueryWidget(QWidget *parent) : m_button_group.addButton(ui->m_button_cb, 3); m_button_group.addButton(ui->m_coil_cb, 4); m_button_group.addButton(ui->m_protection_cb, 5); - m_button_group.addButton(ui->m_thumbnail_cb,6); + m_button_group.addButton(ui->m_thumbnail_cb, 6); #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) // ### Qt 6: remove connect(&m_button_group, static_cast(&QButtonGroup::buttonClicked), [this](int id) #else @@ -345,7 +345,7 @@ QString ElementQueryWidget::queryStr() const } if (ui->m_thumbnail_cb->isChecked()) { if (b) where +=" OR"; - where += " element_type = 'thumbnail'"; + where += " element_type = 'Thumbnail'"; b = true; } if (ui->m_simple_cb->isChecked()) { diff --git a/sources/editor/elementscene.cpp b/sources/editor/elementscene.cpp index 59b00ac1d..2d8d7a302 100644 --- a/sources/editor/elementscene.cpp +++ b/sources/editor/elementscene.cpp @@ -467,14 +467,16 @@ const QDomDocument ElementScene::toXml(bool all_parts) auto type_ = m_element_data.m_type; if (type_ == ElementData::Slave || type_ == ElementData::Master || - type_ == ElementData::Terminale) + type_ == ElementData::Terminale || + type_ == ElementData::Thumbnail) { root.appendChild(m_element_data.kindInfoToXml(xml_document)); } if(type_ == ElementData::Simple || type_ == ElementData::Master || - type_ == ElementData::Terminale) + type_ == ElementData::Terminale|| + type_ == ElementData::Thumbnail) { QDomElement element_info = xml_document.createElement("elementInformations"); m_element_data.m_informations.toXml(element_info, "elementInformation"); diff --git a/sources/properties/elementdata.cpp b/sources/properties/elementdata.cpp index 682340e48..762bfb877 100644 --- a/sources/properties/elementdata.cpp +++ b/sources/properties/elementdata.cpp @@ -312,7 +312,7 @@ QString ElementData::typeToString(ElementData::Type type) case ElementData::Terminale : return QString("terminal"); case ElementData::Thumbnail: - return QString("thumbnail"); + return QStringLiteral("thumbnail"); default: qDebug() << "ElementData::typeToString : type don't exist" << "return failsafe value 'simple'"; @@ -334,7 +334,7 @@ ElementData::Type ElementData::typeFromString(const QString &string) return ElementData::Slave; } else if (string == "terminal") { return ElementData::Terminale; - } else if (string == "thumbnail") { + } else if (string == QLatin1String("thumbnail")) { return ElementData::Thumbnail; } diff --git a/sources/qetgraphicsitem/dynamicelementtextitem.cpp b/sources/qetgraphicsitem/dynamicelementtextitem.cpp index 328b8983c..81878b63f 100644 --- a/sources/qetgraphicsitem/dynamicelementtextitem.cpp +++ b/sources/qetgraphicsitem/dynamicelementtextitem.cpp @@ -270,6 +270,8 @@ Element *DynamicElementTextItem::elementUseForInfo() const { case Element::Simple: return elmt; + case Element::Thumbnail: + return elmt; case Element::NextReport: return elmt; case Element::PreviousReport: diff --git a/sources/qetgraphicsitem/element.cpp b/sources/qetgraphicsitem/element.cpp index d0177cdac..4c09aa1a2 100644 --- a/sources/qetgraphicsitem/element.cpp +++ b/sources/qetgraphicsitem/element.cpp @@ -1328,6 +1328,8 @@ QString Element::linkTypeToString() const return QStringLiteral("Slave"); case Terminale: return QStringLiteral("Terminale"); + case Thumbnail: + return QStringLiteral("Thumbnail"); default: return QStringLiteral("Unknown"); }