projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow: Added initial import menu with no options
[pulseview.git]
/
pv
/
mainwindow.hpp
diff --git
a/pv/mainwindow.hpp
b/pv/mainwindow.hpp
index d2bcd918361ce6fc4e053f3f7d6196d37412154f..99772e3d0037aad26ca983fefb1ca00242b46d5b 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,7
@@
struct srd_decoder;
class QVBoxLayout;
namespace sigrok {
class QVBoxLayout;
namespace sigrok {
-class
Device
;
+class
InputFormat
;
class OutputFormat;
}
class OutputFormat;
}
@@
-53,7
+56,7
@@
class View;
namespace widgets {
#ifdef ENABLE_DECODE
class DecoderMenu;
namespace widgets {
#ifdef ENABLE_DECODE
class DecoderMenu;
-#endif
/* ENABLE_DECODE */
+#endif
}
class MainWindow : public QMainWindow
}
class MainWindow : public QMainWindow
@@
-91,14
+94,15
@@
public:
#ifdef ENABLE_DECODE
QMenu* menu_decoder_add() const;
#ifdef ENABLE_DECODE
QMenu* menu_decoder_add() const;
-#endif
/* ENABLE_DECODE */
+#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);
public Q_SLOTS:
void export_file(std::shared_ptr<sigrok::OutputFormat> format);
+ void import_file(std::shared_ptr<sigrok::InputFormat> format);
private:
void setup_ui();
private:
void setup_ui();
@@
-120,7
+124,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);
@@
-173,7
+180,7
@@
private:
#ifdef ENABLE_DECODE
QMenu *const menu_decoders_add_;
#ifdef ENABLE_DECODE
QMenu *const menu_decoders_add_;
-#endif
/* ENABLE_DECODE */
+#endif
};
} // namespace pv
};
} // namespace pv