MainWindow: Added format parameters to load_file

[pulseview.git] / pv / mainwindow.hpp

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 84245e0ec117c279814faeb7decffdbc03642963..35ccf0655d10b4e37699f87d47d9f308cb007822 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
  */
 
-#ifndef PULSEVIEW_PV_MAINWINDOW_H
-#define PULSEVIEW_PV_MAINWINDOW_H
+#ifndef PULSEVIEW_PV_MAINWINDOW_HPP
+#define PULSEVIEW_PV_MAINWINDOW_HPP
 
 #include <list>
+#include <map>
 #include <memory>
 
+#include <glibmm/variant.h>
+
 #include <QMainWindow>
 
 #include "session.hpp"
@@ -33,7 +36,8 @@ struct srd_decoder;
 class QVBoxLayout;
 
 namespace sigrok {
-class Device;
+class InputFormat;
+class OutputFormat;
 }
 
 namespace pv {
@@ -50,7 +54,9 @@ class View;
 }
 
 namespace widgets {
+#ifdef ENABLE_DECODE
 class DecoderMenu;
+#endif
 }
 
 class MainWindow : public QMainWindow
@@ -86,11 +92,16 @@ public:
        QAction* action_view_show_cursors() const;
        QAction* action_about() const;
 
+#ifdef ENABLE_DECODE
        QMenu* menu_decoder_add() const;
+#endif
 
        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();
@@ -102,14 +113,20 @@ private:
        void session_error(const QString text, const QString info_text);
 
        /**
-        * Updates the device list in the sampling bar
+        * Updates the device list in the toolbar
         */
-       void update_device_list();
+       void update_device_list();      
 
+private:
        void closeEvent(QCloseEvent *event);
 
+       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);
@@ -160,9 +177,11 @@ private:
        QAction *const action_view_show_cursors_;
        QAction *const action_about_;
 
+#ifdef ENABLE_DECODE
        QMenu *const menu_decoders_add_;
+#endif
 };
 
 } // namespace pv
 
-#endif // PULSEVIEW_PV_MAINWINDOW_H
+#endif // PULSEVIEW_PV_MAINWINDOW_HPP