Minor : fix little regression about folio report and displayed information

This commit is contained in:
Claveau Joshua
2020-11-08 19:05:11 +01:00
parent 862dbede24
commit 7882c5734a
4 changed files with 123 additions and 56 deletions

View File

@@ -18,9 +18,22 @@
#include <QObject>
#include <QHash>
#include "qetinformation.h"
/** Default information related to element **/
static QString ELMT_LABEL = "label";
static QString ELMT_LABEL_VAR = "%{label}";
/** Default information related to conductor **/
static QString COND_FUNCTION = "function";
static QString COND_FUNCTION_VAR = "%{function}";
static QString COND_TENSION_PROTOCOL = "tension/protocol";
static QString COND_TENSION_PROTOCOL_var = "%{tension/protocol}";
static QString COND_COLOR = "conductor_color";
static QString COND_COLOR_VAR = "%{conductor_color}";
static QString COND_SECTION = "conductor_section";
static QString COND_SECTION_var = "%{conductor_section}";
/**
@brief QETInformation::titleblockInfoKeys
@return all available key for use with a titleblock
@@ -60,31 +73,8 @@ QStringList QETInformation::titleblockInfoKeys()
@return the translated information given by info
If info don't match, return an empty string
*/
QString QETInformation::titleblockTranslatedInfoKey(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");
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");
else if (info == "folio-total") return QObject::tr("Nombre de folio");
else if (info == "previous-folio-num") return QObject::tr("Numéro du folio précédent");
else if (info == "next-folio-num") return QObject::tr("Numéro du folio suivant");
else if (info == "projecttitle") return QObject::tr("Titre du projet");
else if (info == "projectpath") return QObject::tr("Chemin du fichier du projet");
else if (info == "projectfilename") return QObject::tr("Nom du fichier");
else if (info == "saveddate") return QObject::tr("Date d'enregistrement du fichier format local");
else if (info == "saveddate-eu") return QObject::tr("Date d'enregistrement du fichier format dd-MM-yyyy");
else if (info == "saveddate-us") return QObject::tr("Date d'enregistrement du fichier format yyyy-MM-dd");
else if (info == "savedtime") return QObject::tr("Heure d'enregistrement du fichier");
else if (info == "savedfilename") return QObject::tr("Nom du fichier enregistré");
else if (info == "savedfilepath") return QObject::tr("Chemin du fichier enregistré");
else return QString();
QString QETInformation::titleblockTranslatedInfoKey(const QString &info) {
return translatedInfoKey(info);
}
/**
@@ -133,3 +123,86 @@ QHash<QString, QString> QETInformation::titleblockTranslatedKeyHashVar()
}
return hash_;
}
/**
* @brief QETInformation::folioReportInfoKey
* @return The info key available for dynamic element text item of a folio report
*/
QStringList QETInformation::folioReportInfoKey()
{
QStringList list;
list << ELMT_LABEL;
list << COND_FUNCTION;
list << COND_TENSION_PROTOCOL;
list << COND_COLOR;
list << COND_SECTION;
return list;
}
QHash<QString, QString> QETInformation::folioReportInfoKeyToVar()
{
QHash <QString, QString> H_;
H_.insert(ELMT_LABEL, ELMT_LABEL_VAR);
H_.insert(COND_FUNCTION, COND_FUNCTION_VAR);
H_.insert(COND_TENSION_PROTOCOL, COND_TENSION_PROTOCOL_var);
H_.insert(COND_COLOR, COND_COLOR_VAR);
H_.insert(COND_SECTION, COND_SECTION_var);
return H_;
}
/**
* @brief QETInformation::translatedInfoKey
* @param info
* @return the information translated to the current local.
* This function translate all information : element, conductor, diagram
* Return an empty QString if don't match
*/
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");
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");
else if (info == "folio-total") return QObject::tr("Nombre de folio");
else if (info == "previous-folio-num") return QObject::tr("Numéro du folio précédent");
else if (info == "next-folio-num") return QObject::tr("Numéro du folio suivant");
else if (info == "projecttitle") return QObject::tr("Titre du projet");
else if (info == "projectpath") return QObject::tr("Chemin du fichier du projet");
else if (info == "projectfilename") return QObject::tr("Nom du fichier");
else if (info == "saveddate") return QObject::tr("Date d'enregistrement du fichier format local");
else if (info == "saveddate-eu") return QObject::tr("Date d'enregistrement du fichier format dd-MM-yyyy");
else if (info == "saveddate-us") return QObject::tr("Date d'enregistrement du fichier format yyyy-MM-dd");
else if (info == "savedtime") return QObject::tr("Heure d'enregistrement du fichier");
else if (info == "savedfilename") return QObject::tr("Nom du fichier enregistré");
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");
else if (info == "auxiliary2") return QObject::tr("Bloc auxiliaire 2");
else if (info == "description") return QObject::tr("Description textuelle");
else if (info == "designation") return QObject::tr("Numéro d'article");
else if (info == "manufacturer") return QObject::tr("Fabricant");
else if (info == "manufacturer_reference") return QObject::tr("Numéro de commande");
else if (info == "machine_manufacturer_reference") return QObject::tr("Numéro interne");
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");
else if (info == COND_SECTION) return QObject::tr("Section du fil");
else return QString();
}