Build fixes for Qt5 Windows/mingw/MXE support.

[pulseview.git] / pv / session.hpp

diff --git a/pv/session.hpp b/pv/session.hpp
index e7a90ae9c720707f97a3796f8a588257a240e42d..0f067a47be1f8e2875467c976cd4424e616c046b 100644 (file)
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PULSEVIEW_PV_SESSION_HPP
@@ -42,6 +41,7 @@
 #include <QString>
 
 #include "util.hpp"
+#include "views/viewbase.hpp"
 
 struct srd_decoder;
 struct srd_channel;
@@ -50,8 +50,10 @@ namespace sigrok {
 class Analog;
 class Channel;
 class Device;
+class InputFormat;
 class Logic;
 class Meta;
+class OutputFormat;
 class Packet;
 class Session;
 }
@@ -77,8 +79,8 @@ namespace toolbars {
 class MainBar;
 }
 
-namespace view {
-class View;
+namespace views {
+class ViewBase;
 }
 
 class Session : public QObject
@@ -109,16 +111,28 @@ public:
 
        void set_name(QString name);
 
-       std::shared_ptr<pv::view::View> main_view() const;
+       const std::list< std::shared_ptr<views::ViewBase> > views() const;
 
-       void set_main_bar(std::shared_ptr<pv::toolbars::MainBar> main_bar);
+       std::shared_ptr<views::ViewBase> main_view() const;
 
        std::shared_ptr<pv::toolbars::MainBar> main_bar() const;
 
+       void set_main_bar(std::shared_ptr<pv::toolbars::MainBar> main_bar);
+
+       /**
+        * Indicates whether the captured data was saved to disk already or not
+        */
+       bool data_saved() const;
+
        void save_settings(QSettings &settings) const;
 
        void restore_settings(QSettings &settings);
 
+       /**
+        * Attempts to set device instance, may fall back to demo if needed
+        */
+       void select_device(std::shared_ptr<devices::Device> device);
+
        /**
         * Sets device instance that will be used in the next capture session.
         */
@@ -126,6 +140,14 @@ public:
 
        void set_default_device();
 
+       void load_init_file(const std::string &file_name,
+               const std::string &format);
+
+       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>());
+
        capture_state get_capture_state() const;
 
        void start_capture(std::function<void (const QString)> error_handler);
@@ -134,11 +156,11 @@ public:
 
        double get_samplerate() const;
 
-       void register_view(std::shared_ptr<pv::view::View> view);
+       void register_view(std::shared_ptr<views::ViewBase> view);
 
-       void deregister_view(std::shared_ptr<pv::view::View> view);
+       void deregister_view(std::shared_ptr<views::ViewBase> view);
 
-       bool has_view(std::shared_ptr<pv::view::View> view);
+       bool has_view(std::shared_ptr<views::ViewBase> view);
 
        const std::unordered_set< std::shared_ptr<data::SignalBase> >
                signalbases() const;
@@ -180,8 +202,8 @@ private:
        std::shared_ptr<devices::Device> device_;
        QString default_name_, name_;
 
-       std::unordered_set< std::shared_ptr<pv::view::View> > views_;
-       std::shared_ptr<pv::view::View> main_view_;
+       std::list< std::shared_ptr<views::ViewBase> > views_;
+       std::shared_ptr<pv::views::ViewBase> main_view_;
 
        std::shared_ptr<pv::toolbars::MainBar> main_bar_;
 
@@ -201,6 +223,7 @@ private:
        std::thread sampling_thread_;
 
        bool out_of_memory_;
+       bool data_saved_;
 
 Q_SIGNALS:
        void capture_state_changed(int state);
@@ -217,6 +240,12 @@ Q_SIGNALS:
        void data_received();
 
        void frame_ended();
+
+       void add_view(const QString &title, views::ViewType type,
+               Session *session);
+
+public Q_SLOTS:
+       void on_data_saved();
 };
 
 } // namespace pv