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

Add new description field

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5059 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2017-10-02 16:59:53 +00:00
parent ecd33d36c7
commit 9c24163556
5 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sources/autoNum/assignvariables.cpp
View File

@@ -167,6 +167,7 @@ namespace autonum
QString str = formula;
str.replace("%{label}", dc.value("label").toString());
str.replace("%{comment}", dc.value("comment").toString());
str.replace("%{description}", dc.value("description").toString());
str.replace("%{designation}", dc.value("designation").toString());
str.replace("%{manufacturer}", dc.value("manufacturer").toString());
str.replace("%{manufacturer-reference}", dc.value("manufacturer-reference").toString());

1
sources/diagramcontext.h
View File

@@ -34,6 +34,7 @@
* label -> label or identification of element
* formula -> formula used to create the label (formula is make with variable)
* designation -> exhaustive comment used to explain what the element does.
* description -> exhaustive description used to explain what the element does.
* comment -> a little comment wich can be displayed in the folio
* manufacturer -> the manufacturer of the element
* manufacturer-reference -> the manufacturer reference of the element

2
sources/editor/ui/elementpropertieseditorwidget.cpp
View File

@@ -152,7 +152,7 @@ void ElementPropertiesEditorWidget::updateTree()
*/
void ElementPropertiesEditorWidget::populateTree()
{
QStringList keys{"label", "comment", "designation", "manufacturer", "manufacturer-reference", "machine-manufacturer-reference"};
QStringList keys{"label", "comment", "description", "designation", "manufacturer", "manufacturer-reference", "machine-manufacturer-reference"};
for(QString key : keys)
{

2
sources/nomenclature.cpp
View File

@@ -91,6 +91,7 @@ QString nomenclature::getNomenclature()
""+ QObject::tr("Position") +";"
""+ QObject::tr("Label") +";"
""+ QObject::tr("Désignation") +";"
""+ QObject::tr("Description") +";"
""+ QObject::tr("Commentaire") +";"
""+ QObject::tr("Fabricant") +";"
""+ QObject::tr("Reference") +";"
@@ -147,6 +148,7 @@ QString nomenclature::getElementInfo(Element *elmt) {
info += elmt-> diagram()-> convertPosition(elmt -> scenePos()).toString() + ";";
info += autonum::AssignVariables::formulaToLabel(elmt_info["label"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";";
info += autonum::AssignVariables::formulaToLabel(elmt_info["designation"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";";
info += autonum::AssignVariables::formulaToLabel(elmt_info["description"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";";
info += autonum::AssignVariables::formulaToLabel(elmt_info["comment"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";";
info += autonum::AssignVariables::formulaToLabel(elmt_info["manufacturer"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";";
info += autonum::AssignVariables::formulaToLabel(elmt_info["manufacturer-reference"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";";

3
sources/qetapp.cpp
View File

@@ -284,6 +284,7 @@ QStringList QETApp::elementInfoKeys()
info_list << "formula"
<< "label"
<< "comment"
<< "description"
<< "designation"
<< "manufacturer"
<< "manufacturer-reference"
@@ -307,6 +308,7 @@ QString QETApp::elementTranslatedInfoKey(const QString &info)
if (info == "formula") return tr("formule du label");
else if (info == "label") return tr("Label");
else if (info == "comment") return tr("Commentaire");
else if (info == "descrition") return tr("Descrition");
else if (info == "designation") return tr("Désignation");
else if (info == "manufacturer") return tr("Fabricant");
else if (info == "manufacturer-reference") return tr("Référence fabricant");
@@ -330,6 +332,7 @@ QString QETApp::elementInfoToVar(const QString &info)
if (info == "formula") return QString("%{formula}");
else if (info == "label") return QString("%{label}");
else if (info == "comment") return QString("%{comment}");
else if (info == "description") return QString("%{description}");
else if (info == "designation") return QString("%{designation}");
else if (info == "manufacturer") return QString("%{manufacturer}");
else if (info == "manufacturer-reference") return QString("%{manufacturer-reference}");