From c4bad4d8341270d2eab5d98528ba98eef22e8463 Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 28 Sep 2017 14:07:41 +0200 Subject: [PATCH] CRLF problem --- .../limesdroutput/limesdroutputsettings.h | 124 +-- .../samplesource/fcdproplus/fcdproplus.pro | 86 +- .../limesdrinput/limesdrinputsettings.h | 152 +-- sdrbase/audio/audioinput.h | 138 +-- sdrbase/dsp/basebandsamplesource.cpp | 116 +-- sdrbase/dsp/devicesamplesink.cpp | 90 +- sdrbase/gui/cwkeyergui.ui | 882 +++++++++--------- sdrbase/gui/myposdialog.ui | 244 ++--- sdrbase/gui/valuedialz.h | 166 ++-- 9 files changed, 999 insertions(+), 999 deletions(-) diff --git a/plugins/samplesink/limesdroutput/limesdroutputsettings.h b/plugins/samplesink/limesdroutput/limesdroutputsettings.h index cf84863e0..991f0932e 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputsettings.h +++ b/plugins/samplesink/limesdroutput/limesdroutputsettings.h @@ -1,62 +1,62 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2017 Edouard Griffiths, F4EXB // -// // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation as version 3 of the License, or // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#ifndef PLUGINS_SAMPLESOURCE_LIMESDROUTPUT_LIMESDROUTPUTSETTINGS_H_ -#define PLUGINS_SAMPLESOURCE_LIMESDROUTPUT_LIMESDROUTPUTSETTINGS_H_ - -#include -#include - -/** - * These are the settings individual to each hardware channel or software Tx chain - * Plus the settings to be saved in the presets - */ -struct LimeSDROutputSettings -{ - typedef enum { - FC_POS_INFRA = 0, - FC_POS_SUPRA, - FC_POS_CENTER - } fcPos_t; - - enum PathRFE - { - PATH_RFE_NONE = 0, - PATH_RFE_TXRF1, - PATH_RFE_TXEF2 - }; - - // global settings to be saved - uint64_t m_centerFrequency; - int m_devSampleRate; - uint32_t m_log2HardInterp; - // channel settings - uint32_t m_log2SoftInterp; - float m_lpfBW; //!< LMS amalog lowpass filter bandwidth (Hz) - bool m_lpfFIREnable; //!< Enable LMS digital lowpass FIR filters - float m_lpfFIRBW; //!< LMS digital lowpass FIR filters bandwidth (Hz) - uint32_t m_gain; //!< Optimally distributed gain (dB) - bool m_ncoEnable; //!< Enable TSP NCO and mixing - int m_ncoFrequency; //!< Actual NCO frequency (the resulting frequency with mixing is displayed) - PathRFE m_antennaPath; - - LimeSDROutputSettings(); - void resetToDefaults(); - QByteArray serialize() const; - bool deserialize(const QByteArray& data); -}; - -#endif /* PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUTSETTINGS_H_ */ +/////////////////////////////////////////////////////////////////////////////////// +// Copyright (C) 2017 Edouard Griffiths, F4EXB // +// // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation as version 3 of the License, or // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License V3 for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program. If not, see . // +/////////////////////////////////////////////////////////////////////////////////// + +#ifndef PLUGINS_SAMPLESOURCE_LIMESDROUTPUT_LIMESDROUTPUTSETTINGS_H_ +#define PLUGINS_SAMPLESOURCE_LIMESDROUTPUT_LIMESDROUTPUTSETTINGS_H_ + +#include +#include + +/** + * These are the settings individual to each hardware channel or software Tx chain + * Plus the settings to be saved in the presets + */ +struct LimeSDROutputSettings +{ + typedef enum { + FC_POS_INFRA = 0, + FC_POS_SUPRA, + FC_POS_CENTER + } fcPos_t; + + enum PathRFE + { + PATH_RFE_NONE = 0, + PATH_RFE_TXRF1, + PATH_RFE_TXEF2 + }; + + // global settings to be saved + uint64_t m_centerFrequency; + int m_devSampleRate; + uint32_t m_log2HardInterp; + // channel settings + uint32_t m_log2SoftInterp; + float m_lpfBW; //!< LMS amalog lowpass filter bandwidth (Hz) + bool m_lpfFIREnable; //!< Enable LMS digital lowpass FIR filters + float m_lpfFIRBW; //!< LMS digital lowpass FIR filters bandwidth (Hz) + uint32_t m_gain; //!< Optimally distributed gain (dB) + bool m_ncoEnable; //!< Enable TSP NCO and mixing + int m_ncoFrequency; //!< Actual NCO frequency (the resulting frequency with mixing is displayed) + PathRFE m_antennaPath; + + LimeSDROutputSettings(); + void resetToDefaults(); + QByteArray serialize() const; + bool deserialize(const QByteArray& data); +}; + +#endif /* PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUTSETTINGS_H_ */ diff --git a/plugins/samplesource/fcdproplus/fcdproplus.pro b/plugins/samplesource/fcdproplus/fcdproplus.pro index 45cf21dc2..c6ea9344f 100644 --- a/plugins/samplesource/fcdproplus/fcdproplus.pro +++ b/plugins/samplesource/fcdproplus/fcdproplus.pro @@ -1,43 +1,43 @@ -#-------------------------------------------------------- -# -# Pro file for Android and Windows builds with Qt Creator -# -#-------------------------------------------------------- - -TEMPLATE = lib -CONFIG += plugin - -QT += core gui widgets multimedia network - -TARGET = inputfcdproplus - -DEFINES += USE_SSE2=1 -QMAKE_CXXFLAGS += -msse2 -DEFINES += USE_SSE4_1=1 -QMAKE_CXXFLAGS += -msse4.1 - -INCLUDEPATH += $$PWD -INCLUDEPATH += ../../../sdrbase -INCLUDEPATH += ../../../fcdhid -INCLUDEPATH += ../../../fcdlib - -CONFIG(Release):build_subdir = release -CONFIG(Debug):build_subdir = debug - -SOURCES = fcdproplusgui.cpp\ - fcdproplusinputqt.cpp\ - fcdproplusplugin.cpp\ - fcdproplussettings.cpp\ - fcdproplusreader.cpp - -HEADERS = fcdproplusgui.h\ - fcdproplusinputqt.h\ - fcdproplusplugin.h\ - fcdproplussettings.h\ - fcdproplusreader.h - -FORMS += fcdproplusgui.ui - -LIBS += -L../../../fcdlib/$${build_subdir} -lfcdlib -LIBS += -L../../../fcdhid/$${build_subdir} -lfcdhid -LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase +#-------------------------------------------------------- +# +# Pro file for Android and Windows builds with Qt Creator +# +#-------------------------------------------------------- + +TEMPLATE = lib +CONFIG += plugin + +QT += core gui widgets multimedia network + +TARGET = inputfcdproplus + +DEFINES += USE_SSE2=1 +QMAKE_CXXFLAGS += -msse2 +DEFINES += USE_SSE4_1=1 +QMAKE_CXXFLAGS += -msse4.1 + +INCLUDEPATH += $$PWD +INCLUDEPATH += ../../../sdrbase +INCLUDEPATH += ../../../fcdhid +INCLUDEPATH += ../../../fcdlib + +CONFIG(Release):build_subdir = release +CONFIG(Debug):build_subdir = debug + +SOURCES = fcdproplusgui.cpp\ + fcdproplusinputqt.cpp\ + fcdproplusplugin.cpp\ + fcdproplussettings.cpp\ + fcdproplusreader.cpp + +HEADERS = fcdproplusgui.h\ + fcdproplusinputqt.h\ + fcdproplusplugin.h\ + fcdproplussettings.h\ + fcdproplusreader.h + +FORMS += fcdproplusgui.ui + +LIBS += -L../../../fcdlib/$${build_subdir} -lfcdlib +LIBS += -L../../../fcdhid/$${build_subdir} -lfcdhid +LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase diff --git a/plugins/samplesource/limesdrinput/limesdrinputsettings.h b/plugins/samplesource/limesdrinput/limesdrinputsettings.h index cb5f858f5..32caafa2f 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputsettings.h +++ b/plugins/samplesource/limesdrinput/limesdrinputsettings.h @@ -1,76 +1,76 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2017 Edouard Griffiths, F4EXB // -// // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation as version 3 of the License, or // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#ifndef PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUTSETTINGS_H_ -#define PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUTSETTINGS_H_ - -#include -#include - -/** - * These are the settings individual to each hardware channel or software Rx chain - * Plus the settings to be saved in the presets - */ -struct LimeSDRInputSettings -{ - typedef enum { - FC_POS_INFRA = 0, - FC_POS_SUPRA, - FC_POS_CENTER - } fcPos_t; - - enum PathRFE - { - PATH_RFE_NONE = 0, - PATH_RFE_LNAH, - PATH_RFE_LNAL, - PATH_RFE_LNAW, - PATH_RFE_LB1, - PATH_RFE_LB2 - }; - - typedef enum { - GAIN_AUTO, - GAIN_MANUAL - } GainMode; - - // global settings to be saved - uint64_t m_centerFrequency; - int m_devSampleRate; - uint32_t m_log2HardDecim; - // channel settings - bool m_dcBlock; - bool m_iqCorrection; - uint32_t m_log2SoftDecim; - float m_lpfBW; //!< LMS amalog lowpass filter bandwidth (Hz) - bool m_lpfFIREnable; //!< Enable LMS digital lowpass FIR filters - float m_lpfFIRBW; //!< LMS digital lowpass FIR filters bandwidth (Hz) - uint32_t m_gain; //!< Optimally distributed gain (dB) - bool m_ncoEnable; //!< Enable TSP NCO and mixing - int m_ncoFrequency; //!< Actual NCO frequency (the resulting frequency with mixing is displayed) - PathRFE m_antennaPath; - GainMode m_gainMode; //!< Gain mode: auto or manual - uint32_t m_lnaGain; //!< Manual LAN gain - uint32_t m_tiaGain; //!< Manual TIA gain - uint32_t m_pgaGain; //!< Manual PGA gain - - LimeSDRInputSettings(); - void resetToDefaults(); - QByteArray serialize() const; - bool deserialize(const QByteArray& data); -}; - -#endif /* PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUTSETTINGS_H_ */ +/////////////////////////////////////////////////////////////////////////////////// +// Copyright (C) 2017 Edouard Griffiths, F4EXB // +// // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation as version 3 of the License, or // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License V3 for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program. If not, see . // +/////////////////////////////////////////////////////////////////////////////////// + +#ifndef PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUTSETTINGS_H_ +#define PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUTSETTINGS_H_ + +#include +#include + +/** + * These are the settings individual to each hardware channel or software Rx chain + * Plus the settings to be saved in the presets + */ +struct LimeSDRInputSettings +{ + typedef enum { + FC_POS_INFRA = 0, + FC_POS_SUPRA, + FC_POS_CENTER + } fcPos_t; + + enum PathRFE + { + PATH_RFE_NONE = 0, + PATH_RFE_LNAH, + PATH_RFE_LNAL, + PATH_RFE_LNAW, + PATH_RFE_LB1, + PATH_RFE_LB2 + }; + + typedef enum { + GAIN_AUTO, + GAIN_MANUAL + } GainMode; + + // global settings to be saved + uint64_t m_centerFrequency; + int m_devSampleRate; + uint32_t m_log2HardDecim; + // channel settings + bool m_dcBlock; + bool m_iqCorrection; + uint32_t m_log2SoftDecim; + float m_lpfBW; //!< LMS amalog lowpass filter bandwidth (Hz) + bool m_lpfFIREnable; //!< Enable LMS digital lowpass FIR filters + float m_lpfFIRBW; //!< LMS digital lowpass FIR filters bandwidth (Hz) + uint32_t m_gain; //!< Optimally distributed gain (dB) + bool m_ncoEnable; //!< Enable TSP NCO and mixing + int m_ncoFrequency; //!< Actual NCO frequency (the resulting frequency with mixing is displayed) + PathRFE m_antennaPath; + GainMode m_gainMode; //!< Gain mode: auto or manual + uint32_t m_lnaGain; //!< Manual LAN gain + uint32_t m_tiaGain; //!< Manual TIA gain + uint32_t m_pgaGain; //!< Manual PGA gain + + LimeSDRInputSettings(); + void resetToDefaults(); + QByteArray serialize() const; + bool deserialize(const QByteArray& data); +}; + +#endif /* PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUTSETTINGS_H_ */ diff --git a/sdrbase/audio/audioinput.h b/sdrbase/audio/audioinput.h index 39e7ed40c..c08d366b6 100644 --- a/sdrbase/audio/audioinput.h +++ b/sdrbase/audio/audioinput.h @@ -1,69 +1,69 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2016 Edouard Griffiths, F4EXB // -// // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation as version 3 of the License, or // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#ifndef SDRBASE_AUDIO_AUDIOINPUT_H_ -#define SDRBASE_AUDIO_AUDIOINPUT_H_ - -#include -#include -#include -#include -#include -#include "util/export.h" - -class QAudioInput; -class AudioFifo; -class AudioOutputPipe; - - -class SDRANGEL_API AudioInput : public QIODevice { -public: - AudioInput(); - virtual ~AudioInput(); - - bool start(int device, int rate); - void stop(); - - void addFifo(AudioFifo* audioFifo); - void removeFifo(AudioFifo* audioFifo); - - uint getRate() const { return m_audioFormat.sampleRate(); } - void setOnExit(bool onExit) { m_onExit = onExit; } - void setVolume(float volume) { m_volume = volume; } - -private: - QMutex m_mutex; - QAudioInput* m_audioInput; - uint m_audioUsageCount; - bool m_onExit; - float m_volume; - - typedef std::list AudioFifos; - AudioFifos m_audioFifos; - std::vector m_mixBuffer; - - QAudioFormat m_audioFormat; - - //virtual bool open(OpenMode mode); - virtual qint64 readData(char* data, qint64 maxLen); - virtual qint64 writeData(const char* data, qint64 len); - - friend class AudioOutputPipe; -}; - - - -#endif /* SDRBASE_AUDIO_AUDIOINPUT_H_ */ +/////////////////////////////////////////////////////////////////////////////////// +// Copyright (C) 2016 Edouard Griffiths, F4EXB // +// // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation as version 3 of the License, or // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License V3 for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program. If not, see . // +/////////////////////////////////////////////////////////////////////////////////// + +#ifndef SDRBASE_AUDIO_AUDIOINPUT_H_ +#define SDRBASE_AUDIO_AUDIOINPUT_H_ + +#include +#include +#include +#include +#include +#include "util/export.h" + +class QAudioInput; +class AudioFifo; +class AudioOutputPipe; + + +class SDRANGEL_API AudioInput : public QIODevice { +public: + AudioInput(); + virtual ~AudioInput(); + + bool start(int device, int rate); + void stop(); + + void addFifo(AudioFifo* audioFifo); + void removeFifo(AudioFifo* audioFifo); + + uint getRate() const { return m_audioFormat.sampleRate(); } + void setOnExit(bool onExit) { m_onExit = onExit; } + void setVolume(float volume) { m_volume = volume; } + +private: + QMutex m_mutex; + QAudioInput* m_audioInput; + uint m_audioUsageCount; + bool m_onExit; + float m_volume; + + typedef std::list AudioFifos; + AudioFifos m_audioFifos; + std::vector m_mixBuffer; + + QAudioFormat m_audioFormat; + + //virtual bool open(OpenMode mode); + virtual qint64 readData(char* data, qint64 maxLen); + virtual qint64 writeData(const char* data, qint64 len); + + friend class AudioOutputPipe; +}; + + + +#endif /* SDRBASE_AUDIO_AUDIOINPUT_H_ */ diff --git a/sdrbase/dsp/basebandsamplesource.cpp b/sdrbase/dsp/basebandsamplesource.cpp index 63c2d9853..76ea093a3 100644 --- a/sdrbase/dsp/basebandsamplesource.cpp +++ b/sdrbase/dsp/basebandsamplesource.cpp @@ -1,58 +1,58 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2016 F4EXB // -// written by Edouard Griffiths // -// // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation as version 3 of the License, or // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#include "dsp/basebandsamplesource.h" -#include "util/message.h" - -BasebandSampleSource::BasebandSampleSource() : - m_sampleFifo(48000) // arbitrary, will be adjusted to match device sink FIFO size -{ - connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages())); - connect(&m_sampleFifo, SIGNAL(dataWrite(int)), this, SLOT(handleWriteToFifo(int))); -} - -BasebandSampleSource::~BasebandSampleSource() -{ -} - -void BasebandSampleSource::handleInputMessages() -{ - Message* message; - - while ((message = m_inputMessageQueue.pop()) != 0) - { - if (handleMessage(*message)) - { - delete message; - } - } -} - -void BasebandSampleSource::handleWriteToFifo(int nbSamples) -{ - SampleVector::iterator writeAt; - m_sampleFifo.getWriteIterator(writeAt); - pullAudio(nbSamples); // Pre-fetch input audio samples this is mandatory to keep things running smoothly - - for (int i = 0; i < nbSamples; i++) - { - pull((*writeAt)); - m_sampleFifo.bumpIndex(writeAt); - } -} - - +/////////////////////////////////////////////////////////////////////////////////// +// Copyright (C) 2016 F4EXB // +// written by Edouard Griffiths // +// // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation as version 3 of the License, or // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License V3 for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program. If not, see . // +/////////////////////////////////////////////////////////////////////////////////// + +#include "dsp/basebandsamplesource.h" +#include "util/message.h" + +BasebandSampleSource::BasebandSampleSource() : + m_sampleFifo(48000) // arbitrary, will be adjusted to match device sink FIFO size +{ + connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages())); + connect(&m_sampleFifo, SIGNAL(dataWrite(int)), this, SLOT(handleWriteToFifo(int))); +} + +BasebandSampleSource::~BasebandSampleSource() +{ +} + +void BasebandSampleSource::handleInputMessages() +{ + Message* message; + + while ((message = m_inputMessageQueue.pop()) != 0) + { + if (handleMessage(*message)) + { + delete message; + } + } +} + +void BasebandSampleSource::handleWriteToFifo(int nbSamples) +{ + SampleVector::iterator writeAt; + m_sampleFifo.getWriteIterator(writeAt); + pullAudio(nbSamples); // Pre-fetch input audio samples this is mandatory to keep things running smoothly + + for (int i = 0; i < nbSamples; i++) + { + pull((*writeAt)); + m_sampleFifo.bumpIndex(writeAt); + } +} + + diff --git a/sdrbase/dsp/devicesamplesink.cpp b/sdrbase/dsp/devicesamplesink.cpp index bd76d6e5a..dfedfdbb7 100644 --- a/sdrbase/dsp/devicesamplesink.cpp +++ b/sdrbase/dsp/devicesamplesink.cpp @@ -1,45 +1,45 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2016 F4EXB // -// written by Edouard Griffiths // -// // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation as version 3 of the License, or // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#include "dsp/devicesamplesink.h" - -DeviceSampleSink::DeviceSampleSink() : - m_sampleSourceFifo(1<<19) -{ - connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages())); -} - -DeviceSampleSink::~DeviceSampleSink() -{ -} - -void DeviceSampleSink::handleInputMessages() -{ - Message* message; - - while ((message = m_inputMessageQueue.pop()) != 0) - { - if (handleMessage(*message)) - { - delete message; - } - } -} - - - - +/////////////////////////////////////////////////////////////////////////////////// +// Copyright (C) 2016 F4EXB // +// written by Edouard Griffiths // +// // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation as version 3 of the License, or // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License V3 for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program. If not, see . // +/////////////////////////////////////////////////////////////////////////////////// + +#include "dsp/devicesamplesink.h" + +DeviceSampleSink::DeviceSampleSink() : + m_sampleSourceFifo(1<<19) +{ + connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages())); +} + +DeviceSampleSink::~DeviceSampleSink() +{ +} + +void DeviceSampleSink::handleInputMessages() +{ + Message* message; + + while ((message = m_inputMessageQueue.pop()) != 0) + { + if (handleMessage(*message)) + { + delete message; + } + } +} + + + + diff --git a/sdrbase/gui/cwkeyergui.ui b/sdrbase/gui/cwkeyergui.ui index de024323a..fe5899f94 100644 --- a/sdrbase/gui/cwkeyergui.ui +++ b/sdrbase/gui/cwkeyergui.ui @@ -1,441 +1,441 @@ - - - CWKeyerGUI - - - - 0 - 0 - 375 - 60 - - - - - Sans Serif - 8 - - - - CW Keyer - - - - 2 - - - 3 - - - - - 3 - - - - - WPM - - - - - - - - 24 - 24 - - - - CW speed (WPM) - - - 1 - - - 26 - - - 1 - - - 13 - - - - - - - - 16 - 0 - - - - - 9 - - - - CW speed display (WPM) - - - 13 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 24 - 24 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 12 - 75 - true - - - - Send dots - - - . - - - - - - - - 0 - 0 - - - - - 24 - 24 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 12 - 75 - true - - - - Send dashes - - - - - - - - - - - Qt::Vertical - - - - - - - - 0 - 0 - - - - - 24 - 24 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 106 - 104 - 100 - - - - - - - - - DejaVu Serif - 9 - 75 - true - - - - Send text written above - - - T - - - true - - - - - - - - 0 - 0 - - - - - 24 - 24 - - - - Play text in a loop - - - - :/playloop.png:/playloop.png - - - - 16 - 16 - - - - true - - - - - - - - 0 - 0 - - - - - 24 - 24 - - - - Play / stop text coding - - - - :/play.png - :/stop.png:/play.png - - - - 16 - 16 - - - - true - - - false - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - CW text - - - - - - - - 24 - 24 - - - - - 24 - 24 - - - - Clear CW text - - - - - - - :/clear.png:/clear.png - - - - 16 - 16 - - - - - - - - - - - ButtonSwitch - QToolButton -
gui/buttonswitch.h
- - - - playLoopCW - - - - - - + + + CWKeyerGUI + + + + 0 + 0 + 375 + 60 + + + + + Sans Serif + 8 + + + + CW Keyer + + + + 2 + + + 3 + + + + + 3 + + + + + WPM + + + + + + + + 24 + 24 + + + + CW speed (WPM) + + + 1 + + + 26 + + + 1 + + + 13 + + + + + + + + 16 + 0 + + + + + 9 + + + + CW speed display (WPM) + + + 13 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 24 + 24 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 12 + 75 + true + + + + Send dots + + + . + + + + + + + + 0 + 0 + + + + + 24 + 24 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 12 + 75 + true + + + + Send dashes + + + - + + + + + + + Qt::Vertical + + + + + + + + 0 + 0 + + + + + 24 + 24 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 106 + 104 + 100 + + + + + + + + + DejaVu Serif + 9 + 75 + true + + + + Send text written above + + + T + + + true + + + + + + + + 0 + 0 + + + + + 24 + 24 + + + + Play text in a loop + + + + :/playloop.png:/playloop.png + + + + 16 + 16 + + + + true + + + + + + + + 0 + 0 + + + + + 24 + 24 + + + + Play / stop text coding + + + + :/play.png + :/stop.png:/play.png + + + + 16 + 16 + + + + true + + + false + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + CW text + + + + + + + + 24 + 24 + + + + + 24 + 24 + + + + Clear CW text + + + + + + + :/clear.png:/clear.png + + + + 16 + 16 + + + + + + + + + + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+ + + + playLoopCW + + + + + + diff --git a/sdrbase/gui/myposdialog.ui b/sdrbase/gui/myposdialog.ui index a794c7925..d87ff3ad8 100644 --- a/sdrbase/gui/myposdialog.ui +++ b/sdrbase/gui/myposdialog.ui @@ -1,122 +1,122 @@ - - - MyPositionDialog - - - - 0 - 0 - 324 - 127 - - - - - Sans Serif - 9 - - - - Dialog - - - - - - My Station Position - - - - - - Latitude - - - - - - - Longitude - - - - - - - 6 - - - -180.000000000000000 - - - 180.000000000000000 - - - - - - - 6 - - - -90.000000000000000 - - - 90.000000000000000 - - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - buttonBox - - - - - buttonBox - accepted() - MyPositionDialog - accept() - - - 257 - 194 - - - 157 - 203 - - - - - buttonBox - rejected() - MyPositionDialog - reject() - - - 314 - 194 - - - 286 - 203 - - - - - + + + MyPositionDialog + + + + 0 + 0 + 324 + 127 + + + + + Sans Serif + 9 + + + + Dialog + + + + + + My Station Position + + + + + + Latitude + + + + + + + Longitude + + + + + + + 6 + + + -180.000000000000000 + + + 180.000000000000000 + + + + + + + 6 + + + -90.000000000000000 + + + 90.000000000000000 + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + buttonBox + + + + + buttonBox + accepted() + MyPositionDialog + accept() + + + 257 + 194 + + + 157 + 203 + + + + + buttonBox + rejected() + MyPositionDialog + reject() + + + 314 + 194 + + + 286 + 203 + + + + + diff --git a/sdrbase/gui/valuedialz.h b/sdrbase/gui/valuedialz.h index c7ad6b005..f7da0d8ab 100644 --- a/sdrbase/gui/valuedialz.h +++ b/sdrbase/gui/valuedialz.h @@ -1,83 +1,83 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2017 F4EXB // -// written by Edouard Griffiths // -// // -// Same as ValueDial but handles optionally positive and negative numbers with // -// sign display. // -// // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation as version 3 of the License, or // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#include -#include -#include "gui/colormapper.h" -#include "util/export.h" - -class SDRANGEL_API ValueDialZ : public QWidget { - Q_OBJECT - -public: - ValueDialZ(bool positiveOnly = true, QWidget* parent = NULL, ColorMapper colorMapper = ColorMapper(ColorMapper::Normal)); - - void setValue(qint64 value); - void setValueRange(bool positiveOnly, uint numDigits, qint64 min, qint64 max); - void setFont(const QFont& font); - void setBold(bool bold); - void setColorMapper(ColorMapper colorMapper); - qint64 getValue() const { return m_value; } - qint64 getValueNew() const { return m_valueNew; } - -signals: - void changed(qint64 value); - -private: - QLinearGradient m_background; - int m_numDigits; - int m_numDecimalPoints; - int m_digitWidth; - int m_digitHeight; - int m_hightlightedDigit; - int m_cursor; - bool m_cursorState; - qint64 m_value; - qint64 m_valueMax; - qint64 m_valueMin; - bool m_positiveOnly; - QString m_text; - - qint64 m_valueNew; - QString m_textNew; - int m_animationState; - QTimer m_animationTimer; - QTimer m_blinkTimer; - - ColorMapper m_colorMapper; - - quint64 findExponent(int digit); - QChar digitNeigh(QChar c, bool dir); - QString formatText(qint64 value); - - void paintEvent(QPaintEvent*); - - void mousePressEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); - void wheelEvent(QWheelEvent*); - void leaveEvent(QEvent*); - void keyPressEvent(QKeyEvent*); - void focusInEvent(QFocusEvent*); - void focusOutEvent(QFocusEvent*); - -private slots: - void animate(); - void blink(); -}; +/////////////////////////////////////////////////////////////////////////////////// +// Copyright (C) 2017 F4EXB // +// written by Edouard Griffiths // +// // +// Same as ValueDial but handles optionally positive and negative numbers with // +// sign display. // +// // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation as version 3 of the License, or // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License V3 for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program. If not, see . // +/////////////////////////////////////////////////////////////////////////////////// + +#include +#include +#include "gui/colormapper.h" +#include "util/export.h" + +class SDRANGEL_API ValueDialZ : public QWidget { + Q_OBJECT + +public: + ValueDialZ(bool positiveOnly = true, QWidget* parent = NULL, ColorMapper colorMapper = ColorMapper(ColorMapper::Normal)); + + void setValue(qint64 value); + void setValueRange(bool positiveOnly, uint numDigits, qint64 min, qint64 max); + void setFont(const QFont& font); + void setBold(bool bold); + void setColorMapper(ColorMapper colorMapper); + qint64 getValue() const { return m_value; } + qint64 getValueNew() const { return m_valueNew; } + +signals: + void changed(qint64 value); + +private: + QLinearGradient m_background; + int m_numDigits; + int m_numDecimalPoints; + int m_digitWidth; + int m_digitHeight; + int m_hightlightedDigit; + int m_cursor; + bool m_cursorState; + qint64 m_value; + qint64 m_valueMax; + qint64 m_valueMin; + bool m_positiveOnly; + QString m_text; + + qint64 m_valueNew; + QString m_textNew; + int m_animationState; + QTimer m_animationTimer; + QTimer m_blinkTimer; + + ColorMapper m_colorMapper; + + quint64 findExponent(int digit); + QChar digitNeigh(QChar c, bool dir); + QString formatText(qint64 value); + + void paintEvent(QPaintEvent*); + + void mousePressEvent(QMouseEvent*); + void mouseMoveEvent(QMouseEvent*); + void wheelEvent(QWheelEvent*); + void leaveEvent(QEvent*); + void keyPressEvent(QKeyEvent*); + void focusInEvent(QFocusEvent*); + void focusOutEvent(QFocusEvent*); + +private slots: + void animate(); + void blink(); +};