From cb9d3001093911a03f701719a63c88f32db53eba Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 15 Nov 2018 19:07:15 +0100 Subject: [PATCH] Windows: MSVC2017: soapysdrinput (1) --- devices/devices.pro | 2 +- devices/soapysdr/devicesoapysdrshared.h | 4 +- .../soapysdrinput/soapysdrinput.pro | 42 +++++++++++++++++++ .../soapysdrinput/soapysdrinputgui.cpp | 8 ++-- sdrgui/sdrgui.pro | 23 ++++++++++ 5 files changed, 72 insertions(+), 7 deletions(-) create mode 100644 plugins/samplesource/soapysdrinput/soapysdrinput.pro diff --git a/devices/devices.pro b/devices/devices.pro index 549796b6c..0b8741487 100644 --- a/devices/devices.pro +++ b/devices/devices.pro @@ -182,5 +182,5 @@ macx { MSVC { LIBS += -L../libhackrf/$${build_subdir} -llibhackrf LIBS += -LC:\Programs\PothosSDR\bin -LC:\Programs\PothosSDR\lib -lLimeSuite - LIBS += -LC:\Programs\PothosSDR\bin -lSoapySDR + LIBS += -LC:\Programs\PothosSDR\bin -LC:\Programs\PothosSDR\lib -lSoapySDR } diff --git a/devices/soapysdr/devicesoapysdrshared.h b/devices/soapysdr/devicesoapysdrshared.h index d219b70ac..f64108692 100644 --- a/devices/soapysdr/devicesoapysdrshared.h +++ b/devices/soapysdr/devicesoapysdrshared.h @@ -35,7 +35,7 @@ class SoapySDROutput; class DEVICES_API DeviceSoapySDRShared { public: - class MsgReportBuddyChange : public Message { + class DEVICES_API MsgReportBuddyChange : public Message { MESSAGE_CLASS_DECLARATION public: @@ -82,7 +82,7 @@ public: { } }; - class MsgReportDeviceArgsChange : public Message { + class DEVICES_API MsgReportDeviceArgsChange : public Message { MESSAGE_CLASS_DECLARATION public: diff --git a/plugins/samplesource/soapysdrinput/soapysdrinput.pro b/plugins/samplesource/soapysdrinput/soapysdrinput.pro new file mode 100644 index 000000000..7a0e0a9b0 --- /dev/null +++ b/plugins/samplesource/soapysdrinput/soapysdrinput.pro @@ -0,0 +1,42 @@ +#------------------------------------------------- +# +# Pro file for Windows MSVC builds with Qt Creator +# +#------------------------------------------------- + +TEMPLATE = lib +CONFIG += plugin + +QT += core gui multimedia opengl + +TARGET = inputsoapysdrinput + +INCLUDEPATH += $$PWD +INCLUDEPATH += ../../../exports +INCLUDEPATH += ../../../sdrbase +INCLUDEPATH += ../../../sdrgui +INCLUDEPATH += ../../../devices +INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client +INCLUDEPATH += "C:\Programs\PothosSDR\include" + +CONFIG(Release):build_subdir = release +CONFIG(Debug):build_subdir = debug + +SOURCES += soapysdrinput.cpp\ + soapysdrinputgui.cpp\ + soapysdrinputplugin.cpp\ + soapysdrinputsettings.cpp\ + soapysdrinputthread.cpp + +HEADERS += soapysdrinput.h\ + soapysdrinputgui.h\ + soapysdrinputplugin.h\ + soapysdrinputsettings.h\ + soapysdrinputthread.h + +FORMS += soapysdrinputgui.ui + +LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase +LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui +LIBS += -L../../../swagger/$${build_subdir} -lswagger +LIBS += -LC:\Programs\PothosSDR\bin -LC:\Programs\PothosSDR\lib -lSoapySDR diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp b/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp index 5f9ca4f2a..5a3363311 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp +++ b/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp @@ -594,7 +594,7 @@ void SoapySDRInputGui::autoIQCorrectionChanged(bool set) void SoapySDRInputGui::dcCorrectionModuleChanged(double value) { - std::complex dcCorrection = std::polar(value, arg(m_settings.m_dcCorrection)); + std::complex dcCorrection = std::polar(value, arg(m_settings.m_dcCorrection)); m_settings.m_dcCorrection = dcCorrection; sendSettings(); } @@ -602,14 +602,14 @@ void SoapySDRInputGui::dcCorrectionModuleChanged(double value) void SoapySDRInputGui::dcCorrectionArgumentChanged(double value) { double angleInRadians = (value / 180.0) * M_PI; - std::complex dcCorrection = std::polar(abs(m_settings.m_dcCorrection), angleInRadians); + std::complex dcCorrection = std::polar(abs(m_settings.m_dcCorrection), angleInRadians); m_settings.m_dcCorrection = dcCorrection; sendSettings(); } void SoapySDRInputGui::iqCorrectionModuleChanged(double value) { - std::complex iqCorrection = std::polar(value, arg(m_settings.m_iqCorrection)); + std::complex iqCorrection = std::polar(value, arg(m_settings.m_iqCorrection)); m_settings.m_iqCorrection = iqCorrection; sendSettings(); } @@ -617,7 +617,7 @@ void SoapySDRInputGui::iqCorrectionModuleChanged(double value) void SoapySDRInputGui::iqCorrectionArgumentChanged(double value) { double angleInRadians = (value / 180.0) * M_PI; - std::complex iqCorrection = std::polar(abs(m_settings.m_iqCorrection), angleInRadians); + std::complex iqCorrection = std::polar(abs(m_settings.m_iqCorrection), angleInRadians); m_settings.m_iqCorrection = iqCorrection; sendSettings(); } diff --git a/sdrgui/sdrgui.pro b/sdrgui/sdrgui.pro index a10c0e74d..2df36a04d 100644 --- a/sdrgui/sdrgui.pro +++ b/sdrgui/sdrgui.pro @@ -86,6 +86,15 @@ SOURCES += mainwindow.cpp\ gui/tvscreen.cpp\ gui/valuedial.cpp\ gui/valuedialz.cpp\ + soapygui/arginfogui.cpp\ + soapygui/complexfactorgui.cpp\ + soapygui/discreterangegui.cpp\ + soapygui/dynamicargsettinggui.cpp\ + soapygui/dynamicitemsettinggui.cpp\ + soapygui/intervalrangegui.cpp\ + soapygui/intervalslidergui.cpp\ + soapygui/itemsettinggui.cpp\ + soapygui/stringrangegui.cpp\ webapi/webapiadaptergui.cpp HEADERS += mainwindow.h\ @@ -135,6 +144,15 @@ HEADERS += mainwindow.h\ gui/tvscreen.h\ gui/valuedial.h\ gui/valuedialz.h\ + soapygui/arginfogui.h\ + soapygui/complexfactorgui.h\ + soapygui/discreterangegui.h\ + soapygui/dynamicargsettinggui.h\ + soapygui/dynamicitemsettinggui.h\ + soapygui/intervalrangegui.h\ + soapygui/intervalslidergui.h\ + soapygui/itemsettinggui.h\ + soapygui/stringrangegui.h\ webapi/webapiadaptergui.h FORMS += mainwindow.ui\ @@ -156,6 +174,11 @@ FORMS += mainwindow.ui\ gui/loggingdialog.ui\ gui/glspectrumgui.ui\ gui/transverterdialog.ui\ + soapygui/arginfogui.ui\ + soapygui/complexfactorgui.ui\ + soapygui/discreterangegui.ui\ + soapygui/intervalrangegui.ui\ + soapygui/intervalslidergui.ui\ mainwindow.ui LIBS += -L../sdrbase/$${build_subdir} -lsdrbase