diff -Nru gqrx-sdr-2.6/CMakeLists.txt gqrx-sdr-2.6.1/CMakeLists.txt --- gqrx-sdr-2.6/CMakeLists.txt 2016-10-02 20:55:02.000000000 +0000 +++ gqrx-sdr-2.6.1/CMakeLists.txt 2017-02-16 19:40:14.000000000 +0000 @@ -4,9 +4,9 @@ project(gqrx) set(${PROJECT_NAME}_MAJOR "2") set(${PROJECT_NAME}_MINOR "6") -set(${PROJECT_NAME}_PATCH "0") -##set(VERSION "${${PROJECT_NAME}_MAJOR}.${${PROJECT_NAME}_MINOR}.${${PROJECT_NAME}_PATCH}") -set(VERSION "${${PROJECT_NAME}_MAJOR}.${${PROJECT_NAME}_MINOR}") +set(${PROJECT_NAME}_PATCH "1") +set(VERSION "${${PROJECT_NAME}_MAJOR}.${${PROJECT_NAME}_MINOR}.${${PROJECT_NAME}_PATCH}") +##set(VERSION "${${PROJECT_NAME}_MAJOR}.${${PROJECT_NAME}_MINOR}") add_definitions(-DVERSION="${VERSION}") # development version diff -Nru gqrx-sdr-2.6/debian/changelog gqrx-sdr-2.6.1/debian/changelog --- gqrx-sdr-2.6/debian/changelog 2017-01-31 00:11:32.000000000 +0000 +++ gqrx-sdr-2.6.1/debian/changelog 2017-02-16 22:39:56.000000000 +0000 @@ -1,3 +1,10 @@ +gqrx-sdr (2.6.1-gqrx1~yakkety) yakkety; urgency=low + + * New upstream release. + * Option for reverting the behavior of the frequency controller. + + -- Alexandru Csete Thu, 16 Feb 2017 23:40:00 +0100 + gqrx-sdr (2.6-gqrx2~yakkety) yakkety; urgency=low * Build for Ubuntu 16.10 Yakkety. diff -Nru gqrx-sdr-2.6/gqrx.pro gqrx-sdr-2.6.1/gqrx.pro --- gqrx-sdr-2.6/gqrx.pro 2016-10-02 20:55:02.000000000 +0000 +++ gqrx-sdr-2.6.1/gqrx.pro 2017-02-16 19:40:14.000000000 +0000 @@ -68,13 +68,13 @@ # Define version string (see below for releases) ##VER = $$system(git describe --abbrev=8) - VER = 2.6 + VER = 2.6.1 } else { DEFINES += QT_NO_DEBUG DEFINES += QT_NO_DEBUG_OUTPUT ##VER = $$system(git describe --abbrev=1) - VER = 2.6 + VER = 2.6.1 # Release binaries with gr bundled # QMAKE_RPATH & co won't work with origin diff -Nru gqrx-sdr-2.6/resources/news.txt gqrx-sdr-2.6.1/resources/news.txt --- gqrx-sdr-2.6/resources/news.txt 2016-10-02 20:55:02.000000000 +0000 +++ gqrx-sdr-2.6.1/resources/news.txt 2017-02-16 19:40:14.000000000 +0000 @@ -1,3 +1,9 @@ + + 2.6.1: Released February 16, 2017 + + IMPROVED: Option for reverting the behavior of the frequency controller. + + 2.6: Released October 3, 2016 NEW: 1-2-5 scaling on FFT axis. diff -Nru gqrx-sdr-2.6/src/applications/gqrx/mainwindow.cpp gqrx-sdr-2.6.1/src/applications/gqrx/mainwindow.cpp --- gqrx-sdr-2.6/src/applications/gqrx/mainwindow.cpp 2016-10-02 20:55:02.000000000 +0000 +++ gqrx-sdr-2.6.1/src/applications/gqrx/mainwindow.cpp 2017-02-16 19:40:14.000000000 +0000 @@ -192,6 +192,7 @@ connect(uiDockInputCtl, SIGNAL(iqBalanceChanged(bool)), this, SLOT(setIqBalance(bool))); connect(uiDockInputCtl, SIGNAL(ignoreLimitsChanged(bool)), this, SLOT(setIgnoreLimits(bool))); connect(uiDockInputCtl, SIGNAL(antennaSelected(QString)), this, SLOT(setAntenna(QString))); + connect(uiDockInputCtl, SIGNAL(freqCtrlResetChanged(bool)), this, SLOT(setFreqCtrlReset(bool))); connect(uiDockRxOpt, SIGNAL(filterOffsetChanged(qint64)), this, SLOT(setFilterOffset(qint64))); connect(uiDockRxOpt, SIGNAL(filterOffsetChanged(qint64)), remote, SLOT(setFilterOffset(qint64))); connect(uiDockRxOpt, SIGNAL(demodSelected(int)), this, SLOT(selectDemod(int))); @@ -893,6 +894,13 @@ setNewFrequency(freq); } + +/** Reset lower digits of main frequency control widget */ +void MainWindow::setFreqCtrlReset(bool enabled) +{ + ui->freqCtrl->setResetLowerDigits(enabled); +} + /** * @brief Select new demodulator. * @param demod New demodulator. diff -Nru gqrx-sdr-2.6/src/applications/gqrx/mainwindow.h gqrx-sdr-2.6.1/src/applications/gqrx/mainwindow.h --- gqrx-sdr-2.6/src/applications/gqrx/mainwindow.h 2016-10-02 20:55:02.000000000 +0000 +++ gqrx-sdr-2.6.1/src/applications/gqrx/mainwindow.h 2017-02-16 19:40:14.000000000 +0000 @@ -139,6 +139,7 @@ void setDcCancel(bool enabled); void setIqBalance(bool enabled); void setIgnoreLimits(bool ignore_limits); + void setFreqCtrlReset(bool enabled); void selectDemod(QString demod); void selectDemod(int index); void setFmMaxdev(float max_dev); diff -Nru gqrx-sdr-2.6/src/qtgui/dockinputctl.cpp gqrx-sdr-2.6.1/src/qtgui/dockinputctl.cpp --- gqrx-sdr-2.6/src/qtgui/dockinputctl.cpp 2016-10-02 20:55:02.000000000 +0000 +++ gqrx-sdr-2.6.1/src/qtgui/dockinputctl.cpp 2017-02-16 19:40:14.000000000 +0000 @@ -104,6 +104,11 @@ emit gainChanged(gain_name, gain_value); } } + + // misc GUI settings + bool_val = settings->value("gui/fctl_reset_digits", true).toBool(); + emit freqCtrlResetChanged(bool_val); + ui->freqCtrlResetButton->setChecked(bool_val); } void DockInputCtl::saveSettings(QSettings * settings) @@ -159,6 +164,12 @@ settings->setValue("input/antenna", ui->antSelector->currentText()); else settings->remove("input/antenna"); + + // Remember state of freqReset button. Default is checked. + if (!ui->freqCtrlResetButton->isChecked()) + settings->setValue("gui/fctl_reset_digits", false); + else + settings->remove("gui/fctl_reset_digits"); } void DockInputCtl::readLnbLoFromSettings(QSettings * settings) @@ -325,6 +336,12 @@ ui->antSelector->setCurrentIndex(index); } +/** Enable/disable resetting lower digits on freqCtrl widgets */ +void DockInputCtl::setFreqCtrlReset(bool enabled) +{ + ui->freqCtrlResetButton->setChecked(enabled); +} + /** * Set gain stages. * @param gain_list A list containing the gain stages for this device. @@ -484,6 +501,12 @@ emit antennaSelected(antenna); } +/** Reset box has changed */ +void DockInputCtl::on_freqCtrlResetButton_toggled(bool checked) +{ + emit freqCtrlResetChanged(checked); +} + /** Remove all widgets from the lists. */ void DockInputCtl::clearWidgets() { diff -Nru gqrx-sdr-2.6/src/qtgui/dockinputctl.h gqrx-sdr-2.6.1/src/qtgui/dockinputctl.h --- gqrx-sdr-2.6/src/qtgui/dockinputctl.h 2016-10-02 20:55:02.000000000 +0000 +++ gqrx-sdr-2.6.1/src/qtgui/dockinputctl.h 2017-02-16 19:40:14.000000000 +0000 @@ -101,6 +101,8 @@ void setGainStages(gain_list_t &gain_list); void restoreManualGains(QSettings *settings); + void setFreqCtrlReset(bool enabled); + signals: void gainChanged(QString name, double value); void autoGainChanged(bool enabled); @@ -111,6 +113,7 @@ void iqBalanceChanged(bool enabled); void ignoreLimitsChanged(bool ignore); void antennaSelected(QString antenna); + void freqCtrlResetChanged(bool enabled); private slots: void on_lnbSpinBox_valueChanged(double value); @@ -121,6 +124,7 @@ void on_iqBalanceButton_toggled(bool checked); void on_ignoreButton_toggled(bool checked); void on_antSelector_currentIndexChanged(const QString &antenna); + void on_freqCtrlResetButton_toggled(bool checked); void sliderValueChanged(int value); diff -Nru gqrx-sdr-2.6/src/qtgui/dockinputctl.ui gqrx-sdr-2.6.1/src/qtgui/dockinputctl.ui --- gqrx-sdr-2.6/src/qtgui/dockinputctl.ui 2016-10-02 20:55:02.000000000 +0000 +++ gqrx-sdr-2.6.1/src/qtgui/dockinputctl.ui 2017-02-16 19:40:14.000000000 +0000 @@ -215,6 +215,23 @@ + + + Qt::Horizontal + + + + + + + <html><head/><body><p>Reset subordinate digits in main frequency control widget</p></body></html> + + + Reset frequency controller digits + + + + Qt::Vertical diff -Nru gqrx-sdr-2.6/src/qtgui/dockrxopt.cpp gqrx-sdr-2.6.1/src/qtgui/dockrxopt.cpp --- gqrx-sdr-2.6/src/qtgui/dockrxopt.cpp 2016-10-02 20:55:02.000000000 +0000 +++ gqrx-sdr-2.6.1/src/qtgui/dockrxopt.cpp 2017-02-16 19:40:14.000000000 +0000 @@ -321,6 +321,10 @@ bool conv_ok; int int_val; double dbl_val; + bool bool_val; + + bool_val = settings->value("gui/fctl_reset_digits", true).toBool(); + ui->filterFreq->setResetLowerDigits(bool_val); int_val = settings->value("receiver/demod", 0).toInt(&conv_ok); if (int_val >= 0) diff -Nru gqrx-sdr-2.6/src/qtgui/freqctrl.h gqrx-sdr-2.6.1/src/qtgui/freqctrl.h --- gqrx-sdr-2.6/src/qtgui/freqctrl.h 2016-10-02 20:55:02.000000000 +0000 +++ gqrx-sdr-2.6.1/src/qtgui/freqctrl.h 2017-02-16 19:40:14.000000000 +0000 @@ -59,6 +59,10 @@ void setHighlightColor(QColor cr); qint64 getFrequency() { return m_freq; } + void setResetLowerDigits(bool reset) { + m_ResetLowerDigits = reset; + } + signals: void newFrequency(qint64 freq); //emitted when frequency has changed