diff --git a/sources/autoNum/assignvariables.cpp b/sources/autoNum/assignvariables.cpp index 481a5cb6a..4ef246316 100644 --- a/sources/autoNum/assignvariables.cpp +++ b/sources/autoNum/assignvariables.cpp @@ -193,13 +193,15 @@ namespace autonum return str; } - + QSettings settings; + AssignVariables::AssignVariables(const QString& formula, const sequentialNumbers& seqStruct , Diagram *diagram, const Element *elmt): m_diagram(diagram), m_arg_formula(formula), m_assigned_label(formula), m_seq_struct(seqStruct), m_element(elmt) + { if (m_diagram) { @@ -210,10 +212,14 @@ namespace autonum m_assigned_label.replace("%M", m_diagram -> border_and_titleblock.machine()); m_assigned_label.replace("%LM", m_diagram -> border_and_titleblock.locmach()); - + if (m_element) { + if (settings.value("border-columns_0", true).toBool()){ + m_assigned_label.replace("%c", QString::number(m_diagram->convertPosition(m_element->scenePos()).number() - 1)); + }else{ m_assigned_label.replace("%c", QString::number(m_diagram->convertPosition(m_element->scenePos()).number())); + } m_assigned_label.replace("%l", m_diagram->convertPosition(m_element->scenePos()).letter()); m_assigned_label.replace("%prefix", m_element->getPrefix()); } diff --git a/sources/bordertitleblock.cpp b/sources/bordertitleblock.cpp index 9b1545aae..822e97097 100644 --- a/sources/bordertitleblock.cpp +++ b/sources/bordertitleblock.cpp @@ -437,6 +437,8 @@ void BorderTitleBlock::draw(QPainter *painter) painter -> setPen(pen); painter -> setBrush(Qt::NoBrush); + QSettings settings; + //Draw the borer if (display_border_) painter -> drawRect(diagram_rect_); @@ -464,7 +466,11 @@ void BorderTitleBlock::draw(QPainter *painter) columns_header_height_ ); painter -> drawRect(numbered_rectangle); + if (settings.value("border-columns_0", true).toBool()){ + painter -> drawText(numbered_rectangle, Qt::AlignVCenter | Qt::AlignCenter, QString("%1").arg(i - 1)); + }else{ painter -> drawText(numbered_rectangle, Qt::AlignVCenter | Qt::AlignCenter, QString("%1").arg(i)); + } } } @@ -530,6 +536,8 @@ void BorderTitleBlock::drawDxf(int width, int height, bool keep_aspect_ratio, QS ); } + QSettings settings; + // dessine la numerotation des colonnes if (display_border_ && display_columns_) { @@ -541,8 +549,13 @@ void BorderTitleBlock::drawDxf(int width, int height, bool keep_aspect_ratio, QS double recWidth = columns_width_; double recHeight = columns_header_height_; Createdxf::drawRectangle(file_path, xCoord, yCoord, recWidth, recHeight, color); + if (settings.value("border-columns_0", true).toBool()){ + Createdxf::drawTextAligned(file_path, QString::number(i - 1), xCoord, + yCoord + recHeight*0.5, recHeight*0.7, 0, 0, 1, 2, xCoord+recWidth/2, color, 0); + }else{ Createdxf::drawTextAligned(file_path, QString::number(i), xCoord, yCoord + recHeight*0.5, recHeight*0.7, 0, 0, 1, 2, xCoord+recWidth/2, color, 0); + } } } diff --git a/sources/diagramposition.cpp b/sources/diagramposition.cpp index 464210529..750314321 100644 --- a/sources/diagramposition.cpp +++ b/sources/diagramposition.cpp @@ -16,6 +16,7 @@ along with QElectroTech. If not, see . */ #include "diagramposition.h" +#include "qetapp.h" /** Constructeur @@ -59,7 +60,13 @@ QString DiagramPosition::toString() { if (isOutOfBounds()) { return("-"); } + QSettings settings; + + if (settings.value("border-columns_0", true).toBool()){ + return(QString("%1%2").arg(letter_).arg(number_ - 1)); + }else{ return(QString("%1%2").arg(letter_).arg(number_)); + } } /** diff --git a/sources/ui/configpage/generalconfigurationpage.cpp b/sources/ui/configpage/generalconfigurationpage.cpp index de129fd03..01365f672 100644 --- a/sources/ui/configpage/generalconfigurationpage.cpp +++ b/sources/ui/configpage/generalconfigurationpage.cpp @@ -46,6 +46,7 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) : ui->m_save_label_paste->setChecked(settings.value("diagramcommands/erase-label-on-copy", true).toBool()); ui->m_use_folio_label->setChecked(settings.value("genericpanel/folio", true).toBool()); ui->m_export_terminal->setChecked(settings.value("nomenclature-exportlist", true).toBool()); + ui->m_border_0->setChecked(settings.value("border-columns_0", false).toBool()); ui->m_autosave_sb->setValue(settings.value("diagrameditor/autosave-interval", 0).toInt()); QString fontInfos = settings.value("diagramitemfont").toString() + " " + @@ -114,6 +115,7 @@ void GeneralConfigurationPage::applyConf() settings.setValue("diagrameditor/zoom-out-beyond-of-folio", ui->m_zoom_out_beyond_folio->isChecked()); settings.setValue("genericpanel/folio",ui->m_use_folio_label->isChecked()); settings.setValue("nomenclature/terminal-exportlist",ui->m_export_terminal->isChecked()); + settings.setValue("border-columns_0",ui->m_border_0->isChecked()); settings.setValue("diagrameditor/autosave-interval", ui->m_autosave_sb->value()); QString path = settings.value("elements-collections/common-collection-path").toString(); diff --git a/sources/ui/configpage/generalconfigurationpage.ui b/sources/ui/configpage/generalconfigurationpage.ui index 7c78aa492..bd930e2b4 100644 --- a/sources/ui/configpage/generalconfigurationpage.ui +++ b/sources/ui/configpage/generalconfigurationpage.ui @@ -6,8 +6,8 @@ 0 0 - 827 - 779 + 930 + 905 @@ -108,21 +108,21 @@ Projets - + - + Sauvegarde automatique des projets (appliqué au prochain lancement de QElectroTech) - + @@ -150,14 +150,14 @@ - + Police des champs textes des pages sommaires - + Police des champs de texte @@ -171,7 +171,7 @@ - + true @@ -205,7 +205,7 @@ - + Qt::Horizontal @@ -218,6 +218,13 @@ + + + + Activer la numérotation à partir de 0 pour la colonne des cartouches au lieu de 1 + + +