From d0af7271e70fdd23c408ff13ad4879f0d9c34a1e Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 13 Jul 2012 18:46:13 +0000 Subject: [PATCH] Various tweaks to GUI. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/jtms3@2515 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- mainwindow.cpp | 4 ++-- mainwindow.ui | 2 +- plotter.cpp | 2 +- widegraph.ui | 25 ++++++++++++++----------- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index cdaf00d10..3510b3545 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//--------------------------------------------------------------- MainWindow +//-------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h" @@ -20,7 +20,7 @@ WideGraph* g_pWideGraph = NULL; QSharedMemory mem_m65("mem_m65"); QString rev="$Rev$"; -QString Program_Title_Version=" JTMS3 v0.1, r" + rev.mid(6,4) + +QString Program_Title_Version=" JTMS3 v0.2, r" + rev.mid(6,4) + " by K1JT"; //-------------------------------------------------- MainWindow constructor diff --git a/mainwindow.ui b/mainwindow.ui index 99cf35459..2ed0cd6e2 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -1185,7 +1185,7 @@ p, li { white-space: pre-wrap; } - Wide Waterfall + Waterfall diff --git a/plotter.cpp b/plotter.cpp index c206a0bbe..e914aee4c 100644 --- a/plotter.cpp +++ b/plotter.cpp @@ -143,7 +143,7 @@ void CPlotter::draw(float green[], int ig) //draw() if(2*i < 215) { if(m_2Dspec) { y=10.0*log10(0.5*(mscom_.s2[2*i-1] + mscom_.s2[2*i])); - y1 = 5.0*gain*(y + 20 - m_plotZero); + y1 = 7.0*gain*(y + 16 - m_plotZero); } else { y=10.0*log10(std::max(mscom_.s1[2*i-1],mscom_.s1[2*i])); y1 = 5.0*gain*(y + 51 - m_plotZero); diff --git a/widegraph.ui b/widegraph.ui index 873c0faad..91a2288b6 100644 --- a/widegraph.ui +++ b/widegraph.ui @@ -78,37 +78,37 @@ - 60 + 40 0 - 60 + 40 16777215 - kHz + - 5 + 0 - 90 + 100 - 5 + 1 - 60 + 0 - Freq Span + p1 @@ -149,17 +149,20 @@ - 1 + 0 - 20 + 100 + + + 0 - N Avg + p2