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

Make JT65 tone markers for RO, RRR, 73 orange; add a green marker for top tone.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6676 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-05-16 17:31:47 +00:00
parent cc8d2130c6
commit c677bd6d2d
1 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
plotter.cpp
View File

@ -228,12 +228,14 @@ void CPlotter::DrawOverlay() //DrawOverlay()
if(m_OverlayPixmap.isNull()) return; if(m_OverlayPixmap.isNull()) return;
if(m_WaterfallPixmap.isNull()) return; if(m_WaterfallPixmap.isNull()) return;
int w = m_WaterfallPixmap.width(); int w = m_WaterfallPixmap.width();
int x,y,x1,x2,x3,x4,x5; int x,y,x1,x2,x3,x4,x5,x6;
float pixperdiv; float pixperdiv;
double df = m_binsPerPixel*m_fftBinWidth; double df = m_binsPerPixel*m_fftBinWidth;
QRect rect; QRect rect;
{ QPen penOrange(QColor(255,165,0),3);
QPen penGreen(Qt::green, 3); //Mark Tol range with green line
QPen penRed(Qt::red, 3); //Mark Tx freq with red
QPainter painter(&m_OverlayPixmap); QPainter painter(&m_OverlayPixmap);
painter.initFrom(this); painter.initFrom(this);
QLinearGradient gradient(0, 0, 0 ,m_h2); //fill background with gradient QLinearGradient gradient(0, 0, 0 ,m_h2); //fill background with gradient
@ -263,7 +265,6 @@ void CPlotter::DrawOverlay() //DrawOverlay()
y = (int)( (float)i*pixperdiv ); y = (int)( (float)i*pixperdiv );
painter.drawLine(0, y, w, y); painter.drawLine(0, y, w, y);
} }
}
QRect rect0; QRect rect0;
QPainter painter0(&m_ScalePixmap); QPainter painter0(&m_ScalePixmap);
@ -322,8 +323,7 @@ void CPlotter::DrawOverlay() //DrawOverlay()
if(m_nSubMode==5) bw=36*bw; if(m_nSubMode==5) bw=36*bw;
if(m_nSubMode==6) bw=72*bw; if(m_nSubMode==6) bw=72*bw;
QPen pen0(Qt::green, 3); //Mark Tol range with green line painter0.setPen(penGreen);
painter0.setPen(pen0);
x1=XfromFreq(m_rxFreq-m_tol); x1=XfromFreq(m_rxFreq-m_tol);
x2=XfromFreq(m_rxFreq+m_tol); x2=XfromFreq(m_rxFreq+m_tol);
painter0.drawLine(x1,29,x2,29); painter0.drawLine(x1,29,x2,29);
@ -333,8 +333,7 @@ void CPlotter::DrawOverlay() //DrawOverlay()
if(i==0) j=18; if(i==0) j=18;
painter0.drawLine(x1,j,x1,30); painter0.drawLine(x1,j,x1,30);
} }
QPen pen1(Qt::red, 3); //Mark Tx freq with red painter0.setPen(penRed);
painter0.setPen(pen1);
for(int i=0; i<4; i++) { for(int i=0; i<4; i++) {
x1=XfromFreq(m_txFreq+bw*i/3.0); x1=XfromFreq(m_txFreq+bw*i/3.0);
painter0.drawLine(x1,12,x1,18); painter0.drawLine(x1,12,x1,18);
@ -358,8 +357,7 @@ void CPlotter::DrawOverlay() //DrawOverlay()
if(m_nSubMode==2) bw=4*bw; if(m_nSubMode==2) bw=4*bw;
} }
QPen pen0(Qt::green, 3); //Mark Rx Freq with green painter0.setPen(penGreen);
painter0.setPen(pen0);
if(m_mode=="WSPR-2") { //### WSPR-15 code needed here, too ### if(m_mode=="WSPR-2") { //### WSPR-15 code needed here, too ###
x1=XfromFreq(1400); x1=XfromFreq(1400);
x2=XfromFreq(1600); x2=XfromFreq(1600);
@ -368,18 +366,26 @@ void CPlotter::DrawOverlay() //DrawOverlay()
if(m_mode=="JT9" or m_mode=="JT65" or m_mode=="JT9+JT65") { if(m_mode=="JT9" or m_mode=="JT65" or m_mode=="JT9+JT65") {
if(g_single_decode and m_mode=="JT65") { if(g_single_decode and m_mode=="JT65") {
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);
painter0.drawLine(x1,28,x2,28); painter0.drawLine(x1,28,x2,28);
x1=XfromFreq(m_rxFreq); x1=XfromFreq(m_rxFreq);
painter0.drawLine(x1,24,x1,30); painter0.drawLine(x1,24,x1,30);
x3=XfromFreq(m_rxFreq+20.0*bw/65.0);
painter0.setPen(penOrange);
x3=XfromFreq(m_rxFreq+20.0*bw/65.0); //RO
painter0.drawLine(x3,24,x3,30); painter0.drawLine(x3,24,x3,30);
x4=XfromFreq(m_rxFreq+30.0*bw/65.0); x4=XfromFreq(m_rxFreq+30.0*bw/65.0); //RRR
painter0.drawLine(x4,24,x4,30); painter0.drawLine(x4,24,x4,30);
x5=XfromFreq(m_rxFreq+40.0*bw/65.0); x5=XfromFreq(m_rxFreq+40.0*bw/65.0); //73
painter0.drawLine(x5,24,x5,30); painter0.drawLine(x5,24,x5,30);
painter0.setPen(penGreen);
x6=XfromFreq(m_rxFreq+bw); //Highest tone
painter0.drawLine(x6,24,x6,30);
} else { } else {
painter0.setPen(penGreen);
x1=XfromFreq(m_rxFreq); x1=XfromFreq(m_rxFreq);
x2=XfromFreq(m_rxFreq+bw); x2=XfromFreq(m_rxFreq+bw);
painter0.drawLine(x1,24,x1,30); painter0.drawLine(x1,24,x1,30);
@ -390,8 +396,7 @@ void CPlotter::DrawOverlay() //DrawOverlay()
if(m_mode=="JT9" or m_mode=="JT65" or m_mode=="JT9+JT65" or if(m_mode=="JT9" or m_mode=="JT65" or m_mode=="JT9+JT65" or
m_mode.mid(0,4)=="WSPR") { m_mode.mid(0,4)=="WSPR") {
QPen pen1(Qt::red, 3); //Mark Tx freq with red painter0.setPen(penRed);
painter0.setPen(pen1);
x1=XfromFreq(m_txFreq); x1=XfromFreq(m_txFreq);
x2=XfromFreq(m_txFreq+bw); x2=XfromFreq(m_txFreq+bw);
if(m_mode=="WSPR-2") { //### WSPR-15 code needed here, too if(m_mode=="WSPR-2") { //### WSPR-15 code needed here, too
@ -419,8 +424,7 @@ void CPlotter::DrawOverlay() //DrawOverlay()
x1=XfromFreq(f1); x1=XfromFreq(f1);
x2=XfromFreq(f2); x2=XfromFreq(f2);
if(x1<=m_w and x2>=0) { if(x1<=m_w and x2>=0) {
QPen pen1(QColor(255,165,0),3); //Mark WSPR sub-band orange painter0.setPen(penOrange); //Mark WSPR sub-band orange
painter0.setPen(pen1);
painter0.drawLine(x1,9,x2,9); painter0.drawLine(x1,9,x2,9);
} }
} }