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

Modifie the text item of a conductor directly on a diagram also change the value of formula and label of the conductor property.

Browse Source 
The change is apply for every conductors in the same potential


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4814 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2016-12-19 15:57:20 +00:00
parent 1698d0bebd
commit d8a374629b
9 changed files with 169 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
sources/ui/potentialselectordialog.cpp
View File

@@ -24,6 +24,7 @@
#include "diagram.h"
#include "element.h"
#include "reportelement.h"
#include "assignvariables.h"
//### BEGIN PRIVATE CLASS ###//
@@ -43,8 +44,8 @@ class NewConductorPotentialSelector : public AbstractPotentialSelector
terminal_1->removeConductor(conductor);
terminal_2->removeConductor(conductor);
getPotential(terminal_1, m_properties_1, m_conductor_number_1);
getPotential(terminal_2, m_properties_2, m_conductor_number_2);
getPotential(terminal_1, m_properties_1, m_seq_num_1, m_conductor_number_1);
getPotential(terminal_2, m_properties_2, m_seq_num_2, m_conductor_number_2);
//There isn't a potential at terminal 1 or 2.
if (m_conductor_number_1 == 0 && m_conductor_number_2 == 0) return;
@@ -64,7 +65,7 @@ class NewConductorPotentialSelector : public AbstractPotentialSelector
* @param properties
* @param number
*/
void getPotential(Terminal *terminal, ConductorProperties &properties, int &number)
void getPotential(Terminal *terminal, ConductorProperties &properties, autonum::sequentialNumbers &seq_num , int &number)
{
Conductor *conductor_in_potential = nullptr;
@@ -99,6 +100,7 @@ class NewConductorPotentialSelector : public AbstractPotentialSelector
if (!conductor_in_potential) return;
properties = conductor_in_potential->properties();
seq_num = conductor_in_potential->sequenceNum();
number = conductor_in_potential->relatedPotentialConductors().size()+1; //We add +1 because conductor_in_potential isn't count by relatedPotentialConductors
}
@@ -171,7 +173,7 @@ PotentialSelectorDialog::PotentialSelectorDialog(Conductor *conductor, QUndoComm
* Constructor when we link two potentiels together, with a folio report.
* @param report : one of the report used to link the potentials (report must be linked to another report)
* @param parent_undo : undo parent to use
* @param parent : paren widget
* @param parent : parent widget
*/
PotentialSelectorDialog::PotentialSelectorDialog(Element *report, QUndoCommand *parent_undo, QWidget *parent) :
QDialog(parent),
@@ -200,8 +202,22 @@ void PotentialSelectorDialog::buildWidget()
QRadioButton *rb1 = new QRadioButton(tr("Le potentiel avec numero de fil %1 est présent %2 fois").arg(m_potential_selector->m_properties_1.text).arg(m_potential_selector->m_conductor_number_1), this);
QRadioButton *rb2 = new QRadioButton(tr("Le potentiel avec numero de fil %1 est présent %2 fois").arg(m_potential_selector->m_properties_2.text).arg(m_potential_selector->m_conductor_number_2), this);
connect(rb1, &QRadioButton::toggled, [this](bool t){if(t) this->m_selected_properties = this->m_potential_selector->m_properties_1;});
connect(rb2, &QRadioButton::toggled, [this](bool t){if(t) this->m_selected_properties = this->m_potential_selector->m_properties_2;});
connect(rb1, &QRadioButton::toggled, [this](bool t)
{
if(t)
{
this->m_selected_properties = this->m_potential_selector->m_properties_1;
this->m_sequential_num = this->m_potential_selector->m_seq_num_1;
}
});
connect(rb2, &QRadioButton::toggled, [this](bool t)
{
if(t)
{
this->m_selected_properties = this->m_potential_selector->m_properties_2;
this->m_sequential_num = this->m_potential_selector->m_seq_num_2;
}
});
//Set the radio button of potential with the bigger number of conductors,
//at first position, and check it
@@ -232,6 +248,7 @@ void PotentialSelectorDialog::on_buttonBox_accepted()
ConductorProperties new_properties = m_conductor->properties();
new_properties.text = m_selected_properties.text;
new_properties.m_formula = m_selected_properties.m_formula;
new_properties.m_function = m_selected_properties.m_function;
new_properties.m_tension_protocol = m_selected_properties.m_tension_protocol;
@@ -239,19 +256,32 @@ void PotentialSelectorDialog::on_buttonBox_accepted()
old_value.setValue(m_conductor->properties());
new_value.setValue(new_properties);
QUndoCommand *undo = nullptr;
if (m_parent_undo)
undo = m_parent_undo;
else
undo = new QUndoCommand(tr("Modifier les propriétés de plusieurs conducteurs", "undo caption"));
//Set the properties for the new conductor
QPropertyUndoCommand *undo = new QPropertyUndoCommand(m_conductor, "properties", old_value, new_value, m_parent_undo);
undo->setText(tr("Modifier les propriétés de plusieurs conducteurs", "undo caption"));
QVariant old_seq, new_seq;
old_seq.setValue(m_conductor->sequenceNum());
new_seq.setValue(m_sequential_num);
new QPropertyUndoCommand(m_conductor, "sequenceNum", old_seq, new_seq, undo);
new QPropertyUndoCommand(m_conductor, "properties", old_value, new_value, undo);
//Set the new properties for each conductors of the new potential
foreach(Conductor *cond, m_conductor->relatedPotentialConductors())
{
new_properties = cond->properties();
new_properties.text = m_selected_properties.text;
new_properties.m_formula = m_selected_properties.m_formula;
new_properties.m_function = m_selected_properties.m_function;
new_properties.m_tension_protocol = m_selected_properties.m_tension_protocol;
old_value.setValue(cond->properties());
new_value.setValue(new_properties);
old_seq.setValue(cond->sequenceNum());
new QPropertyUndoCommand(cond, "sequenceNum", old_seq, new_seq, undo);
new QPropertyUndoCommand(cond, "properties", old_value, new_value, undo);
}
@@ -263,6 +293,7 @@ void PotentialSelectorDialog::on_buttonBox_accepted()
else
{
delete undo;
m_conductor->setSequenceNum(m_sequential_num);
m_conductor->setProperties(new_properties);
}
}