WaveDAQ/drs4eb
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed problem when no trigger channel is selected

Browse Source
This commit is contained in:
ritt
2016-11-30 17:38:23 +01:00
parent 8906b39e7d
commit fab70c5365
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
software/drsosc/DOFrame.cpp
+6 -9
View File
@@ -1744,17 +1744,14 @@ void DOFrame::OnSetTriggerConfig(int id, bool flag)
}
}
if ((m_trgConfig[m_board] & 0x7FFF) > 0) {
m_rbSource->SetSelection(GetTriggerChannel(m_board));
if (m_multiBoard) {
for (int i=0 ; i<m_osci->GetNumberOfBoards() ; i++) {
m_osci->GetBoard(i)->SetTriggerConfig(m_trgConfig[i]);
}
} else {
m_osci->SetTriggerConfig(m_trgConfig[m_board]);
m_rbSource->SetSelection(GetTriggerChannel(m_board));
if (m_multiBoard) {
for (int i=0 ; i<m_osci->GetNumberOfBoards() ; i++) {
m_osci->GetBoard(i)->SetTriggerConfig(m_trgConfig[i]);
}
} else {
m_osci->SetTriggerConfig(m_trgConfig[m_board]);
}
}
/*------------------------------------------------------------------*/