From 7c65709437184b09753d1bcacc02467b8f6171f1 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Tue, 30 Dec 2014 14:37:29 +0000 Subject: [PATCH] MainBar: Renamed from SamplingBar --- CMakeLists.txt | 4 +- pv/mainwindow.cpp | 12 +++--- pv/mainwindow.hpp | 4 +- pv/prop/binding/deviceoptions.cpp | 2 +- pv/toolbars/{samplingbar.cpp => mainbar.cpp} | 42 ++++++++++---------- pv/toolbars/{samplingbar.hpp => mainbar.hpp} | 10 ++--- 6 files changed, 37 insertions(+), 37 deletions(-) rename pv/toolbars/{samplingbar.cpp => mainbar.cpp} (91%) rename pv/toolbars/{samplingbar.hpp => mainbar.hpp} (92%) diff --git a/CMakeLists.txt b/CMakeLists.txt index edb8a82c..ddabe2e8 100644 --- 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/toolbars/samplingbar.cpp + pv/toolbars/mainbar.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/toolbars/samplingbar.hpp + pv/toolbars/mainbar.hpp pv/view/cursor.hpp pv/view/flag.hpp pv/view/header.hpp diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 9fa4eee6..924e7058 100644 --- 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 "toolbars/samplingbar.hpp" +#include "toolbars/mainbar.hpp" #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 - 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(); - addToolBar(sampling_bar_); + addToolBar(main_bar_); // Set the title setWindowTitle(tr("PulseView")); @@ -394,7 +394,7 @@ void MainWindow::session_error( void MainWindow::update_device_list() { - assert(sampling_bar_); + assert(main_bar_); shared_ptr selected_device = session_.device(); list< shared_ptr > devices; @@ -410,7 +410,7 @@ void MainWindow::update_device_list() 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) @@ -563,7 +563,7 @@ void MainWindow::add_decoder(srd_decoder *decoder) 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() diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp index 35cad3ab..42462d22 100644 --- a/pv/mainwindow.hpp +++ b/pv/mainwindow.hpp @@ -42,7 +42,7 @@ class DeviceManager; namespace toolbars { class ContextBar; -class SamplingBar; +class MainBar; } namespace view { @@ -133,7 +133,7 @@ private: QWidget *central_widget_; QVBoxLayout *vertical_layout_; - toolbars::SamplingBar *sampling_bar_; + toolbars::MainBar *main_bar_; }; } // namespace pv diff --git a/pv/prop/binding/deviceoptions.cpp b/pv/prop/binding/deviceoptions.cpp index 8412104d..c995ea69 100644 --- a/pv/prop/binding/deviceoptions.cpp +++ b/pv/prop/binding/deviceoptions.cpp @@ -86,7 +86,7 @@ DeviceOptions::DeviceOptions(shared_ptr configurable) : { 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: diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/mainbar.cpp similarity index 91% rename from pv/toolbars/samplingbar.cpp rename to pv/toolbars/mainbar.cpp index 710f3128..7a387b4b 100644 --- a/pv/toolbars/samplingbar.cpp +++ b/pv/toolbars/mainbar.cpp @@ -27,7 +27,7 @@ #include #include -#include "samplingbar.hpp" +#include "mainbar.hpp" #include #include @@ -52,11 +52,11 @@ 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; +const uint64_t MainBar::MinSampleCount = 100ULL; +const uint64_t MainBar::MaxSampleCount = 1000000000000ULL; +const uint64_t MainBar::DefaultSampleCount = 1000000; -SamplingBar::SamplingBar(Session &session, MainWindow &main_window) : +MainBar::MainBar(Session &session, MainWindow &main_window) : QToolBar("Sampling Bar", &main_window), session_(session), main_window_(main_window), @@ -75,7 +75,7 @@ SamplingBar::SamplingBar(Session &session, MainWindow &main_window) : icon_grey_(":/icons/status-grey.svg"), run_stop_button_(this) { - setObjectName(QString::fromUtf8("SamplingBar")); + setObjectName(QString::fromUtf8("MainBar")); connect(&run_stop_button_, SIGNAL(clicked()), this, SLOT(on_run_stop())); @@ -110,7 +110,7 @@ SamplingBar::SamplingBar(Session &session, MainWindow &main_window) : sample_rate_.installEventFilter(this); } -void SamplingBar::set_device_list( +void MainBar::set_device_list( const std::list< std::shared_ptr > &devices, shared_ptr selected) { @@ -144,7 +144,7 @@ void SamplingBar::set_device_list( updating_device_selector_ = false; } -shared_ptr SamplingBar::get_selected_device() const +shared_ptr MainBar::get_selected_device() const { const int index = device_selector_.currentIndex(); if (index < 0) @@ -153,7 +153,7 @@ shared_ptr SamplingBar::get_selected_device() const return device_selector_.itemData(index).value>(); } -void SamplingBar::set_capture_state(pv::Session::capture_state state) +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]); @@ -162,7 +162,7 @@ void SamplingBar::set_capture_state(pv::Session::capture_state state) run_stop_button_.setShortcut(QKeySequence(Qt::Key_Space)); } -void SamplingBar::update_sample_rate_selector() +void MainBar::update_sample_rate_selector() { Glib::VariantContainerBase gvar_dict; GVariant *gvar_list; @@ -240,7 +240,7 @@ void SamplingBar::update_sample_rate_selector() update_sample_rate_selector_value(); } -void SamplingBar::update_sample_rate_selector_value() +void MainBar::update_sample_rate_selector_value() { if (updating_sample_rate_) return; @@ -263,7 +263,7 @@ void SamplingBar::update_sample_rate_selector_value() } } -void SamplingBar::update_sample_count_selector() +void MainBar::update_sample_count_selector() { if (updating_sample_count_) return; @@ -325,7 +325,7 @@ void SamplingBar::update_sample_count_selector() updating_sample_count_ = false; } -void SamplingBar::update_device_config_widgets() +void MainBar::update_device_config_widgets() { using namespace pv::popups; @@ -380,7 +380,7 @@ void SamplingBar::update_device_config_widgets() update_sample_rate_selector(); } -void SamplingBar::commit_sample_count() +void MainBar::commit_sample_count() { uint64_t sample_count = 0; @@ -410,7 +410,7 @@ void SamplingBar::commit_sample_count() updating_sample_count_ = false; } -void SamplingBar::commit_sample_rate() +void MainBar::commit_sample_rate() { uint64_t sample_rate = 0; @@ -439,7 +439,7 @@ void SamplingBar::commit_sample_rate() updating_sample_rate_ = false; } -void SamplingBar::on_device_selected() +void MainBar::on_device_selected() { if (updating_device_selector_) return; @@ -453,24 +453,24 @@ void SamplingBar::on_device_selected() update_device_config_widgets(); } -void SamplingBar::on_sample_count_changed() +void MainBar::on_sample_count_changed() { commit_sample_count(); } -void SamplingBar::on_sample_rate_changed() +void MainBar::on_sample_rate_changed() { commit_sample_rate(); } -void SamplingBar::on_run_stop() +void MainBar::on_run_stop() { commit_sample_count(); commit_sample_rate(); main_window_.run_stop(); } -void SamplingBar::on_config_changed() +void MainBar::on_config_changed() { commit_sample_count(); update_sample_count_selector(); @@ -478,7 +478,7 @@ void SamplingBar::on_config_changed() update_sample_rate_selector(); } -bool SamplingBar::eventFilter(QObject *watched, QEvent *event) +bool MainBar::eventFilter(QObject *watched, QEvent *event) { if ((watched == &sample_count_ || watched == &sample_rate_) && (event->type() == QEvent::ToolTip)) { diff --git a/pv/toolbars/samplingbar.hpp b/pv/toolbars/mainbar.hpp similarity index 92% rename from pv/toolbars/samplingbar.hpp rename to pv/toolbars/mainbar.hpp index 10e70cb9..d5d79c82 100644 --- a/pv/toolbars/samplingbar.hpp +++ b/pv/toolbars/mainbar.hpp @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef PULSEVIEW_PV_TOOLBARS_SAMPLINGBAR_H -#define PULSEVIEW_PV_TOOLBARS_SAMPLINGBAR_H +#ifndef PULSEVIEW_PV_TOOLBARS_MAINBAR_H +#define PULSEVIEW_PV_TOOLBARS_MAINBAR_H #include @@ -50,7 +50,7 @@ class Session; namespace toolbars { -class SamplingBar : public QToolBar +class MainBar : public QToolBar { Q_OBJECT @@ -60,7 +60,7 @@ private: static const uint64_t DefaultSampleCount; public: - SamplingBar(Session &session, pv::MainWindow &main_window); + MainBar(Session &session, pv::MainWindow &main_window); void set_device_list( const std::list< std::shared_ptr > &devices, @@ -120,4 +120,4 @@ private: } // namespace toolbars } // namespace pv -#endif // PULSEVIEW_PV_TOOLBARS_SAMPLINGBAR_H +#endif // PULSEVIEW_PV_TOOLBARS_MAINBAR_H -- 2.30.2