X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftabular_decoder%2Fview.hpp;h=9c251382c675bbb2e2cb074dbde47016eb02afc7;hb=6d46525fb5566856d01deac5a7787699b17cc4e4;hp=a7215f7b85008ad4cf5f0bb9e52bbae68dda7308;hpb=9a35b05d2f2e5329f1ecaddb04289d4adeea2752;p=pulseview.git

diff --git a/pv/views/tabular_decoder/view.hpp b/pv/views/tabular_decoder/view.hpp
index a7215f7b..9c251382 100644
--- a/pv/views/tabular_decoder/view.hpp
+++ b/pv/views/tabular_decoder/view.hpp
@@ -36,6 +36,16 @@ namespace views {
 
 namespace tabular_decoder {
 
+// When adding an entry here, don't forget to update SaveTypeNames as well
+enum SaveType {
+	SaveTypeCSVEscaped,
+	SaveTypeCSVQuoted,
+	SaveTypeCount  // Indicates how many save types there are, must always be last
+};
+
+extern const char* SaveTypeNames[SaveTypeCount];
+
+
 class AnnotationCollectionModel : public QAbstractTableModel, public GlobalSettingsInterface
 {
 	Q_OBJECT
@@ -43,6 +53,7 @@ class AnnotationCollectionModel : public QAbstractTableModel, public GlobalSetti
 public:
 	AnnotationCollectionModel(QObject* parent = nullptr);
 
+	QVariant data_from_ann(const Annotation* ann, int index) const;
 	QVariant data(const QModelIndex& index, int role) const override;
 	Qt::ItemFlags flags(const QModelIndex& index) const override;
 
@@ -106,7 +117,7 @@ private:
 	void reset_data();
 	void update_data();
 
-	void save_data() const;
+	void save_data_as_csv(unsigned int save_type) const;
 
 private Q_SLOTS:
 	void on_selected_decoder_changed(int index);
@@ -141,7 +152,6 @@ private:
 
 	data::DecodeSignal* signal_;
 	const data::decode::Decoder* decoder_;
-	bool updating_data_;
 };
 
 } // namespace tabular_decoder