w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-23 12:48:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Gradually activating EchoGraph's binsPerPixel.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5562 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2015-06-09 15:41:27 +00:00
parent 816d56056d
commit 83c237cafd
4 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
echograph.cpp
View File

@ -27,8 +27,12 @@ EchoGraph::EchoGraph(QSettings * settings, QWidget *parent) :
ui->echoPlot->setPlotGain(m_settings->value("PlotGain", 0).toInt()); ui->echoPlot->setPlotGain(m_settings->value("PlotGain", 0).toInt());
ui->zeroSlider->setValue(ui->echoPlot->getPlotZero()); ui->zeroSlider->setValue(ui->echoPlot->getPlotZero());
ui->gainSlider->setValue(ui->echoPlot->getPlotGain()); ui->gainSlider->setValue(ui->echoPlot->getPlotGain());
ui->smoothSpinBox->setValue(m_settings->value("Smooth",0).toInt()); int n=m_settings->value("Smooth",0).toInt();
ui->binsPerPixelSpinBox->setValue(m_settings->value("EchoBPP",0).toInt()); ui->echoPlot->m_smooth=n;
ui->smoothSpinBox->setValue(n);
n=m_settings->value("EchoBPP",0).toInt();
ui->echoPlot->m_binsPerPixel=n;
ui->binsPerPixelSpinBox->setValue(n);
ui->echoPlot->m_blue=m_settings->value("BlueCurve",false).toBool(); ui->echoPlot->m_blue=m_settings->value("BlueCurve",false).toBool();
ui->cbBlue->setChecked(ui->echoPlot->m_blue); ui->cbBlue->setChecked(ui->echoPlot->m_blue);
m_settings->endGroup(); m_settings->endGroup();

4
echograph.ui
View File

@ -154,10 +154,10 @@
<item> <item>
<widget class="QSlider" name="zeroSlider"> <widget class="QSlider" name="zeroSlider">
<property name="minimum"> <property name="minimum">
<number>-100</number> <number>-50</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>100</number> <number>150</number>
</property> </property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>

30
echoplot.cpp
View File

