mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-12-23 19:25:37 -05:00
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:
parent
937fba8af5
commit
5dfa36988f
Binary file not shown.
21
main.cpp
21
main.cpp
@ -4,8 +4,21 @@
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
QApplication a(argc, argv);
|
||||
MainWindow w;
|
||||
w.show();
|
||||
return a.exec();
|
||||
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;
|
||||
w.show();
|
||||
return a.exec();
|
||||
}
|
||||
|
@ -1089,8 +1089,8 @@ void MainWindow::decode() //decode()
|
||||
jt9com_.ndepth=m_ndepth;
|
||||
jt9com_.ndiskdat=0;
|
||||
if(m_diskData) jt9com_.ndiskdat=1;
|
||||
jt9com_.nfa=1000; //### temporary ###
|
||||
jt9com_.nfb=2000;
|
||||
jt9com_.nfa=g_pWideGraph->getFmin();
|
||||
jt9com_.nfb=g_pWideGraph->getFmax();
|
||||
|
||||
jt9com_.ntol=10;
|
||||
if(jt9com_.nutc < m_nutc0) m_RxLog |= 1; //Date and Time to all65.txt
|
||||
|
@ -1614,7 +1614,7 @@ p, li { white-space: pre-wrap; }
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Generate Std Messages</string>
|
||||
<string>Generate Std Msgs</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -1774,7 +1774,7 @@ p, li { white-space: pre-wrap; }
|
||||
<attribute name="title">
|
||||
<string>2</string>
|
||||
</attribute>
|
||||
<widget class="QWidget" name="">
|
||||
<widget class="QWidget" name="layoutWidget">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>5</x>
|
||||
|
@ -212,6 +212,16 @@ void WideGraph::setRxRange(int fMin, int fMax)
|
||||
ui->widePlot->update();
|
||||
}
|
||||
|
||||
int WideGraph::getFmin()
|
||||
{
|
||||
return m_fMin;
|
||||
}
|
||||
|
||||
int WideGraph::getFmax()
|
||||
{
|
||||
return m_fMax;
|
||||
}
|
||||
|
||||
void WideGraph::setfMax(int n)
|
||||
{
|
||||
m_fMax = n;
|
||||
|
@ -20,6 +20,8 @@ public:
|
||||
int QSOfreq();
|
||||
int nSpan();
|
||||
int nStartFreq();
|
||||
int getFmin();
|
||||
int getFmax();
|
||||
float fSpan();
|
||||
void saveSettings();
|
||||
void setRxRange(int fMin, int fMax);
|
||||
|
@ -317,7 +317,7 @@
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>fMin</string>
|
||||
<string>f Min</string>
|
||||
</property>
|
||||
<property name="margin">
|
||||
<number>2</number>
|
||||
@ -371,7 +371,7 @@
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>fMax</string>
|
||||
<string>f Max</string>
|
||||
</property>
|
||||
<property name="margin">
|
||||
<number>2</number>
|
||||
|
Loading…
Reference in New Issue
Block a user