projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Session: Use a monotonic clock to measure acquisition time.
[pulseview.git]
/
pv
/
mainwindow.cpp
diff --git
a/pv/mainwindow.cpp
b/pv/mainwindow.cpp
index d07d3316afb3632a5b9e828c122330851d5f9918..fb749f5701724e37be0fffae8d55c3edd3d22a7e 100644
(file)
--- a/
pv/mainwindow.cpp
+++ b/
pv/mainwindow.cpp
@@
-44,12
+44,15
@@
#include "devices/hardwaredevice.hpp"
#include "dialogs/settings.hpp"
#include "globalsettings.hpp"
#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"
#include "views/trace/standardbar.hpp"
#include "toolbars/mainbar.hpp"
#include "util.hpp"
#include "views/trace/view.hpp"
#include "views/trace/standardbar.hpp"
+#ifdef ENABLE_DECODE
+#include "subwindows/decoder_selector/subwindow.hpp"
+#endif
+
#include <libsigrokcxx/libsigrokcxx.hpp>
using std::dynamic_pointer_cast;
#include <libsigrokcxx/libsigrokcxx.hpp>
using std::dynamic_pointer_cast;
@@
-267,8
+270,13
@@
shared_ptr<subwindows::SubWindowBase> MainWindow::add_subwindow(
QString title = "";
switch (type) {
QString title = "";
switch (type) {
+#ifdef ENABLE_DECODE
case subwindows::SubWindowTypeDecoderSelector:
title = tr("Decoder Selector");
case subwindows::SubWindowTypeDecoderSelector:
title = tr("Decoder Selector");
+ break;
+#endif
+ default:
+ break;
}
QDockWidget* dock = new QDockWidget(title, main_window);
}
QDockWidget* dock = new QDockWidget(title, main_window);
@@
-279,8
+287,10
@@
shared_ptr<subwindows::SubWindowBase> MainWindow::add_subwindow(
QMainWindow *dock_main = new QMainWindow(dock);
dock_main->setWindowFlags(Qt::Widget); // Remove Qt::Window flag
QMainWindow *dock_main = new QMainWindow(dock);
dock_main->setWindowFlags(Qt::Widget); // Remove Qt::Window flag
+#ifdef ENABLE_DECODE
if (type == subwindows::SubWindowTypeDecoderSelector)
v = make_shared<subwindows::decoder_selector::SubWindow>(session, dock_main);
if (type == subwindows::SubWindowTypeDecoderSelector)
v = make_shared<subwindows::decoder_selector::SubWindow>(session, dock_main);
+#endif
if (!v)
return nullptr;
if (!v)
return nullptr;
@@
-303,6
+313,9
@@
shared_ptr<subwindows::SubWindowBase> MainWindow::add_subwindow(
if (v->has_toolbar())
dock_main->addToolBar(v->create_toolbar(dock_main));
if (v->has_toolbar())
dock_main->addToolBar(v->create_toolbar(dock_main));
+ if (v->minimum_width() > 0)
+ dock->setMinimumSize(v->minimum_width(), 0);
+
return v;
}
return v;
}
@@
-386,10
+399,10
@@
void MainWindow::remove_session(shared_ptr<Session> session)
}
void MainWindow::add_session_with_file(string open_file_name,
}
void MainWindow::add_session_with_file(string open_file_name,
- string open_file_format)
+ string open_file_format
, string open_setup_file_name
)
{
shared_ptr<Session> session = add_session();
{
shared_ptr<Session> session = add_session();
- session->load_init_file(open_file_name, open_file_format);
+ session->load_init_file(open_file_name, open_file_format
, open_setup_file_name
);
}
void MainWindow::add_default_session()
}
void MainWindow::add_default_session()
@@
-824,6
+837,7
@@
void MainWindow::on_tab_close_requested(int index)
void MainWindow::on_show_decoder_selector(Session *session)
{
void MainWindow::on_show_decoder_selector(Session *session)
{
+#ifdef ENABLE_DECODE
// Close dock widget if it's already showing and return
for (auto entry : sub_windows_) {
QDockWidget* dock = entry.first;
// Close dock widget if it's already showing and return
for (auto entry : sub_windows_) {
QDockWidget* dock = entry.first;
@@
-838,6
+852,7
@@
void MainWindow::on_show_decoder_selector(Session *session)
for (shared_ptr<Session> s : sessions_)
if (s.get() == session)
add_subwindow(subwindows::SubWindowTypeDecoderSelector, *s);
for (shared_ptr<Session> s : sessions_)
if (s.get() == session)
add_subwindow(subwindows::SubWindowTypeDecoderSelector, *s);
+#endif
}
void MainWindow::on_sub_window_close_clicked()
}
void MainWindow::on_sub_window_close_clicked()