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

Added autoprepend back in

Browse Source
This commit is contained in:
Jordan Sherer 2018-10-26 22:16:48 -04:00
parent 6dfd037736
commit 5c28d154ff
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mainwindow.cpp
View File

@ -5352,7 +5352,7 @@ int MainWindow::currentFreqOffset(){
QStringList MainWindow::buildMessageFrames(const QString &text){ QStringList MainWindow::buildMessageFrames(const QString &text){
// prepare selected callsign for directed message // prepare selected callsign for directed message
//QString selectedCall = callsignSelected(); QString selectedCall = callsignSelected();
// prepare compound // prepare compound
//bool compound = Varicode::isCompoundCallsign(/*Radio::is_compound_callsign(*/m_config.my_callsign()); //bool compound = Varicode::isCompoundCallsign(/*Radio::is_compound_callsign(*/m_config.my_callsign());
@ -5368,7 +5368,7 @@ QStringList MainWindow::buildMessageFrames(const QString &text){
//basecall, //basecall,
mygrid, mygrid,
//compound, //compound,
//selectedCall, selectedCall,
text); text);
#if 0 #if 0
@ -7906,7 +7906,7 @@ void MainWindow::refreshTextDisplay(){
#else #else
// prepare selected callsign for directed message // prepare selected callsign for directed message
//QString selectedCall = callsignSelected(); QString selectedCall = callsignSelected();
//qDebug() << "selected callsign for directed" << selectedCall; //qDebug() << "selected callsign for directed" << selectedCall;
// prepare compound // prepare compound
@ -7923,7 +7923,7 @@ void MainWindow::refreshTextDisplay(){
//basecall, //basecall,
mygrid, mygrid,
//compound, //compound,
//selectedCall, selectedCall,
text text
); );

15
varicode.cpp
View File

@ -1606,13 +1606,13 @@ QStringList Varicode::buildMessageFrames(
//QString const& basecall, //QString const& basecall,
QString const& mygrid, QString const& mygrid,
//bool compound, //bool compound,
//QString const& selectedCall, QString const& selectedCall,
QString const& text QString const& text
){ ){
#define ALLOW_SEND_COMPOUND 1 #define ALLOW_SEND_COMPOUND 1
#define ALLOW_SEND_COMPOUND_DIRECTED 1 #define ALLOW_SEND_COMPOUND_DIRECTED 1
#define AUTO_PREPEND_DIRECTED 0 #define AUTO_PREPEND_DIRECTED 1
#define AUTO_REMOVE_MYCALL 0 #define AUTO_REMOVE_MYCALL 1
bool mycallCompound = Varicode::isCompoundCallsign(mycall); bool mycallCompound = Varicode::isCompoundCallsign(mycall);
@ -1630,9 +1630,6 @@ QStringList Varicode::buildMessageFrames(
if(line.startsWith(mycall + ":") || line.startsWith(mycall + " ")){ if(line.startsWith(mycall + ":") || line.startsWith(mycall + " ")){
line = lstrip(line.mid(mycall.length() + 1)); line = lstrip(line.mid(mycall.length() + 1));
} }
if(line.startsWith(basecall + ":") || line.startsWith(basecall + " ")){
line = lstrip(line.mid(basecall.length() + 1));
}
// remove trailing whitespace as long as there are characters left afterwards // remove trailing whitespace as long as there are characters left afterwards
auto rline = rstrip(line); auto rline = rstrip(line);
@ -1828,14 +1825,14 @@ BuildMessageFramesThread::BuildMessageFramesThread(
//const QString &basecall, //const QString &basecall,
const QString &mygrid, const QString &mygrid,
//bool compound, //bool compound,
//const QString &selectedCall, const QString &selectedCall,
const QString &text, QObject *parent): const QString &text, QObject *parent):
QThread(parent), QThread(parent),
m_mycall{mycall}, m_mycall{mycall},
//m_basecall{basecall}, //m_basecall{basecall},
m_mygrid{mygrid}, m_mygrid{mygrid},
//m_compound{compound}, //m_compound{compound},
//m_selectedCall{selectedCall}, m_selectedCall{selectedCall},
m_text{text} m_text{text}
{ {
} }
@ -1846,7 +1843,7 @@ void BuildMessageFramesThread::run(){
//m_basecall, //m_basecall,
m_mygrid, m_mygrid,
//m_compound, //m_compound,
//m_selectedCall, m_selectedCall,
m_text m_text
); );

6
varicode.h
View File

@ -152,7 +152,7 @@ public:
//QString const& basecall, //QString const& basecall,
QString const& mygrid, QString const& mygrid,
//bool compound, //bool compound,
//QString const& selectedCall, QString const& selectedCall,
QString const& text QString const& text
); );
}; };
@ -166,7 +166,7 @@ public:
//QString const& basecall, //QString const& basecall,
QString const& mygrid, QString const& mygrid,
//bool compound, //bool compound,
//QString const& selectedCall, QString const& selectedCall,
QString const& text, QString const& text,
QObject *parent=nullptr); QObject *parent=nullptr);
void run() override; void run() override;
@ -178,7 +178,7 @@ private:
//QString m_basecall; //QString m_basecall;
QString m_mygrid; QString m_mygrid;
//bool m_compound; //bool m_compound;
//QString m_selectedCall; QString m_selectedCall;
QString m_text; QString m_text;
}; };