From 98d4ba6a982c3732ecda308160b2c783be77864c Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 30 Apr 2013 14:34:45 +0000 Subject: [PATCH] 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 --- devsetup.cpp | 8 ++++++++ devsetup.h | 2 ++ devsetup.ui | 32 ++++++++++++++++++++++++++++++++ mainwindow.cpp | 4 ++++ mainwindow.h | 1 + wsjtx.iss | 4 ++-- wsjtx_changelog.txt | 6 +++--- 7 files changed, 52 insertions(+), 5 deletions(-) diff --git a/devsetup.cpp b/devsetup.cpp index a3043244d..80f61c5e5 100644 --- a/devsetup.cpp +++ b/devsetup.cpp @@ -168,6 +168,7 @@ void DevSetup::initDlg() ui.stopBitsComboBox->setCurrentIndex(m_stopBitsIndex); ui.handshakeComboBox->setCurrentIndex(m_handshakeIndex); ui.rbData->setChecked(m_pttData); + ui.pollSpinBox->setValue(m_poll); // PY2SDR -- Per OS serial port names ui.catPortComboBox->clear(); @@ -218,6 +219,8 @@ void DevSetup::initDlg() ui.f15->setText(m_dFreq[14]); ui.f16->setText(m_dFreq[15]); + qDebug() << "A" << m_poll; + } //------------------------------------------------------- accept() @@ -473,3 +476,8 @@ void DevSetup::on_rbData_toggled(bool checked) { m_pttData=checked; } + +void DevSetup::on_pollSpinBox_valueChanged(int n) +{ + m_poll=n; +} diff --git a/devsetup.h b/devsetup.h index 35e618bb9..ccf6e4a52 100644 --- a/devsetup.h +++ b/devsetup.h @@ -38,6 +38,7 @@ public: qint32 m_iptt; qint32 m_test; qint32 m_COMportOpen; + qint32 m_poll; bool m_restartSoundIn; bool m_restartSoundOut; @@ -85,6 +86,7 @@ private slots: void on_testPTTButton_clicked(); void on_cbDTRoff_toggled(bool checked); void on_rbData_toggled(bool checked); + void on_pollSpinBox_valueChanged(int n); private: Rig* rig; diff --git a/devsetup.ui b/devsetup.ui index 81d597247..4f23b97cf 100644 --- a/devsetup.ui +++ b/devsetup.ui @@ -1047,6 +1047,38 @@ + + + + + 0 + 0 + + + + + 60 + 0 + + + + Polling interval: + + + + + + + + 50 + 0 + + + + 60 + + + diff --git a/mainwindow.cpp b/mainwindow.cpp index b7625a88f..bacc2cd76 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -411,6 +411,7 @@ void MainWindow::writeSettings() settings.setValue("DTRoff",m_bDTRoff); settings.setValue("pttData",m_pttData); settings.setValue("LogQSOgeom",m_logQSOgeom); + settings.setValue("Polling",m_poll); settings.endGroup(); } @@ -526,6 +527,7 @@ void MainWindow::readSettings() ui->actionAllow_multiple_instances->setChecked(m_bMultipleOK); m_bDTRoff=settings.value("DTRoff",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(); 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_bDTRoff=m_bDTRoff; dlg.m_pttData=m_pttData; + dlg.m_poll=m_poll; if(m_bRigOpen) { rig->close(); @@ -674,6 +677,7 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog m_handshakeIndex=dlg.m_handshakeIndex; m_bDTRoff=dlg.m_bDTRoff; m_pttData=dlg.m_pttData; + m_poll=dlg.m_poll; #ifdef WIN32 if(dlg.m_pskReporter!=m_pskReporter) { diff --git a/mainwindow.h b/mainwindow.h index d8cff4ad3..c4abec9f7 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -206,6 +206,7 @@ private: qint32 m_band; qint32 m_repeatMsg; qint32 m_watchdogLimit; + qint32 m_poll; bool m_monitoring; bool m_transmitting; diff --git a/wsjtx.iss b/wsjtx.iss index de7f910a2..195f26fcf 100644 --- a/wsjtx.iss +++ b/wsjtx.iss @@ -1,6 +1,6 @@ [Setup] AppName=wsjtx -AppVerName=wsjtx Version 0.95 r3242 +AppVerName=wsjtx Version 0.95 r3243 AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT DefaultDirName=c:\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\mouse_commands.txt"; 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] Name: "{group}\wsjtx"; Filename: "{app}\wsjtx.exe"; WorkingDir: {app}; IconFilename: {app}\wsjt.ico diff --git a/wsjtx_changelog.txt b/wsjtx_changelog.txt index bf7d56645..e05d22e98 100644 --- a/wsjtx_changelog.txt +++ b/wsjtx_changelog.txt @@ -4,10 +4,10 @@ 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 concentrate on any necessary bug fixes. If you have bug reports on -version 0.95 r3242, or important feature requests, send them to us -at wsjtgroup@yahoogroups.com now! +version 0.95 r3243, or important feature requests, send them to us +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