*/
#ifdef ENABLE_SIGROKDECODE
-#include <sigrokdecode.h>
+#include <libsigrokdecode/libsigrokdecode.h>
#endif
#include <boost/bind.hpp>
+#include <boost/foreach.hpp>
#include <QAction>
#include <QApplication>
#include <QWidget>
#include "mainwindow.h"
+
+#include "devicemanager.h"
#include "dialogs/about.h"
#include "dialogs/connect.h"
#include "toolbars/samplingbar.h"
#include <glib.h>
#include <libsigrok/libsigrok.h>
+using namespace std;
namespace pv {
-MainWindow::MainWindow(const char *open_file_name,
+MainWindow::MainWindow(DeviceManager &device_manager,
+ const char *open_file_name,
QWidget *parent) :
- QMainWindow(parent)
+ QMainWindow(parent),
+ _device_manager(device_manager),
+ _session(device_manager)
{
setup_ui();
if (open_file_name) {
_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->setShortcut(QKeySequence(Qt::Key_C));
_action_view_show_cursors->setObjectName(
QString::fromUtf8("actionViewShowCursors"));
_action_view_show_cursors->setText(QApplication::translate(
setMenuBar(_menu_bar);
QMetaObject::connectSlotsByName(this);
- // Setup the toolbars
- _toolbar = new QToolBar(this);
+ // Setup the toolbar
+ _toolbar = new QToolBar(tr("Main Toolbar"), this);
_toolbar->addAction(_action_open);
_toolbar->addSeparator();
_toolbar->addAction(_action_view_zoom_in);
_toolbar->addAction(_action_view_zoom_out);
addToolBar(_toolbar);
+ // Setup the sampling bar
_sampling_bar = new toolbars::SamplingBar(this);
- scan_devices();
+
+ // Populate the device list and select the initially selected device
+ update_device_list();
+
+ connect(_sampling_bar, SIGNAL(device_selected()), this,
+ SLOT(device_selected()));
connect(_sampling_bar, SIGNAL(run_stop()), this,
SLOT(run_stop()));
addToolBar(_sampling_bar);
+ // Set the title
setWindowTitle(QApplication::translate("MainWindow", "PulseView", 0,
QApplication::UnicodeUTF8));
}
-void MainWindow::scan_devices()
-{
- _devices.clear();
-
- /* Scan all drivers for all devices. */
- struct sr_dev_driver **const drivers = sr_driver_list();
- for (struct sr_dev_driver **driver = drivers; *driver; driver++) {
- GSList *const devices = sr_driver_scan(*driver, NULL);
- for (GSList *l = devices; l; l = l->next)
- _devices.push_back((sr_dev_inst*)l->data);
- g_slist_free(devices);
- }
-
- assert(_sampling_bar);
- _sampling_bar->set_device_list(_devices);
-}
-
void MainWindow::session_error(
const QString text, const QString info_text)
{
Q_ARG(QString, info_text));
}
+void MainWindow::update_device_list(struct sr_dev_inst *selected_device)
+{
+ assert(_sampling_bar);
+
+ const list<sr_dev_inst*> &devices = _device_manager.devices();
+ _sampling_bar->set_device_list(devices);
+
+ if (!selected_device && !devices.empty()) {
+ // Fall back to the first device in the list.
+ selected_device = devices.front();
+
+ // 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;
+ }
+ }
+
+ 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(
const QString file_name = QFileDialog::getOpenFileName(
this, tr("Open File"), "",
tr("Sigrok Sessions (*.sr)"));
- load_file(file_name);
+ if (!file_name.isEmpty())
+ load_file(file_name);
}
void MainWindow::on_actionConnect_triggered()
{
- dialogs::Connect dlg(this);
- if (!dlg.exec())
- return;
+ // Stop any currently running capture session
+ _session.stop_capture();
- struct sr_dev_inst *const sdi = dlg.get_selected_device();
- if (sdi) {
- assert(_sampling_bar);
+ dialogs::Connect dlg(this, _device_manager);
- _devices.push_back(sdi);
- _sampling_bar->set_device_list(_devices);
- _sampling_bar->set_selected_device(sdi);
- }
+ // 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();
+
+ update_device_list(sdi);
}
void MainWindow::on_actionQuit_triggered()
dlg.exec();
}
+void MainWindow::device_selected()
+{
+ _session.set_device(_sampling_bar->get_selected_device());
+}
+
void MainWindow::run_stop()
{
switch(_session.get_capture_state()) {
case SigSession::Stopped:
- _session.start_capture(
- _sampling_bar->get_selected_device(),
- _sampling_bar->get_record_length(),
+ _session.start_capture(_sampling_bar->get_record_length(),
boost::bind(&MainWindow::session_error, this,
QString("Capture failed"), _1));
break;