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

Conductor : formula and text is now two different things.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4799 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2016-12-06 19:49:18 +00:00
parent c0b5aa7a59
commit 7ab0115c62
16 changed files with 213 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sources/autoNum/assignvariables.cpp
View File

@@ -334,7 +334,6 @@ namespace autonum
//Add location name to path array
while((current_location.parent() != current_location) && (current_location.parent().fileName() != "import"))
{
qDebug() << "i = " << i << " " << current_location.fileName();
i++;
path[i]=current_location.fileName();
current_location = current_location.parent();

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

@@ -191,15 +191,8 @@ void AutoNumberingDockWidget::conductorAutoNumChanged() {
void AutoNumberingDockWidget::on_m_conductor_cb_activated(int)
{
QString current_autonum = ui->m_conductor_cb->currentText();
QString current_formula = m_project->conductorAutoNumFormula(current_autonum);
if (!current_autonum.isEmpty()) {
m_project->setConductorAutoNumCurrentFormula(current_formula, current_autonum);
}
else {
m_project->setConductorAutoNumCurrentFormula("","");
}
m_project->setCurrentConductorAutoNum(current_autonum);
m_project_view->currentDiagram()->diagram()->setConductorsAutonumName(current_autonum);
m_project_view->currentDiagram()->diagram()->loadCndFolioSeq();
}