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

Allow blank selection in Auto Numbering Dock

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4580 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
dfochi
2016-07-18 15:23:30 +00:00
parent 5cd00517c5
commit cd3723920e
4 changed files with 45 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sources/configpages.cpp
View File

@@ -114,6 +114,7 @@ void NewDiagramPage::applyConf() {
if (m_project -> defaultTitleBlockProperties() != new_tbt_prop) { if (m_project -> defaultTitleBlockProperties() != new_tbt_prop) {
m_project -> setDefaultTitleBlockProperties(ipw -> properties()); m_project -> setDefaultTitleBlockProperties(ipw -> properties());
modified_project = true; modified_project = true;
emit (m_project->defaultTitleBlockPropertiesChanged());
} }
ConductorProperties new_conductor_prop = cpw -> properties(); ConductorProperties new_conductor_prop = cpw -> properties();
@@ -161,7 +162,7 @@ void NewDiagramPage::applyConf() {
xrp.toSettings(settings, str += key); xrp.toSettings(settings, str += key);
} }
} }
emit (m_project->defaultTitleBlockPropertiesChanged());
} }
/** /**

2
sources/qetgraphicsitem/customelement.cpp
View File

@@ -309,7 +309,7 @@ void CustomElement::parseLabels() {
prefix = rxml.readElementText(); prefix = rxml.readElementText();
DiagramContext &dc = this->rElementInformations(); DiagramContext &dc = this->rElementInformations();
//if there is a formula to assign, assign it //if there is a formula to assign, assign it
if (!location().project()->elementAutoNumFormula().isEmpty() && this->linkType()!=Element::Slave) { if (!(location().project()->elementAutoNumFormula().isEmpty()) && (location().project()->elementAutoNumFormula() != "") && (this->linkType()!=Element::Slave)) {
QString formula = location().project()->elementAutoNumFormula(); QString formula = location().project()->elementAutoNumFormula();
this->setPrefix(prefix); this->setPrefix(prefix);
dc.addValue("label", formula); dc.addValue("label", formula);

8
sources/qetproject.cpp
View File

@@ -1416,9 +1416,11 @@ void QETProject::writeDefaultPropertiesXml(QDomElement &xml_element) {
element_autonums.setAttribute("current_formula", m_current_element_formula); element_autonums.setAttribute("current_formula", m_current_element_formula);
foreach (QString key, elementAutoNum().keys()) { foreach (QString key, elementAutoNum().keys()) {
QDomElement element_autonum = elementAutoNum(key).toXml(xml_document, "element_autonum"); QDomElement element_autonum = elementAutoNum(key).toXml(xml_document, "element_autonum");
element_autonum.setAttribute("title", key); if (key != "" && elementAutoNumFormula(key) != "") {
element_autonum.setAttribute("formula", elementAutoNumFormula(key)); element_autonum.setAttribute("title", key);
element_autonums.appendChild(element_autonum); element_autonum.setAttribute("formula", elementAutoNumFormula(key));
element_autonums.appendChild(element_autonum);
}
} }
xml_element.appendChild(element_autonums); xml_element.appendChild(element_autonums);
} }

57
sources/ui/autonumberingdockwidget.cpp
View File

@@ -103,18 +103,21 @@ void AutoNumberingDockWidget::setContext() {
this->clear(); this->clear();
//Conductor Combobox //Conductor Combobox
ui->m_conductor_cb->addItem("");
QList <QString> keys_conductor = project_->conductorAutoNum().keys(); QList <QString> keys_conductor = 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("");
QList <QString> keys_element = project_->elementAutoNum().keys(); QList <QString> keys_element = 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("");
QList <QString> keys_folio = project_->folioAutoNum().keys(); QList <QString> keys_folio = 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);}
@@ -142,22 +145,24 @@ void AutoNumberingDockWidget::setConductorActive(DiagramView* dv) {
void AutoNumberingDockWidget::setActive() { void AutoNumberingDockWidget::setActive() {
if (projectview_!=NULL) { if (projectview_!=NULL) {
//Conductor //Conductor
QString conductor_autonum = projectview_->currentDiagram()->diagram()->conductorsAutonumName(); QString conductor_autonum = projectview_->currentDiagram()->diagram()->conductorsAutonumName();
int conductor_index = ui->m_conductor_cb->findText(conductor_autonum); int conductor_index = ui->m_conductor_cb->findText(conductor_autonum);
ui->m_conductor_cb->setCurrentIndex(conductor_index); ui->m_conductor_cb->setCurrentIndex(conductor_index);
//Element //Element
QString current_element_autonum = project_->elementCurrentAutoNum(); QString current_element_autonum = project_->elementCurrentAutoNum();
QString element_formula = project_->elementAutoNumFormula(); QString element_formula = project_->elementAutoNumFormula();
QString active_element_autonum = project_->elementAutoNum_2().key(element_formula); QString active_element_autonum = project_->elementAutoNum_2().key(element_formula);
int el_index = ui->m_element_cb->findText(active_element_autonum); int el_index = ui->m_element_cb->findText(active_element_autonum);
ui->m_element_cb->setCurrentIndex(el_index); ui->m_element_cb->setCurrentIndex(el_index);
//Folio //Folio
QString page_autonum = project_->defaultTitleBlockProperties().auto_page_num; if (project_->defaultTitleBlockProperties().folio == "%autonum") {
int folio_index = ui->m_folio_cb->findText(page_autonum); QString page_autonum = project_->defaultTitleBlockProperties().auto_page_num;
ui->m_folio_cb->setCurrentIndex(folio_index); int folio_index = ui->m_folio_cb->findText(page_autonum);
ui->m_folio_cb->setCurrentIndex(folio_index);
}
} }
} }
@@ -170,6 +175,7 @@ void AutoNumberingDockWidget::conductorAutoNumChanged() {
ui->m_conductor_cb->clear(); ui->m_conductor_cb->clear();
//Conductor Combobox //Conductor Combobox
ui->m_conductor_cb->addItem("");
QList <QString> keys_conductor = project_->conductorAutoNum().keys(); QList <QString> keys_conductor = 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); }
@@ -196,6 +202,7 @@ void AutoNumberingDockWidget::elementAutoNumChanged() {
ui->m_element_cb->clear(); ui->m_element_cb->clear();
//Element Combobox //Element Combobox
ui->m_element_cb->addItem("");
QList <QString> keys_element = project_->elementAutoNum().keys(); QList <QString> keys_element = 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);}
@@ -210,10 +217,12 @@ void AutoNumberingDockWidget::elementAutoNumChanged() {
*/ */
void AutoNumberingDockWidget::on_m_element_cb_activated(int) { void AutoNumberingDockWidget::on_m_element_cb_activated(int) {
QString current_autonum = ui->m_element_cb->currentText(); QString current_autonum = ui->m_element_cb->currentText();
QString current_formula = project_->elementAutoNumFormula(); QString current_formula = project_->elementAutoNumFormula(current_autonum);
if (current_formula!=NULL) { if (current_autonum != "") {
project_->setElementAutoNumCurrentFormula(current_formula, current_autonum); project_->setElementAutoNumCurrentFormula(current_formula, current_autonum);
} }
else
project_->setElementAutoNumCurrentFormula("","");
} }
/** /**
@@ -225,6 +234,7 @@ void AutoNumberingDockWidget::folioAutoNumChanged() {
ui->m_folio_cb->clear(); ui->m_folio_cb->clear();
//Folio Combobox //Folio Combobox
ui->m_folio_cb->addItem("");
QList <QString> keys_folio = project_->folioAutoNum().keys(); QList <QString> keys_folio = 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);}
@@ -239,8 +249,15 @@ void AutoNumberingDockWidget::folioAutoNumChanged() {
*/ */
void AutoNumberingDockWidget::on_m_folio_cb_activated(int) { void AutoNumberingDockWidget::on_m_folio_cb_activated(int) {
QString current_autonum = ui->m_folio_cb->currentText(); QString current_autonum = ui->m_folio_cb->currentText();
TitleBlockProperties ip = project_->defaultTitleBlockProperties(); TitleBlockProperties ip = project_ -> defaultTitleBlockProperties();
ip.setAutoPageNum(current_autonum); if (current_autonum != "") {
project_->setDefaultTitleBlockProperties(ip); ip.setAutoPageNum(current_autonum);
emit(folioAutoNumChanged(current_autonum)); ip.folio = "%autonum";
project_->setDefaultTitleBlockProperties(ip);
}
else {
ip.folio = "%id/%total";
project_->setDefaultTitleBlockProperties(ip);
}
emit(folioAutoNumChanged(current_autonum));
} }