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

Don't display dupes in JT65, even if minsync<0. Use VHFfeatures rather than single_decode to control display of Tol, etc., in plotter.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7224 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-10-24 14:56:14 +00:00
parent a700663b0d
commit 5b47bbf22e
6 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/jt65_decode.f90
View File

@ -299,7 +299,8 @@ contains
endif endif
enddo enddo
if(ndupe.ne.1 .or. minsync.lt.0) then ! if(ndupe.ne.1 .or. minsync.lt.0) then
if(ndupe.ne.1) then
if(ipass.eq.1) n65a=n65a + 1 if(ipass.eq.1) n65a=n65a + 1
if(ipass.eq.2) n65b=n65b + 1 if(ipass.eq.2) n65b=n65b + 1
if(ndecoded.lt.50) ndecoded=ndecoded+1 if(ndecoded.lt.50) ndecoded=ndecoded+1

7
mainwindow.cpp
View File

@ -133,7 +133,6 @@ int fast_jh {0};
int fast_jh2 {0}; int fast_jh2 {0};
int narg[15]; int narg[15];
QVector<QColor> g_ColorTbl; QVector<QColor> g_ColorTbl;
bool g_single_decode;
namespace namespace
{ {
@ -814,7 +813,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
} }
fixStop(); fixStop();
VHF_features_enabled(m_config.enable_VHF_features()); VHF_features_enabled(m_config.enable_VHF_features());
g_single_decode=m_config.single_decode(); m_wideGraph->setVHF(m_config.enable_VHF_features());
progressBar.setMaximum(m_TRperiod); progressBar.setMaximum(m_TRperiod);
m_modulator->setPeriod(m_TRperiod); // TODO - not thread safe m_modulator->setPeriod(m_TRperiod); // TODO - not thread safe
@ -1395,7 +1394,8 @@ void MainWindow::on_actionSettings_triggered() //Setup Dialog
auto_tx_label.setText (m_config.quick_call () ? "Auto-Tx-Enable Armed" : auto_tx_label.setText (m_config.quick_call () ? "Auto-Tx-Enable Armed" :
"Auto-Tx-Enable Disarmed"); "Auto-Tx-Enable Disarmed");
displayDialFrequency (); displayDialFrequency ();
bool vhf {m_config.enable_VHF_features ()}; bool vhf {m_config.enable_VHF_features()};
m_wideGraph->setVHF(vhf);
if (!vhf) ui->sbSubmode->setValue (0); if (!vhf) ui->sbSubmode->setValue (0);
setup_status_bar (vhf); setup_status_bar (vhf);
bool b = vhf && (m_mode=="JT4" or m_mode=="JT65" or m_mode=="ISCAT" or bool b = vhf && (m_mode=="JT4" or m_mode=="JT65" or m_mode=="ISCAT" or
@ -2940,7 +2940,6 @@ void MainWindow::guiUpdate()
//Once per second: //Once per second:
if(nsec != m_sec0) { if(nsec != m_sec0) {
g_single_decode=m_config.single_decode();
if(m_auto and m_mode=="Echo" and m_bEchoTxOK) { if(m_auto and m_mode=="Echo" and m_bEchoTxOK) {
progressBar.setMaximum(6); progressBar.setMaximum(6);
progressBar.setValue(int(m_s6)); progressBar.setValue(int(m_s6));

8
plotter.cpp
View File

@ -424,7 +424,7 @@ void CPlotter::DrawOverlay() //DrawOverlay()
} }
if(m_mode=="JT9" or m_mode=="JT65" or m_mode=="JT9+JT65" or m_mode=="QRA64") { if(m_mode=="JT9" or m_mode=="JT65" or m_mode=="JT9+JT65" or m_mode=="QRA64") {
if(m_mode=="QRA64" or (g_single_decode and m_mode=="JT65")) { if(m_mode=="QRA64" or (m_mode=="JT65" and m_bVHF)) {
painter0.setPen(penGreen); painter0.setPen(penGreen);
x1=XfromFreq(m_rxFreq-m_tol); x1=XfromFreq(m_rxFreq-m_tol);
x2=XfromFreq(m_rxFreq+m_tol); x2=XfromFreq(m_rxFreq+m_tol);
@ -717,6 +717,10 @@ void CPlotter::SetPercent2DScreen(int percent)
{ {
m_Percent2DScreen=percent; m_Percent2DScreen=percent;
resizeEvent(NULL); resizeEvent(NULL);
// DrawOverlay();
update(); update();
} }
void CPlotter::setVHF(bool bVHF)
{
m_bVHF=bVHF;
qDebug() << "A" << m_bVHF;
}

2
plotter.h
View File

@ -83,6 +83,7 @@ public:
void setReference(bool b) {m_bReference = b;} void setReference(bool b) {m_bReference = b;}
bool Reference() const {return m_bReference;} bool Reference() const {return m_bReference;}
void drawRed(int ia, int ib, float swide[]); void drawRed(int ia, int ib, float swide[]);
void setVHF(bool bVHF);
signals: signals:
void freezeDecode1(int n); void freezeDecode1(int n);
@ -105,6 +106,7 @@ private:
bool m_bReference; bool m_bReference;
bool m_bReference0; bool m_bReference0;
bool m_lockTxFreq; bool m_lockTxFreq;
bool m_bVHF;
float m_fSpan; float m_fSpan;

5
widegraph.cpp
View File

@ -480,6 +480,11 @@ void WideGraph::setWSPRtransmitted()
m_bHaveTransmitted=true; m_bHaveTransmitted=true;
} }
void WideGraph::setVHF(bool bVHF)
{
ui->widePlot->setVHF(bVHF);
}
void WideGraph::on_sbPercent2dPlot_valueChanged(int n) void WideGraph::on_sbPercent2dPlot_valueChanged(int n)
{ {
m_Percent2DScreen=n; m_Percent2DScreen=n;

1
widegraph.h
View File

@ -47,6 +47,7 @@ public:
void setRxBand(QString band); void setRxBand(QString band);
void setWSPRtransmitted(); void setWSPRtransmitted();
void drawRed(int ia, int ib); void drawRed(int ia, int ib);
void setVHF(bool bVHF);
signals: signals:
void freezeDecode2(int n); void freezeDecode2(int n);