w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-02-03 09:44:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280

Browse Source
This commit is contained in:
Bill Somerville 2020-07-24 21:16:52 +01:00
commit 4015c5e538
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
widgets/mainwindow.cpp
View File

@ -428,7 +428,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
ui->dxGridEntry->setValidator (new MaidenheadLocatorValidator {this}); ui->dxGridEntry->setValidator (new MaidenheadLocatorValidator {this});
ui->dxCallEntry->setValidator (new CallsignValidator {this}); ui->dxCallEntry->setValidator (new CallsignValidator {this});
ui->sbTR->values ({5, 10, 15, 30, 60, 120, 300, 900, 1800}); ui->sbTR->values ({5, 10, 15, 30, 60, 120, 300, 900, 1800});
ui->sbTR_FST4W->values ({15, 30, 60, 120, 300, 900, 1800}); ui->sbTR_FST4W->values ({120, 300, 900, 1800});
ui->decodedTextBrowser->set_configuration (&m_config, true); ui->decodedTextBrowser->set_configuration (&m_config, true);
ui->decodedTextBrowser2->set_configuration (&m_config); ui->decodedTextBrowser2->set_configuration (&m_config);

8
widgets/plotter.cpp
View File

@ -56,6 +56,7 @@ CPlotter::CPlotter(QWidget *parent) : //CPlotter Constructor
setAutoFillBackground(false); setAutoFillBackground(false);
setAttribute(Qt::WA_OpaquePaintEvent, false); setAttribute(Qt::WA_OpaquePaintEvent, false);
setAttribute(Qt::WA_NoSystemBackground, true); setAttribute(Qt::WA_NoSystemBackground, true);
setMouseTracking(true);
m_bReplot=false; m_bReplot=false;
// contextual pop up menu // contextual pop up menu
@ -697,6 +698,13 @@ void CPlotter::setRxFreq (int x) //setRxFreq
int CPlotter::rxFreq() {return m_rxFreq;} //rxFreq int CPlotter::rxFreq() {return m_rxFreq;} //rxFreq
void CPlotter::mouseMoveEvent (QMouseEvent * event)
{
int x=event->x();
QToolTip::showText(event->globalPos(),QString::number(int(FreqfromX(x))));
QWidget::mouseMoveEvent(event);
}
void CPlotter::mouseReleaseEvent (QMouseEvent * event) void CPlotter::mouseReleaseEvent (QMouseEvent * event)
{ {
if (Qt::LeftButton == event->button () and m_mode!="FST4W") { if (Qt::LeftButton == event->button () and m_mode!="FST4W") {

2
widgets/plotter.h
View File

@ -13,6 +13,7 @@
#include <QImage> #include <QImage>
#include <QVector> #include <QVector>
#include <QColor> #include <QColor>
#include <QToolTip>
#define VERT_DIVS 7 //specify grid screen divisions #define VERT_DIVS 7 //specify grid screen divisions
#define HORZ_DIVS 20 #define HORZ_DIVS 20
@ -91,6 +92,7 @@ protected:
//re-implemented widget event handlers //re-implemented widget event handlers
void paintEvent(QPaintEvent *event) override; void paintEvent(QPaintEvent *event) override;
void resizeEvent(QResizeEvent* event) override; void resizeEvent(QResizeEvent* event) override;
void mouseMoveEvent(QMouseEvent * event) override;
void mouseReleaseEvent (QMouseEvent * event) override; void mouseReleaseEvent (QMouseEvent * event) override;
void mouseDoubleClickEvent (QMouseEvent * event) override; void mouseDoubleClickEvent (QMouseEvent * event) override;