Whitespace fixes.

[pulseview.git] / pv / samplingbar.cpp

diff --git a/pv/samplingbar.cpp b/pv/samplingbar.cpp
index e46a39725b56de89aeb2cb156c54b9aee4a9e49d..24fcc40a86794b88f5e97af7686dc2cdf188cd9d 100644 (file)
--- a/pv/samplingbar.cpp
+++ b/pv/samplingbar.cpp
@@ -22,9 +22,12 @@
 
 #include <assert.h>
 
+#include <boost/foreach.hpp>
+
 #include <libsigrok/libsigrok.h>
 
 #include <QAction>
+#include <QDebug>
 
 #include "samplingbar.h"
 
@@ -103,7 +106,30 @@ SamplingBar::SamplingBar(QWidget *parent) :
        _sample_rate_value_action = addWidget(&_sample_rate_value);
        addWidget(&_run_stop_button);
 
-       update_device_selector();
+       connect(&_sample_rate_list, SIGNAL(currentIndexChanged(int)),
+               this, SLOT(on_sample_rate_changed()));
+       connect(&_sample_rate_value, SIGNAL(editingFinished()),
+               this, SLOT(on_sample_rate_changed()));
+}
+
+void SamplingBar::set_device_list(
+       const std::list<struct sr_dev_inst*> &devices)
+{
+       _device_selector.clear();
+
+       BOOST_FOREACH (sr_dev_inst *sdi, devices) {
+               QString title;
+               if (sdi->vendor && sdi->vendor[0])
+                       title += sdi->vendor + QString(" ");
+               if (sdi->model && sdi->model[0])
+                       title += sdi->model + QString(" ");
+               if (sdi->version && sdi->version[0])
+                       title += sdi->version + QString(" ");
+
+               _device_selector.addItem(title, qVariantFromValue(
+                       (void*)sdi));
+       }
+
        update_sample_rate_selector();
 }
 
@@ -117,6 +143,15 @@ struct sr_dev_inst* SamplingBar::get_selected_device() const
                index).value<void*>();
 }
 
+void SamplingBar::set_selected_device(struct sr_dev_inst *const sdi)
+{
+       for (int i = 0; i < _device_selector.count(); i++)
+               if (sdi == _device_selector.itemData(i).value<void*>()) {
+                       _device_selector.setCurrentIndex(i);
+                       return;
+               }
+}
+
 uint64_t SamplingBar::get_record_length() const
 {
        const int index = _record_length_selector.currentIndex();
@@ -126,62 +161,12 @@ uint64_t SamplingBar::get_record_length() const
        return _record_length_selector.itemData(index).value<uint64_t>();
 }
 
-uint64_t SamplingBar::get_sample_rate() const
-{
-       assert(_sample_rate_value_action);
-       assert(_sample_rate_list_action);
-
-       if (_sample_rate_value_action->isVisible())
-               return (uint64_t)_sample_rate_value.value();
-       else if (_sample_rate_list_action->isVisible())
-       {
-               const int index = _sample_rate_list.currentIndex();
-               if (index < 0)
-                       return 0;
-               
-               return _sample_rate_list.itemData(index).value<uint64_t>();
-       }
-
-       return 0;
-}
-
 void SamplingBar::set_sampling(bool sampling)
 {
        _run_stop_button.setIcon(sampling ? _icon_green : _icon_grey);
        _run_stop_button.setText(sampling ? "Stop" : "Run");
 }
 
-void SamplingBar::update_device_selector()
-{
-       GSList *devices = NULL;
-
-       /* Scan all drivers for all devices. */
-       struct sr_dev_driver **const drivers = sr_driver_list();
-       for (struct sr_dev_driver **driver = drivers; *driver; driver++) {
-               GSList *tmpdevs = sr_driver_scan(*driver, NULL);
-               for (GSList *l = tmpdevs; l; l = l->next)
-                       devices = g_slist_append(devices, l->data);
-               g_slist_free(tmpdevs);
-       }
-
-       for (GSList *l = devices; l; l = l->next) {
-               sr_dev_inst *const sdi = (sr_dev_inst*)l->data;
-
-               QString title;
-               if (sdi->vendor && sdi->vendor[0])
-                       title += sdi->vendor + QString(" ");
-               if (sdi->model && sdi->model[0])
-                       title += sdi->model + QString(" ");
-               if (sdi->version && sdi->version[0])
-                       title += sdi->version + QString(" ");
-
-               _device_selector.addItem(title, qVariantFromValue(
-                       (void*)sdi));
-       }
-
-       g_slist_free(devices);
-}
-
 void SamplingBar::update_sample_rate_selector()
 {
        const sr_dev_inst *const sdi = get_selected_device();
@@ -190,6 +175,9 @@ void SamplingBar::update_sample_rate_selector()
        assert(_sample_rate_value_action);
        assert(_sample_rate_list_action);
 
+       if (!sdi)
+               return;
+
        if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE,
                (const void **)&samplerates, sdi) != SR_OK)
                return;
@@ -215,6 +203,63 @@ void SamplingBar::update_sample_rate_selector()
                _sample_rate_list.show();
                _sample_rate_list_action->setVisible(true);
        }
+
+       update_sample_rate_selector_value();
+}
+
+void SamplingBar::update_sample_rate_selector_value()
+{
+       sr_dev_inst *const sdi = get_selected_device();
+       assert(sdi);
+
+       uint64_t *samplerate = NULL;
+       if (sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
+               (const void**)&samplerate, sdi) != SR_OK) {
+               qDebug() <<
+                               "WARNING: Failed to get value of sample rate";
+               return;
+       }
+
+       assert(_sample_rate_value_action);
+       assert(_sample_rate_list_action);
+
+       if (_sample_rate_value_action->isVisible())
+               _sample_rate_value.setValue(*samplerate);
+       else if (_sample_rate_list_action->isVisible())
+       {
+               for (int i = 0; i < _sample_rate_list.count(); i++)
+                       if (*samplerate == _sample_rate_list.itemData(
+                               i).value<uint64_t>())
+                               _sample_rate_list.setCurrentIndex(i);
+       }
+}
+
+void SamplingBar::commit_sample_rate()
+{
+       uint64_t sample_rate = 0;
+
+       sr_dev_inst *const sdi = get_selected_device();
+       assert(sdi);
+
+       assert(_sample_rate_value_action);
+       assert(_sample_rate_list_action);
+
+       if (_sample_rate_value_action->isVisible())
+               sample_rate = (uint64_t)_sample_rate_value.value();
+       else if (_sample_rate_list_action->isVisible())
+       {
+               const int index = _sample_rate_list.currentIndex();
+               if (index >= 0)
+                       sample_rate = _sample_rate_list.itemData(
+                               index).value<uint64_t>();
+       }
+
+       // Set the samplerate
+       if (sr_config_set(sdi, SR_CONF_SAMPLERATE,
+               &sample_rate) != SR_OK) {
+               qDebug() << "Failed to configure samplerate.";
+               return;
+       }
 }
 
 void SamplingBar::on_device_selected()
@@ -222,13 +267,22 @@ void SamplingBar::on_device_selected()
        update_sample_rate_selector();
 }
 
+void SamplingBar::on_sample_rate_changed()
+{
+       commit_sample_rate();
+}
+
 void SamplingBar::configure()
 {
+       commit_sample_rate();
+
        sr_dev_inst *const sdi = get_selected_device();
        assert(sdi);
 
        pv::dialogs::DeviceOptions dlg(this, sdi);
        dlg.exec();
+
+       update_sample_rate_selector_value();
 }
 
 } // namespace pv