mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-19 10:32:02 -05:00
Starting to implement a "polling interval" option. More to come!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3245 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
bcb74260af
commit
d62a045e27
@ -168,6 +168,7 @@ void DevSetup::initDlg()
|
|||||||
ui.stopBitsComboBox->setCurrentIndex(m_stopBitsIndex);
|
ui.stopBitsComboBox->setCurrentIndex(m_stopBitsIndex);
|
||||||
ui.handshakeComboBox->setCurrentIndex(m_handshakeIndex);
|
ui.handshakeComboBox->setCurrentIndex(m_handshakeIndex);
|
||||||
ui.rbData->setChecked(m_pttData);
|
ui.rbData->setChecked(m_pttData);
|
||||||
|
ui.pollSpinBox->setValue(m_poll);
|
||||||
|
|
||||||
// PY2SDR -- Per OS serial port names
|
// PY2SDR -- Per OS serial port names
|
||||||
ui.catPortComboBox->clear();
|
ui.catPortComboBox->clear();
|
||||||
@ -218,6 +219,8 @@ void DevSetup::initDlg()
|
|||||||
ui.f15->setText(m_dFreq[14]);
|
ui.f15->setText(m_dFreq[14]);
|
||||||
ui.f16->setText(m_dFreq[15]);
|
ui.f16->setText(m_dFreq[15]);
|
||||||
|
|
||||||
|
qDebug() << "A" << m_poll;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//------------------------------------------------------- accept()
|
//------------------------------------------------------- accept()
|
||||||
@ -473,3 +476,8 @@ void DevSetup::on_rbData_toggled(bool checked)
|
|||||||
{
|
{
|
||||||
m_pttData=checked;
|
m_pttData=checked;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void DevSetup::on_pollSpinBox_valueChanged(int n)
|
||||||
|
{
|
||||||
|
m_poll=n;
|
||||||
|
}
|
||||||
|
@ -38,6 +38,7 @@ public:
|
|||||||
qint32 m_iptt;
|
qint32 m_iptt;
|
||||||
qint32 m_test;
|
qint32 m_test;
|
||||||
qint32 m_COMportOpen;
|
qint32 m_COMportOpen;
|
||||||
|
qint32 m_poll;
|
||||||
|
|
||||||
bool m_restartSoundIn;
|
bool m_restartSoundIn;
|
||||||
bool m_restartSoundOut;
|
bool m_restartSoundOut;
|
||||||
@ -85,6 +86,7 @@ private slots:
|
|||||||
void on_testPTTButton_clicked();
|
void on_testPTTButton_clicked();
|
||||||
void on_cbDTRoff_toggled(bool checked);
|
void on_cbDTRoff_toggled(bool checked);
|
||||||
void on_rbData_toggled(bool checked);
|
void on_rbData_toggled(bool checked);
|
||||||
|
void on_pollSpinBox_valueChanged(int n);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Rig* rig;
|
Rig* rig;
|
||||||
|
32
devsetup.ui
32
devsetup.ui
@ -1047,6 +1047,38 @@
|
|||||||
</property>
|
</property>
|
||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="label_47">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>60</width>
|
||||||
|
<height>0</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Polling interval:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QSpinBox" name="pollSpinBox">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>50</width>
|
||||||
|
<height>0</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximum">
|
||||||
|
<number>60</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
|
@ -411,6 +411,7 @@ void MainWindow::writeSettings()
|
|||||||
settings.setValue("DTRoff",m_bDTRoff);
|
settings.setValue("DTRoff",m_bDTRoff);
|
||||||
settings.setValue("pttData",m_pttData);
|
settings.setValue("pttData",m_pttData);
|
||||||
settings.setValue("LogQSOgeom",m_logQSOgeom);
|
settings.setValue("LogQSOgeom",m_logQSOgeom);
|
||||||
|
settings.setValue("Polling",m_poll);
|
||||||
|
|
||||||
settings.endGroup();
|
settings.endGroup();
|
||||||
}
|
}
|
||||||
@ -526,6 +527,7 @@ void MainWindow::readSettings()
|
|||||||
ui->actionAllow_multiple_instances->setChecked(m_bMultipleOK);
|
ui->actionAllow_multiple_instances->setChecked(m_bMultipleOK);
|
||||||
m_bDTRoff=settings.value("DTRoff",false).toBool();
|
m_bDTRoff=settings.value("DTRoff",false).toBool();
|
||||||
m_pttData=settings.value("pttData",false).toBool();
|
m_pttData=settings.value("pttData",false).toBool();
|
||||||
|
m_poll=settings.value("Polling",0).toInt();
|
||||||
m_logQSOgeom=settings.value("LogQSOgeom",QRect(500,400,424,283)).toRect();
|
m_logQSOgeom=settings.value("LogQSOgeom",QRect(500,400,424,283)).toRect();
|
||||||
|
|
||||||
if(!ui->actionLinrad->isChecked() && !ui->actionCuteSDR->isChecked() &&
|
if(!ui->actionLinrad->isChecked() && !ui->actionCuteSDR->isChecked() &&
|
||||||
@ -636,6 +638,7 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog
|
|||||||
dlg.m_handshakeIndex=m_handshakeIndex;
|
dlg.m_handshakeIndex=m_handshakeIndex;
|
||||||
dlg.m_bDTRoff=m_bDTRoff;
|
dlg.m_bDTRoff=m_bDTRoff;
|
||||||
dlg.m_pttData=m_pttData;
|
dlg.m_pttData=m_pttData;
|
||||||
|
dlg.m_poll=m_poll;
|
||||||
|
|
||||||
if(m_bRigOpen) {
|
if(m_bRigOpen) {
|
||||||
rig->close();
|
rig->close();
|
||||||
@ -674,6 +677,7 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog
|
|||||||
m_handshakeIndex=dlg.m_handshakeIndex;
|
m_handshakeIndex=dlg.m_handshakeIndex;
|
||||||
m_bDTRoff=dlg.m_bDTRoff;
|
m_bDTRoff=dlg.m_bDTRoff;
|
||||||
m_pttData=dlg.m_pttData;
|
m_pttData=dlg.m_pttData;
|
||||||
|
m_poll=dlg.m_poll;
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
if(dlg.m_pskReporter!=m_pskReporter) {
|
if(dlg.m_pskReporter!=m_pskReporter) {
|
||||||
|
@ -206,6 +206,7 @@ private:
|
|||||||
qint32 m_band;
|
qint32 m_band;
|
||||||
qint32 m_repeatMsg;
|
qint32 m_repeatMsg;
|
||||||
qint32 m_watchdogLimit;
|
qint32 m_watchdogLimit;
|
||||||
|
qint32 m_poll;
|
||||||
|
|
||||||
bool m_monitoring;
|
bool m_monitoring;
|
||||||
bool m_transmitting;
|
bool m_transmitting;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[Setup]
|
[Setup]
|
||||||
AppName=wsjtx
|
AppName=wsjtx
|
||||||
AppVerName=wsjtx Version 0.95 r3242
|
AppVerName=wsjtx Version 0.95 r3243
|
||||||
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
|
||||||
@ -17,7 +17,7 @@ Source: "c:\Users\joe\wsjt\QtSupport\*.dll"; DestDir: "{app}";
|
|||||||
Source: "c:\Users\joe\wsjt\wsjtx\shortcuts.txt"; DestDir: "{app}"
|
Source: "c:\Users\joe\wsjt\wsjtx\shortcuts.txt"; DestDir: "{app}"
|
||||||
Source: "c:\Users\joe\wsjt\wsjtx\mouse_commands.txt"; DestDir: "{app}"
|
Source: "c:\Users\joe\wsjt\wsjtx\mouse_commands.txt"; DestDir: "{app}"
|
||||||
Source: "c:\Users\joe\wsjt\wsjtx\WSJT-X_Users_Guide.pdf"; DestDir: "{app}"
|
Source: "c:\Users\joe\wsjt\wsjtx\WSJT-X_Users_Guide.pdf"; DestDir: "{app}"
|
||||||
Source: "c:\Users\joe\wsjt\wsjtx_install\save\Samples\130426_0027.wav"; DestDir: "{app}\save\Samples";
|
Source: "c:\Users\joe\wsjt\wsjtx_install\save\Samples\130418_1742.wav"; DestDir: "{app}\save\Samples";
|
||||||
|
|
||||||
[Icons]
|
[Icons]
|
||||||
Name: "{group}\wsjtx"; Filename: "{app}\wsjtx.exe"; WorkingDir: {app}; IconFilename: {app}\wsjt.ico
|
Name: "{group}\wsjtx"; Filename: "{app}\wsjtx.exe"; WorkingDir: {app}; IconFilename: {app}\wsjt.ico
|
||||||
|
@ -4,10 +4,10 @@
|
|||||||
We are getting close to a stable "Version 1.0" release of WSJT-X. At
|
We are getting close to a stable "Version 1.0" release of WSJT-X. At
|
||||||
that point program features will be frozen temporarily while we
|
that point program features will be frozen temporarily while we
|
||||||
concentrate on any necessary bug fixes. If you have bug reports on
|
concentrate on any necessary bug fixes. If you have bug reports on
|
||||||
version 0.95 r3242, or important feature requests, send them to us
|
version 0.95 r3243, or important feature requests, send them to us
|
||||||
at wsjtgroup@yahoogroups.com now!
|
at wsjtgroup@yahoogroups.com as soon as possible!
|
||||||
|
|
||||||
April 29, 2013: v0.95, r3242
|
April 29, 2013: v0.95, r3243
|
||||||
----------------------------
|
----------------------------
|
||||||
|
|
||||||
1. Now has bi-directionsl CAT control using direct calls to hamlib
|
1. Now has bi-directionsl CAT control using direct calls to hamlib
|
||||||
|
Loading…
Reference in New Issue
Block a user