w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-16 09:01:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-2.3.0' into develop

Browse Source
This commit is contained in:
Bill Somerville 2020-12-19 19:54:12 +00:00
commit ab3dc7acc7
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
widgets/widegraph.cpp
View File

@ -13,12 +13,6 @@
#include "SettingsGroup.hpp" #include "SettingsGroup.hpp"
#include "moc_widegraph.cpp" #include "moc_widegraph.cpp"
namespace
{
auto user_defined = QObject::tr ("User Defined");
float swide[MAX_SCREENSIZE];
}
WideGraph::WideGraph(QSettings * settings, QWidget *parent) : WideGraph::WideGraph(QSettings * settings, QWidget *parent) :
QDialog(parent), QDialog(parent),
ui(new Ui::WideGraph), ui(new Ui::WideGraph),
@ -26,7 +20,8 @@ WideGraph::WideGraph(QSettings * settings, QWidget *parent) :
m_palettes_path {":/Palettes"}, m_palettes_path {":/Palettes"},
m_tr0 {0.0}, m_tr0 {0.0},
m_n {0}, m_n {0},
m_bHaveTransmitted {false} m_bHaveTransmitted {false},
m_user_defined {tr ("User Defined")}
{ {
ui->setupUi(this); ui->setupUi(this);
@ -103,8 +98,8 @@ WideGraph::WideGraph(QSettings * settings, QWidget *parent) :
if(t==m_waterfallPalette) ui->paletteComboBox->setCurrentIndex(index); if(t==m_waterfallPalette) ui->paletteComboBox->setCurrentIndex(index);
index++; index++;
} }
ui->paletteComboBox->addItem (user_defined); ui->paletteComboBox->addItem (m_user_defined);
if (user_defined == m_waterfallPalette) ui->paletteComboBox->setCurrentIndex(index); if (m_user_defined == m_waterfallPalette) ui->paletteComboBox->setCurrentIndex(index);
readPalette (); readPalette ();
} }
@ -147,7 +142,7 @@ void WideGraph::saveSettings() //saveS
void WideGraph::drawRed(int ia, int ib) void WideGraph::drawRed(int ia, int ib)
{ {
ui->widePlot->drawRed(ia,ib,swide); ui->widePlot->drawRed(ia,ib,m_swide);
} }
void WideGraph::dataSink2(float s[], float df3, int ihsym, int ndiskdata) //dataSink2 void WideGraph::dataSink2(float s[], float df3, int ihsym, int ndiskdata) //dataSink2
@ -181,8 +176,8 @@ void WideGraph::dataSink2(float s[], float df3, int ihsym, int ndiskdata) //dat
ss += sp; ss += sp;
smax=qMax(smax,sp); smax=qMax(smax,sp);
} }
// swide[j]=nbpp*smax; // m_swide[j]=nbpp*smax;
swide[j]=nbpp*ss; m_swide[j]=nbpp*ss;
} }
// Time according to this computer // Time according to this computer
@ -192,7 +187,7 @@ void WideGraph::dataSink2(float s[], float df3, int ihsym, int ndiskdata) //dat
float flagValue=1.0e30; float flagValue=1.0e30;
if(m_bHaveTransmitted) flagValue=2.0e30; if(m_bHaveTransmitted) flagValue=2.0e30;
for(int i=0; i<MAX_SCREENSIZE; i++) { for(int i=0; i<MAX_SCREENSIZE; i++) {
swide[i] = flagValue; m_swide[i] = flagValue;
} }
for(int i=0; i<NSMAX; i++) { for(int i=0; i<NSMAX; i++) {
splot[i] = flagValue; splot[i] = flagValue;
@ -200,7 +195,7 @@ void WideGraph::dataSink2(float s[], float df3, int ihsym, int ndiskdata) //dat
m_bHaveTransmitted=false; m_bHaveTransmitted=false;
} }
m_tr0=tr; m_tr0=tr;
ui->widePlot->draw(swide,true,false); ui->widePlot->draw(m_swide,true,false);
} }
} }
@ -238,7 +233,7 @@ void WideGraph::keyPressEvent(QKeyEvent *e) //F1
void WideGraph::setRxFreq(int n) //setRxFreq void WideGraph::setRxFreq(int n) //setRxFreq
{ {
ui->widePlot->setRxFreq(n); ui->widePlot->setRxFreq(n);
ui->widePlot->draw(swide,false,false); ui->widePlot->draw(m_swide,false,false);
} }
int WideGraph::rxFreq() //rxFreq int WideGraph::rxFreq() //rxFreq
@ -384,7 +379,7 @@ void WideGraph::readPalette () //readPalette
{ {
try try
{ {
if (user_defined == m_waterfallPalette) if (m_user_defined == m_waterfallPalette)
{ {
ui->widePlot->setColours (WFPalette {m_userPalette}.interpolate ()); ui->widePlot->setColours (WFPalette {m_userPalette}.interpolate ());
} }
@ -437,7 +432,7 @@ void WideGraph::on_adjust_palette_push_button_clicked (bool) //Adjust Palette
{ {
if (m_userPalette.design ()) if (m_userPalette.design ())
{ {
m_waterfallPalette = user_defined; m_waterfallPalette = m_user_defined;
ui->paletteComboBox->setCurrentText (m_waterfallPalette); ui->paletteComboBox->setCurrentText (m_waterfallPalette);
readPalette (); readPalette ();
} }
@ -479,8 +474,8 @@ void WideGraph::on_gain2dSlider_valueChanged(int value) //Gain2
{ {
ui->widePlot->setPlot2dGain(value); ui->widePlot->setPlot2dGain(value);
if(ui->widePlot->scaleOK ()) { if(ui->widePlot->scaleOK ()) {
ui->widePlot->draw(swide,false,false); ui->widePlot->draw(m_swide,false,false);
if(m_mode=="QRA64") ui->widePlot->draw(swide,false,true); if(m_mode=="QRA64") ui->widePlot->draw(m_swide,false,true);
} }
} }
@ -488,8 +483,8 @@ void WideGraph::on_zero2dSlider_valueChanged(int value) //Zero2
{ {
ui->widePlot->setPlot2dZero(value); ui->widePlot->setPlot2dZero(value);
if(ui->widePlot->scaleOK ()) { if(ui->widePlot->scaleOK ()) {
ui->widePlot->draw(swide,false,false); ui->widePlot->draw(m_swide,false,false);
if(m_mode=="QRA64") ui->widePlot->draw(swide,false,true); if(m_mode=="QRA64") ui->widePlot->draw(m_swide,false,true);
} }
} }

2
widgets/widegraph.h
View File

@ -117,6 +117,8 @@ private:
QString m_mode; QString m_mode;
QString m_modeTx; QString m_modeTx;
QString m_waterfallPalette; QString m_waterfallPalette;
float m_swide[MAX_SCREENSIZE];
QString m_user_defined;
}; };
#endif // WIDEGRAPH_H #endif // WIDEGRAPH_H