Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 5275c0916f | |||
| 676aa3c78e | |||
| 4e8a65b5ee | |||
| 329ca0b23f | |||
| 29cb01697a | |||
| e27e7baec9 | |||
| 9cd17a4441 | |||
| 9d371c474a |
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
# Version number components
|
# Version number components
|
||||||
set (WSJTX_VERSION_MAJOR 0)
|
set (WSJTX_VERSION_MAJOR 0)
|
||||||
set (WSJTX_VERSION_MINOR 7)
|
set (WSJTX_VERSION_MINOR 7)
|
||||||
set (WSJTX_VERSION_PATCH 1)
|
set (WSJTX_VERSION_PATCH 2)
|
||||||
set (WSJTX_RC 0) # release candidate number, comment out or zero for development versions
|
set (WSJTX_RC 0) # release candidate number, comment out or zero for development versions
|
||||||
set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build
|
set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build
|
||||||
|
|||||||
+11
-11
@@ -1087,7 +1087,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// TODO: jsherer - need to remove this eventually...
|
// TODO: jsherer - need to remove this eventually...
|
||||||
QTimer::singleShot (0, this, SLOT (not_GA_warning_message ()));
|
QTimer::singleShot (0, this, SLOT (checkStartupWarnings ()));
|
||||||
|
|
||||||
if(!ui->cbMenus->isChecked()) {
|
if(!ui->cbMenus->isChecked()) {
|
||||||
ui->cbMenus->setChecked(true);
|
ui->cbMenus->setChecked(true);
|
||||||
@@ -1418,21 +1418,18 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
|
|||||||
if (!m_valid) throw std::runtime_error {"Fatal initialization exception"};
|
if (!m_valid) throw std::runtime_error {"Fatal initialization exception"};
|
||||||
}
|
}
|
||||||
|
|
||||||
QDate eol(2018, 10, 29);
|
QDate eol(2018, 10, 31);
|
||||||
|
|
||||||
void MainWindow::expiry_warning_message()
|
void MainWindow::checkExpiryWarningMessage()
|
||||||
{
|
{
|
||||||
if(QDateTime::currentDateTimeUtc().date() > eol){
|
if(QDateTime::currentDateTimeUtc().date() > eol){
|
||||||
MessageBox::critical_message (this, QString("This pre-release development build of JS8Call has expired. Please upgrade to the latest version."));
|
MessageBox::critical_message (this, QString("This pre-release development build of JS8Call has expired. Please upgrade to the latest version."));
|
||||||
close();
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::not_GA_warning_message ()
|
void MainWindow::checkStartupWarnings ()
|
||||||
{
|
{
|
||||||
expiry_warning_message();
|
|
||||||
|
|
||||||
MessageBox::critical_message (this,
|
MessageBox::critical_message (this,
|
||||||
QString("This version of %1 is a pre-release development\n"
|
QString("This version of %1 is a pre-release development\n"
|
||||||
"build and will expire after %2 (UTC), upon which you\n"
|
"build and will expire after %2 (UTC), upon which you\n"
|
||||||
@@ -1441,6 +1438,8 @@ void MainWindow::not_GA_warning_message ()
|
|||||||
"and carry a responsiblity to report any problems to:\n"
|
"and carry a responsiblity to report any problems to:\n"
|
||||||
"Jordan Sherer (KN4CRD) kn4crd@gmail.com\n\n").arg(QApplication::applicationName()).arg(eol.toString()));
|
"Jordan Sherer (KN4CRD) kn4crd@gmail.com\n\n").arg(QApplication::applicationName()).arg(eol.toString()));
|
||||||
|
|
||||||
|
checkExpiryWarningMessage();
|
||||||
|
|
||||||
ensureCallsignSet(false);
|
ensureCallsignSet(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -6362,7 +6361,7 @@ void MainWindow::prepareBeacon(){
|
|||||||
if(m_txBeaconQueue.isEmpty()){
|
if(m_txBeaconQueue.isEmpty()){
|
||||||
lines.append(QString("%1: BEACON %2").arg(mycall).arg(mygrid));
|
lines.append(QString("%1: BEACON %2").arg(mycall).arg(mygrid));
|
||||||
} else {
|
} else {
|
||||||
while(!m_txBeaconQueue.isEmpty() && lines.length() < 2){
|
while(!m_txBeaconQueue.isEmpty() && lines.length() < 1){
|
||||||
lines.append(m_txBeaconQueue.dequeue());
|
lines.append(m_txBeaconQueue.dequeue());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -6412,6 +6411,7 @@ QString MainWindow::calculateDistance(QString const& value, int *pDistance)
|
|||||||
void MainWindow::on_startTxButton_toggled(bool checked)
|
void MainWindow::on_startTxButton_toggled(bool checked)
|
||||||
{
|
{
|
||||||
if(checked){
|
if(checked){
|
||||||
|
checkExpiryWarningMessage();
|
||||||
createMessage(ui->extFreeTextMsgEdit->toPlainText());
|
createMessage(ui->extFreeTextMsgEdit->toPlainText());
|
||||||
startTx();
|
startTx();
|
||||||
} else {
|
} else {
|
||||||
@@ -9284,7 +9284,7 @@ void MainWindow::processCommandActivity() {
|
|||||||
auto d = m_rxCommandQueue.dequeue();
|
auto d = m_rxCommandQueue.dequeue();
|
||||||
|
|
||||||
bool isAllCall = isAllCallIncluded(d.to);
|
bool isAllCall = isAllCallIncluded(d.to);
|
||||||
bool isNear = abs(d.freq - currentFreqOffset()) <= 110; // 100Hz + a 10Hz buffer
|
bool isNear = abs(d.freq - currentFreqOffset()) <= 125; // 100Hz + a 25Hz buffer
|
||||||
bool isGroupCall = isGroupCallIncluded(d.to) && isNear;
|
bool isGroupCall = isGroupCallIncluded(d.to) && isNear;
|
||||||
|
|
||||||
qDebug() << "try processing command" << d.from << d.to << d.cmd << d.freq << d.grid << d.extra;
|
qDebug() << "try processing command" << d.from << d.to << d.cmd << d.freq << d.grid << d.extra;
|
||||||
@@ -10185,8 +10185,8 @@ void MainWindow::displayCallActivity() {
|
|||||||
ui->tableWidgetCalls->setItem(row, 1, new QTableWidgetItem(QString("(%1)").arg(since(d.utcTimestamp))));
|
ui->tableWidgetCalls->setItem(row, 1, new QTableWidgetItem(QString("(%1)").arg(since(d.utcTimestamp))));
|
||||||
ui->tableWidgetCalls->setItem(row, 2, new QTableWidgetItem(QString("%1").arg(d.freq)));
|
ui->tableWidgetCalls->setItem(row, 2, new QTableWidgetItem(QString("%1").arg(d.freq)));
|
||||||
ui->tableWidgetCalls->setItem(row, 3, new QTableWidgetItem(QString("%1").arg(Varicode::formatSNR(d.snr))));
|
ui->tableWidgetCalls->setItem(row, 3, new QTableWidgetItem(QString("%1").arg(Varicode::formatSNR(d.snr))));
|
||||||
auto gridItem = new QTableWidgetItem(QString("%1 ").arg(d.grid.left(4)));
|
auto gridItem = new QTableWidgetItem(QString("%1").arg(d.grid.trimmed().left(4)));
|
||||||
gridItem->setToolTip(d.grid);
|
gridItem->setToolTip(d.grid.trimmed());
|
||||||
ui->tableWidgetCalls->setItem(row, 4, gridItem);
|
ui->tableWidgetCalls->setItem(row, 4, gridItem);
|
||||||
|
|
||||||
auto distanceItem = new QTableWidgetItem(calculateDistance(d.grid));
|
auto distanceItem = new QTableWidgetItem(calculateDistance(d.grid));
|
||||||
|
|||||||
+2
-2
@@ -385,8 +385,8 @@ private slots:
|
|||||||
void on_cbCQTx_toggled(bool b);
|
void on_cbCQTx_toggled(bool b);
|
||||||
void splash_done ();
|
void splash_done ();
|
||||||
void on_measure_check_box_stateChanged (int);
|
void on_measure_check_box_stateChanged (int);
|
||||||
void expiry_warning_message ();
|
void checkExpiryWarningMessage ();
|
||||||
void not_GA_warning_message ();
|
void checkStartupWarnings ();
|
||||||
void clearCallsignSelected();
|
void clearCallsignSelected();
|
||||||
void refreshTextDisplay();
|
void refreshTextDisplay();
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -309,7 +309,7 @@ QPushButton[oob="true"] {
|
|||||||
<string notr="true">QFrame, QLabel { background-color : black; }</string>
|
<string notr="true">QFrame, QLabel { background-color : black; }</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="frameShape">
|
<property name="frameShape">
|
||||||
<enum>QFrame::StyledPanel</enum>
|
<enum>QFrame::NoFrame</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="frameShadow">
|
<property name="frameShadow">
|
||||||
<enum>QFrame::Plain</enum>
|
<enum>QFrame::Plain</enum>
|
||||||
@@ -4588,7 +4588,7 @@ list. The list can be maintained in Settings (F2).</string>
|
|||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>872</width>
|
<width>872</width>
|
||||||
<height>22</height>
|
<height>21</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QMenu" name="menuFile">
|
<widget class="QMenu" name="menuFile">
|
||||||
|
|||||||
@@ -1507,6 +1507,7 @@ QStringList Varicode::buildMessageFrames(
|
|||||||
|
|
||||||
bool lineStartsWithBaseCall = (
|
bool lineStartsWithBaseCall = (
|
||||||
line.startsWith("ALLCALL") ||
|
line.startsWith("ALLCALL") ||
|
||||||
|
line.startsWith("GROUPCALL") ||
|
||||||
line.startsWith("BEACON") ||
|
line.startsWith("BEACON") ||
|
||||||
Varicode::startsWithCQ(line)
|
Varicode::startsWithCQ(line)
|
||||||
);
|
);
|
||||||
@@ -1550,6 +1551,9 @@ QStringList Varicode::buildMessageFrames(
|
|||||||
QString dirNum;
|
QString dirNum;
|
||||||
QString dirFrame = Varicode::packDirectedMessage(line, basecall, &dirTo, &dirCmd, &dirNum, &n);
|
QString dirFrame = Varicode::packDirectedMessage(line, basecall, &dirTo, &dirCmd, &dirNum, &n);
|
||||||
bool dirToCompound = dirTo.contains("/");
|
bool dirToCompound = dirTo.contains("/");
|
||||||
|
if(dirToCompound){
|
||||||
|
qDebug() << "directed message to field is compound" << dirTo;
|
||||||
|
}
|
||||||
|
|
||||||
int m = 0;
|
int m = 0;
|
||||||
QString datFrame = Varicode::packDataMessage(line, &m);
|
QString datFrame = Varicode::packDataMessage(line, &m);
|
||||||
|
|||||||
Reference in New Issue
Block a user