w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix rx/tx frequency overlay punctuation and make label background transparent

This commit is contained in:
Bill Somerville 2021-05-08 23:51:16 +01:00
parent 356946d9ab
commit 7b98a0c585
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
2 changed files with 61 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
map65/widegraph.cpp
View File

@ -15,8 +15,6 @@ WideGraph::WideGraph(QWidget *parent) :
this->setMaximumHeight(880); this->setMaximumHeight(880);
ui->widePlot->setMaximumHeight(800); ui->widePlot->setMaximumHeight(800);
m_bIQxt=false; m_bIQxt=false;
ui->labFreq->setStyleSheet( \
"QLabel { background-color : black; color : yellow; }");
connect(ui->widePlot, SIGNAL(freezeDecode1(int)),this, connect(ui->widePlot, SIGNAL(freezeDecode1(int)),this,
SLOT(wideFreezeDecode(int))); SLOT(wideFreezeDecode(int)));
@ -60,7 +58,7 @@ void WideGraph::resizeEvent(QResizeEvent* ) //resizeEvent()
if(!size().isValid()) return; if(!size().isValid()) return;
int w = size().width(); int w = size().width();
int h = size().height(); int h = size().height();
ui->labFreq->setGeometry(QRect(w-160,h-100,131,41)); ui->labFreq->setGeometry(QRect(w-256,h-100,227,41));
} }
void WideGraph::saveSettings() void WideGraph::saveSettings()
@ -372,8 +370,10 @@ void WideGraph::tx570()
void WideGraph::updateFreqLabel() void WideGraph::updateFreqLabel()
{ {
auto rxFreq = QString {"%1"}.arg (ui->widePlot->rxFreq (), 10, 'f', 6).insert (7, '.'); auto rxFreq = QString {"%1"}.arg (ui->widePlot->rxFreq (), 10, 'f', 6);
auto txFreq = QString {"%1"}.arg (ui->widePlot->txFreq (), 10, 'f', 6).insert (7, '.'); auto txFreq = QString {"%1"}.arg (ui->widePlot->txFreq (), 10, 'f', 6);
rxFreq.insert (rxFreq.size () - 3, '.');
txFreq.insert (txFreq.size () - 3, '.');
ui->labFreq->setText (QString {"Rx: %1\nTx: %2"}.arg (rxFreq, txFreq)); ui->labFreq->setText (QString {"Rx: %1\nTx: %2"}.arg (rxFreq, txFreq));
} }

103
map65/widegraph.ui
View File

@ -15,54 +15,63 @@
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout"> <widget class="CPlotter" name="widePlot">
<item> <property name="enabled">
<widget class="CPlotter" name="widePlot"> <bool>true</bool>
<property name="enabled"> </property>
<bool>true</bool> <property name="sizePolicy">
</property> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<property name="sizePolicy"> <horstretch>0</horstretch>
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <verstretch>0</verstretch>
<horstretch>0</horstretch> </sizepolicy>
<verstretch>0</verstretch> </property>
</sizepolicy> <property name="minimumSize">
</property> <size>
<property name="minimumSize"> <width>400</width>
<size> <height>200</height>
<width>400</width> </size>
<height>200</height> </property>
</size> <property name="frameShape">
</property> <enum>QFrame::StyledPanel</enum>
<property name="frameShape"> </property>
<enum>QFrame::StyledPanel</enum> <property name="frameShadow">
</property> <enum>QFrame::Sunken</enum>
<property name="frameShadow"> </property>
<enum>QFrame::Sunken</enum> <property name="lineWidth">
</property> <number>1</number>
<property name="lineWidth"> </property>
<number>1</number> <widget class="QLabel" name="labFreq">
</property> <property name="geometry">
<widget class="QLabel" name="labFreq"> <rect>
<property name="geometry"> <x>940</x>
<rect> <y>230</y>
<x>1015</x> <width>211</width>
<y>230</y> <height>41</height>
<width>131</width> </rect>
<height>41</height> </property>
</rect> <property name="font">
</property> <font>
<property name="font"> <pointsize>12</pointsize>
<font> </font>
<pointsize>12</pointsize> </property>
</font> <property name="styleSheet">
</property> <string notr="true">QLabel {
<property name="text"> background-color: rgba(0, 0, 0, 0);
<string>Rx: 144.118.200 color: yellow;
}</string>
</property>
<property name="text">
<string>Rx: 144.118.200
Tx: 144.127.317</string> Tx: 144.127.317</string>
</property> </property>
</widget> <property name="alignment">
</widget> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</item> </property>
</widget>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<item> <item>