w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-04-05 19:08:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make time and band text position on waterfall font agnostic

Browse Source 
Use  the actual  font metrics  to calculate  the position  rather than
assuming the font size.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6648 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2016-04-25 23:12:59 +00:00
parent 7cda91c759
commit 4797cee661
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plotter.cpp
View File

@ -109,7 +109,6 @@ void CPlotter::draw(float swide[], bool bScroll) //dr
if(!painter2D.isActive()) return;
QFont Font("Arial");
Font.setPointSize(12);
QFontMetrics metrics(Font);
Font.setWeight(QFont::Normal);
painter2D.setFont(Font);
@ -191,7 +190,7 @@ void CPlotter::draw(float swide[], bool bScroll) //dr
if(swide[0]>1.0e29) m_line=0;
m_line++;
if(m_line == 13) {
if(m_line == painter1.fontMetrics ().height ()) {
painter1.setPen(Qt::white);
QString t;
if(m_TRperiod < 60) {
@ -202,7 +201,7 @@ void CPlotter::draw(float swide[], bool bScroll) //dr
} else {
t=QDateTime::currentDateTimeUtc().toString("hh:mm") + " " + m_rxBand;
}
painter1.drawText(5,10,t);
painter1.drawText (5, painter1.fontMetrics ().ascent (), t);
}
if(m_mode=="JT4") {
@ -273,7 +272,6 @@ void CPlotter::DrawOverlay() //DrawOverlay()
//create Font to use for scales
QFont Font("Arial");
Font.setPointSize(12);
QFontMetrics metrics(Font);
Font.setWeight(QFont::Normal);
painter0.setFont(Font);
painter0.setPen(Qt::black);