chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify conditional

Browse Source
This commit is contained in:
Jordan Sherer 2018-11-21 16:40:26 -05:00
parent cc96daa26f
commit e1e2ae50e8
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mainwindow.cpp
View File

@ -151,9 +151,8 @@ extern "C" {
void plotsave_(float swide[], int* m_w , int* m_h1, int* irow); void plotsave_(float swide[], int* m_w , int* m_h1, int* irow);
} }
#define TEST_FOX_WAVE_GEN 0
#define TEST_FOX_WAVE_GEN 1 #define TEST_FOX_WAVE_GEN_SLOTS 1
#define TEST_FOX_WAVE_GEN_SLOTS 2
const int NEAR_THRESHOLD_RX = 10; const int NEAR_THRESHOLD_RX = 10;
@ -8707,13 +8706,12 @@ void MainWindow::updateTxButtonDisplay(){
// update transmit button // update transmit button
if(m_tune || m_transmitting || m_txFrameCount > 0){ if(m_tune || m_transmitting || m_txFrameCount > 0){
int count = m_txFrameCount; int count = m_txFrameCount;
#if TEST_FOX_WAVE_GEN #if TEST_FOX_WAVE_GEN
if(ui->turboButton->isChecked()){ if(ui->turboButton->isChecked()){
count = qMax(1, (int)ceil(float(count)/TEST_FOX_WAVE_GEN_SLOTS)); count = qMax(1, (int)ceil(float(count)/TEST_FOX_WAVE_GEN_SLOTS));
} }
#endif
#if TEST_FOX_WAVE_GEN
int left = m_txFrameQueue.count(); int left = m_txFrameQueue.count();
if(ui->turboButton->isChecked()){ if(ui->turboButton->isChecked()){
left = (int)ceil(float(left)/TEST_FOX_WAVE_GEN_SLOTS); left = (int)ceil(float(left)/TEST_FOX_WAVE_GEN_SLOTS);