From 7da4fc63a6c73626524e147288160820642d3fe7 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 28 Jan 2019 11:07:52 -0500 Subject: [PATCH] Add freq markers for FT4 to Wide Graph. Tentative default FT4 freqs for 40m and 20m. --- models/FrequencyList.cpp | 4 ++-- widgets/plotter.cpp | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/models/FrequencyList.cpp b/models/FrequencyList.cpp index 57f850eb7..d080f76cf 100644 --- a/models/FrequencyList.cpp +++ b/models/FrequencyList.cpp @@ -68,7 +68,7 @@ namespace {7038600, Modes::WSPR, IARURegions::ALL}, {7074000, Modes::FT8, IARURegions::ALL}, {7076000, Modes::JT65, IARURegions::ALL}, - {7078000, Modes::FT8, IARURegions::ALL}, + {7078000, Modes::FT4, IARURegions::ALL}, {7078000, Modes::JT9, IARURegions::ALL}, {10136000, Modes::FT8, IARURegions::ALL}, @@ -79,7 +79,7 @@ namespace {14095600, Modes::WSPR, IARURegions::ALL}, {14074000, Modes::FT8, IARURegions::ALL}, {14076000, Modes::JT65, IARURegions::ALL}, - {14078000, Modes::FT8, IARURegions::ALL}, + {14078000, Modes::FT4, IARURegions::ALL}, {14078000, Modes::JT9, IARURegions::ALL}, {18100000, Modes::FT8, IARURegions::ALL}, diff --git a/widgets/plotter.cpp b/widgets/plotter.cpp index 761dae08d..4fad379d8 100644 --- a/widgets/plotter.cpp +++ b/widgets/plotter.cpp @@ -409,7 +409,7 @@ void CPlotter::DrawOverlay() //DrawOverlay() } float bw=9.0*12000.0/m_nsps; //JT9 - + if(m_mode=="FT4") bw=3*12000.0/512.0; //FT4 ### (3x, or 4x???) ### if(m_mode=="FT8") bw=7*12000.0/1920.0; //FT8 if(m_mode=="JT4") { //JT4 @@ -484,7 +484,8 @@ void CPlotter::DrawOverlay() //DrawOverlay() painter0.drawLine(x1,24,x1,30); } - if(m_mode=="JT9" or m_mode=="JT65" or m_mode=="JT9+JT65" or m_mode=="QRA64" or m_mode=="FT8") { + if(m_mode=="JT9" or m_mode=="JT65" or m_mode=="JT9+JT65" + or m_mode=="QRA64" or m_mode=="FT8" or m_mode=="FT4") { if(m_mode=="QRA64" or (m_mode=="JT65" and m_bVHF)) { painter0.setPen(penGreen); @@ -518,7 +519,8 @@ void CPlotter::DrawOverlay() //DrawOverlay() } if(m_mode=="JT9" or m_mode=="JT65" or m_mode=="JT9+JT65" or - m_mode.mid(0,4)=="WSPR" or m_mode=="QRA64" or m_mode=="FT8") { + m_mode.mid(0,4)=="WSPR" or m_mode=="QRA64" or m_mode=="FT8" + or m_mode=="FT4") { painter0.setPen(penRed); x1=XfromFreq(m_txFreq); x2=XfromFreq(m_txFreq+bw);