projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
View: Use more reasonable default time scale
[pulseview.git]
/
pv
/
mainwindow.hpp
diff --git
a/pv/mainwindow.hpp
b/pv/mainwindow.hpp
index 2e6e55c1d1dee53bbb12c796bbd3d6c28a1e7046..6a4bdfc80f4b46134fde599d33f4eea2dda469a1 100644
(file)
--- a/
pv/mainwindow.hpp
+++ b/
pv/mainwindow.hpp
@@
-18,12
+18,15
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_MAINWINDOW_H
-#define PULSEVIEW_PV_MAINWINDOW_H
+#ifndef PULSEVIEW_PV_MAINWINDOW_H
PP
+#define PULSEVIEW_PV_MAINWINDOW_H
PP
#include <list>
#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
@@
-72,7
+78,8
@@
private:
public:
explicit MainWindow(DeviceManager &device_manager,
public:
explicit MainWindow(DeviceManager &device_manager,
- const char *open_file_name = NULL,
+ std::string open_file_name = std::string(),
+ std::string open_file_format = std::string(),
QWidget *parent = 0);
QAction* action_open() const;
QWidget *parent = 0);
QAction* action_open() const;
@@
-86,15
+93,26
@@
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);
+ void import_file(std::shared_ptr<sigrok::InputFormat> format);
private:
void setup_ui();
private:
void setup_ui();
+ void select_init_device();
+
+ void load_init_file(const std::string &file_name,
+ const std::string &format);
+
void save_ui_settings();
void restore_ui_settings();
void save_ui_settings();
void restore_ui_settings();
@@
-104,13
+122,19
@@
private:
/**
* Updates the device list in the toolbar
*/
/**
* Updates the device list in the toolbar
*/
- void update_device_list();
+ void update_device_list();
+ 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>());
+
+private:
void closeEvent(QCloseEvent *event);
void closeEvent(QCloseEvent *event);
-private Q_SLOTS:
- void load_file(QString file_name);
+ void keyReleaseEvent(QKeyEvent *event);
+private Q_SLOTS:
void show_session_error(
const QString text, const QString info_text);
void show_session_error(
const QString text, const QString info_text);
@@
-160,9
+184,11
@@
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
-#endif // PULSEVIEW_PV_MAINWINDOW_H
+#endif // PULSEVIEW_PV_MAINWINDOW_H
PP