rtang/FSUDAQ_Qt6
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases 3 Wiki Activity

fixed trace display

Browse Source
This commit is contained in:
carina@hades 2023-12-12 17:59:45 -05:00
parent fb06ea3098
commit c2080b9d39
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FSUDAQ.cpp
View File

@ -965,12 +965,10 @@ void MainWindow::UpdateScalar(){
leTrigger[iDigi][i]->setText(a); leTrigger[iDigi][i]->setText(a);
leAccept[iDigi][i]->setText(b); leAccept[iDigi][i]->setText(b);
if( influx && a != "inf" ){ if( influx && a != "inf" ){
influx->AddDataPoint("Rate,Bd="+std::to_string(digi[iDigi]->GetSerialNumber()) + ",Ch=" + QString::number(i).rightJustified(2, '0').toStdString() + " value=" + a.toStdString()); influx->AddDataPoint("Rate,Bd="+std::to_string(digi[iDigi]->GetSerialNumber()) + ",Ch=" + QString::number(i).rightJustified(2, '0').toStdString() + " value=" + a.toStdString());
} }
} }
} }

6
Scope.cpp
View File

@ -436,6 +436,8 @@ void Scope::StopScope(){
bnScopeStop->setEnabled(false); bnScopeStop->setEnabled(false);
bnScopeStop->setStyleSheet(""); bnScopeStop->setStyleSheet("");
runStatus->setStyleSheet("");
EnableControl(true); EnableControl(true);
TellACQOnOff(false); TellACQOnOff(false);
@ -474,7 +476,6 @@ void Scope::UpdateScope(){
}else{ }else{
leTriggerRate->setStyleSheet(""); leTriggerRate->setStyleSheet("");
leTriggerRate->setText(QString::number(data->TriggerRate[ch])); leTriggerRate->setText(QString::number(data->TriggerRate[ch]));
data->ClearTriggerRate();
} }
int index = data->DataIndex[ch]; int index = data->DataIndex[ch];
@ -483,7 +484,7 @@ void Scope::UpdateScope(){
if( traceLength > MaxDisplayTraceDataLength) traceLength = MaxDisplayTraceDataLength; if( traceLength > MaxDisplayTraceDataLength) traceLength = MaxDisplayTraceDataLength;
// printf("--- %s| %d, %d, %d | %d | %d, %d\n", __func__, ch, data->LoopIndex[ch], index, traceLength, factor, tick2ns ); //printf("--- %s| %d, %d, %d | %d | %d, %d\n", __func__, ch, data->LoopIndex[ch], index, traceLength, factor, tick2ns );
if( data->TriggerRate[ch] > 0 ){ if( data->TriggerRate[ch] > 0 ){
QVector<QPointF> points[5]; QVector<QPointF> points[5];
@ -528,6 +529,7 @@ void Scope::UpdateScope(){
dataTrace[4]->replace(points[4]); dataTrace[4]->replace(points[4]);
} }
} }
data->ClearTriggerRate();
digiMTX[ID].unlock(); digiMTX[ID].unlock();
// if( data->TriggerRate[ch] == 0 ){ // if( data->TriggerRate[ch] == 0 ){