chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix oscar crash on View > Reset Graphs issue

Browse Source
This commit is contained in:
LoudSnorer 2023-03-02 19:28:09 -05:00
parent ccae617baa
commit 9d05b1bf3e
3 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oscar/Graphs/gGraphView.cpp
View File

@ -3541,7 +3541,7 @@ void gGraphView::resetGraphOrder(bool pinFirst, const QList<QString> graphOrder)
QString nextGraph = graphOrder.at(i);
auto it = m_graphsbyname.find(nextGraph);
if (it == m_graphsbyname.end()) {
qDebug() << "resetGraphOrder could not find" << nextGraph;
// qDebug() << "resetGraphOrder could not find" << nextGraph;
continue; // should not happen
}
gGraph * graph = it.value();
@ -3552,7 +3552,7 @@ void gGraphView::resetGraphOrder(bool pinFirst, const QList<QString> graphOrder)
}
// If we didn't find everything, append anything extra we have
for (int i = 0; i < old_graphs.size(); i++) {
qDebug() << "resetGraphOrder added leftover" << old_graphs.at(i)->name();
// qDebug() << "resetGraphOrder added leftover" << old_graphs.at(i)->name();
new_graphs.append(old_graphs.at(i));
}

40
oscar/daily.cpp
View File

@ -7,7 +7,7 @@
* License. See the file COPYING in the main directory of the source code
* for more details. */
#define TEST_MACROS_ENABLED
#define TEST_MACROS_ENABLEDoff
#include <test_macros.h>
#include <QTextCharFormat>
@ -1007,13 +1007,7 @@ void Daily::ResetGraphOrder(int type)
}
// Enable all graphs (make them not hidden)
for (int i=1;i<ui->graphCombo->count();i++) {
// If disabled, emulate a click to enable the graph
if (!ui->graphCombo->itemData(i,Qt::UserRole).toBool()) {
// qDebug() << "resetting graph" << i;
Daily::on_graphCombo_activated(i);
}
}
showAllGraphs(true);
// Mark all events as active
for (int i=1;i<ui->eventsCombo->count();i++) {
@ -2691,25 +2685,31 @@ void Daily::setFlagText () {
ui->eventsCombo->setItemText(0, flagsText);
}
void Daily::showAllGraphs(bool show) {
//Skip over first button - label for comboBox
for (int i=1;i<ui->graphCombo->count();i++) {
showGraph(i,show);
}
setGraphText();
}
void Daily::showGraph(int index,bool b) {
QString graphName = ui->graphCombo->itemText(index);
ui->graphCombo->setItemData(index,b,Qt::UserRole);
ui->graphCombo->setItemIcon(index, b ? *icon_on : *icon_off);
gGraph* graph=GraphView->findGraphTitle(graphName);
if (graph) graph->setVisible(b);
}
void Daily::on_graphCombo_activated(int index)
{
if (index<0)
return;
gGraph *g;
QString s;
s=ui->graphCombo->currentText();
if (index<0) return;
if (index > 0) {
bool b=!ui->graphCombo->itemData(index,Qt::UserRole).toBool();
ui->graphCombo->setItemData(index,b,Qt::UserRole);
ui->graphCombo->setItemIcon(index, b ? *icon_on : *icon_off);
g=GraphView->findGraphTitle(s);
g->setVisible(b);
showGraph(index,b);
ui->graphCombo->showPopup();
}
ui->graphCombo->setCurrentIndex(0);
setGraphText();
updateCube();
GraphView->updateScale();

2
oscar/daily.h
View File

@ -139,6 +139,8 @@ public:
//void populateSessionWidget();
void showAllGraphs(bool show);
void showGraph(int index,bool b);
public slots:
void on_LineCursorUpdate(double time);