diff --git a/sources/SearchAndReplace/searchandreplaceworker.cpp b/sources/SearchAndReplace/searchandreplaceworker.cpp index ca97b34a1..9e329cbfb 100644 --- a/sources/SearchAndReplace/searchandreplaceworker.cpp +++ b/sources/SearchAndReplace/searchandreplaceworker.cpp @@ -94,13 +94,6 @@ void SearchAndReplaceWorker::replaceDiagram(QList diagram_list) } else { new_properties.machine = m_titleblock_properties.machine; } - }if (!m_titleblock_properties.funcgroup.isEmpty()) - { - if (m_titleblock_properties.funcgroup == eraseText()) { - new_properties.funcgroup.clear(); - } else { - new_properties.funcgroup = m_titleblock_properties.funcgroup; - } } if (!m_titleblock_properties.locmach.isEmpty()) { diff --git a/sources/SearchAndReplace/ui/replacefoliowidget.cpp b/sources/SearchAndReplace/ui/replacefoliowidget.cpp index 3a95b24df..0533f9232 100644 --- a/sources/SearchAndReplace/ui/replacefoliowidget.cpp +++ b/sources/SearchAndReplace/ui/replacefoliowidget.cpp @@ -47,7 +47,6 @@ TitleBlockProperties ReplaceFolioWidget::titleBlockProperties() const prop.author = ui->m_author_le->text(); prop.filename = ui->m_file_le ->text(); prop.machine = ui->m_mach ->text(); - prop.funcgroup= ui->m_group_f ->text(); prop.locmach = ui->m_loc ->text(); prop.indexrev = ui->m_indice ->text(); prop.folio = ui->m_folio_le ->text(); @@ -80,7 +79,6 @@ void ReplaceFolioWidget::setTitleBlockProperties(const TitleBlockProperties &pro ui->m_author_le->setText (properties.author); ui->m_file_le ->setText (properties.filename); ui->m_mach ->setText (properties.machine); - ui->m_group_f ->setText (properties.funcgroup); ui->m_loc ->setText (properties.locmach); ui->m_indice ->setText (properties.indexrev); ui->m_folio_le ->setText (properties.folio); @@ -169,11 +167,6 @@ void ReplaceFolioWidget::on_m_mach_cb_clicked() { ui->m_mach->setDisabled(ui->m_mach_cb->isChecked()); } -void ReplaceFolioWidget::on_m_group_f_cb_clicked() { - ui->m_group_f->setText(ui->m_group_f_cb->isChecked() ? SearchAndReplaceWorker::eraseText() : QString()); - ui->m_group_f->setDisabled(ui->m_group_f_cb->isChecked()); -} - void ReplaceFolioWidget::on_m_loc_cb_clicked() { ui->m_loc->setText(ui->m_loc_cb->isChecked() ? SearchAndReplaceWorker::eraseText() : QString()); ui->m_loc->setDisabled(ui->m_loc_cb->isChecked()); @@ -183,5 +176,3 @@ void ReplaceFolioWidget::on_m_indice_cb_clicked() { ui->m_indice->setText(ui->m_indice_cb->isChecked() ? SearchAndReplaceWorker::eraseText() : QString()); ui->m_indice->setDisabled(ui->m_indice_cb->isChecked()); } - - diff --git a/sources/SearchAndReplace/ui/replacefoliowidget.h b/sources/SearchAndReplace/ui/replacefoliowidget.h index 1bee8728a..a529221e5 100644 --- a/sources/SearchAndReplace/ui/replacefoliowidget.h +++ b/sources/SearchAndReplace/ui/replacefoliowidget.h @@ -48,15 +48,10 @@ class ReplaceFolioWidget : public QWidget void on_m_file_cb_clicked(); void on_m_folio_cb_clicked(); void on_m_mach_cb_clicked(); - void on_m_group_f_cb_clicked(); void on_m_loc_cb_clicked(); void on_m_indice_cb_clicked(); - - - - - private: + private: Ui::ReplaceFolioWidget *ui; DiagramContextWidget *m_diagram_context_widget = nullptr; diff --git a/sources/SearchAndReplace/ui/replacefoliowidget.ui b/sources/SearchAndReplace/ui/replacefoliowidget.ui index 2ee113661..d6bf9b1da 100644 --- a/sources/SearchAndReplace/ui/replacefoliowidget.ui +++ b/sources/SearchAndReplace/ui/replacefoliowidget.ui @@ -7,7 +7,7 @@ 0 0 449 - 431 + 389 @@ -305,23 +305,6 @@ Les variables suivantes sont utilisables : - - - - - - - Groupe fonctionnel - - - - - - - - - - diff --git a/sources/autoNum/assignvariables.cpp b/sources/autoNum/assignvariables.cpp index 9090b6a47..dbe6ef2bd 100644 --- a/sources/autoNum/assignvariables.cpp +++ b/sources/autoNum/assignvariables.cpp @@ -187,7 +187,6 @@ namespace autonum str.replace("%{auxiliary1}", dc.value("auxiliary1").toString()); str.replace("%{auxiliary2}", dc.value("auxiliary2").toString()); str.replace("%{machine-manufacturer-reference}", dc.value("machine-manufacturer-reference").toString()); - str.replace("%{function-group}", dc.value("function-group").toString()); str.replace("%{location}", dc.value("location").toString()); str.replace("%{function}", dc.value("function").toString()); str.replace("%{void}", QString()); @@ -211,7 +210,6 @@ namespace autonum m_assigned_label.replace("%id", QString::number(m_diagram->folioIndex()+1)); m_assigned_label.replace("%total", QString::number(m_diagram->border_and_titleblock.folioTotal())); m_assigned_label.replace("%M", m_diagram -> border_and_titleblock.machine()); - m_assigned_label.replace("%FG",m_diagram ->border_and_titleblock.funcgroup()); m_assigned_label.replace("%LM", m_diagram -> border_and_titleblock.locmach()); QSettings settings; @@ -428,9 +426,6 @@ namespace autonum else if (type == "machine") { formula.append("%M"); } - else if (type == "funcgroup") { - formula.append("%FG"); - } else if (type == "locmach") { formula.append("%LM"); } diff --git a/sources/autoNum/numerotationcontext.cpp b/sources/autoNum/numerotationcontext.cpp index a60fb7cfd..92ebc2133 100644 --- a/sources/autoNum/numerotationcontext.cpp +++ b/sources/autoNum/numerotationcontext.cpp @@ -101,7 +101,7 @@ QStringList NumerotationContext::itemAt(const int i) const { * @return all type use to numerotation */ QString NumerotationContext::validRegExpNum () const { - return ("unit|unitfolio|ten|tenfolio|hundred|hundredfolio|string|idfolio|folio|machine|funcgroup|locmach|elementline|elementcolumn|elementprefix"); + return ("unit|unitfolio|ten|tenfolio|hundred|hundredfolio|string|idfolio|folio|machine|locmach|elementline|elementcolumn|elementprefix"); } /** diff --git a/sources/autoNum/numerotationcontextcommands.cpp b/sources/autoNum/numerotationcontextcommands.cpp index 685508f9a..6c16a6bcf 100644 --- a/sources/autoNum/numerotationcontextcommands.cpp +++ b/sources/autoNum/numerotationcontextcommands.cpp @@ -128,11 +128,6 @@ void NumerotationContextCommands::setNumStrategy(const QString &str) { strategy_ = new MachineNum (diagram_); return; } - - else if (str=="funcgroup"){ - strategy_ = new FuncgroupNum (diagram_); - return; - } else if (str=="locmach"){ strategy_ = new LocmachNum (diagram_); return; @@ -534,39 +529,6 @@ NumerotationContext MachineNum::previous(const NumerotationContext &nc, const in } -/** - * Constructor - */ -FuncgroupNum::FuncgroupNum (Diagram *d): - NumStrategy (d) -{} - -/** - * @brief FuncgroupNum::toRepresentedString - * @return the represented string of folio - */ -QString FuncgroupNum::toRepresentedString(const QString str) const { - Q_UNUSED(str); - return "%FG"; -} - -/** - * @brief FuncgroupNum::next - * @return the next NumerotationContext nc at position i - */ -NumerotationContext FuncgroupNum::next (const NumerotationContext &nc, const int i) const { - return (nextString(nc, i)); -} - -/** - * @brief FuncgroupNum::previous - * @return the previous NumerotationContext nc at posiiton i - */ -NumerotationContext FuncgroupNum::previous(const NumerotationContext &nc, const int i) const { - return (nextString(nc, i)); -} - - /** * Constructor */ diff --git a/sources/autoNum/numerotationcontextcommands.h b/sources/autoNum/numerotationcontextcommands.h index b1bec50ae..4bd71a080 100644 --- a/sources/autoNum/numerotationcontextcommands.h +++ b/sources/autoNum/numerotationcontextcommands.h @@ -150,15 +150,6 @@ class MachineNum: public NumStrategy NumerotationContext previous (const NumerotationContext &, const int) const override; }; -class FuncgroupNum: public NumStrategy -{ - public: - FuncgroupNum (Diagram *); - QString toRepresentedString(const QString) const override; - NumerotationContext next (const NumerotationContext &, const int) const override; - NumerotationContext previous (const NumerotationContext &, const int) const override; -}; - class LocmachNum: public NumStrategy { public: diff --git a/sources/autoNum/ui/numparteditorw.cpp b/sources/autoNum/ui/numparteditorw.cpp index dffa42a08..9257247dd 100644 --- a/sources/autoNum/ui/numparteditorw.cpp +++ b/sources/autoNum/ui/numparteditorw.cpp @@ -59,7 +59,6 @@ NumPartEditorW::NumPartEditorW (NumerotationContext &context, int i, int type, Q else if (strl.at(0)=="idfolio") setType(NumPartEditorW::idfolio); else if (strl.at(0)=="folio") setType(NumPartEditorW::folio); else if (strl.at(0)=="machine") setType(NumPartEditorW::machine); - else if (strl.at(0)=="funcgroup") setType(NumPartEditorW::funcgroup); else if (strl.at(0)=="locmach") setType(NumPartEditorW::locmach); else if (strl.at(0)=="elementline") setType(NumPartEditorW::elementline); else if (strl.at(0)=="elementcolumn") setType(NumPartEditorW::elementcolumn); @@ -92,12 +91,12 @@ void NumPartEditorW::setVisibleItems() { items << tr("Chiffre 1") << tr("Chiffre 1 - Folio") << tr("Chiffre 01") << tr("Chiffre 01 - Folio") << tr("Chiffre 001") << tr("Chiffre 001 - Folio") - << tr("Texte") << tr("N° folio") << tr("Folio") << tr("Machine") << tr("Funcgroup") << tr("Locmach"); + << tr("Texte") << tr("N° folio") << tr("Folio") << tr("Machine") << tr("Locmach"); } else items << tr("Chiffre 1") << tr("Chiffre 1 - Folio") << tr("Chiffre 01") << tr("Chiffre 01 - Folio") << tr("Chiffre 001") << tr("Chiffre 001 - Folio") - << tr("Texte") << tr("N° folio") << tr("Folio") << tr("Machine") << tr("Funcgroup") << tr("Locmach") + << tr("Texte") << tr("N° folio") << tr("Folio") << tr("Machine") << tr("Locmach") << tr("Element Line") << tr("Element Column") << tr("Element Prefix"); ui->type_cb->insertItems(0,items); } @@ -140,9 +139,6 @@ NumerotationContext NumPartEditorW::toNumContext() { case machine: type_str = "machine"; break; - case funcgroup: - type_str = "funcgroup"; - break; case locmach: type_str = "locmach"; break; @@ -168,7 +164,7 @@ NumerotationContext NumPartEditorW::toNumContext() { * @return true if value field isn't empty or if type is folio */ bool NumPartEditorW::isValid() { - if (type_ == folio || type_ == idfolio || type_ == elementline || type_ == machine || type_ == funcgroup || type_ == locmach || + if (type_ == folio || type_ == idfolio || type_ == elementline || type_ == machine || type_ == locmach || type_ == elementcolumn || type_ == elementprefix) {return true;} else if(ui -> value_field -> text().isEmpty()) {return false;} else return true; @@ -199,8 +195,6 @@ void NumPartEditorW::on_type_cb_activated(int) { setType(folio); else if (ui->type_cb->currentText() == tr("Machine")) setType(machine); - else if (ui->type_cb->currentText() == tr("Funcgroup")) - setType(funcgroup); else if (ui->type_cb->currentText() == tr("Locmach")) setType(locmach); else if (ui->type_cb->currentText() == tr("Element Line")) @@ -240,7 +234,7 @@ void NumPartEditorW::setType(NumPartEditorW::type t, bool fnum) { //if @t is a numeric type and preview type @type_ isn't a numeric type //or @fnum is true, we set numeric behavior if ( ((t==unit || t==unitfolio || t==ten || t==tenfolio || t==hundred || t==hundredfolio) && - (type_==string || type_==folio || type_==machine || type_ ==funcgroup || type_==locmach ||type_==idfolio || + (type_==string || type_==folio || type_==machine || type_==locmach ||type_==idfolio || type_==elementcolumn || type_==elementline || type_==elementprefix)) || fnum) { ui -> value_field -> clear(); @@ -250,7 +244,7 @@ void NumPartEditorW::setType(NumPartEditorW::type t, bool fnum) { ui -> increase_spinBox -> setValue(1); } //@t isn't a numeric type - else if (t == string || t == folio || t == idfolio || t == elementline || t == machine || t == funcgroup ||t == locmach || + else if (t == string || t == folio || t == idfolio || t == elementline || t == machine || t == locmach || t == elementcolumn || t == elementprefix) { ui -> value_field -> clear(); ui -> increase_spinBox -> setDisabled(true); @@ -266,12 +260,6 @@ void NumPartEditorW::setType(NumPartEditorW::type t, bool fnum) { ui -> value_field -> setDisabled(true); ui -> increase_spinBox -> setDisabled(true); } - - else if (t==funcgroup) { - ui -> value_field -> setDisabled(true); - ui -> increase_spinBox -> setDisabled(true); - } - else if (t==locmach) { ui -> value_field -> setDisabled(true); ui -> increase_spinBox -> setDisabled(true); @@ -323,8 +311,6 @@ void NumPartEditorW::setCurrentIndex(NumPartEditorW::type t) { i = ui->type_cb->findText(tr("Folio")); else if (t == machine) i = ui->type_cb->findText(tr("Machine")); - else if (t == funcgroup) - i = ui->type_cb->findText(tr("Funcgroup")); else if (t == locmach) i = ui->type_cb->findText(tr("Locmach")); else if (t == elementline) diff --git a/sources/autoNum/ui/numparteditorw.h b/sources/autoNum/ui/numparteditorw.h index 145ea291b..165c99d35 100644 --- a/sources/autoNum/ui/numparteditorw.h +++ b/sources/autoNum/ui/numparteditorw.h @@ -42,7 +42,7 @@ class NumPartEditorW : public QWidget ~NumPartEditorW() override; enum type {unit,unitfolio,ten,tenfolio, hundred, hundredfolio, - string,idfolio,folio,machine,funcgroup,locmach, + string,idfolio,folio,machine,locmach, elementline,elementcolumn,elementprefix, }; NumerotationContext toNumContext(); diff --git a/sources/bordertitleblock.cpp b/sources/bordertitleblock.cpp index 30df0cf7d..822e97097 100644 --- a/sources/bordertitleblock.cpp +++ b/sources/bordertitleblock.cpp @@ -242,8 +242,7 @@ TitleBlockProperties BorderTitleBlock::exportTitleBlock() { ip.title = title(); ip.filename = fileName(); ip.machine = machine(); - ip.funcgroup = funcgroup(); - ip.locmach = locmach(); + ip.locmach = locmach(); ip.indexrev = indexrev(); ip.version = version(); ip.folio = folio(); @@ -266,7 +265,6 @@ void BorderTitleBlock::importTitleBlock(const TitleBlockProperties &ip) { setTitle(ip.title); setFileName(ip.filename); setMachine(ip.machine); - setFuncgroup(ip.funcgroup); setLocMach(ip.locmach); setIndicerev(ip.indexrev); setVersion(QET::displayedVersion); @@ -718,7 +716,6 @@ void BorderTitleBlock::updateDiagramContextForTitleBlock(const DiagramContext &i context.addValue("title", btb_title_); context.addValue("filename", btb_filename_); context.addValue("machine", btb_machine_); - context.addValue("funcgroup", btb_funcgroup_); context.addValue("locmach", btb_locmach_); context.addValue("indexrev", btb_indexrev_); context.addValue("version", btb_version_); diff --git a/sources/bordertitleblock.h b/sources/bordertitleblock.h index 46636b780..c0cadaad5 100644 --- a/sources/bordertitleblock.h +++ b/sources/bordertitleblock.h @@ -101,8 +101,6 @@ class BorderTitleBlock : public QObject QString machine() const { return(btb_machine_); } /// @return the value of the title block "Locmach" field QString locmach() const { return(btb_locmach_); } - /// @return the value of the title block "Funcgroup" field - QString funcgroup() const { return(btb_funcgroup_); } /// @return the value of the revision index block "Folio" field QString indexrev() const { return(btb_indexrev_); } @@ -158,7 +156,6 @@ class BorderTitleBlock : public QObject void setFolioData(int, int, const QString& = nullptr, const DiagramContext & = DiagramContext()); /// @param author the new value of the "File" field void setMachine(const QString &machine) { btb_machine_ = machine; } - void setFuncgroup(const QString &funcgroup) { btb_locmach_ = funcgroup; } void setLocMach(const QString &locmach) { btb_locmach_ = locmach; } void setIndicerev(const QString &indexrev){ btb_indexrev_ = indexrev; } void setFileName(const QString &filename) { btb_filename_ = filename; } @@ -241,7 +238,6 @@ class BorderTitleBlock : public QObject QString btb_title_; QString btb_folio_; QString btb_machine_; - QString btb_funcgroup_; QString btb_locmach_; QString btb_indexrev_; QString btb_final_folio_; diff --git a/sources/diagramcontext.h b/sources/diagramcontext.h index 0e1366f57..e4243fdce 100644 --- a/sources/diagramcontext.h +++ b/sources/diagramcontext.h @@ -41,7 +41,6 @@ * auxiliary1 -> auxiliary 1 of element * auxiliary2 -> auxiliary 2 of element * machine-manufacturer-reference -> reference of the manufacturer machine - * function-group -> Function group * provider -> the provider of the element * function -> the function of element * location -> the location of the element diff --git a/sources/diagramfoliolist.cpp b/sources/diagramfoliolist.cpp index fcc2241ed..7759d43d3 100644 --- a/sources/diagramfoliolist.cpp +++ b/sources/diagramfoliolist.cpp @@ -19,7 +19,7 @@ #include #include "qetapp.h" -qreal DiagramFolioList::colWidths[8] = {0.05, 0.40, 0.10, 0.10, 0.10, 0.05, 0.10, 0.10}; +qreal DiagramFolioList::colWidths[7] = {0.05, 0.50, 0.10, 0.10, 0.05, 0.10, 0.10}; /** * @brief DiagramFolioList::DiagramFolioList @@ -94,7 +94,6 @@ void DiagramFolioList::drawBackground(QPainter *p, const QRectF &r) diagram_list[i] -> title(), diagram_list[i] -> border_and_titleblock.finalfolio(), diagram_list[i] -> border_and_titleblock.machine(), - diagram_list[i] -> border_and_titleblock.funcgroup(), diagram_list[i] -> border_and_titleblock.locmach(), diagram_list[i] -> border_and_titleblock.indexrev(), diagram_list[i] -> border_and_titleblock.date().toString(Qt::SystemLocaleShortDate)); @@ -103,7 +102,6 @@ void DiagramFolioList::drawBackground(QPainter *p, const QRectF &r) diagram_list[i] -> title(), QString::number(diagram_list[i] ->folioIndex()+1), diagram_list[i] -> border_and_titleblock.machine(), - diagram_list[i] -> border_and_titleblock.funcgroup(), diagram_list[i] -> border_and_titleblock.locmach(), diagram_list[i] -> border_and_titleblock.indexrev(), diagram_list[i] -> border_and_titleblock.date().toString(Qt::SystemLocaleShortDate)); @@ -122,7 +120,7 @@ void DiagramFolioList::drawBackground(QPainter *p, const QRectF &r) * @param row_rect rectangle where we must draw the new row */ void DiagramFolioList::fillRow(QPainter *qp, const QRectF &row_rect, const QString& author, const QString& title, - const QString& folio, const QString& machine, const QString& funcgroup, const QString& loc, const QString& indexrev, const QString& date) + const QString& folio, const QString& machine, const QString& loc, const QString& indexrev, const QString& date) { qreal x = row_rect.topLeft().x(); qreal y = row_rect.topLeft().y(); @@ -176,50 +174,42 @@ void DiagramFolioList::fillRow(QPainter *qp, const QRectF &row_rect, const QStri qp -> drawText(QRectF(x, y, colWidths[3]*row_rect.width(), row_rect.height()), Qt::AlignCenter, machine); x += colWidths[2]*row_rect.width(); - if (origFontMetrics.width(funcgroup) > 0.95*colWidths[3]*row_rect.width()) - workingFont.setPointSizeF(origFontSize * 0.95*colWidths[3]*row_rect.width() / origFontMetrics.width(funcgroup)); + + if (origFontMetrics.width(loc) > 0.95*colWidths[3]*row_rect.width()) + workingFont.setPointSizeF(origFontSize * 0.95*colWidths[3]*row_rect.width() / origFontMetrics.width(loc)); else workingFont.setPointSizeF(origFontSize); qp -> setFont(workingFont); - qp -> drawText(QRectF(x, y, colWidths[3]*row_rect.width(), row_rect.height()), Qt::AlignCenter, funcgroup); + qp -> drawText(QRectF(x, y, colWidths[3]*row_rect.width(), row_rect.height()), Qt::AlignCenter, loc); x += colWidths[3]*row_rect.width(); - if (origFontMetrics.width(loc) > 0.95*colWidths[4]*row_rect.width()) - workingFont.setPointSizeF(origFontSize * 0.95*colWidths[4]*row_rect.width() / origFontMetrics.width(loc)); + if (origFontMetrics.width(indexrev) > 0.95*colWidths[4]*row_rect.width()) + workingFont.setPointSizeF(origFontSize * 0.95*colWidths[4]*row_rect.width() / origFontMetrics.width(indexrev)); else workingFont.setPointSizeF(origFontSize); qp -> setFont(workingFont); - qp -> drawText(QRectF(x, y, colWidths[4]*row_rect.width(), row_rect.height()), Qt::AlignCenter, loc); + qp -> drawText(QRectF(x, y, colWidths[4]*row_rect.width(), row_rect.height()), Qt::AlignCenter, indexrev); x += colWidths[4]*row_rect.width(); - if (origFontMetrics.width(indexrev) > 0.95*colWidths[5]*row_rect.width()) - workingFont.setPointSizeF(origFontSize * 0.95*colWidths[5]*row_rect.width() / origFontMetrics.width(indexrev)); - else - workingFont.setPointSizeF(origFontSize); - qp -> setFont(workingFont); - qp -> drawText(QRectF(x, y, colWidths[5]*row_rect.width(), row_rect.height()), Qt::AlignCenter, indexrev); - x += colWidths[5]*row_rect.width(); - - - if (origFontMetrics.width(author) > 0.95*colWidths[6]*row_rect.width()) - workingFont.setPointSizeF(origFontSize * 0.95*colWidths[6]*row_rect.width() / origFontMetrics.width(author)); + if (origFontMetrics.width(author) > 0.95*colWidths[5]*row_rect.width()) + workingFont.setPointSizeF(origFontSize * 0.95*colWidths[5]*row_rect.width() / origFontMetrics.width(author)); else workingFont.setPointSizeF(origFontSize); qp -> setFont(workingFont); qp -> drawText(QRectF(x, y, colWidths[6]*row_rect.width(), row_rect.height()), Qt::AlignCenter, author); - x += colWidths[6]*row_rect.width(); + x += colWidths[5]*row_rect.width(); - if (origFontMetrics.width(date) > 0.95*colWidths[7]*row_rect.width()) - workingFont.setPointSizeF(origFontSize * 0.95*colWidths[7]*row_rect.width() / origFontMetrics.width(date)); + if (origFontMetrics.width(date) > 0.95*colWidths[6]*row_rect.width()) + workingFont.setPointSizeF(origFontSize * 0.95*colWidths[6]*row_rect.width() / origFontMetrics.width(date)); else workingFont.setPointSizeF(origFontSize); qp -> setFont(workingFont); - qp -> drawText(QRectF(x, y, colWidths[7]*row_rect.width(), row_rect.height()), Qt::AlignCenter, date); + qp -> drawText(QRectF(x, y, colWidths[6]*row_rect.width(), row_rect.height()), Qt::AlignCenter, date); } void DiagramFolioList::buildGrid(QPainter *qp, const QRectF &rect, int rows, int tables, qreal colWidths[]) @@ -230,7 +220,7 @@ void DiagramFolioList::buildGrid(QPainter *qp, const QRectF &rect, int rows, int list_rectangles_.clear(); qreal sum = 0; - for (int i = 0; i < 8; i++ ) + for (int i = 0; i < 7; i++ ) sum += colWidths[i]; if ( sum < 0.99 || sum > 1.01 ) { qDebug() << "Invalid input: Column widths do not sum to 1"; @@ -240,7 +230,7 @@ void DiagramFolioList::buildGrid(QPainter *qp, const QRectF &rect, int rows, int qreal tablesSpacing = rect.height() * 0.02; qreal tableWidth = (rect.width() - tablesSpacing*(tables+1) ) / tables; qreal rowHeight = (rect.height() - 2*tablesSpacing) / rows; - int cols = 8;//colWidths.size(); + int cols = 7;//colWidths.size(); qreal x0 = tablesSpacing + rect.topLeft().x(); qreal y0 = tablesSpacing + rect.topLeft().y(); @@ -275,13 +265,12 @@ void DiagramFolioList::fillHeader(QPainter *qp, const QRectF &row_RectF) { QString titleTranslatable(QObject::tr("Titre")); QString folioTranslatable(QObject::tr("Folio")); QString machineTranslatable(QObject::tr("Installation")); - QString funcgroupTranslatable(QObject::tr("Groupe fonctionnel")); QString locTranslatable(QObject::tr("Localisation")); QString indexrevTranslatable(QObject::tr("Rev")); QString dateTranslatable(QObject::tr("Date")); qp->save(); qp->setFont(QETApp::diagramTextsFont(13)); - fillRow(qp, row_RectF, authorTranslatable, titleTranslatable, folioTranslatable, machineTranslatable, funcgroupTranslatable, locTranslatable, indexrevTranslatable, dateTranslatable); + fillRow(qp, row_RectF, authorTranslatable, titleTranslatable, folioTranslatable, machineTranslatable, locTranslatable, indexrevTranslatable, dateTranslatable); qp->restore(); } diff --git a/sources/diagramfoliolist.h b/sources/diagramfoliolist.h index 2cb4cc75c..55d0324da 100644 --- a/sources/diagramfoliolist.h +++ b/sources/diagramfoliolist.h @@ -31,13 +31,13 @@ class DiagramFolioList : public Diagram void setId(int i) {id = i;} int getId() const {return id;} - static qreal colWidths[8]; + static qreal colWidths[7]; protected: void drawBackground(QPainter *, const QRectF &) override; private: - void fillRow(QPainter *, const QRectF &, const QString&, const QString&, const QString&, const QString&, const QString&, const QString&, const QString&, const QString&); + void fillRow(QPainter *, const QRectF &, const QString&, const QString&, const QString&, const QString&, const QString&, const QString&, const QString&); void buildGrid(QPainter *, const QRectF &, int, int, qreal[]); void fillHeader(QPainter *, const QRectF &); diff --git a/sources/editor/ui/elementpropertieseditorwidget.cpp b/sources/editor/ui/elementpropertieseditorwidget.cpp index 47b80ff91..3d82306b6 100644 --- a/sources/editor/ui/elementpropertieseditorwidget.cpp +++ b/sources/editor/ui/elementpropertieseditorwidget.cpp @@ -152,7 +152,7 @@ void ElementPropertiesEditorWidget::updateTree() */ void ElementPropertiesEditorWidget::populateTree() { - QStringList keys{"label", "comment", "description", "designation", "manufacturer", "manufacturer-reference", "provider", "function-group", "machine-manufacturer-reference"}; + QStringList keys{"label", "comment", "description", "designation", "manufacturer", "manufacturer-reference", "provider", "machine-manufacturer-reference"}; for(const QString& key : keys) { diff --git a/sources/nomenclature.cpp b/sources/nomenclature.cpp index 1125cd161..84361e71e 100644 --- a/sources/nomenclature.cpp +++ b/sources/nomenclature.cpp @@ -100,7 +100,6 @@ QString nomenclature::getNomenclature() ""+ QObject::tr("M001") +";" //:Don't translate this text! //ID for auxiliary field 1 ""+ QObject::tr("M002") +";" //:Don't translate this text! //ID for auciliary field 2 ""+ QObject::tr("N001")+";" //:Don't translate this text! //ID for internal number - ""+ QObject::tr("N002")+";" //:Don't translate this text! //ID for Function group ""+ QObject::tr("O001")+";" //:Don't translate this text! //ID for location ""+ QObject::tr("P001") +"\n"; //:Don't translate this text! //ID for function data += QObject::tr("N° de folio") +";" @@ -119,7 +118,6 @@ QString nomenclature::getNomenclature() ""+ QObject::tr("Bloc auxiliaire 1") +";" ""+ QObject::tr("Bloc auxiliaire 2") +";" ""+ QObject::tr("Machine-reference") +";" - ""+ QObject::tr("Function-group") +";" ""+ QObject::tr("Localisation") +";" ""+ QObject::tr("Fonction") +"\n"; @@ -179,7 +177,6 @@ QString nomenclature::getElementInfo(Element *elmt) { info += autonum::AssignVariables::formulaToLabel(elmt_info["auxiliary1"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";"; info += autonum::AssignVariables::formulaToLabel(elmt_info["auxiliary2"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";"; info += autonum::AssignVariables::formulaToLabel(elmt_info["machine-manufacturer-reference"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";"; - info += autonum::AssignVariables::formulaToLabel(elmt_info["function-group"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";"; info += autonum::AssignVariables::formulaToLabel(elmt_info["location"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";"; info += autonum::AssignVariables::formulaToLabel(elmt_info["function"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + "\n"; diff --git a/sources/qetapp.cpp b/sources/qetapp.cpp index e83346bc1..f26f5c50b 100644 --- a/sources/qetapp.cpp +++ b/sources/qetapp.cpp @@ -303,7 +303,6 @@ QStringList QETApp::elementInfoKeys() << "auxiliary1" << "auxiliary2" << "machine-manufacturer-reference" - << "function-group" << "location" << "function" << "tension-protocol"; @@ -330,7 +329,6 @@ QString QETApp::elementTranslatedInfoKey(const QString &info) else if (info == "auxiliary1") return tr("Bloc auxiliaire 1"); else if (info == "auxiliary2") return tr("Bloc auxiliaire 2"); else if (info == "machine-manufacturer-reference") return tr("Numéro interne"); - else if (info == "function-group") return tr("Groupe fonctionnel"); else if (info == "location") return tr("Localisation"); else if (info == "function") return tr("Fonction"); else if (info == "tension-protocol") return tr("Tension / Protocole"); @@ -356,7 +354,6 @@ QString QETApp::elementInfoToVar(const QString &info) else if (info == "auxiliary1") return QString("%{auxiliary1}"); else if (info == "auxiliary2") return QString("%{auxiliary2}"); else if (info == "machine-manufacturer-reference") return QString("%{machine-manufacturer-reference}"); - else if (info == "function-group" ) return QString("%{function-group}"); else if (info == "location") return QString("%{location}"); else if (info == "function") return QString("%{function}"); else if (info == "tension-protocol") return QString("%{tension-protocol}"); diff --git a/sources/titleblock/templatecellwidget.cpp b/sources/titleblock/templatecellwidget.cpp index 332127e24..e8ae7b774 100644 --- a/sources/titleblock/templatecellwidget.cpp +++ b/sources/titleblock/templatecellwidget.cpp @@ -437,8 +437,7 @@ QString TitleBlockTemplateCellWidget::defaultVariablesString() const { "
  • %{date} : date du folio
    • " "
  • %{title} : titre du folio
    • " "
  • %{filename} : nom de fichier du projet
    • " - "
  • %{machine} : nom du projet
    • " - "
  • %{funcgroup} : nom du groupe fonctionnel du projet
    • " + "
  • %{machine} : nom du groupe fonctionnel du projet
    • " "
  • %{locmach} : nom de la localisation dans le groupe fonctionnel du projet
    • " "
  • %{indexrev} : indice de révision du folio
    • " "
  • %{version} : version du logiciel
    • " diff --git a/sources/titleblockproperties.cpp b/sources/titleblockproperties.cpp index f5177d7cb..189062684 100644 --- a/sources/titleblockproperties.cpp +++ b/sources/titleblockproperties.cpp @@ -48,7 +48,6 @@ bool TitleBlockProperties::operator==(const TitleBlockProperties &ip) { ip.date == date &&\ ip.filename == filename &&\ ip.machine == machine &&\ - ip.funcgroup == funcgroup &&\ ip.locmach == locmach &&\ ip.indexrev == indexrev &&\ ip.version == version &&\ @@ -79,7 +78,6 @@ void TitleBlockProperties::toXml(QDomElement &e) const { e.setAttribute("title", title); e.setAttribute("filename", filename); e.setAttribute("machine", machine); - e.setAttribute("funcgroup", funcgroup); e.setAttribute("locmach", locmach); e.setAttribute("indexrev",indexrev); e.setAttribute("version", version); @@ -110,7 +108,6 @@ void TitleBlockProperties::fromXml(const QDomElement &e) { if (e.hasAttribute("title")) title = e.attribute("title"); if (e.hasAttribute("filename")) filename = e.attribute("filename"); if (e.hasAttribute("machine")) machine = e.attribute("machine"); - if (e.hasAttribute("funcgroup")) funcgroup = e.attribute("funcgroup"); if (e.hasAttribute("locmach")) locmach = e.attribute("locmach"); if (e.hasAttribute("indexrev")) indexrev = e.attribute("indexrev"); if (e.hasAttribute("version")) version = e.attribute("version"); @@ -144,7 +141,6 @@ void TitleBlockProperties::toSettings(QSettings &settings, const QString &prefix settings.setValue(prefix + "author", author); settings.setValue(prefix + "filename", filename); settings.setValue(prefix + "machine", machine); - settings.setValue(prefix + "funcgroup", funcgroup); settings.setValue(prefix + "locmach", locmach); settings.setValue(prefix + "indexrev", indexrev); settings.setValue(prefix + "version", version); @@ -167,7 +163,6 @@ void TitleBlockProperties::fromSettings(QSettings &settings, const QString &pref author = settings.value(prefix + "author").toString(); filename = settings.value(prefix + "filename").toString(); machine = settings.value(prefix + "machine").toString(); - funcgroup= settings.value(prefix + "funcgroup").toString(); locmach = settings.value(prefix + "locmach").toString(); indexrev = settings.value(prefix + "indexrev").toString(); version = settings.value(prefix + "version").toString(); diff --git a/sources/titleblockproperties.h b/sources/titleblockproperties.h index 469d0888f..a06d3421d 100644 --- a/sources/titleblockproperties.h +++ b/sources/titleblockproperties.h @@ -55,7 +55,6 @@ class TitleBlockProperties { QDate date; ///< Date (displayed by the default template) QString filename; ///< Filename (displayed by the default template) QString machine; ///< Machine (displayed by the default template) - QString funcgroup; ///< Function group (displayed by the default template) QString locmach; ///< Location(displayed by the default template) QString indexrev; ///< Revision Index (displayed by the default template) QString version; ///< Version (displayed by the default template) diff --git a/sources/ui/potentialselectordialog.cpp b/sources/ui/potentialselectordialog.cpp index 7ccbd16ed..91ec6024e 100644 --- a/sources/ui/potentialselectordialog.cpp +++ b/sources/ui/potentialselectordialog.cpp @@ -319,18 +319,18 @@ void PotentialSelectorDialog::on_buttonBox_accepted() } //Check if formula of the new potential have incompatible variable with folio report - QRegularExpression rx ("%sequf_|%seqtf_|%seqhf_|%id|%F|%M|%FG|%LM"); + QRegularExpression rx ("%sequf_|%seqtf_|%seqhf_|%id|%F|%M|%LM"); foreach(ConductorProperties cp, m_properties_list) { if (cp.m_formula.contains(rx)) { QStringList forbidden_str; - forbidden_str << "%sequf_" << "%seqtf_" << "%seqhf_" << "%id" << "%F" << "%M" << "%FG" << "%LM"; + forbidden_str << "%sequf_" << "%seqtf_" << "%seqhf_" << "%id" << "%F" << "%M" << "%LM"; QString text(tr("La formule du nouveau potentiel contient des variables incompatibles avec les reports de folio.\n" "Veuillez saisir une formule compatible pour ce potentiel.\n" "Les variables suivantes sont incompatibles :\n" - "%sequf_ %seqtf_ %seqhf_ %id %F %M %FG %LM")); + "%sequf_ %seqtf_ %seqhf_ %id %F %M %LM")); FormulaAssistantDialog fag(this); fag.setForbiddenVariables(forbidden_str); fag.setText(text); diff --git a/sources/ui/reportpropertiewidget.ui b/sources/ui/reportpropertiewidget.ui index 262cef0ec..d261a4ba1 100644 --- a/sources/ui/reportpropertiewidget.ui +++ b/sources/ui/reportpropertiewidget.ui @@ -7,7 +7,7 @@ 0 0 400 - 421 + 300 @@ -33,14 +33,13 @@ Vous pouvez définir un label personnalisé pour les reports de folio. --Créer votre propre texte en vous aidant des variables suivantes : --%f : le numéro de folio --%F: le label de folio --%M: Machine --%FG: Groupe fonctionnel --%LM: Location --%l : le numéro de ligne --%c : le numéro de colonne +Créer votre propre texte en vous aidant des variables suivantes : +%f : le numéro de folio +%F: le label de folio +%M: Machine +%LM: Location +%l : le numéro de ligne +%c : le numéro de colonne false diff --git a/sources/ui/titleblockpropertieswidget.cpp b/sources/ui/titleblockpropertieswidget.cpp index 30c297fd4..47c4ac706 100644 --- a/sources/ui/titleblockpropertieswidget.cpp +++ b/sources/ui/titleblockpropertieswidget.cpp @@ -97,7 +97,6 @@ void TitleBlockPropertiesWidget::setProperties(const TitleBlockProperties &prope ui -> m_author_le -> setText (properties.author); ui -> m_file_le -> setText (properties.filename); ui -> m_mach -> setText (properties.machine); - ui -> m_group_f -> setText (properties.funcgroup); ui -> m_loc -> setText (properties.locmach); ui -> m_indice -> setText (properties.indexrev); ui -> m_folio_le -> setText (properties.folio); @@ -156,8 +155,7 @@ TitleBlockProperties TitleBlockPropertiesWidget::properties() const { prop.author = ui -> m_author_le -> text(); prop.filename = ui -> m_file_le -> text(); prop.machine = ui -> m_mach -> text(); - prop.funcgroup = ui -> m_group_f -> text(); - prop.locmach = ui -> m_loc -> text(); + prop.locmach = ui -> m_loc -> text(); prop.indexrev = ui -> m_indice -> text(); prop.folio = ui -> m_folio_le -> text(); prop.display_at = ui -> m_display_at_cb -> currentIndex() == 0 ? Qt::BottomEdge : Qt::RightEdge; @@ -198,7 +196,6 @@ TitleBlockProperties TitleBlockPropertiesWidget::propertiesAutoNum(QString autoN prop.author = ui -> m_author_le -> text(); prop.filename = ui -> m_file_le -> text(); prop.machine = ui -> m_mach -> text(); - prop.funcgroup = ui -> m_group_f -> text(); prop.locmach = ui -> m_loc -> text(); prop.indexrev = ui -> m_indice -> text(); prop.folio = "%autonum"; diff --git a/sources/ui/titleblockpropertieswidget.ui b/sources/ui/titleblockpropertieswidget.ui index 61c54c4dd..c37347704 100644 --- a/sources/ui/titleblockpropertieswidget.ui +++ b/sources/ui/titleblockpropertieswidget.ui @@ -84,7 +84,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -220,7 +220,7 @@ - Indice Rev: + Indice Rev @@ -373,20 +373,10 @@ Les variables suivantes sont utilisables : - Localisation: + Localisation - - - - Groupe fonctionnel: - - - - - - diff --git a/sources/ui/xrefpropertieswidget.ui b/sources/ui/xrefpropertieswidget.ui index 846a69891..855270d2d 100644 --- a/sources/ui/xrefpropertieswidget.ui +++ b/sources/ui/xrefpropertieswidget.ui @@ -2,14 +2,6 @@ XRefPropertiesWidget - - - 0 - 0 - 459 - 662 - - Form @@ -195,7 +187,6 @@ %l : le numéro de ligne %c : le numéro de colonne %M: Installation -%FG: Groupe fonctionnel %LM: Localisation