@ -53,19 +53,14 @@ void EPlotter::resizeEvent(QResizeEvent* ) //resizeEvent()
m_h = m_Size.height(); m_h = m_Size.height();
m_h1=30; m_h1=30;
m_h2=m_h-m_h1; m_h2=m_h-m_h1;
qDebug() << m_h << m_h1 << m_h2;
m_2DPixmap = QPixmap(m_Size.width(), m_h2); m_2DPixmap = QPixmap(m_Size.width(), m_h2);
m_2DPixmap.fill(Qt::black); m_2DPixmap.fill(Qt::black);
m_OverlayPixmap = QPixmap(m_Size.width(), m_h2); m_OverlayPixmap = QPixmap(m_Size.width(), m_h2);
m_OverlayPixmap.fill(Qt::black); m_OverlayPixmap.fill(Qt::black);
m_2DPixmap.fill(Qt::black); m_2DPixmap.fill(Qt::black);
m_ScalePixmap = QPixmap(m_w,30); m_ScalePixmap = QPixmap(m_w,30);
m_ScalePixmap.fill(Qt::white); m_ScalePixmap.fill(Qt::white);
m_fSpan=m_w*m_fftBinWidth*m_binsPerPixel;
m_fSpan=m_w*m_fftBinWidth;
m_StartFreq=50 * int((-0.5*m_fSpan)/50.0 - 0.5); m_StartFreq=50 * int((-0.5*m_fSpan)/50.0 - 0.5);
} }
DrawOverlay(); DrawOverlay();
@ -98,7 +93,7 @@ void EPlotter::draw() //draw()
QPen penBlue(QColor(0,255,255),1); QPen penBlue(QColor(0,255,255),1);
QPen penRed(Qt::red,1); QPen penRed(Qt::red,1);
j=0; j=0;
int i0=1000 + int(m_StartFreq/m_fftBinWidth); int i0=1000 + int(m_StartFreq/(m_fftBinWidth*m_binsPerPixel));
for(i=0; i<2000; i++) { for(i=0; i<2000; i++) {
blue[i]=echocom_.blue[i]; blue[i]=echocom_.blue[i];
red[i]=echocom_.red[i]; red[i]=echocom_.red[i];
@ -115,7 +110,7 @@ void EPlotter::draw() //draw()
painter2D.setPen(penBlue); painter2D.setPen(penBlue);
j=0; j=0;
for(i=0; i<m_w; i++) { for(i=0; i<m_w; i++) {
y = 0.9*m_h2 - gain*(m_h/10.0)*(blue[i0+i]-1.0) - m_plotZero; y = 0.9*m_h2 - gain*(m_h/10.0)*(blue[i0+i]-1.0) - 0.01*m_h2*m_plotZero;
LineBuf[j].setX(i); LineBuf[j].setX(i);
LineBuf[j].setY(y); LineBuf[j].setY(y);
j++; j++;
@ -126,7 +121,7 @@ void EPlotter::draw() //draw()
painter2D.setPen(penRed); painter2D.setPen(penRed);
j=0; j=0;
for(int i=0; i<m_w; i++) { for(int i=0; i<m_w; i++) {
y = 0.9*m_h2 - gain*(m_h/10.0)*(red[i0+i]-1.0) - m_plotZero; y = 0.9*m_h2 - gain*(m_h/10.0)*(red[i0+i]-1.0) - 0.01*m_h2*m_plotZero;
LineBuf[j].setX(i); LineBuf[j].setX(i);
LineBuf[j].setY(y); LineBuf[j].setY(y);
j++; j++;
@ -153,13 +148,22 @@ void EPlotter::DrawOverlay() //DrawOverlay()
painter.drawRect(0, 0, m_w, m_h2); painter.drawRect(0, 0, m_w, m_h2);
painter.setBrush(Qt::SolidPattern); painter.setBrush(Qt::SolidPattern);
m_fSpan = m_w*m_fftBinWidth; m_fSpan = m_w*m_fftBinWidth*m_binsPerPixel;
m_freqPerDiv=20; m_freqPerDiv=20;
if(m_fSpan>250) m_freqPerDiv=50; if(m_fSpan>250) m_freqPerDiv=50;
float pixPerHdiv = m_freqPerDiv/m_fftBinWidth; if(m_fSpan>500) m_freqPerDiv=100;
if(m_fSpan>1000) m_freqPerDiv=200;
if(m_fSpan>2000) m_freqPerDiv=500;
// m_StartFreq=50 * int((-0.5*m_fSpan)/50.0 - 0.5);
m_StartFreq=m_freqPerDiv * int((-0.5*m_fSpan)/m_freqPerDiv - 0.5);
qDebug() << m_fSpan << m_freqPerDiv << m_StartFreq;
float pixPerHdiv = m_freqPerDiv/(m_fftBinWidth*m_binsPerPixel);
float pixPerVdiv = float(m_h2)/float(VERT_DIVS); float pixPerVdiv = float(m_h2)/float(VERT_DIVS);
m_hdivs = m_w*m_fftBinWidth/m_freqPerDiv + 0.9999; m_hdivs = m_w*m_fftBinWidth*m_binsPerPixel/m_freqPerDiv + 0.9999;
painter.setPen(QPen(Qt::white, 1,Qt::DotLine)); painter.setPen(QPen(Qt::white, 1,Qt::DotLine));
for( int i=1; i<m_hdivs; i++) //draw vertical grids for( int i=1; i<m_hdivs; i++) //draw vertical grids
@ -252,7 +256,7 @@ int EPlotter::XfromFreq(float f) //XfromFreq()
float EPlotter::FreqfromX(int x) //FreqfromX() float EPlotter::FreqfromX(int x) //FreqfromX()
{ {
return float(m_StartFreq + x*m_fftBinWidth); return float(m_StartFreq + x*m_fftBinWidth*m_binsPerPixel);
} }
void EPlotter::SetRunningState(bool running) //SetRunningState() void EPlotter::SetRunningState(bool running) //SetRunningState()

1
widegraph.cpp
View File

@ -266,7 +266,6 @@ void WideGraph::setMode(QString mode) //setMode
ui->widePlot->setMode(mode); ui->widePlot->setMode(mode);
ui->widePlot->DrawOverlay(); ui->widePlot->DrawOverlay();
ui->widePlot->update(); ui->widePlot->update();
qDebug() << "WideGraph::setMode" << m_mode;
} }
void WideGraph::setSubMode(int n) //setSubMode void WideGraph::setSubMode(int n) //setSubMode