diff --git a/wfmain.cpp b/wfmain.cpp
index b8cc330..d7662b5 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -178,28 +178,16 @@ wfmain::wfmain(const QString serialPortCL, const QString hostCL, QWidget *parent
ui->serialDeviceListCombo->addItem("Manual...", 256);
ui->serialDeviceListCombo->blockSignals(false);
- // vspe checkbox is Currently disabled as not implemented!
- ui->vspeCheck->setVisible(false);
#ifndef Q_OS_WIN
ui->vspCombo->setVisible(false);
ui->vspLabel->setVisible(false);
- ui->vspeCheck->setVisible(false);
#else
i = 0;
ui->vspCombo->blockSignals(true);
ui->vspCombo->addItem(QString("None"), i++);
- if (!ui->vspeCheck->isChecked())
+ foreach(const QSerialPortInfo & serialPortInfo, QSerialPortInfo::availablePorts())
{
- int i = 0;
- foreach(const QSerialPortInfo & serialPortInfo, QSerialPortInfo::availablePorts())
- {
- ui->vspCombo->addItem(serialPortInfo.portName(), i++);
- }
- }
- else {
- for (int f = 1; f < 100; f++) {
- ui->vspCombo->addItem(QString("COM%1").arg(f), f);
- }
+ ui->vspCombo->addItem(serialPortInfo.portName(), i++);
}
ui->vspCombo->blockSignals(false);
@@ -819,7 +807,6 @@ void wfmain::setDefPrefs()
defPrefs.niceTS = true;
defPrefs.enableRigCtlD = false;
defPrefs.rigCtlPort = 4533;
- defPrefs.enableVSPE = false;
defPrefs.virtualSerialPort = QString("none");
udpDefPrefs.ipAddress = QString("");
@@ -898,13 +885,11 @@ void wfmain::loadSettings()
prefs.radioCIVAddr = (unsigned char) settings.value("RigCIVuInt", defPrefs.radioCIVAddr).toInt();
prefs.serialPortRadio = settings.value("SerialPortRadio", defPrefs.serialPortRadio).toString();
prefs.serialPortBaud = (quint32) settings.value("SerialPortBaud", defPrefs.serialPortBaud).toInt();
- prefs.enableVSPE = settings.value("EnableVSPE", defPrefs.enableVSPE).toBool();
prefs.virtualSerialPort = settings.value("VirtualSerialPort", defPrefs.virtualSerialPort).toString();
int vspIndex = ui->vspCombo->findText(prefs.virtualSerialPort);
if (vspIndex != -1) {
ui->vspCombo->setCurrentIndex(vspIndex);
}
- ui->vspeCheck->setChecked(prefs.enableVSPE);
settings.endGroup();
// Misc. user settings (enable PTT, draw peaks, etc)
@@ -1084,7 +1069,6 @@ void wfmain::saveSettings()
settings.setValue("RigCIVuInt", prefs.radioCIVAddr);
settings.setValue("SerialPortRadio", prefs.serialPortRadio);
settings.setValue("SerialPortBaud", prefs.serialPortBaud);
- settings.setValue("EnableVSPE", prefs.enableVSPE);
settings.setValue("VirtualSerialPort", prefs.virtualSerialPort);
settings.endGroup();
@@ -3412,11 +3396,6 @@ void wfmain::on_vspCombo_currentIndexChanged(int value)
prefs.virtualSerialPort = ui->vspCombo->currentText();
}
-void wfmain::on_vspeCheck_clicked(bool checked)
-{
- prefs.enableVSPE = checked;
-}
-
void wfmain::on_toFixedBtn_clicked()
{
emit setScopeFixedEdge(oldLowerFreq, oldUpperFreq, ui->scopeEdgeCombo->currentIndex()+1);
diff --git a/wfmain.h b/wfmain.h
index f4697c1..ece9d45 100644
--- a/wfmain.h
+++ b/wfmain.h
@@ -363,8 +363,6 @@ private slots:
void on_vspCombo_currentIndexChanged(int value);
- void on_vspeCheck_clicked(bool checked);
-
void on_scopeEnableWFBtn_clicked(bool checked);
void on_sqlSlider_valueChanged(int value);
@@ -602,7 +600,6 @@ private:
bool enableRigCtlD;
quint16 rigCtlPort;
colors colorScheme;
- bool enableVSPE;
QString virtualSerialPort;
} prefs;
diff --git a/wfmain.ui b/wfmain.ui
index ff1084e..567500a 100644
--- a/wfmain.ui
+++ b/wfmain.ui
@@ -2086,13 +2086,6 @@
-
- -
-
-
- Use VSPE Driver
-
-
-
-
diff --git a/wfview.sln b/wfview.sln
index 9148927..7e2a93c 100644
--- a/wfview.sln
+++ b/wfview.sln
@@ -7,20 +7,29 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wfview", "wfview.vcxproj",
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
+ Release|Win32 = Release|Win32
Release|x64 = Release|x64
Release|x86 = Release|x86
+ Template|Win32 = Template|Win32
Template|x64 = Template|x64
Template|x86 = Template|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Debug|Win32.ActiveCfg = Debug|Win32
+ {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Debug|Win32.Build.0 = Debug|Win32
{326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Debug|x64.ActiveCfg = Debug|x64
{326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Debug|x64.Build.0 = Debug|x64
{326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Debug|x86.ActiveCfg = Debug|x64
+ {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Release|Win32.ActiveCfg = Debug|Win32
+ {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Release|Win32.Build.0 = Debug|Win32
{326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Release|x64.ActiveCfg = Release|x64
{326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Release|x64.Build.0 = Release|x64
{326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Release|x86.ActiveCfg = Release|x64
+ {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Template|Win32.ActiveCfg = Debug|Win32
+ {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Template|Win32.Build.0 = Debug|Win32
{326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Template|x64.ActiveCfg = Release|x64
{326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Template|x64.Build.0 = Release|x64
{326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Template|x86.ActiveCfg = Release|x64
diff --git a/wfview.vcxproj b/wfview.vcxproj
index 941276a..3c50c5b 100644
--- a/wfview.vcxproj
+++ b/wfview.vcxproj
@@ -1,6 +1,14 @@
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
Release
x64
@@ -28,6 +36,15 @@
release\
wfview
+
+ v142
+ release\
+ false
+ NotSet
+ Application
+ release\
+ wfview
+
v142
debug\
@@ -37,6 +54,15 @@
debug\
wfview
+
+ v142
+ debug\
+ false
+ NotSet
+ Application
+ debug\
+ wfview
+
@@ -45,9 +71,15 @@
+
+
+
+
+
+
@@ -60,6 +92,12 @@
$(IncludePath)
$(LibraryPath)
+
+ wfview
+ true
+ $(IncludePath)
+ $(LibraryPath)
+
release\
release\
@@ -67,14 +105,27 @@
true
false
+
+ wfview
+ true
+ false
+
msvc2019_64_5
core;network;gui;multimedia;widgets;serialport;printsupport
+
+ msvc2019
+ core;network;gui;multimedia;widgets;serialport;printsupport
+
msvc2019_64_5
core;opengl;network;gui;multimedia;widgets;serialport;printsupport
+
+ msvc2019
+ core;opengl;network;gui;multimedia;widgets;serialport;printsupport
+
@@ -141,6 +192,69 @@
ui_%(Filename).h
+
+
+ GeneratedFiles\$(ConfigurationName);GeneratedFiles;.;c:\qcustomplot;release;/include;%(AdditionalIncludeDirectories)
+ -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -s -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions)
+ release\
+ false
+ None
+ 4577;4467;%(DisableSpecificWarnings)
+ Sync
+ release\
+ MaxSpeed
+ _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_USE_OPENGL;HOST=1;UNAME=1;GITSHORT=1;NDEBUG;QT_NO_DEBUG;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;%(PreprocessorDefinitions)
+ false
+
+
+ MultiThreadedDLL
+ true
+ true
+ Level3
+ true
+
+
+ OpenGL32.lib;shell32.lib;%(AdditionalDependencies)
+ C:\openssl\lib;C:\Utils\my_sql\mysql-5.7.25-winx64\lib;C:\Utils\postgresql\pgsql\lib;%(AdditionalLibraryDirectories)
+ -O2 -s "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)
+ true
+ false
+ true
+ false
+ true
+ $(OutDir)\wfview.exe
+ true
+ Windows
+ true
+
+
+ Unsigned
+ None
+ 0
+
+
+ _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_USE_OPENGL;HOST=1;UNAME=1;GITSHORT=1;NDEBUG;QT_NO_DEBUG;QT_MULTIMEDIA_LIB;QT_OPENGL_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_LIB;QT_CORE_LIB;%(PreprocessorDefinitions)
+
+
+ msvc
+ ./$(Configuration)/moc_predefs.h
+ Moc'ing %(Identity)...
+ output
+ $(Configuration)
+ moc_%(Filename).cpp
+
+
+ default
+ Rcc'ing %(Identity)...
+ $(Configuration)
+ qrc_%(Filename).cpp
+
+
+ Uic'ing %(Identity)...
+ $(ProjectDir)
+ ui_%(Filename).h
+
+
GeneratedFiles\$(ConfigurationName);GeneratedFiles;.;c:\qcustomplot;debug;/include;%(AdditionalIncludeDirectories)
@@ -200,6 +314,65 @@
ui_%(Filename).h
+
+
+ GeneratedFiles\$(ConfigurationName);GeneratedFiles;.;c:\qcustomplot;debug;/include;%(AdditionalIncludeDirectories)
+ -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions)
+ debug\
+ false
+ ProgramDatabase
+ 4577;4467;%(DisableSpecificWarnings)
+ Sync
+ debug\
+ Disabled
+ _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_USE_OPENGL;HOST=1;UNAME=1;GITSHORT=1;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;%(PreprocessorDefinitions)
+ false
+ MultiThreadedDebugDLL
+ true
+ true
+ Level3
+ true
+
+
+ OpenGL32.lib;shell32.lib;%(AdditionalDependencies)
+ C:\openssl\lib;C:\Utils\my_sql\mysql-5.7.25-winx64\lib;C:\Utils\postgresql\pgsql\lib;%(AdditionalLibraryDirectories)
+ "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)
+ true
+ true
+ true
+ $(OutDir)\wfview.exe
+ true
+ Windows
+ true
+
+
+ Unsigned
+ None
+ 0
+
+
+ _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_USE_OPENGL;HOST=1;UNAME=1;GITSHORT=1;QT_MULTIMEDIA_LIB;QT_OPENGL_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_LIB;QT_CORE_LIB;_DEBUG;%(PreprocessorDefinitions)
+
+
+ msvc
+ ./$(Configuration)/moc_predefs.h
+ Moc'ing %(Identity)...
+ output
+ $(Configuration)
+ moc_%(Filename).cpp
+
+
+ default
+ Rcc'ing %(Identity)...
+ $(Configuration)
+ qrc_%(Filename).cpp
+
+
+ Uic'ing %(Identity)...
+ $(ProjectDir)
+ ui_%(Filename).h
+
+
@@ -253,18 +426,28 @@
Document
true
+ true
$(QTDIR)\mkspecs\features\data\dummy.cpp;%(AdditionalInputs)
+ $(QTDIR)\mkspecs\features\data\dummy.cpp;%(AdditionalInputs)
cl -Bx"$(QTDIR)\bin\qmake.exe" -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -Zi -MDd -W3 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 -wd4577 -wd4467 -E $(QTDIR)\mkspecs\features\data\dummy.cpp 2>NUL >debug\moc_predefs.h
+ cl -Bx"$(QTDIR)\bin\qmake.exe" -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -Zi -MDd -W3 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 -wd4577 -wd4467 -E $(QTDIR)\mkspecs\features\data\dummy.cpp 2>NUL >debug\moc_predefs.h
Generate moc_predefs.h
+ Generate moc_predefs.h
debug\moc_predefs.h;%(Outputs)
+ debug\moc_predefs.h;%(Outputs)
Document
$(QTDIR)\mkspecs\features\data\dummy.cpp;%(AdditionalInputs)
+ $(QTDIR)\mkspecs\features\data\dummy.cpp;%(AdditionalInputs)
cl -Bx"$(QTDIR)\bin\qmake.exe" -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -s -fvisibility=hidden -fvisibility-inlines-hidden -O2 -MD -W3 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 -wd4577 -wd4467 -E $(QTDIR)\mkspecs\features\data\dummy.cpp 2>NUL >release\moc_predefs.h
+ cl -Bx"$(QTDIR)\bin\qmake.exe" -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -s -fvisibility=hidden -fvisibility-inlines-hidden -O2 -MD -W3 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 -wd4577 -wd4467 -E $(QTDIR)\mkspecs\features\data\dummy.cpp 2>NUL >release\moc_predefs.h
Generate moc_predefs.h
+ Generate moc_predefs.h
release\moc_predefs.h;%(Outputs)
+ release\moc_predefs.h;%(Outputs)
true
+ true
@@ -307,14 +490,18 @@
resources
+ resources
resources
+ resources
style
+ style
style
+ style
diff --git a/wfview.vcxproj.filters b/wfview.vcxproj.filters
index b08cafe..efa5219 100644
--- a/wfview.vcxproj.filters
+++ b/wfview.vcxproj.filters
@@ -349,6 +349,7 @@
+