Tidied whitespace

[pulseview.git] / pv / samplingbar.cpp

diff --git a/pv/samplingbar.cpp b/pv/samplingbar.cpp
index 468c1c539ef6e536fdcd551d68914d33f053532c..877957847b099c0ffefc4b55cbabb760b884f635 100644 (file)
--- a/pv/samplingbar.cpp
+++ b/pv/samplingbar.cpp
@@ -18,23 +18,30 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <assert.h>
+#include <extdef.h>
 
-#include <boost/foreach.hpp>
+#include <assert.h>
 
-extern "C" {
 #include <libsigrok/libsigrok.h>
-}
 
 #include <QAction>
 
 #include "samplingbar.h"
 
-#include <pv/dialogs/hwcap.h>
+#include <pv/dialogs/deviceoptions.h>
 
 namespace pv {
 
-const uint64_t SamplingBar::RecordLengths[11] = {
+const uint64_t SamplingBar::RecordLengths[20] = {
+       1000,
+       2500,
+       5000,
+       10000,
+       25000,
+       50000,
+       100000,
+       250000,
+       500000,
        1000000,
        2000000,
        5000000,
@@ -45,15 +52,19 @@ const uint64_t SamplingBar::RecordLengths[11] = {
        250000000,
        500000000,
        1000000000,
-       10000000000
+       10000000000ULL,
 };
 
+const uint64_t SamplingBar::DefaultRecordLength = 1000000;
+
 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()),
@@ -66,17 +77,24 @@ SamplingBar::SamplingBar(QWidget *parent) :
        _sample_rate_value.setDecimals(0);
        _sample_rate_value.setSuffix("Hz");
 
-       BOOST_FOREACH(uint64_t l, RecordLengths)
+       for (size_t i = 0; i < countof(RecordLengths); i++)
        {
+               const uint64_t &l = RecordLengths[i];
                char *const text = sr_si_string_u64(l, " samples");
                _record_length_selector.addItem(QString(text),
                        qVariantFromValue(l));
                g_free(text);
+
+               if (l == DefaultRecordLength)
+                       _record_length_selector.setCurrentIndex(i);
        }
 
        set_sampling(false);
 
-       _configure_button.setIcon(QIcon::fromTheme("configure"));
+       _configure_button.setIcon(QIcon::fromTheme("configure",
+               QIcon(":/icons/configure.png")));
+
+       _run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
 
        addWidget(&_device_selector);
        addWidget(&_configure_button);
@@ -120,7 +138,7 @@ uint64_t SamplingBar::get_sample_rate() const
                const int index = _sample_rate_list.currentIndex();
                if (index < 0)
                        return 0;
-               
+
                return _sample_rate_list.itemData(index).value<uint64_t>();
        }
 
@@ -129,6 +147,7 @@ uint64_t SamplingBar::get_sample_rate() const
 
 void SamplingBar::set_sampling(bool sampling)
 {
+       _run_stop_button.setIcon(sampling ? _icon_green : _icon_grey);
        _run_stop_button.setText(sampling ? "Stop" : "Run");
 }
 
@@ -171,7 +190,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;
 
@@ -208,7 +227,7 @@ void SamplingBar::configure()
        sr_dev_inst *const sdi = get_selected_device();
        assert(sdi);
 
-       pv::dialogs::HwCap dlg(this, sdi);
+       pv::dialogs::DeviceOptions dlg(this, sdi);
        dlg.exec();
 }