w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More progress. 

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2601 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2012-09-26 18:45:10 +00:00
parent 3589018463
commit a4db2a4c30
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
getfile.cpp
View File

@ -19,7 +19,7 @@ void getfile(QString fname, int ntrperiod)
fread(jt8com_.d2,1,44,fp);
int nrd=fread(jt8com_.d2,2,npts,fp);
fclose(fp);
for(int i=0; i<npts; i++) jt8com_.d2[i]/=100;
// for(int i=0; i<npts; i++) jt8com_.d2[i]/=100;
}
}

2
mainwindow.cpp
View File

@ -360,7 +360,7 @@ void MainWindow::dataSink(int k)
ntr0=ntr;
n=0;
}
if(ihsym == 184) {
if(ihsym == 179) {
jt8com_.newdat=1;
jt8com_.nagain=0;
QDateTime t = QDateTime::currentDateTimeUtc();

13
plotter.cpp
View File

@ -259,12 +259,11 @@ void CPlotter::DrawOverlay() //DrawOverlay()
painter0.setPen(Qt::black);
double fftBinWidth=12000.0/m_nsps;
// m_binsPerPixel = m_nSpan * 32768.0/(w*0.001*m_fSample) + 0.5;
m_binsPerPixel = (m_nSpan/fftBinWidth)/w + 0.5;
if(m_binsPerPixel < 1) m_binsPerPixel=1;
double FreqPerDiv=50.0;
double df = m_binsPerPixel*fftBinWidth;
// qDebug() << "A" << fftBinWidth << m_binsPerPixel << df;
m_hdivs = w*df/FreqPerDiv + 0.9999;
m_fSpan = w*df;
m_ScalePixmap.fill(Qt::white);
@ -332,10 +331,10 @@ void CPlotter::DrawOverlay() //DrawOverlay()
painter3.setFont(Font);
painter3.setPen(Qt::black);
FreqPerDiv=0.2;
df = 0.001*m_fSample/32768.0;
m_hdivs = 32768*df/FreqPerDiv + 0.9999;
int nlabs=df*w/0.2 + 1.0;
FreqPerDiv=100;
df = 12000.0/m_nsps;
m_hdivs = 4400*df/FreqPerDiv + 0.9999;
int nlabs=df*w/FreqPerDiv + 1.0;
m_ZoomScalePixmap.fill(Qt::white);
painter3.drawRect(0, 0, w, 30);
@ -343,7 +342,7 @@ void CPlotter::DrawOverlay() //DrawOverlay()
for( int i=0; i<10*nlabs; i++) {
x = i*pixperdiv/10;
y=24;
if ((i%5) == 0) y=18;
if ((i%10) == 0) y=18;
painter3.drawLine(x,y,x,30);
}

6
widegraph.cpp
View File

@ -106,9 +106,9 @@ void WideGraph::dataSink2(float s[], int nkhz, int ihsym, int ndiskdata,
int w=ui->widePlot->plotWidth();
// qint64 sf = nkhz + ui->widePlot->freqOffset() - 0.5*w*nbpp*df/1000.0;
// if(sf != ui->widePlot->startFreq()) ui->widePlot->SetStartFreq(sf);
int i0=16384.0+(ui->widePlot->startFreq()-nkhz+1.27046+0.001*m_fCal) *
1000.0/df + 0.5;
i0=0; //###
// int i0=16384.0+(ui->widePlot->startFreq()-nkhz+1.27046+0.001*m_fCal) *
// 1000.0/df + 0.5;
int i0=0; //###
nbpp=1; //###
int i=i0;
for (int j=0; j<2048; j++) {