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 2548e0ef4d8a1ceade73d6e2ea3cabf76adcd011..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,7
+36,8
@@
struct srd_decoder;
class QVBoxLayout;
namespace sigrok {
class QVBoxLayout;
namespace sigrok {
-class Device;
+class InputFormat;
+class OutputFormat;
}
namespace pv {
}
namespace pv {
@@
-50,7
+54,9
@@
class View;
}
namespace widgets {
}
namespace widgets {
+#ifdef ENABLE_DECODE
class DecoderMenu;
class DecoderMenu;
+#endif
}
class MainWindow : public QMainWindow
}
class MainWindow : public QMainWindow
@@
-86,11
+92,16
@@
public:
QAction* action_view_show_cursors() const;
QAction* action_about() const;
QAction* action_view_show_cursors() const;
QAction* action_about() const;
+#ifdef ENABLE_DECODE
QMenu* menu_decoder_add() const;
QMenu* menu_decoder_add() const;
+#endif
void run_stop();
void run_stop();
- void select_device(std::shared_ptr<sigrok::Device> device);
+ void select_device(std::shared_ptr<devices::Device> device);
+
+public Q_SLOTS:
+ void export_file(std::shared_ptr<sigrok::OutputFormat> format);
private:
void setup_ui();
private:
void setup_ui();
@@
-112,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);
@@
-163,7
+177,9
@@
private:
QAction *const action_view_show_cursors_;
QAction *const action_about_;
QAction *const action_view_show_cursors_;
QAction *const action_about_;
+#ifdef ENABLE_DECODE
QMenu *const menu_decoders_add_;
QMenu *const menu_decoders_add_;
+#endif
};
} // namespace pv
};
} // namespace pv