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

fixed bug of pointer of pointer

Browse Source
This commit is contained in:
Ryan Tang 2023-02-02 19:26:47 -05:00
parent 100c9c9feb
commit d55779468c
1 changed files with 32 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
mainwindow.cpp
View File

@ -180,23 +180,7 @@ MainWindow::~MainWindow(){
//---- need manually delete //---- need manually delete
if( digiSetting != NULL ) delete digiSetting; if( digiSetting != NULL ) delete digiSetting;
if( digi != NULL ){ CloseDigitizers();
for( int i = 0 ; i < nDigi; i++) {
digi[i]->CloseDigitizer();
delete digi[i];
}
delete [] digi;
}
if( readDataThread != NULL){
for( int i = 0; i < nDigi; i++){
readDataThread[i]->Stop();
readDataThread[i]->quit();
readDataThread[i]->wait();
delete readDataThread[i];
}
delete [] readDataThread;
}
} }
@ -205,6 +189,7 @@ void MainWindow::StartACQ(){
LogMsg("Start Run...."); LogMsg("Start Run....");
for( int i =0 ; i < nDigi; i ++){ for( int i =0 ; i < nDigi; i ++){
if( digi[i]->IsDummy () ) continue;
digi[i]->Reset(); digi[i]->Reset();
digi[i]->ProgramPHA(false); digi[i]->ProgramPHA(false);
digi[i]->SetPHADataFormat(1);// only save 1 trace digi[i]->SetPHADataFormat(1);// only save 1 trace
@ -226,6 +211,7 @@ void MainWindow::StartACQ(){
void MainWindow::StopACQ(){ void MainWindow::StopACQ(){
for( int i = 0; i < nDigi; i++){ for( int i = 0; i < nDigi; i++){
if( digi[i]->IsDummy () ) continue;
digi[i]->StopACQ(); digi[i]->StopACQ();
//readDataThread->Stop(); //readDataThread->Stop();
@ -246,11 +232,10 @@ void MainWindow::StopACQ(){
void MainWindow::OpenDigitizers(){ void MainWindow::OpenDigitizers(){
//------- decode IPList //------- decode IPList
//TODO --------
nDigi = 1; nDigi = 1;
LogMsg("Opening digitizers.....");
LogMsg("Opening digitizer.....");
digi = new Digitizer2Gen*[nDigi]; digi = new Digitizer2Gen*[nDigi];
readDataThread = new ReadDataThread*[nDigi]; readDataThread = new ReadDataThread*[nDigi];
@ -266,11 +251,7 @@ void MainWindow::OpenDigitizers(){
digiSerialNum.push_back(digi[i]->GetSerialNumber()); digiSerialNum.push_back(digi[i]->GetSerialNumber());
LogMsg("Opened digitizer : " + QString::number(digi[i]->GetSerialNumber())); LogMsg("Opened digitizer : <font style=\"color:red;\">" + QString::number(digi[i]->GetSerialNumber()) + "</font>");
bnOpenDigitizers->setEnabled(false);
bnOpenDigitizers->setStyleSheet("");
bnCloseDigitizers->setEnabled(true);
bnDigiSettings->setEnabled(true);
bnStartACQ->setEnabled(true); bnStartACQ->setEnabled(true);
bnStopACQ->setEnabled(false); bnStopACQ->setEnabled(false);
@ -278,28 +259,29 @@ void MainWindow::OpenDigitizers(){
connect(readDataThread[i], &ReadDataThread::sendMsg, this, &MainWindow::LogMsg); connect(readDataThread[i], &ReadDataThread::sendMsg, this, &MainWindow::LogMsg);
}else{ }else{
LogMsg("Cannot open digitizer"); LogMsg("Cannot open digitizer. Use a dummy. with serial number " + QString::number(i));
digi[i]->SetDummy();
//LogMsg("use a dummy."); digiSerialNum.push_back(i);
//digi->SetDummy();
//digiSerialNum.push_back(0000);
//nDigi ++;
delete digi;
readDataThread[i] = NULL;
} }
} }
bnDigiSettings->setEnabled(true);
bnCloseDigitizers->setEnabled(true);
bnOpenDigitizers->setEnabled(false);
bnOpenDigitizers->setStyleSheet("");
} }
void MainWindow::CloseDigitizers(){ void MainWindow::CloseDigitizers(){
for( int i = 0; i < nDigi; i++){ for( int i = 0; i < nDigi; i++){
if( digi[i] != NULL ){
digi[i]->CloseDigitizer(); digi[i]->CloseDigitizer();
delete digi[i]; delete digi[i];
LogMsg("Closed Digitizer : " + QString::number(digiSerialNum[0])); LogMsg("Closed Digitizer : " + QString::number(digiSerialNum[0]));
nDigi = 0;
digiSerialNum.clear(); digiSerialNum.clear();
bnOpenDigitizers->setEnabled(true); bnOpenDigitizers->setEnabled(true);
@ -310,6 +292,7 @@ void MainWindow::CloseDigitizers(){
if( digiSetting != NULL ) digiSetting->close(); if( digiSetting != NULL ) digiSetting->close();
if( readDataThread[i] != NULL ){
readDataThread[i]->Stop(); readDataThread[i]->Stop();
readDataThread[i]->quit(); readDataThread[i]->quit();
readDataThread[i]->wait(); readDataThread[i]->wait();
@ -320,6 +303,9 @@ void MainWindow::CloseDigitizers(){
delete [] readDataThread; delete [] readDataThread;
digi = NULL; digi = NULL;
readDataThread = NULL; readDataThread = NULL;
nDigi = 0;
bnOpenDigitizers->setFocus();
} }
void MainWindow::OpenDigitizersSettings(){ void MainWindow::OpenDigitizersSettings(){