diff --git a/mainwindow.cpp b/mainwindow.cpp
index 26d591b5e..bba6a4e3a 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -867,7 +867,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
m_bDisplayedOnce=false;
m_wait=0;
m_isort=-3;
- m_max_N=10;
m_min_dB=-30;
m_max_dB=30;
m_CQtype="CQ";
@@ -996,7 +995,8 @@ void MainWindow::writeSettings()
m_settings->setValue("FoxSortRandom",ui->rbRandom->isChecked());
m_settings->setValue("FoxSortReverse",ui->cbReverse->isChecked());
m_settings->setValue("FoxNsig",ui->sbNsig->value());
-
+ m_settings->setValue("FoxNslots",ui->sbNslots->value());
+ m_settings->setValue("FoxMaxDB",ui->sbMax_dB->value());
m_settings->endGroup();
m_settings->beginGroup("Common");
@@ -1070,7 +1070,9 @@ void MainWindow::readSettings()
ui->rbDist->setChecked(m_settings->value("FoxSortDist",false).toBool());
ui->rbRandom->setChecked(m_settings->value("FoxSortRandom",false).toBool());
ui->cbReverse->setChecked(m_settings->value("FoxSortReverse",true).toBool());
- ui->sbNsig->setValue(m_settings->value("FoxNsig",5).toInt());
+ ui->sbNsig->setValue(m_settings->value("FoxNsig",12).toInt());
+ ui->sbNslots->setValue(m_settings->value("FoxNslots",5).toInt());
+ ui->sbMax_dB->setValue(m_settings->value("FoxMaxDB",30).toInt());
m_settings->endGroup();
// do this outside of settings group because it uses groups internally
@@ -3454,7 +3456,7 @@ void MainWindow::guiUpdate()
}
if(m_config.bFox()) {
QString t;
- t.sprintf("DXpedition: Fox %d %d %d %d",m_isort,m_max_N,
+ t.sprintf("DXpedition: Fox %d %d %d %d",m_isort,m_Nsig,
m_min_dB,m_max_dB);
ui->labDXped->setText(t);
}
@@ -3828,7 +3830,7 @@ void MainWindow::doubleClickOnCall(Qt::KeyboardModifiers modifiers)
}
if(m_config.bFox() and m_decodedText2) {
- if(m_nToBeCalled >= m_Nsig or m_nFoxCallers==0) return;
+ if(m_nToBeCalled >= m_Nslots or m_nFoxCallers==0) return;
QString t=cursor.block().text();
QString c2=t.split(" ",QString::SkipEmptyParts).at(0);
if(ui->textBrowser3->toPlainText().indexOf(c2) >= 0) return;
@@ -3847,6 +3849,7 @@ void MainWindow::doubleClickOnCall(Qt::KeyboardModifiers modifiers)
QString t1=c2 + " ";
QString t2=rpt;
if(rpt.mid(0,1) != "-") t2="+" + rpt;
+ if(t2.length()==2) t2=t2.mid(0,1) + "0" + t2.mid(1,1);
t1=t1.mid(0,7) + t2;
t2.sprintf("%1d. ",m_nToBeCalled);
t1=t2 + t1;
@@ -7105,8 +7108,8 @@ QString MainWindow::sortFoxCalls(QString t, int isort, int min_dB, int max_dB)
int i0=t.indexOf("\n") + 1;
m_nFoxCallers=0;
- if(i0 > 0) m_nFoxCallers=qMin(t.length(),m_max_N*i0)/i0;
- m_FoxCallers=t.mid(0,m_max_N*i0);
+ if(i0 > 0) m_nFoxCallers=qMin(t.length(),m_Nsig*i0)/i0;
+ m_FoxCallers=t.mid(0,m_Nsig*i0);
return m_FoxCallers;
}
@@ -7143,4 +7146,12 @@ void MainWindow::on_sbNsig_valueChanged(int n)
m_Nsig=n;
}
+void MainWindow::on_sbNslots_valueChanged(int n)
+{
+ m_Nslots=n;
+}
+void MainWindow::on_sbMax_dB_valueChanged(int n)
+{
+ m_max_dB=n;
+}
diff --git a/mainwindow.h b/mainwindow.h
index 8712b2a72..952761de4 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -288,6 +288,8 @@ private slots:
void on_rbDist_toggled(bool b);
void on_rbRandom_toggled(bool b);
void on_sbNsig_valueChanged(int n);
+ void on_sbNslots_valueChanged(int n);
+ void on_sbMax_dB_valueChanged(int n);
private:
Q_SIGNAL void initializeAudioOutputStream (QAudioDeviceInfo,
@@ -415,12 +417,12 @@ private:
qint32 m_wait;
qint32 m_i3bit;
qint32 m_isort;
- qint32 m_max_N;
qint32 m_max_dB;
qint32 m_min_dB;
qint32 m_nFoxCallers=0;
qint32 m_nToBeCalled=0;
- qint32 m_Nsig=5;
+ qint32 m_Nsig=12;
+ qint32 m_Nslots=5;
bool m_btxok; //True if OK to transmit
bool m_diskData;
diff --git a/mainwindow.ui b/mainwindow.ui
index 8c5b133da..08cac543f 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -1637,8 +1637,8 @@ list. The list can be maintained in Settings (F2).
10
100
- 131
- 91
+ 221
+ 101
@@ -1647,10 +1647,10 @@ list. The list can be maintained in Settings (F2).
- 10
+ 11
20
- 113
- 65
+ 201
+ 74
@@ -1671,6 +1671,22 @@ list. The list can be maintained in Settings (F2).
+ -
+
+
+ Nsigs
+
+
+ 5
+
+
+ 20
+
+
+ 12
+
+
+
-
@@ -1685,6 +1701,25 @@ list. The list can be maintained in Settings (F2).
+ -
+
+
+
+
+
+ Nslots
+
+
+ 1
+
+
+ 5
+
+
+ 5
+
+
+
-
@@ -1699,31 +1734,25 @@ list. The list can be maintained in Settings (F2).
+ -
+
+
+ Max dB
+
+
+ -15
+
+
+ 30
+
+
+ 30
+
+
+
-
-
-
- 150
- 140
- 61
- 22
-
-
-
- Nsig:
-
-
- 1
-
-
- 5
-
-
- 5
-
-