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

Conductor : remove the possibility to have different texts on the same potential

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4150 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2015-08-22 13:18:20 +00:00
parent 185d6adfdd
commit 3336237a3f
4 changed files with 73 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sources/conductorautonumerotation.cpp
View File

@@ -114,22 +114,25 @@ void ConductorAutoNumerotation::applyText(QString t)
* @brief ConductorAutoNumerotation::numeratePotential
* Numerate a conductor on an existing potential
*/
void ConductorAutoNumerotation::numeratePotential() {
void ConductorAutoNumerotation::numeratePotential()
{
QStringList strl;
foreach (const Conductor *cc, conductor_list) strl<<(cc->text());
//the texts is identicals
if (QET::eachStrIsEqual(strl)) {
if (QET::eachStrIsEqual(strl))
{
ConductorProperties cp = conductor_ -> properties();
cp.text = strl.at(0);
conductor_ -> setProperties(cp);
conductor_ -> setText(strl.at(0));
}
//the texts isn't identicals
else {
//the texts isn't identicals
else
{
PotentialTextsDialog ptd (conductor_, conductor_ -> diagramEditor());
if (ptd.exec() == QDialog::Accepted) {
applyText(ptd.selectedText());
}
ptd.exec();
applyText(ptd.selectedText());
}
}

65
sources/qetgraphicsitem/conductor.cpp
View File

@@ -90,15 +90,11 @@ Conductor::Conductor(Terminal *p1, Terminal* p2) :
setFlags(QGraphicsItem::ItemIsSelectable);
setAcceptHoverEvents(true);
// ajout du champ de texte editable
// Add the text field
text_item = new ConductorTextItem(properties_.text, this);
text_item -> setFlag(QGraphicsItem::ItemStacksBehindParent);
connect(
text_item,
SIGNAL(diagramTextChanged(DiagramTextItem *, const QString &, const QString &)),
this,
SLOT(displayedTextChanged())
);
connect(text_item, &ConductorTextItem::diagramTextChanged, this, &Conductor::displayedTextChanged);
}
/**
@@ -1392,43 +1388,38 @@ void Conductor::setHighlighted(Conductor::Highlight hl) {
}
/**
Met a jour les proprietes du conducteur apres modification du champ de texte affiche
*/
void Conductor::displayedTextChanged() {
// verifie que le texte a reellement change
if (text_item -> toPlainText() == properties_.text) return;
* @brief Conductor::displayedTextChanged
* Update the properties (text) of this conductor and other conductors
* at the same potential of this conductor.
*/
void Conductor::displayedTextChanged()
{
if ((text_item->toPlainText() == properties_.text) || !diagram()) return;
if (Diagram *my_diagram = diagram())
QVariant old_value, new_value;
old_value.setValue(properties_);
ConductorProperties new_properties(properties_);
new_properties.text = text_item -> toPlainText();
new_value.setValue(new_properties);
QPropertyUndoCommand *undo = new QPropertyUndoCommand(this, "properties", old_value, new_value);
undo->setText(tr("Modifier les propriétés d'un conducteur", "undo caption"));
if (!relatedPotentialConductors().isEmpty())
{
int qmbreturn=0;
//if conductor isn't alone at this potential
//ask user to apply text on every conductors of this potential
if (relatedPotentialConductors().size() >= 1)
{
qmbreturn = QMessageBox::question(diagramEditor(), tr("Textes de conducteurs"),
tr("Voulez-vous appliquer le nouveau texte \n"
"à l'ensemble des conducteurs de ce potentiel ?"),
QMessageBox::No| QMessageBox::Yes, QMessageBox::Yes);
if (qmbreturn == QMessageBox::Yes)
{
ConductorAutoNumerotation can(this, my_diagram);
can.applyText(text_item -> toPlainText());
}
}
undo->setText(tr("Modifier les propriétés de plusieurs conducteurs", "undo caption"));
if (qmbreturn == 0 || qmbreturn == QMessageBox::No)
foreach (Conductor *potential_conductor, relatedPotentialConductors())
{
QVariant old_value, new_value;
old_value.setValue(properties_);
ConductorProperties new_properties(properties_);
new_properties.text = text_item -> toPlainText();
old_value.setValue(potential_conductor->properties());
ConductorProperties new_properties = potential_conductor->properties();
new_properties.text = text_item->toPlainText();
new_value.setValue(new_properties);
QPropertyUndoCommand *undo = new QPropertyUndoCommand(this, "properties", old_value, new_value);
undo->setText(tr("Modifier les propriétés d'un conducteur", "undo caption"));
my_diagram -> undoStack().push(undo);
new QPropertyUndoCommand (potential_conductor, "properties", old_value, new_value, undo);
}
}
diagram()->undoStack().push(undo);
}

46
sources/ui/conductorpropertiesdialog.cpp
View File

@@ -61,28 +61,44 @@ void ConductorPropertiesDialog::PropertiesDialog(Conductor *conductor, QWidget *
{
ConductorPropertiesDialog cpd (conductor, parent);
if (cpd.exec() == QDialog::Accepted && cpd.properties() != conductor->properties())
if (cpd.exec() == QDialog::Rejected || cpd.properties() == conductor->properties()) return;
QVariant old_value, new_value;
old_value.setValue(conductor->properties());
new_value.setValue(cpd.properties());
QPropertyUndoCommand *undo = new QPropertyUndoCommand(conductor, "properties", old_value, new_value);
undo->setText(tr("Modifier les propriétés d'un conducteur", "undo caption"));
if (!conductor->relatedPotentialConductors().isEmpty())
{
QVariant old_value, new_value;
old_value.setValue(conductor->properties());
new_value.setValue(cpd.properties());
undo->setText(tr("Modifier les propriétés de plusieurs conducteurs", "undo caption"));
QString old_text = conductor->properties().text;
QString new_text = cpd.properties().text;
QPropertyUndoCommand *undo = new QPropertyUndoCommand(conductor, "properties", old_value, new_value);
undo->setText(tr("Modifier les propriétés d'un conducteur", "undo caption"));
//Make undo for all related potiential conductors
if (cpd.applyAll() && !conductor->relatedPotentialConductors().isEmpty())
foreach (Conductor *potential_conductor, conductor->relatedPotentialConductors())
{
undo->setText(tr("Modifier les propriétés de plusieurs conducteurs", "undo caption"));
foreach (Conductor *cond, conductor->relatedPotentialConductors())
//"Apply to all conductors of potential" is checked,
//we apply the new properties for every conductors in the same potential.
if (cpd.applyAll())
{
old_value.setValue(cond->properties());
new QPropertyUndoCommand (cond, "properties", old_value, new_value, undo);
old_value.setValue(potential_conductor->properties());
new QPropertyUndoCommand (potential_conductor, "properties", old_value, new_value, undo);
}
//The num of conductor isn't affected by "Apply to all conductors of potential"
//we always apply it to the potential if he change.
else if(old_text != new_text)
{
old_value.setValue(potential_conductor->properties());
ConductorProperties new_properties = potential_conductor->properties();
new_properties.text = new_text;
new_value.setValue(new_properties);
new QPropertyUndoCommand (potential_conductor, "properties", old_value, new_value, undo);
}
}
conductor->diagram()->undoStack().push(undo);
}
conductor->diagram()->undoStack().push(undo);
}
/**

6
sources/ui/potentialtextsdialog.ui
View File

@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<width>403</width>
<height>94</height>
</rect>
</property>
@@ -20,7 +20,7 @@
<widget class="QLabel" name="label">
<property name="text">
<string>Les textes de ce potentiel électrique ne sont pas identiques.
Appliquer un texte à l'ensemble de ces conducteurs?</string>
Appliquer un texte à l'ensemble de ces conducteurs.</string>
</property>
</widget>
</item>
@@ -48,7 +48,7 @@ Appliquer un texte à l'ensemble de ces conducteurs?</string>
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::Ok</set>
</property>
</widget>
</item>