#include <boost/bind.hpp>
#include <boost/foreach.hpp>
+#include <algorithm>
+#include <iterator>
+
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
#include "mainwindow.h"
#include "devicemanager.h"
+#include "device/device.h"
#include "dialogs/about.h"
#include "dialogs/connect.h"
#include "dialogs/storeprogress.h"
#include <glib.h>
#include <libsigrok/libsigrok.h>
+using boost::shared_ptr;
using std::list;
namespace pv {
"MainWindow", "Zoom &In", 0, QApplication::UnicodeUTF8));
action_view_zoom_in->setIcon(QIcon::fromTheme("zoom-in",
QIcon(":/icons/zoom-in.png")));
+ // simply using Qt::Key_Plus shows no + in the menu
+ action_view_zoom_in->setShortcut(QKeySequence::ZoomIn);
action_view_zoom_in->setObjectName(
QString::fromUtf8("actionViewZoomIn"));
menu_view->addAction(action_view_zoom_in);
"MainWindow", "Zoom &Out", 0, QApplication::UnicodeUTF8));
action_view_zoom_out->setIcon(QIcon::fromTheme("zoom-out",
QIcon(":/icons/zoom-out.png")));
+ action_view_zoom_out->setShortcut(QKeySequence::ZoomOut);
action_view_zoom_out->setObjectName(
QString::fromUtf8("actionViewZoomOut"));
menu_view->addAction(action_view_zoom_out);
Q_ARG(QString, info_text));
}
-void MainWindow::update_device_list(struct sr_dev_inst *selected_device)
+void MainWindow::update_device_list()
{
assert(_sampling_bar);
- const list<sr_dev_inst*> &devices = _device_manager.devices();
- _sampling_bar->set_device_list(devices);
+ 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));
- if (!selected_device && !devices.empty()) {
- // Fall back to the first device in the list.
- selected_device = devices.front();
+ if (std::find(devices.begin(), devices.end(), selected_device) ==
+ devices.end())
+ devices.push_back(selected_device);
- // Try and find the demo device and select that by default
- BOOST_FOREACH (struct sr_dev_inst *sdi, devices)
- if (strcmp(sdi->driver->name, "demo") == 0) {
- selected_device = sdi;
- }
- }
+ _sampling_bar->set_device_list(devices);
- if (selected_device) {
+ if (selected_device)
_sampling_bar->set_selected_device(selected_device);
- _session.set_device(selected_device);
- }
}
void MainWindow::load_file(QString file_name)
const QString errorMessage(
QString("Failed to load file %1").arg(file_name));
const QString infoMessage;
- _session.load_file(file_name.toStdString(),
- boost::bind(&MainWindow::session_error, this,
- errorMessage, infoMessage));
+
+ try {
+ _session.set_file(file_name.toStdString());
+ } catch(QString e) {
+ show_session_error(tr("Failed to load ") + file_name, e);
+ }
+
+ update_device_list();
+
+ _session.start_capture(boost::bind(&MainWindow::session_error, this,
+ errorMessage, infoMessage));
}
void MainWindow::show_session_error(
// If the user selected a device, select it in the device list. Select the
// current device otherwise.
- struct sr_dev_inst *const sdi = dlg.exec() ?
- dlg.get_selected_device() : _session.get_device();
+ if (dlg.exec())
+ _session.set_device(dlg.get_selected_device());
- update_device_list(sdi);
+ update_device_list();
}
void MainWindow::on_actionQuit_triggered()
{
switch(_session.get_capture_state()) {
case SigSession::Stopped:
- _session.start_capture(_sampling_bar->get_record_length(),
- boost::bind(&MainWindow::session_error, this,
+ _session.start_capture(
+ boost::bind(&MainWindow::session_error, this,
QString("Capture failed"), _1));
break;