Compare commits

..

8 Commits

Author SHA1 Message Date
Jordan Sherer 5275c0916f Fixed window frame on windows 2018-10-07 11:30:02 -04:00
Jordan Sherer 676aa3c78e Don't close the app when expired...just be really annoying 2018-10-07 11:01:01 -04:00
Jordan Sherer 4e8a65b5ee Move EOL to Oct 31 2018-10-07 10:52:03 -04:00
Jordan Sherer 329ca0b23f Bump to 0.7.2 2018-10-07 10:51:30 -04:00
Jordan Sherer 29cb01697a Bump to 25Hz buffer 2018-10-07 10:51:08 -04:00
Jordan Sherer e27e7baec9 Added groupcall to compound parsing. 2018-10-07 08:44:47 -04:00
Jordan Sherer 9cd17a4441 Only one beacon ack per frame 2018-10-06 23:37:32 -04:00
Jordan Sherer 9d371c474a Fixed truncated grid issue 2018-10-06 23:28:00 -04:00
5 changed files with 21 additions and 17 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
# Version number components
set (WSJTX_VERSION_MAJOR 0)
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_VERSION_IS_RELEASE 0) # set to 1 for final release build
+12 -12
View File
@@ -1087,7 +1087,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
*/
// 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()) {
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"};
}
QDate eol(2018, 10, 29);
QDate eol(2018, 10, 31);
void MainWindow::expiry_warning_message()
void MainWindow::checkExpiryWarningMessage()
{
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."));
close();
return;
}
}
void MainWindow::not_GA_warning_message ()
void MainWindow::checkStartupWarnings ()
{
expiry_warning_message();
MessageBox::critical_message (this,
QString("This version of %1 is a pre-release development\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"
"Jordan Sherer (KN4CRD) kn4crd@gmail.com\n\n").arg(QApplication::applicationName()).arg(eol.toString()));
checkExpiryWarningMessage();
ensureCallsignSet(false);
}
@@ -1475,7 +1474,7 @@ void MainWindow::initializeDummyData(){
cd.snr = i == 3 ? -100 : i;
cd.ackTimestamp = i == 1 ? dt.addSecs(-900) : QDateTime{};
cd.utcTimestamp = dt;
cd.grid = i == 5 ? "J042" : i == 6 ? "FN42FN42FN" : "";
cd.grid = i == 5 ? "J042" : i == 6 ? " FN42FN42FN" : "";
logCallActivity(cd, false);
ActivityDetail ad = {};
@@ -6362,7 +6361,7 @@ void MainWindow::prepareBeacon(){
if(m_txBeaconQueue.isEmpty()){
lines.append(QString("%1: BEACON %2").arg(mycall).arg(mygrid));
} else {
while(!m_txBeaconQueue.isEmpty() && lines.length() < 2){
while(!m_txBeaconQueue.isEmpty() && lines.length() < 1){
lines.append(m_txBeaconQueue.dequeue());
}
}
@@ -6412,6 +6411,7 @@ QString MainWindow::calculateDistance(QString const& value, int *pDistance)
void MainWindow::on_startTxButton_toggled(bool checked)
{
if(checked){
checkExpiryWarningMessage();
createMessage(ui->extFreeTextMsgEdit->toPlainText());
startTx();
} else {
@@ -9284,7 +9284,7 @@ void MainWindow::processCommandActivity() {
auto d = m_rxCommandQueue.dequeue();
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;
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, 2, new QTableWidgetItem(QString("%1").arg(d.freq)));
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)));
gridItem->setToolTip(d.grid);
auto gridItem = new QTableWidgetItem(QString("%1").arg(d.grid.trimmed().left(4)));
gridItem->setToolTip(d.grid.trimmed());
ui->tableWidgetCalls->setItem(row, 4, gridItem);
auto distanceItem = new QTableWidgetItem(calculateDistance(d.grid));
+2 -2
View File
@@ -385,8 +385,8 @@ private slots:
void on_cbCQTx_toggled(bool b);
void splash_done ();
void on_measure_check_box_stateChanged (int);
void expiry_warning_message ();
void not_GA_warning_message ();
void checkExpiryWarningMessage ();
void checkStartupWarnings ();
void clearCallsignSelected();
void refreshTextDisplay();
+2 -2
View File
@@ -309,7 +309,7 @@ QPushButton[oob=&quot;true&quot;] {
<string notr="true">QFrame, QLabel { background-color : black; }</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
@@ -4588,7 +4588,7 @@ list. The list can be maintained in Settings (F2).</string>
<x>0</x>
<y>0</y>
<width>872</width>
<height>22</height>
<height>21</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
+4
View File
@@ -1507,6 +1507,7 @@ QStringList Varicode::buildMessageFrames(
bool lineStartsWithBaseCall = (
line.startsWith("ALLCALL") ||
line.startsWith("GROUPCALL") ||
line.startsWith("BEACON") ||
Varicode::startsWithCQ(line)
);
@@ -1550,6 +1551,9 @@ QStringList Varicode::buildMessageFrames(
QString dirNum;
QString dirFrame = Varicode::packDirectedMessage(line, basecall, &dirTo, &dirCmd, &dirNum, &n);
bool dirToCompound = dirTo.contains("/");
if(dirToCompound){
qDebug() << "directed message to field is compound" << dirTo;
}
int m = 0;
QString datFrame = Varicode::packDataMessage(line, &m);