w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-06-11 18:28:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes from branches/wsjtx_w back into branches/wsjtx.

Browse Source 
Note to developers: Not sure about the makefiles...


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3835 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor
2014-03-05 18:20:40 +00:00
parent 9d3ccab76e
commit 7fe8901149
20 changed files with 710 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plotter.cpp
+16 -2
View File
@@ -96,7 +96,11 @@ void CPlotter::draw(float swide[]) //draw()
m_2DPixmap = m_OverlayPixmap.copy(0,0,m_w,m_h2);
QPainter painter2D(&m_2DPixmap);
painter2D.setPen(Qt::green);
if(m_bLinearAvg) {
painter2D.setPen(Qt::yellow);
} else {
painter2D.setPen(Qt::green);
}
QPoint LineBuf[MAX_SCREENSIZE];
j=0;
@@ -122,8 +126,18 @@ void CPlotter::draw(float swide[]) //draw()
sum+=jt9com_.savg[j++];
}
y2=gain*6.0*log10(sum/m_binsPerPixel) - 10.0;
y2 += m_plotZero;
}
y2 += m_plotZero;
if(m_bLinearAvg) {
float sum=0.0;
int j=j0+m_binsPerPixel*i;
for(int k=0; k<m_binsPerPixel; k++) {
sum+=jt9w_.syellow[j++];
}
y2=sum/m_binsPerPixel * (0.2*m_h/50.0) - 20.0;
}
if(i==iz-1) painter2D.drawPolyline(LineBuf,j);
LineBuf[j].setX(i);
LineBuf[j].setY(m_h-(y2+0.8*m_h));