w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-07-31 21:22:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fast mode audio recording behaves the same way as slow modes

Browse Source 
Fixed naming of fast recording files.

Tidied some signal/slot plumbing in the fast plotter.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6806 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2016-06-24 17:01:51 +00:00
parent 529ad6eec9
commit c69bfee149
6 changed files with 28 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fastgraph.cpp
View File

@ -32,8 +32,7 @@ FastGraph::FastGraph(QSettings * settings, QWidget *parent) :
ui->greenZeroSlider->setValue(ui->fastPlot->m_greenZero); ui->greenZeroSlider->setValue(ui->fastPlot->m_greenZero);
m_settings->endGroup(); m_settings->endGroup();
connect(ui->fastPlot, SIGNAL(fastPick1(int,int,int)),this, connect (ui->fastPlot, &FPlotter::fastPick, this, &FastGraph::fastPick);
SLOT(fastPick1a(int,int,int)));
} }
FastGraph::~FastGraph() FastGraph::~FastGraph()
@ -84,11 +83,6 @@ void FastGraph::on_greenZeroSlider_valueChanged(int value)
ui->fastPlot->draw(); ui->fastPlot->draw();
} }
void FastGraph::fastPick1a(int x0, int x1, int y)
{
Q_EMIT fastPick(x0,x1,y);
}
void FastGraph::on_pbAutoLevel_clicked() void FastGraph::on_pbAutoLevel_clicked()
{ {
float sum=0.0; float sum=0.0;

3
fastgraph.h
View File

@ -27,9 +27,6 @@ public:
signals: signals:
void fastPick(int x0, int x1, int y); void fastPick(int x0, int x1, int y);
public slots:
void fastPick1a(int x0, int x1, int y);
private slots: private slots:
void on_gainSlider_valueChanged(int value); void on_gainSlider_valueChanged(int value);
void on_zeroSlider_valueChanged(int value); void on_zeroSlider_valueChanged(int value);

2
fastplot.cpp
View File

@ -216,7 +216,7 @@ void FPlotter::mousePressEvent(QMouseEvent *event) //mousePressEvent
int x1=x+n*m_pixPerSecond; int x1=x+n*m_pixPerSecond;
if(x0 < 0) x0=0; if(x0 < 0) x0=0;
if(x1 > 702) x1=702; if(x1 > 702) x1=702;
Q_EMIT fastPick1(x0,x1,y); Q_EMIT fastPick (x0,x1,y);
int y0=64; int y0=64;
if(y >= 120) y0+=100; if(y >= 120) y0+=100;
if(m_x0+m_x1 != 0) { if(m_x0+m_x1 != 0) {

2
fastplot.h
View File

@ -35,7 +35,7 @@ public:
void drawScale(); void drawScale();
signals: signals:
void fastPick1(int x0, int x1, int y); void fastPick (int x0, int x1, int y);
protected: protected:
//re-implemented widget event handlers //re-implemented widget event handlers

72
mainwindow.cpp
View File

@ -234,7 +234,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
m_ihsym {0}, m_ihsym {0},
m_nzap {0}, m_nzap {0},
m_px {0.0}, m_px {0.0},
m_decodeEarly {false},
m_iptt0 {0}, m_iptt0 {0},
m_btxok0 {false}, m_btxok0 {false},
m_nsendingsh {0}, m_nsendingsh {0},
@ -388,8 +387,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
connect(m_wideGraph.data (), SIGNAL(f11f12(int)),this,SLOT(bumpFqso(int))); connect(m_wideGraph.data (), SIGNAL(f11f12(int)),this,SLOT(bumpFqso(int)));
connect(m_wideGraph.data (), SIGNAL(setXIT2(int)),this,SLOT(setXIT(int))); connect(m_wideGraph.data (), SIGNAL(setXIT2(int)),this,SLOT(setXIT(int)));
connect(m_fastGraph.data(),SIGNAL(fastPick(int,int,int)),this, connect (m_fastGraph.data (), &FastGraph::fastPick, this, &MainWindow::fastPick);
SLOT(fastPick(int,int,int)));
connect (this, &MainWindow::finished, m_wideGraph.data (), &WideGraph::close); connect (this, &MainWindow::finished, m_wideGraph.data (), &WideGraph::close);
connect (this, &MainWindow::finished, m_echoGraph.data (), &EchoGraph::close); connect (this, &MainWindow::finished, m_echoGraph.data (), &EchoGraph::close);
@ -1077,23 +1075,19 @@ void MainWindow::dataSink(qint64 frames)
dec_data.params.newdat=1; dec_data.params.newdat=1;
dec_data.params.nagain=0; dec_data.params.nagain=0;
dec_data.params.nzhsym=m_hsymStop; dec_data.params.nzhsym=m_hsymStop;
QDateTime t = QDateTime::currentDateTimeUtc(); QDateTime now {QDateTime::currentDateTimeUtc ()};
m_dateTime=t.toString("yyyy-MMM-dd hh:mm"); m_dateTime = now.toString ("yyyy-MMM-dd hh:mm");
if(!m_mode.startsWith ("WSPR")) decode(); //Start decoder if(!m_mode.startsWith ("WSPR")) decode(); //Start decoder
if(!m_diskData) { //Always save; may delete later if(!m_diskData) { //Always save; may delete later
int ihr=t.time().toString("hh").toInt(); auto const& period_start = now.addSecs (-now.time ().minute () % (m_TRperiod / 60));
int imin=t.time().toString("mm").toInt(); m_fnameWE = m_config.save_directory ().absoluteFilePath (period_start.toString ("yyMMdd_hhmm"));
imin=imin - (imin%(m_TRperiod/60));
QString t2;
t2.sprintf("%2.2d%2.2d",ihr,imin);
m_fileToSave.clear (); m_fileToSave.clear ();
m_fname = m_config.save_directory ().absoluteFilePath (t.date().toString("yyMMdd") + "_" + t2);
// the following is potential a threading hazard - not a good // the following is potential a threading hazard - not a good
// idea to pass pointer to be processed in another thread // idea to pass pointer to be processed in another thread
m_saveWAVWatcher.setFuture (QtConcurrent::run (std::bind (&MainWindow::save_wave_file m_saveWAVWatcher.setFuture (QtConcurrent::run (std::bind (&MainWindow::save_wave_file
, this , this
, m_fname , m_fnameWE
, &dec_data.d2[0] , &dec_data.d2[0]
, m_TRperiod , m_TRperiod
, m_config.my_callsign () , m_config.my_callsign ()
@ -1104,7 +1098,7 @@ void MainWindow::dataSink(qint64 frames)
, m_hisCall , m_hisCall
, m_hisGrid))); , m_hisGrid)));
if (m_mode.startsWith ("WSPR")) { if (m_mode.startsWith ("WSPR")) {
QString c2name_string {m_fname + ".c2"}; QString c2name_string {m_fnameWE + ".c2"};
int len1=c2name_string.length(); int len1=c2name_string.length();
char c2name[80]; char c2name[80];
strcpy(c2name,c2name_string.toLatin1 ().constData ()); strcpy(c2name,c2name_string.toLatin1 ().constData ());
@ -1129,7 +1123,7 @@ void MainWindow::dataSink(qint64 frames)
} else { } else {
cmnd='"' + m_appDir + '"' + "/wsprd -a \"" + cmnd='"' + m_appDir + '"' + "/wsprd -a \"" +
QDir::toNativeSeparators(m_dataDir.absolutePath()) + "\" " + QDir::toNativeSeparators(m_dataDir.absolutePath()) + "\" " +
t2 + '"' + m_fname + ".wav\""; t2 + '"' + m_fnameWE + ".wav\"";
} }
QString t3=cmnd; QString t3=cmnd;
int i1=cmnd.indexOf("/wsprd "); int i1=cmnd.indexOf("/wsprd ");
@ -1198,28 +1192,12 @@ void MainWindow::fastSink(qint64 frames)
int k (frames); int k (frames);
bool decodeNow=false; bool decodeNow=false;
if(m_k0==9999999) { if(k < m_k0) { //New sequence ?
memset(fast_green,0,sizeof(float)*703); //Zero fast_gereen[] memcpy(fast_green2,fast_green,4*703); //Copy fast_green[] to fast_green2[]
memset(fast_s2,0,sizeof(float)*703*64); //Zero fast_s2[] memcpy(fast_s2,fast_s,4*703*64); //Copy fast_s[] into fast_s2[]
fast_jh2=fast_jh;
if(!m_diskData) memset(dec_data.d2,0,2*30*12000); //Zero the d2[] array
m_bFastDecodeCalled=false; m_bFastDecodeCalled=false;
} else {
if(k < m_k0) { //New sequence ?
memcpy(fast_green2,fast_green,4*703); //Copy fast_green[] to fast_green2[]
memcpy(fast_s2,fast_s,4*703*64); //Copy fast_s[] into fast_s2[]
fast_jh2=fast_jh;
if(!m_diskData) memset(dec_data.d2,0,2*30*12000); //Zero the d2[] array
m_decodeEarly=false;
m_bFastDecodeCalled=false;
QDateTime t=QDateTime::currentDateTimeUtc(); //.addSecs(2-m_TRperiod);
int ihr=t.toString("hh").toInt();
int imin=t.toString("mm").toInt();
int isec=t.toString("ss").toInt();
isec=isec - isec%m_TRperiod;
QString t2;
t2.sprintf("%2.2d%2.2d%2.2d.wav",ihr,imin,isec);
m_fname = m_config.save_directory().absoluteFilePath(
t.date().toString("yyMMdd") + "_" + t2);
}
} }
hspec_(dec_data.d2, &k, &m_inGain, fast_green, fast_s, &fast_jh); hspec_(dec_data.d2, &k, &m_inGain, fast_green, fast_s, &fast_jh);
@ -1244,13 +1222,16 @@ void MainWindow::fastSink(qint64 frames)
m_bFastDecodeCalled=true; m_bFastDecodeCalled=true;
decode(); decode();
} }
if(!m_diskData and (m_saveAll or m_saveDecoded) and m_fname != "" and if(!m_diskData) {
!m_decodeEarly) { QDateTime now {QDateTime::currentDateTimeUtc()};
auto const& period_start = now.addSecs (-now.time ().second () % m_TRperiod);
m_fnameWE = m_config.save_directory ().absoluteFilePath (period_start.toString ("yyMMdd_hhmmss"));
m_fileToSave.clear ();
// the following is potential a threading hazard - not a good // the following is potential a threading hazard - not a good
// idea to pass pointer to be processed in another thread // idea to pass pointer to be processed in another thread
m_saveWAVWatcher.setFuture (QtConcurrent::run (std::bind (&MainWindow::save_wave_file m_saveWAVWatcher.setFuture (QtConcurrent::run (std::bind (&MainWindow::save_wave_file
, this , this
, m_fname , m_fnameWE
, &dec_data.d2[0] , &dec_data.d2[0]
, m_TRperiod , m_TRperiod
, m_config.my_callsign () , m_config.my_callsign ()
@ -1260,10 +1241,8 @@ void MainWindow::fastSink(qint64 frames)
, m_freqNominal , m_freqNominal
, m_hisCall , m_hisCall
, m_hisGrid))); , m_hisGrid)));
m_fileToKill=m_fname;
killFileTimer.start (3*1000*m_TRperiod/4); //Kill 3/4 period from now killFileTimer.start (3*1000*m_TRperiod/4); //Kill 3/4 period from now
} }
m_decodeEarly=false;
} }
} }
@ -1472,7 +1451,7 @@ void MainWindow::keyPressEvent( QKeyEvent *e ) //keyPressEvent
break; break;
case Qt::Key_V: case Qt::Key_V:
if(e->modifiers() & Qt::AltModifier) { if(e->modifiers() & Qt::AltModifier) {
m_fileToSave=m_fname; m_fileToSave = m_fnameWE;
return; return;
} }
break; break;
@ -2313,15 +2292,12 @@ void MainWindow::readFromStdout() //readFromStdout
void MainWindow::killFile () void MainWindow::killFile ()
{ {
QString f=m_fname; if (m_fnameWE.size () &&
if(m_bFastMode) f=m_fileToKill; !(m_saveAll || (m_saveDecoded && m_bDecoded) || m_fnameWE == m_fileToSave)) {
if (!m_fname.isEmpty() && QFile f1 {m_fnameWE + ".wav"};
!(m_saveAll || (m_saveDecoded && m_bDecoded) || m_fname == m_fileToSave)) {
if(m_fname.indexOf(".wav")<0) f+= ".wav";
QFile f1{f};
if(f1.exists()) f1.remove(); if(f1.exists()) f1.remove();
if(m_mode.startsWith ("WSPR")) { if(m_mode.startsWith ("WSPR")) {
QFile f2{m_fname + ".c2"}; QFile f2 {m_fnameWE + ".c2"};
if(f2.exists()) f2.remove(); if(f2.exists()) f2.remove();
} }
} }

4
mainwindow.h
View File

@ -417,7 +417,6 @@ private:
int m_npts8; int m_npts8;
float m_px; float m_px;
float m_df3; float m_df3;
bool m_decodeEarly;
int m_iptt0; int m_iptt0;
bool m_btxok0; bool m_btxok0;
int m_nsendingsh; int m_nsendingsh;
@ -468,7 +467,7 @@ private:
QString m_dateTime; QString m_dateTime;
QString m_mode; QString m_mode;
QString m_modeTx; QString m_modeTx;
QString m_fname; QString m_fnameWE; // save path without extension
QString m_rpt; QString m_rpt;
QString m_rptSent; QString m_rptSent;
QString m_rptRcvd; QString m_rptRcvd;
@ -476,7 +475,6 @@ private:
QString m_qsoStop; QString m_qsoStop;
QString m_cmnd; QString m_cmnd;
QString m_msgSent0; QString m_msgSent0;
QString m_fileToKill;
QString m_fileToSave; QString m_fileToSave;
QString m_calls; QString m_calls;