w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1. Tweak the DialFreq label; remove similar label from Wide Graph window. 

2. Add a tab for Default Frequencies on Setup window.
3. Update Makefile.MinGW
4. Bump version number to 0.8.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3097 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-03-25 19:13:49 +00:00
parent 23a65ea2f3
commit 0516a86dd8
11 changed files with 2148 additions and 1504 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
devsetup.cpp
View File

@ -5,6 +5,8 @@
#define MAXDEVICES 100
extern double dFreq[16];
//----------------------------------------------------------- DevSetup()
DevSetup::DevSetup(QWidget *parent) : QDialog(parent)
{
@ -18,6 +20,7 @@ DevSetup::~DevSetup()
{
}
void DevSetup::initDlg()
{
int k,id;
@ -160,6 +163,23 @@ void DevSetup::initDlg()
ui.macro9->setText(m_macro[8].toUpper());
ui.macro10->setText(m_macro[9].toUpper());
ui.f1->setText(m_dFreq[0]);
ui.f2->setText(m_dFreq[1]);
ui.f3->setText(m_dFreq[2]);
ui.f4->setText(m_dFreq[3]);
ui.f5->setText(m_dFreq[4]);
ui.f6->setText(m_dFreq[5]);
ui.f7->setText(m_dFreq[6]);
ui.f8->setText(m_dFreq[7]);
ui.f9->setText(m_dFreq[8]);
ui.f10->setText(m_dFreq[9]);
ui.f11->setText(m_dFreq[10]);
ui.f12->setText(m_dFreq[11]);
ui.f13->setText(m_dFreq[12]);
ui.f14->setText(m_dFreq[13]);
ui.f15->setText(m_dFreq[14]);
ui.f16->setText(m_dFreq[15]);
}
//------------------------------------------------------- accept()
@ -198,6 +218,24 @@ void DevSetup::accept()
m_macro.append(ui.macro9->text());
m_macro.append(ui.macro10->text());
m_dFreq.clear();
m_dFreq.append(ui.f1->text());
m_dFreq.append(ui.f2->text());
m_dFreq.append(ui.f3->text());
m_dFreq.append(ui.f4->text());
m_dFreq.append(ui.f5->text());
m_dFreq.append(ui.f6->text());
m_dFreq.append(ui.f7->text());
m_dFreq.append(ui.f8->text());
m_dFreq.append(ui.f9->text());
m_dFreq.append(ui.f10->text());
m_dFreq.append(ui.f11->text());
m_dFreq.append(ui.f12->text());
m_dFreq.append(ui.f13->text());
m_dFreq.append(ui.f14->text());
m_dFreq.append(ui.f15->text());
m_dFreq.append(ui.f16->text());
QDialog::accept();
}

2
devsetup.h
View File

@ -14,6 +14,7 @@ public:
~DevSetup();
void initDlg();
qint32 m_idInt;
qint32 m_pttMethodIndex;
qint32 m_pttPort;
@ -49,6 +50,7 @@ public:
QString m_handshake;
QStringList m_macro;
QStringList m_dFreq;
QProcess p4;
QMessageBox msgBox0;

3491
devsetup.ui
View File

File diff suppressed because it is too large Load Diff

2
lib/Makefile.MinGW
View File

@ -32,7 +32,7 @@ OBJS1 = pctile.o graycode.o sort.o ssort.o \
entail.o fano232.o gran.o spec9.o sync9.o decode9.o \
fil3.o redsync.o decoder.o grid2n.o n2grid.o timer.o \
decode9a.o getlags.o afc9.o fchisq.o twkfreq.o downsam9.o \
peakdt9.o symspec2.o stdmsg.o
peakdt9.o symspec2.o stdmsg.o morse.o azdist.o geodist.o
libjt9.a: $(OBJS1)
ar cr libjt9.a $(OBJS1)

39
mainwindow.cpp
View File

