VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-25 09:18:54 -05:00
Code Issues Projects Releases Wiki Activity

Windows: MSVC2017: soapysdrinput (1)

Browse Source
This commit is contained in:
f4exb 2018-11-15 19:07:15 +01:00
parent 6ad678e059
commit cb9d300109
5 changed files with 72 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devices/devices.pro
View File

@ -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
}

4
devices/soapysdr/devicesoapysdrshared.h
View File

@ -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:

42
plugins/samplesource/soapysdrinput/soapysdrinput.pro Normal file
View File

@ -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

8
plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp
View File

@ -594,7 +594,7 @@ void SoapySDRInputGui::autoIQCorrectionChanged(bool set)
void SoapySDRInputGui::dcCorrectionModuleChanged(double value)
{
std::complex<float> dcCorrection = std::polar<float>(value, arg(m_settings.m_dcCorrection));
std::complex<double> dcCorrection = std::polar<double>(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<float> dcCorrection = std::polar<float>(abs(m_settings.m_dcCorrection), angleInRadians);
std::complex<double> dcCorrection = std::polar<double>(abs(m_settings.m_dcCorrection), angleInRadians);
m_settings.m_dcCorrection = dcCorrection;
sendSettings();
}
void SoapySDRInputGui::iqCorrectionModuleChanged(double value)
{
std::complex<float> iqCorrection = std::polar<float>(value, arg(m_settings.m_iqCorrection));
std::complex<double> iqCorrection = std::polar<double>(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<float> iqCorrection = std::polar<float>(abs(m_settings.m_iqCorrection), angleInRadians);
std::complex<double> iqCorrection = std::polar<double>(abs(m_settings.m_iqCorrection), angleInRadians);
m_settings.m_iqCorrection = iqCorrection;
sendSettings();
}

23
sdrgui/sdrgui.pro
View File

@ -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