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

Multipaste dialog : add 'autonum pasted conductors' check box

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5339 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2018-04-23 13:50:36 +00:00
parent 5fe1389f8b
commit 9d2124f593
8 changed files with 94 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sources/diagramcontent.cpp
View File

@@ -81,9 +81,9 @@ DiagramContent::DiagramContent(Diagram *diagram) :
other_terminal = conductor->terminal1;
//If the two elements of conductor are movable
if (m_elements.contains(other_terminal -> parentElement()))
if (m_elements.contains(other_terminal -> parentElement()) && !m_conductors_to_move.contains(conductor))
m_conductors_to_move << conductor;
else
else if (!m_conductors_to_update.contains(conductor))
m_conductors_to_update << conductor;
}
}
@@ -160,16 +160,18 @@ QList<ElementTextItemGroup *> DiagramContent::selectedTextsGroup() const
*/
QList<Conductor *> DiagramContent::conductors(int filter) const
{
QSet<Conductor *> result;
QList<Conductor *> result;
if (filter & ConductorsToMove) result += m_conductors_to_move;
if (filter & ConductorsToUpdate) result += m_conductors_to_update;
if (filter & OtherConductors) result += m_other_conductors;
if (filter & SelectedOnly) {
for(Conductor *conductor : result) {
if (!conductor->isSelected()) result.remove(conductor);
for(Conductor *conductor : result)
{
if (!conductor->isSelected())
result.removeAll(conductor);
}
}
return(result.toList());
return(result);
}
/**