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

Wrap code for better readability

Browse Source
This commit is contained in:
Simon De Backer
2020-08-29 19:21:51 +02:00
parent cb0c0f8778
commit 62d370c99a
7 changed files with 208 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
sources/autoNum/ui/autonumberingdockwidget.cpp
View File

@@ -72,32 +72,43 @@ void AutoNumberingDockWidget::projectClosed()
@param projectview: projectview to be setted @param projectview: projectview to be setted
assign Project and ProjectView, connect all signals and setContext assign Project and ProjectView, connect all signals and setContext
*/ */
void AutoNumberingDockWidget::setProject(QETProject *project, ProjectView *projectview) void AutoNumberingDockWidget::setProject(QETProject *project,
ProjectView *projectview)
{ {
//Disconnect previous project //Disconnect previous project
if (m_project && m_project_view) if (m_project && m_project_view)
{ {
//Conductor Signals //Conductor Signals
disconnect(m_project, SIGNAL(conductorAutoNumChanged()),this,SLOT(conductorAutoNumChanged())); disconnect(m_project, SIGNAL(conductorAutoNumChanged()),
disconnect (m_project,SIGNAL(conductorAutoNumRemoved()), this,SLOT(conductorAutoNumChanged())); this,SLOT(conductorAutoNumChanged()));
disconnect (m_project,SIGNAL(conductorAutoNumAdded()), this,SLOT(conductorAutoNumChanged())); disconnect (m_project,SIGNAL(conductorAutoNumRemoved()),
disconnect(m_project_view,SIGNAL(diagramActivated(DiagramView*)),this,SLOT(setConductorActive(DiagramView*))); this,SLOT(conductorAutoNumChanged()));
disconnect (m_project,SIGNAL(conductorAutoNumAdded()),
this,SLOT(conductorAutoNumChanged()));
disconnect(m_project_view,SIGNAL(diagramActivated(DiagramView*)),
this,SLOT(setConductorActive(DiagramView*)));
//Element Signals //Element Signals
disconnect (m_project,SIGNAL(elementAutoNumRemoved(QString)), this,SLOT(elementAutoNumChanged())); disconnect (m_project,SIGNAL(elementAutoNumRemoved(QString)),
disconnect (m_project,SIGNAL(elementAutoNumAdded(QString)), this,SLOT(elementAutoNumChanged())); this,SLOT(elementAutoNumChanged()));
disconnect (m_project,SIGNAL(elementAutoNumAdded(QString)),
this,SLOT(elementAutoNumChanged()));
//Folio Signals //Folio Signals
disconnect (m_project,SIGNAL(folioAutoNumRemoved()), this,SLOT(folioAutoNumChanged())); disconnect (m_project,SIGNAL(folioAutoNumRemoved()),
disconnect (m_project,SIGNAL(folioAutoNumAdded()), this,SLOT(folioAutoNumChanged())); this,SLOT(folioAutoNumChanged()));
disconnect (m_project,SIGNAL(folioAutoNumAdded()),
this,SLOT(folioAutoNumChanged()));
disconnect (this, disconnect (this,
SIGNAL(folioAutoNumChanged(QString)), SIGNAL(folioAutoNumChanged(QString)),
&m_project_view->currentDiagram()->diagram()->border_and_titleblock, &m_project_view->currentDiagram()->diagram()->border_and_titleblock,
SLOT (slot_setAutoPageNum(QString))); SLOT (slot_setAutoPageNum(QString)));
disconnect(m_project, SIGNAL(defaultTitleBlockPropertiesChanged()),this,SLOT(setActive())); disconnect(m_project, SIGNAL(defaultTitleBlockPropertiesChanged()),
this,SLOT(setActive()));
//Conductor, Element and Folio Signals //Conductor, Element and Folio Signals
disconnect(m_project, &QETProject::destroyed, this, &AutoNumberingDockWidget::projectClosed); disconnect(m_project, &QETProject::destroyed,
this, &AutoNumberingDockWidget::projectClosed);
} }
m_project = project; m_project = project;
@@ -105,26 +116,36 @@ void AutoNumberingDockWidget::setProject(QETProject *project, ProjectView *proje
this->setEnabled(true); this->setEnabled(true);
//Conductor Signals //Conductor Signals
connect(m_project, SIGNAL(conductorAutoNumChanged()),this,SLOT(conductorAutoNumChanged())); connect(m_project, SIGNAL(conductorAutoNumChanged()),
connect(m_project,SIGNAL(conductorAutoNumRemoved()), this,SLOT(conductorAutoNumChanged())); this,SLOT(conductorAutoNumChanged()));
connect(m_project,SIGNAL(conductorAutoNumAdded()), this,SLOT(conductorAutoNumChanged())); connect(m_project,SIGNAL(conductorAutoNumRemoved()),
connect(m_project_view,SIGNAL(diagramActivated(DiagramView*)),this,SLOT(setConductorActive(DiagramView*))); this,SLOT(conductorAutoNumChanged()));
connect(m_project,SIGNAL(conductorAutoNumAdded()),
this,SLOT(conductorAutoNumChanged()));
connect(m_project_view,SIGNAL(diagramActivated(DiagramView*)),
this,SLOT(setConductorActive(DiagramView*)));
//Element Signals //Element Signals
connect (m_project,SIGNAL(elementAutoNumRemoved(QString)), this,SLOT(elementAutoNumChanged())); connect (m_project,SIGNAL(elementAutoNumRemoved(QString)),
connect (m_project,SIGNAL(elementAutoNumAdded(QString)), this,SLOT(elementAutoNumChanged())); this,SLOT(elementAutoNumChanged()));
connect (m_project,SIGNAL(elementAutoNumAdded(QString)),
this,SLOT(elementAutoNumChanged()));
//Folio Signals //Folio Signals
connect (m_project,SIGNAL(folioAutoNumRemoved()), this,SLOT(folioAutoNumChanged())); connect (m_project,SIGNAL(folioAutoNumRemoved()),
connect (m_project,SIGNAL(folioAutoNumAdded()), this,SLOT(folioAutoNumChanged())); this,SLOT(folioAutoNumChanged()));
connect (m_project,SIGNAL(folioAutoNumAdded()),
this,SLOT(folioAutoNumChanged()));
connect (this, connect (this,
SIGNAL(folioAutoNumChanged(QString)), SIGNAL(folioAutoNumChanged(QString)),
&m_project_view->currentDiagram()->diagram()->border_and_titleblock, &m_project_view->currentDiagram()->diagram()->border_and_titleblock,
SLOT (slot_setAutoPageNum(QString))); SLOT (slot_setAutoPageNum(QString)));
connect(m_project, SIGNAL(defaultTitleBlockPropertiesChanged()),this,SLOT(setActive())); connect(m_project, SIGNAL(defaultTitleBlockPropertiesChanged()),
this,SLOT(setActive()));
//Conductor, Element and Folio Signals //Conductor, Element and Folio Signals
connect(m_project, &QETProject::destroyed, this, &AutoNumberingDockWidget::projectClosed); connect(m_project, &QETProject::destroyed,
this, &AutoNumberingDockWidget::projectClosed);
//Set Combobox Context //Set Combobox Context
setContext(); setContext();
@@ -144,21 +165,24 @@ void AutoNumberingDockWidget::setContext() {
ui->m_conductor_cb->addItem(""); ui->m_conductor_cb->addItem("");
QList <QString> keys_conductor = m_project->conductorAutoNum().keys(); QList <QString> keys_conductor = m_project->conductorAutoNum().keys();
if (!keys_conductor.isEmpty()) { if (!keys_conductor.isEmpty()) {
foreach (QString str, keys_conductor) { ui->m_conductor_cb-> addItem(str); } foreach (QString str, keys_conductor)
{ ui->m_conductor_cb-> addItem(str); }
} }
//Element Combobox //Element Combobox
ui->m_element_cb->addItem(""); ui->m_element_cb->addItem("");
QList <QString> keys_element = m_project->elementAutoNum().keys(); QList <QString> keys_element = m_project->elementAutoNum().keys();
if (!keys_element.isEmpty()) { if (!keys_element.isEmpty()) {
foreach (QString str, keys_element) {ui->m_element_cb -> addItem(str);} foreach (QString str, keys_element)
{ui->m_element_cb -> addItem(str);}
} }
//Folio Combobox //Folio Combobox
ui->m_folio_cb->addItem(""); ui->m_folio_cb->addItem("");
QList <QString> keys_folio = m_project->folioAutoNum().keys(); QList <QString> keys_folio = m_project->folioAutoNum().keys();
if (!keys_folio.isEmpty()) { if (!keys_folio.isEmpty()) {
foreach (QString str, keys_folio) { ui->m_folio_cb -> addItem(str);} foreach (QString str, keys_folio)
{ ui->m_folio_cb -> addItem(str);}
} }
this->setActive(); this->setActive();
@@ -216,7 +240,8 @@ void AutoNumberingDockWidget::conductorAutoNumChanged() {
ui->m_conductor_cb->addItem(""); ui->m_conductor_cb->addItem("");
QList <QString> keys_conductor = m_project->conductorAutoNum().keys(); QList <QString> keys_conductor = m_project->conductorAutoNum().keys();
if (!keys_conductor.isEmpty()) { if (!keys_conductor.isEmpty()) {
foreach (QString str, keys_conductor) { ui->m_conductor_cb-> addItem(str); } foreach (QString str, keys_conductor)
{ ui->m_conductor_cb-> addItem(str); }
} }
setActive(); setActive();
} }

44
sources/autoNum/ui/autonumberingmanagementw.cpp
View File

@@ -62,7 +62,8 @@ AutoNumberingManagementW::~AutoNumberingManagementW()
@brief AutoNumberingManagementW::setProjectContext @brief AutoNumberingManagementW::setProjectContext
Add Default Project Status Add Default Project Status
*/ */
void AutoNumberingManagementW::setProjectContext() { void AutoNumberingManagementW::setProjectContext()
{
ui->m_status_cb->addItem(tr("Under Development")); ui->m_status_cb->addItem(tr("Under Development"));
ui->m_status_cb->addItem(tr("Installing")); ui->m_status_cb->addItem(tr("Installing"));
ui->m_status_cb->addItem(tr("Built")); ui->m_status_cb->addItem(tr("Built"));
@@ -73,7 +74,8 @@ void AutoNumberingManagementW::setProjectContext() {
Load Default Status Options Load Default Status Options
@param index @param index
*/ */
void AutoNumberingManagementW::on_m_status_cb_currentIndexChanged(int index) { void AutoNumberingManagementW::on_m_status_cb_currentIndexChanged(int index)
{
//Under Development //Under Development
if (index == 0) { if (index == 0) {
@@ -105,7 +107,8 @@ void AutoNumberingManagementW::on_m_status_cb_currentIndexChanged(int index) {
@brief AutoNumberingManagementW::on_m_apply_folios_rb_clicked @brief AutoNumberingManagementW::on_m_apply_folios_rb_clicked
Set From Folios Combobox Set From Folios Combobox
*/ */
void AutoNumberingManagementW::on_m_apply_folios_rb_clicked() { void AutoNumberingManagementW::on_m_apply_folios_rb_clicked()
{
if (ui->m_apply_folios_rb->isChecked()) { if (ui->m_apply_folios_rb->isChecked()) {
ui->m_selected_folios_widget->setEnabled(true); ui->m_selected_folios_widget->setEnabled(true);
ui->m_selected_folios_le->setEnabled(true); ui->m_selected_folios_le->setEnabled(true);
@@ -114,8 +117,13 @@ void AutoNumberingManagementW::on_m_apply_folios_rb_clicked() {
ui->m_from_folios_cb->addItem(""); ui->m_from_folios_cb->addItem("");
foreach (Diagram *diagram, project_->diagrams()){ foreach (Diagram *diagram, project_->diagrams()){
if (diagram->title() != "") if (diagram->title() != "")
ui->m_from_folios_cb->addItem(diagram->title(),diagram->folioIndex()); ui->m_from_folios_cb->addItem(
else ui->m_from_folios_cb->addItem(QString::number(diagram->folioIndex()),diagram->folioIndex()); diagram->title(),
diagram->folioIndex());
else ui->m_from_folios_cb->addItem(
QString::number(
diagram->folioIndex()),
diagram->folioIndex());
} }
} }
if (ui->m_from_folios_cb->currentIndex() > 0) if (ui->m_from_folios_cb->currentIndex() > 0)
@@ -129,7 +137,9 @@ void AutoNumberingManagementW::on_m_apply_folios_rb_clicked() {
Set To Folios Combobox Set To Folios Combobox
@param index @param index
*/ */
void AutoNumberingManagementW::on_m_from_folios_cb_currentIndexChanged(int index) { void AutoNumberingManagementW::on_m_from_folios_cb_currentIndexChanged(
int index)
{
ui->m_to_folios_cb->clear(); ui->m_to_folios_cb->clear();
ui->m_selected_folios_le->clear(); ui->m_selected_folios_le->clear();
ui->m_selected_folios_le->setEnabled(true); ui->m_selected_folios_le->setEnabled(true);
@@ -159,7 +169,8 @@ void AutoNumberingManagementW::on_m_from_folios_cb_currentIndexChanged(int index
Set selected folios Line Edit content Set selected folios Line Edit content
@param index @param index
*/ */
void AutoNumberingManagementW::on_m_to_folios_cb_currentIndexChanged(int index) { void AutoNumberingManagementW::on_m_to_folios_cb_currentIndexChanged(int index)
{
if (index > 0) { if (index > 0) {
QString from = ui->m_from_folios_cb->currentText(); QString from = ui->m_from_folios_cb->currentText();
QString to = ui->m_to_folios_cb->currentText(); QString to = ui->m_to_folios_cb->currentText();
@@ -174,7 +185,8 @@ void AutoNumberingManagementW::on_m_to_folios_cb_currentIndexChanged(int index)
@brief AutoNumberingManagementW::on_m_apply_project_rb_clicked @brief AutoNumberingManagementW::on_m_apply_project_rb_clicked
Disable folio widget Disable folio widget
*/ */
void AutoNumberingManagementW::on_m_apply_project_rb_clicked() { void AutoNumberingManagementW::on_m_apply_project_rb_clicked()
{
ui->m_selected_folios_widget->setDisabled(true); ui->m_selected_folios_widget->setDisabled(true);
ui->m_selected_folios_le->setDisabled(true); ui->m_selected_folios_le->setDisabled(true);
applyEnable(true); applyEnable(true);
@@ -185,11 +197,12 @@ void AutoNumberingManagementW::on_m_apply_project_rb_clicked() {
Action on buttonBox clicked Action on buttonBox clicked
@param button @param button
*/ */
void AutoNumberingManagementW::on_buttonBox_clicked(QAbstractButton *button) { void AutoNumberingManagementW::on_buttonBox_clicked(QAbstractButton *button)
{
//transform button to int //transform button to int
int answer = ui -> buttonBox -> buttonRole(button); int answer = ui -> buttonBox -> buttonRole(button);
switch (answer) { switch (answer) {
//apply the context in the diagram displayed by diagram_chooser. //apply the context in the diagram displayed by diagram_chooser.
case QDialogButtonBox::ApplyRole: case QDialogButtonBox::ApplyRole:
applyEnable(false); applyEnable(false);
emit applyPressed(); emit applyPressed();
@@ -216,15 +229,18 @@ void AutoNumberingManagementW::on_buttonBox_clicked(QAbstractButton *button) {
enable/disable the apply button enable/disable the apply button
@param b @param b
*/ */
void AutoNumberingManagementW::applyEnable(bool b) { void AutoNumberingManagementW::applyEnable(bool b)
{
if (b){ if (b){
bool valid= true; bool valid= true;
if (ui->m_apply_project_rb->isChecked()) if (ui->m_apply_project_rb->isChecked())
ui -> buttonBox -> button(QDialogButtonBox::Apply) -> setEnabled(valid); ui->buttonBox->button(QDialogButtonBox::Apply)
->setEnabled(valid);
else if (ui->m_apply_folios_rb->isChecked()) else if (ui->m_apply_folios_rb->isChecked())
ui -> buttonBox -> button(QDialogButtonBox::Apply) -> setEnabled(valid); ui->buttonBox-> button(QDialogButtonBox::Apply)
->setEnabled(valid);
} }
else { else {
ui -> buttonBox -> button(QDialogButtonBox::Apply) -> setEnabled(b); ui->buttonBox->button(QDialogButtonBox::Apply)->setEnabled(b);
} }
} }

48
sources/autoNum/ui/folioautonumbering.cpp
View File

@@ -50,7 +50,8 @@ FolioAutonumberingW::~FolioAutonumberingW()
@brief FolioAutonumberingW::setContext @brief FolioAutonumberingW::setContext
construct autonums in the comboBox selected in the autonum_chooser QcomboBox construct autonums in the comboBox selected in the autonum_chooser QcomboBox
*/ */
void FolioAutonumberingW::setContext(QList <QString> autonums) { void FolioAutonumberingW::setContext(QList <QString> autonums)
{
foreach (QString str, autonums) { ui->m_autonums_cb->addItem(str);} foreach (QString str, autonums) { ui->m_autonums_cb->addItem(str);}
} }
@@ -58,7 +59,8 @@ void FolioAutonumberingW::setContext(QList <QString> autonums) {
@brief FolioAutonumberingW::autoNumSelected @brief FolioAutonumberingW::autoNumSelected
returns the current autonum selected returns the current autonum selected
*/ */
QString FolioAutonumberingW::autoNumSelected(){ QString FolioAutonumberingW::autoNumSelected()
{
return ui->m_autonums_cb->currentText(); return ui->m_autonums_cb->currentText();
} }
@@ -66,7 +68,8 @@ QString FolioAutonumberingW::autoNumSelected(){
@brief FolioAutonumberingW::fromFolio @brief FolioAutonumberingW::fromFolio
returns the current "From Folio" index returns the current "From Folio" index
*/ */
int FolioAutonumberingW::fromFolio(){ int FolioAutonumberingW::fromFolio()
{
return ui->m_from_cb->currentIndex()-1; return ui->m_from_cb->currentIndex()-1;
} }
@@ -74,7 +77,8 @@ int FolioAutonumberingW::fromFolio(){
@brief FolioAutonumberingW::toFolio @brief FolioAutonumberingW::toFolio
returns the current "To Folio" index returns the current "To Folio" index
*/ */
int FolioAutonumberingW::toFolio(){ int FolioAutonumberingW::toFolio()
{
return ui->m_to_cb->currentIndex()+this->fromFolio()+1; return ui->m_to_cb->currentIndex()+this->fromFolio()+1;
} }
@@ -82,14 +86,16 @@ int FolioAutonumberingW::toFolio(){
@brief FolioAutonumberingW::newFoliosNumber @brief FolioAutonumberingW::newFoliosNumber
returns the number of folios to create returns the number of folios to create
*/ */
int FolioAutonumberingW::newFoliosNumber(){ int FolioAutonumberingW::newFoliosNumber()
{
return ui->m_new_tabs_sb->value(); return ui->m_new_tabs_sb->value();
} }
/** /**
@brief FolioAutonumberingW::updateFolioList @brief FolioAutonumberingW::updateFolioList
update Folio List in From and To ComboBox update Folio List in From and To ComboBox
*/ */
void FolioAutonumberingW::updateFolioList(){ void FolioAutonumberingW::updateFolioList()
{
ui -> m_from_cb->clear(); ui -> m_from_cb->clear();
ui -> m_to_cb->clear(); ui -> m_to_cb->clear();
if (newFolios){ if (newFolios){
@@ -103,7 +109,8 @@ void FolioAutonumberingW::updateFolioList(){
@brief FolioAutonumberingW::on_m_create_new_tabs_rb_clicked @brief FolioAutonumberingW::on_m_create_new_tabs_rb_clicked
* Enable New Tabs SpinBox * Enable New Tabs SpinBox
*/ */
void FolioAutonumberingW::on_m_create_new_tabs_rb_clicked() { void FolioAutonumberingW::on_m_create_new_tabs_rb_clicked()
{
ui->m_from_cb->setEnabled(false); ui->m_from_cb->setEnabled(false);
ui->m_to_cb->setEnabled(false); ui->m_to_cb->setEnabled(false);
ui->m_new_tabs_sb->setEnabled(true); ui->m_new_tabs_sb->setEnabled(true);
@@ -115,7 +122,8 @@ void FolioAutonumberingW::on_m_create_new_tabs_rb_clicked() {
@brief FolioAutonumberingW::on_m_autonumber_tabs_rb_clicked @brief FolioAutonumberingW::on_m_autonumber_tabs_rb_clicked
* Enable From ComboBox, fill From ComboBox * Enable From ComboBox, fill From ComboBox
*/ */
void FolioAutonumberingW::on_m_autonumber_tabs_rb_clicked() { void FolioAutonumberingW::on_m_autonumber_tabs_rb_clicked()
{
ui->m_new_tabs_sb->setEnabled(false); ui->m_new_tabs_sb->setEnabled(false);
ui->m_from_cb->setEnabled(true); ui->m_from_cb->setEnabled(true);
ui->m_to_cb->setEnabled(true); ui->m_to_cb->setEnabled(true);
@@ -134,7 +142,8 @@ void FolioAutonumberingW::on_m_autonumber_tabs_rb_clicked() {
@brief FolioAutonumberingW::on_m_new_tabs_sb_valueChanged @brief FolioAutonumberingW::on_m_new_tabs_sb_valueChanged
* Enable Apply if any new folio is to be created * Enable Apply if any new folio is to be created
*/ */
void FolioAutonumberingW::on_m_new_tabs_sb_valueChanged(int){ void FolioAutonumberingW::on_m_new_tabs_sb_valueChanged(int)
{
if (ui->m_new_tabs_sb->value()>0) applyEnable(true); if (ui->m_new_tabs_sb->value()>0) applyEnable(true);
else applyEnable(false); else applyEnable(false);
} }
@@ -143,13 +152,15 @@ void FolioAutonumberingW::on_m_new_tabs_sb_valueChanged(int){
@brief FolioAutonumberingW::on_m_from_cb_currentIndexChanged @brief FolioAutonumberingW::on_m_from_cb_currentIndexChanged
* Enable To ComboBox * Enable To ComboBox
*/ */
void FolioAutonumberingW::on_m_from_cb_currentIndexChanged(int){ void FolioAutonumberingW::on_m_from_cb_currentIndexChanged(int)
{
int index = ui->m_from_cb->currentIndex(); int index = ui->m_from_cb->currentIndex();
ui->m_to_cb->clear(); ui->m_to_cb->clear();
if (index > 0){ if (index > 0){
ui->m_to_cb->setEnabled(true); ui->m_to_cb->setEnabled(true);
for (int i=index;i<project_->diagrams().size();i++) for (int i=index;i<project_->diagrams().size();i++)
ui->m_to_cb->addItem(project_->diagrams().at(i)->title()); ui->m_to_cb->addItem(project_
->diagrams().at(i)->title());
applyEnable(true); applyEnable(true);
} }
else{ else{
@@ -162,7 +173,8 @@ void FolioAutonumberingW::on_m_from_cb_currentIndexChanged(int){
@brief SelectAutonumW::on_buttonBox_clicked @brief SelectAutonumW::on_buttonBox_clicked
Action on buttonBox clicked Action on buttonBox clicked
*/ */
void FolioAutonumberingW::on_buttonBox_clicked(QAbstractButton *button) { void FolioAutonumberingW::on_buttonBox_clicked(QAbstractButton *button)
{
//transform button to int //transform button to int
int answer = ui -> buttonBox -> buttonRole(button); int answer = ui -> buttonBox -> buttonRole(button);
@@ -200,19 +212,23 @@ void FolioAutonumberingW::on_buttonBox_clicked(QAbstractButton *button) {
@brief SelectAutonumW::applyEnable @brief SelectAutonumW::applyEnable
enable/disable the apply button enable/disable the apply button
*/ */
void FolioAutonumberingW::applyEnable(bool b) { void FolioAutonumberingW::applyEnable(bool b)
{
if (b){ if (b){
bool valid = true; bool valid = true;
if (ui->m_create_new_tabs_rb->isChecked()){ if (ui->m_create_new_tabs_rb->isChecked()){
if (ui->m_new_tabs_sb->value()==0) valid = false; if (ui->m_new_tabs_sb->value()==0) valid = false;
ui->buttonBox->button(QDialogButtonBox::Apply)->setEnabled(valid); ui->buttonBox->button(QDialogButtonBox::Apply)
->setEnabled(valid);
} }
else{ else{
if (ui->m_to_cb->currentText()=="") valid = false; if (ui->m_to_cb->currentText()=="") valid = false;
ui->buttonBox->button(QDialogButtonBox::Apply)->setEnabled(valid); ui->buttonBox->button(QDialogButtonBox::Apply)
->setEnabled(valid);
} }
} }
else{ else{
ui -> buttonBox -> button(QDialogButtonBox::Apply) -> setEnabled(b); ui->buttonBox->button(QDialogButtonBox::Apply)
->setEnabled(b);
} }
} }

13
sources/autoNum/ui/formulaautonumberingw.cpp
View File

@@ -28,7 +28,6 @@
FormulaAutonumberingW::FormulaAutonumberingW(QWidget *parent) : FormulaAutonumberingW::FormulaAutonumberingW(QWidget *parent) :
QWidget(parent), QWidget(parent),
ui(new Ui::FormulaAutonumberingW) ui(new Ui::FormulaAutonumberingW)
{ {
ui->setupUi(this); ui->setupUi(this);
setContext(formula_); setContext(formula_);
@@ -46,7 +45,8 @@ FormulaAutonumberingW::~FormulaAutonumberingW()
@brief FormulaAutonumberingW::setContext @brief FormulaAutonumberingW::setContext
@param formula to be inserted into context @param formula to be inserted into context
*/ */
void FormulaAutonumberingW::setContext(const QString& formula) { void FormulaAutonumberingW::setContext(const QString& formula)
{
ui->m_formula_le->insert(formula); ui->m_formula_le->insert(formula);
} }
@@ -54,7 +54,8 @@ void FormulaAutonumberingW::setContext(const QString& formula) {
@brief FormulaAutonumberingW::clearContext @brief FormulaAutonumberingW::clearContext
@param clear formula line edit text @param clear formula line edit text
*/ */
void FormulaAutonumberingW::clearContext() { void FormulaAutonumberingW::clearContext()
{
ui->m_formula_le->clear(); ui->m_formula_le->clear();
} }
@@ -62,7 +63,8 @@ void FormulaAutonumberingW::clearContext() {
@brief FormulaAutonumberingW::formula @brief FormulaAutonumberingW::formula
@return formula to be stored into project @return formula to be stored into project
*/ */
QString FormulaAutonumberingW::formula() { QString FormulaAutonumberingW::formula()
{
return ui->m_formula_le->text(); return ui->m_formula_le->text();
} }
@@ -70,6 +72,7 @@ QString FormulaAutonumberingW::formula() {
@brief FormulaAutonumberingW::on_m_formula_le_textChanged @brief FormulaAutonumberingW::on_m_formula_le_textChanged
Update Apply Button Update Apply Button
*/ */
void FormulaAutonumberingW::on_m_formula_le_textChanged(QString text) { void FormulaAutonumberingW::on_m_formula_le_textChanged(QString text)
{
emit (textChanged(std::move(text))); emit (textChanged(std::move(text)));
} }

77
sources/autoNum/ui/numparteditorw.cpp
View File

@@ -60,20 +60,34 @@ NumPartEditorW::NumPartEditorW (NumerotationContext &context,
else { else {
QStringList strl = context.itemAt(i); QStringList strl = context.itemAt(i);
if (strl.at(0)=="unit") setType(NumPartEditorW::unit, true); if (strl.at(0)=="unit")
else if (strl.at(0)=="unitfolio") setType(NumPartEditorW::unitfolio, true); setType(NumPartEditorW::unit, true);
else if (strl.at(0)=="ten") setType(NumPartEditorW::ten, true); else if (strl.at(0)=="unitfolio")
else if (strl.at(0)=="tenfolio") setType(NumPartEditorW::tenfolio, true); setType(NumPartEditorW::unitfolio, true);
else if (strl.at(0)=="hundred") setType(NumPartEditorW::hundred, true); else if (strl.at(0)=="ten")
else if (strl.at(0)=="hundredfolio") setType(NumPartEditorW::hundredfolio, true); setType(NumPartEditorW::ten, true);
else if (strl.at(0)=="string") setType(NumPartEditorW::string); else if (strl.at(0)=="tenfolio")
else if (strl.at(0)=="idfolio") setType(NumPartEditorW::idfolio); setType(NumPartEditorW::tenfolio, true);
else if (strl.at(0)=="folio") setType(NumPartEditorW::folio); else if (strl.at(0)=="hundred")
else if (strl.at(0)=="plant") setType(NumPartEditorW::plant); setType(NumPartEditorW::hundred, true);
else if (strl.at(0)=="locmach") setType(NumPartEditorW::locmach); else if (strl.at(0)=="hundredfolio")
else if (strl.at(0)=="elementline") setType(NumPartEditorW::elementline); setType(NumPartEditorW::hundredfolio, true);
else if (strl.at(0)=="elementcolumn") setType(NumPartEditorW::elementcolumn); else if (strl.at(0)=="string")
else if (strl.at(0)=="elementprefix") setType(NumPartEditorW::elementprefix); setType(NumPartEditorW::string);
else if (strl.at(0)=="idfolio")
setType(NumPartEditorW::idfolio);
else if (strl.at(0)=="folio")
setType(NumPartEditorW::folio);
else if (strl.at(0)=="plant")
setType(NumPartEditorW::plant);
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);
else if (strl.at(0)=="elementprefix")
setType(NumPartEditorW::elementprefix);
ui -> value_field -> setText(strl.at(1)); ui -> value_field -> setText(strl.at(1));
ui -> increase_spinBox -> setValue(strl.at(2).toInt()); ui -> increase_spinBox -> setValue(strl.at(2).toInt());
} }
@@ -275,10 +289,27 @@ void NumPartEditorW::setType(NumPartEditorW::type t, bool fnum) {
//if @t is a numeric type and preview type @type_ isn't a numeric type //if @t is a numeric type and preview type @type_ isn't a numeric type
//or @fnum is true, we set numeric behavior //or @fnum is true, we set numeric behavior
if ( ((t==unit || t==unitfolio || t==ten || t==tenfolio || t==hundred || t==hundredfolio) && if (
(type_==string || type_==folio || type_==plant || type_==locmach ||type_==idfolio || (
type_==elementcolumn || type_==elementline || type_==elementprefix)) (t==unit
|| fnum) { || t==unitfolio
|| t==ten
|| t==tenfolio
|| t==hundred
|| t==hundredfolio
)
&& (type_==string
|| type_==folio
|| type_==plant
|| type_==locmach
|| type_==idfolio
|| type_==elementcolumn
|| type_==elementline
|| type_==elementprefix)
)
|| fnum
)
{
ui -> value_field -> clear(); ui -> value_field -> clear();
ui -> value_field -> setEnabled(true); ui -> value_field -> setEnabled(true);
ui -> value_field -> setValidator(intValidator); ui -> value_field -> setValidator(intValidator);
@@ -286,8 +317,14 @@ void NumPartEditorW::setType(NumPartEditorW::type t, bool fnum) {
ui -> increase_spinBox -> setValue(1); ui -> increase_spinBox -> setValue(1);
} }
//@t isn't a numeric type //@t isn't a numeric type
else if (t == string || t == folio || t == idfolio || t == elementline || t == plant || t == locmach || else if (t == string
t == elementcolumn || t == elementprefix) { || t == folio
|| t == idfolio
|| t == elementline
|| t == plant
|| t == locmach
|| t == elementcolumn
|| t == elementprefix) {
ui -> value_field -> clear(); ui -> value_field -> clear();
ui -> increase_spinBox -> setDisabled(true); ui -> increase_spinBox -> setDisabled(true);
if (t==string) { if (t==string) {

18
sources/autoNum/ui/numparteditorw.h
View File

@@ -22,15 +22,16 @@
#include <QValidator> #include <QValidator>
#include "numerotationcontext.h" #include "numerotationcontext.h"
/**
*This class represent a single part num widget. By this widget, we can define and edit
*how the num auto must work .
*This widget is called by selectautonumw.
*/
namespace Ui { namespace Ui {
class NumPartEditorW; class NumPartEditorW;
} }
/**
@brief The NumPartEditorW class
This class represent a single part num widget.
By this widget, we can define and edit how the num auto must work.
This widget is called by selectautonumw.
*/
class NumPartEditorW : public QWidget class NumPartEditorW : public QWidget
{ {
Q_OBJECT Q_OBJECT
@@ -38,7 +39,10 @@ class NumPartEditorW : public QWidget
//METHODS //METHODS
public: public:
explicit NumPartEditorW(int type, QWidget *parent = nullptr); explicit NumPartEditorW(int type, QWidget *parent = nullptr);
NumPartEditorW (NumerotationContext &, int, int type, QWidget *parent=nullptr); NumPartEditorW (NumerotationContext &,
int,
int type,
QWidget *parent=nullptr);
~NumPartEditorW() override; ~NumPartEditorW() override;
enum type {unit,unitfolio,ten,tenfolio, hundred, hundredfolio, enum type {unit,unitfolio,ten,tenfolio, hundred, hundredfolio,
@@ -66,7 +70,7 @@ class NumPartEditorW : public QWidget
private: private:
Ui::NumPartEditorW *ui; Ui::NumPartEditorW *ui;
QValidator *intValidator; QValidator *intValidator;
int m_edited_type = -1; //0 == element : 1 == conductor : 2 == folio int m_edited_type = -1; ///<0 == element : 1 == conductor : 2 == folio

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

@@ -24,15 +24,18 @@
#include "ui_formulaautonumberingw.h" #include "ui_formulaautonumberingw.h"
#include "assignvariables.h" #include "assignvariables.h"
/** /**
@brief SelectAutonumW::SelectAutonumW
Constructor Constructor
@param type : int m_edited_type
@param parent : QWidget
*/ */
SelectAutonumW::SelectAutonumW(int type, QWidget *parent) : SelectAutonumW::SelectAutonumW(int type, QWidget *parent) :
QWidget(parent), QWidget(parent),
ui(new Ui::SelectAutonumW), ui(new Ui::SelectAutonumW),
m_edited_type(type) m_edited_type(type)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->m_comboBox->lineEdit()->setClearButtonEnabled(true); ui->m_comboBox->lineEdit()->setClearButtonEnabled(true);
if (m_edited_type == 0) if (m_edited_type == 0)
@@ -50,6 +53,13 @@ SelectAutonumW::SelectAutonumW(int type, QWidget *parent) :
setContext(NumerotationContext()); setContext(NumerotationContext());
} }
/**
@brief SelectAutonumW::SelectAutonumW
Constructor
@param context : NumerotationContext
@param type : int m_edited_type
@param parent : QWidget
*/
SelectAutonumW::SelectAutonumW(const NumerotationContext &context, SelectAutonumW::SelectAutonumW(const NumerotationContext &context,
int type, int type,
QWidget *parent) : QWidget *parent) :
@@ -74,6 +84,7 @@ SelectAutonumW::SelectAutonumW(const NumerotationContext &context,
} }
/** /**
@brief SelectAutonumW::~SelectAutonumW
Destructor Destructor
*/ */
SelectAutonumW::~SelectAutonumW() SelectAutonumW::~SelectAutonumW()
@@ -181,7 +192,8 @@ QComboBox *SelectAutonumW::contextComboBox() const
Action on button clicked Action on button clicked
@param button @param button
*/ */
void SelectAutonumW::on_buttonBox_clicked(QAbstractButton *button) { void SelectAutonumW::on_buttonBox_clicked(QAbstractButton *button)
{
//transform button to int //transform button to int
int answer = ui -> buttonBox -> buttonRole(button); int answer = ui -> buttonBox -> buttonRole(button);
switch (answer) { switch (answer) {