#ifdef ENABLE_DECODE
#include "subwindows/decoder_selector/subwindow.hpp"
-#include "views/decoder_output/view.hpp"
+#include "views/decoder_binary/view.hpp"
+#include "views/tabular_decoder/view.hpp"
#endif
#include <libsigrokcxx/libsigrokcxx.hpp>
{
setup_ui();
restore_ui_settings();
+ connect(this, SIGNAL(session_error_raised(const QString, const QString)),
+ this, SLOT(on_session_error_raised(const QString, const QString)));
}
MainWindow::~MainWindow()
void MainWindow::show_session_error(const QString text, const QString info_text)
{
// TODO Emulate noquote()
- qDebug() << "Notifying user of session error:" << info_text;
+ qDebug() << "Notifying user of session error: " << text << "; " << info_text;
QMessageBox msg;
msg.setText(text + "\n\n" + info_text);
// This view will be the main view if there's no main bar yet
v = make_shared<views::trace::View>(session, (main_bar ? false : true), dock_main);
#ifdef ENABLE_DECODE
- if (type == views::ViewTypeDecoderOutput)
- v = make_shared<views::decoder_output::View>(session, false, dock_main);
+ if (type == views::ViewTypeDecoderBinary)
+ v = make_shared<views::decoder_binary::View>(session, false, dock_main);
+ if (type == views::ViewTypeTabularDecoder)
+ v = make_shared<views::tabular_decoder::View>(session, false, dock_main);
#endif
if (!v)
qobject_cast<views::ViewBase*>(v.get()),
SLOT(trigger_event(int, util::Timestamp)));
+ connect(&session, SIGNAL(session_error_raised(const QString, const QString)),
+ this, SLOT(on_session_error_raised(const QString, const QString)));
+
if (type == views::ViewTypeTrace) {
views::trace::View *tv =
qobject_cast<views::trace::View*>(v.get());
shared_ptr<Session> session = make_shared<Session>(device_manager_, name);
- connect(session.get(), SIGNAL(add_view(views::ViewType, Session*)),
- this, SLOT(on_add_view(views::ViewType, Session*)));
+ connect(session.get(), SIGNAL(add_view(ViewType, Session*)),
+ this, SLOT(on_add_view(ViewType, Session*)));
connect(session.get(), SIGNAL(name_changed()),
this, SLOT(on_session_name_changed()));
connect(session.get(), SIGNAL(device_changed()),
session_selector_.setCornerWidget(static_tab_widget_, Qt::TopLeftCorner);
session_selector_.setTabsClosable(true);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ close_application_shortcut_ = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_Q), this, SLOT(close()));
+ close_current_tab_shortcut_ = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_W), this, SLOT(on_close_current_tab()));
+#else
close_application_shortcut_ = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q), this, SLOT(close()));
- close_application_shortcut_->setAutoRepeat(false);
-
close_current_tab_shortcut_ = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), this, SLOT(on_close_current_tab()));
+#endif
+ close_application_shortcut_->setAutoRepeat(false);
connect(new_session_button_, SIGNAL(clicked(bool)),
this, SLOT(on_new_session_clicked()));
void MainWindow::update_acq_button(Session *session)
{
- int state = session->get_capture_state();
+ int state;
+ QString run_caption;
- const QString run_caption =
- session->using_file_device() ? tr("Reload") : tr("Run");
+ if (session) {
+ state = session->get_capture_state();
+ run_caption = session->using_file_device() ? tr("Reload") : tr("Run");
+ } else {
+ state = Session::Stopped;
+ run_caption = tr("Run");
+ }
const QIcon *icons[] = {&icon_grey_, &icon_red_, &icon_green_};
run_stop_button_->setIcon(*icons[state]);
return false;
}
+void MainWindow::on_run_stop_clicked()
+{
+ GlobalSettings settings;
+ bool all_sessions = settings.value(GlobalSettings::Key_General_StartAllSessions).toBool();
+
+ if (all_sessions)
+ {
+ vector< shared_ptr<Session> > hw_sessions;
+
+ // Make a list of all sessions where a hardware device is used
+ for (const shared_ptr<Session>& s : sessions_) {
+ shared_ptr<devices::HardwareDevice> hw_device =
+ dynamic_pointer_cast< devices::HardwareDevice >(s->device());
+ if (!hw_device)
+ continue;
+ hw_sessions.push_back(s);
+ }
+
+ // Stop all acquisitions if there are any running ones, start all otherwise
+ bool any_running = any_of(hw_sessions.begin(), hw_sessions.end(),
+ [](const shared_ptr<Session> &s)
+ { return (s->get_capture_state() == Session::AwaitingTrigger) ||
+ (s->get_capture_state() == Session::Running); });
+
+ for (shared_ptr<Session> s : hw_sessions)
+ if (any_running)
+ s->stop_capture();
+ else
+ s->start_capture([&](QString message) {Q_EMIT session_error_raised("Capture failed", message);});
+ } else {
+
+ shared_ptr<Session> session = last_focused_session_;
+
+ if (!session)
+ return;
+
+ switch (session->get_capture_state()) {
+ case Session::Stopped:
+ session->start_capture([&](QString message) {Q_EMIT session_error_raised("Capture failed", message);});
+ break;
+ case Session::AwaitingTrigger:
+ case Session::Running:
+ session->stop_capture();
+ break;
+ }
+ }
+}
+
void MainWindow::on_add_view(views::ViewType type, Session *session)
{
// We get a pointer and need a reference
add_session();
}
-void MainWindow::on_run_stop_clicked()
-{
- shared_ptr<Session> session = last_focused_session_;
-
- if (!session)
- return;
-
- switch (session->get_capture_state()) {
- case Session::Stopped:
- session->start_capture([&](QString message) {
- show_session_error("Capture failed", message); });
- break;
- case Session::AwaitingTrigger:
- case Session::Running:
- session->stop_capture();
- break;
- }
-}
-
void MainWindow::on_settings_clicked()
{
dialogs::Settings dlg(device_manager_);
tr("This session contains unsaved data. Close it anyway?"),
QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes))
remove_session(session);
+
+ if (sessions_.empty())
+ update_acq_button(nullptr);
}
void MainWindow::on_show_decoder_selector(Session *session)
for (shared_ptr<Session>& s : sessions_)
if (s.get() == session)
add_subwindow(subwindows::SubWindowTypeDecoderSelector, *s);
+#else
+ (void)session;
#endif
}
on_tab_close_requested(tab);
}
+void MainWindow::on_session_error_raised(const QString text, const QString info_text) {
+ MainWindow::show_session_error(text, info_text);
+}
+
} // namespace pv
projects / pulseview.git / blobdiff