1. Send values of fMin, fMax, to the jt9 decoder.

2. Option for user to set default fonts.
3. Minor tweaks to GUI appearance.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3150 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-04-10 14:41:16 +00:00
parent 76623ca749
commit 119b2ed43b
8 changed files with 36 additions and 11 deletions

Binary file not shown.

View File

@ -5,6 +5,19 @@
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
QApplication a(argc, argv); QApplication a(argc, argv);
QFile f("fonts.txt");
if(f.open(QIODevice::ReadOnly)) {
QTextStream in(&f); //Example:
QString fontFamily; // helvetica
qint32 fontSize,fontWeight; // 8,50
in >> fontFamily >> fontSize >> fontWeight;
f.close();
QFont font;
font=QFont(fontFamily,fontSize,fontWeight);
a.setFont(font);
}
MainWindow w; MainWindow w;
w.show(); w.show();
return a.exec(); return a.exec();

View File

@ -1089,8 +1089,8 @@ void MainWindow::decode() //decode()
jt9com_.ndepth=m_ndepth; jt9com_.ndepth=m_ndepth;
jt9com_.ndiskdat=0; jt9com_.ndiskdat=0;
if(m_diskData) jt9com_.ndiskdat=1; if(m_diskData) jt9com_.ndiskdat=1;
jt9com_.nfa=1000; //### temporary ### jt9com_.nfa=g_pWideGraph->getFmin();
jt9com_.nfb=2000; jt9com_.nfb=g_pWideGraph->getFmax();
jt9com_.ntol=10; jt9com_.ntol=10;
if(jt9com_.nutc < m_nutc0) m_RxLog |= 1; //Date and Time to all65.txt if(jt9com_.nutc < m_nutc0) m_RxLog |= 1; //Date and Time to all65.txt

View File

@ -1614,7 +1614,7 @@ p, li { white-space: pre-wrap; }
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>Generate Std Messages</string> <string>Generate Std Msgs</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -1774,7 +1774,7 @@ p, li { white-space: pre-wrap; }
<attribute name="title"> <attribute name="title">
<string>2</string> <string>2</string>
</attribute> </attribute>
<widget class="QWidget" name=""> <widget class="QWidget" name="layoutWidget">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>5</x> <x>5</x>

View File

@ -212,6 +212,16 @@ void WideGraph::setRxRange(int fMin, int fMax)
ui->widePlot->update(); ui->widePlot->update();
} }
int WideGraph::getFmin()
{
return m_fMin;
}
int WideGraph::getFmax()
{
return m_fMax;
}
void WideGraph::setfMax(int n) void WideGraph::setfMax(int n)
{ {
m_fMax = n; m_fMax = n;

View File

@ -20,6 +20,8 @@ public:
int QSOfreq(); int QSOfreq();
int nSpan(); int nSpan();
int nStartFreq(); int nStartFreq();
int getFmin();
int getFmax();
float fSpan(); float fSpan();
void saveSettings(); void saveSettings();
void setRxRange(int fMin, int fMax); void setRxRange(int fMin, int fMax);

View File

@ -317,7 +317,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text"> <property name="text">
<string>fMin</string> <string>f Min</string>
</property> </property>
<property name="margin"> <property name="margin">
<number>2</number> <number>2</number>
@ -371,7 +371,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text"> <property name="text">
<string>fMax</string> <string>f Max</string>
</property> </property>
<property name="margin"> <property name="margin">
<number>2</number> <number>2</number>

View File

@ -1,6 +1,6 @@
[Setup] [Setup]
AppName=wsjtx AppName=wsjtx
AppVerName=wsjtx Version 0.9 r3143 AppVerName=wsjtx Version 0.9 r3148
AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT
DefaultDirName=c:\wsjtx DefaultDirName=c:\wsjtx
DefaultGroupName=wsjtx DefaultGroupName=wsjtx