w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-07-06 11:55:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Increase range of report spinbox in MSK144 to -8 --> +24 dB. Limit the yellow click-to-decode bar to max at TRperiod.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7084 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-09-15 17:06:49 +00:00
parent 2402fa8fa8
commit c8d795df0a
5 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fastgraph.cpp
View File

@ -83,6 +83,12 @@ void FastGraph::on_greenZeroSlider_valueChanged(int value)
ui->fastPlot->draw(); ui->fastPlot->draw();
} }
void FastGraph::setTRperiod(int n)
{
m_TRperiod=n;
ui->fastPlot->setTRperiod(m_TRperiod);
}
void FastGraph::on_pbAutoLevel_clicked() void FastGraph::on_pbAutoLevel_clicked()
{ {
float sum=0.0; float sum=0.0;

2
fastgraph.h
View File

@ -23,6 +23,7 @@ public:
void plotSpec(); void plotSpec();
void saveSettings(); void saveSettings();
void setTRperiod(int n);
signals: signals:
void fastPick(int x0, int x1, int y); void fastPick(int x0, int x1, int y);
@ -36,6 +37,7 @@ private slots:
private: private:
QSettings * m_settings; QSettings * m_settings;
float m_ave; float m_ave;
qint32 m_TRperiod;
QScopedPointer<Ui::FastGraph> ui; QScopedPointer<Ui::FastGraph> ui;
}; };

9
fastplot.cpp
View File

@ -129,6 +129,12 @@ void FPlotter::setGreenZero(int n)
m_bPaint2=true; m_bPaint2=true;
} }
void FPlotter::setTRperiod(int n)
{
m_TRperiod=n;
}
void FPlotter::draw() //draw() void FPlotter::draw() //draw()
{ {
QPainter painter1(&m_HorizPixmap); QPainter painter1(&m_HorizPixmap);
@ -214,7 +220,10 @@ void FPlotter::mousePressEvent(QMouseEvent *event) //mousePressEvent
QPainter painter(&m_HorizPixmap); QPainter painter(&m_HorizPixmap);
int x0=x-n*m_pixPerSecond; int x0=x-n*m_pixPerSecond;
int x1=x+n*m_pixPerSecond; int x1=x+n*m_pixPerSecond;
int xmax=m_TRperiod*m_pixPerSecond;
if(x0 < 0) x0=0; if(x0 < 0) x0=0;
qDebug() << "a" << xmax;
if(x1 > xmax) x1=xmax;
if(x1 > 702) x1=702; if(x1 > 702) x1=702;
Q_EMIT fastPick (x0,x1,y); Q_EMIT fastPick (x0,x1,y);
int y0=64; int y0=64;

2
fastplot.h
View File

@ -32,6 +32,7 @@ public:
void setPlotZero(int plotZero); void setPlotZero(int plotZero);
void setPlotGain(int plotGain); void setPlotGain(int plotGain);
void setGreenZero(int n); void setGreenZero(int n);
void setTRperiod(int n);
void drawScale(); void drawScale();
signals: signals:
@ -65,6 +66,7 @@ private:
qint32 m_h2; qint32 m_h2;
QPixmap m_HorizPixmap; QPixmap m_HorizPixmap;
qint32 m_jh0; qint32 m_jh0;
qint32 m_TRperiod;
bool m_bPaint2; bool m_bPaint2;
}; };

5
mainwindow.cpp
View File

@ -3973,8 +3973,8 @@ void MainWindow::on_actionMSK144_triggered()
ui->cbShMsgs->setVisible(true); ui->cbShMsgs->setVisible(true);
ui->actionMSK144->setChecked(true); ui->actionMSK144->setChecked(true);
ui->rptSpinBox->setMinimum(-3); ui->rptSpinBox->setMinimum(-8);
ui->rptSpinBox->setMaximum(16); ui->rptSpinBox->setMaximum(24);
ui->rptSpinBox->setValue(0); ui->rptSpinBox->setValue(0);
ui->rptSpinBox->setSingleStep(1); ui->rptSpinBox->setSingleStep(1);
ui->sbFtol->setMinimum(23); ui->sbFtol->setMinimum(23);
@ -5161,6 +5161,7 @@ void MainWindow::on_sbTR_valueChanged(int index)
m_modulator->setPeriod(m_TRperiod); // TODO - not thread safe m_modulator->setPeriod(m_TRperiod); // TODO - not thread safe
m_detector->setPeriod(m_TRperiod); // TODO - not thread safe m_detector->setPeriod(m_TRperiod); // TODO - not thread safe
m_wideGraph->setPeriod(m_TRperiod,m_nsps); m_wideGraph->setPeriod(m_TRperiod,m_nsps);
m_fastGraph->setTRperiod(m_TRperiod);
} }
void MainWindow::on_sbSubmode_valueChanged(int n) void MainWindow::on_sbSubmode_valueChanged(int n)