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

Set fQSO; code cleanup. 

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2616 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2012-09-29 17:52:35 +00:00
parent 57ba22e00d
commit e7d0b0e4d6
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mainwindow.cpp
View File

@ -947,6 +947,7 @@ void MainWindow::guiUpdate()
ui->monitorButton->setStyleSheet(""); ui->monitorButton->setStyleSheet("");
} }
lab2->setText("QSO Freq: " + QString::number(g_pWideGraph->QSOfreq()));
lab3->setText("Freeze DF: " + QString::number(g_pWideGraph->DF())); lab3->setText("Freeze DF: " + QString::number(g_pWideGraph->DF()));
if(m_startAnother) { if(m_startAnother) {

15
plotter.cpp
View File

@ -58,7 +58,6 @@ void CPlotter::resizeEvent(QResizeEvent* ) //resizeEvent()
m_2DPixmap = QPixmap(w,h); m_2DPixmap = QPixmap(w,h);
m_WaterfallPixmap.fill(Qt::black); m_WaterfallPixmap.fill(Qt::black);
m_2DPixmap.fill(Qt::black); m_2DPixmap.fill(Qt::black);
memset(m_zwf,0,NSMAX*h);
m_ScalePixmap = QPixmap(w,30); m_ScalePixmap = QPixmap(w,30);
m_LowerScalePixmap = QPixmap(w,30); //(no change on resize...) m_LowerScalePixmap = QPixmap(w,30); //(no change on resize...)
m_ScalePixmap.fill(Qt::white); m_ScalePixmap.fill(Qt::white);
@ -97,7 +96,6 @@ void CPlotter::draw(float swide[], int i0, float splot[]) //draw()
//move current data down one line //move current data down one line
//(must do this before attaching a QPainter object) //(must do this before attaching a QPainter object)
m_WaterfallPixmap.scroll(0,1,0,0,w,h); m_WaterfallPixmap.scroll(0,1,0,0,w,h);
memmove(&m_zwf[32768],m_zwf,32768*(h-1));
QPainter painter1(&m_WaterfallPixmap); QPainter painter1(&m_WaterfallPixmap);
QPainter painter2D(&m_2DPixmap); QPainter painter2D(&m_2DPixmap);
@ -106,7 +104,6 @@ void CPlotter::draw(float swide[], int i0, float splot[]) //draw()
m_hist2[i]=0; m_hist2[i]=0;
} }
// qDebug() << "A" << m_binsPerPixel << m_nSpan << m_fSpan;
painter2D.setPen(Qt::green); painter2D.setPen(Qt::green);
QRect tmp(0,0,w,h); QRect tmp(0,0,w,h);
painter2D.fillRect(tmp,Qt::black); painter2D.fillRect(tmp,Qt::black);
@ -152,7 +149,6 @@ void CPlotter::draw(float swide[], int i0, float splot[]) //draw()
if (y1>254) y1=254; if (y1>254) y1=254;
if (splot[i]>1.e29) y1=255; if (splot[i]>1.e29) y1=255;
m_hist2[y1]++; m_hist2[y1]++;
m_zwf[i]=y1;
} }
if(swide[0]>1.0e29) m_line=0; if(swide[0]>1.0e29) m_line=0;
@ -202,9 +198,9 @@ void CPlotter::DrawOverlay() //DrawOverlay()
painter0.setFont(Font); painter0.setFont(Font);
painter0.setPen(Qt::black); painter0.setPen(Qt::black);
double fftBinWidth=12000.0/m_nsps; m_fftBinWidth=12000.0/m_nsps;
if(m_binsPerPixel < 1) m_binsPerPixel=1; if(m_binsPerPixel < 1) m_binsPerPixel=1;
double df = m_binsPerPixel*fftBinWidth; double df = m_binsPerPixel*m_fftBinWidth;
m_fSpan = w*df; m_fSpan = w*df;
// m_freqPerDiv=50*m_binsPerPixel; // m_freqPerDiv=50*m_binsPerPixel;
// m_freqPerDiv=nHzDiv[m_binsPerPixel]; // m_freqPerDiv=nHzDiv[m_binsPerPixel];
@ -214,7 +210,6 @@ void CPlotter::DrawOverlay() //DrawOverlay()
if(n>70) m_freqPerDiv=100; if(n>70) m_freqPerDiv=100;
if(n>250) m_freqPerDiv=500; if(n>250) m_freqPerDiv=500;
m_hdivs = w*df/m_freqPerDiv + 0.9999; m_hdivs = w*df/m_freqPerDiv + 0.9999;
// qDebug() << "B" << m_binsPerPixel << df << m_freqPerDiv << pixperdiv << m_hdivs << m_fSpan;
m_ScalePixmap.fill(Qt::white); m_ScalePixmap.fill(Qt::white);
painter0.drawRect(0, 0, w, 30); painter0.drawRect(0, 0, w, 30);
@ -275,11 +270,9 @@ void CPlotter::DrawOverlay() //DrawOverlay()
painter3.setPen(Qt::black); painter3.setPen(Qt::black);
df = 12000.0/m_nsps; df = 12000.0/m_nsps;
m_hdivs = 4400*df/m_freqPerDiv + 0.9999;
int nlabs=df*w/m_freqPerDiv + 1.0; int nlabs=df*w/m_freqPerDiv + 1.0;
m_LowerScalePixmap.fill(Qt::white); m_LowerScalePixmap.fill(Qt::white);
painter3.drawRect(0, 0, w, 30); painter3.drawRect(0, 0, w, 30);
pixperdiv = m_freqPerDiv/df; pixperdiv = m_freqPerDiv/df;
for( int i=0; i<10*nlabs; i++) { for( int i=0; i<10*nlabs; i++) {
x = i*pixperdiv/10; x = i*pixperdiv/10;
@ -321,9 +314,7 @@ int CPlotter::XfromFreq(float f) //XfromFreq()
float CPlotter::FreqfromX(int x) //FreqfromX() float CPlotter::FreqfromX(int x) //FreqfromX()
{ {
float w = m_WaterfallPixmap.width(); return float(1000.0 + m_fftBinWidth*x);
float f =m_CenterFreq - 0.5*m_fSpan + m_fSpan * x/w;
return f;
} }
void CPlotter::SetRunningState(bool running) //SetRunningState() void CPlotter::SetRunningState(bool running) //SetRunningState()

2
plotter.h
View File

@ -85,7 +85,6 @@ private:
QPixmap m_WaterfallPixmap; QPixmap m_WaterfallPixmap;
QPixmap m_2DPixmap; QPixmap m_2DPixmap;
unsigned char m_zwf[32768*400];
QPixmap m_ScalePixmap; QPixmap m_ScalePixmap;
QPixmap m_LowerScalePixmap; QPixmap m_LowerScalePixmap;
QSize m_Size; QSize m_Size;
@ -96,6 +95,7 @@ private:
bool m_2Dspec; bool m_2Dspec;
double m_CenterFreq; double m_CenterFreq;
double m_fGreen; double m_fGreen;
double m_fftBinWidth;
qint64 m_StartFreq; qint64 m_StartFreq;
qint32 m_dBStepSize; qint32 m_dBStepSize;
qint32 m_FreqUnits; qint32 m_FreqUnits;