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);
ui->widePlot->setMaximumHeight(800);
m_bIQxt=false;
ui->labFreq->setStyleSheet( \
"QLabel { background-color : black; color : yellow; }");
connect(ui->widePlot, SIGNAL(freezeDecode1(int)),this,
SLOT(wideFreezeDecode(int)));
@ -60,7 +58,7 @@ void WideGraph::resizeEvent(QResizeEvent* ) //resizeEvent()
if(!size().isValid()) return;
int w = size().width();
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()
@ -372,8 +370,10 @@ void WideGraph::tx570()
void WideGraph::updateFreqLabel()
{
auto rxFreq = QString {"%1"}.arg (ui->widePlot->rxFreq (), 10, 'f', 6).insert (7, '.');
auto txFreq = QString {"%1"}.arg (ui->widePlot->txFreq (), 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);
rxFreq.insert (rxFreq.size () - 3, '.');
txFreq.insert (txFreq.size () - 3, '.');
ui->labFreq->setText (QString {"Rx: %1\nTx: %2"}.arg (rxFreq, txFreq));
}

103
map65/widegraph.ui
View File

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