projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prop/bool: Add a tooltip containing a description.
[pulseview.git]
/
pv
/
mainwindow.cpp
diff --git
a/pv/mainwindow.cpp
b/pv/mainwindow.cpp
index b6cca7b2edadb99d8313b7d92ccbf4313c028386..5c399e43c38d1523abe748e52cb9c0d44039d792 100644
(file)
--- a/
pv/mainwindow.cpp
+++ b/
pv/mainwindow.cpp
@@
-21,11
+21,11
@@
#include <libsigrokdecode/libsigrokdecode.h>
#endif
#include <libsigrokdecode/libsigrokdecode.h>
#endif
-#include <cassert>
#include <algorithm>
#include <algorithm>
-#include <iterator>
-#include <cstdint>
+#include <cassert>
#include <cstdarg>
#include <cstdarg>
+#include <cstdint>
+#include <iterator>
#include <QAction>
#include <QApplication>
#include <QAction>
#include <QApplication>
@@
-34,26
+34,27
@@
#include <QHBoxLayout>
#include <QMessageBox>
#include <QSettings>
#include <QHBoxLayout>
#include <QMessageBox>
#include <QSettings>
-#include <QWidget>
#include <QShortcut>
#include <QShortcut>
+#include <QWidget>
#include "mainwindow.hpp"
#include "devicemanager.hpp"
#include "mainwindow.hpp"
#include "devicemanager.hpp"
-#include "globalsettings.hpp"
-#include "util.hpp"
#include "devices/hardwaredevice.hpp"
#include "dialogs/settings.hpp"
#include "devices/hardwaredevice.hpp"
#include "dialogs/settings.hpp"
+#include "globalsettings.hpp"
#include "toolbars/mainbar.hpp"
#include "toolbars/mainbar.hpp"
+#include "util.hpp"
#include "view/view.hpp"
#include "views/trace/standardbar.hpp"
#include <libsigrokcxx/libsigrokcxx.hpp>
#include "view/view.hpp"
#include "views/trace/standardbar.hpp"
#include <libsigrokcxx/libsigrokcxx.hpp>
+using std::bind;
using std::dynamic_pointer_cast;
using std::dynamic_pointer_cast;
-using std::list;
using std::make_shared;
using std::map;
using std::make_shared;
using std::map;
+using std::placeholders::_1;
using std::shared_ptr;
using std::string;
using std::shared_ptr;
using std::string;
@@
-65,9
+66,6
@@
class ViewItem;
using toolbars::MainBar;
using toolbars::MainBar;
-using std::bind;
-using std::placeholders::_1;
-
const QString MainWindow::WindowTitle = tr("PulseView");
MainWindow::MainWindow(DeviceManager &device_manager,
const QString MainWindow::WindowTitle = tr("PulseView");
MainWindow::MainWindow(DeviceManager &device_manager,
@@
-136,10
+134,10
@@
shared_ptr<views::ViewBase> MainWindow::get_active_view() const
QDockWidget *dock = nullptr;
while (w) {
QDockWidget *dock = nullptr;
while (w) {
- dock = qobject_cast<QDockWidget*>(w);
- if (dock)
- break;
- w = w->parent();
+
dock = qobject_cast<QDockWidget*>(w);
+
if (dock)
+
break;
+
w = w->parent();
}
// Get the view contained in the dock widget
}
// Get the view contained in the dock widget
@@
-474,7
+472,7
@@
void MainWindow::restore_ui_settings()
}
}
}
}
-s
td::s
hared_ptr<Session> MainWindow::get_tab_session(int index) const
+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_)
{
// Find the session that belongs to the tab's main window
for (auto entry : session_windows_)
@@
-539,7
+537,7
@@
void MainWindow::on_add_view(const QString &title, views::ViewType type,
Session *session)
{
// We get a pointer and need a reference
Session *session)
{
// We get a pointer and need a reference
- for (s
td::s
hared_ptr<Session> s : sessions_)
+ for (shared_ptr<Session> s : sessions_)
if (s.get() == session)
add_view(title, type, *s);
}
if (s.get() == session)
add_view(title, type, *s);
}
@@
-659,7
+657,7
@@
void MainWindow::on_capture_state_changed(QObject *obj)
void MainWindow::on_new_view(Session *session)
{
// We get a pointer and need a reference
void MainWindow::on_new_view(Session *session)
{
// We get a pointer and need a reference
- for (s
td::s
hared_ptr<Session> s : sessions_)
+ for (shared_ptr<Session> s : sessions_)
if (s.get() == session)
add_view(session->name(), views::ViewTypeTrace, *s);
}
if (s.get() == session)
add_view(session->name(), views::ViewTypeTrace, *s);
}