#include <algorithm>
#include <iterator>
+#include <boost/algorithm/string/join.hpp>
+
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
#include "mainwindow.hpp"
#include "devicemanager.hpp"
+#include "devices/hardwaredevice.hpp"
+#include "devices/inputfile.hpp"
+#include "devices/sessionfile.hpp"
#include "dialogs/about.hpp"
#include "dialogs/connect.hpp"
+#include "dialogs/inputoutputoptions.hpp"
#include "dialogs/storeprogress.hpp"
#include "toolbars/mainbar.hpp"
#include "view/logicsignal.hpp"
#include "view/view.hpp"
+#include "widgets/exportmenu.hpp"
+#include "widgets/importmenu.hpp"
#ifdef ENABLE_DECODE
#include "widgets/decodermenu.hpp"
#endif
+#include "widgets/hidingmenubar.hpp"
#include <inttypes.h>
#include <stdint.h>
#include <stdarg.h>
#include <glib.h>
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
using std::list;
using std::map;
using std::shared_ptr;
using std::string;
+using std::vector;
+
+using boost::algorithm::join;
-using sigrok::Device;
using sigrok::Error;
-using sigrok::HardwareDevice;
+using sigrok::OutputFormat;
+using sigrok::InputFormat;
namespace pv {
action_view_zoom_fit_(new QAction(this)),
action_view_zoom_one_to_one_(new QAction(this)),
action_view_show_cursors_(new QAction(this)),
- action_about_(new QAction(this)),
- menu_decoders_add_(new pv::widgets::DecoderMenu(this, true))
+ action_about_(new QAction(this))
+#ifdef ENABLE_DECODE
+ , menu_decoders_add_(new pv::widgets::DecoderMenu(this, true))
+#endif
{
setup_ui();
restore_ui_settings();
return action_about_;
}
+#ifdef ENABLE_DECODE
QMenu* MainWindow::menu_decoder_add() const
{
return menu_decoders_add_;
}
+#endif
void MainWindow::run_stop()
{
}
}
-void MainWindow::select_device(shared_ptr<Device> device)
+void MainWindow::select_device(shared_ptr<devices::Device> device)
{
try {
- session_.set_device(device);
+ if (device)
+ session_.set_device(device);
+ else
+ session_.set_default_device();
} catch(const QString &e) {
QMessageBox msg(this);
msg.setText(e);
}
}
+void MainWindow::export_file(shared_ptr<OutputFormat> format)
+{
+ using pv::dialogs::StoreProgress;
+
+ // Stop any currently running capture session
+ session_.stop_capture();
+
+ QSettings settings;
+ const QString dir = settings.value(SettingSaveDirectory).toString();
+
+ // Construct the filter
+ const vector<string> exts = format->extensions();
+ QString filter = tr("%1 files ").arg(
+ QString::fromStdString(format->description()));
+
+ if (exts.empty())
+ filter += "(*.*)";
+ else
+ filter += QString("(*.%1);;%2 (*.*)").arg(
+ QString::fromStdString(join(exts, ", *."))).arg(
+ tr("All Files"));
+
+ // Show the file dialog
+ const QString file_name = QFileDialog::getSaveFileName(
+ this, tr("Save File"), dir, filter);
+
+ if (file_name.isEmpty())
+ return;
+
+ const QString abs_path = QFileInfo(file_name).absolutePath();
+ settings.setValue(SettingSaveDirectory, abs_path);
+
+ // Show the options dialog
+ map<string, Glib::VariantBase> options;
+ if (!format->options().empty()) {
+ dialogs::InputOutputOptions dlg(
+ tr("Export %1").arg(QString::fromStdString(
+ format->description())),
+ format->options(), this);
+ if (!dlg.exec())
+ return;
+ options = dlg.options();
+ }
+
+ StoreProgress *dlg = new StoreProgress(file_name, format, options,
+ session_, this);
+ dlg->run();
+}
+
+void MainWindow::import_file(shared_ptr<InputFormat> format)
+{
+ assert(format);
+
+ QSettings settings;
+ const QString dir = settings.value(SettingOpenDirectory).toString();
+
+ // Construct the filter
+ const vector<string> exts = format->extensions();
+ const QString filter = exts.empty() ? "" :
+ tr("%1 files (*.%2)").arg(
+ QString::fromStdString(format->description())).arg(
+ QString::fromStdString(join(exts, ", *.")));
+
+ // Show the file dialog
+ const QString file_name = QFileDialog::getOpenFileName(
+ this, tr("Import File"), dir, tr(
+ "%1 files (*.*);;All Files (*.*)").arg(
+ QString::fromStdString(format->description())));
+
+ if (file_name.isEmpty())
+ return;
+
+ // Show the options dialog
+ map<string, Glib::VariantBase> options;
+ if (!format->options().empty()) {
+ dialogs::InputOutputOptions dlg(
+ tr("Import %1").arg(QString::fromStdString(
+ format->description())),
+ format->options(), this);
+ if (!dlg.exec())
+ return;
+ options = dlg.options();
+ }
+
+ load_file(file_name, format, options);
+
+ const QString abs_path = QFileInfo(file_name).absolutePath();
+ settings.setValue(SettingOpenDirectory, abs_path);
+}
+
void MainWindow::setup_ui()
{
setObjectName(QString::fromUtf8("MainWindow"));
// Set the window icon
QIcon icon;
- icon.addFile(QString::fromUtf8(":/icons/sigrok-logo-notext.png"),
- QSize(), QIcon::Normal, QIcon::Off);
+ icon.addFile(QString(":/icons/sigrok-logo-notext.svg"));
setWindowIcon(icon);
// Setup the central widget
vertical_layout_->addWidget(view_);
// Setup the menu bar
- QMenuBar *const menu_bar = new QMenuBar(this);
- menu_bar->setGeometry(QRect(0, 0, 400, 25));
+ pv::widgets::HidingMenuBar *const menu_bar =
+ new pv::widgets::HidingMenuBar(this);
// File Menu
QMenu *const menu_file = new QMenu;
menu_file->addSeparator();
+ widgets::ExportMenu *menu_file_export = new widgets::ExportMenu(this,
+ device_manager_.context());
+ menu_file_export->setTitle(tr("&Export"));
+ connect(menu_file_export,
+ SIGNAL(format_selected(std::shared_ptr<sigrok::OutputFormat>)),
+ this, SLOT(export_file(std::shared_ptr<sigrok::OutputFormat>)));
+ menu_file->addAction(menu_file_export->menuAction());
+
+ widgets::ImportMenu *menu_file_import = new widgets::ImportMenu(this,
+ device_manager_.context());
+ menu_file_import->setTitle(tr("&Import"));
+ connect(menu_file_import,
+ SIGNAL(format_selected(std::shared_ptr<sigrok::InputFormat>)),
+ this, SLOT(import_file(std::shared_ptr<sigrok::InputFormat>)));
+ menu_file->addAction(menu_file_import->menuAction());
+
+ menu_file->addSeparator();
+
action_connect_->setText(tr("&Connect to Device..."));
action_connect_->setObjectName(QString::fromUtf8("actionConnect"));
menu_file->addAction(action_connect_);
QString::fromUtf8("actionViewZoomFit"));
menu_view->addAction(action_view_zoom_fit_);
- action_view_zoom_one_to_one_->setText(tr("Zoom to &One-to-One"));
+ action_view_zoom_one_to_one_->setText(tr("Zoom to O&ne-to-One"));
action_view_zoom_one_to_one_->setIcon(QIcon::fromTheme("zoom-original",
QIcon(":/icons/zoom-original.png")));
action_view_zoom_one_to_one_->setShortcut(QKeySequence(Qt::Key_O));
setMenuBar(menu_bar);
QMetaObject::connectSlotsByName(this);
- // Setup the sampling bar
+ // Setup the toolbar
main_bar_ = new toolbars::MainBar(session_, *this);
// Populate the device list and select the initially selected device
{
QSettings settings;
- shared_ptr<HardwareDevice> device;
-
map<string, string> dev_info;
list<string> key_list;
- string value;
settings.beginGroup("MainWindow");
key_list.push_back("connection_id");
for (string key : key_list) {
- if (!settings.contains(QString::fromUtf8(key.c_str())))
+ const QString k = QString::fromStdString(key);
+ if (!settings.contains(k))
continue;
- value = settings.value(QString::fromUtf8(key.c_str())).toString().toStdString();
-
- if (value.size() > 0)
+ const string value = settings.value(k).toString().toStdString();
+ if (!value.empty())
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();
- }
+ const shared_ptr<devices::HardwareDevice> device =
+ device_manager_.find_device_from_info(dev_info);
+ select_device(device);
+ update_device_list();
settings.endGroup();
}
event->accept();
}
-void MainWindow::load_file(QString file_name)
+void MainWindow::keyReleaseEvent(QKeyEvent *event)
+{
+ if (event->key() == Qt::Key_Alt) {
+ menuBar()->setHidden(!menuBar()->isHidden());
+ menuBar()->setFocus();
+ }
+ QMainWindow::keyReleaseEvent(event);
+}
+
+void MainWindow::load_file(QString file_name,
+ std::shared_ptr<sigrok::InputFormat> format,
+ const std::map<std::string, Glib::VariantBase> &options)
{
const QString errorMessage(
QString("Failed to load file %1").arg(file_name));
const QString infoMessage;
try {
- session_.set_file(file_name.toStdString());
+ if (format)
+ session_.set_device(shared_ptr<devices::Device>(
+ new devices::InputFile(
+ device_manager_.context(),
+ file_name.toStdString(),
+ format, options)));
+ else
+ session_.set_device(shared_ptr<devices::Device>(
+ new devices::SessionFile(
+ device_manager_.context(),
+ file_name.toStdString())));
} catch(Error e) {
show_session_error(tr("Failed to load ") + file_name, e.what());
session_.set_default_device();
void MainWindow::on_actionSaveAs_triggered()
{
- using pv::dialogs::StoreProgress;
-
- // Stop any currently running capture session
- session_.stop_capture();
-
- QSettings settings;
- const QString dir = settings.value(SettingSaveDirectory).toString();
-
- // Show the dialog
- const QString file_name = QFileDialog::getSaveFileName(
- this, tr("Save File"), dir, tr("Sigrok Sessions (*.sr)"));
-
- if (file_name.isEmpty())
- return;
-
- const QString abs_path = QFileInfo(file_name).absolutePath();
- settings.setValue(SettingSaveDirectory, abs_path);
-
- StoreProgress *dlg = new StoreProgress(file_name, session_, this);
- dlg->run();
+ export_file(device_manager_.context()->output_formats()["srzip"]);
}
void MainWindow::on_actionConnect_triggered()
void MainWindow::device_selected()
{
// Set the title to include the device/file name
- const shared_ptr<sigrok::Device> device = session_.device();
+ const shared_ptr<devices::Device> device = session_.device();
if (!device)
return;
- const string display_name = device_manager_.get_display_name(device);
+ const string display_name = device->display_name(device_manager_);
setWindowTitle(tr("%1 - PulseView").arg(display_name.c_str()));
}