#include <QAction>
#include <QApplication>
#include <QButtonGroup>
+#include <QCloseEvent>
#include <QFileDialog>
#include <QMessageBox>
#include <QMenu>
#include <QVBoxLayout>
#include <QWidget>
-#include "mainwindow.h"
+#include "mainwindow.hpp"
-#include "devicemanager.h"
-#include "device/device.h"
-#include "dialogs/about.h"
-#include "dialogs/connect.h"
-#include "dialogs/storeprogress.h"
-#include "toolbars/samplingbar.h"
-#include "view/logicsignal.h"
-#include "view/view.h"
+#include "devicemanager.hpp"
+#include "dialogs/about.hpp"
+#include "dialogs/connect.hpp"
+#include "dialogs/storeprogress.hpp"
+#include "toolbars/mainbar.hpp"
+#include "view/logicsignal.hpp"
+#include "view/view.hpp"
#ifdef ENABLE_DECODE
-#include "widgets/decodermenu.h"
+#include "widgets/decodermenu.hpp"
#endif
-/* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
-#define __STDC_FORMAT_MACROS
#include <inttypes.h>
#include <stdint.h>
#include <stdarg.h>
#include <glib.h>
-#include <libsigrok/libsigrok.h>
+#include <libsigrok/libsigrok.hpp>
using std::list;
+using std::map;
using std::shared_ptr;
+using std::string;
+
+using sigrok::Device;
+using sigrok::Error;
+using sigrok::HardwareDevice;
namespace pv {
namespace view {
-class SelectableItem;
+class ViewItem;
}
const char *MainWindow::SettingOpenDirectory = "MainWindow/OpenDirectory";
const char *open_file_name,
QWidget *parent) :
QMainWindow(parent),
- _device_manager(device_manager),
- _session(device_manager)
+ device_manager_(device_manager),
+ session_(device_manager)
{
setup_ui();
+ restore_ui_settings();
if (open_file_name) {
const QString s(QString::fromUtf8(open_file_name));
QMetaObject::invokeMethod(this, "load_file",
}
}
+void MainWindow::run_stop()
+{
+ 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::select_device(shared_ptr<Device> device)
+{
+ try {
+ session_.set_device(device);
+ } catch(const QString &e) {
+ QMessageBox msg(this);
+ msg.setText(e);
+ msg.setInformativeText(tr("Failed to Select Device"));
+ msg.setStandardButtons(QMessageBox::Ok);
+ msg.setIcon(QMessageBox::Warning);
+ msg.exec();
+ }
+}
+
void MainWindow::setup_ui()
{
setObjectName(QString::fromUtf8("MainWindow"));
- resize(1024, 768);
-
// Set the window icon
QIcon icon;
icon.addFile(QString::fromUtf8(":/icons/sigrok-logo-notext.png"),
setWindowIcon(icon);
// Setup the central widget
- _central_widget = new QWidget(this);
- _vertical_layout = new QVBoxLayout(_central_widget);
- _vertical_layout->setSpacing(6);
- _vertical_layout->setContentsMargins(0, 0, 0, 0);
- setCentralWidget(_central_widget);
+ central_widget_ = new QWidget(this);
+ vertical_layout_ = new QVBoxLayout(central_widget_);
+ vertical_layout_->setSpacing(6);
+ vertical_layout_->setContentsMargins(0, 0, 0, 0);
+ setCentralWidget(central_widget_);
- _view = new pv::view::View(_session, this);
+ view_ = new pv::view::View(session_, this);
- _vertical_layout->addWidget(_view);
+ vertical_layout_->addWidget(view_);
// Setup the menu bar
QMenuBar *const menu_bar = new QMenuBar(this);
QAction *action_view_show_cursors = new QAction(this);
action_view_show_cursors->setCheckable(true);
- action_view_show_cursors->setChecked(_view->cursors_shown());
+ action_view_show_cursors->setChecked(view_->cursors_shown());
action_view_show_cursors->setShortcut(QKeySequence(Qt::Key_C));
action_view_show_cursors->setObjectName(
QString::fromUtf8("actionViewShowCursors"));
// Setup the toolbar
QToolBar *const toolbar = new QToolBar(tr("Main Toolbar"), this);
+ toolbar->setObjectName(QString::fromUtf8("MainToolbar"));
toolbar->addAction(action_open);
toolbar->addAction(action_save_as);
toolbar->addSeparator();
addToolBar(toolbar);
// Setup the sampling bar
- _sampling_bar = new toolbars::SamplingBar(_session, this);
+ main_bar_ = new toolbars::MainBar(session_, *this);
// Populate the device list and select the initially selected device
update_device_list();
- connect(_sampling_bar, SIGNAL(run_stop()), this,
- SLOT(run_stop()));
- addToolBar(_sampling_bar);
+ addToolBar(main_bar_);
// Set the title
setWindowTitle(tr("PulseView"));
- // Setup _session events
- connect(&_session, SIGNAL(capture_state_changed(int)), this,
+ // Setup session_ events
+ connect(&session_, SIGNAL(capture_state_changed(int)), this,
SLOT(capture_state_changed(int)));
+ connect(&session_, SIGNAL(device_selected()), this,
+ SLOT(device_selected()));
+}
+
+void MainWindow::save_ui_settings()
+{
+ QSettings settings;
+
+ map<string, string> dev_info;
+ list<string> key_list;
+
+ settings.beginGroup("MainWindow");
+ settings.setValue("state", saveState());
+ settings.setValue("geometry", saveGeometry());
+ settings.endGroup();
+
+ if (session_.device()) {
+ settings.beginGroup("Device");
+ key_list.push_back("vendor");
+ key_list.push_back("model");
+ key_list.push_back("version");
+ key_list.push_back("serial_num");
+ key_list.push_back("connection_id");
+
+ dev_info = device_manager_.get_device_info(
+ session_.device());
+
+ for (string key : key_list) {
+
+ if (dev_info.count(key))
+ settings.setValue(QString::fromUtf8(key.c_str()),
+ QString::fromUtf8(dev_info.at(key).c_str()));
+ else
+ settings.remove(QString::fromUtf8(key.c_str()));
+ }
+
+ settings.endGroup();
+ }
+}
+
+void MainWindow::restore_ui_settings()
+{
+ QSettings settings;
+
+ shared_ptr<HardwareDevice> device;
+
+ map<string, string> dev_info;
+ list<string> key_list;
+ string value;
+
+ settings.beginGroup("MainWindow");
+
+ if (settings.contains("geometry")) {
+ restoreGeometry(settings.value("geometry").toByteArray());
+ restoreState(settings.value("state").toByteArray());
+ } else
+ resize(1000, 720);
+
+ settings.endGroup();
+
+ // Re-select last used device if possible.
+ settings.beginGroup("Device");
+ key_list.push_back("vendor");
+ key_list.push_back("model");
+ key_list.push_back("version");
+ key_list.push_back("serial_num");
+ key_list.push_back("connection_id");
+
+ for (string key : key_list) {
+ if (!settings.contains(QString::fromUtf8(key.c_str())))
+ continue;
+ value = settings.value(QString::fromUtf8(key.c_str())).toString().toStdString();
+
+ if (value.size() > 0)
+ dev_info.insert(std::make_pair(key, value));
+ }
+
+ device = device_manager_.find_device_from_info(dev_info);
+
+ if (device) {
+ select_device(device);
+ update_device_list();
+ }
+
+ settings.endGroup();
}
void MainWindow::session_error(
void MainWindow::update_device_list()
{
- assert(_sampling_bar);
+ assert(main_bar_);
- shared_ptr<pv::device::DevInst> selected_device = _session.get_device();
- list< shared_ptr<device::DevInst> > devices;
- std::copy(_device_manager.devices().begin(),
- _device_manager.devices().end(), std::back_inserter(devices));
+ shared_ptr<Device> selected_device = session_.device();
+ list< shared_ptr<Device> > devices;
+
+ if (device_manager_.devices().size() == 0)
+ return;
+
+ std::copy(device_manager_.devices().begin(),
+ device_manager_.devices().end(), std::back_inserter(devices));
if (std::find(devices.begin(), devices.end(), selected_device) ==
devices.end())
devices.push_back(selected_device);
assert(selected_device);
- _sampling_bar->set_device_list(devices, selected_device);
+ main_bar_->set_device_list(devices, selected_device);
+}
+
+void MainWindow::closeEvent(QCloseEvent *event)
+{
+ save_ui_settings();
+ event->accept();
}
void MainWindow::load_file(QString file_name)
const QString infoMessage;
try {
- _session.set_file(file_name.toStdString());
- } catch(QString e) {
- show_session_error(tr("Failed to load ") + file_name, e);
- _session.set_default_device();
+ session_.set_file(file_name.toStdString());
+ } catch(Error e) {
+ show_session_error(tr("Failed to load ") + file_name, e.what());
+ session_.set_default_device();
update_device_list();
return;
}
update_device_list();
- _session.start_capture([&, errorMessage, infoMessage](QString) {
+ session_.start_capture([&, errorMessage, infoMessage](QString) {
session_error(errorMessage, infoMessage); });
}
using pv::dialogs::StoreProgress;
// Stop any currently running capture session
- _session.stop_capture();
+ session_.stop_capture();
QSettings settings;
const QString dir = settings.value(SettingSaveDirectory).toString();
const QString abs_path = QFileInfo(file_name).absolutePath();
settings.setValue(SettingSaveDirectory, abs_path);
- StoreProgress *dlg = new StoreProgress(file_name, _session, this);
+ StoreProgress *dlg = new StoreProgress(file_name, session_, this);
dlg->run();
}
void MainWindow::on_actionConnect_triggered()
{
// Stop any currently running capture session
- _session.stop_capture();
+ session_.stop_capture();
- dialogs::Connect dlg(this, _device_manager);
+ dialogs::Connect dlg(this, device_manager_);
// If the user selected a device, select it in the device list. Select the
// current device otherwise.
if (dlg.exec())
- _session.set_device(dlg.get_selected_device());
+ select_device(dlg.get_selected_device());
update_device_list();
}
void MainWindow::on_actionViewZoomIn_triggered()
{
- _view->zoom(1);
+ view_->zoom(1);
}
void MainWindow::on_actionViewZoomOut_triggered()
{
- _view->zoom(-1);
+ view_->zoom(-1);
}
void MainWindow::on_actionViewZoomFit_triggered()
{
- _view->zoom_fit();
+ view_->zoom_fit();
}
void MainWindow::on_actionViewZoomOneToOne_triggered()
{
- _view->zoom_one_to_one();
+ view_->zoom_one_to_one();
}
void MainWindow::on_actionViewShowCursors_triggered()
{
- assert(_view);
+ assert(view_);
- const bool show = !_view->cursors_shown();
+ const bool show = !view_->cursors_shown();
if(show)
- _view->centre_cursors();
+ view_->centre_cursors();
- _view->show_cursors(show);
+ view_->show_cursors(show);
}
void MainWindow::on_actionAbout_triggered()
{
- dialogs::About dlg(this);
+ dialogs::About dlg(device_manager_.context(), this);
dlg.exec();
}
{
#ifdef ENABLE_DECODE
assert(decoder);
- _session.add_decoder(decoder);
+ session_.add_decoder(decoder);
#else
(void)decoder;
#endif
}
-void MainWindow::run_stop()
+void MainWindow::capture_state_changed(int state)
{
- switch(_session.get_capture_state()) {
- case SigSession::Stopped:
- _session.start_capture([&](QString message) {
- session_error("Capture failed", message); });
- break;
-
- case SigSession::AwaitingTrigger:
- case SigSession::Running:
- _session.stop_capture();
- break;
- }
+ main_bar_->set_capture_state((pv::Session::capture_state)state);
}
-void MainWindow::capture_state_changed(int state)
+void MainWindow::device_selected()
{
- _sampling_bar->set_capture_state((pv::SigSession::capture_state)state);
+ // Set the title to include the device/file name
+ const shared_ptr<sigrok::Device> device = session_.device();
+ if (!device)
+ return;
+
+ const string display_name = device_manager_.get_display_name(device);
+ setWindowTitle(tr("%1 - PulseView").arg(display_name.c_str()));
}
} // namespace pv
projects / pulseview.git / blobdiff