kopia lustrzana https://gitlab.com/eliggett/wfview
Compiles but lots not working!
rodzic
4634da3c23
commit
15c0d40a3e
|
@ -26,7 +26,7 @@ void frequencyinputwidget::setAutomaticSidebandSwitching(bool autossb)
|
|||
this->automaticSidebandSwitching = autossb;
|
||||
}
|
||||
|
||||
void frequencyinputwidget::updateCurrentMode(mode_kind mode)
|
||||
void frequencyinputwidget::updateCurrentMode(rigMode_t mode)
|
||||
{
|
||||
currentMode = mode;
|
||||
}
|
||||
|
@ -126,7 +126,7 @@ void frequencyinputwidget::on_fStoBtn_clicked()
|
|||
{
|
||||
//emit setMemory(preset_number, freq, currentMode);
|
||||
emit saveMemoryPreset(preset_number);
|
||||
//mem.setPreset(preset_number, freq.MHzDouble, (mode_kind)ui->modeSelectCombo->currentData().toInt() );
|
||||
//mem.setPreset(preset_number, freq.MHzDouble, (rigMode_t)ui->modeSelectCombo->currentData().toInt() );
|
||||
//showStatusBarText( QString("Storing frequency %1 to memory location %2").arg( freq.MHzDouble ).arg(preset_number) );
|
||||
} else {
|
||||
//showStatusBarText(QString("Could not store preset to %1. Valid preset numbers are 0 to 99").arg(preset_number));
|
||||
|
@ -195,7 +195,7 @@ void frequencyinputwidget::on_goFreqBtn_clicked()
|
|||
}
|
||||
if(ok)
|
||||
{
|
||||
mode_info m;
|
||||
modeInfo m;
|
||||
issueCmdF(cmdSetFreq, f);
|
||||
m.mk = sidebandChooser::getMode(f, currentMode);
|
||||
m.reg = (unsigned char) m.mk;
|
||||
|
|
|
@ -22,14 +22,14 @@ public:
|
|||
|
||||
signals:
|
||||
void issueCmdF(cmds cmd, freqt f);
|
||||
void issueCmdM(cmds cmd, mode_info m);
|
||||
void updateUIMode(mode_kind mode);
|
||||
void issueCmdM(cmds cmd, modeInfo m);
|
||||
void updateUIMode(rigMode_t mode);
|
||||
void updateUIFrequency(freqt f);
|
||||
void gotoMemoryPreset(int presetNumber);
|
||||
void saveMemoryPreset(int presetNumber);
|
||||
|
||||
public slots:
|
||||
void updateCurrentMode(mode_kind mode);
|
||||
void updateCurrentMode(rigMode_t mode);
|
||||
void updateFilterSelection(int filter);
|
||||
void setAutomaticSidebandSwitching(bool autossb);
|
||||
|
||||
|
@ -59,7 +59,7 @@ private:
|
|||
bool freqTextSelected = false;
|
||||
bool usingDataMode = false;
|
||||
bool automaticSidebandSwitching = true;
|
||||
mode_kind currentMode;
|
||||
rigMode_t currentMode;
|
||||
freqt currentFrequency;
|
||||
int currentFilter = 1;
|
||||
void checkFreqSel();
|
||||
|
|
|
@ -837,7 +837,7 @@ void settingswidget::updateModSourceList(QStringList deviceNames, QVector<rigInp
|
|||
ui->modInputCombo->clear();
|
||||
for(int i=0; i < deviceNames.length(); i++)
|
||||
{
|
||||
ui->modInputCombo->addItem(deviceNames.at(i), data.at(i));
|
||||
ui->modInputCombo->addItem(deviceNames.at(i), QVariant::fromValue(data.at(i)));
|
||||
}
|
||||
ui->modInputCombo->blockSignals(false);
|
||||
}
|
||||
|
@ -848,7 +848,7 @@ void settingswidget::updateDataModSourceList(QStringList deviceNames, QVector<ri
|
|||
ui->modInputDataCombo->clear();
|
||||
for(int i=0; i < deviceNames.length(); i++)
|
||||
{
|
||||
ui->modInputDataCombo->addItem(deviceNames.at(i), data.at(i));
|
||||
ui->modInputDataCombo->addItem(deviceNames.at(i), QVariant::fromValue(data.at(i)));
|
||||
}
|
||||
ui->modInputDataCombo->blockSignals(false);
|
||||
}
|
||||
|
@ -1251,7 +1251,7 @@ void settingswidget::on_audioSystemServerCombo_currentIndexChanged(int value)
|
|||
|
||||
void settingswidget::on_meter2selectionCombo_currentIndexChanged(int index)
|
||||
{
|
||||
prefs->meter2Type = static_cast<meterKind>(ui->meter2selectionCombo->itemData(index).toInt());
|
||||
prefs->meter2Type = static_cast<meter_t>(ui->meter2selectionCombo->itemData(index).toInt());
|
||||
emit changedIfPref(if_meter2Type);
|
||||
}
|
||||
|
||||
|
|
113
wfmain.cpp
113
wfmain.cpp
|
@ -628,11 +628,11 @@ void wfmain::rigConnections()
|
|||
issueCmd(cmd, f);
|
||||
});
|
||||
connect(finputbtns, &frequencyinputwidget::issueCmdM,
|
||||
[=](cmds cmd, mode_info m) {
|
||||
[=](cmds cmd, modeInfo m) {
|
||||
issueCmd(cmd, m);
|
||||
});
|
||||
connect(finputbtns, &frequencyinputwidget::updateUIMode,
|
||||
[=](mode_kind m) {
|
||||
[=](rigMode_t m) {
|
||||
// set the mode combo box, quietly, to the mode indicated.
|
||||
ui->modeSelectCombo->blockSignals(true);
|
||||
ui->modeSelectCombo->setCurrentIndex(ui->modeSelectCombo->findData(m));
|
||||
|
@ -1338,7 +1338,7 @@ void wfmain::setupMainUI()
|
|||
connect(this->trxadj, &transceiverAdjustments::setPassband, this, [=](const quint16 &passbandHz) {
|
||||
queue->add(priorityImmediate,queueItem(funcPBTInner,QVariant::fromValue<short>(passbandHz)));
|
||||
});
|
||||
|
||||
/*
|
||||
connect(this->cw, &cwSender::sendCW,
|
||||
[=](const QString &cwMessage) { issueCmd(cmdSendCW, cwMessage);});
|
||||
connect(this->cw, &cwSender::stopCW,
|
||||
|
@ -1352,6 +1352,9 @@ void wfmain::setupMainUI()
|
|||
connect(this->cw, &cwSender::getCWSettings,
|
||||
[=]() { issueDelayedCommand(cmdGetKeySpeed);
|
||||
issueDelayedCommand(cmdGetBreakMode);});
|
||||
*/
|
||||
|
||||
}
|
||||
|
||||
void wfmain::connectSettingsWidget()
|
||||
{
|
||||
|
@ -1374,8 +1377,8 @@ void wfmain::connectSettingsWidget()
|
|||
connect(setupui, SIGNAL(changedUdpPrefs(int)), this, SLOT(extChangedUdpPrefs(int)));
|
||||
|
||||
connect(setupui, &settingswidget::showUSBControllerSetup, [=](){
|
||||
if(shut != Q_NULLPTR)
|
||||
showAndRaiseWidget(shut);
|
||||
if(usbWindow != Q_NULLPTR)
|
||||
showAndRaiseWidget(usbWindow);
|
||||
});
|
||||
|
||||
connect(this, SIGNAL(haveClusterList(QList<clusterSettings>)), setupui, SLOT(copyClusterList(QList<clusterSettings>)));
|
||||
|
@ -2380,8 +2383,8 @@ void wfmain::loadSettings()
|
|||
ui->audioSystemServerCombo->setEnabled(!prefs.enableLAN);
|
||||
|
||||
// If LAN is not enabled, disable local audio input/output
|
||||
ui->audioOutputCombo->setEnabled(prefs.enableLAN);
|
||||
ui->audioInputCombo->setEnabled(prefs.enableLAN);
|
||||
//ui->audioOutputCombo->setEnabled(prefs.enableLAN);
|
||||
//ui->audioInputCombo->setEnabled(prefs.enableLAN);
|
||||
|
||||
ui->baudRateCombo->setEnabled(!prefs.enableLAN);
|
||||
ui->serialDeviceListCombo->setEnabled(!prefs.enableLAN);
|
||||
|
@ -2700,7 +2703,7 @@ void wfmain::loadSettings()
|
|||
}
|
||||
settings->endArray();
|
||||
settings->endGroup();
|
||||
emit haveClusterList(clusters);
|
||||
//emit haveClusterList(clusters);
|
||||
|
||||
// CW Memory Load:
|
||||
settings->beginGroup("Keyer");
|
||||
|
@ -2726,9 +2729,9 @@ void wfmain::loadSettings()
|
|||
settings->beginGroup("USB");
|
||||
/* Load USB buttons*/
|
||||
prefs.enableUSBControllers = settings->value("EnableUSBControllers", defPrefs.enableUSBControllers).toBool();
|
||||
ui->enableUsbChk->blockSignals(true);
|
||||
ui->enableUsbChk->setChecked(prefs.enableUSBControllers);
|
||||
ui->enableUsbChk->blockSignals(false);
|
||||
//ui->enableUsbChk->blockSignals(true);
|
||||
//ui->enableUsbChk->setChecked(prefs.enableUSBControllers);
|
||||
//ui->enableUsbChk->blockSignals(false);
|
||||
ui->usbControllerBtn->setEnabled(prefs.enableUSBControllers);
|
||||
ui->usbControllersResetBtn->setEnabled(prefs.enableUSBControllers);
|
||||
ui->usbResetLbl->setVisible(prefs.enableUSBControllers);
|
||||
|
@ -3112,7 +3115,7 @@ void wfmain::extChangedCtPref(prefCtItem i)
|
|||
finputbtns->setAutomaticSidebandSwitching(prefs.automaticSidebandSwitching);
|
||||
break;
|
||||
case ct_enableUSBControllers:
|
||||
enableUsbControllers(prefs.enableUSBControllers);
|
||||
//enableUsbControllers(prefs.enableUSBControllers);
|
||||
break;
|
||||
case ct_usbSensitivity:
|
||||
// No UI element for this.
|
||||
|
@ -4551,9 +4554,11 @@ void wfmain::receiveRigID(rigCapabilities rigCaps)
|
|||
ui->modeSelectCombo->blockSignals(true);
|
||||
ui->modeSelectCombo->clear();
|
||||
|
||||
|
||||
foreach (auto m, rigCaps.modes)
|
||||
{
|
||||
ui->modeSelectCombo->addItem(m.name, m.mk);
|
||||
|
||||
}
|
||||
ui->modeSelectCombo->blockSignals(false);
|
||||
|
||||
|
@ -4568,7 +4573,8 @@ void wfmain::receiveRigID(rigCapabilities rigCaps)
|
|||
ui->tuningStepCombo->setCurrentIndex(2);
|
||||
ui->tuningStepCombo->blockSignals(false);
|
||||
|
||||
|
||||
QStringList modSources;
|
||||
QVector<rigInput> modData;
|
||||
|
||||
if(rigCaps.model == model9700)
|
||||
{
|
||||
|
@ -4693,7 +4699,7 @@ void wfmain::receiveRigID(rigCapabilities rigCaps)
|
|||
|
||||
ui->memoriesBtn->setEnabled(rigCaps.commands.contains(funcMemoryContents));
|
||||
|
||||
ui->useRTSforPTTchk->setChecked(prefs.forceRTSasPTT);
|
||||
//ui->useRTSforPTTchk->setChecked(prefs.forceRTSasPTT);
|
||||
|
||||
ui->audioSystemCombo->setEnabled(false);
|
||||
ui->audioSystemServerCombo->setEnabled(false);
|
||||
|
@ -4721,7 +4727,7 @@ void wfmain::receiveRigID(rigCapabilities rigCaps)
|
|||
changeMeter2Type(prefs.meter2Type);
|
||||
// for (int i = 0; i < ui->meter2selectionCombo->count(); i++)
|
||||
// {
|
||||
// if (static_cast<meterKind>(ui->meter2selectionCombo->itemData(i).toInt()) == prefs.meter2Type)
|
||||
// if (static_cast<meter_t>(ui->meter2selectionCombo->itemData(i).toInt()) == prefs.meter2Type)
|
||||
// {
|
||||
// // I thought that setCurrentIndex() would call the activated() function for the combobox
|
||||
// // but it doesn't, so call it manually.
|
||||
|
@ -5152,7 +5158,7 @@ void wfmain::computePlasma()
|
|||
plasmaMutex.unlock();
|
||||
}
|
||||
|
||||
void wfmain::receivespectrumMode_t(spectrumMode_t spectMode)
|
||||
void wfmain::receivespectrumMode(spectrumMode_t spectMode)
|
||||
{
|
||||
ui->spectrumMode_tCombo->blockSignals(true);
|
||||
ui->spectrumMode_tCombo->setCurrentIndex(ui->spectrumMode_tCombo->findData(spectMode));
|
||||
|
@ -5607,20 +5613,20 @@ void wfmain::receiveMode(modeInfo mode)
|
|||
ui->modeFilterCombo->blockSignals(false);
|
||||
}
|
||||
|
||||
currentModeIndex = mode;
|
||||
//currentModeIndex = mode;
|
||||
finputbtns->updateCurrentMode(currentMode);
|
||||
finputbtns->updateFilterSelection(filter);
|
||||
currentModeInfo.mk = (mode_kind)mode;
|
||||
currentMode = (mode_kind)mode;
|
||||
currentModeInfo.filter = filter;
|
||||
currentModeInfo.reg = mode;
|
||||
rpt->handleUpdateCurrentMainMode(currentModeInfo);
|
||||
cw->handleCurrentModeUpdate(currentMode);
|
||||
if (!found)
|
||||
{
|
||||
qWarning(logSystem()) << __func__ << "Received mode " << mode << " but could not match to any index within the modeSelectCombo. ";
|
||||
return;
|
||||
}
|
||||
//finputbtns->updateFilterSelection(filter);
|
||||
//currentModeInfo.mk = (rigMode_t)mode;
|
||||
//currentMode = (rigMode_t)mode;
|
||||
//currentModeInfo.filter = filter;
|
||||
//currentModeInfo.reg = mode;
|
||||
//rpt->handleUpdateCurrentMainMode(currentModeInfo);
|
||||
//cw->handleCurrentModeUpdate(currentMode);
|
||||
//if (!found)
|
||||
//{
|
||||
// qWarning(logSystem()) << __func__ << "Received mode " << mode << " but could not match to any index within the modeSelectCombo. ";
|
||||
// return;
|
||||
//}
|
||||
|
||||
if (maxPassbandHz != 0)
|
||||
{
|
||||
|
@ -5639,7 +5645,7 @@ void wfmain::receiveMode(modeInfo mode)
|
|||
}
|
||||
}
|
||||
|
||||
void wfmain::receiveDataModeStatus(unsigned char data, unsigned char filter)
|
||||
void wfmain::receiveDataModeStatus(uchar data, uchar filter)
|
||||
{
|
||||
ui->datamodeCombo->blockSignals(true);
|
||||
ui->datamodeCombo->setCurrentIndex(data);
|
||||
|
@ -5888,14 +5894,14 @@ void wfmain::gotoMemoryPreset(int presetNumber)
|
|||
setFilterVal = ui->modeFilterCombo->currentIndex()+1; // TODO, add to memory
|
||||
setModeVal = temp.mode;
|
||||
freqt memFreq;
|
||||
mode_info m;
|
||||
modeInfo m;
|
||||
m.mk = temp.mode;
|
||||
m.filter = ui->modeFilterCombo->currentIndex()+1;
|
||||
m.reg =(unsigned char) m.mk; // fallback, works only for some modes
|
||||
memFreq.Hz = temp.frequency * 1E6;
|
||||
issueCmd(cmdSetFreq, memFreq);
|
||||
//issueCmd(cmdSetFreq, memFreq);
|
||||
//issueDelayedCommand(cmdSetModeFilter); // goes to setModeVal
|
||||
issueCmd(cmdSetMode, m);
|
||||
//issueCmd(cmdSetMode, m);
|
||||
memFreq.MHzDouble = memFreq.Hz / 1.0E6;
|
||||
freq = memFreq;
|
||||
qDebug(logGui()) << "Recalling preset number " << presetNumber << " as frequency " << temp.frequency << "MHz";
|
||||
|
@ -5905,7 +5911,7 @@ void wfmain::gotoMemoryPreset(int presetNumber)
|
|||
|
||||
void wfmain::saveMemoryPreset(int presetNumber)
|
||||
{
|
||||
// int, double, mode_kind
|
||||
// int, double, rigMode_t
|
||||
double frequency;
|
||||
if(this->freq.Hz == 0)
|
||||
{
|
||||
|
@ -5913,7 +5919,7 @@ void wfmain::saveMemoryPreset(int presetNumber)
|
|||
} else {
|
||||
frequency = freq.Hz / 1.0E6;
|
||||
}
|
||||
mode_kind mode = currentMode;
|
||||
rigMode_t mode = currentMode;
|
||||
qDebug(logGui()) << "Saving preset number " << presetNumber << " to frequency " << frequency << " MHz";
|
||||
mem.setPreset(presetNumber, frequency, mode);
|
||||
}
|
||||
|
@ -7269,12 +7275,13 @@ funcs wfmain::meter_tToMeterCommand(meter_t m)
|
|||
}
|
||||
|
||||
|
||||
void wfmain::changeMeter2Type(meterKind m)
|
||||
void wfmain::changeMeter2Type(meter_t m)
|
||||
{
|
||||
meter_t newMeterType;
|
||||
meter_t oldMeterType;
|
||||
newMeterType = static_cast<meter_t>(ui->meter2selectionCombo->currentData().toInt());
|
||||
newMeterType = m;
|
||||
oldMeterType = ui->meter2Widget->getMeterType();
|
||||
|
||||
if(newMeterType == oldMeterType)
|
||||
return;
|
||||
|
||||
|
@ -8684,7 +8691,7 @@ void wfmain::on_clickDragTuningEnableChk_clicked(bool checked)
|
|||
prefs.clickDragTuningEnable = checked;
|
||||
}
|
||||
|
||||
void wfmain::enableUsbControllers(bool enabled)
|
||||
void wfmain::enableUsbControllers(bool checked)
|
||||
{
|
||||
prefs.enableUSBControllers = checked;
|
||||
ui->usbControllerBtn->setEnabled(checked);
|
||||
|
@ -8731,18 +8738,18 @@ void wfmain::on_usbControllersResetBtn_clicked()
|
|||
QMessageBox::Cancel);
|
||||
if (ret == QMessageBox::Ok) {
|
||||
qInfo(logUsbControl()) << "Resetting USB controllers to default values";
|
||||
bool enabled = ui->enableUsbChk->isChecked();
|
||||
if (enabled) on_enableUsbChk_clicked(false); // Force disconnect of USB controllers
|
||||
//bool enabled = ui->enableUsbChk->isChecked();
|
||||
//if (enabled) on_enableUsbChk_clicked(false); // Force disconnect of USB controllers
|
||||
|
||||
usbButtons.clear();
|
||||
usbKnobs.clear();
|
||||
usbDevices.clear();
|
||||
|
||||
if (enabled) on_enableUsbChk_clicked(true); // Force connect of USB controllers
|
||||
//if (enabled) on_enableUsbChk_clicked(true); // Force connect of USB controllers
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
void wfmain::on_autoPollBtn_clicked(bool checked)
|
||||
{
|
||||
ui->pollTimeMsSpin->setEnabled(!checked);
|
||||
|
@ -8771,6 +8778,7 @@ void wfmain::on_pollTimeMsSpin_valueChanged(int timing_ms)
|
|||
changePollTiming(timing_ms);
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
void wfmain::changePollTiming(int timing_ms, bool setUI)
|
||||
{
|
||||
|
@ -8813,11 +8821,12 @@ void wfmain::connectionHandler(bool connect)
|
|||
queue->clear();
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
void wfmain::on_autoSSBchk_clicked(bool checked)
|
||||
{
|
||||
prefs.automaticSidebandSwitching = checked;
|
||||
}
|
||||
*/
|
||||
|
||||
void wfmain::on_cwButton_clicked()
|
||||
{
|
||||
|
@ -9337,7 +9346,7 @@ void wfmain::receiveValue(cacheItem val){
|
|||
// [1] 0x14
|
||||
// [2] 0x00
|
||||
// [3] 0x00 (center), 0x01 (fixed), 0x02, 0x03
|
||||
receivespectrumMode_t(val.value.value<spectrumMode_t>());
|
||||
receivespectrumMode(val.value.value<spectrumMode_t>());
|
||||
break;
|
||||
case funcScopeMainSpan:
|
||||
{
|
||||
|
@ -9391,3 +9400,19 @@ void wfmain::receiveValue(cacheItem val){
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
void wfmain::on_showBandsBtn_clicked()
|
||||
{
|
||||
showAndRaiseWidget(bandbtns);
|
||||
}
|
||||
|
||||
void wfmain::on_showFreqBtn_clicked()
|
||||
{
|
||||
showAndRaiseWidget(finputbtns);
|
||||
}
|
||||
|
||||
void wfmain::on_showSettingsBtn_clicked()
|
||||
{
|
||||
showAndRaiseWidget(setupui);
|
||||
}
|
||||
|
||||
|
|
14
wfmain.h
14
wfmain.h
|
@ -303,7 +303,6 @@ signals:
|
|||
void setClusterSkimmerSpots(bool enable);
|
||||
void setFrequencyRange(double low, double high);
|
||||
void sendControllerRequest(USBDEVICE* dev, usbFeatureType request, int val=0, QString text="", QImage* img=Q_NULLPTR, QColor* color=Q_NULLPTR);
|
||||
|
||||
// Signals to forward incoming data onto other areas
|
||||
void haveMemory(memoryType mem);
|
||||
|
||||
|
@ -323,6 +322,7 @@ private slots:
|
|||
void extChangedClusterPref(prefClusterItem i);
|
||||
void extChangedUdpPref(udpPrefsItem i);
|
||||
|
||||
void enableUsbControllers(bool enabled);
|
||||
|
||||
void receiveValue(cacheItem val);
|
||||
void setAudioDevicesUI();
|
||||
|
@ -371,10 +371,10 @@ private slots:
|
|||
void receiveFreq(freqt);
|
||||
void receiveMode(modeInfo mode);
|
||||
void receiveSpectrumData(scopeData data);
|
||||
void receivespectrumMode_t(spectrumMode_t spectMode);
|
||||
void receivespectrumMode(spectrumMode_t spectMode);
|
||||
void receiveSpectrumSpan(freqt freqspan, bool isSub);
|
||||
void receivePTTstatus(bool pttOn);
|
||||
void receiveDataModeStatus(bool dataOn);
|
||||
void receiveDataModeStatus(uchar data, uchar filter);
|
||||
void handleBandStackReg(freqt f, char mode, char filter, bool dataOn); // freq, mode, (filter,) datamode
|
||||
void receiveRITStatus(bool ritEnabled);
|
||||
void receiveRITValue(int ritValHz);
|
||||
|
@ -497,7 +497,7 @@ private slots:
|
|||
void on_audioRXCodecCombo_currentIndexChanged(int value);
|
||||
void on_audioTXCodecCombo_currentIndexChanged(int value);
|
||||
void on_audioSampleRateCombo_currentIndexChanged(int value);
|
||||
void on_scopeEnableWFBtn_clicked(bool checked);
|
||||
void on_scopeEnableWFBtn_stateChanged(int state);
|
||||
void on_sqlSlider_valueChanged(int value);
|
||||
void on_modeFilterCombo_activated(int index);
|
||||
|
||||
|
@ -518,7 +518,7 @@ private slots:
|
|||
|
||||
void on_tuneLockChk_clicked(bool checked);
|
||||
|
||||
void on_spectrumMode_tCombo_currentIndexChanged(int index);
|
||||
void on_spectrumModeCombo_currentIndexChanged(int index);
|
||||
|
||||
void on_serialEnableBtn_clicked(bool checked);
|
||||
void on_tuningStepCombo_currentIndexChanged(int index);
|
||||
|
@ -539,7 +539,7 @@ private slots:
|
|||
void on_wfLengthSlider_valueChanged(int value);
|
||||
void on_wfAntiAliasChk_clicked(bool checked);
|
||||
void on_wfInterpolateChk_clicked(bool checked);
|
||||
void changeMeter2Type(meterKind m);
|
||||
void changeMeter2Type(meter_t m);
|
||||
void enableRigCtl(bool enabled);
|
||||
void on_moreControlsBtn_clicked();
|
||||
|
||||
|
@ -808,7 +808,7 @@ private:
|
|||
|
||||
bool onFullscreen;
|
||||
bool freqTextSelected;
|
||||
void setUISpectrumControlsToMode(spectrumMode smode);
|
||||
void setUISpectrumControlsToMode(spectrumMode_t smode);
|
||||
|
||||
double oldLowerFreq;
|
||||
double oldUpperFreq;
|
||||
|
|
|
@ -22,13 +22,13 @@
|
|||
<ProjectGuid>{00E054F8-A1D4-3ECA-A8D6-DFC8A68AFD56}</ProjectGuid>
|
||||
<RootNamespace>wfserver</RootNamespace>
|
||||
<Keyword>QtVS_v304</Keyword>
|
||||
<WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
|
||||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
||||
<WindowsTargetPlatformMinVersion>10.0.19041.0</WindowsTargetPlatformMinVersion>
|
||||
<QtMsBuild Condition="'$(QtMsBuild)'=='' or !Exists('$(QtMsBuild)\qt.targets')">$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<OutputDirectory>wfview-release\</OutputDirectory>
|
||||
<ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
|
||||
<CharacterSet>NotSet</CharacterSet>
|
||||
|
@ -37,7 +37,7 @@
|
|||
<PrimaryOutput>wfserver</PrimaryOutput>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<OutputDirectory>wfview-release\</OutputDirectory>
|
||||
<ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
|
||||
<CharacterSet>NotSet</CharacterSet>
|
||||
|
@ -46,7 +46,7 @@
|
|||
<PrimaryOutput>wfserver</PrimaryOutput>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<OutputDirectory>wfview-debug\</OutputDirectory>
|
||||
<ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
|
||||
<CharacterSet>NotSet</CharacterSet>
|
||||
|
@ -55,7 +55,7 @@
|
|||
<PrimaryOutput>wfserver</PrimaryOutput>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<OutputDirectory>wfview-debug\</OutputDirectory>
|
||||
<ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
|
||||
<CharacterSet>NotSet</CharacterSet>
|
||||
|
|
|
@ -22,13 +22,13 @@
|
|||
<ProjectGuid>{326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}</ProjectGuid>
|
||||
<RootNamespace>wfview</RootNamespace>
|
||||
<Keyword>QtVS_v304</Keyword>
|
||||
<WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
|
||||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
||||
<WindowsTargetPlatformMinVersion>10.0.19041.0</WindowsTargetPlatformMinVersion>
|
||||
<QtMsBuild Condition="'$(QtMsBuild)'=='' or !Exists('$(QtMsBuild)\qt.targets')">$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<OutputDirectory>wfview-release\</OutputDirectory>
|
||||
<ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
|
||||
<CharacterSet>NotSet</CharacterSet>
|
||||
|
@ -37,7 +37,7 @@
|
|||
<PrimaryOutput>wfview</PrimaryOutput>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<OutputDirectory>wfview-release\</OutputDirectory>
|
||||
<ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
|
||||
<CharacterSet>NotSet</CharacterSet>
|
||||
|
@ -46,7 +46,7 @@
|
|||
<PrimaryOutput>wfview</PrimaryOutput>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<OutputDirectory>wfview-debug\</OutputDirectory>
|
||||
<ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
|
||||
<CharacterSet>NotSet</CharacterSet>
|
||||
|
@ -55,7 +55,7 @@
|
|||
<PrimaryOutput>wfview</PrimaryOutput>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<OutputDirectory>wfview-debug\</OutputDirectory>
|
||||
<ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
|
||||
<CharacterSet>NotSet</CharacterSet>
|
||||
|
|
Ładowanie…
Reference in New Issue