#include <QAction>
#include <QApplication>
#include <QCloseEvent>
+#include <QDebug>
#include <QDockWidget>
#include <QHBoxLayout>
#include <QMessageBox>
#include "globalsettings.hpp"
#include "toolbars/mainbar.hpp"
#include "util.hpp"
-#include "view/view.hpp"
+#include "views/trace/view.hpp"
#include "views/trace/standardbar.hpp"
#include <libsigrokcxx/libsigrokcxx.hpp>
-using std::bind;
using std::dynamic_pointer_cast;
using std::make_shared;
-using std::map;
-using std::placeholders::_1;
using std::shared_ptr;
using std::string;
qRegisterMetaType<util::Timestamp>("util::Timestamp");
qRegisterMetaType<uint64_t>("uint64_t");
- GlobalSettings::register_change_handler(GlobalSettings::Key_View_ColouredBG,
- bind(&MainWindow::on_settingViewColouredBg_changed, this, _1));
-
- GlobalSettings::register_change_handler(GlobalSettings::Key_View_ShowSamplingPoints,
- bind(&MainWindow::on_settingViewShowSamplingPoints_changed, this, _1));
-
- GlobalSettings::register_change_handler(GlobalSettings::Key_View_ShowAnalogMinorGrid,
- bind(&MainWindow::on_settingViewShowAnalogMinorGrid_changed, this, _1));
-
- GlobalSettings settings;
- settings.set_defaults_where_needed();
+ GlobalSettings::add_change_handler(this);
setup_ui();
restore_ui_settings();
MainWindow::~MainWindow()
{
+ GlobalSettings::remove_change_handler(this);
+
while (!sessions_.empty())
remove_session(sessions_.front());
}
+void MainWindow::show_session_error(const QString text, const QString info_text)
+{
+ // TODO Emulate noquote()
+ qDebug() << "Notifying user of session error:" << info_text;
+
+ QMessageBox msg;
+ msg.setText(text);
+ msg.setInformativeText(info_text);
+ msg.setStandardButtons(QMessageBox::Ok);
+ msg.setIcon(QMessageBox::Warning);
+ msg.exec();
+}
+
shared_ptr<views::ViewBase> MainWindow::get_active_view() const
{
// If there's only one view, use it...
if (type == views::ViewTypeTrace)
// This view will be the main view if there's no main bar yet
- v = make_shared<views::TraceView::View>(session,
+ v = make_shared<views::trace::View>(session,
(main_bar ? false : true), dock_main);
if (!v)
connect(close_btn, SIGNAL(clicked(bool)),
this, SLOT(on_view_close_clicked()));
- connect(&session, SIGNAL(trigger_event(util::Timestamp)),
+ connect(&session, SIGNAL(trigger_event(int, util::Timestamp)),
qobject_cast<views::ViewBase*>(v.get()),
- SLOT(trigger_event(util::Timestamp)));
+ SLOT(trigger_event(int, util::Timestamp)));
if (type == views::ViewTypeTrace) {
- views::TraceView::View *tv =
- qobject_cast<views::TraceView::View*>(v.get());
+ views::trace::View *tv =
+ qobject_cast<views::trace::View*>(v.get());
- tv->enable_coloured_bg(settings.value(GlobalSettings::Key_View_ColouredBG).toBool());
+ tv->enable_colored_bg(settings.value(GlobalSettings::Key_View_ColoredBG).toBool());
tv->enable_show_sampling_points(settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool());
tv->enable_show_analog_minor_grid(settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool());
shared_ptr<Session> session = add_session();
- map<string, string> dev_info;
- shared_ptr<devices::HardwareDevice> other_device, demo_device;
-
- // Use any available device that's not demo
+ // Check the list of available devices. Prefer the one that was
+ // found with user supplied scan specs (if applicable). Then try
+ // one of the auto detected devices that are not the demo device.
+ // Pick demo in the absence of "genuine" hardware devices.
+ shared_ptr<devices::HardwareDevice> user_device, other_device, demo_device;
for (shared_ptr<devices::HardwareDevice> dev : device_manager_.devices()) {
- if (dev->hardware_device()->driver()->name() == "demo") {
+ if (dev == device_manager_.user_spec_device()) {
+ user_device = dev;
+ } else if (dev->hardware_device()->driver()->name() == "demo") {
demo_device = dev;
} else {
other_device = dev;
}
}
-
- // ...and if there isn't any, just use demo then
- session->select_device(other_device ? other_device : demo_device);
+ if (user_device)
+ session->select_device(user_device);
+ else if (other_device)
+ session->select_device(other_device);
+ else
+ session->select_device(demo_device);
}
void MainWindow::save_sessions()
}
}
+void MainWindow::on_setting_changed(const QString &key, const QVariant &value)
+{
+ if (key == GlobalSettings::Key_View_ColoredBG)
+ on_settingViewColoredBg_changed(value);
+
+ if (key == GlobalSettings::Key_View_ShowSamplingPoints)
+ on_settingViewShowSamplingPoints_changed(value);
+
+ if (key == GlobalSettings::Key_View_ShowAnalogMinorGrid)
+ on_settingViewShowAnalogMinorGrid_changed(value);
+}
+
void MainWindow::setup_ui()
{
setObjectName(QString::fromUtf8("MainWindow"));
// Set the window icon
QIcon icon;
- icon.addFile(QString(":/icons/sigrok-logo-notext.png"));
+ icon.addFile(QString(":/icons/pulseview.png"));
setWindowIcon(icon);
view_sticky_scrolling_shortcut_ = new QShortcut(QKeySequence(Qt::Key_S), this, SLOT(on_view_sticky_scrolling_shortcut()));
view_show_analog_minor_grid_shortcut_ = new QShortcut(QKeySequence(Qt::Key_G), this, SLOT(on_view_show_analog_minor_grid_shortcut()));
view_show_analog_minor_grid_shortcut_->setAutoRepeat(false);
- view_coloured_bg_shortcut_ = new QShortcut(QKeySequence(Qt::Key_B), this, SLOT(on_view_coloured_bg_shortcut()));
- view_coloured_bg_shortcut_->setAutoRepeat(false);
+ view_colored_bg_shortcut_ = new QShortcut(QKeySequence(Qt::Key_B), this, SLOT(on_view_colored_bg_shortcut()));
+ view_colored_bg_shortcut_->setAutoRepeat(false);
// Set up the tab area
new_session_button_ = new QToolButton();
return false;
}
-void MainWindow::session_error(const QString text, const QString info_text)
-{
- QMetaObject::invokeMethod(this, "show_session_error",
- Qt::QueuedConnection, Q_ARG(QString, text),
- Q_ARG(QString, info_text));
-}
-
-void MainWindow::show_session_error(const QString text, const QString info_text)
-{
- QMessageBox msg(this);
- msg.setText(text);
- msg.setInformativeText(info_text);
- msg.setStandardButtons(QMessageBox::Ok);
- msg.setIcon(QMessageBox::Warning);
- msg.exec();
-}
-
void MainWindow::on_add_view(const QString &title, views::ViewType type,
Session *session)
{
switch (session->get_capture_state()) {
case Session::Stopped:
session->start_capture([&](QString message) {
- session_error("Capture failed", message); });
+ show_session_error("Capture failed", message); });
break;
case Session::AwaitingTrigger:
case Session::Running:
remove_session(session);
}
-void MainWindow::on_view_coloured_bg_shortcut()
+void MainWindow::on_view_colored_bg_shortcut()
{
GlobalSettings settings;
- bool state = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
- settings.setValue(GlobalSettings::Key_View_ColouredBG, !state);
+ bool state = settings.value(GlobalSettings::Key_View_ColoredBG).toBool();
+ settings.setValue(GlobalSettings::Key_View_ColoredBG, !state);
}
void MainWindow::on_view_sticky_scrolling_shortcut()
settings.setValue(GlobalSettings::Key_View_ShowAnalogMinorGrid, !state);
}
-void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value)
+void MainWindow::on_settingViewColoredBg_changed(const QVariant new_value)
{
bool state = new_value.toBool();
shared_ptr<views::ViewBase> viewbase = entry.second;
// Only trace views have this setting
- views::TraceView::View* view =
- qobject_cast<views::TraceView::View*>(viewbase.get());
+ views::trace::View* view =
+ qobject_cast<views::trace::View*>(viewbase.get());
if (view)
- view->enable_coloured_bg(state);
+ view->enable_colored_bg(state);
}
}
shared_ptr<views::ViewBase> viewbase = entry.second;
// Only trace views have this setting
- views::TraceView::View* view =
- qobject_cast<views::TraceView::View*>(viewbase.get());
+ views::trace::View* view =
+ qobject_cast<views::trace::View*>(viewbase.get());
if (view)
view->enable_show_sampling_points(state);
}
shared_ptr<views::ViewBase> viewbase = entry.second;
// Only trace views have this setting
- views::TraceView::View* view =
- qobject_cast<views::TraceView::View*>(viewbase.get());
+ views::trace::View* view =
+ qobject_cast<views::trace::View*>(viewbase.get());
if (view)
view->enable_show_analog_minor_grid(state);
}
projects / pulseview.git / blobdiff