w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-06-09 01:14:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improved, simplified sort routine; faster and better "flatten"

Browse Source 
procedure; better window functions for some FFTs, resulting in
better decoder performance; User-selectable colors for backgrounds
of decoded messages.  NB: more testing is desirable!



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4951 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor
2015-02-11 00:50:35 +00:00
parent d8075a758e
commit d91aed5aee
18 changed files with 494 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plotter.cpp
+20 -9
View File
@@ -90,7 +90,7 @@ void CPlotter::draw(float swide[]) //draw()
int j,j0,y2;
float y;
double gain = pow(10.0,0.05*(m_plotGain+7));
double gain = pow(10.0,0.05*m_plotGain);
//move current data down one line (must do this before attaching a QPainter object)
m_WaterfallPixmap.scroll(0,1,0,0,m_w,m_h1);
@@ -108,27 +108,32 @@ void CPlotter::draw(float swide[]) //draw()
j=0;
j0=int(m_startFreq/m_fftBinWidth + 0.5);
int iz=XfromFreq(5000.0);
int jz=iz*m_binsPerPixel;
m_fMax=FreqfromX(iz);
flat4_(swide,&iz,&m_Flatten);
flat4_(&jt9com_.savg[j0],&jz,&m_Flatten);
for(int i=0; i<iz; i++) {
if(i>iz) swide[i]=0;
y=0.0;
if(swide[i]>0.0) y = 10.0*log10(swide[i]);
int y1 = 5.0*gain*y + 10*(m_plotZero-4);
y=swide[i];
int y1 = 10.0*gain*y + 10*m_plotZero +40;
if (y1<0) y1=0;
if (y1>254) y1=254;
if (swide[i]>1.e29) y1=255;
painter1.setPen(m_ColorTbl[y1]);
painter1.drawPoint(i,0);
y2=0;
if(m_bCurrent) y2 = 0.4*gain*y - 15;
if(m_bCurrent) y2 = gain*y - 15;
if(m_bCumulative) {
float sum=0.0;
int j=j0+m_binsPerPixel*i;
for(int k=0; k<m_binsPerPixel; k++) {
sum+=jt9com_.savg[j++];
}
y2=gain*6.0*log10(sum/m_binsPerPixel) - 10.0;
y2 += m_plotZero;
y2=1.3*gain*sum/m_binsPerPixel + m_plotZero - 15;
if(m_Flatten==0) y2 += 40;
}
if(m_bLinearAvg) {
@@ -137,7 +142,7 @@ void CPlotter::draw(float swide[]) //draw()
for(int k=0; k<m_binsPerPixel; k++) {
sum+=jt9w_.syellow[j++];
}
y2=sum/m_binsPerPixel * (0.2*m_h/50.0) - 20.0;
y2=gain*sum/m_binsPerPixel * (m_h/50.0) - 20.0;
}
if(i==iz-1) painter2D.drawPolyline(LineBuf,j);
@@ -470,3 +475,9 @@ void CPlotter::setDialFreq(double d)
DrawOverlay();
update();
}
void CPlotter::setFlatten(bool b)
{
m_Flatten=0;
if(b) m_Flatten=1;
}