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

change digitizer class, add a mapping for Reg

Browse Source
This commit is contained in:
Ryan Tang 2023-02-28 17:08:34 -05:00
parent 5478fa05f0
commit 58969da70e
6 changed files with 247 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
ClassDigitizer2Gen.cpp
View File

@ -50,6 +50,10 @@ void Digitizer2Gen::Initialization(){
for( int ch = 0; ch < MaxNumberOfChannel ; ch ++) chSettings[ch] = DIGIPARA::CH::AllSettings; for( int ch = 0; ch < MaxNumberOfChannel ; ch ++) chSettings[ch] = DIGIPARA::CH::AllSettings;
for( int index = 0 ; index < 4; index ++) VGASetting[index] = DIGIPARA::VGA::VGAGain; for( int index = 0 ; index < 4; index ++) VGASetting[index] = DIGIPARA::VGA::VGAGain;
//build map
for( int i = 0; i < (int) DIGIPARA::DIG::AllSettings.size(); i++) boardMap[DIGIPARA::DIG::AllSettings[i].GetPara()] = i;
for( int i = 0; i < (int) DIGIPARA::CH::AllSettings.size(); i++) chMap[DIGIPARA::CH::AllSettings[i].GetPara()] = i;
} }
void Digitizer2Gen::SetDummy(unsigned short sn){ void Digitizer2Gen::SetDummy(unsigned short sn){
@ -95,6 +99,20 @@ std::string Digitizer2Gen::GetPath(uint64_t handle){
} }
//########################################### Read Write //########################################### Read Write
int Digitizer2Gen::FindIndex(const Reg para){
switch (para.GetType() ){
case TYPE::CH: return chMap[para.GetPara()];
case TYPE::DIG: return boardMap[para.GetPara()];
case TYPE::VGA: return 0;
case TYPE::LVDS: return -1;
}
return -1;
}
std::string Digitizer2Gen::ReadValue(const char * parameter, bool verbose){ std::string Digitizer2Gen::ReadValue(const char * parameter, bool verbose){
if( !isConnected ) return "not connected"; if( !isConnected ) return "not connected";
//printf(" %s|%s \n", __func__, parameter); //printf(" %s|%s \n", __func__, parameter);
@ -108,31 +126,41 @@ std::string Digitizer2Gen::ReadValue(const char * parameter, bool verbose){
return retValue; return retValue;
} }
std::string Digitizer2Gen::ReadValue(Reg &para, int ch_index, bool verbose){ std::string Digitizer2Gen::ReadValue(const Reg para, int ch_index, bool verbose){
para.SetValue( ReadValue(para.GetFullPara(ch_index).c_str(), verbose) ); std:: string ans = ReadValue(para.GetFullPara(ch_index).c_str(), verbose);
return para.GetValue();
int index = FindIndex(para);
switch( para.GetType()){
case TYPE::CH : chSettings[ch_index][index].SetValue(ans); break;
case TYPE::DIG : boardSettings[index].SetValue(ans); break;
case TYPE::VGA : VGASetting[ch_index].SetValue(ans); break;
case TYPE::LVDS: return "LVDS not implemented.";
} }
std::string Digitizer2Gen::ReadValue(TYPE type, unsigned short index, int ch_index, bool verbose){ return ans;
if( !isConnected ) return "not connected";
switch (type){
case TYPE::DIG: return ReadValue( boardSettings[index], ch_index, verbose );
case TYPE::CH: return ReadValue( chSettings[ch_index][index], ch_index, verbose );
case TYPE::VGA: return ReadValue( VGASetting[index], ch_index, verbose);
case TYPE::LVDS: return "no defined";
}
return "invalid";
} }
std::string Digitizer2Gen::ReadDigValue(std::string shortPara, bool verbose){ std::string Digitizer2Gen::ReadDigValue(std::string shortPara, bool verbose){
std::string haha = "/par/" + shortPara; std::string haha = "/par/" + shortPara;
return ReadValue(haha.c_str(), verbose); std::string ans = ReadValue(haha.c_str(), verbose);
for( int i = 0; i < (int) boardSettings.size(); i++){
if( boardSettings[i].GetPara() == shortPara ) boardSettings[i].SetValue(ans);
}
return ans;
} }
std::string Digitizer2Gen::ReadChValue(std::string ch, std::string shortPara, bool verbose){ std::string Digitizer2Gen::ReadChValue(std::string ch, std::string shortPara, bool verbose){
std::string haha = "/ch/" + ch + "/par/" + shortPara; std::string haha = "/ch/" + ch + "/par/" + shortPara;
return ReadValue(haha.c_str(), verbose); std::string ans = ReadValue(haha.c_str(), verbose);
const int index = atoi(ch.c_str());
for( int i = 0; i < (int) chSettings[index].size(); i++){
if( chSettings[index][i].GetPara() == shortPara ) chSettings[index][i].SetValue(ans);
}
return ans;
} }
bool Digitizer2Gen::WriteValue(const char * parameter, std::string value){ bool Digitizer2Gen::WriteValue(const char * parameter, std::string value){
@ -147,10 +175,17 @@ bool Digitizer2Gen::WriteValue(const char * parameter, std::string value){
return true; return true;
} }
bool Digitizer2Gen::WriteValue(Reg &para, std::string value, int ch_index){ bool Digitizer2Gen::WriteValue(const Reg para, std::string value, int ch_index){
if( WriteValue(para.GetFullPara(ch_index).c_str(), value)){ if( WriteValue(para.GetFullPara(ch_index).c_str(), value)){
para.SetValue(value); int index = FindIndex(para);
if( index != -1 ){
switch(para.GetType()){
case TYPE::CH : chSettings[ch_index][index].SetValue(value); break;
case TYPE::VGA : VGASetting[ch_index].SetValue(value); break;
case TYPE::DIG : boardSettings[index].SetValue(value); break;
case TYPE::LVDS : break;
}
}
return true; return true;
}else{ }else{
return false; return false;
@ -860,7 +895,6 @@ bool Digitizer2Gen::LoadSettingsFromFile(const char * loadFileName){
if( std::strcmp(readWrite, "2") == 0 && isConnected) WriteValue(para, value); if( std::strcmp(readWrite, "2") == 0 && isConnected) WriteValue(para, value);
} }
delete [] para; delete [] para;
delete [] readWrite; delete [] readWrite;
delete [] idStr; delete [] idStr;
@ -874,3 +908,15 @@ bool Digitizer2Gen::LoadSettingsFromFile(const char * loadFileName){
return false; return false;
} }
std::string Digitizer2Gen::GetSettingValue(const Reg para, unsigned int ch_index) {
int index = FindIndex(para);
switch (para.GetType()){
case TYPE::DIG: return boardSettings[index].GetValue();
case TYPE::CH: return chSettings[ch_index][index].GetValue();
case TYPE::VGA: return VGASetting[ch_index].GetValue();
case TYPE::LVDS: return "not defined";
default : return "invalid";
}
return "no such parameter";
}

44
ClassDigitizer2Gen.h
View File

@ -5,6 +5,7 @@
#include <CAEN_FELib.h> #include <CAEN_FELib.h>
#include <cstdlib> #include <cstdlib>
#include <string> #include <string>
#include <map>
#include "Event.h" #include "Event.h"
@ -68,6 +69,9 @@ class Digitizer2Gen {
std::vector<Reg> chSettings[MaxNumberOfChannel]; std::vector<Reg> chSettings[MaxNumberOfChannel];
Reg VGASetting[4]; Reg VGASetting[4];
std::map<std::string, int> boardMap;
std::map<std::string, int> chMap;
public: public:
Digitizer2Gen(); Digitizer2Gen();
~Digitizer2Gen(); ~Digitizer2Gen();
@ -83,13 +87,14 @@ class Digitizer2Gen {
int GetRet() const {return ret;}; int GetRet() const {return ret;};
int FindIndex(const Reg para); // get index from DIGIPARA
std::string ReadValue(const char * parameter, bool verbose = false); std::string ReadValue(const char * parameter, bool verbose = false);
std::string ReadValue(Reg &para, int ch_index = -1, bool verbose = false); std::string ReadValue(const Reg para, int ch_index = -1, bool verbose = false);
std::string ReadValue(TYPE type, unsigned short index, int ch_index = -1, bool verbose = false);
std::string ReadDigValue(std::string shortPara, bool verbose = false); std::string ReadDigValue(std::string shortPara, bool verbose = false);
std::string ReadChValue(std::string ch, std::string shortPara, bool verbose = false); std::string ReadChValue(std::string ch, std::string shortPara, bool verbose = false);
bool WriteValue(const char * parameter, std::string value); bool WriteValue(const char * parameter, std::string value);
bool WriteValue(Reg &para, std::string value, int ch_index = -1); bool WriteValue(const Reg para, std::string value, int ch_index = -1);
bool WriteDigValue(std::string shortPara, std::string value); bool WriteDigValue(std::string shortPara, std::string value);
bool WriteChValue(std::string ch, std::string shortPara, std::string value); bool WriteChValue(std::string ch, std::string shortPara, std::string value);
void SendCommand(const char * parameter); void SendCommand(const char * parameter);
@ -135,39 +140,8 @@ class Digitizer2Gen {
void ReadAllSettings(); // read settings from digitier and save to memory void ReadAllSettings(); // read settings from digitier and save to memory
bool SaveSettingsToFile(const char * saveFileName = NULL); // ReadAllSettings + text file bool SaveSettingsToFile(const char * saveFileName = NULL); // ReadAllSettings + text file
bool LoadSettingsFromFile(const char * loadFileName = NULL); // Load settings, write to digitizer and save to memory bool LoadSettingsFromFile(const char * loadFileName = NULL); // Load settings, write to digitizer and save to memory
std::string GetSettingValue(TYPE type, unsigned short index, unsigned int ch_index = 0) const {
switch(type){
case TYPE::DIG: return boardSettings[index].GetValue();
case TYPE::CH: return chSettings[ch_index][index].GetValue();
case TYPE::VGA: return VGASetting[ch_index].GetValue();
case TYPE::LVDS: return "not defined";
}
return "invalid";
}
std::string GetSettingValue(TYPE type, const Reg para, unsigned int ch_index = 0) const{
switch(type){
case TYPE::DIG:{
for( int i = 0; i < (int) boardSettings.size(); i++){
if( para.GetPara() == boardSettings[i].GetPara()){
return boardSettings[i].GetValue();
}
}
};break;
case TYPE::CH:{
for( int i = 0; i < (int) chSettings[ch_index].size(); i++){
if( para.GetPara() == chSettings[ch_index][i].GetPara()){
return chSettings[ch_index][i].GetValue();
}
}
};break;
case TYPE::VGA: return VGASetting[ch_index].GetValue();
case TYPE::LVDS: return "not defined";
default : return "invalid";
}
return "no such parameter"; std::string GetSettingValue(const Reg para, unsigned int ch_index = 0); // read from memory
}
}; };
#endif #endif

197
digiSettingsPanel.cpp
View File

@ -3,18 +3,18 @@
#include <QLabel> #include <QLabel>
#include <QFileDialog> #include <QFileDialog>
std::vector<std::pair<std::string, int>> infoIndex = {{"Serial Num : ", 8}, std::vector<std::pair<std::string, Reg>> infoIndex = {{"Serial Num : ", DIGIPARA::DIG::SerialNumber},
{"IP : ", 20}, {"IP : ", DIGIPARA::DIG::IPAddress},
{"Model Name : ", 5}, {"Model Name : ", DIGIPARA::DIG::ModelName},
{"FPGA version : ", 1}, {"FPGA version : ", DIGIPARA::DIG::FPGA_firmwareVersion},
{"DPP Type : ", 2}, {"DPP Type : ", DIGIPARA::DIG::FirmwareType},
{"CUP version : ", 0}, {"CUP version : ", DIGIPARA::DIG::CupVer},
{"ADC bits : ", 15}, {"ADC bits : ", DIGIPARA::DIG::ADC_bit},
{"ADC rate [Msps] : ", 16}, {"ADC rate [Msps] : ", DIGIPARA::DIG::ADC_SampleRate},
{"Num. of Channel : ", 14}, {"Num. of Channel : ", DIGIPARA::DIG::NumberOfChannel},
{"Input range [Vpp] : ", 17}, {"Input range [Vpp] : ", DIGIPARA::DIG::InputDynamicRange},
{"Input Type : ", 18}, {"Input Type : ", DIGIPARA::DIG::InputType},
{"Input Impedance [Ohm] : ", 19} {"Input Impedance [Ohm] : ", DIGIPARA::DIG::InputImpedance}
}; };
DigiSettingsPanel::DigiSettingsPanel(Digitizer2Gen ** digi, unsigned short nDigi, QWidget * parent) : QWidget(parent){ DigiSettingsPanel::DigiSettingsPanel(Digitizer2Gen ** digi, unsigned short nDigi, QWidget * parent) : QWidget(parent){
@ -66,10 +66,10 @@ DigiSettingsPanel::DigiSettingsPanel(Digitizer2Gen ** digi, unsigned short nDigi
const unsigned short nRow = 4; const unsigned short nRow = 4;
for( unsigned short j = 0; j < (unsigned short) infoIndex.size(); j++){ for( unsigned short j = 0; j < (unsigned short) infoIndex.size(); j++){
QLabel * lab = new QLabel(QString::fromStdString(infoIndex[j].first), tab); QLabel * lab = new QLabel(QString::fromStdString(infoIndex[j].first), tab);
lab->setAlignment(Qt::AlignRight); lab->setAlignment(Qt::AlignRight | Qt::AlignCenter);
leInfo[iDigi][j] = new QLineEdit(tab); leInfo[iDigi][j] = new QLineEdit(tab);
leInfo[iDigi][j]->setReadOnly(true); leInfo[iDigi][j]->setReadOnly(true);
leInfo[iDigi][j]->setText(QString::fromStdString(digi[iDigi]->ReadValue(TYPE::DIG, infoIndex[j].second))); leInfo[iDigi][j]->setText(QString::fromStdString(digi[iDigi]->ReadValue(infoIndex[j].second)));
infoLayout->addWidget(lab, j%nRow, 2*(j/nRow)); infoLayout->addWidget(lab, j%nRow, 2*(j/nRow));
infoLayout->addWidget(leInfo[iDigi][j], j%nRow, 2*(j/nRow) +1); infoLayout->addWidget(leInfo[iDigi][j], j%nRow, 2*(j/nRow) +1);
} }
@ -217,6 +217,10 @@ DigiSettingsPanel::DigiSettingsPanel(Digitizer2Gen ** digi, unsigned short nDigi
rowId ++; rowId ++;
cbbClockSource[iDigi] = new QComboBox(tab); cbbClockSource[iDigi] = new QComboBox(tab);
SetupComboBox(cbbClockSource[iDigi], DIGIPARA::DIG::ClockSource, "Clock Source :", boardLayout, rowId, 0, 1, 2); SetupComboBox(cbbClockSource[iDigi], DIGIPARA::DIG::ClockSource, "Clock Source :", boardLayout, rowId, 0, 1, 2);
connect(cbbClockSource[iDigi], &QComboBox::currentIndexChanged, this, [=](){
if( !enableSignalSlot ) return;
digi[ID]->WriteValue(DIGIPARA::DIG::ClockSource, cbbClockSource[ID]->currentData().toString().toStdString());
});
//------------------------------------- //-------------------------------------
rowId ++; rowId ++;
@ -523,12 +527,6 @@ DigiSettingsPanel::DigiSettingsPanel(Digitizer2Gen ** digi, unsigned short nDigi
cbbWaveTrigger[iDigi][ch] = new QComboBox(tab); cbbWaveTrigger[iDigi][ch] = new QComboBox(tab);
SetupComboBox(cbbWaveTrigger[iDigi][ch], DIGIPARA::CH::WaveTriggerSource, "Wave Trig. Source", layout5, rowID, 2); SetupComboBox(cbbWaveTrigger[iDigi][ch], DIGIPARA::CH::WaveTriggerSource, "Wave Trig. Source", layout5, rowID, 2);
//------------------------------
rowID ++;
cbbEventSelector[iDigi][ch] = new QComboBox(tab);
SetupComboBox(cbbEventSelector[iDigi][ch], DIGIPARA::CH::EventSelector, "Event Selector", layout5, rowID, 0);
cbbWaveSelector[iDigi][ch] = new QComboBox(tab);
SetupComboBox(cbbWaveSelector[iDigi][ch], DIGIPARA::CH::WaveSelector, "Wave Selector", layout5, rowID, 2);
//------------------------------ //------------------------------
rowID ++; rowID ++;
@ -556,17 +554,39 @@ DigiSettingsPanel::DigiSettingsPanel(Digitizer2Gen ** digi, unsigned short nDigi
spbADCVetoWidth[iDigi][ch] = new QSpinBox(tab); spbADCVetoWidth[iDigi][ch] = new QSpinBox(tab);
SetupSpinBox(spbADCVetoWidth[iDigi][ch], DIGIPARA::CH::ADCVetoWidth, "ADC Veto Length [ns]", layout5, rowID, 2); SetupSpinBox(spbADCVetoWidth[iDigi][ch], DIGIPARA::CH::ADCVetoWidth, "ADC Veto Length [ns]", layout5, rowID, 2);
//------------------------------
rowID ++;
spbEnergySkimLow[iDigi][ch] = new QSpinBox(tab);
SetupSpinBox(spbEnergySkimLow[iDigi][ch], DIGIPARA::CH::EnergySkimLowDiscriminator, "Energy Skim Low", layout5, rowID, 0);
spbEnergySkimHigh[iDigi][ch] = new QSpinBox(tab);
SetupSpinBox(spbEnergySkimHigh[iDigi][ch], DIGIPARA::CH::EnergySkimHighDiscriminator, "Energy Skim Low", layout5, rowID, 2);
for( int i = 0; i < layout5->columnCount(); i++) layout5->setColumnStretch(i, 1); for( int i = 0; i < layout5->columnCount(); i++) layout5->setColumnStretch(i, 1);
} }
{//*--------- Group 6
QGroupBox * box6 = new QGroupBox("Other Settings", tab);
allLayout->addWidget(box6);
QGridLayout * layout6 = new QGridLayout(box6);
//------------------------------
rowID = 0 ;
cbbEventSelector[iDigi][ch] = new QComboBox(tab);
SetupComboBox(cbbEventSelector[iDigi][ch], DIGIPARA::CH::EventSelector, "Event Selector", layout6, rowID, 0);
cbbWaveSelector[iDigi][ch] = new QComboBox(tab);
SetupComboBox(cbbWaveSelector[iDigi][ch], DIGIPARA::CH::WaveSelector, "Wave Selector", layout6, rowID, 2);
//------------------------------
rowID ++;
spbEnergySkimLow[iDigi][ch] = new QSpinBox(tab);
SetupSpinBox(spbEnergySkimLow[iDigi][ch], DIGIPARA::CH::EnergySkimLowDiscriminator, "Energy Skim Low", layout6, rowID, 0);
spbEnergySkimHigh[iDigi][ch] = new QSpinBox(tab);
SetupSpinBox(spbEnergySkimHigh[iDigi][ch], DIGIPARA::CH::EnergySkimHighDiscriminator, "Energy Skim High", layout6, rowID, 2);
}
}
{//@============== Status tab
QTabWidget * statusTab = new QTabWidget(tab);
chTabWidget->addTab(statusTab, "Status");
} }
{//@============== input tab {//@============== input tab
@ -682,25 +702,59 @@ DigiSettingsPanel::DigiSettingsPanel(Digitizer2Gen ** digi, unsigned short nDigi
} }
{//@============== Other tab
QTabWidget * otherTab = new QTabWidget(tab);
chTabWidget->addTab(otherTab, "Others");
for( int ch = 0; ch < digi[iDigi]->GetNChannels(); ch ++ ) cbbEventSelector[iDigi][ch] = new QComboBox(tab);
SetupComboBoxTab(cbbEventSelector, DIGIPARA::CH::EventSelector, "Event Selector", otherTab, iDigi, digi[iDigi]->GetNChannels());
for( int ch = 0; ch < digi[iDigi]->GetNChannels(); ch ++ ) cbbWaveSelector[iDigi][ch] = new QComboBox(tab);
SetupComboBoxTab(cbbWaveSelector, DIGIPARA::CH::WaveSelector, "Wave Selector", otherTab, iDigi, digi[iDigi]->GetNChannels(), 2 );
for( int ch = 0; ch < digi[iDigi]->GetNChannels(); ch ++ ) spbEnergySkimLow[iDigi][ch] = new QSpinBox(tab);
SetupSpinBoxTab(spbEnergySkimLow, DIGIPARA::CH::EnergySkimLowDiscriminator, "Energy Skim Low", otherTab, iDigi, digi[iDigi]->GetNChannels());
for( int ch = 0; ch < digi[iDigi]->GetNChannels(); ch ++ ) spbEnergySkimHigh[iDigi][ch] = new QSpinBox(tab);
SetupSpinBoxTab(spbEnergySkimHigh, DIGIPARA::CH::EnergySkimHighDiscriminator, "Energy Skim High", otherTab, iDigi, digi[iDigi]->GetNChannels());
}
{//@============== Trigger tab {//@============== Trigger tab
QTabWidget * triggerTab = new QTabWidget(tab); QTabWidget * triggerTab = new QTabWidget(tab);
chTabWidget->addTab(triggerTab, "Trigger"); chTabWidget->addTab(triggerTab, "Trigger");
for( int ch = 0; ch < digi[iDigi]->GetNChannels(); ch ++ ) cbbEvtTrigger[iDigi][ch] = new QComboBox(tab);
SetupComboBoxTab(cbbEvtTrigger, DIGIPARA::CH::EventTriggerSource, "Event Trig. Source", triggerTab, iDigi, digi[iDigi]->GetNChannels(), 2);
for( int ch = 0; ch < digi[iDigi]->GetNChannels(); ch ++ ) cbbWaveTrigger[iDigi][ch] = new QComboBox(tab);
SetupComboBoxTab(cbbWaveTrigger, DIGIPARA::CH::WaveTriggerSource, "Wave Trig. Source", triggerTab, iDigi, digi[iDigi]->GetNChannels(), 2);
for( int ch = 0; ch < digi[iDigi]->GetNChannels(); ch ++ ) cbbChVetoSrc[iDigi][ch] = new QComboBox(tab);
SetupComboBoxTab(cbbChVetoSrc, DIGIPARA::CH::ChannelVetoSource, "Veto Source", triggerTab, iDigi, digi[iDigi]->GetNChannels(), 2);
for( int ch = 0; ch < digi[iDigi]->GetNChannels(); ch ++ ) cbbCoinMask[iDigi][ch] = new QComboBox(tab);
SetupComboBoxTab(cbbCoinMask, DIGIPARA::CH::CoincidenceMask, "Coin. Mask", triggerTab, iDigi, digi[iDigi]->GetNChannels());
for( int ch = 0; ch < digi[iDigi]->GetNChannels(); ch ++ ) cbbAntiCoinMask[iDigi][ch] = new QComboBox(tab);
SetupComboBoxTab(cbbAntiCoinMask, DIGIPARA::CH::AntiCoincidenceMask, "Anti-Coin. Mask", triggerTab, iDigi, digi[iDigi]->GetNChannels());
for( int ch = 0; ch < digi[iDigi]->GetNChannels(); ch ++ ) spbCoinLength[iDigi][ch] = new QSpinBox(tab);
SetupSpinBoxTab(spbCoinLength, DIGIPARA::CH::CoincidenceLength, "Coin. Length [ns]", triggerTab, iDigi, digi[iDigi]->GetNChannels());
for( int ch = 0; ch < digi[iDigi]->GetNChannels(); ch ++ ) spbADCVetoWidth[iDigi][ch] = new QSpinBox(tab);
SetupSpinBoxTab(spbADCVetoWidth, DIGIPARA::CH::ADCVetoWidth, "ADC Veto Length [ns]", triggerTab, iDigi, digi[iDigi]->GetNChannels());
} }
}
/*
{//^====================== Group trigger settings
QGroupBox * triggerBox = new QGroupBox("Trigger Map", tab);
triggerBox->setSizePolicy(sizePolicy);
QGridLayout * triggerLayout = new QGridLayout(triggerBox);
//triggerBox->setLayout(triggerLayout);
tabLayout_V1->addWidget(triggerBox);
triggerLayout->setHorizontalSpacing(0); {//@============== Trigger Map tab
triggerLayout->setVerticalSpacing(0); QTabWidget * triggerMapTab = new QTabWidget(tab);
chTabWidget->addTab(triggerMapTab, "Trigger Map");
QGridLayout * triggerLayout = new QGridLayout(triggerMapTab);
triggerLayout->setAlignment(Qt::AlignCenter);
triggerLayout->setSpacing(0);
QLabel * instr = new QLabel("Reading: Column (C) represents a trigger channel for Row (R) channel.\nFor example, R3C1 = ch-3 trigger source is ch-1.\n", tab); QLabel * instr = new QLabel("Reading: Column (C) represents a trigger channel for Row (R) channel.\nFor example, R3C1 = ch-3 trigger source is ch-1.\n", tab);
triggerLayout->addWidget(instr, 0, 0, 1, 64+15); triggerLayout->addWidget(instr, 0, 0, 1, 64+15);
@ -718,10 +772,10 @@ DigiSettingsPanel::DigiSettingsPanel(Digitizer2Gen ** digi, unsigned short nDigi
bn[i][j]->setFixedSize(QSize(10,10)); bn[i][j]->setFixedSize(QSize(10,10));
bnClickStatus[i][j] = false; bnClickStatus[i][j] = false;
if( i%4 != 0 && j == (i/4)*4) { //if( i%4 != 0 && j == (i/4)*4) {
bn[i][j]->setStyleSheet("background-color: red;"); // bn[i][j]->setStyleSheet("background-color: red;");
bnClickStatus[i][j] = true; // bnClickStatus[i][j] = true;
} //}
triggerLayout->addWidget(bn[i][j], rowID, colID); triggerLayout->addWidget(bn[i][j], rowID, colID);
triggerMapper->setMapping(bn[i][j], (iDigi << 12) + (i << 8) + j); triggerMapper->setMapping(bn[i][j], (iDigi << 12) + (i << 8) + j);
@ -748,9 +802,8 @@ DigiSettingsPanel::DigiSettingsPanel(Digitizer2Gen ** digi, unsigned short nDigi
} }
}*/ }
} //=== end of channel group
} //=== end of tab } //=== end of tab
@ -872,11 +925,11 @@ void DigiSettingsPanel::ShowSettingsToPanel(){
enableSignalSlot = false; enableSignalSlot = false;
for (unsigned short j = 0; j < (unsigned short) infoIndex.size(); j++){ for (unsigned short j = 0; j < (unsigned short) infoIndex.size(); j++){
leInfo[ID][j]->setText(QString::fromStdString(digi[ID]->GetSettingValue(TYPE::DIG, infoIndex[j].second))); leInfo[ID][j]->setText(QString::fromStdString(digi[ID]->GetSettingValue(infoIndex[j].second)));
} }
//--------- LED Status //--------- LED Status
unsigned int ledStatus = atoi(digi[ID]->GetSettingValue(TYPE::DIG, DIGIPARA::DIG::LED_status).c_str()); unsigned int ledStatus = atoi(digi[ID]->GetSettingValue(DIGIPARA::DIG::LED_status).c_str());
for( int i = 0; i < 19; i++){ for( int i = 0; i < 19; i++){
if( (ledStatus >> i) & 0x1 ) { if( (ledStatus >> i) & 0x1 ) {
LEDStatus[ID][i]->setStyleSheet("background-color:green;"); LEDStatus[ID][i]->setStyleSheet("background-color:green;");
@ -886,7 +939,7 @@ void DigiSettingsPanel::ShowSettingsToPanel(){
} }
//--------- ACQ Status //--------- ACQ Status
unsigned int acqStatus = atoi(digi[ID]->GetSettingValue(TYPE::DIG, DIGIPARA::DIG::ACQ_status).c_str()); unsigned int acqStatus = atoi(digi[ID]->GetSettingValue(DIGIPARA::DIG::ACQ_status).c_str());
for( int i = 0; i < 7; i++){ for( int i = 0; i < 7; i++){
if( (acqStatus >> i) & 0x1 ) { if( (acqStatus >> i) & 0x1 ) {
ACQStatus[ID][i]->setStyleSheet("background-color:green;"); ACQStatus[ID][i]->setStyleSheet("background-color:green;");
@ -897,13 +950,13 @@ void DigiSettingsPanel::ShowSettingsToPanel(){
//-------- temperature //-------- temperature
for( int i = 0; i < 8; i++){ for( int i = 0; i < 8; i++){
leTemp[ID][i]->setText(QString::fromStdString(digi[ID]->GetSettingValue(TYPE::DIG, DIGIPARA::DIG::TempSensADC[i]))); leTemp[ID][i]->setText(QString::fromStdString(digi[ID]->GetSettingValue(DIGIPARA::DIG::TempSensADC[i])));
} }
//-------- board settings //-------- board settings
ReadCombBoxValue(cbbClockSource[ID], TYPE::DIG, DIGIPARA::DIG::ClockSource); ReadCombBoxValue(cbbClockSource[ID], DIGIPARA::DIG::ClockSource);
QString result = QString::fromStdString(digi[ID]->GetSettingValue(TYPE::DIG, DIGIPARA::DIG::StartSource)); QString result = QString::fromStdString(digi[ID]->GetSettingValue(DIGIPARA::DIG::StartSource));
QStringList resultList = result.remove(QChar(' ')).split("|"); QStringList resultList = result.remove(QChar(' ')).split("|");
//qDebug() << resultList << "," << resultList.count(); //qDebug() << resultList << "," << resultList.count();
for( int j = 0; j < (int) DIGIPARA::DIG::StartSource.GetAnswers().size(); j++){ for( int j = 0; j < (int) DIGIPARA::DIG::StartSource.GetAnswers().size(); j++){
@ -915,7 +968,7 @@ void DigiSettingsPanel::ShowSettingsToPanel(){
} }
result = QString::fromStdString(digi[ID]->GetSettingValue(TYPE::DIG, DIGIPARA::DIG::GlobalTriggerSource)); result = QString::fromStdString(digi[ID]->GetSettingValue(DIGIPARA::DIG::GlobalTriggerSource));
resultList = result.remove(QChar(' ')).split("|"); resultList = result.remove(QChar(' ')).split("|");
for( int j = 0; j < (int) DIGIPARA::DIG::StartSource.GetAnswers().size(); j++){ for( int j = 0; j < (int) DIGIPARA::DIG::StartSource.GetAnswers().size(); j++){
ckbGlbTrgSource[ID][j]->setChecked(false); ckbGlbTrgSource[ID][j]->setChecked(false);
@ -924,36 +977,36 @@ void DigiSettingsPanel::ShowSettingsToPanel(){
} }
} }
ReadCombBoxValue(cbbTrgOut[ID], TYPE::DIG, DIGIPARA::DIG::TrgOutMode); ReadCombBoxValue(cbbTrgOut[ID], DIGIPARA::DIG::TrgOutMode);
ReadCombBoxValue(cbbGPIO[ID], TYPE::DIG, DIGIPARA::DIG::GPIOMode); ReadCombBoxValue(cbbGPIO[ID], DIGIPARA::DIG::GPIOMode);
ReadCombBoxValue(cbbBusyIn[ID], TYPE::DIG, DIGIPARA::DIG::BusyInSource); ReadCombBoxValue(cbbBusyIn[ID], DIGIPARA::DIG::BusyInSource);
ReadCombBoxValue(cbbSyncOut[ID], TYPE::DIG, DIGIPARA::DIG::SyncOutMode); ReadCombBoxValue(cbbSyncOut[ID], DIGIPARA::DIG::SyncOutMode);
ReadCombBoxValue(cbbAutoDisarmAcq[ID], TYPE::DIG, DIGIPARA::DIG::EnableAutoDisarmACQ); ReadCombBoxValue(cbbAutoDisarmAcq[ID], DIGIPARA::DIG::EnableAutoDisarmACQ);
ReadCombBoxValue(cbbStatEvents[ID], TYPE::DIG, DIGIPARA::DIG::EnableStatisticEvents); ReadCombBoxValue(cbbStatEvents[ID], DIGIPARA::DIG::EnableStatisticEvents);
ReadCombBoxValue(cbbBdVetoPolarity[ID], TYPE::DIG, DIGIPARA::DIG::BoardVetoPolarity); ReadCombBoxValue(cbbBdVetoPolarity[ID], DIGIPARA::DIG::BoardVetoPolarity);
ReadCombBoxValue(cbbBoardVetoSource[ID], TYPE::DIG, DIGIPARA::DIG::BoardVetoSource); ReadCombBoxValue(cbbBoardVetoSource[ID], DIGIPARA::DIG::BoardVetoSource);
ReadCombBoxValue(cbbIOLevel[ID], TYPE::DIG, DIGIPARA::DIG::IO_Level); ReadCombBoxValue(cbbIOLevel[ID], DIGIPARA::DIG::IO_Level);
result = QString::fromStdString(digi[ID]->GetSettingValue(TYPE::DIG, DIGIPARA::DIG::BoardVetoWidth)); result = QString::fromStdString(digi[ID]->GetSettingValue(DIGIPARA::DIG::BoardVetoWidth));
spbBdVetoWidth[ID]->setValue(result.toInt()); spbBdVetoWidth[ID]->setValue(result.toInt());
result = QString::fromStdString(digi[ID]->GetSettingValue(TYPE::DIG, DIGIPARA::DIG::RunDelay)); result = QString::fromStdString(digi[ID]->GetSettingValue(DIGIPARA::DIG::RunDelay));
spbRunDelay[ID]->setValue(result.toInt()); spbRunDelay[ID]->setValue(result.toInt());
result = QString::fromStdString(digi[ID]->GetSettingValue(TYPE::DIG, DIGIPARA::DIG::VolatileClockOutDelay)); result = QString::fromStdString(digi[ID]->GetSettingValue(DIGIPARA::DIG::VolatileClockOutDelay));
dsbVolatileClockOutDelay[ID]->setValue(result.toDouble()); dsbVolatileClockOutDelay[ID]->setValue(result.toDouble());
result = QString::fromStdString(digi[ID]->GetSettingValue(TYPE::DIG, DIGIPARA::DIG::PermanentClockOutDelay)); result = QString::fromStdString(digi[ID]->GetSettingValue(DIGIPARA::DIG::PermanentClockOutDelay));
dsbClockOutDelay[ID]->setValue(result.toDouble()); dsbClockOutDelay[ID]->setValue(result.toDouble());
//------------- test pulse //------------- test pulse
result = QString::fromStdString(digi[ID]->GetSettingValue(TYPE::DIG, DIGIPARA::DIG::TestPulsePeriod)); result = QString::fromStdString(digi[ID]->GetSettingValue(DIGIPARA::DIG::TestPulsePeriod));
dsbTestPuslePeriod[ID]->setValue(result.toDouble()); dsbTestPuslePeriod[ID]->setValue(result.toDouble());
result = QString::fromStdString(digi[ID]->GetSettingValue(TYPE::DIG, DIGIPARA::DIG::TestPulseWidth)); result = QString::fromStdString(digi[ID]->GetSettingValue(DIGIPARA::DIG::TestPulseWidth));
dsbTestPusleWidth[ID]->setValue(result.toDouble()); dsbTestPusleWidth[ID]->setValue(result.toDouble());
result = QString::fromStdString(digi[ID]->GetSettingValue(TYPE::DIG, DIGIPARA::DIG::TestPulseLowLevel)); result = QString::fromStdString(digi[ID]->GetSettingValue(DIGIPARA::DIG::TestPulseLowLevel));
spbTestPusleLowLevel[ID]->setValue(result.toInt()); spbTestPusleLowLevel[ID]->setValue(result.toInt());
result = QString::fromStdString(digi[ID]->GetSettingValue(TYPE::DIG, DIGIPARA::DIG::TestPulseHighLevel)); result = QString::fromStdString(digi[ID]->GetSettingValue(DIGIPARA::DIG::TestPulseHighLevel));
spbTestPusleHighLevel[ID]->setValue(result.toInt()); spbTestPusleHighLevel[ID]->setValue(result.toInt());
@ -990,8 +1043,9 @@ void DigiSettingsPanel::SetupSpinBox(QSpinBox *spb, Reg para, QString labelTxt,
void DigiSettingsPanel::SetupSpinBoxTab(QSpinBox *spb[][MaxNumberOfChannel+1], Reg para, QString text, QTabWidget *tabWidget, int iDigi, int nChannel){ void DigiSettingsPanel::SetupSpinBoxTab(QSpinBox *spb[][MaxNumberOfChannel+1], Reg para, QString text, QTabWidget *tabWidget, int iDigi, int nChannel){
QWidget * tabPage = new QWidget(this); tabWidget->addTab(tabPage, text); QWidget * tabPage = new QWidget(this); tabWidget->addTab(tabPage, text);
QGridLayout * allLayout = new QGridLayout(tabPage); QGridLayout * allLayout = new QGridLayout(tabPage);
//allLayout->setAlignment(Qt::AlignTop | Qt::AlignHCenter);
allLayout->setAlignment(Qt::AlignTop); allLayout->setAlignment(Qt::AlignTop);
allLayout->setHorizontalSpacing(0); allLayout->setHorizontalSpacing(10);
allLayout->setVerticalSpacing(0); allLayout->setVerticalSpacing(0);
for( int ch = 0; ch < nChannel; ch++){ for( int ch = 0; ch < nChannel; ch++){
SetupSpinBox(spb[iDigi][ch], para, "ch-"+QString::number(ch)+ " ", allLayout, ch/4, ch%4 * 2); SetupSpinBox(spb[iDigi][ch], para, "ch-"+QString::number(ch)+ " ", allLayout, ch/4, ch%4 * 2);
@ -1001,16 +1055,17 @@ void DigiSettingsPanel::SetupSpinBoxTab(QSpinBox *spb[][MaxNumberOfChannel+1], R
void DigiSettingsPanel::SetupComboBoxTab(QComboBox *cbb[][MaxNumberOfChannel + 1], Reg para, QString text, QTabWidget *tabWidget, int iDigi, int nChannel, int nCol){ void DigiSettingsPanel::SetupComboBoxTab(QComboBox *cbb[][MaxNumberOfChannel + 1], Reg para, QString text, QTabWidget *tabWidget, int iDigi, int nChannel, int nCol){
QWidget * tabPage = new QWidget(this); tabWidget->addTab(tabPage, text); QWidget * tabPage = new QWidget(this); tabWidget->addTab(tabPage, text);
QGridLayout * allLayout = new QGridLayout(tabPage); QGridLayout * allLayout = new QGridLayout(tabPage);
//allLayout->setAlignment(Qt::AlignTop | Qt::AlignHCenter);
allLayout->setAlignment(Qt::AlignTop); allLayout->setAlignment(Qt::AlignTop);
allLayout->setHorizontalSpacing(0); allLayout->setHorizontalSpacing(10);
allLayout->setVerticalSpacing(0); allLayout->setVerticalSpacing(0);
for( int ch = 0; ch < nChannel; ch++){ for( int ch = 0; ch < nChannel; ch++){
SetupComboBox(cbb[iDigi][ch], para, "ch-"+QString::number(ch) + " ", allLayout, ch/nCol, ch%nCol * 3); SetupComboBox(cbb[iDigi][ch], para, "ch-"+QString::number(ch) + " ", allLayout, ch/nCol, ch%nCol * 3);
} }
} }
void DigiSettingsPanel::ReadCombBoxValue(QComboBox *cbb, TYPE type, Reg para){ void DigiSettingsPanel::ReadCombBoxValue(QComboBox *cbb, const Reg para){
QString result = QString::fromStdString(digi[ID]->GetSettingValue(type, para)); QString result = QString::fromStdString(digi[ID]->GetSettingValue(para));
//printf("%s === %s, %d, %p\n", __func__, result.toStdString().c_str(), ID, cbb); //printf("%s === %s, %d, %p\n", __func__, result.toStdString().c_str(), ID, cbb);
int index = cbb->findData(result); int index = cbb->findData(result);
if( index >= 0 && index < cbb->count()) { if( index >= 0 && index < cbb->count()) {

2
digiSettingsPanel.h
View File

@ -154,7 +154,7 @@ private:
void SetupSpinBoxTab(QSpinBox *spb[][MaxNumberOfChannel+1], Reg para, QString text, QTabWidget * tabWidget, int iDigi, int nChannel); void SetupSpinBoxTab(QSpinBox *spb[][MaxNumberOfChannel+1], Reg para, QString text, QTabWidget * tabWidget, int iDigi, int nChannel);
void SetupComboBoxTab(QComboBox *cbb[][MaxNumberOfChannel+1], Reg para, QString text, QTabWidget * tabWidget, int iDigi, int nChannel, int nCol = 4); void SetupComboBoxTab(QComboBox *cbb[][MaxNumberOfChannel+1], Reg para, QString text, QTabWidget * tabWidget, int iDigi, int nChannel, int nCol = 4);
void ReadCombBoxValue(QComboBox * cbb, TYPE type, Reg para ); void ReadCombBoxValue(QComboBox * cbb, const Reg para );

6
scope.cpp
View File

@ -597,9 +597,12 @@ void Scope::ScopeMakeSpinBox(QSpinBox *sb, QString str, QGridLayout *layout, int
int iDigi = cbScopeDigi->currentIndex(); int iDigi = cbScopeDigi->currentIndex();
if( step > 1 ) sb->setValue(step*((sb->value() + step - 1)/step)); if( step > 1 ) sb->setValue(step*((sb->value() + step - 1)/step));
digiMTX.lock(); digiMTX.lock();
//TODO change to use Reg
digi[iDigi]->WriteChValue(std::to_string(cbScopeCh->currentIndex()), digPara, std::to_string(sb->value())); digi[iDigi]->WriteChValue(std::to_string(cbScopeCh->currentIndex()), digPara, std::to_string(sb->value()));
digi[iDigi]->ReadChValue(std::to_string(cbScopeCh->currentIndex()), digPara);
digiMTX.unlock(); digiMTX.unlock();
}); });
//TODO digiSettingPanel update setting
} }
void Scope::ScopeMakeComoBox(QComboBox *cb, QString str, QGridLayout *layout, int row, int col, std::string digPara){ void Scope::ScopeMakeComoBox(QComboBox *cb, QString str, QGridLayout *layout, int row, int col, std::string digPara){
@ -611,9 +614,12 @@ void Scope::ScopeMakeComoBox(QComboBox *cb, QString str, QGridLayout *layout, in
if( !allowChange ) return; if( !allowChange ) return;
int iDigi = cbScopeDigi->currentIndex(); int iDigi = cbScopeDigi->currentIndex();
digiMTX.lock(); digiMTX.lock();
//TODO change to use Reg
digi[iDigi]->WriteChValue(std::to_string(cbScopeCh->currentIndex()), digPara, cb->currentData().toString().toStdString()); digi[iDigi]->WriteChValue(std::to_string(cbScopeCh->currentIndex()), digPara, cb->currentData().toString().toStdString());
digi[iDigi]->ReadChValue(std::to_string(cbScopeCh->currentIndex()), digPara);
digiMTX.unlock(); digiMTX.unlock();
}); });
//TODO digiSettingPanel update setting
} }

6
test.cpp
View File

@ -94,9 +94,11 @@ int main(int argc, char* argv[]){
//printf("--------%s \n", digi->ReadChValue("0..63", "WaveAnalogprobe0", true).c_str()); //printf("--------%s \n", digi->ReadChValue("0..63", "WaveAnalogprobe0", true).c_str());
digi->SaveSettingsToFile(("settings_" + std::to_string(digi->GetSerialNumber()) + ".dat").c_str()); //digi->SaveSettingsToFile(("settings_" + std::to_string(digi->GetSerialNumber()) + ".dat").c_str());
printf("===================================\n"); //printf("===================================\n");
printf("======== index : %d \n", digi->FindIndex(DIGIPARA::CH::ChannelEnable));
//digi->LoadSettingsFromFile("settings_21245.dat"); //digi->LoadSettingsFromFile("settings_21245.dat");
//printf("%s \n", digi->ReadValue("/ch/0/par/ChRealtimeMonitor").c_str()); //printf("%s \n", digi->ReadValue("/ch/0/par/ChRealtimeMonitor").c_str());