From 5af5bd659802da1fda2afc2005dd945c5bd3f54e Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 22 Mar 2013 19:57:32 +0000 Subject: [PATCH] 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 --- devsetup.cpp | 4 ++++ devsetup.ui | 2 +- logqso.ui | 15 ++++++++++++++- plotter.h | 2 +- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/devsetup.cpp b/devsetup.cpp index 7f42edc11..f4cb2a62e 100644 --- a/devsetup.cpp +++ b/devsetup.cpp @@ -37,6 +37,9 @@ void DevSetup::initDlg() t.sprintf("COM%d",i); ui.pttComboBox->addItem(t); } + for(int i=0; i<10; i++) { + m_macro.append(""); + } m_firstCall=false; } @@ -120,6 +123,7 @@ void DevSetup::initDlg() ui.cbPSKReporter->setChecked(m_pskReporter); m_paInDevice=m_inDevList[m_nDevIn]; m_paOutDevice=m_outDevList[m_nDevOut]; + ui.macro1->setText(m_macro[0].toUpper()); ui.macro2->setText(m_macro[1].toUpper()); ui.macro3->setText(m_macro[2].toUpper()); diff --git a/devsetup.ui b/devsetup.ui index 806c7ad44..f065442f5 100644 --- a/devsetup.ui +++ b/devsetup.ui @@ -391,7 +391,7 @@ Tx Macros - + 110 diff --git a/logqso.ui b/logqso.ui index 749d576ea..20b5c5e52 100644 --- a/logqso.ui +++ b/logqso.ui @@ -405,6 +405,9 @@ + + false + 0 @@ -503,6 +506,9 @@ + + false + 0 @@ -542,13 +548,20 @@ + + false + Comments - + + + false + + diff --git a/plotter.h b/plotter.h index beb94a398..3d40a34e9 100644 --- a/plotter.h +++ b/plotter.h @@ -99,7 +99,7 @@ private: qint32 m_FreqUnits; qint32 m_hdivs; bool m_dataFromDisk; - char m_sutc[5]; + char m_sutc[6]; qint32 m_line; qint32 m_fSample; qint32 m_i0;