Changeset 2eeb21

Timestamp:

Sep 2, 2016, 7:56:52 AM (8 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Gui_Fixes

Children:

f62b00

Parents:

e03e9f

Message:

tempcommit: QtNumericalItem::operator<() seems to be called always??

• also, occurence should be sorted numerically, too.

Location:

src/UIElements/Views/Qt4

Files:

• QtFragmentList.cpp (modified) (1 diff)
• QtHomologyList.cpp (modified) (1 diff)
• QtNumericalItem.cpp (modified) (1 diff)
• QtNumericalItem.hpp (modified) (1 diff)

src/UIElements/Views/Qt4/QtFragmentList.cpp

@@ -116 +116 @@
       ++keyiter,++resultiter,++count) {
 
-    QTreeWidgetItem *treeItem = new QtNumericalItem(this);
+    QTreeWidgetItem *treeItem = new QtNumericalItem(NUMBER, this);
     treeItem->setText(NUMBER, QString::number(count));
     {

src/UIElements/Views/Qt4/QtHomologyList.cpp

@@ -179 +179 @@
 
     // create item
-    QTreeWidgetItem *treeItem = new QtNumericalItem(this);
+    QTreeWidgetItem *treeItem = new QtNumericalItem(NUMBER, treewidget);
     treeItem->setText(NUMBER, QString::number(count));
     {

src/UIElements/Views/Qt4/QtNumericalItem.cpp

@@ -44 +44 @@
 bool QtNumericalItem::operator<(const QTreeWidgetItem &_item) const {
   const int col = treeWidget()->sortColumn();
-  const int mynr = boost::lexical_cast<int>(QTreeWidgetItem::text(col).toStdString());
-  const int othernr = boost::lexical_cast<int>(_item.text(col).toStdString());
-  return mynr < othernr;
+  if (col == view_column) {
+    const int mynr = boost::lexical_cast<int>(QTreeWidgetItem::text(col).toStdString());
+    const int othernr = boost::lexical_cast<int>(_item.text(col).toStdString());
+    return mynr < othernr;
+  } else
+    return QTreeWidgetItem::text(col).toStdString() < _item.text(col).toStdString();
 }
 

src/UIElements/Views/Qt4/QtNumericalItem.hpp

@@ -22 +22 @@
 {
 public:
-  QtNumericalItem(QTreeWidget *parent = 0) :
-    QTreeWidgetItem(parent)
+  QtNumericalItem(int column, QTreeWidget *parent = 0) :
+    QTreeWidgetItem(parent),
+    view_column(column)
   {}
 
   bool operator<(const QTreeWidgetItem &_item) const;
+
+private:
+  //!> such that we know that we need to check
+  const int view_column;
 };