diff --git a/devsetup.cpp b/devsetup.cpp index 3c39b562d..3e517e9a8 100644 --- a/devsetup.cpp +++ b/devsetup.cpp @@ -28,6 +28,16 @@ void DevSetup::initDlg() char hostAPI_DeviceName[MAXDEVICES][50]; char s[60]; int numDevices=Pa_GetDeviceCount(); + + const PaDeviceInfo *pdi; + int nchin; + int nchout; + char *p,*p1; + char p2[50]; + char pa_device_name[128]; + char pa_device_hostapi[128]; + +/* getDev(&numDevices,hostAPI_DeviceName,minChan,maxChan,minSpeed,maxSpeed); k=0; for(id=0; idmaxInputChannels; + if(nchin>=2) { + m_inDevList[k]=id; + k++; + sprintf((char*)(pa_device_name),"%s",pdi->name); + sprintf((char*)(pa_device_hostapi),"%s", + Pa_GetHostApiInfo(pdi->hostApi)->name); + + p1=(char*)""; + p=strstr(pa_device_hostapi,"MME"); + if(p!=NULL) p1=(char*)"MME"; + p=strstr(pa_device_hostapi,"Direct"); + if(p!=NULL) p1=(char*)"DirectX"; + p=strstr(pa_device_hostapi,"WASAPI"); + if(p!=NULL) p1=(char*)"WASAPI"; + p=strstr(pa_device_hostapi,"ASIO"); + if(p!=NULL) p1=(char*)"ASIO"; + p=strstr(pa_device_hostapi,"WDM-KS"); + if(p!=NULL) p1=(char*)"WDM-KS"; + + sprintf(p2,"%2d %-8s %-39s",id,p1,pa_device_name); + QString t(p2); + ui.comboBoxSndIn->addItem(t); + } nchout=pdi->maxOutputChannels; if(nchout>=2) { m_outDevList[k]=id; @@ -83,33 +111,8 @@ void DevSetup::initDlg() ui.pttComboBox->setCurrentIndex(m_pttPort); ui.saveDirEntry->setText(m_saveDir); ui.dxccEntry->setText(m_dxccPfx); - ui.timeoutSpinBox->setValue(m_timeout); - ui.fCalSpinBox->setValue(m_fCal); - ui.faddEntry->setText(QString::number(m_fAdd,'f',3)); ui.comboBoxSndIn->setCurrentIndex(m_nDevIn); ui.comboBoxSndOut->setCurrentIndex(m_nDevOut); - ui.cbInitIQplus->setChecked(m_initIQplus); - ui.mult570SpinBox->setValue(m_mult570); - ui.cal570SpinBox->setValue(m_cal570); - sscanf(m_colors.toAscii(),"%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]; @@ -134,145 +137,11 @@ void DevSetup::accept() m_pttPort=ui.pttComboBox->currentIndex(); m_saveDir=ui.saveDirEntry->text(); m_dxccPfx=ui.dxccEntry->text(); - m_timeout=ui.timeoutSpinBox->value(); - m_fCal=ui.fCalSpinBox->value(); - m_fAdd=ui.faddEntry->text().toDouble(); m_nDevIn=ui.comboBoxSndIn->currentIndex(); m_paInDevice=m_inDevList[m_nDevIn]; m_nDevOut=ui.comboBoxSndOut->currentIndex(); m_paOutDevice=m_outDevList[m_nDevOut]; - m_initIQplus=ui.cbInitIQplus->isChecked(); - m_mult570=ui.mult570SpinBox->value(); - m_cal570=ui.cal570SpinBox->value(); QDialog::accept(); } -void DevSetup::on_cal570SpinBox_valueChanged(double ppm) -{ - m_cal570=ppm; -} - -void DevSetup::on_mult570SpinBox_valueChanged(int mult) -{ - m_mult570=mult; -} - -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(); - - t.sprintf("QLabel{background-color: #%2.2x%2.2x%2.2x;" - "color: #%2.2x%2.2x%2.2x}",r,g,b,r0,g0,b0); - ui.lab0->setStyleSheet(t); - t.sprintf("QLabel{background-color: #%2.2x%2.2x%2.2x;" - "color: #%2.2x%2.2x%2.2x}",r,g,b,r1,g1,b1); - ui.lab1->setStyleSheet(t); - t.sprintf("QLabel{background-color: #%2.2x%2.2x%2.2x;" - "color: #%2.2x%2.2x%2.2x}",r,g,b,r2,g2,b2); - ui.lab2->setStyleSheet(t); - t.sprintf("QLabel{background-color: #%2.2x%2.2x%2.2x;" - "color: #%2.2x%2.2x%2.2x}",r,g,b,r3,g3,b3); - ui.lab3->setStyleSheet(t); - - m_colors.sprintf("%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x" - "%2.2x%2.2x%2.2x",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()) { - } -} diff --git a/devsetup.h b/devsetup.h index f45c4ae66..8ed91c681 100644 --- a/devsetup.h +++ b/devsetup.h @@ -20,61 +20,20 @@ public: qint32 m_outDevList[100]; qint32 m_paInDevice; qint32 m_paOutDevice; - qint32 m_timeout; - qint32 m_dPhi; - qint32 m_fCal; - qint32 m_udpPort; - qint32 m_astroFont; - qint32 m_mult570; - double m_fAdd; - double m_cal570; - - bool m_xpolx; - bool m_network; - bool m_fs96000; - bool m_xpol; - bool m_IQswap; bool m_restartSoundIn; bool m_restartSoundOut; - bool m_10db; - bool m_initIQplus; QString m_myCall; QString m_myGrid; QString m_saveDir; QString m_azelDir; QString m_dxccPfx; - QString m_colors; - - QColor m_colorBackground; public slots: void accept(); -private slots: - 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(); - private: - int r,g,b,r0,g0,b0,r1,g1,b1,r2,g2,b2,r3,g3,b3; Ui::DialogSndCard ui; }; diff --git a/devsetup.ui b/devsetup.ui index d413252cb..af62488af 100644 --- a/devsetup.ui +++ b/devsetup.ui @@ -17,7 +17,7 @@ - 0 + 1 @@ -392,91 +392,51 @@ I/O Devices - + - 0 - 10 - 361 - 291 + 1 + 73 + 351 + 151 - + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 55 + + Input Device (Rx Audio) - + + + true + - 13 - 14 - 341 - 211 + 15 + 16 + 291 + 22 - - - - - false - - - - 0 - 0 - - - - Dev Ch API Name - - - - - - - - - true - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 50 - 13 - - - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 13 - - - - - @@ -512,619 +472,6 @@ - - - Si570 - - - - - 70 - 90 - 228 - 111 - - - - - - - - - Frequency multiplier: - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 47 - 20 - - - - - - - - 1 - - - 8 - - - 2 - - - - - - - - - - - Frequency correction (ppm): - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 20 - - - - - - - - 3 - - - -200.000000000000000 - - - 200.000000000000000 - - - - - - - - - Initialize IQ+ on startup - - - - - - - - - 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 - - - - - - - - - diff --git a/mainwindow.cpp b/mainwindow.cpp index ffcdd3182..d99d31d7c 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -540,57 +540,24 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog dlg.m_myGrid=m_myGrid; dlg.m_idInt=m_idInt; dlg.m_pttPort=m_pttPort; - dlg.m_xpol=m_xpol; - dlg.m_xpolx=m_xpolx; dlg.m_saveDir=m_saveDir; dlg.m_azelDir=m_azelDir; dlg.m_dxccPfx=m_dxccPfx; - dlg.m_timeout=m_timeout; - dlg.m_dPhi=m_dPhi; - dlg.m_fCal=m_fCal; - dlg.m_fAdd=m_fAdd; - dlg.m_network=m_network; - dlg.m_fs96000=m_fs96000; dlg.m_nDevIn=m_nDevIn; dlg.m_nDevOut=m_nDevOut; - dlg.m_udpPort=m_udpPort; - dlg.m_IQswap=m_IQswap; - dlg.m_10db=m_10db; - dlg.m_initIQplus=m_initIQplus; - 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; m_myGrid=dlg.m_myGrid; m_idInt=dlg.m_idInt; - m_pttPort=dlg.m_pttPort; - m_xpol=dlg.m_xpol; - ui->actionFind_Delta_Phi->setEnabled(m_xpol); - m_xpolx=dlg.m_xpolx; m_saveDir=dlg.m_saveDir; - m_azelDir=dlg.m_azelDir; m_dxccPfx=dlg.m_dxccPfx; - m_timeout=dlg.m_timeout; - m_dPhi=dlg.m_dPhi; - m_fCal=dlg.m_fCal; - m_fAdd=dlg.m_fAdd; g_pWideGraph->setFcal(m_fCal); - m_fs96000=dlg.m_fs96000; - m_network=dlg.m_network; m_nDevIn=dlg.m_nDevIn; m_paInDevice=dlg.m_paInDevice; m_nDevOut=dlg.m_nDevOut; m_paOutDevice=dlg.m_paOutDevice; - m_udpPort=dlg.m_udpPort; - m_IQswap=dlg.m_IQswap; - m_10db=dlg.m_10db; - m_initIQplus=dlg.m_initIQplus; - m_colors=dlg.m_colors; - m_cal570=dlg.m_cal570; - m_mult570=dlg.m_mult570; g_pWideGraph->m_mult570=m_mult570; g_pWideGraph->m_cal570=m_cal570; soundInThread.setSwapIQ(m_IQswap);