[qet] [2931] add function to sort an elements list by the positions of elements.

[subversion@xxxxxxxxxxxxx]

Revision: 2931
Author:   blacksun
Date:     2014-03-18 13:35:36 +0100 (Tue, 18 Mar 2014)
Log Message:
-----------
add function to sort an elements list by the positions of elements.
this function is use by:
cross ref item -> shild are always sorted
element selector widget -> list of widget are sorted.

Modified Paths:
--------------
    trunk/sources/qetgraphicsitem/element.cpp
    trunk/sources/qetgraphicsitem/element.h
    trunk/sources/ui/elementselectorwidget.cpp

Modified: trunk/sources/qetgraphicsitem/element.cpp
===================================================================
--- trunk/sources/qetgraphicsitem/element.cpp	2014-03-18 11:19:15 UTC (rev 2930)
+++ trunk/sources/qetgraphicsitem/element.cpp	2014-03-18 12:35:36 UTC (rev 2931)
@@ -24,6 +24,7 @@
 #include <QtDebug>
 #include <ui/elementpropertieswidget.h>
 #include "elementprovider.h"
+#include "diagramposition.h"
 
 /**
 	Constructeur pour un element sans scene ni parent
@@ -54,6 +55,8 @@
 		}
 }
 
+
+
 /**
 	@return true si l'element est mis en evidence
 */
@@ -499,3 +502,23 @@
 	}
 	tmp_uuids_link.clear();
 }
+
+/**
+ * @brief comparPos
+ * Compare position of the two elements. Compare 3 points:
+ * 1 folio - 2 row - 3 line
+ * returns a response when a comparison is found.
+ * @return true if elmt1 is at lower position than elmt 2, else false
+ */
+bool comparPos(const Element *elmt1, const Element *elmt2) {
+	//Compare folio first
+	if (elmt1->diagram()->folioIndex() != elmt2->diagram()->folioIndex())
+		return elmt1->diagram()->folioIndex() < elmt2->diagram()->folioIndex();
+	//Compare the row in second
+	QString a = elmt1->diagram()->convertPosition(elmt1->scenePos()).letter();
+	QString b = elmt2->diagram()->convertPosition(elmt2->scenePos()).letter();
+	if (a != b)
+		return a<b;
+	//In last compare the line
+	return elmt1->pos().x() <= elmt2->pos().x();
+}

Modified: trunk/sources/qetgraphicsitem/element.h
===================================================================
--- trunk/sources/qetgraphicsitem/element.h	2014-03-18 11:19:15 UTC (rev 2930)
+++ trunk/sources/qetgraphicsitem/element.h	2014-03-18 12:35:36 UTC (rev 2931)
@@ -104,7 +104,7 @@
 	virtual void unlinkAllElements() {}
 	virtual void unlinkElement(Element *) {}
 	void initLink(QETProject *);
-	QList<Element *> linkedElements () const;
+	QList<Element *> linkedElements ();
 	virtual int linkType() const {return link_type_;} // @return the linkable type
 	void newUuid() {uuid_ = QUuid::createUuid();} 	//create new uuid for this element
 
@@ -179,6 +179,8 @@
 	void updatePixmap();
 };
 
+bool comparPos(const Element * elmt1, const Element * elmt2);
+
 inline bool Element::isFree() const {
 	return (connected_elements.isEmpty());
 }
@@ -221,7 +223,12 @@
 	return uuid_;
 }
 
-inline QList <Element *> Element::linkedElements() const {
+/**
+ * @brief Element::linkedElements
+ * @return the list of linked elements, the list is sorted by position
+ */
+inline QList <Element *> Element::linkedElements() {
+	 qSort(connected_elements.begin(), connected_elements.end(), comparPos);
 	return connected_elements;
 }
 

Modified: trunk/sources/ui/elementselectorwidget.cpp
===================================================================
--- trunk/sources/ui/elementselectorwidget.cpp	2014-03-18 11:19:15 UTC (rev 2930)
+++ trunk/sources/ui/elementselectorwidget.cpp	2014-03-18 12:35:36 UTC (rev 2931)
@@ -35,6 +35,7 @@
 	selected_element(0),
 	showed_element(0)
 {
+	qSort(elements_list.begin(), elements_list.end(), comparPos);
 	ui->setupUi(this);
 	buildInterface();
 }
@@ -86,6 +87,7 @@
 void ElementSelectorWidget::setList(QList<Element *> elmt_list) {
 	clear();
 	elements_list << elmt_list;
+	qSort(elements_list.begin(), elements_list.end(), comparPos);
 	buildInterface();
 }