diff --git a/q65w/devsetup.cpp b/q65w/devsetup.cpp index 6b67ff9cb..857c0ab02 100644 --- a/q65w/devsetup.cpp +++ b/q65w/devsetup.cpp @@ -74,7 +74,6 @@ void DevSetup::initDlg() sprintf(p2,"%2d %-8s %-39s",id,p1,pa_device_name); QString t(p2); - ui.comboBoxSndOut->addItem(t); } } @@ -87,40 +86,11 @@ void DevSetup::initDlg() ui.faddEntry->setText(QString::number(m_fAdd,'f',3)); ui.networkRadioButton->setChecked(m_network); ui.soundCardRadioButton->setChecked(!m_network); - ui.rb96000->setChecked(m_fs96000); - ui.rb95238->setChecked(!m_fs96000); - ui.rbIQXT->setChecked(m_bIQxt); - ui.rbSi570->setChecked(!m_bIQxt); - ui.mult570TxSpinBox->setEnabled(m_bIQxt); ui.comboBoxSndIn->setEnabled(!m_network); ui.comboBoxSndIn->setCurrentIndex(m_nDevIn); - ui.comboBoxSndOut->setCurrentIndex(m_nDevOut); ui.sbPort->setValue(m_udpPort); ui.cbIQswap->setChecked(m_IQswap); - ui.cbInitIQplus->setChecked(m_initIQplus); ui.sb_dB->setValue(m_dB); - ui.mult570SpinBox->setValue(m_mult570); - ui.mult570TxSpinBox->setValue(m_mult570Tx); - ui.cal570SpinBox->setValue(m_cal570); - ui.sbTxOffset->setValue(m_TxOffset); - ::sscanf (m_colors.toLatin1(),"%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x", - &r,&g,&b,&r0,&g0,&b0,&r1,&g1,&b1,&r2,&g2,&b2,&r3,&g3,&b3); - updateColorLabels(); - ui.sbBackgroundRed->setValue(r); - ui.sbBackgroundGreen->setValue(g); - ui.sbBackgroundBlue->setValue(b); - ui.sbRed0->setValue(r0); - ui.sbRed1->setValue(r1); - ui.sbRed2->setValue(r2); - ui.sbRed3->setValue(r3); - ui.sbGreen0->setValue(g0); - ui.sbGreen1->setValue(g1); - ui.sbGreen2->setValue(g2); - ui.sbGreen3->setValue(g3); - ui.sbBlue0->setValue(b0); - ui.sbBlue1->setValue(b1); - ui.sbBlue2->setValue(b2); - ui.sbBlue3->setValue(b3); m_paInDevice=m_inDevList[m_nDevIn]; m_paOutDevice=m_outDevList[m_nDevOut]; @@ -147,213 +117,21 @@ void DevSetup::accept() m_fCal=ui.fCalSpinBox->value(); m_fAdd=ui.faddEntry->text().toDouble(); m_network=ui.networkRadioButton->isChecked(); - m_fs96000=ui.rb96000->isChecked(); - m_bIQxt=ui.rbIQXT->isChecked(); m_nDevIn=ui.comboBoxSndIn->currentIndex(); m_paInDevice=m_inDevList[m_nDevIn]; - m_nDevOut=ui.comboBoxSndOut->currentIndex(); m_paOutDevice=m_outDevList[m_nDevOut]; m_udpPort=ui.sbPort->value(); m_IQswap=ui.cbIQswap->isChecked(); - m_initIQplus=ui.cbInitIQplus->isChecked(); m_dB=ui.sb_dB->value(); - m_mult570=ui.mult570SpinBox->value(); - m_mult570Tx=ui.mult570TxSpinBox->value(); - m_cal570=ui.cal570SpinBox->value(); - m_TxOffset=ui.sbTxOffset->value(); - QDialog::accept(); } void DevSetup::on_soundCardRadioButton_toggled(bool checked) { ui.comboBoxSndIn->setEnabled(ui.soundCardRadioButton->isChecked()); - ui.rb96000->setChecked(checked); - ui.rb95238->setEnabled(!checked); ui.label_InputDev->setEnabled(checked); ui.label_Port->setEnabled(!checked); ui.sbPort->setEnabled(!checked); ui.cbIQswap->setEnabled(checked); ui.sb_dB->setEnabled(checked); } - -void DevSetup::on_cal570SpinBox_valueChanged(double ppm) -{ - m_cal570=ppm; -} - -void DevSetup::on_mult570SpinBox_valueChanged(int mult) -{ - m_mult570=mult; -} - -void DevSetup::on_sb_dB_valueChanged(int n) -{ - m_dB=n; -} - -void DevSetup::updateColorLabels() -{ - QString t; - int r=ui.sbBackgroundRed->value(); - int g=ui.sbBackgroundGreen->value(); - int b=ui.sbBackgroundBlue->value(); - int r0=ui.sbRed0->value(); - int r1=ui.sbRed1->value(); - int r2=ui.sbRed2->value(); - int r3=ui.sbRed3->value(); - int g0=ui.sbGreen0->value(); - int g1=ui.sbGreen1->value(); - int g2=ui.sbGreen2->value(); - int g3=ui.sbGreen3->value(); - int b0=ui.sbBlue0->value(); - int b1=ui.sbBlue1->value(); - int b2=ui.sbBlue2->value(); - int b3=ui.sbBlue3->value(); - - ui.lab0->setStyleSheet ( - QString {"QLabel{background-color: #%1%2%3; color: #%4%5%6}"} - .arg (r, 2, 16, QLatin1Char {'0'}) - .arg (g, 2, 16, QLatin1Char {'0'}) - .arg (b, 2, 16, QLatin1Char {'0'}) - .arg (r0, 2, 16, QLatin1Char {'0'}) - .arg (g0, 2, 16, QLatin1Char {'0'}) - .arg (b0, 2, 16, QLatin1Char {'0'}) - ); - ui.lab1->setStyleSheet( - QString {"QLabel{background-color: #%1%2%3; color: #%4%5%6}"} - .arg (r, 2, 16, QLatin1Char {'0'}) - .arg (g, 2, 16, QLatin1Char {'0'}) - .arg (b, 2, 16, QLatin1Char {'0'}) - .arg (r1, 2, 16, QLatin1Char {'0'}) - .arg (g1, 2, 16, QLatin1Char {'0'}) - .arg (b1, 2, 16, QLatin1Char {'0'}) - ); - ui.lab2->setStyleSheet( - QString {"QLabel{background-color: #%1%2%3; color: #%4%5%6}"} - .arg (r, 2, 16, QLatin1Char {'0'}) - .arg (g, 2, 16, QLatin1Char {'0'}) - .arg (b, 2, 16, QLatin1Char {'0'}) - .arg (r2, 2, 16, QLatin1Char {'0'}) - .arg (g2, 2, 16, QLatin1Char {'0'}) - .arg (b2, 2, 16, QLatin1Char {'0'}) - ); - ui.lab3->setStyleSheet( - QString {"QLabel{background-color: #%1%2%3; color: #%4%5%6}"} - .arg (r, 2, 16, QLatin1Char {'0'}) - .arg (g, 2, 16, QLatin1Char {'0'}) - .arg (b, 2, 16, QLatin1Char {'0'}) - .arg (r3, 2, 16, QLatin1Char {'0'}) - .arg (g3, 2, 16, QLatin1Char {'0'}) - .arg (b3, 2, 16, QLatin1Char {'0'}) - ); - - m_colors.clear (); - QTextStream ots {&m_colors, QIODevice::WriteOnly}; - ots.setIntegerBase (16); - ots.setFieldWidth (2); - ots.setPadChar ('0'); - ots << r << g << b << r0 << g0 << b0 << r1 << g1 << b1 << r2 << g2 << b2 << r3 << g3 << b3; -} - -void DevSetup::on_sbBackgroundRed_valueChanged(int /*r*/) -{ - updateColorLabels(); -} - -void DevSetup::on_sbBackgroundGreen_valueChanged(int /*g*/) -{ - updateColorLabels(); -} - -void DevSetup::on_sbBackgroundBlue_valueChanged(int /*b*/) -{ - updateColorLabels(); -} - - -void DevSetup::on_sbRed0_valueChanged(int /*arg1*/) -{ - updateColorLabels(); -} - -void DevSetup::on_sbGreen0_valueChanged(int /*arg1*/) -{ - updateColorLabels(); -} - -void DevSetup::on_sbBlue0_valueChanged(int /*arg1*/) -{ - updateColorLabels(); -} - -void DevSetup::on_sbRed1_valueChanged(int /*arg1*/) -{ - updateColorLabels(); -} - -void DevSetup::on_sbGreen1_valueChanged(int /*arg1*/) -{ - updateColorLabels(); -} - -void DevSetup::on_sbBlue1_valueChanged(int /*arg1*/) -{ - updateColorLabels(); -} - -void DevSetup::on_sbRed2_valueChanged(int /*arg1*/) -{ - updateColorLabels(); -} - -void DevSetup::on_sbGreen2_valueChanged(int /*arg1*/) -{ - updateColorLabels(); -} - -void DevSetup::on_sbBlue2_valueChanged(int /*arg1*/) -{ - updateColorLabels(); -} - -void DevSetup::on_sbRed3_valueChanged(int /*arg1*/) -{ - updateColorLabels(); -} - -void DevSetup::on_sbGreen3_valueChanged(int /*arg1*/) -{ - updateColorLabels(); -} - -void DevSetup::on_sbBlue3_valueChanged(int /*arg1*/) -{ - updateColorLabels(); -} - -void DevSetup::on_pushButton_5_clicked() -{ - QColor color = QColorDialog::getColor(Qt::green, this); - if (color.isValid()) { - } -} - -void DevSetup::on_mult570TxSpinBox_valueChanged(int n) -{ - m_mult570Tx=n; -} - -void DevSetup::on_rbIQXT_toggled(bool checked) -{ - m_bIQxt=checked; - ui.mult570TxSpinBox->setEnabled(m_bIQxt); - ui.label_25->setEnabled(m_bIQxt); - ui.sbTxOffset->setEnabled(m_bIQxt); - ui.label_26->setEnabled(m_bIQxt); -} - -void DevSetup::on_sbTxOffset_valueChanged(double f) -{ - m_TxOffset=f; -} diff --git a/q65w/devsetup.h b/q65w/devsetup.h index 71dad4027..21deda46f 100644 --- a/q65w/devsetup.h +++ b/q65w/devsetup.h @@ -38,46 +38,19 @@ public: bool m_IQswap; bool m_restartSoundIn; bool m_initIQplus; - bool m_bIQxt; QString m_myCall; QString m_myGrid; QString m_saveDir; QString m_azelDir; QString m_dxccPfx; - QString m_colors; QString m_editorCommand; - QColor m_colorBackground; - public slots: void accept(); private slots: void on_soundCardRadioButton_toggled(bool checked); - void on_cal570SpinBox_valueChanged(double ppm); - void on_mult570SpinBox_valueChanged(int mult); - void on_sbBackgroundRed_valueChanged(int arg1); - void on_sbBackgroundGreen_valueChanged(int arg1); - void on_sbBackgroundBlue_valueChanged(int arg1); - void updateColorLabels(void); - void on_sbRed0_valueChanged(int arg1); - void on_sbGreen0_valueChanged(int arg1); - void on_sbBlue0_valueChanged(int arg1); - void on_sbRed1_valueChanged(int arg1); - void on_sbGreen1_valueChanged(int arg1); - void on_sbBlue1_valueChanged(int arg1); - void on_sbRed2_valueChanged(int arg1); - void on_sbGreen2_valueChanged(int arg1); - void on_sbBlue2_valueChanged(int arg1); - void on_sbRed3_valueChanged(int arg1); - void on_sbGreen3_valueChanged(int arg1); - void on_sbBlue3_valueChanged(int arg1); - void on_pushButton_5_clicked(); - void on_mult570TxSpinBox_valueChanged(int arg1); - void on_rbIQXT_toggled(bool checked); - void on_sbTxOffset_valueChanged(double f); - void on_sb_dB_valueChanged(int n); private: int r,g,b,r0,g0,b0,r1,g1,b1,r2,g2,b2,r3,g3,b3; diff --git a/q65w/devsetup.ui b/q65w/devsetup.ui index ffd4a7fba..05cabbccc 100644 --- a/q65w/devsetup.ui +++ b/q65w/devsetup.ui @@ -478,943 +478,10 @@ - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 13 - - - - - - - - - 0 - 0 - - - - - 16777215 - 60 - - - - Sample Rate - - - - - 30 - 20 - 282 - 22 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - 96000 Hz - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - 95238 Hz - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 55 - - - - Output Device (Tx Audio) - - - - - 10 - 20 - 291 - 22 - - - - - - - - - - - Colors - - - - - 12 - 21 - 351 - 281 - - - - - - - - 10 - - - - Choose colors for Band Map and Messages Windows - - - Qt::AlignCenter - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 80 - 20 - - - - - - - - Red - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 31 - 20 - - - - - - - - Green - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 34 - 20 - - - - - - - - Blue - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 80 - 20 - - - - - - - - - - - - - 60 - 16777215 - - - - Background - - - Qt::AlignCenter - - - - - - - 255 - - - - - - - 255 - - - - - - - 255 - - - 102 - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 55 - 20 - - - - - - - - - - - - - 60 - 16777215 - - - - Newest - - - Qt::AlignCenter - - - - - - - 255 - - - 255 - - - - - - - 255 - - - - - - - 255 - - - - - - - - 0 - 0 - - - - - 50 - 16777215 - - - - - Courier New - 9 - - - - K1ABC - - - - - - - - - - - - 60 - 16777215 - - - - 2nd - - - Qt::AlignCenter - - - - - - - 255 - - - 255 - - - - - - - 255 - - - 255 - - - - - - - 255 - - - - - - - - 0 - 0 - - - - - 50 - 16777215 - - - - - Courier New - 9 - - - - K1ABC - - - - - - - - - - - - 60 - 16777215 - - - - 3rd - - - Qt::AlignCenter - - - - - - - 255 - - - 150 - - - - - - - 255 - - - 150 - - - - - - - 255 - - - 150 - - - - - - - - 0 - 0 - - - - - 50 - 16777215 - - - - - Courier New - 9 - - - - K1ABC - - - - - - - - - - - - 60 - 16777215 - - - - Oldest - - - Qt::AlignCenter - - - - - - - 255 - - - 100 - - - - - - - 255 - - - 100 - - - - - - - 255 - - - 100 - - - - - - - - 0 - 0 - - - - - 50 - 16777215 - - - - - Courier New - 9 - - - - K1ABC - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Color Selector - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Si570 Control - - - - - 41 - 41 - 272 - 248 - - - - - - - - - LO Selection: - - - - - - - IQ+, Generic Si570 - - - true - - - - - - - IQ+ Rx/XT - - - false - - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 40 - - - - - - - - - - Rx frequency multiplier: - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 47 - 20 - - - - - - - - - 0 - 0 - - - - - 80 - 0 - - - - 1 - - - 8 - - - 2 - - - - - - - - - - - Tx Offset (MHz): - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 80 - 0 - - - - 3 - - - 150.000000000000000 - - - 130.900000000000006 - - - - - - - - - - - false - - - Tx frequency multiplier: - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 47 - 20 - - - - - - - - false - - - - 0 - 0 - - - - - 80 - 0 - - - - 1 - - - - - - - - - - - Frequency correction (ppm): - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 10 - 20 - - - - - - - - - 0 - 0 - - - - - 80 - 0 - - - - 3 - - - -200.000000000000000 - - - 200.000000000000000 - - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 40 - - - - - - - - Initialize IQ+ on startup - - - diff --git a/q65w/mainwindow.cpp b/q65w/mainwindow.cpp index f4e6abe68..e534665f0 100644 --- a/q65w/mainwindow.cpp +++ b/q65w/mainwindow.cpp @@ -99,11 +99,9 @@ MainWindow::MainWindow(QWidget *parent) : connect(m_gui_timer, &QTimer::timeout, this, &MainWindow::guiUpdate); - m_auto=false; m_waterfallAvg = 1; m_network = true; m_restart=false; - m_transmitting=false; m_widebandDecode=false; m_myCall="K1JT"; m_myGrid="FN20qi"; @@ -137,8 +135,6 @@ MainWindow::MainWindow(QWidget *parent) : xSignalMeter = new SignalMeter(ui->xMeterFrame); xSignalMeter->resize(50, 160); - ySignalMeter = new SignalMeter(ui->yMeterFrame); - ySignalMeter->resize(50, 160); #ifdef WIN32 while(true) { @@ -219,12 +215,7 @@ MainWindow::MainWindow(QWidget *parent) : m_tol=500; m_wide_graph_window->setTol(m_tol); m_wide_graph_window->setFcal(m_fCal); - if(m_fs96000) m_wide_graph_window->setFsample(96000); - if(!m_fs96000) m_wide_graph_window->setFsample(95238); - m_wide_graph_window->m_mult570=m_mult570; - m_wide_graph_window->m_mult570Tx=m_mult570Tx; - m_wide_graph_window->m_cal570=m_cal570; - if(m_initIQplus) m_wide_graph_window->initIQplus(); + m_wide_graph_window->setFsample(96000); // Create "m_worked", a dictionary of all calls in wsjt.log QFile f("wsjt.log"); @@ -329,8 +320,6 @@ void MainWindow::writeSettings() settings.setValue("GainY",(double)m_gainy); settings.setValue("PhaseX",(double)m_phasex); settings.setValue("PhaseY",(double)m_phasey); - settings.setValue("Mult570",m_mult570); - settings.setValue("Cal570",m_cal570); settings.setValue("Colors",m_colors); settings.setValue("MaxDrift",ui->sbMaxDrift->value()); } @@ -413,8 +402,6 @@ void MainWindow::readSettings() m_gainy=settings.value("GainY",1.0).toFloat(); m_phasex=settings.value("PhaseX",0.0).toFloat(); m_phasey=settings.value("PhaseY",0.0).toFloat(); - m_mult570=settings.value("Mult570",2).toInt(); - m_cal570=settings.value("Cal570",0.0).toDouble(); m_colors=settings.value("Colors","000066ff0000ffff00969696646464").toString(); if(!ui->actionLinrad->isChecked() && !ui->actionCuteSDR->isChecked() && @@ -488,13 +475,12 @@ void MainWindow::dataSink(int k) ui->yMeterFrame->setVisible(false); lab4->setText ( - QString {" Rx noise: %1 %2 %% "} + QString {" Rx: %1 %2 %% "} .arg (px, 5, 'f', 1) .arg (m_pctZap, 5, 'f', 1) ); xSignalMeter->setValue(px); // Update the signal meters - ySignalMeter->setValue(py); if(m_monitoring || m_diskData) { m_wide_graph_window->dataSink2(s,nkhz,ihsym,m_diskData,lstrong); } @@ -585,11 +571,6 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog dlg.m_IQswap=m_IQswap; dlg.m_dB=m_dB; dlg.m_initIQplus=m_initIQplus; - dlg.m_bIQxt=m_bIQxt; - dlg.m_cal570=m_cal570; - dlg.m_mult570=m_mult570; - dlg.m_colors=m_colors; - dlg.initDlg(); if(dlg.exec() == QDialog::Accepted) { m_myCall=dlg.m_myCall; @@ -617,11 +598,6 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog m_IQswap=dlg.m_IQswap; m_dB=dlg.m_dB; m_initIQplus=dlg.m_initIQplus; - m_bIQxt=dlg.m_bIQxt; - m_colors=dlg.m_colors; - m_cal570=dlg.m_cal570; - m_wide_graph_window->m_mult570=m_mult570; - m_wide_graph_window->m_cal570=m_cal570; soundInThread.setSwapIQ(m_IQswap); soundInThread.setScale(m_dB); @@ -741,18 +717,6 @@ void MainWindow::createStatusBar() //createStatusBar lab1->setFrameStyle(QFrame::Panel | QFrame::Sunken); statusBar()->addWidget(lab1); - lab2 = new QLabel("QSO freq: 125"); - lab2->setAlignment(Qt::AlignHCenter); - lab2->setMinimumSize(QSize(90,10)); - lab2->setFrameStyle(QFrame::Panel | QFrame::Sunken); - statusBar()->addWidget(lab2); - - lab3 = new QLabel("QSO DF: 0"); - lab3->setAlignment(Qt::AlignHCenter); - lab3->setMinimumSize(QSize(80,10)); - lab3->setFrameStyle(QFrame::Panel | QFrame::Sunken); - statusBar()->addWidget(lab3); - lab4 = new QLabel(""); lab4->setAlignment(Qt::AlignHCenter); lab4->setMinimumSize(QSize(80,10)); @@ -1234,42 +1198,12 @@ void MainWindow::guiUpdate() qint64 ms = QDateTime::currentMSecsSinceEpoch() % 86400000; int nsec=ms/1000; - /* - if(nc1 <= 0) nc1++; - if(nc1 == 0) { - xSignalMeter->setValue(0); - ySignalMeter->setValue(0); - m_monitoring=false; - soundInThread.setMonitoring(false); - m_transmitting=true; - m_wide_graph_window->enableSetRxHardware(false); - - QString t=" Tx " + m_modeTx + " "; - t=t.left(11); - QFile f("map65_tx.log"); - f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append); - QTextStream out(&f); - out << QDateTime::currentDateTimeUtc().toString("yyyy-MMM-dd hh:mm") - << t << QString::fromLatin1(msgsent) -#if QT_VERSION >= QT_VERSION_CHECK (5, 15, 0) - << Qt::endl -#else - << endl -#endif - ; - f.close(); - } -*/ - if(m_monitoring) { ui->monitorButton->setStyleSheet(m_pbmonitor_style); } else { ui->monitorButton->setStyleSheet(""); } - lab2->setText("QSO Freq: " + QString::number(m_wide_graph_window->QSOfreq())); - lab3->setText("QSO DF: " + QString::number(m_wide_graph_window->DF())); - m_wide_graph_window->updateFreqLabel(); if(m_startAnother) { @@ -1282,7 +1216,7 @@ void MainWindow::guiUpdate() soundInThread.setForceCenterFreqMHz(m_wide_graph_window->m_dForceCenterFreq); soundInThread.setForceCenterFreqBool(m_wide_graph_window->m_bForceCenterFreq); - if(m_pctZap>30.0 and !m_transmitting) { + if(m_pctZap>30.0) { lab4->setStyleSheet("QLabel{background-color: #ff0000}"); } else { lab4->setStyleSheet(""); @@ -1323,8 +1257,7 @@ void MainWindow::guiUpdate() ui->labUTC->setText(utc); if((!m_monitoring and !m_diskData) or (khsym==m_hsym0)) { xSignalMeter->setValue(0); - ySignalMeter->setValue(0); - lab4->setText(" Rx noise: 0.0 0.0 0.0% "); + lab4->setText(" Rx noise: 0.0 0.0% "); } m_hsym0=khsym; m_sec0=nsec; diff --git a/q65w/mainwindow.h b/q65w/mainwindow.h index e8ed20a2f..7c14d3b2a 100644 --- a/q65w/mainwindow.h +++ b/q65w/mainwindow.h @@ -128,8 +128,6 @@ private: qint32 m_NBslider; qint32 m_adjustIQ; qint32 m_applyIQcal; - qint32 m_mult570; - qint32 m_mult570Tx; qint32 m_nsum; qint32 m_nsave; qint32 m_TRperiod; @@ -139,23 +137,13 @@ private: qint32 m_dB; double m_fAdd; - // double m_IQamp; - // double m_IQphase; - double m_cal570; - double m_TxOffset; double m_xavg; bool m_monitoring; - bool m_transmitting; bool m_diskData; bool m_loopall; bool m_decoderBusy; - bool m_txFirst; - bool m_auto; - bool m_txMute; bool m_restart; - bool m_xpol; - bool m_xpolx; bool m_call3Modified; bool m_startAnother; bool m_saveAll;