projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow: Added format parameters to load_file
[pulseview.git]
/
pv
/
mainwindow.hpp
diff --git
a/pv/mainwindow.hpp
b/pv/mainwindow.hpp
index 1779712f4c93aa9edc5b2182930454021f5099a1..35ccf0655d10b4e37699f87d47d9f308cb007822 100644
(file)
--- a/
pv/mainwindow.hpp
+++ b/
pv/mainwindow.hpp
@@
-22,8
+22,11
@@
#define PULSEVIEW_PV_MAINWINDOW_HPP
#include <list>
#define PULSEVIEW_PV_MAINWINDOW_HPP
#include <list>
+#include <map>
#include <memory>
#include <memory>
+#include <glibmm/variant.h>
+
#include <QMainWindow>
#include "session.hpp"
#include <QMainWindow>
#include "session.hpp"
@@
-33,6
+36,7
@@
struct srd_decoder;
class QVBoxLayout;
namespace sigrok {
class QVBoxLayout;
namespace sigrok {
+class InputFormat;
class OutputFormat;
}
class OutputFormat;
}
@@
-119,7
+123,10
@@
private:
void keyReleaseEvent(QKeyEvent *event);
private Q_SLOTS:
void keyReleaseEvent(QKeyEvent *event);
private Q_SLOTS:
- void load_file(QString file_name);
+ void load_file(QString file_name,
+ std::shared_ptr<sigrok::InputFormat> format = nullptr,
+ const std::map<std::string, Glib::VariantBase> &options =
+ std::map<std::string, Glib::VariantBase>());
void show_session_error(
const QString text, const QString info_text);
void show_session_error(
const QString text, const QString info_text);