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

Replaced a QMultiMap-based sort with a cleaner qSort().

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@1807 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2012-05-11 21:38:50 +00:00
parent b7feb25dbd
commit df4edf60e5
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sources/editor/elementscene.cpp
View File

@@ -1039,14 +1039,7 @@ QList<QGraphicsItem *> ElementScene::zItems(bool include_terminals) const {
} }
// ordonne les parties par leur zValue // ordonne les parties par leur zValue
QMultiMap<qreal, QGraphicsItem *> mm; qSort(all_items_list.begin(), all_items_list.end(), ElementScene::zValueLessThan);
foreach(QGraphicsItem *qgi, all_items_list) mm.insert(qgi -> zValue(), qgi);
all_items_list.clear();
QMapIterator<qreal, QGraphicsItem *> i(mm);
while (i.hasNext()) {
i.next();
all_items_list << i.value();
}
// rajoute eventuellement les bornes // rajoute eventuellement les bornes
if (include_terminals) all_items_list += terminals; if (include_terminals) all_items_list += terminals;
@@ -1300,3 +1293,10 @@ void ElementScene::snapToGrid(QPointF &point) {
bool ElementScene::mustSnapToGrid(QGraphicsSceneMouseEvent *e) { bool ElementScene::mustSnapToGrid(QGraphicsSceneMouseEvent *e) {
return(!(e -> modifiers() & Qt::ControlModifier)); return(!(e -> modifiers() & Qt::ControlModifier));
} }
/**
@return true if \a item1's zValue() is less than \a item2's.
*/
bool ElementScene::zValueLessThan(QGraphicsItem *item1, QGraphicsItem *item2) {
return(item1-> zValue() < item2 -> zValue());
}

1
sources/editor/elementscene.h
View File

@@ -159,6 +159,7 @@ class ElementScene : public QGraphicsScene {
void initPasteArea(); void initPasteArea();
void snapToGrid(QPointF &); void snapToGrid(QPointF &);
bool mustSnapToGrid(QGraphicsSceneMouseEvent *); bool mustSnapToGrid(QGraphicsSceneMouseEvent *);
static bool zValueLessThan(QGraphicsItem *, QGraphicsItem *);
public slots: public slots:
void slot_move(); void slot_move();