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

Cleanup of build frames and a note for later

Browse Source
This commit is contained in:
Jordan Sherer 2019-01-02 12:36:25 -05:00
parent cc9ecf0f47
commit 4f226b0c11
3 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mainwindow.cpp
View File

@ -5741,6 +5741,8 @@ void MainWindow::createMessageTransmitQueue(QString const& text){
lines.append(dt.message()); lines.append(dt.message());
} }
// TODO: jsherer - parse outgoing message so we can add it to the inbox as an outgoing message
displayTextForFreq(lines.join("") + " \u2301 ", freq, DriftingDateTime::currentDateTimeUtc(), true, true, true); displayTextForFreq(lines.join("") + " \u2301 ", freq, DriftingDateTime::currentDateTimeUtc(), true, true, true);
// if we're transmitting a message to be displayed, we should bump the repeat buttons... // if we're transmitting a message to be displayed, we should bump the repeat buttons...
@ -5823,19 +5825,12 @@ QList<QPair<QString, int>> MainWindow::buildMessageFrames(const QString &text){
QString selectedCall = callsignSelected(); QString selectedCall = callsignSelected();
// prepare compound // prepare compound
//bool compound = Varicode::isCompoundCallsign(/*Radio::is_compound_callsign(*/m_config.my_callsign());
QString mycall = m_config.my_callsign(); QString mycall = m_config.my_callsign();
QString mygrid = m_config.my_grid().left(4); QString mygrid = m_config.my_grid().left(4);
// QString basecall = Radio::base_callsign(m_config.my_callsign());
// if(basecall != mycall){
// basecall = "<....>";
// }
auto frames = Varicode::buildMessageFrames( auto frames = Varicode::buildMessageFrames(
mycall, mycall,
//basecall,
mygrid, mygrid,
//compound,
selectedCall, selectedCall,
text); text);

8
varicode.cpp
View File

@ -1651,9 +1651,7 @@ QString Varicode::unpackDataMessage(const QString &text){
// TODO: remove the dependence on providing all this data? // TODO: remove the dependence on providing all this data?
QList<QPair<QString, int>> Varicode::buildMessageFrames( QList<QPair<QString, int>> Varicode::buildMessageFrames(
QString const& mycall, QString const& mycall,
//QString const& basecall,
QString const& mygrid, QString const& mygrid,
//bool compound,
QString const& selectedCall, QString const& selectedCall,
QString const& text QString const& text
){ ){
@ -1878,16 +1876,12 @@ QList<QPair<QString, int>> Varicode::buildMessageFrames(
BuildMessageFramesThread::BuildMessageFramesThread( BuildMessageFramesThread::BuildMessageFramesThread(
const QString &mycall, const QString &mycall,
//const QString &basecall,
const QString &mygrid, const QString &mygrid,
//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_mygrid{mygrid}, m_mygrid{mygrid},
//m_compound{compound},
m_selectedCall{selectedCall}, m_selectedCall{selectedCall},
m_text{text} m_text{text}
{ {
@ -1896,9 +1890,7 @@ BuildMessageFramesThread::BuildMessageFramesThread(
void BuildMessageFramesThread::run(){ void BuildMessageFramesThread::run(){
auto results = Varicode::buildMessageFrames( auto results = Varicode::buildMessageFrames(
m_mycall, m_mycall,
//m_basecall,
m_mygrid, m_mygrid,
//m_compound,
m_selectedCall, m_selectedCall,
m_text m_text
); );

6
varicode.h
View File

@ -157,9 +157,7 @@ public:
static QList<QPair<QString, int>> buildMessageFrames( static QList<QPair<QString, int>> buildMessageFrames(
QString const& mycall, QString const& mycall,
//QString const& basecall,
QString const& mygrid, QString const& mygrid,
//bool compound,
QString const& selectedCall, QString const& selectedCall,
QString const& text QString const& text
); );
@ -171,9 +169,7 @@ class BuildMessageFramesThread : public QThread
Q_OBJECT Q_OBJECT
public: public:
BuildMessageFramesThread(QString const& mycall, BuildMessageFramesThread(QString const& mycall,
//QString const& basecall,
QString const& mygrid, QString const& mygrid,
//bool compound,
QString const& selectedCall, QString const& selectedCall,
QString const& text, QString const& text,
QObject *parent=nullptr); QObject *parent=nullptr);
@ -183,9 +179,7 @@ signals:
private: private:
QString m_mycall; QString m_mycall;
//QString m_basecall;
QString m_mygrid; QString m_mygrid;
//bool m_compound;
QString m_selectedCall; QString m_selectedCall;
QString m_text; QString m_text;
}; };