Merge pull request #142 from HerrMuellerluedenscheid/master

emit chunk-wise selection of markers to editor
pyrocko · Oct 22, 2016 · b17ee88 · b17ee88
2 parents 9241915 + ace2fc5
commit b17ee88
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/src/marker_editor.py b/src/marker_editor.py
@@ -28,10 +28,13 @@ def __init__(self):
         self.sort(1, qc.Qt.AscendingOrder)
 
     def lessThan(self, left, right):
-        if left.column() not in _string_header:
-            return left.data().toDouble()[0] > right.data().toDouble()[0]
-        else:
+        if left.column() == _column_mapping['Time']:
+            return util.stt(str(left.data().toString())) > \
+                util.stt(str(right.data().toString()))
+        elif left.column() == _column_mapping['Label']:
             return left > right
+        else:
+            return left.data().toDouble()[0] > right.data().toDouble()[0]
 
 
 class MarkerTableView(qg.QTableView):
@@ -447,12 +450,14 @@ def update_selection_model(self, indices):
         flag = qg.QItemSelectionModel.SelectionFlags(
             (qg.QItemSelectionModel.Current | qg.QItemSelectionModel.Select))
 
-        for i in indices:
+        for chunk in indices:
+            istart = min(chunk)
+            istop = max(chunk)
             left = self.proxy_filter.mapFromSource(
-                self.marker_model.index(i, 0))
+                self.marker_model.index(istart, 0))
 
             right = self.proxy_filter.mapFromSource(
-                self.marker_model.index(i, num_columns-1))
+                self.marker_model.index(istop, num_columns-1))
 
             row_selection = qg.QItemSelection(left, right)
             row_selection.select(left, right)
@@ -461,15 +466,13 @@ def update_selection_model(self, indices):
         if len(indices) != 0:
             self.marker_table.setCurrentIndex(
                 self.proxy_filter.mapFromSource(
-                    self.marker_model.index(indices[0], 0)))
+                    self.marker_model.index(indices[0][0], 0)))
             self.selection_model.setCurrentIndex(
                 self.proxy_filter.mapFromSource(
-                    self.marker_model.index(indices[0], 0)),
+                    self.marker_model.index(indices[0][0], 0)),
                 qg.QItemSelectionModel.SelectCurrent)
-
-        self.selection_model.select(selections, flag)
-
-        if len(indices) != 0:
             self.marker_table.scrollTo(
                 self.proxy_filter.mapFromSource(
-                    self.marker_model.index(indices[0], 0)))
+                    self.marker_model.index(indices[0][0], 0)))
+
+        self.selection_model.select(selections, flag)
diff --git a/src/pile_viewer.py b/src/pile_viewer.py
@@ -2098,6 +2098,9 @@ def emit_selected_markers(self):
             for sm in selected_markers:
                 if sm in markers:
                     _indexes.append(markers.index(sm))
+
+            _indexes.sort()
+            _indexes = make_chunks(_indexes)
             self.emit(qc.SIGNAL('changed_marker_selection'), _indexes)
 
         def toggle_marker_editor(self):