Drop a few more unneeded 'extern "C"'.

[pulseview.git] / pv / samplingbar.cpp

diff --git a/pv/samplingbar.cpp b/pv/samplingbar.cpp
index 31047439c6354886c58c060412032a6034aa0d08..41e98be2653e67602a9eede6888d8662106edb0c 100644 (file)
--- a/pv/samplingbar.cpp
+++ b/pv/samplingbar.cpp
@@ -22,14 +22,14 @@
 
 #include <boost/foreach.hpp>
 
-extern "C" {
 #include <libsigrok/libsigrok.h>
-}
 
 #include <QAction>
 
 #include "samplingbar.h"
 
+#include <pv/dialogs/deviceoptions.h>
+
 namespace pv {
 
 const uint64_t SamplingBar::RecordLengths[11] = {
@@ -43,19 +43,25 @@ const uint64_t SamplingBar::RecordLengths[11] = {
        250000000,
        500000000,
        1000000000,
-       10000000000
+       10000000000ULL,
 };
 
 SamplingBar::SamplingBar(QWidget *parent) :
        QToolBar("Sampling Bar", parent),
        _device_selector(this),
+       _configure_button(this),
        _record_length_selector(this),
        _sample_rate_list(this),
+       _icon_green(":/icons/status-green.svg"),
+       _icon_grey(":/icons/status-grey.svg"),
        _run_stop_button(this)
 {
-       connect(&_run_stop_button, SIGNAL(clicked()), this, SIGNAL(run_stop()));
+       connect(&_run_stop_button, SIGNAL(clicked()),
+               this, SIGNAL(run_stop()));
        connect(&_device_selector, SIGNAL(currentIndexChanged (int)),
                this, SLOT(on_device_selected()));
+       connect(&_configure_button, SIGNAL(clicked()),
+               this, SLOT(configure()));
 
        _sample_rate_value.setDecimals(0);
        _sample_rate_value.setSuffix("Hz");
@@ -68,9 +74,15 @@ SamplingBar::SamplingBar(QWidget *parent) :
                g_free(text);
        }
 
-       _run_stop_button.setText("Run");
+       set_sampling(false);
+
+       _configure_button.setIcon(QIcon::fromTheme("configure",
+               QIcon(":/icons/configure.png")));
+
+       _run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
 
        addWidget(&_device_selector);
+       addWidget(&_configure_button);
        addWidget(&_record_length_selector);
        _sample_rate_list_action = addWidget(&_sample_rate_list);
        _sample_rate_value_action = addWidget(&_sample_rate_value);
@@ -83,7 +95,7 @@ SamplingBar::SamplingBar(QWidget *parent) :
 struct sr_dev_inst* SamplingBar::get_selected_device() const
 {
        const int index = _device_selector.currentIndex();
-       if(index < 0)
+       if (index < 0)
                return NULL;
 
        return (sr_dev_inst*)_device_selector.itemData(
@@ -93,7 +105,7 @@ struct sr_dev_inst* SamplingBar::get_selected_device() const
 uint64_t SamplingBar::get_record_length() const
 {
        const int index = _record_length_selector.currentIndex();
-       if(index < 0)
+       if (index < 0)
                return 0;
 
        return _record_length_selector.itemData(index).value<uint64_t>();
@@ -104,12 +116,12 @@ uint64_t SamplingBar::get_sample_rate() const
        assert(_sample_rate_value_action);
        assert(_sample_rate_list_action);
 
-       if(_sample_rate_value_action->isVisible())
+       if (_sample_rate_value_action->isVisible())
                return (uint64_t)_sample_rate_value.value();
-       else if(_sample_rate_list_action->isVisible())
+       else if (_sample_rate_list_action->isVisible())
        {
                const int index = _sample_rate_list.currentIndex();
-               if(index < 0)
+               if (index < 0)
                        return 0;
                
                return _sample_rate_list.itemData(index).value<uint64_t>();
@@ -118,6 +130,12 @@ uint64_t SamplingBar::get_sample_rate() const
        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;
@@ -157,7 +175,7 @@ void SamplingBar::update_sample_rate_selector()
        assert(_sample_rate_value_action);
        assert(_sample_rate_list_action);
 
-       if (sr_info_get(sdi->driver, SR_DI_SAMPLERATES,
+       if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE,
                (const void **)&samplerates, sdi) != SR_OK)
                return;
 
@@ -189,4 +207,13 @@ void SamplingBar::on_device_selected()
        update_sample_rate_selector();
 }
 
+void SamplingBar::configure()
+{
+       sr_dev_inst *const sdi = get_selected_device();
+       assert(sdi);
+
+       pv::dialogs::DeviceOptions dlg(this, sdi);
+       dlg.exec();
+}
+
 } // namespace pv