Some tweaks to the Tx macro code, and a few small clean-ups.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3070 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-03-22 19:57:32 +00:00
parent 22957fb355
commit 5af5bd6598
4 changed files with 20 additions and 3 deletions

View File

@ -37,6 +37,9 @@ void DevSetup::initDlg()
t.sprintf("COM%d",i); t.sprintf("COM%d",i);
ui.pttComboBox->addItem(t); ui.pttComboBox->addItem(t);
} }
for(int i=0; i<10; i++) {
m_macro.append("");
}
m_firstCall=false; m_firstCall=false;
} }
@ -120,6 +123,7 @@ void DevSetup::initDlg()
ui.cbPSKReporter->setChecked(m_pskReporter); ui.cbPSKReporter->setChecked(m_pskReporter);
m_paInDevice=m_inDevList[m_nDevIn]; m_paInDevice=m_inDevList[m_nDevIn];
m_paOutDevice=m_outDevList[m_nDevOut]; m_paOutDevice=m_outDevList[m_nDevOut];
ui.macro1->setText(m_macro[0].toUpper()); ui.macro1->setText(m_macro[0].toUpper());
ui.macro2->setText(m_macro[1].toUpper()); ui.macro2->setText(m_macro[1].toUpper());
ui.macro3->setText(m_macro[2].toUpper()); ui.macro3->setText(m_macro[2].toUpper());

View File

@ -391,7 +391,7 @@
<attribute name="title"> <attribute name="title">
<string>Tx Macros</string> <string>Tx Macros</string>
</attribute> </attribute>
<widget class="QWidget" name="layoutWidget"> <widget class="QWidget" name="layoutWidget1">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>110</x> <x>110</x>

View File

@ -405,6 +405,9 @@
</item> </item>
<item> <item>
<widget class="QLabel" name="lab9"> <widget class="QLabel" name="lab9">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred"> <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -503,6 +506,9 @@
</item> </item>
<item> <item>
<widget class="QLineEdit" name="name"> <widget class="QLineEdit" name="name">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -542,13 +548,20 @@
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QLabel" name="lab10"> <widget class="QLabel" name="lab10">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text"> <property name="text">
<string>Comments</string> <string>Comments</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLineEdit" name="comments"/> <widget class="QLineEdit" name="comments">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item> </item>
</layout> </layout>
</item> </item>

View File

@ -99,7 +99,7 @@ private:
qint32 m_FreqUnits; qint32 m_FreqUnits;
qint32 m_hdivs; qint32 m_hdivs;
bool m_dataFromDisk; bool m_dataFromDisk;
char m_sutc[5]; char m_sutc[6];
qint32 m_line; qint32 m_line;
qint32 m_fSample; qint32 m_fSample;
qint32 m_i0; qint32 m_i0;