comparison widgets/ModelDataTableDialog.cpp @ 401:96531861b2f3

* a bit of progress on retaining current row when sorting changes &c

 
 #include <iostream>
 
 ModelDataTableDialog::ModelDataTableDialog(TabularModel *model, QString title, QWidget *parent) :
     QMainWindow(parent),
-    m_currentRow(0)
+    m_currentRow(0),
+    m_trackPlayback(false)
 {
     setWindowTitle(tr("Data Editor"));
 
     QToolBar *toolbar = addToolBar(tr("Toolbar"));
 

             SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
             this,
             SLOT(currentChanged(const QModelIndex &, const QModelIndex &)));
     connect(m_table, SIGNAL(addCommand(Command *)),
             this, SLOT(addCommand(Command *)));
+    connect(m_table, SIGNAL(currentChanged(const QModelIndex &)),
+            this, SLOT(currentChangedThroughResort(const QModelIndex &)));
 
     QDialogButtonBox *bb = new QDialogButtonBox(QDialogButtonBox::Close);
     connect(bb, SIGNAL(rejected()), this, SLOT(close()));
     grid->addWidget(bb, 2, 0);
     grid->setRowStretch(2, 0);

 {
     delete m_table;
 }
 
 void
-ModelDataTableDialog::scrollToFrameRequested(unsigned long frame)
-{
-    m_tableView->scrollTo(m_table->getModelIndexForFrame(frame));
+ModelDataTableDialog::userScrolledToFrame(unsigned long frame)
+{
+    QModelIndex index = m_table->getModelIndexForFrame(frame);
+    makeCurrent(index.row());
+}
+
+void
+ModelDataTableDialog::playbackScrolledToFrame(unsigned long frame)
+{
+    if (m_trackPlayback) {
+        QModelIndex index = m_table->getModelIndexForFrame(frame);
+        makeCurrent(index.row());
+    }
+}
+
+void
+ModelDataTableDialog::makeCurrent(int row)
+{
+    int rh = m_tableView->height() / m_tableView->rowHeight(0);
+    int topRow = row - rh/2;
+    if (topRow < 0) topRow = 0;
+    m_tableView->scrollTo
+        (m_table->getModelIndexForRow(topRow));
+    m_tableView->selectionModel()->setCurrentIndex
+        (m_table->getModelIndexForRow(row), QItemSelectionModel::Select);
 }
 
 void
 ModelDataTableDialog::viewClicked(const QModelIndex &index)
 {

     std::cerr << "ModelDataTableDialog::currentChanged: from "
               << previous.row() << ", " << previous.column()
               << " to " << current.row() << ", " << current.column() 
               << std::endl;
     m_currentRow = current.row();
+    m_table->setCurrentRow(m_currentRow);
 }
 
 void
 ModelDataTableDialog::insertRow()
 {

 ModelDataTableDialog::addCommand(Command *command)
 {
     CommandHistory::getInstance()->addCommand(command, false, true);
 }
 
+void
+ModelDataTableDialog::currentChangedThroughResort(const QModelIndex &index)
+{
+    std::cerr << "ModelDataTableDialog::currentChangedThroughResort: row = " << index.row() << std::endl;
+//  m_tableView->scrollTo(index);
+    makeCurrent(index.row());
+}
+
+
+