Shift-double-click on decoded line does NOT change the frequencies.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3032 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-03-01 21:25:33 +00:00
parent 9785c228ad
commit 5bb9603ea2
4 changed files with 13 additions and 10 deletions

View File

@ -10,6 +10,7 @@ DisplayText::DisplayText(QWidget *parent) :
void DisplayText::mouseDoubleClickEvent(QMouseEvent *e) void DisplayText::mouseDoubleClickEvent(QMouseEvent *e)
{ {
bool ctrl = (e->modifiers() & Qt::ControlModifier); bool ctrl = (e->modifiers() & Qt::ControlModifier);
emit(selectCallsign(ctrl)); bool shift = (e->modifiers() & Qt::ShiftModifier);
emit(selectCallsign(shift,ctrl));
QTextBrowser::mouseDoubleClickEvent(e); QTextBrowser::mouseDoubleClickEvent(e);
} }

View File

@ -10,7 +10,7 @@ public:
explicit DisplayText(QWidget *parent = 0); explicit DisplayText(QWidget *parent = 0);
signals: signals:
void selectCallsign(bool ctrl); void selectCallsign(bool shift, bool ctrl);
public slots: public slots:

View File

@ -72,8 +72,8 @@ MainWindow::MainWindow(QWidget *parent) :
txMsgButtonGroup->addButton(ui->txrb5,5); txMsgButtonGroup->addButton(ui->txrb5,5);
txMsgButtonGroup->addButton(ui->txrb6,6); txMsgButtonGroup->addButton(ui->txrb6,6);
connect(txMsgButtonGroup,SIGNAL(buttonClicked(int)),SLOT(set_ntx(int))); connect(txMsgButtonGroup,SIGNAL(buttonClicked(int)),SLOT(set_ntx(int)));
connect(ui->decodedTextBrowser,SIGNAL(selectCallsign(bool)),this, connect(ui->decodedTextBrowser,SIGNAL(selectCallsign(bool,bool)),this,
SLOT(doubleClickOnCall(bool))); SLOT(doubleClickOnCall(bool,bool)));
setWindowTitle(Program_Title_Version); setWindowTitle(Program_Title_Version);
connect(&soundInThread, SIGNAL(readyForFFT(int)), connect(&soundInThread, SIGNAL(readyForFFT(int)),
@ -1253,7 +1253,7 @@ void MainWindow::on_txb6_clicked() //txb6
m_restart=true; m_restart=true;
} }
void MainWindow::doubleClickOnCall(bool ctrl) void MainWindow::doubleClickOnCall(bool shift, bool ctrl)
{ {
QTextCursor cursor=ui->decodedTextBrowser->textCursor(); QTextCursor cursor=ui->decodedTextBrowser->textCursor();
cursor.select(QTextCursor::LineUnderCursor); cursor.select(QTextCursor::LineUnderCursor);
@ -1266,10 +1266,12 @@ void MainWindow::doubleClickOnCall(bool ctrl)
if(i4>60) i4=60; if(i4>60) i4=60;
QString t3=t.mid(i1,i4); QString t3=t.mid(i1,i4);
QStringList t4=t3.split(" ",QString::SkipEmptyParts); QStringList t4=t3.split(" ",QString::SkipEmptyParts);
if(t4.length() <7) return; if(t4.length() <7) return; //Skip the rest if no decoded text
if(!shift) { //Don't change freqs if Shift key down
int nfreq=int(t4.at(4).toFloat()); int nfreq=int(t4.at(4).toFloat());
ui->TxFreqSpinBox->setValue(nfreq); ui->TxFreqSpinBox->setValue(nfreq);
g_pWideGraph->setQSOfreq(nfreq); g_pWideGraph->setQSOfreq(nfreq);
}
QString hiscall=t4.at(7); QString hiscall=t4.at(7);
ui->dxCallEntry->setText(hiscall); ui->dxCallEntry->setText(hiscall);
int n = 60*t2.mid(0,2).toInt() + t2.mid(2,2).toInt(); int n = 60*t2.mid(0,2).toInt() + t2.mid(2,2).toInt();

View File

@ -28,7 +28,7 @@ public slots:
void diskWriteFinished(); void diskWriteFinished();
void freezeDecode(int n); void freezeDecode(int n);
void guiUpdate(); void guiUpdate();
void doubleClickOnCall(bool ctrl); void doubleClickOnCall(bool shift, bool ctrl);
void readFromStdout(); void readFromStdout();
void readFromStderr(); void readFromStderr();
void jt9_error(); void jt9_error();