w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-09-02 21:27:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

1. Display "best of N" rather than "average of N" in Wide Graph waterfall.

Browse Source 
2. More fixes of widget visibilities.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7175 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-10-13 19:20:24 +00:00
parent 94bbe4ff1a
commit f313ff2a60
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mainwindow.cpp
View File

@ -1420,7 +1420,11 @@ void MainWindow::on_actionSettings_triggered() //Setup Dialog
bool vhf {m_config.enable_VHF_features ()}; bool vhf {m_config.enable_VHF_features ()};
if (!vhf) { if (!vhf) {
ui->sbSubmode->setValue (0); ui->sbSubmode->setValue (0);
if(m_mode=="JT9") ui->sbSubmode->setVisible(false); if(m_mode=="JT4" or m_mode=="JT9" or m_mode=="JT65") {
ui->sbSubmode->setVisible(false);
ui->sbFtol->setVisible(false);
ui->syncSpinBox->setVisible(false);
}
} }
setup_status_bar (vhf); setup_status_bar (vhf);
bool b = vhf && (m_mode=="JT4" or m_mode=="JT65" or m_mode=="ISCAT" or bool b = vhf && (m_mode=="JT4" or m_mode=="JT65" or m_mode=="ISCAT" or
@ -1429,7 +1433,10 @@ void MainWindow::on_actionSettings_triggered() //Setup Dialog
VHF_features_enabled(b); VHF_features_enabled(b);
VHF_controls_visible(b); VHF_controls_visible(b);
} }
if(m_mode=="MSK144" or (m_mode=="JT9" and m_nSubMode<4)) ui->cbFast9->setVisible(false); if(m_mode=="JT4" or (m_mode=="JT9" and m_nSubMode<4) or m_mode=="JT65" or
m_mode=="JT9+JT65" or m_mode=="ISCAT" or m_mode=="MSK144") {
ui->cbFast9->setVisible(false);
}
} }
m_config.transceiver_online (); m_config.transceiver_online ();

2
mainwindow.ui
View File

@ -2765,7 +2765,7 @@ QPushButton[state=&quot;ok&quot;] {
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text"> <property name="text">
<string>WSPR-2</string> <string>WSPR</string>
</property> </property>
</action> </action>
<action name="actionWSPR_15"> <action name="actionWSPR_15">

9
widegraph.cpp
View File

@ -149,7 +149,7 @@ void WideGraph::dataSink2(float s[], float df3, int ihsym, int ndiskdata) //dat
static float splot[NSMAX]; static float splot[NSMAX];
int nbpp = ui->widePlot->binsPerPixel(); int nbpp = ui->widePlot->binsPerPixel();
//Average spectra over specified number, m_waterfallAvg //Average spectra over specified number, m_waterfallAvg
if (m_n==0) { if (m_n==0) {
for (int i=0; i<NSMAX; i++) for (int i=0; i<NSMAX; i++)
splot[i]=s[i]; splot[i]=s[i];
@ -167,11 +167,12 @@ void WideGraph::dataSink2(float s[], float df3, int ihsym, int ndiskdata) //dat
int jz=5000.0/(nbpp*df3); int jz=5000.0/(nbpp*df3);
if(jz>MAX_SCREENSIZE) jz=MAX_SCREENSIZE; if(jz>MAX_SCREENSIZE) jz=MAX_SCREENSIZE;
for (int j=0; j<jz; j++) { for (int j=0; j<jz; j++) {
float sum=0; float ss=0;
for (int k=0; k<nbpp; k++) { for (int k=0; k<nbpp; k++) {
sum += splot[i++]; if(splot[i]>ss) ss=splot[i];
i++;
} }
swide[j]=sum; swide[j]=nbpp*ss;
} }
// Time according to this computer // Time according to this computer