Another try at getting the plot scaling correct. (May still have

some dependence on plot window's height?)


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2661 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2012-10-11 20:41:05 +00:00
parent 35f24869f7
commit 82b1f9ce15
3 changed files with 10 additions and 10 deletions

View File

@ -143,9 +143,12 @@ subroutine symspec(k,ntrperiod,nsps,ndiskdat,nb,nbslider,pxdb,s,f0a,df3, &
call pctile(ssum,iz,50,xmed1)
savg(1:iz)=ssum(1:iz)/xmed1
! if(ihsym.ge.1) then
! write(71,3003) ihsym,ave0,xmed0,smax0,ave1,xmed1,smax1
!3003 format(i3,6f12.6)
! if(ihsym.eq.160) then
! rewind 71
! do i=1,iz
! write(71,3003) 1000+i*df3,savg(i)
!3003 format(2f12.3)
! enddo
! flush(71)
! endif

View File

@ -1,4 +1,4 @@
//--------------------------------------------------------------- MainWindow
//-------------------------------------------------------------- MainWindow
#include "mainwindow.h"
#include "ui_mainwindow.h"
#include "devsetup.h"

View File

@ -125,11 +125,7 @@ void CPlotter::draw(float swide[], int i0) //draw()
painter1.setPen(m_ColorTbl[y1]);
painter1.drawPoint(i,0);
int y2 = gain*y + 30;
if(!m_bCurrent) y2=5.0*gain*jt9com_.savg[i] + 20;
if (y2<0) y2=0;
if (y2>254) y2=254;
if (swide[i]>1.e29) y2=255;
if(!m_bCurrent) y2=gain*10.0*log10(jt9com_.savg[i]);
if(strong != strong0 or i==m_w-1) {
painter2D.drawPolyline(LineBuf,j);
j=0;
@ -138,8 +134,9 @@ void CPlotter::draw(float swide[], int i0) //draw()
if(!strong0) painter2D.setPen(Qt::green);
}
LineBuf[j].setX(i);
LineBuf[j].setY(m_h-(y2+180));
// y2 = m_h*float(i)/m_w;
// if(m_line==10) qDebug() << i << FreqfromX(i) << m_h << y2 << m_h-y2;
LineBuf[j].setY(m_h-(y2+0.8*m_h));
j++;
}