chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed macros menu

Browse Source
This commit is contained in:
Jordan Sherer 2018-07-09 21:49:38 -04:00
parent eb062fb0b8
commit ec568966c8
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Configuration.cpp
View File

@ -1347,7 +1347,9 @@ void Configuration::impl::read_settings ()
tx_QSY_allowed_ = settings_->value ("TxQSYAllowed", false).toBool (); tx_QSY_allowed_ = settings_->value ("TxQSYAllowed", false).toBool ();
use_dynamic_grid_ = settings_->value ("AutoGrid", false).toBool (); use_dynamic_grid_ = settings_->value ("AutoGrid", false).toBool ();
macros_.setStringList (settings_->value ("Macros", QStringList {"TNX 73 GL"}).toStringList ()); auto loadedMacros = settings_->value ("Macros", QStringList {"TNX 73 GL"}).toStringList();
macros_.setStringList (loadedMacros);
region_ = settings_->value ("Region", QVariant::fromValue (IARURegions::ALL)).value<IARURegions::Region> (); region_ = settings_->value ("Region", QVariant::fromValue (IARURegions::ALL)).value<IARURegions::Region> ();

21
mainwindow.cpp
View File

@ -719,10 +719,10 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
//ui->extFreeTextMsg->setValidator (new QRegExpValidator {message_alphabet, this}); //ui->extFreeTextMsg->setValidator (new QRegExpValidator {message_alphabet, this});
// Free text macros model to widget hook up. // Free text macros model to widget hook up.
ui->tx5->setModel (m_config.macros ()); //ui->tx5->setModel (m_config.macros ());
connect (ui->tx5->lineEdit(), &QLineEdit::editingFinished, //connect (ui->tx5->lineEdit(), &QLineEdit::editingFinished,
[this] () {on_tx5_currentTextChanged (ui->tx5->lineEdit()->text());}); // [this] () {on_tx5_currentTextChanged (ui->tx5->lineEdit()->text());});
ui->freeTextMsg->setModel (m_config.macros ()); //ui->freeTextMsg->setModel (m_config.macros ());
connect (ui->freeTextMsg->lineEdit () connect (ui->freeTextMsg->lineEdit ()
, &QLineEdit::editingFinished , &QLineEdit::editingFinished
, [this] () {on_freeTextMsg_currentTextChanged (ui->freeTextMsg->lineEdit ()->text ());}); , [this] () {on_freeTextMsg_currentTextChanged (ui->freeTextMsg->lineEdit ()->text ());});
@ -3092,11 +3092,7 @@ void MainWindow::readFromStdout() //readFromStdout
m_config.ppfx(),(ui->cbCQonly->isVisible() and ui->cbCQonly->isChecked())); m_config.ppfx(),(ui->cbCQonly->isVisible() and ui->cbCQonly->isChecked()));
// TODO: parse decode... // TODO: parse decode...
//ui->textEditRXAll->append(decodedtext.messageWords().first().trimmed()); if(decodedtext.messageWords().length() > 0){
//ui->tableWidgetRXAll->insertRow(ui->tableWidgetRXAll->rowCount());
//ui->tableWidgetRXAll->setItem(ui->tableWidgetRXAll->rowCount()-1, 0, new QTableWidgetItem(QString("%1").arg(decodedtext.frequencyOffset())));
//ui->tableWidgetRXAll->setItem(ui->tableWidgetRXAll->rowCount()-1, 1, new QTableWidgetItem(decodedtext.messageWords().first().trimmed()));
if(decodedtext.messageWords().length() > 0){
int offset = decodedtext.frequencyOffset(); int offset = decodedtext.frequencyOffset();
if(!m_bandActivity.contains(offset)){ if(!m_bandActivity.contains(offset)){
@ -3110,6 +3106,7 @@ void MainWindow::readFromStdout() //readFromStdout
} }
ActivityDetail d; ActivityDetail d;
d.isLowConfidence = decodedtext.isLowConfidence();
d.isFree = !decodedtext.isStandardMessage(); d.isFree = !decodedtext.isStandardMessage();
d.firstCall = decodedtext.CQersCall(); d.firstCall = decodedtext.CQersCall();
if(d.firstCall.isEmpty()){ if(d.firstCall.isEmpty()){
@ -6641,7 +6638,7 @@ void MainWindow::on_snrMacroButton_clicked(){
} }
} }
void MainWindow::on_macrosMacroButton_clicked(){ void MainWindow::on_macrosMacroButton_pressed(){
if(m_config.macros()->stringList().isEmpty()){ if(m_config.macros()->stringList().isEmpty()){
on_actionSettings_triggered(); on_actionSettings_triggered();
return; return;
@ -7641,6 +7638,7 @@ void MainWindow::displayActivity(){
clearTableWidget(ui->tableWidgetRXAll); clearTableWidget(ui->tableWidgetRXAll);
QList<int> keys = m_bandActivity.keys(); QList<int> keys = m_bandActivity.keys();
// sort directed messages first
qSort(keys.begin(), keys.end(), [this](const int left, int right){ qSort(keys.begin(), keys.end(), [this](const int left, int right){
if(m_rxDirectedCache.contains(left/10*10)){ if(m_rxDirectedCache.contains(left/10*10)){
return true; return true;
@ -7663,6 +7661,9 @@ void MainWindow::displayActivity(){
if(item.text.isEmpty()){ if(item.text.isEmpty()){
continue; continue;
} }
if(item.isLowConfidence){
item.text = QString("[%1]").arg(item.text);
}
text.append(item.text); text.append(item.text);
snr = item.snr; snr = item.snr;
} }

3
mainwindow.h
View File

@ -239,7 +239,7 @@ private slots:
void on_replyMacroButton_clicked(); void on_replyMacroButton_clicked();
void on_qthMacroButton_clicked(); void on_qthMacroButton_clicked();
void on_snrMacroButton_clicked(); void on_snrMacroButton_clicked();
void on_macrosMacroButton_clicked(); void on_macrosMacroButton_pressed();
void on_tableWidgetRXAll_cellClicked(int row, int col); void on_tableWidgetRXAll_cellClicked(int row, int col);
void on_tableWidgetRXAll_cellDoubleClicked(int row, int col); void on_tableWidgetRXAll_cellDoubleClicked(int row, int col);
void on_tableWidgetRXAll_selectionChanged(const QItemSelection &selected, const QItemSelection &deselected); void on_tableWidgetRXAll_selectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
@ -643,6 +643,7 @@ private:
struct ActivityDetail struct ActivityDetail
{ {
bool isFree; bool isFree;
bool isLowConfidence;
QString firstCall; QString firstCall;
QString secondCall; QString secondCall;
int freq; int freq;