diff --git a/sources/SearchAndReplace/ui/replaceadvanceddialog.cpp b/sources/SearchAndReplace/ui/replaceadvanceddialog.cpp index b8b62dee5..1174a7ae4 100644 --- a/sources/SearchAndReplace/ui/replaceadvanceddialog.cpp +++ b/sources/SearchAndReplace/ui/replaceadvanceddialog.cpp @@ -94,8 +94,8 @@ void replaceAdvancedDialog::fillWhatComboBox(int index) if (index == 0) { - for (QString str : QETApp::diagramInfoKeys()) { - ui->m_what_cb->addItem(QETApp::diagramTranslatedInfoKey(str), str); + for (QString str : QETInformation::diagramInfoKeys()) { + ui->m_what_cb->addItem(QETInformation::translatedInfoKey(str), str); } } else if (index == 1) { diff --git a/sources/dataBase/projectdatabase.cpp b/sources/dataBase/projectdatabase.cpp index d234acbe5..e81a766f3 100644 --- a/sources/dataBase/projectdatabase.cpp +++ b/sources/dataBase/projectdatabase.cpp @@ -22,6 +22,7 @@ #include "element.h" #include "diagram.h" #include "diagramposition.h" +#include "qetinformation.h" #include #include @@ -268,7 +269,7 @@ bool projectDataBase::createDataBase() //Create the diagram info table QString diagram_info_table("CREATE TABLE diagram_info (diagram_uuid VARCHAR(50) PRIMARY KEY NOT NULL, "); first_ = true; - for (auto string : QETApp::diagramInfoKeys()) + for (auto string : QETInformation::diagramInfoKeys()) { if (first_) { first_ = false; @@ -471,11 +472,11 @@ void projectDataBase::prepareQuery() //INSERT DIAGRAM INFO m_insert_diagram_info_query = QSqlQuery(m_data_base); QStringList bind_diag_info_values; - for (auto key : QETApp::diagramInfoKeys()) { + for (auto key : QETInformation::diagramInfoKeys()) { bind_diag_info_values << key.prepend(":"); } QString insert_diag_info("INSERT INTO diagram_info (diagram_uuid, " + - QETApp::diagramInfoKeys().join(", ") + + QETInformation::diagramInfoKeys().join(", ") + ") VALUES (:uuid, " + bind_diag_info_values.join(", ") + ")"); @@ -483,7 +484,7 @@ void projectDataBase::prepareQuery() //UPDATE DIAGRAM INFO QString update_diagram_str("UPDATE diagram_info SET "); - for (auto str : QETApp::diagramInfoKeys()) { + for (auto str : QETInformation::diagramInfoKeys()) { update_diagram_str.append(str + " = :" + str + ", "); } update_diagram_str.remove(update_diagram_str.length()-2, 2); //Remove the last ", " @@ -558,7 +559,7 @@ void projectDataBase::bindDiagramInfoValues(QSqlQuery &query, Diagram *diagram) query.bindValue(":uuid", diagram->uuid()); auto infos = diagram->border_and_titleblock.titleblockInformation(); - for (auto key : QETApp::diagramInfoKeys()) + for (auto key : QETInformation::diagramInfoKeys()) { if (key == "date") { query.bindValue( ":date", diff --git a/sources/dataBase/ui/summaryquerywidget.cpp b/sources/dataBase/ui/summaryquerywidget.cpp index 3fc7e5b72..2a33832d1 100644 --- a/sources/dataBase/ui/summaryquerywidget.cpp +++ b/sources/dataBase/ui/summaryquerywidget.cpp @@ -18,6 +18,7 @@ #include "summaryquerywidget.h" #include "ui_summaryquerywidget.h" #include "qetapp.h" +#include "qetinformation.h" #include @@ -121,12 +122,12 @@ void SummaryQueryWidget::setQuery(const QString &query) */ void SummaryQueryWidget::setUpItems() { - for (auto key : QETApp::diagramInfoKeys()) + for (auto key : QETInformation::diagramInfoKeys()) { if (key == "filename" || key == "display_folio") { continue; } - auto item = new QListWidgetItem(QETApp::diagramTranslatedInfoKey(key), ui->m_available_list); + auto item = new QListWidgetItem(QETInformation::translatedInfoKey(key), ui->m_available_list); item->setData(Qt::UserRole, key); m_items_list << item; } diff --git a/sources/qetapp.cpp b/sources/qetapp.cpp index 29044146b..a8446857e 100644 --- a/sources/qetapp.cpp +++ b/sources/qetapp.cpp @@ -427,46 +427,6 @@ QString QETApp::elementInfoToVar(const QString &info) return (QString ("%{void}")); } -/** - @brief QETApp::diagramInfoKeys - @return the diagram default default information keys -*/ -QStringList QETApp::diagramInfoKeys() -{ - QStringList list; - list.append("title"); - list.append("author"); - list.append("filename"); - list.append("folio"); - list.append("plant"); - list.append("locmach"); - list.append("indexrev"); - list.append("date"); - list.append("display_folio"); - - return list; -} - -/** - @brief QETApp::diagramTranslatedInfoKey - @param key - @return the translated information key given by key - If key don't match, return an empty string -*/ -QString QETApp::diagramTranslatedInfoKey(const QString &key) -{ - if (key == "title") return tr("Titre"); - else if (key == "author") return tr("Auteur"); - else if (key == "filename") return tr("Fichier"); - else if (key == "folio") return tr("Folio"); - else if (key == "plant") return tr("Installation"); - else if (key == "locmach") return tr("Localisation"); - else if (key == "indexrev") return tr("Indice de révision"); - else if (key == "date") return tr("Date"); - else if (key == "pos") return tr("Position"); - else return QString(); -} - /** @brief QETApp::commonTitleBlockTemplatesCollection @return the common title block templates collection, diff --git a/sources/qetapp.h b/sources/qetapp.h index 3f14b22f1..e33841afc 100644 --- a/sources/qetapp.h +++ b/sources/qetapp.h @@ -76,9 +76,6 @@ class QETApp : public QObject static QStringList elementInfoKeys(); static QString elementInfoToVar(const QString &info); - static QStringList diagramInfoKeys(); - static QString diagramTranslatedInfoKey(const QString &key); - static TitleBlockTemplatesFilesCollection *commonTitleBlockTemplatesCollection(); static TitleBlockTemplatesFilesCollection *customTitleBlockTemplatesCollection(); static QList availableTitleBlockTemplatesCollections(); diff --git a/sources/qetgraphicsitem/ViewItem/projectdbmodel.cpp b/sources/qetgraphicsitem/ViewItem/projectdbmodel.cpp index fdbff41ee..a69fa1995 100644 --- a/sources/qetgraphicsitem/ViewItem/projectdbmodel.cpp +++ b/sources/qetgraphicsitem/ViewItem/projectdbmodel.cpp @@ -350,9 +350,6 @@ void ProjectDBModel::setHeaderString() header_name = tr("Position du folio"); } else { header_name = QETInformation::translatedInfoKey(field_name); - if (header_name.isEmpty()) { - header_name = QETApp::diagramTranslatedInfoKey(field_name); - } if (header_name.isEmpty()) { header_name = field_name; } diff --git a/sources/qetinformation.cpp b/sources/qetinformation.cpp index cfa3d4557..0addfc051 100644 --- a/sources/qetinformation.cpp +++ b/sources/qetinformation.cpp @@ -38,6 +38,27 @@ static QString COND_FORMULA_VAR = "%{formula}"; static QString COND_TEXT = "text"; static QString COND_TEXT_VAR = "%{text}"; +/** Default information related to diagram **/ +static QString DIA_AUTHOR = "author"; +static QString DIA_AUTHOR_VAR = "%{author}"; +static QString DIA_DATE = "date"; +static QString DIA_DATE_VAR = "%{date}"; +static QString DIA_DISPLAY_FOLIO = "display_folio"; +static QString DIA_DISPLAY_FOLIO_VAR = "%{display_folio}"; +static QString DIA_FILENAME = "filename"; +static QString DIA_FILENAME_VAR = "%{filename}"; +static QString DIA_FOLIO = "folio"; +static QString DIA_FOLIO_VAR = "%{folio}"; +static QString DIA_INDEX_REV = "indexrev"; +static QString DIA_INDEX_REV_VAR = "%{indexrev}"; +static QString DIA_LOCMACH = "locmach"; +static QString DIA_LOCMACH_VAR = "%{locmach}"; +static QString DIA_PLANT = "plant"; +static QString DIA_PLANT_VAR = "%{plant}"; +static QString DIA_POS = "pos"; +static QString DIA_POS_VAR = "%{pos}"; +static QString DIA_TITLE = "title"; +static QString DIA_TITLE_VAR = "%{title}"; /** @brief QETInformation::titleblockInfoKeys @@ -46,15 +67,15 @@ static QString COND_TEXT_VAR = "%{text}"; QStringList QETInformation::titleblockInfoKeys() { QStringList info_list; - info_list << "author"; - info_list << "date"; - info_list << "title"; - info_list << "filename"; - info_list << "plant"; - info_list << "locmach"; - info_list << "indexrev"; + info_list << DIA_AUTHOR; + info_list << DIA_DATE; + info_list << DIA_TITLE; + info_list << DIA_FILENAME; + info_list << DIA_PLANT; + info_list << DIA_LOCMACH; + info_list << DIA_INDEX_REV; info_list << "version"; - info_list << "folio"; + info_list << DIA_FOLIO; info_list << "folio-id"; info_list << "folio-total"; info_list << "previous-folio-num"; @@ -80,15 +101,15 @@ QStringList QETInformation::titleblockInfoKeys() */ QString QETInformation::titleblockInfoKeysToVar(const QString &info) { - if (info == "author") return QString("%{author}"); - else if (info == "date") return QString("%{date}"); - else if (info == "title") return QString("%{title}"); - else if (info == "filename") return QString("%{filename}"); - else if (info == "plant") return QString("%{plant}"); - else if (info == "locmach") return QString("%{locmach}"); - else if (info == "indexrev") return QString("%{indexrev}"); + if (info == DIA_AUTHOR) return DIA_AUTHOR_VAR; + else if (info == DIA_DATE) return DIA_DATE_VAR; + else if (info == DIA_TITLE) return DIA_TITLE_VAR; + else if (info == DIA_FILENAME) return DIA_FILENAME_VAR; + else if (info == DIA_PLANT) return DIA_PLANT_VAR; + else if (info == DIA_LOCMACH) return DIA_LOCMACH_VAR; + else if (info == DIA_INDEX_REV) return DIA_INDEX_REV_VAR; else if (info == "version") return QString("%{version}"); - else if (info == "folio") return QString("%{folio}"); + else if (info == DIA_FOLIO) return DIA_FOLIO_VAR; else if (info == "folio-id") return QString("%{folio-id}"); else if (info == "folio-total") return QString("%{folio-total}"); else if (info == "previous-folio-num") return QString("%{previous-folio-num}"); @@ -102,7 +123,7 @@ QString QETInformation::titleblockInfoKeysToVar(const QString &info) else if (info == "savedtime") return QString("%{savedtime}"); else if (info == "savedfilename") return QString("%{savedfilename}"); else if (info == "savedfilepath") return QString("%{savedfilepath}"); - else return QString("%{void"); + else return QString("%{void}"); } /** @@ -157,6 +178,20 @@ QStringList QETInformation::conductorInfoKeys() return list; } +QStringList QETInformation::diagramInfoKeys() +{ + QStringList list = {DIA_TITLE, + DIA_AUTHOR, + DIA_FILENAME, + DIA_FOLIO, + DIA_PLANT, + DIA_LOCMACH, + DIA_INDEX_REV, + DIA_DATE, + DIA_DISPLAY_FOLIO}; + return list; +} + /** * @brief QETInformation::translatedInfoKey * @param info @@ -166,13 +201,14 @@ QStringList QETInformation::conductorInfoKeys() */ QString QETInformation::translatedInfoKey(const QString &info) { - if (info == "author") return QObject::tr("Auteur"); - else if (info == "date") return QObject::tr("Date"); - else if (info == "title") return QObject::tr("Titre"); - else if (info == "filename") return QObject::tr("Fichier"); - else if (info == "plant") return QObject::tr("Installation (=)"); - else if (info == "locmach") return QObject::tr("Localisation (+)"); - else if (info == "indexrev") return QObject::tr("Indice de révision"); + if (info == DIA_AUTHOR) return QObject::tr("Auteur"); + else if (info == DIA_DATE) return QObject::tr("Date"); + else if (info == DIA_TITLE) return QObject::tr("Titre"); + else if (info == DIA_FILENAME) return QObject::tr("Fichier"); + else if (info == DIA_PLANT) return QObject::tr("Installation (=)"); + else if (info == DIA_LOCMACH) return QObject::tr("Localisation (+)"); + else if (info == DIA_INDEX_REV) return QObject::tr("Indice de révision"); + else if (info == DIA_POS) return QObject::tr("Position"); else if (info == "version") return QObject::tr("Version de QElectroTech"); else if (info == "folio") return QObject::tr("Numéro de folio"); else if (info == "folio-id") return QObject::tr("Position du folio"); @@ -190,8 +226,6 @@ QString QETInformation::translatedInfoKey(const QString &info) else if (info == "savedfilepath") return QObject::tr("Chemin du fichier enregistré"); else if (info == "formula") return QObject::tr("Formule du label"); else if (info == ELMT_LABEL) return QObject::tr("Label"); - else if (info == "plant") return QObject::tr("Installation"); - else if (info == "location") return QObject::tr("Localisation"); else if (info == "comment") return QObject::tr("Commentaire"); else if (info == "function") return QObject::tr("Fonction"); else if (info == "auxiliary1") return QObject::tr("Bloc auxiliaire 1"); @@ -204,8 +238,6 @@ QString QETInformation::translatedInfoKey(const QString &info) else if (info == "supplier") return QObject::tr("Fournisseur"); else if (info == "quantity") return QObject::tr("Quantité"); else if (info == "unity") return QObject::tr("Unité"); - else if (info == "formula") return QObject::tr("Formule du texte"); - else if (info == "text") return QObject::tr("Texte"); else if (info == COND_FUNCTION) return QObject::tr("Fonction"); else if (info == COND_TENSION_PROTOCOL) return QObject::tr("Tension / Protocole"); else if (info == COND_COLOR) return QObject::tr("Couleur du fil"); diff --git a/sources/qetinformation.h b/sources/qetinformation.h index 5da696dac..b7ddb9d05 100644 --- a/sources/qetinformation.h +++ b/sources/qetinformation.h @@ -38,6 +38,7 @@ namespace QETInformation QStringList folioReportInfoKeys(); QHash folioReportInfoKeyToVar(); QStringList conductorInfoKeys(); + QStringList diagramInfoKeys(); QString translatedInfoKey(const QString &info); } diff --git a/sources/ui/bomexportdialog.cpp b/sources/ui/bomexportdialog.cpp index d510b77c8..23dd7e8aa 100644 --- a/sources/ui/bomexportdialog.cpp +++ b/sources/ui/bomexportdialog.cpp @@ -124,9 +124,6 @@ QString BOMExportDialog::getBom() header_name << tr("Quantité numéro d'article", "Special field with name : designation quantity"); } else { header_name << QETInformation::translatedInfoKey(field_name); - if (header_name.isEmpty()) { - header_name << QETApp::diagramTranslatedInfoKey(field_name); - } if (header_name.isEmpty()) { header_name << field_name; }