MainBar: Renamed from SamplingBar

diff --git a/CMakeLists.txt b/CMakeLists.txt
index edb8a82c9e16fe7338cd9bcbbc123886f91efb0c..ddabe2e86de0a1c7226955936946b75f63aacd92 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -165,7 +165,7 @@ set(pulseview_SOURCES
        pv/prop/string.cpp
        pv/prop/binding/binding.cpp
        pv/prop/binding/deviceoptions.cpp
        pv/prop/string.cpp
        pv/prop/binding/binding.cpp
        pv/prop/binding/deviceoptions.cpp

-       pv/toolbars/samplingbar.cpp
+       pv/toolbars/mainbar.cpp

        pv/view/analogsignal.cpp
        pv/view/cursor.cpp
        pv/view/cursorpair.cpp
        pv/view/analogsignal.cpp
        pv/view/cursor.cpp
        pv/view/cursorpair.cpp


@@ -212,7 +212,7 @@ set(pulseview_HEADERS
        pv/prop/property.hpp
        pv/prop/string.hpp
        pv/prop/binding/deviceoptions.hpp
        pv/prop/property.hpp
        pv/prop/string.hpp
        pv/prop/binding/deviceoptions.hpp

-       pv/toolbars/samplingbar.hpp
+       pv/toolbars/mainbar.hpp

        pv/view/cursor.hpp
        pv/view/flag.hpp
        pv/view/header.hpp
        pv/view/cursor.hpp
        pv/view/flag.hpp
        pv/view/header.hpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 9fa4eee6baa2735281a4c3e4dbfda21cc7a3bb62..924e70581fa442d064413b2a9b6e5f862d8553aa 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -46,7 +46,7 @@
 #include "dialogs/about.hpp"
 #include "dialogs/connect.hpp"
 #include "dialogs/storeprogress.hpp"
 #include "dialogs/about.hpp"
 #include "dialogs/connect.hpp"
 #include "dialogs/storeprogress.hpp"

-#include "toolbars/samplingbar.hpp"
+#include "toolbars/mainbar.hpp"

 #include "view/logicsignal.hpp"
 #include "view/view.hpp"
 #ifdef ENABLE_DECODE
 #include "view/logicsignal.hpp"
 #include "view/view.hpp"
 #ifdef ENABLE_DECODE


@@ -283,12 +283,12 @@ void MainWindow::setup_ui()
        addToolBar(toolbar);
 
        // Setup the sampling bar
        addToolBar(toolbar);
 
        // Setup the sampling bar

-       sampling_bar_ = new toolbars::SamplingBar(session_, *this);
+       main_bar_ = new toolbars::MainBar(session_, *this);

 
        // Populate the device list and select the initially selected device
        update_device_list();
 
 
        // Populate the device list and select the initially selected device
        update_device_list();
 

-       addToolBar(sampling_bar_);
+       addToolBar(main_bar_);

 
        // Set the title
        setWindowTitle(tr("PulseView"));
 
        // Set the title
        setWindowTitle(tr("PulseView"));


@@ -394,7 +394,7 @@ void MainWindow::session_error(
 
 void MainWindow::update_device_list()
 {
 
 void MainWindow::update_device_list()
 {

-       assert(sampling_bar_);
+       assert(main_bar_);

 
        shared_ptr<Device> selected_device = session_.device();
        list< shared_ptr<Device> > devices;
 
        shared_ptr<Device> selected_device = session_.device();
        list< shared_ptr<Device> > devices;


@@ -410,7 +410,7 @@ void MainWindow::update_device_list()
                devices.push_back(selected_device);
        assert(selected_device);
 
                devices.push_back(selected_device);
        assert(selected_device);
 

-       sampling_bar_->set_device_list(devices, selected_device);
+       main_bar_->set_device_list(devices, selected_device);

 }
 
 void MainWindow::closeEvent(QCloseEvent *event)
 }
 
 void MainWindow::closeEvent(QCloseEvent *event)


@@ -563,7 +563,7 @@ void MainWindow::add_decoder(srd_decoder *decoder)
 
 void MainWindow::capture_state_changed(int state)
 {
 
 void MainWindow::capture_state_changed(int state)
 {

-       sampling_bar_->set_capture_state((pv::Session::capture_state)state);
+       main_bar_->set_capture_state((pv::Session::capture_state)state);

 }
 
 void MainWindow::device_selected()
 }
 
 void MainWindow::device_selected()

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 35cad3ab2890993f13c30afc95fa956ef7775548..42462d22a7cca0d9ff13ab844897e240a51f8968 100644 (file)
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -42,7 +42,7 @@ class DeviceManager;
 
 namespace toolbars {
 class ContextBar;
 
 namespace toolbars {
 class ContextBar;

-class SamplingBar;
+class MainBar;

 }
 
 namespace view {
 }
 
 namespace view {


@@ -133,7 +133,7 @@ private:
        QWidget *central_widget_;
        QVBoxLayout *vertical_layout_;
 
        QWidget *central_widget_;
        QVBoxLayout *vertical_layout_;
 

-       toolbars::SamplingBar *sampling_bar_;
+       toolbars::MainBar *main_bar_;

 };
 
 } // namespace pv
 };
 
 } // namespace pv

diff --git a/pv/prop/binding/deviceoptions.cpp b/pv/prop/binding/deviceoptions.cpp
index 8412104daf0eb3328cac1764a13395560d9fa875..c995ea697c01e6980adaefd9c0efa0676b36d35d 100644 (file)
--- a/pv/prop/binding/deviceoptions.cpp
+++ b/pv/prop/binding/deviceoptions.cpp
@@ -86,7 +86,7 @@ DeviceOptions::DeviceOptions(shared_ptr<sigrok::Configurable> configurable) :
                {
                case SR_CONF_SAMPLERATE:
                        // Sample rate values are not bound because they are shown
                {
                case SR_CONF_SAMPLERATE:
                        // Sample rate values are not bound because they are shown

-                       // in the SamplingBar
+                       // in the MainBar

                        break;
 
                case SR_CONF_CAPTURE_RATIO:
                        break;
 
                case SR_CONF_CAPTURE_RATIO:

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
new file mode 100644 (file)
index 0000000..7a387b4
--- /dev/null
+++ b/pv/toolbars/mainbar.cpp
@@ -0,0 +1,498 @@
+/*
+ * This file is part of the PulseView project.
+ *
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include <extdef.h>
+
+#include <assert.h>
+
+#include <QAction>
+#include <QDebug>
+#include <QHelpEvent>
+#include <QToolTip>
+
+#include "mainbar.hpp"
+
+#include <pv/devicemanager.hpp>
+#include <pv/mainwindow.hpp>
+#include <pv/popups/deviceoptions.hpp>
+#include <pv/popups/channels.hpp>
+#include <pv/util.hpp>
+
+#include <libsigrok/libsigrok.hpp>
+
+using std::map;
+using std::vector;
+using std::max;
+using std::min;
+using std::shared_ptr;
+using std::string;
+
+using sigrok::Capability;
+using sigrok::ConfigKey;
+using sigrok::Device;
+using sigrok::Error;
+
+namespace pv {
+namespace toolbars {
+
+const uint64_t MainBar::MinSampleCount = 100ULL;
+const uint64_t MainBar::MaxSampleCount = 1000000000000ULL;
+const uint64_t MainBar::DefaultSampleCount = 1000000;
+
+MainBar::MainBar(Session &session, MainWindow &main_window) :
+       QToolBar("Sampling Bar", &main_window),
+       session_(session),
+       main_window_(main_window),
+       device_selector_(this),
+       updating_device_selector_(false),
+       configure_button_(this),
+       configure_button_action_(NULL),
+       channels_button_(this),
+       sample_count_(" samples", this),
+       sample_rate_("Hz", this),
+       updating_sample_rate_(false),
+       updating_sample_count_(false),
+       sample_count_supported_(false),
+       icon_red_(":/icons/status-red.svg"),
+       icon_green_(":/icons/status-green.svg"),
+       icon_grey_(":/icons/status-grey.svg"),
+       run_stop_button_(this)
+{
+       setObjectName(QString::fromUtf8("MainBar"));
+
+       connect(&run_stop_button_, SIGNAL(clicked()),
+               this, SLOT(on_run_stop()));
+       connect(&device_selector_, SIGNAL(currentIndexChanged (int)),
+               this, SLOT(on_device_selected()));
+       connect(&sample_count_, SIGNAL(value_changed()),
+               this, SLOT(on_sample_count_changed()));
+       connect(&sample_rate_, SIGNAL(value_changed()),
+               this, SLOT(on_sample_rate_changed()));
+
+       sample_count_.show_min_max_step(0, UINT64_MAX, 1);
+
+       set_capture_state(pv::Session::Stopped);
+
+       configure_button_.setIcon(QIcon::fromTheme("configure",
+               QIcon(":/icons/configure.png")));
+
+       channels_button_.setIcon(QIcon::fromTheme("channels",
+               QIcon(":/icons/channels.svg")));
+
+       run_stop_button_.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+
+       addWidget(&device_selector_);
+       configure_button_action_ = addWidget(&configure_button_);
+       addWidget(&channels_button_);
+       addWidget(&sample_count_);
+       addWidget(&sample_rate_);
+
+       addWidget(&run_stop_button_);
+
+       sample_count_.installEventFilter(this);
+       sample_rate_.installEventFilter(this);
+}
+
+void MainBar::set_device_list(
+       const std::list< std::shared_ptr<sigrok::Device> > &devices,
+       shared_ptr<Device> selected)
+{
+       int selected_index = -1;
+
+       assert(selected);
+
+       updating_device_selector_ = true;
+
+       device_selector_.clear();
+
+       for (auto device : devices) {
+               assert(device);
+
+               string display_name =
+                       session_.device_manager().get_display_name(device);
+
+               if (selected == device)
+                       selected_index = device_selector_.count();
+
+               device_selector_.addItem(display_name.c_str(),
+                       qVariantFromValue(device));
+       }
+
+       // The selected device should have been in the list
+       assert(selected_index != -1);
+       device_selector_.setCurrentIndex(selected_index);
+
+       update_device_config_widgets();
+
+       updating_device_selector_ = false;
+}
+
+shared_ptr<Device> MainBar::get_selected_device() const
+{
+       const int index = device_selector_.currentIndex();
+       if (index < 0)
+               return shared_ptr<Device>();
+
+       return device_selector_.itemData(index).value<shared_ptr<Device>>();
+}
+
+void MainBar::set_capture_state(pv::Session::capture_state state)
+{
+       const QIcon *icons[] = {&icon_grey_, &icon_red_, &icon_green_};
+       run_stop_button_.setIcon(*icons[state]);
+       run_stop_button_.setText((state == pv::Session::Stopped) ?
+               tr("Run") : tr("Stop"));
+       run_stop_button_.setShortcut(QKeySequence(Qt::Key_Space));
+}
+
+void MainBar::update_sample_rate_selector()
+{
+       Glib::VariantContainerBase gvar_dict;
+       GVariant *gvar_list;
+       const uint64_t *elements = NULL;
+       gsize num_elements;
+
+       if (updating_sample_rate_)
+               return;
+
+       const shared_ptr<Device> device = get_selected_device();
+       if (!device)
+               return;
+
+       assert(!updating_sample_rate_);
+       updating_sample_rate_ = true;
+
+       const auto keys = device->config_keys(ConfigKey::DEVICE_OPTIONS);
+       const auto iter = keys.find(ConfigKey::SAMPLERATE);
+       if (iter != keys.end() &&
+               (*iter).second.find(sigrok::LIST) != (*iter).second.end()) {
+               const auto keys = device->config_keys(
+                       ConfigKey::DEVICE_OPTIONS);
+               try {
+                       gvar_dict = device->config_list(ConfigKey::SAMPLERATE);
+               } catch(const sigrok::Error &e) {
+                       // Failed to enunmerate samplerate
+                       (void)e;
+               }
+       }
+
+       if (!gvar_dict) {
+               sample_rate_.show_none();
+               updating_sample_rate_ = false;
+               return;
+       }
+
+       if ((gvar_list = g_variant_lookup_value(gvar_dict.gobj(),
+                       "samplerate-steps", G_VARIANT_TYPE("at"))))
+       {
+               elements = (const uint64_t *)g_variant_get_fixed_array(
+                               gvar_list, &num_elements, sizeof(uint64_t));
+
+               const uint64_t min = elements[0];
+               const uint64_t max = elements[1];
+               const uint64_t step = elements[2];
+
+               g_variant_unref(gvar_list);
+
+               assert(min > 0);
+               assert(max > 0);
+               assert(max > min);
+               assert(step > 0);
+
+               if (step == 1)
+                       sample_rate_.show_125_list(min, max);
+               else
+               {
+                       // When the step is not 1, we cam't make a 1-2-5-10
+                       // list of sample rates, because we may not be able to
+                       // make round numbers. Therefore in this case, show a
+                       // spin box.
+                       sample_rate_.show_min_max_step(min, max, step);
+               }
+       }
+       else if ((gvar_list = g_variant_lookup_value(gvar_dict.gobj(),
+                       "samplerates", G_VARIANT_TYPE("at"))))
+       {
+               elements = (const uint64_t *)g_variant_get_fixed_array(
+                               gvar_list, &num_elements, sizeof(uint64_t));
+               sample_rate_.show_list(elements, num_elements);
+               g_variant_unref(gvar_list);
+       }
+       updating_sample_rate_ = false;
+
+       update_sample_rate_selector_value();
+}
+
+void MainBar::update_sample_rate_selector_value()
+{
+       if (updating_sample_rate_)
+               return;
+
+       const shared_ptr<Device> device = get_selected_device();
+       if (!device)
+               return;
+
+       try {
+               auto gvar = device->config_get(ConfigKey::SAMPLERATE);
+               uint64_t samplerate =
+                       Glib::VariantBase::cast_dynamic<Glib::Variant<guint64>>(gvar).get();
+               assert(!updating_sample_rate_);
+               updating_sample_rate_ = true;
+               sample_rate_.set_value(samplerate);
+               updating_sample_rate_ = false;
+       } catch (Error error) {
+               qDebug() << "WARNING: Failed to get value of sample rate";
+               return;
+       }
+}
+
+void MainBar::update_sample_count_selector()
+{
+       if (updating_sample_count_)
+               return;
+
+       const shared_ptr<Device> device = get_selected_device();
+       if (!device)
+               return;
+
+       assert(!updating_sample_count_);
+       updating_sample_count_ = true;
+
+       if (!sample_count_supported_)
+       {
+               sample_count_.show_none();
+               updating_sample_count_ = false;
+               return;
+       }
+
+       uint64_t sample_count = sample_count_.value();
+       uint64_t min_sample_count = 0;
+       uint64_t max_sample_count = MaxSampleCount;
+
+       if (sample_count == 0)
+               sample_count = DefaultSampleCount;
+
+       const auto keys = device->config_keys(ConfigKey::DEVICE_OPTIONS);
+       const auto iter = keys.find(ConfigKey::LIMIT_SAMPLES);
+       if (iter != keys.end() &&
+               (*iter).second.find(sigrok::LIST) != (*iter).second.end()) {
+               try {
+                       auto gvar =
+                               device->config_list(ConfigKey::LIMIT_SAMPLES);
+                       if (gvar)
+                               g_variant_get(gvar.gobj(), "(tt)",
+                                       &min_sample_count, &max_sample_count);
+               } catch(const sigrok::Error &e) {
+                       // Failed to query sample limit
+                       (void)e;
+               }
+       }
+
+       min_sample_count = min(max(min_sample_count, MinSampleCount),
+               max_sample_count);
+
+       sample_count_.show_125_list(
+               min_sample_count, max_sample_count);
+
+       try {
+               auto gvar = device->config_get(ConfigKey::LIMIT_SAMPLES);
+               sample_count = g_variant_get_uint64(gvar.gobj());
+               if (sample_count == 0)
+                       sample_count = DefaultSampleCount;
+               sample_count = min(max(sample_count, MinSampleCount),
+                       max_sample_count);
+       } catch (Error error) {}
+
+       sample_count_.set_value(sample_count);
+
+       updating_sample_count_ = false;
+}
+
+void MainBar::update_device_config_widgets()
+{
+       using namespace pv::popups;
+
+       const shared_ptr<Device> device = get_selected_device();
+       if (!device)
+               return;
+
+       // Update the configure popup
+       DeviceOptions *const opts = new DeviceOptions(device, this);
+       configure_button_action_->setVisible(
+               !opts->binding().properties().empty());
+       configure_button_.set_popup(opts);
+
+       // Update the channels popup
+       Channels *const channels = new Channels(session_, this);
+       channels_button_.set_popup(channels);
+
+       // Update supported options.
+       sample_count_supported_ = false;
+
+       try {
+               for (auto entry : device->config_keys(ConfigKey::DEVICE_OPTIONS))
+               {
+                       auto key = entry.first;
+                       auto capabilities = entry.second;
+                       switch (key->id()) {
+                       case SR_CONF_LIMIT_SAMPLES:
+                               if (capabilities.count(Capability::SET))
+                                       sample_count_supported_ = true;
+                               break;
+                       case SR_CONF_LIMIT_FRAMES:
+                               if (capabilities.count(Capability::SET))
+                               {
+                                       device->config_set(ConfigKey::LIMIT_FRAMES,
+                                               Glib::Variant<guint64>::create(1));
+                                       on_config_changed();
+                               }
+                               break;
+                       default:
+                               break;
+                       }
+               }
+       } catch (Error error) {}
+
+       // Add notification of reconfigure events
+       disconnect(this, SLOT(on_config_changed()));
+       connect(&opts->binding(), SIGNAL(config_changed()),
+               this, SLOT(on_config_changed()));
+
+       // Update sweep timing widgets.
+       update_sample_count_selector();
+       update_sample_rate_selector();
+}
+
+void MainBar::commit_sample_count()
+{
+       uint64_t sample_count = 0;
+
+       if (updating_sample_count_)
+               return;
+
+       const shared_ptr<Device> device = get_selected_device();
+       if (!device)
+               return;
+
+       sample_count = sample_count_.value();
+
+       // Set the sample count
+       assert(!updating_sample_count_);
+       updating_sample_count_ = true;
+       if (sample_count_supported_)
+       {
+               try {
+                       device->config_set(ConfigKey::LIMIT_SAMPLES,
+                               Glib::Variant<guint64>::create(sample_count));
+                       on_config_changed();
+               } catch (Error error) {
+                       qDebug() << "Failed to configure sample count.";
+                       return;
+               }
+       }
+       updating_sample_count_ = false;
+}
+
+void MainBar::commit_sample_rate()
+{
+       uint64_t sample_rate = 0;
+
+       if (updating_sample_rate_)
+               return;
+
+       const shared_ptr<Device> device = get_selected_device();
+       if (!device)
+               return;
+
+       sample_rate = sample_rate_.value();
+       if (sample_rate == 0)
+               return;
+
+       // Set the samplerate
+       assert(!updating_sample_rate_);
+       updating_sample_rate_ = true;
+       try {
+               device->config_set(ConfigKey::SAMPLERATE,
+                       Glib::Variant<guint64>::create(sample_rate));
+               on_config_changed();
+       } catch (Error error) {
+               qDebug() << "Failed to configure samplerate.";
+               return;
+       }
+       updating_sample_rate_ = false;
+}
+
+void MainBar::on_device_selected()
+{
+       if (updating_device_selector_)
+               return;
+
+       shared_ptr<Device> device = get_selected_device();
+       if (!device)
+               return;
+
+       main_window_.select_device(device);
+
+       update_device_config_widgets();
+}
+
+void MainBar::on_sample_count_changed()
+{
+       commit_sample_count();
+}
+
+void MainBar::on_sample_rate_changed()
+{
+       commit_sample_rate();
+}
+
+void MainBar::on_run_stop()
+{
+       commit_sample_count();
+       commit_sample_rate();   
+       main_window_.run_stop();
+}
+
+void MainBar::on_config_changed()
+{
+       commit_sample_count();
+       update_sample_count_selector(); 
+       commit_sample_rate();   
+       update_sample_rate_selector();
+}
+
+bool MainBar::eventFilter(QObject *watched, QEvent *event)
+{
+       if ((watched == &sample_count_ || watched == &sample_rate_) &&
+               (event->type() == QEvent::ToolTip)) {
+               double sec = (double)sample_count_.value() / sample_rate_.value();
+               QHelpEvent *help_event = static_cast<QHelpEvent*>(event);
+
+               QString str = tr("Total sampling time: %1").arg(pv::util::format_second(sec));
+               QToolTip::showText(help_event->globalPos(), str);
+
+               return true;
+       }
+
+       return false;
+}
+
+} // namespace toolbars
+} // namespace pv

diff --git a/pv/toolbars/mainbar.hpp b/pv/toolbars/mainbar.hpp
new file mode 100644 (file)
index 0000000..d5d79c8
--- /dev/null
+++ b/pv/toolbars/mainbar.hpp
@@ -0,0 +1,123 @@
+/*
+ * This file is part of the PulseView project.
+ *
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#ifndef PULSEVIEW_PV_TOOLBARS_MAINBAR_H
+#define PULSEVIEW_PV_TOOLBARS_MAINBAR_H
+
+#include <stdint.h>
+
+#include <list>
+#include <memory>
+
+#include <QComboBox>
+#include <QDoubleSpinBox>
+#include <QToolBar>
+#include <QToolButton>
+
+#include <pv/session.hpp>
+#include <pv/widgets/popuptoolbutton.hpp>
+#include <pv/widgets/sweeptimingwidget.hpp>
+
+namespace sigrok {
+       class Device;
+}
+
+Q_DECLARE_METATYPE(std::shared_ptr<sigrok::Device>)
+
+class QAction;
+
+namespace pv {
+
+class MainWindow;
+class Session;
+
+namespace toolbars {
+
+class MainBar : public QToolBar
+{
+       Q_OBJECT
+
+private:
+       static const uint64_t MinSampleCount;
+       static const uint64_t MaxSampleCount;
+       static const uint64_t DefaultSampleCount;
+
+public:
+       MainBar(Session &session, pv::MainWindow &main_window);
+
+       void set_device_list(
+               const std::list< std::shared_ptr<sigrok::Device> > &devices,
+               std::shared_ptr<sigrok::Device> selected);
+
+       std::shared_ptr<sigrok::Device> get_selected_device() const;
+
+       void set_capture_state(pv::Session::capture_state state);
+
+Q_SIGNALS:
+       void run_stop();
+
+private:
+       void update_sample_rate_selector();
+       void update_sample_rate_selector_value();
+       void update_sample_count_selector();
+       void update_device_config_widgets();
+       void commit_sample_rate();
+       void commit_sample_count();
+
+private Q_SLOTS:
+       void on_device_selected();
+       void on_sample_count_changed();
+       void on_sample_rate_changed();
+       void on_run_stop();
+
+       void on_config_changed();
+
+protected:
+       bool eventFilter(QObject *watched, QEvent *event);
+
+private:
+       Session &session_;
+       MainWindow &main_window_;
+
+       QComboBox device_selector_;
+       bool updating_device_selector_;
+
+       pv::widgets::PopupToolButton configure_button_;
+       QAction *configure_button_action_;
+
+       pv::widgets::PopupToolButton channels_button_;
+
+       pv::widgets::SweepTimingWidget sample_count_;
+       pv::widgets::SweepTimingWidget sample_rate_;
+       bool updating_sample_rate_;
+       bool updating_sample_count_;
+
+       bool sample_count_supported_;
+
+       QIcon icon_red_;
+       QIcon icon_green_;
+       QIcon icon_grey_;
+       QToolButton run_stop_button_;
+};
+
+} // namespace toolbars
+} // namespace pv
+
+#endif // PULSEVIEW_PV_TOOLBARS_MAINBAR_H

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
deleted file mode 100644 (file)
index 710f312..0000000
--- a/pv/toolbars/samplingbar.cpp
+++ /dev/null
@@ -1,498 +0,0 @@
-/*
- * This file is part of the PulseView project.
- *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#include <extdef.h>
-
-#include <assert.h>
-
-#include <QAction>
-#include <QDebug>
-#include <QHelpEvent>
-#include <QToolTip>
-
-#include "samplingbar.hpp"
-
-#include <pv/devicemanager.hpp>
-#include <pv/mainwindow.hpp>
-#include <pv/popups/deviceoptions.hpp>
-#include <pv/popups/channels.hpp>
-#include <pv/util.hpp>
-
-#include <libsigrok/libsigrok.hpp>
-
-using std::map;
-using std::vector;
-using std::max;
-using std::min;
-using std::shared_ptr;
-using std::string;
-
-using sigrok::Capability;
-using sigrok::ConfigKey;
-using sigrok::Device;
-using sigrok::Error;
-
-namespace pv {
-namespace toolbars {
-
-const uint64_t SamplingBar::MinSampleCount = 100ULL;
-const uint64_t SamplingBar::MaxSampleCount = 1000000000000ULL;
-const uint64_t SamplingBar::DefaultSampleCount = 1000000;
-
-SamplingBar::SamplingBar(Session &session, MainWindow &main_window) :
-       QToolBar("Sampling Bar", &main_window),
-       session_(session),
-       main_window_(main_window),
-       device_selector_(this),
-       updating_device_selector_(false),
-       configure_button_(this),
-       configure_button_action_(NULL),
-       channels_button_(this),
-       sample_count_(" samples", this),
-       sample_rate_("Hz", this),
-       updating_sample_rate_(false),
-       updating_sample_count_(false),
-       sample_count_supported_(false),
-       icon_red_(":/icons/status-red.svg"),
-       icon_green_(":/icons/status-green.svg"),
-       icon_grey_(":/icons/status-grey.svg"),
-       run_stop_button_(this)
-{
-       setObjectName(QString::fromUtf8("SamplingBar"));
-
-       connect(&run_stop_button_, SIGNAL(clicked()),
-               this, SLOT(on_run_stop()));
-       connect(&device_selector_, SIGNAL(currentIndexChanged (int)),
-               this, SLOT(on_device_selected()));
-       connect(&sample_count_, SIGNAL(value_changed()),
-               this, SLOT(on_sample_count_changed()));
-       connect(&sample_rate_, SIGNAL(value_changed()),
-               this, SLOT(on_sample_rate_changed()));
-
-       sample_count_.show_min_max_step(0, UINT64_MAX, 1);
-
-       set_capture_state(pv::Session::Stopped);
-
-       configure_button_.setIcon(QIcon::fromTheme("configure",
-               QIcon(":/icons/configure.png")));
-
-       channels_button_.setIcon(QIcon::fromTheme("channels",
-               QIcon(":/icons/channels.svg")));
-
-       run_stop_button_.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-
-       addWidget(&device_selector_);
-       configure_button_action_ = addWidget(&configure_button_);
-       addWidget(&channels_button_);
-       addWidget(&sample_count_);
-       addWidget(&sample_rate_);
-
-       addWidget(&run_stop_button_);
-
-       sample_count_.installEventFilter(this);
-       sample_rate_.installEventFilter(this);
-}
-
-void SamplingBar::set_device_list(
-       const std::list< std::shared_ptr<sigrok::Device> > &devices,
-       shared_ptr<Device> selected)
-{
-       int selected_index = -1;
-
-       assert(selected);
-
-       updating_device_selector_ = true;
-
-       device_selector_.clear();
-
-       for (auto device : devices) {
-               assert(device);
-
-               string display_name =
-                       session_.device_manager().get_display_name(device);
-
-               if (selected == device)
-                       selected_index = device_selector_.count();
-
-               device_selector_.addItem(display_name.c_str(),
-                       qVariantFromValue(device));
-       }
-
-       // The selected device should have been in the list
-       assert(selected_index != -1);
-       device_selector_.setCurrentIndex(selected_index);
-
-       update_device_config_widgets();
-
-       updating_device_selector_ = false;
-}
-
-shared_ptr<Device> SamplingBar::get_selected_device() const
-{
-       const int index = device_selector_.currentIndex();
-       if (index < 0)
-               return shared_ptr<Device>();
-
-       return device_selector_.itemData(index).value<shared_ptr<Device>>();
-}
-
-void SamplingBar::set_capture_state(pv::Session::capture_state state)
-{
-       const QIcon *icons[] = {&icon_grey_, &icon_red_, &icon_green_};
-       run_stop_button_.setIcon(*icons[state]);
-       run_stop_button_.setText((state == pv::Session::Stopped) ?
-               tr("Run") : tr("Stop"));
-       run_stop_button_.setShortcut(QKeySequence(Qt::Key_Space));
-}
-
-void SamplingBar::update_sample_rate_selector()
-{
-       Glib::VariantContainerBase gvar_dict;
-       GVariant *gvar_list;
-       const uint64_t *elements = NULL;
-       gsize num_elements;
-
-       if (updating_sample_rate_)
-               return;
-
-       const shared_ptr<Device> device = get_selected_device();
-       if (!device)
-               return;
-
-       assert(!updating_sample_rate_);
-       updating_sample_rate_ = true;
-
-       const auto keys = device->config_keys(ConfigKey::DEVICE_OPTIONS);
-       const auto iter = keys.find(ConfigKey::SAMPLERATE);
-       if (iter != keys.end() &&
-               (*iter).second.find(sigrok::LIST) != (*iter).second.end()) {
-               const auto keys = device->config_keys(
-                       ConfigKey::DEVICE_OPTIONS);
-               try {
-                       gvar_dict = device->config_list(ConfigKey::SAMPLERATE);
-               } catch(const sigrok::Error &e) {
-                       // Failed to enunmerate samplerate
-                       (void)e;
-               }
-       }
-
-       if (!gvar_dict) {
-               sample_rate_.show_none();
-               updating_sample_rate_ = false;
-               return;
-       }
-
-       if ((gvar_list = g_variant_lookup_value(gvar_dict.gobj(),
-                       "samplerate-steps", G_VARIANT_TYPE("at"))))
-       {
-               elements = (const uint64_t *)g_variant_get_fixed_array(
-                               gvar_list, &num_elements, sizeof(uint64_t));
-
-               const uint64_t min = elements[0];
-               const uint64_t max = elements[1];
-               const uint64_t step = elements[2];
-
-               g_variant_unref(gvar_list);
-
-               assert(min > 0);
-               assert(max > 0);
-               assert(max > min);
-               assert(step > 0);
-
-               if (step == 1)
-                       sample_rate_.show_125_list(min, max);
-               else
-               {
-                       // When the step is not 1, we cam't make a 1-2-5-10
-                       // list of sample rates, because we may not be able to
-                       // make round numbers. Therefore in this case, show a
-                       // spin box.
-                       sample_rate_.show_min_max_step(min, max, step);
-               }
-       }
-       else if ((gvar_list = g_variant_lookup_value(gvar_dict.gobj(),
-                       "samplerates", G_VARIANT_TYPE("at"))))
-       {
-               elements = (const uint64_t *)g_variant_get_fixed_array(
-                               gvar_list, &num_elements, sizeof(uint64_t));
-               sample_rate_.show_list(elements, num_elements);
-               g_variant_unref(gvar_list);
-       }
-       updating_sample_rate_ = false;
-
-       update_sample_rate_selector_value();
-}
-
-void SamplingBar::update_sample_rate_selector_value()
-{
-       if (updating_sample_rate_)
-               return;
-
-       const shared_ptr<Device> device = get_selected_device();
-       if (!device)
-               return;
-
-       try {
-               auto gvar = device->config_get(ConfigKey::SAMPLERATE);
-               uint64_t samplerate =
-                       Glib::VariantBase::cast_dynamic<Glib::Variant<guint64>>(gvar).get();
-               assert(!updating_sample_rate_);
-               updating_sample_rate_ = true;
-               sample_rate_.set_value(samplerate);
-               updating_sample_rate_ = false;
-       } catch (Error error) {
-               qDebug() << "WARNING: Failed to get value of sample rate";
-               return;
-       }
-}
-
-void SamplingBar::update_sample_count_selector()
-{
-       if (updating_sample_count_)
-               return;
-
-       const shared_ptr<Device> device = get_selected_device();
-       if (!device)
-               return;
-
-       assert(!updating_sample_count_);
-       updating_sample_count_ = true;
-
-       if (!sample_count_supported_)
-       {
-               sample_count_.show_none();
-               updating_sample_count_ = false;
-               return;
-       }
-
-       uint64_t sample_count = sample_count_.value();
-       uint64_t min_sample_count = 0;
-       uint64_t max_sample_count = MaxSampleCount;
-
-       if (sample_count == 0)
-               sample_count = DefaultSampleCount;
-
-       const auto keys = device->config_keys(ConfigKey::DEVICE_OPTIONS);
-       const auto iter = keys.find(ConfigKey::LIMIT_SAMPLES);
-       if (iter != keys.end() &&
-               (*iter).second.find(sigrok::LIST) != (*iter).second.end()) {
-               try {
-                       auto gvar =
-                               device->config_list(ConfigKey::LIMIT_SAMPLES);
-                       if (gvar)
-                               g_variant_get(gvar.gobj(), "(tt)",
-                                       &min_sample_count, &max_sample_count);
-               } catch(const sigrok::Error &e) {
-                       // Failed to query sample limit
-                       (void)e;
-               }
-       }
-
-       min_sample_count = min(max(min_sample_count, MinSampleCount),
-               max_sample_count);
-
-       sample_count_.show_125_list(
-               min_sample_count, max_sample_count);
-
-       try {
-               auto gvar = device->config_get(ConfigKey::LIMIT_SAMPLES);
-               sample_count = g_variant_get_uint64(gvar.gobj());
-               if (sample_count == 0)
-                       sample_count = DefaultSampleCount;
-               sample_count = min(max(sample_count, MinSampleCount),
-                       max_sample_count);
-       } catch (Error error) {}
-
-       sample_count_.set_value(sample_count);
-
-       updating_sample_count_ = false;
-}
-
-void SamplingBar::update_device_config_widgets()
-{
-       using namespace pv::popups;
-
-       const shared_ptr<Device> device = get_selected_device();
-       if (!device)
-               return;
-
-       // Update the configure popup
-       DeviceOptions *const opts = new DeviceOptions(device, this);
-       configure_button_action_->setVisible(
-               !opts->binding().properties().empty());
-       configure_button_.set_popup(opts);
-
-       // Update the channels popup
-       Channels *const channels = new Channels(session_, this);
-       channels_button_.set_popup(channels);
-
-       // Update supported options.
-       sample_count_supported_ = false;
-
-       try {
-               for (auto entry : device->config_keys(ConfigKey::DEVICE_OPTIONS))
-               {
-                       auto key = entry.first;
-                       auto capabilities = entry.second;
-                       switch (key->id()) {
-                       case SR_CONF_LIMIT_SAMPLES:
-                               if (capabilities.count(Capability::SET))
-                                       sample_count_supported_ = true;
-                               break;
-                       case SR_CONF_LIMIT_FRAMES:
-                               if (capabilities.count(Capability::SET))
-                               {
-                                       device->config_set(ConfigKey::LIMIT_FRAMES,
-                                               Glib::Variant<guint64>::create(1));
-                                       on_config_changed();
-                               }
-                               break;
-                       default:
-                               break;
-                       }
-               }
-       } catch (Error error) {}
-
-       // Add notification of reconfigure events
-       disconnect(this, SLOT(on_config_changed()));
-       connect(&opts->binding(), SIGNAL(config_changed()),
-               this, SLOT(on_config_changed()));
-
-       // Update sweep timing widgets.
-       update_sample_count_selector();
-       update_sample_rate_selector();
-}
-
-void SamplingBar::commit_sample_count()
-{
-       uint64_t sample_count = 0;
-
-       if (updating_sample_count_)
-               return;
-
-       const shared_ptr<Device> device = get_selected_device();
-       if (!device)
-               return;
-
-       sample_count = sample_count_.value();
-
-       // Set the sample count
-       assert(!updating_sample_count_);
-       updating_sample_count_ = true;
-       if (sample_count_supported_)
-       {
-               try {
-                       device->config_set(ConfigKey::LIMIT_SAMPLES,
-                               Glib::Variant<guint64>::create(sample_count));
-                       on_config_changed();
-               } catch (Error error) {
-                       qDebug() << "Failed to configure sample count.";
-                       return;
-               }
-       }
-       updating_sample_count_ = false;
-}
-
-void SamplingBar::commit_sample_rate()
-{
-       uint64_t sample_rate = 0;
-
-       if (updating_sample_rate_)
-               return;
-
-       const shared_ptr<Device> device = get_selected_device();
-       if (!device)
-               return;
-
-       sample_rate = sample_rate_.value();
-       if (sample_rate == 0)
-               return;
-
-       // Set the samplerate
-       assert(!updating_sample_rate_);
-       updating_sample_rate_ = true;
-       try {
-               device->config_set(ConfigKey::SAMPLERATE,
-                       Glib::Variant<guint64>::create(sample_rate));
-               on_config_changed();
-       } catch (Error error) {
-               qDebug() << "Failed to configure samplerate.";
-               return;
-       }
-       updating_sample_rate_ = false;
-}
-
-void SamplingBar::on_device_selected()
-{
-       if (updating_device_selector_)
-               return;
-
-       shared_ptr<Device> device = get_selected_device();
-       if (!device)
-               return;
-
-       main_window_.select_device(device);
-
-       update_device_config_widgets();
-}
-
-void SamplingBar::on_sample_count_changed()
-{
-       commit_sample_count();
-}
-
-void SamplingBar::on_sample_rate_changed()
-{
-       commit_sample_rate();
-}
-
-void SamplingBar::on_run_stop()
-{
-       commit_sample_count();
-       commit_sample_rate();   
-       main_window_.run_stop();
-}
-
-void SamplingBar::on_config_changed()
-{
-       commit_sample_count();
-       update_sample_count_selector(); 
-       commit_sample_rate();   
-       update_sample_rate_selector();
-}
-
-bool SamplingBar::eventFilter(QObject *watched, QEvent *event)
-{
-       if ((watched == &sample_count_ || watched == &sample_rate_) &&
-               (event->type() == QEvent::ToolTip)) {
-               double sec = (double)sample_count_.value() / sample_rate_.value();
-               QHelpEvent *help_event = static_cast<QHelpEvent*>(event);
-
-               QString str = tr("Total sampling time: %1").arg(pv::util::format_second(sec));
-               QToolTip::showText(help_event->globalPos(), str);
-
-               return true;
-       }
-
-       return false;
-}
-
-} // namespace toolbars
-} // namespace pv

diff --git a/pv/toolbars/samplingbar.hpp b/pv/toolbars/samplingbar.hpp
deleted file mode 100644 (file)
index 10e70cb..0000000
--- a/pv/toolbars/samplingbar.hpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * This file is part of the PulseView project.
- *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef PULSEVIEW_PV_TOOLBARS_SAMPLINGBAR_H
-#define PULSEVIEW_PV_TOOLBARS_SAMPLINGBAR_H
-
-#include <stdint.h>
-
-#include <list>
-#include <memory>
-
-#include <QComboBox>
-#include <QDoubleSpinBox>
-#include <QToolBar>
-#include <QToolButton>
-
-#include <pv/session.hpp>
-#include <pv/widgets/popuptoolbutton.hpp>
-#include <pv/widgets/sweeptimingwidget.hpp>
-
-namespace sigrok {
-       class Device;
-}
-
-Q_DECLARE_METATYPE(std::shared_ptr<sigrok::Device>)
-
-class QAction;
-
-namespace pv {
-
-class MainWindow;
-class Session;
-
-namespace toolbars {
-
-class SamplingBar : public QToolBar
-{
-       Q_OBJECT
-
-private:
-       static const uint64_t MinSampleCount;
-       static const uint64_t MaxSampleCount;
-       static const uint64_t DefaultSampleCount;
-
-public:
-       SamplingBar(Session &session, pv::MainWindow &main_window);
-
-       void set_device_list(
-               const std::list< std::shared_ptr<sigrok::Device> > &devices,
-               std::shared_ptr<sigrok::Device> selected);
-
-       std::shared_ptr<sigrok::Device> get_selected_device() const;
-
-       void set_capture_state(pv::Session::capture_state state);
-
-Q_SIGNALS:
-       void run_stop();
-
-private:
-       void update_sample_rate_selector();
-       void update_sample_rate_selector_value();
-       void update_sample_count_selector();
-       void update_device_config_widgets();
-       void commit_sample_rate();
-       void commit_sample_count();
-
-private Q_SLOTS:
-       void on_device_selected();
-       void on_sample_count_changed();
-       void on_sample_rate_changed();
-       void on_run_stop();
-
-       void on_config_changed();
-
-protected:
-       bool eventFilter(QObject *watched, QEvent *event);
-
-private:
-       Session &session_;
-       MainWindow &main_window_;
-
-       QComboBox device_selector_;
-       bool updating_device_selector_;
-
-       pv::widgets::PopupToolButton configure_button_;
-       QAction *configure_button_action_;
-
-       pv::widgets::PopupToolButton channels_button_;
-
-       pv::widgets::SweepTimingWidget sample_count_;
-       pv::widgets::SweepTimingWidget sample_rate_;
-       bool updating_sample_rate_;
-       bool updating_sample_count_;
-
-       bool sample_count_supported_;
-
-       QIcon icon_red_;
-       QIcon icon_green_;
-       QIcon icon_grey_;
-       QToolButton run_stop_button_;
-};
-
-} // namespace toolbars
-} // namespace pv
-
-#endif // PULSEVIEW_PV_TOOLBARS_SAMPLINGBAR_H