t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash bugs in discrete state and flowview windows.

Browse Source
This commit is contained in:
Collin Kidder
2017-01-08 19:26:51 -05:00
parent 3d4db6e921
commit 02aff6e0e0
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
re/discretestatewindow.cpp
+2 -2
View File
@@ -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);
}
}
}
re/flowviewwindow.cpp
+7 -7
View File
@@ -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);
}
}