VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-25 01:18:38 -05:00
Code Issues Projects Releases Wiki Activity

Fix server compilation. Update docs.

Browse Source
This commit is contained in:
Jon Beniston 2024-10-11 11:15:34 +01:00
parent 4455ac0c55
commit 944803a276
7 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
doc/img/PagerDemod_plugin.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
doc/img/PagerDemod_plugin_notifications.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB

56
plugins/channelrx/demodpager/pagerdemodgui.cpp
View File

@ -55,15 +55,15 @@ void PagerDemodGUI::resizeTable()
// Trailing spaces are for sort arrow // Trailing spaces are for sort arrow
int row = ui->messages->rowCount(); int row = ui->messages->rowCount();
ui->messages->setRowCount(row + 1); ui->messages->setRowCount(row + 1);
ui->messages->setItem(row, MESSAGE_COL_DATE, new QTableWidgetItem("Fri Apr 15 2016--")); ui->messages->setItem(row, PagerDemodSettings::MESSAGE_COL_DATE, new QTableWidgetItem("Fri Apr 15 2016--"));
ui->messages->setItem(row, MESSAGE_COL_TIME, new QTableWidgetItem("10:17:00")); ui->messages->setItem(row, PagerDemodSettings::MESSAGE_COL_TIME, new QTableWidgetItem("10:17:00"));
ui->messages->setItem(row, MESSAGE_COL_ADDRESS, new QTableWidgetItem("1000000")); ui->messages->setItem(row, PagerDemodSettings::MESSAGE_COL_ADDRESS, new QTableWidgetItem("1000000"));
ui->messages->setItem(row, MESSAGE_COL_MESSAGE, new QTableWidgetItem("ABCEDGHIJKLMNOPQRSTUVWXYZABCEDGHIJKLMNOPQRSTUVWXYZ")); ui->messages->setItem(row, PagerDemodSettings::MESSAGE_COL_MESSAGE, new QTableWidgetItem("ABCEDGHIJKLMNOPQRSTUVWXYZABCEDGHIJKLMNOPQRSTUVWXYZ"));
ui->messages->setItem(row, MESSAGE_COL_FUNCTION, new QTableWidgetItem("0")); ui->messages->setItem(row, PagerDemodSettings::MESSAGE_COL_FUNCTION, new QTableWidgetItem("0"));
ui->messages->setItem(row, MESSAGE_COL_ALPHA, new QTableWidgetItem("ABCEDGHIJKLMNOPQRSTUVWXYZABCEDGHIJKLMNOPQRSTUVWXYZ")); ui->messages->setItem(row, PagerDemodSettings::MESSAGE_COL_ALPHA, new QTableWidgetItem("ABCEDGHIJKLMNOPQRSTUVWXYZABCEDGHIJKLMNOPQRSTUVWXYZ"));
ui->messages->setItem(row, MESSAGE_COL_NUMERIC, new QTableWidgetItem("123456789123456789123456789123456789123456789123456789")); ui->messages->setItem(row, PagerDemodSettings::MESSAGE_COL_NUMERIC, new QTableWidgetItem("123456789123456789123456789123456789123456789123456789"));
ui->messages->setItem(row, MESSAGE_COL_EVEN_PE, new QTableWidgetItem("0")); ui->messages->setItem(row, PagerDemodSettings::MESSAGE_COL_EVEN_PE, new QTableWidgetItem("0"));
ui->messages->setItem(row, MESSAGE_COL_BCH_PE, new QTableWidgetItem("0")); ui->messages->setItem(row, PagerDemodSettings::MESSAGE_COL_BCH_PE, new QTableWidgetItem("0"));
ui->messages->resizeColumnsToContents(); ui->messages->resizeColumnsToContents();
ui->messages->removeRow(row); ui->messages->removeRow(row);
} }
@ -233,8 +233,8 @@ void PagerDemodGUI::messageReceived(const QDateTime dateTime, int address, int f
int startRow = m_settings.m_duplicateMatchLastOnly ? ui->messages->rowCount() - 1 : 0; int startRow = m_settings.m_duplicateMatchLastOnly ? ui->messages->rowCount() - 1 : 0;
for (int row = startRow; row < ui->messages->rowCount(); row++) for (int row = startRow; row < ui->messages->rowCount(); row++)
{ {
QString prevAddress = ui->messages->item(row, MESSAGE_COL_ADDRESS)->text(); QString prevAddress = ui->messages->item(row, PagerDemodSettings::MESSAGE_COL_ADDRESS)->text();
QString prevMessage = ui->messages->item(row, MESSAGE_COL_MESSAGE)->text(); QString prevMessage = ui->messages->item(row, PagerDemodSettings::MESSAGE_COL_MESSAGE)->text();
if ((message == prevMessage) && (m_settings.m_duplicateMatchMessageOnly || (addressString == prevAddress))) if ((message == prevMessage) && (m_settings.m_duplicateMatchMessageOnly || (addressString == prevAddress)))
{ {
@ -262,15 +262,15 @@ void PagerDemodGUI::messageReceived(const QDateTime dateTime, int address, int f
QTableWidgetItem *numericItem = new QTableWidgetItem(); QTableWidgetItem *numericItem = new QTableWidgetItem();
QTableWidgetItem *evenPEItem = new QTableWidgetItem(); QTableWidgetItem *evenPEItem = new QTableWidgetItem();
QTableWidgetItem *bchPEItem = new QTableWidgetItem(); QTableWidgetItem *bchPEItem = new QTableWidgetItem();
ui->messages->setItem(row, MESSAGE_COL_DATE, dateItem); ui->messages->setItem(row, PagerDemodSettings::MESSAGE_COL_DATE, dateItem);
ui->messages->setItem(row, MESSAGE_COL_TIME, timeItem); ui->messages->setItem(row, PagerDemodSettings::MESSAGE_COL_TIME, timeItem);
ui->messages->setItem(row, MESSAGE_COL_ADDRESS, addressItem); ui->messages->setItem(row, PagerDemodSettings::MESSAGE_COL_ADDRESS, addressItem);
ui->messages->setItem(row, MESSAGE_COL_MESSAGE, messageItem); ui->messages->setItem(row, PagerDemodSettings::MESSAGE_COL_MESSAGE, messageItem);
ui->messages->setItem(row, MESSAGE_COL_FUNCTION, functionItem); ui->messages->setItem(row, PagerDemodSettings::MESSAGE_COL_FUNCTION, functionItem);
ui->messages->setItem(row, MESSAGE_COL_ALPHA, alphaItem); ui->messages->setItem(row, PagerDemodSettings::MESSAGE_COL_ALPHA, alphaItem);
ui->messages->setItem(row, MESSAGE_COL_NUMERIC, numericItem); ui->messages->setItem(row, PagerDemodSettings::MESSAGE_COL_NUMERIC, numericItem);
ui->messages->setItem(row, MESSAGE_COL_EVEN_PE, evenPEItem); ui->messages->setItem(row, PagerDemodSettings::MESSAGE_COL_EVEN_PE, evenPEItem);
ui->messages->setItem(row, MESSAGE_COL_BCH_PE, bchPEItem); ui->messages->setItem(row, PagerDemodSettings::MESSAGE_COL_BCH_PE, bchPEItem);
dateItem->setText(dateTime.date().toString()); dateItem->setText(dateTime.date().toString());
timeItem->setText(dateTime.time().toString()); timeItem->setText(dateTime.time().toString());
addressItem->setText(addressString); addressItem->setText(addressString);
@ -434,7 +434,7 @@ void PagerDemodGUI::filterRow(int row)
if (m_settings.m_filterAddress != "") if (m_settings.m_filterAddress != "")
{ {
QRegExp re(m_settings.m_filterAddress); QRegExp re(m_settings.m_filterAddress);
QTableWidgetItem *fromItem = ui->messages->item(row, MESSAGE_COL_ADDRESS); QTableWidgetItem *fromItem = ui->messages->item(row, PagerDemodSettings::MESSAGE_COL_ADDRESS);
if (!re.exactMatch(fromItem->text())) { if (!re.exactMatch(fromItem->text())) {
hidden = true; hidden = true;
} }
@ -921,18 +921,18 @@ void PagerDemodGUI::enableSpeechIfNeeded()
void PagerDemodGUI::checkNotification(int row) void PagerDemodGUI::checkNotification(int row)
{ {
QString address = ui->messages->item(row, MESSAGE_COL_ADDRESS)->text(); QString address = ui->messages->item(row, PagerDemodSettings::MESSAGE_COL_ADDRESS)->text();
QString message = ui->messages->item(row, MESSAGE_COL_MESSAGE)->text(); QString message = ui->messages->item(row, PagerDemodSettings::MESSAGE_COL_MESSAGE)->text();
for (int i = 0; i < m_settings.m_notificationSettings.size(); i++) for (int i = 0; i < m_settings.m_notificationSettings.size(); i++)
{ {
QString match; QString match;
switch (m_settings.m_notificationSettings[i]->m_matchColumn) switch (m_settings.m_notificationSettings[i]->m_matchColumn)
{ {
case MESSAGE_COL_ADDRESS: case PagerDemodSettings::MESSAGE_COL_ADDRESS:
match = address; match = address;
break; break;
case MESSAGE_COL_MESSAGE: case PagerDemodSettings::MESSAGE_COL_MESSAGE:
match = message; match = message;
break; break;
} }
@ -944,7 +944,7 @@ void PagerDemodGUI::checkNotification(int row)
if (matchResult.hasMatch()) if (matchResult.hasMatch())
{ {
if (m_settings.m_notificationSettings[i]->m_highlight) { if (m_settings.m_notificationSettings[i]->m_highlight) {
ui->messages->item(row, MESSAGE_COL_MESSAGE)->setTextColor(m_settings.m_notificationSettings[i]->m_highlightColor); ui->messages->item(row, PagerDemodSettings::MESSAGE_COL_MESSAGE)->setTextColor(m_settings.m_notificationSettings[i]->m_highlightColor);
} }
if (!m_settings.m_notificationSettings[i]->m_speech.isEmpty()) if (!m_settings.m_notificationSettings[i]->m_speech.isEmpty())
@ -968,8 +968,8 @@ void PagerDemodGUI::checkNotification(int row)
{ {
QDateTime dateTime; QDateTime dateTime;
dateTime.setDate(QDate::fromString(ui->messages->item(row, MESSAGE_COL_DATE)->text())); dateTime.setDate(QDate::fromString(ui->messages->item(row, PagerDemodSettings::MESSAGE_COL_DATE)->text()));
dateTime.setTime(QTime::fromString(ui->messages->item(row, MESSAGE_COL_TIME)->text())); dateTime.setTime(QTime::fromString(ui->messages->item(row, PagerDemodSettings::MESSAGE_COL_TIME)->text()));
sendToMap(address, message, latitude, longitude, dateTime); sendToMap(address, message, latitude, longitude, dateTime);
} }

11
plugins/channelrx/demodpager/pagerdemodgui.h
View File

@ -46,17 +46,6 @@ class PagerDemodGUI : public ChannelGUI {
Q_OBJECT Q_OBJECT
public: public:
enum MessageCol {
MESSAGE_COL_DATE,
MESSAGE_COL_TIME,
MESSAGE_COL_ADDRESS,
MESSAGE_COL_MESSAGE,
MESSAGE_COL_FUNCTION,
MESSAGE_COL_ALPHA,
MESSAGE_COL_NUMERIC,
MESSAGE_COL_EVEN_PE,
MESSAGE_COL_BCH_PE
};
static PagerDemodGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); static PagerDemodGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel);
virtual void destroy(); virtual void destroy();

4
plugins/channelrx/demodpager/pagerdemodnotificationdialog.cpp
View File

@ -28,7 +28,7 @@
// Map main table column numbers to combo box indices // Map main table column numbers to combo box indices
std::vector<int> PagerDemodNotificationDialog::m_columnMap = { std::vector<int> PagerDemodNotificationDialog::m_columnMap = {
PagerDemodGUI::MESSAGE_COL_ADDRESS, PagerDemodGUI::MESSAGE_COL_MESSAGE PagerDemodSettings::MESSAGE_COL_ADDRESS, PagerDemodSettings::MESSAGE_COL_MESSAGE
}; };
PagerDemodNotificationDialog::PagerDemodNotificationDialog(PagerDemodSettings *settings, PagerDemodNotificationDialog::PagerDemodNotificationDialog(PagerDemodSettings *settings,
@ -76,7 +76,7 @@ void PagerDemodNotificationDialog::accept()
void PagerDemodNotificationDialog::resizeTable() void PagerDemodNotificationDialog::resizeTable()
{ {
PagerDemodSettings::NotificationSettings dummy; PagerDemodSettings::NotificationSettings dummy;
dummy.m_matchColumn = PagerDemodGUI::MESSAGE_COL_ADDRESS; dummy.m_matchColumn = PagerDemodSettings::MESSAGE_COL_ADDRESS;
dummy.m_regExp = "1234567"; dummy.m_regExp = "1234567";
dummy.m_speech = "${message}"; dummy.m_speech = "${message}";
dummy.m_command = "cmail.exe -to:user@host.com \"-subject: Paging ${address}\" \"-body: ${message}\""; dummy.m_command = "cmail.exe -to:user@host.com \"-subject: Paging ${address}\" \"-body: ${message}\"";

3
plugins/channelrx/demodpager/pagerdemodsettings.cpp
View File

@ -25,7 +25,6 @@
#include "util/simpleserializer.h" #include "util/simpleserializer.h"
#include "settings/serializable.h" #include "settings/serializable.h"
#include "pagerdemodsettings.h" #include "pagerdemodsettings.h"
#include "pagerdemodgui.h"
PagerDemodSettings::PagerDemodSettings() : PagerDemodSettings::PagerDemodSettings() :
m_channelMarker(nullptr), m_channelMarker(nullptr),
@ -255,7 +254,7 @@ void PagerDemodSettings::deserializeIntList(const QByteArray& data, QList<qint32
} }
PagerDemodSettings::NotificationSettings::NotificationSettings() : PagerDemodSettings::NotificationSettings::NotificationSettings() :
m_matchColumn(PagerDemodGUI::MESSAGE_COL_ADDRESS), m_matchColumn(PagerDemodSettings::MESSAGE_COL_ADDRESS),
m_highlight(false), m_highlight(false),
m_highlightColor(Qt::red), m_highlightColor(Qt::red),
m_plotOnMap(false) m_plotOnMap(false)

12
plugins/channelrx/demodpager/pagerdemodsettings.h
View File

@ -34,6 +34,18 @@ class Serializable;
struct PagerDemodSettings struct PagerDemodSettings
{ {
enum MessageCol {
MESSAGE_COL_DATE,
MESSAGE_COL_TIME,
MESSAGE_COL_ADDRESS,
MESSAGE_COL_MESSAGE,
MESSAGE_COL_FUNCTION,
MESSAGE_COL_ALPHA,
MESSAGE_COL_NUMERIC,
MESSAGE_COL_EVEN_PE,
MESSAGE_COL_BCH_PE
};
struct NotificationSettings { struct NotificationSettings {
int m_matchColumn; int m_matchColumn;
QString m_regExp; QString m_regExp;