w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-25 02:42:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Commit wspr tone frequency patch and fix GrayLineDuration typo

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5465 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Steven Franke 2015-05-29 19:23:54 +00:00
parent 5b711d5d8d
commit 7118372667
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modulator.cpp
View File

@ -43,7 +43,7 @@ Modulator::Modulator (unsigned frameRate, unsigned periodLengthInSeconds,
} }
void Modulator::start (unsigned symbolsLength, double framesPerSymbol, void Modulator::start (unsigned symbolsLength, double framesPerSymbol,
unsigned frequency, double toneSpacing, double frequency, double toneSpacing,
SoundOutput * stream, Channel channel, SoundOutput * stream, Channel channel,
bool synchronize, double dBSNR) bool synchronize, double dBSNR)
{ {

6
Modulator.hpp
View File

@ -27,15 +27,15 @@ public:
void close () override; void close () override;
bool isTuning () const {return m_tuning;} bool isTuning () const {return m_tuning;}
unsigned frequency () const {return m_frequency;} double frequency () const {return m_frequency;}
bool isActive () const {return m_state != Idle;} bool isActive () const {return m_state != Idle;}
void setSpread(double s) {m_fSpread=s;} void setSpread(double s) {m_fSpread=s;}
void setPeriod(unsigned p) {m_period=p;} void setPeriod(unsigned p) {m_period=p;}
Q_SLOT void start (unsigned symbolsLength, double framesPerSymbol, unsigned frequency, double toneSpacing, SoundOutput *, Channel = Mono, bool synchronize = true, double dBSNR = 99.); Q_SLOT void start (unsigned symbolsLength, double framesPerSymbol, double frequency, double toneSpacing, SoundOutput *, Channel = Mono, bool synchronize = true, double dBSNR = 99.);
Q_SLOT void stop (bool quick = false); Q_SLOT void stop (bool quick = false);
Q_SLOT void tune (bool newState = true); Q_SLOT void tune (bool newState = true);
Q_SLOT void setFrequency (unsigned newFrequency) {m_frequency = newFrequency;} Q_SLOT void setFrequency (double newFrequency) {m_frequency = newFrequency;}
Q_SIGNAL void stateChanged (ModulatorState) const; Q_SIGNAL void stateChanged (ModulatorState) const;
protected: protected:

4
mainwindow.cpp
View File

@ -720,7 +720,7 @@ void MainWindow::readSettings()
on_nightBands_editingFinished(); on_nightBands_editingFinished();
ui->tuneBands->setText(m_settings->value("TuneBands","").toString()); ui->tuneBands->setText(m_settings->value("TuneBands","").toString());
on_tuneBands_editingFinished(); on_tuneBands_editingFinished();
ui->graylineDuration->setText(m_settings->value("GraylineDuration","").toString()); ui->graylineDuration->setText(m_settings->value("GrayLineDuration","").toString());
on_graylineDuration_editingFinished(); on_graylineDuration_editingFinished();
m_settings->endGroup(); m_settings->endGroup();
@ -3705,7 +3705,7 @@ void MainWindow::transmit (double snr)
if (m_mode=="WSPR-2") { //### Similar code needed for WSPR-15 ### if (m_mode=="WSPR-2") { //### Similar code needed for WSPR-15 ###
Q_EMIT sendMessage (NUM_WSPR_SYMBOLS, 8192.0, Q_EMIT sendMessage (NUM_WSPR_SYMBOLS, 8192.0,
ui->TxFreqSpinBox->value()-2, m_toneSpacing, ui->TxFreqSpinBox->value() - 1.5 * 12000 / 8192, m_toneSpacing,
&m_soundOutput, m_config.audio_output_channel(), &m_soundOutput, m_config.audio_output_channel(),
true, snr); true, snr);
} }

4
mainwindow.h
View File

@ -246,11 +246,11 @@ private:
Q_SIGNAL void startDetector (AudioDevice::Channel) const; Q_SIGNAL void startDetector (AudioDevice::Channel) const;
Q_SIGNAL void detectorClose () const; Q_SIGNAL void detectorClose () const;
Q_SIGNAL void finished () const; Q_SIGNAL void finished () const;
Q_SIGNAL void transmitFrequency (unsigned) const; Q_SIGNAL void transmitFrequency (double) const;
Q_SIGNAL void endTransmitMessage (bool quick = false) const; Q_SIGNAL void endTransmitMessage (bool quick = false) const;
Q_SIGNAL void tune (bool = true) const; Q_SIGNAL void tune (bool = true) const;
Q_SIGNAL void sendMessage (unsigned symbolsLength, double framesPerSymbol, Q_SIGNAL void sendMessage (unsigned symbolsLength, double framesPerSymbol,
unsigned frequency, double toneSpacing, double frequency, double toneSpacing,
SoundOutput *, AudioDevice::Channel = AudioDevice::Mono, SoundOutput *, AudioDevice::Channel = AudioDevice::Mono,
bool synchronize = true, double dBSNR = 99.) const; bool synchronize = true, double dBSNR = 99.) const;
Q_SIGNAL void outAttenuationChanged (qreal) const; Q_SIGNAL void outAttenuationChanged (qreal) const;