added ZeroTotalFileSize() for Data Class, this is for new run
This commit is contained in:
parent
8a662c3407
commit
8bead5a54b
|
@ -80,7 +80,7 @@ class Data{
|
||||||
void CloseSaveFile();
|
void CloseSaveFile();
|
||||||
unsigned int GetFileSize() const {return outFileSize;}
|
unsigned int GetFileSize() const {return outFileSize;}
|
||||||
uint64_t GetTotalFileSize() const {return FinishedOutFilesSize + outFileSize;}
|
uint64_t GetTotalFileSize() const {return FinishedOutFilesSize + outFileSize;}
|
||||||
|
void ZeroTotalFileSize() { FinishedOutFilesSize = 0; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
|
|
|
@ -406,6 +406,7 @@ void Digitizer::StopACQ(){
|
||||||
AcqRun = false;
|
AcqRun = false;
|
||||||
data->ClearTriggerRate();
|
data->ClearTriggerRate();
|
||||||
data->ClearBuffer();
|
data->ClearBuffer();
|
||||||
|
data->ZeroTotalFileSize();
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned int Digitizer::CalByteForBuffer(){
|
unsigned int Digitizer::CalByteForBuffer(){
|
||||||
|
|
|
@ -184,14 +184,7 @@ public:
|
||||||
plot = new Trace();
|
plot = new Trace();
|
||||||
dataSeries = new QLineSeries();
|
dataSeries = new QLineSeries();
|
||||||
|
|
||||||
this->xMin = xMin;
|
Rebin(xMin, xMax, nBin);
|
||||||
this->xMax = xMax;
|
|
||||||
this->nBin = nBin;
|
|
||||||
dX = (xMax-xMin)/nBin;
|
|
||||||
for( int i = 0; i <= nBin; i++) {
|
|
||||||
dataSeries->append(xMin + i * dX, 0 );
|
|
||||||
dataSeries->append(xMin + i * dX, 0 );
|
|
||||||
}
|
|
||||||
|
|
||||||
maxBin = -1;
|
maxBin = -1;
|
||||||
maxBinValue = 0;
|
maxBinValue = 0;
|
||||||
|
@ -234,6 +227,18 @@ public:
|
||||||
|
|
||||||
void SetColor(Qt::GlobalColor color){ areaSeries->setBrush(color);}
|
void SetColor(Qt::GlobalColor color){ areaSeries->setBrush(color);}
|
||||||
|
|
||||||
|
void Rebin(double xMin, double xMax, int nBin){
|
||||||
|
dataSeries->clear();
|
||||||
|
this->xMin = xMin;
|
||||||
|
this->xMax = xMax;
|
||||||
|
this->nBin = nBin;
|
||||||
|
dX = (xMax-xMin)/nBin;
|
||||||
|
for( int i = 0; i <= nBin; i++) {
|
||||||
|
dataSeries->append(xMin + i * dX, 0 );
|
||||||
|
dataSeries->append(xMin + i * dX, 0 );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void Fill(double value){
|
void Fill(double value){
|
||||||
|
|
||||||
double bin = (value - xMin)/dX;
|
double bin = (value - xMin)/dX;
|
||||||
|
|
|
@ -2882,7 +2882,6 @@ void DigiSettingsPanel::SyncAllChannelsTab_PSD(){
|
||||||
SyncComboBox(cbVetoMode);
|
SyncComboBox(cbVetoMode);
|
||||||
SyncComboBox(cbVetoStep);
|
SyncComboBox(cbVetoStep);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
void DigiSettingsPanel::UpdatePSDSetting(){
|
void DigiSettingsPanel::UpdatePSDSetting(){
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user