diff --git a/FSUDAQ.cpp b/FSUDAQ.cpp index 6dc86ef..063f04a 100644 --- a/FSUDAQ.cpp +++ b/FSUDAQ.cpp @@ -965,12 +965,10 @@ void MainWindow::UpdateScalar(){ leTrigger[iDigi][i]->setText(a); leAccept[iDigi][i]->setText(b); - 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()); } - } } diff --git a/Scope.cpp b/Scope.cpp index 4ba2bbe..e87a241 100644 --- a/Scope.cpp +++ b/Scope.cpp @@ -436,6 +436,8 @@ void Scope::StopScope(){ bnScopeStop->setEnabled(false); bnScopeStop->setStyleSheet(""); + runStatus->setStyleSheet(""); + EnableControl(true); TellACQOnOff(false); @@ -474,7 +476,6 @@ void Scope::UpdateScope(){ }else{ leTriggerRate->setStyleSheet(""); leTriggerRate->setText(QString::number(data->TriggerRate[ch])); - data->ClearTriggerRate(); } int index = data->DataIndex[ch]; @@ -483,7 +484,7 @@ void Scope::UpdateScope(){ 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 ){ QVector points[5]; @@ -528,6 +529,7 @@ void Scope::UpdateScope(){ dataTrace[4]->replace(points[4]); } } + data->ClearTriggerRate(); digiMTX[ID].unlock(); // if( data->TriggerRate[ch] == 0 ){