diff --git a/lib/symspec.f90 b/lib/symspec.f90 index dccc08ff9..24855141a 100644 --- a/lib/symspec.f90 +++ b/lib/symspec.f90 @@ -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 diff --git a/mainwindow.cpp b/mainwindow.cpp index 02dc35acc..cc8131ff1 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//--------------------------------------------------------------- MainWindow +//-------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h" diff --git a/plotter.cpp b/plotter.cpp index 58c1ab789..d489f3e2a 100644 --- a/plotter.cpp +++ b/plotter.cpp @@ -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++; }