X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=1821ad1e67a69276bd3e6b04c607df0e2c1f121f;hb=0a4162a4bd844574319f8b26b05f4fcdf837bb70;hp=8d728a797c86ff0b4e95b66b2f3337a917887ad7;hpb=085cd160a4a279997d5e406af30838c21d59ff95;p=pulseview.git
diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 8d728a7..1821ad1 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
@@ -32,6 +31,7 @@
#include
#include
#include
+#include
#include
#include
@@ -43,6 +43,7 @@
#include "dialogs/about.hpp"
#include "toolbars/mainbar.hpp"
#include "view/view.hpp"
+#include "views/trace/standardbar.hpp"
#include
#include
@@ -71,9 +72,13 @@ MainWindow::MainWindow(DeviceManager &device_manager,
QMainWindow(parent),
device_manager_(device_manager),
session_selector_(this),
+ session_state_mapper_(this),
action_view_sticky_scrolling_(new QAction(this)),
action_view_coloured_bg_(new QAction(this)),
- action_about_(new QAction(this))
+ action_about_(new QAction(this)),
+ icon_red_(":/icons/status-red.svg"),
+ icon_green_(":/icons/status-green.svg"),
+ icon_grey_(":/icons/status-grey.svg")
{
qRegisterMetaType("util::Timestamp");
@@ -82,7 +87,7 @@ MainWindow::MainWindow(DeviceManager &device_manager,
if (!open_file_name.empty()) {
shared_ptr session = add_session();
- session->main_bar()->load_init_file(open_file_name, open_file_format);
+ session->load_init_file(open_file_name, open_file_format);
}
// Add empty default session if there aren't any sessions
@@ -102,8 +107,7 @@ MainWindow::MainWindow(DeviceManager &device_manager,
}
// ...and if there isn't any, just use demo then
- session->main_bar()->select_device(other_device ?
- other_device : demo_device);
+ session->select_device(other_device ? other_device : demo_device);
}
}
@@ -156,7 +160,7 @@ shared_ptr MainWindow::get_active_view() const
shared_ptr MainWindow::add_view(const QString &title,
views::ViewType type, Session &session)
{
- QMainWindow *main_window;
+ QMainWindow *main_window = nullptr;
for (auto entry : session_windows_)
if (entry.first.get() == &session)
main_window = entry.second;
@@ -200,17 +204,29 @@ shared_ptr MainWindow::add_view(const QString &title,
shared_ptr main_bar = session.main_bar();
if (!main_bar) {
- main_bar = make_shared(session, *this);
+ /* Initial view, create the main bar */
+ main_bar = make_shared(session, this, v.get());
dock_main->addToolBar(main_bar.get());
session.set_main_bar(main_bar);
connect(main_bar.get(), SIGNAL(new_view(Session*)),
this, SLOT(on_new_view(Session*)));
- }
- main_bar->action_view_show_cursors()->setChecked(v->cursors_shown());
- connect(v.get(), SIGNAL(always_zoom_to_fit_changed(bool)),
- main_bar.get(), SLOT(on_always_zoom_to_fit_changed(bool)));
+ main_bar->action_view_show_cursors()->setChecked(v->cursors_shown());
+
+ /* For the main view we need to prevent the dock widget from
+ * closing itself when its close button is clicked. This is
+ * so we can confirm with the user first. Regular views don't
+ * need this */
+ close_btn->disconnect(SIGNAL(clicked()), dock, SLOT(close()));
+ } else {
+ /* Additional view, create a standard bar */
+ pv::views::trace::StandardBar *standard_bar =
+ new pv::views::trace::StandardBar(session, this, v.get());
+ dock_main->addToolBar(standard_bar);
+
+ standard_bar->action_view_show_cursors()->setChecked(v->cursors_shown());
+ }
}
return v;
@@ -219,6 +235,34 @@ shared_ptr MainWindow::add_view(const QString &title,
return nullptr;
}
+void MainWindow::remove_view(shared_ptr view)
+{
+ for (shared_ptr session : sessions_) {
+ if (!session->has_view(view))
+ continue;
+
+ // Find the dock the view is contained in and remove it
+ for (auto entry : view_docks_)
+ if (entry.second == view) {
+ // Remove the view from the session
+ session->deregister_view(view);
+
+ // Remove the view from its parent; otherwise, Qt will
+ // call deleteLater() on it, which causes a double free
+ // since the shared_ptr in view_docks_ doesn't know
+ // that Qt keeps a pointer to the view around
+ view->setParent(0);
+
+ // Delete the view's dock widget and all widgets inside it
+ entry.first->deleteLater();
+
+ // Remove the dock widget from the list and stop iterating
+ view_docks_.erase(entry.first);
+ break;
+ }
+ }
+}
+
shared_ptr MainWindow::add_session()
{
static int last_session_id = 1;
@@ -230,6 +274,9 @@ shared_ptr MainWindow::add_session()
this, SLOT(on_add_view(const QString&, views::ViewType, Session*)));
connect(session.get(), SIGNAL(name_changed()),
this, SLOT(on_session_name_changed()));
+ session_state_mapper_.setMapping(session.get(), session.get());
+ connect(session.get(), SIGNAL(capture_state_changed(int)),
+ &session_state_mapper_, SLOT(map()));
sessions_.push_back(session);
@@ -239,6 +286,7 @@ shared_ptr MainWindow::add_session()
int index = session_selector_.addTab(window, name);
session_selector_.setCurrentIndex(index);
+ last_focused_session_ = session;
window->setDockNestingEnabled(true);
@@ -252,29 +300,17 @@ void MainWindow::remove_session(shared_ptr session)
{
int h = new_session_button_->height();
- for (shared_ptr view : session->views()) {
- // Find the dock the view is contained in and remove it
- for (auto entry : view_docks_)
- if (entry.second == view) {
- // Remove the view from the session
- session->deregister_view(view);
-
- // Remove the view from its parent; otherwise, Qt will
- // call deleteLater() on it, which causes a double free
- // since the shared_ptr in view_docks_ doesn't know
- // that Qt keeps a pointer to the view around
- entry.second->setParent(0);
-
- // Remove this entry from the container
- view_docks_.erase(entry.first);
- }
- }
+ for (shared_ptr view : session->views())
+ remove_view(view);
QMainWindow *window = session_windows_.at(session);
session_selector_.removeTab(session_selector_.indexOf(window));
session_windows_.erase(session);
+ if (last_focused_session_ == session)
+ last_focused_session_.reset();
+
sessions_.remove_if([&](shared_ptr s) {
return s == session; });
@@ -318,20 +354,42 @@ void MainWindow::setup_ui()
action_view_coloured_bg_->setShortcut(QKeySequence(Qt::Key_B));
action_view_coloured_bg_->setObjectName(
QString::fromUtf8("actionViewColouredBg"));
- action_view_coloured_bg_->setText(tr("Use &coloured backgrounds"));
+ action_view_coloured_bg_->setText(tr("Use &Coloured Backgrounds"));
action_about_->setObjectName(QString::fromUtf8("actionAbout"));
- action_about_->setText(tr("&About..."));
+ action_about_->setToolTip(tr("&About..."));
// Set up the tab area
new_session_button_ = new QToolButton();
new_session_button_->setIcon(QIcon::fromTheme("document-new",
QIcon(":/icons/document-new.png")));
+ new_session_button_->setToolTip(tr("Create New Session"));
new_session_button_->setAutoRaise(true);
+ run_stop_button_ = new QToolButton();
+ run_stop_button_->setAutoRaise(true);
+ run_stop_button_->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+ run_stop_button_->setShortcut(QKeySequence(Qt::Key_Space));
+ run_stop_button_->setToolTip(tr("Start/Stop Acquisition"));
+
+ settings_button_ = new QToolButton();
+ settings_button_->setIcon(QIcon::fromTheme("configure",
+ QIcon(":/icons/configure.png")));
+ settings_button_->setToolTip(tr("Settings"));
+ settings_button_->setAutoRaise(true);
+
+ QFrame *separator1 = new QFrame();
+ separator1->setFrameStyle(QFrame::VLine | QFrame::Raised);
+ QFrame *separator2 = new QFrame();
+ separator2->setFrameStyle(QFrame::VLine | QFrame::Raised);
+
QHBoxLayout* layout = new QHBoxLayout();
layout->setContentsMargins(2, 2, 2, 2);
layout->addWidget(new_session_button_);
+ layout->addWidget(separator1);
+ layout->addWidget(run_stop_button_);
+ layout->addWidget(separator2);
+ layout->addWidget(settings_button_);
static_tab_widget_ = new QWidget();
static_tab_widget_->setLayout(layout);
@@ -341,6 +399,10 @@ void MainWindow::setup_ui()
connect(new_session_button_, SIGNAL(clicked(bool)),
this, SLOT(on_new_session_clicked()));
+ connect(run_stop_button_, SIGNAL(clicked(bool)),
+ this, SLOT(on_run_stop_clicked()));
+ connect(&session_state_mapper_, SIGNAL(mapped(QObject*)),
+ this, SLOT(on_capture_state_changed(QObject*)));
connect(&session_selector_, SIGNAL(tabCloseRequested(int)),
this, SLOT(on_tab_close_requested(int)));
@@ -421,8 +483,20 @@ std::shared_ptr MainWindow::get_tab_session(int index) const
void MainWindow::closeEvent(QCloseEvent *event)
{
- save_ui_settings();
- event->accept();
+ bool data_saved = true;
+
+ for (auto entry : session_windows_)
+ if (!entry.first->data_saved())
+ data_saved = false;
+
+ if (!data_saved && (QMessageBox::question(this, tr("Confirmation"),
+ tr("There is unsaved data. Close anyway?"),
+ QMessageBox::Yes | QMessageBox::No) == QMessageBox::No)) {
+ event->ignore();
+ } else {
+ save_ui_settings();
+ event->accept();
+ }
}
QMenu* MainWindow::createPopupMenu()
@@ -441,6 +515,23 @@ bool MainWindow::restoreState(const QByteArray &state, int version)
return false;
}
+void MainWindow::session_error(const QString text, const QString info_text)
+{
+ QMetaObject::invokeMethod(this, "show_session_error",
+ Qt::QueuedConnection, Q_ARG(QString, text),
+ Q_ARG(QString, info_text));
+}
+
+void MainWindow::show_session_error(const QString text, const QString info_text)
+{
+ QMessageBox msg(this);
+ msg.setText(text);
+ msg.setInformativeText(info_text);
+ msg.setStandardButtons(QMessageBox::Ok);
+ msg.setIcon(QMessageBox::Warning);
+ msg.exec();
+}
+
void MainWindow::on_add_view(const QString &title, views::ViewType type,
Session *session)
{
@@ -452,14 +543,12 @@ void MainWindow::on_add_view(const QString &title, views::ViewType type,
void MainWindow::on_focus_changed()
{
- static shared_ptr prev_session;
-
shared_ptr view = get_active_view();
if (view) {
for (shared_ptr session : sessions_) {
if (session->has_view(view)) {
- if (session != prev_session) {
+ if (session != last_focused_session_) {
// Activate correct tab if necessary
shared_ptr tab_session = get_tab_session(
session_selector_.currentIndex());
@@ -470,7 +559,6 @@ void MainWindow::on_focus_changed()
on_focused_session_changed(session);
}
- prev_session = session;
break;
}
}
@@ -482,7 +570,12 @@ void MainWindow::on_focus_changed()
void MainWindow::on_focused_session_changed(shared_ptr session)
{
+ last_focused_session_ = session;
+
setWindowTitle(session->name() + " - " + WindowTitle);
+
+ // Update the state of the run/stop button, too
+ on_capture_state_changed(session.get());
}
void MainWindow::on_new_session_clicked()
@@ -490,6 +583,25 @@ void MainWindow::on_new_session_clicked()
add_session();
}
+void MainWindow::on_run_stop_clicked()
+{
+ shared_ptr session = last_focused_session_;
+
+ if (!session)
+ return;
+
+ switch (session->get_capture_state()) {
+ case Session::Stopped:
+ session->start_capture([&](QString message) {
+ session_error("Capture failed", message); });
+ break;
+ case Session::AwaitingTrigger:
+ case Session::Running:
+ session->stop_capture();
+ break;
+ }
+}
+
void MainWindow::on_session_name_changed()
{
// Update the corresponding dock widget's name(s)
@@ -505,13 +617,36 @@ void MainWindow::on_session_name_changed()
}
}
- // Refresh window title if the affected session has focus
- shared_ptr view = get_active_view();
+ // Update the tab widget by finding the main window and the tab from that
+ for (auto entry : session_windows_)
+ if (entry.first.get() == session) {
+ QMainWindow *window = entry.second;
+ const int index = session_selector_.indexOf(window);
+ session_selector_.setTabText(index, session->name());
+ }
- if (view && session->has_view(view))
+ // Refresh window title if the affected session has focus
+ if (session == last_focused_session_.get())
setWindowTitle(session->name() + " - " + WindowTitle);
}
+void MainWindow::on_capture_state_changed(QObject *obj)
+{
+ Session *caller = qobject_cast(obj);
+
+ // Ignore if caller is not the currently focused session
+ // unless there is only one session
+ if ((sessions_.size() > 1) && (caller != last_focused_session_.get()))
+ return;
+
+ int state = caller->get_capture_state();
+
+ const QIcon *icons[] = {&icon_grey_, &icon_red_, &icon_green_};
+ run_stop_button_->setIcon(*icons[state]);
+ run_stop_button_->setText((state == pv::Session::Stopped) ?
+ tr("Run") : tr("Stop"));
+}
+
void MainWindow::on_new_view(Session *session)
{
// We get a pointer and need a reference
@@ -545,12 +680,17 @@ void MainWindow::on_view_close_clicked()
if (!session->has_view(view))
continue;
- // Also destroy the entire session if its main view is closing
+ // Also destroy the entire session if its main view is closing...
if (view == session->main_view()) {
- remove_session(session);
+ // ...but only if data is saved or the user confirms closing
+ if (session->data_saved() || (QMessageBox::question(this, tr("Confirmation"),
+ tr("This session contains unsaved data. Close it anyway?"),
+ QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes))
+ remove_session(session);
break;
} else
- session->deregister_view(view);
+ // All other views can be closed at any time as no data will be lost
+ remove_view(view);
}
}
@@ -564,11 +704,13 @@ void MainWindow::on_tab_changed(int index)
void MainWindow::on_tab_close_requested(int index)
{
- // TODO Ask user if this is intended in case data is unsaved
-
shared_ptr session = get_tab_session(index);
- if (session)
+ assert(session);
+
+ if (session->data_saved() || (QMessageBox::question(this, tr("Confirmation"),
+ tr("This session contains unsaved data. Close it anyway?"),
+ QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes))
remove_session(session);
}