Synchronize PlotDock with 'Execute SQL' table. #1271
Conversation
|
Thanks. 😄 |
|
Great! This is absolutely needed for coherence to the Data Browser table. Thanks! I'll take a look at the code now. |
There was a problem hiding this comment.
The use of the enum Tab should be changed before merging. The refactoring could done after that, but let's wait to what @MKleusberg says. Thanks for the pull request, Fabian!
src/MainWindow.cpp
Outdated
| // Are there even that many lines? | ||
| if(lastLine >= m_browseTableModel->totalRowCount()) | ||
| return; | ||
| if(ui->mainTab->currentIndex() == 1) { |
There was a problem hiding this comment.
Here we should use the enum Tabs.
src/MainWindow.cpp
Outdated
|
|
||
| ui->dataTable->selectionModel()->select(QItemSelection(topLeft, bottomRight), QItemSelectionModel::Select | QItemSelectionModel::Rows); | ||
| ui->dataTable->selectionModel()->select(QItemSelection(topLeft, bottomRight), QItemSelectionModel::Select | QItemSelectionModel::Rows); | ||
| }else if(ui->mainTab->currentIndex() == 3) { |
There was a problem hiding this comment.
The same here, better use the enum Tabs.
| @@ -694,6 +694,34 @@ void MainWindow::deleteRecord() | |||
| } | |||
| } | |||
|
|
|||
| void MainWindow::selectCurrentTabTableLines(int firstLine, int lastLine) | |||
There was a problem hiding this comment.
Part of the code in this function could be refactored with the old code by passing the table model and table widgets as parameters. This could be made after merging, though. It is not indispensable.
There was a problem hiding this comment.
I though doing that would be nice but the method selectTableLine was used in a lot of places so I left it as is.
|
Thanks, @FabianInostroza 😄 This is really helpful indeed! There is only one minor problem I see with this: you assume the plot is always drawn from the current tab but that doesn't need to be true. For example you could draw a plot in the Browse Data tab, then change to the Execute SQL tab, and then select a plot point. It's then going to select a row from the wrong table. The same happens if there are multiple SQL tabs opened. I'm not sure how to fix that though. We probably need to store the table widget from which the data comes from. @mgrojo Or do you have any other idea? If not, I would suggest to just merge this and refactor the plot dock to store the required information. |
|
I think the plot is cleared when you change the tab, so it might be impossible to come to that situation, unless reaching in other way that I cannot currently visualise. |
|
Is it? For me it seems to stay even when changing tabs 😕 Especially if there are multiple SQL tabs I don't think the plot would be cleared when changing between them. |
|
You're right. It is only cleared when the list of selected columns does not match with the new table or query. So the issue can actually happen. |
|
Ah that makes sense 😃 |
|
I'll merge this now and then try to address the issue about the selection in the appropriate table widget. Thanks again @FabianInostroza for this contribution! |
|
Yep, I agree. I should have merged this earlier. Thanks @FabianInostroza and @mgrojo! 😃 |
Make use of signals to connect the selection in plot to the associated table widget. Every time that the plot is updated from the Main Window the table widget associated to the table or query is connected to the plot and the previous widget is disconnected. This allows the selection of the correct table widget. Line selection methods moved to the Extended Table Widget to be used as slots for this connection. The destroyed signal is also connected for resetting the plot. This fixes a crash that already existed before this PR, when closing a SQL tab while the plot is still associated to the table results model.
|
Thank you! |
Add the synchronization feature between plot dock and browse data table to the table shown in the SQL query.