From b11a653480c8c14df7c8e1e8607c811a24383369 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 1 Nov 2017 20:32:27 +0000 Subject: [PATCH] Move selected calls to 'to be called'. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8207 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- foxcalls.cpp | 28 ++++++++++++++++++++++++---- foxcalls.h | 3 +++ 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/foxcalls.cpp b/foxcalls.cpp index 93cbecf2e..8217209e4 100644 --- a/foxcalls.cpp +++ b/foxcalls.cpp @@ -20,7 +20,8 @@ FoxCalls::FoxCalls(QSettings * settings, QWidget *parent) : restoreGeometry (m_settings->value("geometry").toByteArray()); ui->cbReverse->setVisible(false); ui->foxPlainTextEdit->setReadOnly (true); -// connect (ui->foxPlainTextEdit,SIGNAL(selectCallsign(bool)),this,SLOT(selectCall2(bool))); + ui->foxPlainTextEdit->viewport()->installEventFilter(this); + m_nToBeCalled=0; } FoxCalls::~FoxCalls() @@ -45,7 +46,7 @@ void FoxCalls::saveSettings() void FoxCalls::insertText(QString t) { QMap map; - QStringList lines,lines2; + QStringList lines; QString msg,c2,t1; QString ABC{"ABCDEFGHIJKLMNOPQRSTUVWXYZ"}; QList list; @@ -59,6 +60,8 @@ void FoxCalls::insertText(QString t) doc->setDefaultFont(font); ui->label_2->setFont(font); ui->label_2->setText("Call Grid dB Freq Age"); + ui->pteToBeCalled->setFont(font); + ui->pteCalled->setFont(font); m_bFirst=false; } @@ -95,7 +98,7 @@ void FoxCalls::insertText(QString t) } list.insert(j,n); - lines2.insert(j,map[a]); + m_lines2.insert(j,map[a]); j++; } } @@ -112,7 +115,7 @@ void FoxCalls::insertText(QString t) for(i=0; ifoxPlainTextEdit || obj==ui->foxPlainTextEdit->viewport()) && + e->type() == QEvent::MouseButtonPress) { + QMouseEvent *me= static_cast(e); + int i=int(0.05592*me->y()+0.5) - 1; + QString t3=m_lines2.at(i); + t3=t3.split(" ").at(0) + "\n"; + ui->pteToBeCalled->insertPlainText(t3); + m_nToBeCalled++; + qDebug() << "a" << m_nToBeCalled; + } + } + return QWidget::eventFilter(obj, e); +} diff --git a/foxcalls.h b/foxcalls.h index 04bd45292..d1bb014d5 100644 --- a/foxcalls.h +++ b/foxcalls.h @@ -35,11 +35,14 @@ private slots: void on_cbReverse_toggled(bool b); void on_sbMaxDB_valueChanged(int n); void on_sbMinDB_valueChanged(int n); + bool eventFilter(QObject *obj, QEvent *event); private: bool m_bFirst=true; bool m_bReverse; + qint32 m_nToBeCalled; QString m_t0; + QStringList m_lines2; QSettings * m_settings; QScopedPointer ui; };