From 02aff6e0e097258779eee2eb6e63631450ddd252 Mon Sep 17 00:00:00 2001 From: Collin Kidder Date: Sun, 8 Jan 2017 19:26:51 -0500 Subject: [PATCH] Fix crash bugs in discrete state and flowview windows. --- re/discretestatewindow.cpp | 4 ++-- re/flowviewwindow.cpp | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/re/discretestatewindow.cpp b/re/discretestatewindow.cpp index f6f46be..d9d1edb 100644 --- a/re/discretestatewindow.cpp +++ b/re/discretestatewindow.cpp @@ -126,8 +126,8 @@ void DiscreteStateWindow::updatedFrames(int numFrames) listItem->setCheckState(Qt::Checked); //default all filters to be set active } - if (operatingState == DWStates::IDLE) stateFrames[0]->append(thisFrame); - else stateFrames[currToggleState + 1]->append(thisFrame); + //if (operatingState == DWStates::IDLE) stateFrames[0]->append(thisFrame); + //else stateFrames[currToggleState + 1]->append(thisFrame); } } } diff --git a/re/flowviewwindow.cpp b/re/flowviewwindow.cpp index a46aa58..6553ab9 100644 --- a/re/flowviewwindow.cpp +++ b/re/flowviewwindow.cpp @@ -361,12 +361,12 @@ void FlowViewWindow::updatedFrames(int numFrames) foundID.clear(); currentPosition = 0; refreshIDList(); - if (ui->listFrameID->count() > 0) - { - changeID(ui->listFrameID->item(0)->text()); - ui->listFrameID->setCurrentRow(0); - } - updateFrameLabel(); + //if (ui->listFrameID->count() > 0) + //{ + // changeID(ui->listFrameID->item(0)->text()); + // ui->listFrameID->setCurrentRow(0); + //} + //updateFrameLabel(); } else //just got some new frames. See if they are relevant. { @@ -424,7 +424,7 @@ void FlowViewWindow::updatedFrames(int numFrames) graphRef[k]->setData(x[k], y[k]); } ui->graphView->replot(); - updateDataView(); + updateDataView(); if (ui->cbSync->checkState() == Qt::Checked) emit sendCenterTimeID(frameCache[currentPosition].ID, frameCache[currentPosition].timestamp / 1000000.0); } }