@ -18,13 +18,13 @@ bool btxok; //True if OK to transmit
bool btxMute;
double outputLatency; //Latency in seconds
double dFreq[]={0.136,0.4742,1.838,3.578,5.2872,7.078,10.130,14.078,
18.1046,21.078,24.9246,28.078,50.293,70.091,144.489,0.0};
18.1046,21.078,24.9246,28.078,50.293,70.091,144.489,432.178};
WideGraph* g_pWideGraph = NULL;
QSharedMemory mem_jt9("mem_jt9");
QString rev="$Rev$";
QString Program_Title_Version=" WSJT-X v0.7, r" + rev.mid(6,4) +
QString Program_Title_Version=" WSJT-X v0.8, r" + rev.mid(6,4) +
" by K1JT";
//-------------------------------------------------- MainWindow constructor
@ -37,6 +37,8 @@ MainWindow::MainWindow(QWidget *parent) :
on_EraseButton_clicked();
ui->labUTC->setStyleSheet( \
"QLabel { background-color : black; color : yellow; }");
ui->labDialFreq->setStyleSheet( \
"QLabel { background-color : black; color : yellow; }");
/*
ui->labTol1->setStyleSheet( \
"QLabel { background-color : white; color : black; }");
@ -171,9 +173,6 @@ MainWindow::MainWindow(QWidget *parent) :
char *to = (char*)mem_jt9.data();
int size=sizeof(jt9com_);
if(jt9com_.newdat==0) {
// int noffset = 4*4*5760000 + 4*4*322*32768 + 4*4*32768;
// to += noffset;
// size -= noffset;
}
memset(to,0,size); //Zero all decoding params in shared memory
@ -182,6 +181,16 @@ MainWindow::MainWindow(QWidget *parent) :
msgBox("Unable to initialize PortAudio.");
}
readSettings(); //Restore user's setup params
if(m_dFreq.length()<=1) {
m_dFreq.clear();
for(int i=0; i<16; i++) {
QString t;
t.sprintf("%f",dFreq[i]);
m_dFreq.append(t);
}
}
QFile lockFile(m_appDir + "/.lock"); //Create .lock so jt9 will wait
lockFile.open(QIODevice::ReadWrite);
//QFile quitFile(m_appDir + "/.lock");
@ -200,7 +209,6 @@ MainWindow::MainWindow(QWidget *parent) :
genStdMsgs("-30");
on_actionWide_Waterfall_triggered(); //###
g_pWideGraph->setTxFreq(m_txFreq);
m_dialFreq=g_pWideGraph->dialFreq();
if(m_mode=="JT9-1") on_actionJT9_1_triggered();
if(m_mode=="JT9-2") on_actionJT9_2_triggered();
@ -333,6 +341,7 @@ void MainWindow::writeSettings()
settings.setValue("PSKReporter",m_pskReporter);
settings.setValue("After73",m_After73);
settings.setValue("Macros",m_macro);
settings.setValue("DefaultFreqs",m_dFreq);
settings.setValue("toRTTY",m_toRTTY);
settings.setValue("NoSuffix",m_noSuffix);
settings.setValue("dBtoComments",m_dBtoComments);
@ -419,6 +428,7 @@ void MainWindow::readSettings()
m_pskReporter=settings.value("PSKReporter",false).toBool();
m_After73=settings.value("After73",false).toBool();
m_macro=settings.value("Macros","").toStringList();
m_dFreq=settings.value("DefaultFreqs","").toStringList();
m_toRTTY=settings.value("toRTTY",false).toBool();
ui->actionConvert_JT9_x_to_RTTY->setChecked(m_toRTTY);
m_noSuffix=settings.value("NoSuffix",false).toBool();
@ -534,6 +544,7 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog
dlg.m_pskReporter=m_pskReporter;
dlg.m_After73=m_After73;
dlg.m_macro=m_macro;
dlg.m_dFreq=m_dFreq;
dlg.m_catEnabled=m_catEnabled;
dlg.m_rig=m_rig;
dlg.m_rigIndex=m_rigIndex;
@ -560,6 +571,7 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog
m_nDevOut=dlg.m_nDevOut;
m_paOutDevice=dlg.m_paOutDevice;
m_macro=dlg.m_macro;
m_dFreq=dlg.m_dFreq;
m_catEnabled=dlg.m_catEnabled;
m_rig=dlg.m_rig;
m_rigIndex=dlg.m_rigIndex;
@ -726,7 +738,7 @@ void MainWindow::dialFreqChanged2(double f)
QString t;
t.sprintf("%.6f",m_dialFreq);
int n=t.length();
t=t.mid(0,n-3) + " " + t.mid(n-3,3) + " MHz";
t=t.mid(0,n-3) + " " + t.mid(n-3,3);
ui->labDialFreq->setText(t);
statusChanged();
}
@ -858,8 +870,9 @@ void MainWindow::on_actionWide_Waterfall_triggered() //Display Waterfalls
SLOT(freezeDecode(int)));
connect(g_pWideGraph, SIGNAL(f11f12(int)),this,
SLOT(bumpFqso(int)));
connect(g_pWideGraph, SIGNAL(dialFreqChanged(double)),this,
SLOT(dialFreqChanged2(double))); }
// connect(g_pWideGraph, SIGNAL(dialFreqChanged(double)),this,
// SLOT(dialFreqChanged2(double)));
}
g_pWideGraph->show();
}
@ -1191,7 +1204,7 @@ void MainWindow::readFromStdout() //readFromStdout
QString remote="call," + c2 + ",";
if(gridOK(g2)) remote += "gridsquare," + g2 + ",";
int nHz=t.mid(22,4).toInt();
uint nfreq=1000000.0*g_pWideGraph->dialFreq() + nHz + 0.5;
uint nfreq=1000000.0*m_dialFreq + nHz + 0.5;
remote += "freq," + QString::number(nfreq);
int nsnr=t.mid(10,3).toInt();
remote += ",mode,JT9,snr," + QString::number(nsnr) + ",,";
@ -1547,8 +1560,6 @@ void MainWindow::stopTx2()
void MainWindow::ba2msg(QByteArray ba, char message[]) //ba2msg()
{
bool eom;
eom=false;
int iz=ba.length();
for(int i=0;i<22; i++) {
if(i<iz) {
@ -1939,7 +1950,6 @@ void MainWindow::on_genStdMsgsPushButton_clicked() //genStdMsgs button
void MainWindow::on_logQSOButton_clicked() //Log QSO button
{
double dialFreq=g_pWideGraph->dialFreq();
QDateTime t = QDateTime::currentDateTimeUtc();
QString date=t.toString("yyyyMMdd");
QFile f("wsjtx.log");
@ -1948,7 +1958,7 @@ void MainWindow::on_logQSOButton_clicked() //Log QSO button
} else {
QString logEntry=t.date().toString("yyyy-MMM-dd,") +
t.time().toString("hh:mm,") + m_hisCall + "," + m_hisGrid + "," +
QString::number(dialFreq) + "," + m_mode + "," +
QString::number(m_dialFreq) + "," + m_mode + "," +
m_rptSent + "," + m_rptRcvd;
QTextStream out(&f);
out << logEntry << endl;
@ -2196,7 +2206,6 @@ void MainWindow::on_bandComboBox_currentIndexChanged(int index)
{
m_band=index;
m_dialFreq=dFreq[index];
if(g_pWideGraph!=NULL) g_pWideGraph->setDialFreq(m_dialFreq);
if(m_catEnabled) {
int nHz=int(1000000.0*m_dialFreq + 0.5);
QString cmnd1,cmnd3;

6
mainwindow.h
View File

@ -109,7 +109,6 @@ private slots:
void on_inGain_valueChanged(int n);
void bumpFqso(int n);
void on_actionMonitor_OFF_at_startup_triggered();
void dialFreqChanged2(double f);
void on_actionErase_ALL_TXT_triggered();
void on_actionErase_wsjtx_log_adi_triggered();
void showMacros(const QPoint& pos);
@ -258,9 +257,11 @@ private:
QString m_qsoStop;
QString m_catPort;
QString m_handshake;
QStringList m_macro;
QString m_cmnd;
QStringList m_macro;
QStringList m_dFreq;
SoundInThread soundInThread; //Instantiate the audio threads
SoundOutThread soundOutThread;
@ -276,6 +277,7 @@ private:
void msgtype(QString t, QLineEdit* tx);
void stub();
void statusChanged();
void dialFreqChanged2(double f);
bool gridOK(QString g);
QString rig_command();
};

12
mainwindow.ui
View File

@ -304,11 +304,17 @@ p, li { white-space: pre-wrap; }
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="4" colspan="2">
<widget class="QLabel" name="labDialFreq">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>75</weight>
<bold>true</bold>
<pointsize>16</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">

22
widegraph.cpp
View File

@ -39,8 +39,6 @@ WideGraph::WideGraph(QWidget *parent) :
ui->widePlot->setBinsPerPixel(1);
m_waterfallAvg = settings.value("WaterfallAvg",5).toInt();
ui->waterfallAvgSpinBox->setValue(m_waterfallAvg);
m_dialFreq=settings.value("DialFreqMHz",14.078).toDouble();
ui->fDialLineEdit->setText(QString::number(m_dialFreq));
ui->widePlot->m_bCurrent=settings.value("Current",true).toBool();
ui->widePlot->m_bCumulative=settings.value("Cumulative",false).toBool();
ui->widePlot->m_bJT9Sync=settings.value("JT9Sync",false).toBool();
@ -52,7 +50,6 @@ WideGraph::WideGraph(QWidget *parent) :
m_qsoFreq=settings.value("QSOfreq",1010).toInt();
ui->widePlot->setFQSO(m_qsoFreq,true);
settings.endGroup();
emit dialFreqChanged(m_dialFreq);
}
WideGraph::~WideGraph()
@ -74,7 +71,6 @@ void WideGraph::saveSettings()
settings.setValue("PlotWidth",ui->widePlot->plotWidth());
settings.setValue("FreqSpan",ui->freqSpanSpinBox->value());
settings.setValue("WaterfallAvg",ui->waterfallAvgSpinBox->value());
settings.setValue("DialFreqMHz",m_dialFreq);
settings.setValue("Current",ui->widePlot->m_bCurrent);
settings.setValue("Cumulative",ui->widePlot->m_bCumulative);
settings.setValue("JT9Sync",ui->widePlot->m_bJT9Sync);
@ -231,22 +227,11 @@ void WideGraph::setPalette(QString palette)
ui->widePlot->setPalette(palette);
}
void WideGraph::on_fDialLineEdit_editingFinished()
{
m_dialFreq=ui->fDialLineEdit->text().toDouble();
emit dialFreqChanged(m_dialFreq);
}
double WideGraph::fGreen()
{
return ui->widePlot->fGreen();
}
double WideGraph::dialFreq()
{
return m_dialFreq;
}
void WideGraph::setPeriod(int ntrperiod, int nsps)
{
m_TRperiod=ntrperiod;
@ -259,13 +244,6 @@ void WideGraph::setTxFreq(int n)
ui->widePlot->setTxFreq(n);
}
void WideGraph::setDialFreq(double f)
{
m_dialFreq=f;
ui->fDialLineEdit->setText(QString::number(m_dialFreq));
emit dialFreqChanged(m_dialFreq);
}
void WideGraph::on_spec2dComboBox_currentIndexChanged(const QString &arg1)
{
ui->widePlot->m_bCurrent=false;

6
widegraph.h
View File

@ -30,15 +30,12 @@ public:
void setPeriod(int ntrperiod, int nsps);
void setTxFreq(int n);
double fGreen();
double dialFreq();
void setDialFreq(double freq);
qint32 m_qsoFreq;
signals:
void freezeDecode2(int n);
void f11f12(int n);
void dialFreqChanged(double f);
public slots:
void wideFreezeDecode(int n);
@ -51,7 +48,6 @@ private slots:
void on_freqSpanSpinBox_valueChanged(int arg1);
void on_zeroSpinBox_valueChanged(int arg1);
void on_gainSpinBox_valueChanged(int arg1);
void on_fDialLineEdit_editingFinished();
void on_spec2dComboBox_currentIndexChanged(const QString &arg1);
private:
@ -62,8 +58,6 @@ private:
qint32 m_nsps;
qint32 m_ntr0;
double m_dialFreq;
Ui::WideGraph *ui;
};

32
widegraph.ui
View File

@ -295,38 +295,6 @@
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_5">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Dial Freq (MHz)</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="fDialLineEdit">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>65</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>1.8395</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>

2
wsjtx.iss
View File

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