projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move the "new session" button to the main window's tab area
[pulseview.git]
/
pv
/
toolbars
/
mainbar.cpp
diff --git
a/pv/toolbars/mainbar.cpp
b/pv/toolbars/mainbar.cpp
index 0adb6c9250c3bd17ca45c4e8da4d28466a97a7c1..f928de5166afe46063be9ccaf6215063961d3689 100644
(file)
--- a/
pv/toolbars/mainbar.cpp
+++ b/
pv/toolbars/mainbar.cpp
@@
-89,6
+89,7
@@
const char *MainBar::SettingSaveDirectory = "MainWindow/SaveDirectory";
MainBar::MainBar(Session &session, MainWindow &main_window) :
QToolBar("Sampling Bar", &main_window),
MainBar::MainBar(Session &session, MainWindow &main_window) :
QToolBar("Sampling Bar", &main_window),
+ action_new_view_(new QAction(this)),
action_open_(new QAction(this)),
action_save_as_(new QAction(this)),
action_save_selection_as_(new QAction(this)),
action_open_(new QAction(this)),
action_save_as_(new QAction(this)),
action_save_selection_as_(new QAction(this)),
@@
-114,8
+115,7
@@
MainBar::MainBar(Session &session, MainWindow &main_window) :
icon_green_(":/icons/status-green.svg"),
icon_grey_(":/icons/status-grey.svg"),
run_stop_button_(this),
icon_green_(":/icons/status-green.svg"),
icon_grey_(":/icons/status-grey.svg"),
run_stop_button_(this),
- run_stop_button_action_(nullptr),
- menu_button_(this)
+ run_stop_button_action_(nullptr)
#ifdef ENABLE_DECODE
, menu_decoders_add_(new pv::widgets::DecoderMenu(this, true))
#endif
#ifdef ENABLE_DECODE
, menu_decoders_add_(new pv::widgets::DecoderMenu(this, true))
#endif
@@
-127,6
+127,12
@@
MainBar::MainBar(Session &session, MainWindow &main_window) :
setContextMenuPolicy(Qt::PreventContextMenu);
// Actions
setContextMenuPolicy(Qt::PreventContextMenu);
// Actions
+ action_new_view_->setText(tr("New &View"));
+ action_new_view_->setIcon(QIcon::fromTheme("window-new",
+ QIcon(":/icons/window-new.png")));
+ connect(action_new_view_, SIGNAL(triggered(bool)),
+ this, SLOT(on_actionNewView_triggered()));
+
action_open_->setText(tr("&Open..."));
action_open_->setIcon(QIcon::fromTheme("document-open",
QIcon(":/icons/document-open.png")));
action_open_->setText(tr("&Open..."));
action_open_->setIcon(QIcon::fromTheme("document-open",
QIcon(":/icons/document-open.png")));
@@
-255,6
+261,8
@@
MainBar::MainBar(Session &session, MainWindow &main_window) :
#endif
// Setup the toolbar
#endif
// Setup the toolbar
+ addAction(action_new_view_);
+ addSeparator();
addWidget(open_button);
addWidget(save_button);
addSeparator();
addWidget(open_button);
addWidget(save_button);
addSeparator();
@@
-296,12
+304,6
@@
MainBar::MainBar(Session &session, MainWindow &main_window) :
addWidget(add_decoder_button);
#endif
addWidget(add_decoder_button);
#endif
- QWidget *const spacer = new QWidget();
- spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- addWidget(spacer);
-
- addWidget(&menu_button_);
-
sample_count_.installEventFilter(this);
sample_rate_.installEventFilter(this);
sample_count_.installEventFilter(this);
sample_rate_.installEventFilter(this);
@@
-485,12
+487,12
@@
void MainBar::load_file(QString file_name,
return;
}
return;
}
- session_.set_name(QFileInfo(file_name).fileName());
-
update_device_list();
session_.start_capture([&, errorMessage](QString infoMessage) {
session_error(errorMessage, infoMessage); });
update_device_list();
session_.start_capture([&, errorMessage](QString infoMessage) {
session_error(errorMessage, infoMessage); });
+
+ session_.set_name(QFileInfo(file_name).fileName());
}
void MainBar::update_sample_rate_selector()
}
void MainBar::update_sample_rate_selector()
@@
-799,7
+801,10
@@
void MainBar::export_file(shared_ptr<OutputFormat> format,
// Selection only? Verify that the cursors are active and fetch their values
if (selection_only) {
// Selection only? Verify that the cursors are active and fetch their values
if (selection_only) {
- if (!session_.main_view()->cursors()->enabled()) {
+ views::TraceView::View *trace_view =
+ qobject_cast<views::TraceView::View*>(session_.main_view().get());
+
+ if (!trace_view->cursors()->enabled()) {
show_session_error(tr("Missing Cursors"), tr("You need to set the " \
"cursors before you can save the data enclosed by them " \
"to a session file (e.g. using ALT-V - Show Cursors)."));
show_session_error(tr("Missing Cursors"), tr("You need to set the " \
"cursors before you can save the data enclosed by them " \
"to a session file (e.g. using ALT-V - Show Cursors)."));
@@
-808,8
+813,8
@@
void MainBar::export_file(shared_ptr<OutputFormat> format,
const double samplerate = session_.get_samplerate();
const double samplerate = session_.get_samplerate();
- const pv::util::Timestamp& start_time =
session_.main_view()
->cursors()->first()->time();
- const pv::util::Timestamp& end_time =
session_.main_view()
->cursors()->second()->time();
+ const pv::util::Timestamp& start_time =
trace_view
->cursors()->first()->time();
+ const pv::util::Timestamp& end_time =
trace_view
->cursors()->second()->time();
const uint64_t start_sample =
std::max((double)0, start_time.convert_to<double>() * samplerate);
const uint64_t start_sample =
std::max((double)0, start_time.convert_to<double>() * samplerate);
@@
-944,6
+949,11
@@
void MainBar::on_config_changed()
commit_sample_rate();
}
commit_sample_rate();
}
+void MainBar::on_actionNewView_triggered()
+{
+ new_view(&session_);
+}
+
void MainBar::on_actionOpen_triggered()
{
QSettings settings;
void MainBar::on_actionOpen_triggered()
{
QSettings settings;
@@
-990,31
+1000,46
@@
void MainBar::on_actionConnect_triggered()
void MainBar::on_actionViewZoomIn_triggered()
{
void MainBar::on_actionViewZoomIn_triggered()
{
- session_.main_view()->zoom(1);
+ views::TraceView::View *trace_view =
+ qobject_cast<views::TraceView::View*>(session_.main_view().get());
+
+ trace_view->zoom(1);
}
void MainBar::on_actionViewZoomOut_triggered()
{
}
void MainBar::on_actionViewZoomOut_triggered()
{
- session_.main_view()->zoom(-1);
+ views::TraceView::View *trace_view =
+ qobject_cast<views::TraceView::View*>(session_.main_view().get());
+
+ trace_view->zoom(-1);
}
void MainBar::on_actionViewZoomFit_triggered()
{
}
void MainBar::on_actionViewZoomFit_triggered()
{
- session_.main_view()->zoom_fit(action_view_zoom_fit_->isChecked());
+ views::TraceView::View *trace_view =
+ qobject_cast<views::TraceView::View*>(session_.main_view().get());
+
+ trace_view->zoom_fit(action_view_zoom_fit_->isChecked());
}
void MainBar::on_actionViewZoomOneToOne_triggered()
{
}
void MainBar::on_actionViewZoomOneToOne_triggered()
{
- session_.main_view()->zoom_one_to_one();
+ views::TraceView::View *trace_view =
+ qobject_cast<views::TraceView::View*>(session_.main_view().get());
+
+ trace_view->zoom_one_to_one();
}
void MainBar::on_actionViewShowCursors_triggered()
{
}
void MainBar::on_actionViewShowCursors_triggered()
{
- const bool show = !session_.main_view()->cursors_shown();
+ views::TraceView::View *trace_view =
+ qobject_cast<views::TraceView::View*>(session_.main_view().get());
+
+ const bool show = !trace_view->cursors_shown();
if (show)
if (show)
-
session_.main_view()
->centre_cursors();
+
trace_view
->centre_cursors();
-
session_.main_view()
->show_cursors(show);
+
trace_view
->show_cursors(show);
}
void MainBar::on_always_zoom_to_fit_changed(bool state)
}
void MainBar::on_always_zoom_to_fit_changed(bool state)