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

conductor autonum. Diagram save current selected autonum.

Browse Source 
Readd dialog to select texts, when potential have different texts


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3251 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2014-08-04 14:39:57 +00:00
parent deaf53fa74
commit f918917c7a
7 changed files with 285 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sources/conductorautonumerotation.cpp
View File

@@ -16,12 +16,12 @@
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/
#include "conductorautonumerotation.h"
#include "conductorautonumerotationwidget.h"
#include "diagramcommands.h"
#include "numerotationcontextcommands.h"
#include "qetdiagrameditor.h"
#include "conductor.h"
#include "diagram.h"
#include "potentialtextsdialog.h"
/**
*Constructor
@@ -45,10 +45,10 @@ void ConductorAutoNumerotation::numerate() {
/**
* @brief ConductorAutoNumerotation::checkPotential
* Check if text of this potential is identical.
* Check if eah texts of this potential is identical.
* If not, ask user how to numerate
* @param conductor
* One conductor of this potential.
* A conductor of the potential to check.
*/
void ConductorAutoNumerotation::checkPotential(Conductor *conductor) {
//fill list of potential
@@ -60,10 +60,11 @@ void ConductorAutoNumerotation::checkPotential(Conductor *conductor) {
//check text list, isn't same in potential, ask user what to do
if (!eachIsEqual(strl)) {
ConductorAutoNumerotationWidget canw(c_list, conductor -> diagramEditor());
ConductorAutoNumerotation can(conductor);
//connect(&canw, SIGNAL(textIsSelected(QString)), &can, SLOT(applyText(QString)));
canw.exec();
PotentialTextsDialog ptd(conductor, conductor->diagramEditor());
if ( ptd.exec() == QDialog::Accepted ) {
ConductorAutoNumerotation can(conductor);
can.applyText(ptd.selectedText());
}
}
}
@@ -118,10 +119,10 @@ void ConductorAutoNumerotation::numeratePotential() {
}
//the texts isn't identicals
else {
ConductorAutoNumerotationWidget *canw = new ConductorAutoNumerotationWidget(conductor_list, conductor_ -> diagramEditor());
/*connect(canw, SIGNAL(textIsSelected(QString)),
this, SLOT(applyText(QString)));*/
canw -> exec();
PotentialTextsDialog ptd (conductor_, conductor_ -> diagramEditor());
if (ptd.exec() == QDialog::Accepted) {
applyText(ptd.selectedText());
}
}
}