kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-02-17 16:59:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Start to revamp the code about formula and label of elements and conductors

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4791 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2016-11-24 16:45:55 +00:00
parent 543c7b6b3e
commit 60c7b9302e
11 changed files with 174 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
sources/autoNum/assignvariables.cpp
View File

@@ -20,6 +20,7 @@
#include "element.h"
#include "diagramposition.h"
#include <QVariant>
#include <QStringList>
namespace autonum
{
@@ -234,4 +235,81 @@ namespace autonum
}
}
/**
* @brief NumerotationContextToFormula
* @param nc
* @return the numerotation context, converted to formula
*/
QString NumerotationContextToFormula(const NumerotationContext &nc)
{
QString type;
QString value;
QString formula;
int count_unit = 0;
int count_unitf = 0;
int count_ten = 0;
int count_tenf = 0;
int count_hundred = 0;
int count_hundredf = 0;
for(int i=0 ; i<nc.size() ; i++)
{
type = nc.itemAt(i).at(0);
value = nc.itemAt(i).at(1);
if (type == "idfolio") {
formula.append("%id");
}
else if (type == "folio") {
formula.append("%F");
}
else if (type == "machine") {
formula.append("%M");
}
else if (type == "locmach") {
formula.append("%LM");
}
else if (type == "elementcolumn") {
formula.append("%c");
}
else if (type == "elementline") {
formula.append("%l");
}
else if (type == "elementprefix") {
formula.append("%prefix");
}
else if (type == "string") {
formula.append(value);
}
else if (type == "unit") {
count_unit++;
formula.append("%sequ_" + QString::number(count_unit));
}
else if (type == "unitfolio") {
count_unitf++;
formula.append("%sequf_" + QString::number(count_unitf));
}
else if (type == "ten") {
count_ten++;
formula.append("%seqt_" + QString::number(count_ten));
}
else if (type == "tenfolio") {
count_tenf++;
formula.append("%seqtf_" + QString::number(count_tenf));
}
else if (type == "hundred") {
count_hundred++;
formula.append("%seqh_" + QString::number(count_hundred));
}
else if (type == "hundredfolio") {
count_hundredf++;
formula.append("%seqhf_" + QString::number(count_hundredf));
}
}
return formula;
}
}

1
sources/autoNum/assignvariables.h
View File

@@ -64,6 +64,7 @@ namespace autonum
void setSequentialToList(QStringList &list, NumerotationContext &nc, QString type);
void setFolioSequentialToHash(QStringList &list, QHash<QString, QStringList> &hash, QString autoNumName);
void setSequential(QString label, autonum::sequenceStruct &seqStruct, NumerotationContext &context, Diagram *diagram, QString hashKey);
QString NumerotationContextToFormula(const NumerotationContext &nc);
}
#endif // ASSIGNVARIABLES_H

4
sources/autoNum/numerotationcontext.cpp
View File

@@ -99,7 +99,7 @@ QStringList NumerotationContext::itemAt(const int i) const {
* @return all type use to numerotation
*/
QString NumerotationContext::validRegExpNum () const {
return ("unit|unitfolio|ten|hundred|string|idfolio|folio|machine|locmach|elementline|elementcolumn|elementprefix");
return ("unit|unitfolio|ten|tenfolio|hundred|hundredfolio|string|idfolio|folio|machine|locmach|elementline|elementcolumn|elementprefix");
}
/**
@@ -107,7 +107,7 @@ QString NumerotationContext::validRegExpNum () const {
* @return all type represents a number
*/
QString NumerotationContext::validRegExpNumber() const {
return ("unit|unitfolio|ten|hundred");
return ("unit|unitfolio|ten|tenfolio|hundred|hundredfolio");
}
/**

74
sources/autoNum/ui/selectautonumw.cpp
View File

@@ -22,7 +22,7 @@
#include "numerotationcontextcommands.h"
#include "formulaautonumberingw.h"
#include "ui_formulaautonumberingw.h"
#include "qdebug.h"
#include "assignvariables.h"
/**
* Constructor
@@ -244,72 +244,18 @@ void SelectAutonumW::applyEnable(bool b) {
* @brief SelectAutonumW::contextToFormula
* Apply formula to ElementAutonumbering Widget
*/
void SelectAutonumW::contextToFormula() {
FormulaAutonumberingW* m_faw;
void SelectAutonumW::contextToFormula()
{
FormulaAutonumberingW* m_faw = nullptr;
if (this->parentWidget() -> objectName()=="ElementTab")
m_faw = m_feaw;
if (this->parentWidget()->objectName()=="ConductorTab")
else if (this->parentWidget()->objectName()=="ConductorTab")
m_faw = m_fcaw;
m_faw->clearContext();
int count_unit = 0;
int count_unitf = 0;
int count_ten = 0;
int count_tenf = 0;
int count_hundred = 0;
int count_hundredf = 0;
foreach (NumPartEditorW *npe, num_part_list_) {
if (npe->isValid()) {
if (npe->type_ == NumPartEditorW::idfolio) {
m_faw->setContext("%id");
}
else if (npe->type_ == NumPartEditorW::folio) {
m_faw->setContext("%F");
}
else if (npe->type_ == NumPartEditorW::machine) {
m_faw->setContext("%M");
}
else if (npe->type_ == NumPartEditorW::locmach) {
m_faw->setContext("%LM");
}
else if (npe->type_ == NumPartEditorW::elementcolumn) {
m_faw->setContext("%c");
}
else if (npe->type_ == NumPartEditorW::elementline) {
m_faw->setContext("%l");
}
else if (npe->type_ == NumPartEditorW::elementprefix) {
m_faw->setContext("%prefix");
}
else if (npe->type_ == NumPartEditorW::string) {
m_faw->setContext(npe->toNumContext().itemAt(0).at(1));
}
else if (npe->type_ == NumPartEditorW::unit) {
count_unit++;
m_faw->setContext("%sequ_"+QString::number(count_unit));
}
else if (npe->type_ == NumPartEditorW::unitfolio) {
count_unitf++;
m_faw->setContext("%sequf_"+QString::number(count_unitf));
}
else if (npe->type_ == NumPartEditorW::ten) {
count_ten++;
m_faw->setContext("%seqt_"+QString::number(count_ten));
}
else if (npe->type_ == NumPartEditorW::tenfolio) {
count_tenf++;
m_faw->setContext("%seqtf_"+QString::number(count_tenf));
}
else if (npe->type_ == NumPartEditorW::hundred) {
count_hundred++;
m_faw->setContext("%seqh_"+QString::number(count_hundred));
}
else if (npe->type_ == NumPartEditorW::hundredfolio) {
count_hundredf++;
m_faw->setContext("%seqhf_"+QString::number(count_hundredf));
}
}
if (m_faw)
{
m_faw->clearContext();
m_faw->setContext(autonum::NumerotationContextToFormula(toNumContext()));
}
}