#include "devices/hardwaredevice.hpp"
#include "dialogs/settings.hpp"
#include "globalsettings.hpp"
+#include "subwindows/decoder_selector/subwindow.hpp"
#include "toolbars/mainbar.hpp"
#include "util.hpp"
#include "views/trace/view.hpp"
icon_green_(":/icons/status-green.svg"),
icon_grey_(":/icons/status-grey.svg")
{
- qRegisterMetaType<util::Timestamp>("util::Timestamp");
- qRegisterMetaType<uint64_t>("uint64_t");
-
GlobalSettings::add_change_handler(this);
setup_ui();
{
GlobalSettings::remove_change_handler(this);
+ // Make sure we no longer hold any shared pointers to widgets after the
+ // destructor finishes (goes for sessions and sub windows alike)
+
while (!sessions_.empty())
remove_session(sessions_.front());
+
+ sub_windows_.clear();
}
void MainWindow::show_session_error(const QString text, const QString info_text)
{
- qDebug().noquote() << "Notifying user of session error:" << info_text;
+ // TODO Emulate noquote()
+ qDebug() << "Notifying user of session error:" << info_text;
QMessageBox msg;
- msg.setText(text);
- msg.setInformativeText(info_text);
+ msg.setText(text + "\n\n" + info_text);
msg.setStandardButtons(QMessageBox::Ok);
msg.setIcon(QMessageBox::Warning);
msg.exec();
}
// Get the view contained in the dock widget
- for (auto entry : view_docks_)
+ for (auto& entry : view_docks_)
if (entry.first == dock)
return entry.second;
shared_ptr<views::ViewBase> v;
QMainWindow *main_window = nullptr;
- for (auto entry : session_windows_)
+ for (auto& entry : session_windows_)
if (entry.first.get() == &session)
main_window = entry.second;
QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
QAbstractButton *close_btn =
- dock->findChildren<QAbstractButton*>
- ("qt_dockwidget_closebutton").front();
+ dock->findChildren<QAbstractButton*>("qt_dockwidget_closebutton") // clazy:exclude=detaching-temporary
+ .front();
connect(close_btn, SIGNAL(clicked(bool)),
this, SLOT(on_view_close_clicked()));
connect(main_bar.get(), SIGNAL(new_view(Session*)),
this, SLOT(on_new_view(Session*)));
+ connect(main_bar.get(), SIGNAL(show_decoder_selector(Session*)),
+ this, SLOT(on_show_decoder_selector(Session*)));
main_bar->action_view_show_cursors()->setChecked(tv->cursors_shown());
continue;
// Find the dock the view is contained in and remove it
- for (auto entry : view_docks_)
+ for (auto& entry : view_docks_)
if (entry.second == view) {
// Remove the view from the session
session->deregister_view(view);
}
}
+shared_ptr<subwindows::SubWindowBase> MainWindow::add_subwindow(
+ subwindows::SubWindowType type, Session &session)
+{
+ GlobalSettings settings;
+ shared_ptr<subwindows::SubWindowBase> v;
+
+ QMainWindow *main_window = nullptr;
+ for (auto entry : session_windows_)
+ if (entry.first.get() == &session)
+ main_window = entry.second;
+
+ assert(main_window);
+
+ QString title = "";
+
+ switch (type) {
+ case subwindows::SubWindowTypeDecoderSelector:
+ title = tr("Decoder Selector");
+ }
+
+ QDockWidget* dock = new QDockWidget(title, main_window);
+ dock->setObjectName(title);
+ main_window->addDockWidget(Qt::TopDockWidgetArea, dock);
+
+ // Insert a QMainWindow into the dock widget to allow for a tool bar
+ QMainWindow *dock_main = new QMainWindow(dock);
+ dock_main->setWindowFlags(Qt::Widget); // Remove Qt::Window flag
+
+ if (type == subwindows::SubWindowTypeDecoderSelector)
+ v = make_shared<subwindows::decoder_selector::SubWindow>(session, dock_main);
+
+ if (!v)
+ return nullptr;
+
+ sub_windows_[dock] = v;
+ dock_main->setCentralWidget(v.get());
+ dock->setWidget(dock_main);
+
+ dock->setContextMenuPolicy(Qt::PreventContextMenu);
+ dock->setFeatures(QDockWidget::DockWidgetMovable |
+ QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
+
+ QAbstractButton *close_btn =
+ dock->findChildren<QAbstractButton*>
+ ("qt_dockwidget_closebutton").front();
+
+ connect(close_btn, SIGNAL(clicked(bool)),
+ this, SLOT(on_sub_window_close_clicked()));
+
+ if (v->has_toolbar())
+ dock_main->addToolBar(v->create_toolbar(dock_main));
+
+ return v;
+}
+
shared_ptr<Session> MainWindow::add_session()
{
static int last_session_id = 1;
session->stop_capture();
QApplication::processEvents();
- for (shared_ptr<views::ViewBase> view : session->views())
+ for (const shared_ptr<views::ViewBase>& view : session->views())
remove_view(view);
QMainWindow *window = session_windows_.at(session);
// When there are no more tabs, the height of the QTabWidget
// drops to zero. We must prevent this to keep the static
// widgets visible
- for (QWidget *w : static_tab_widget_->findChildren<QWidget*>())
+ for (QWidget *w : static_tab_widget_->findChildren<QWidget*>()) // clazy:exclude=range-loop
w->setMinimumHeight(h);
int margin = static_tab_widget_->layout()->contentsMargins().bottom();
// 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()) {
+ for (const shared_ptr<devices::HardwareDevice>& dev : device_manager_.devices()) {
if (dev == device_manager_.user_spec_device()) {
user_device = dev;
} else if (dev->hardware_device()->driver()->name() == "demo") {
QSettings settings;
int id = 0;
- for (shared_ptr<Session> session : sessions_) {
+ for (shared_ptr<Session>& session : sessions_) {
// Ignore sessions using the demo device or no device at all
if (session->device()) {
shared_ptr<devices::HardwareDevice> device =
shared_ptr<Session> MainWindow::get_tab_session(int index) const
{
// Find the session that belongs to the tab's main window
- for (auto entry : session_windows_)
+ for (auto& entry : session_windows_)
if (entry.second == session_selector_.widget(index))
return entry.first;
{
bool data_saved = true;
- for (auto entry : session_windows_)
+ for (auto& entry : session_windows_)
if (!entry.first->data_saved())
data_saved = false;
Session *session)
{
// We get a pointer and need a reference
- for (shared_ptr<Session> s : sessions_)
+ for (shared_ptr<Session>& s : sessions_)
if (s.get() == session)
add_view(title, type, *s);
}
Session *session = qobject_cast<Session*>(QObject::sender());
assert(session);
- for (shared_ptr<views::ViewBase> view : session->views()) {
+ for (const shared_ptr<views::ViewBase>& view : session->views()) {
// Get the dock that contains the view
- for (auto entry : view_docks_)
+ for (auto& entry : view_docks_)
if (entry.second == view) {
entry.first->setObjectName(session->name());
entry.first->setWindowTitle(session->name());
}
// Update the tab widget by finding the main window and the tab from that
- for (auto entry : session_windows_)
+ for (auto& entry : session_windows_)
if (entry.first.get() == session) {
QMainWindow *window = entry.second;
const int index = session_selector_.indexOf(window);
void MainWindow::on_new_view(Session *session)
{
// We get a pointer and need a reference
- for (shared_ptr<Session> s : sessions_)
+ for (shared_ptr<Session>& s : sessions_)
if (s.get() == session)
add_view(session->name(), views::ViewTypeTrace, *s);
}
// Get the view contained in the dock widget
shared_ptr<views::ViewBase> view;
- for (auto entry : view_docks_)
+ for (auto& entry : view_docks_)
if (entry.first == dock)
view = entry.second;
remove_session(session);
}
+void MainWindow::on_show_decoder_selector(Session *session)
+{
+ // Close dock widget if it's already showing and return
+ for (auto entry : sub_windows_) {
+ QDockWidget* dock = entry.first;
+ if (dynamic_pointer_cast<subwindows::decoder_selector::SubWindow>(entry.second)) {
+ sub_windows_.erase(dock);
+ dock->close();
+ return;
+ }
+ }
+
+ // We get a pointer and need a reference
+ for (shared_ptr<Session> s : sessions_)
+ if (s.get() == session)
+ add_subwindow(subwindows::SubWindowTypeDecoderSelector, *s);
+}
+
+void MainWindow::on_sub_window_close_clicked()
+{
+ // Find the dock widget that contains the close button that was clicked
+ QObject *w = QObject::sender();
+ QDockWidget *dock = nullptr;
+
+ while (w) {
+ dock = qobject_cast<QDockWidget*>(w);
+ if (dock)
+ break;
+ w = w->parent();
+ }
+
+ sub_windows_.erase(dock);
+ dock->close();
+}
+
void MainWindow::on_view_colored_bg_shortcut()
{
GlobalSettings settings;
{
bool state = new_value.toBool();
- for (auto entry : view_docks_) {
+ for (auto& entry : view_docks_) {
shared_ptr<views::ViewBase> viewbase = entry.second;
// Only trace views have this setting
{
bool state = new_value.toBool();
- for (auto entry : view_docks_) {
+ for (auto& entry : view_docks_) {
shared_ptr<views::ViewBase> viewbase = entry.second;
// Only trace views have this setting
{
bool state = new_value.toBool();
- for (auto entry : view_docks_) {
+ for (auto& entry : view_docks_) {
shared_ptr<views::ViewBase> viewbase = entry.second;
// Only trace views have this setting
projects / pulseview.git / blobdiff