X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fanalog.hpp;h=5b6e5ee8600acf15452f52b40d1f815b9fc04f2d;hp=cfc964e1872c2cd1ac0b33a66d9e9617b8a77566;hb=eae3bbbbfd35aef309c186e278ff7ab2d90f362a;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329

diff --git a/pv/data/analog.hpp b/pv/data/analog.hpp
index cfc964e1..5b6e5ee8 100644
--- a/pv/data/analog.hpp
+++ b/pv/data/analog.hpp
@@ -14,43 +14,59 @@
  * 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_DATA_ANALOG_H
-#define PULSEVIEW_PV_DATA_ANALOG_H
+#ifndef PULSEVIEW_PV_DATA_ANALOG_HPP
+#define PULSEVIEW_PV_DATA_ANALOG_HPP
 
 #include "signaldata.hpp"
 
 #include <deque>
 #include <memory>
 
+#include <QObject>
+
+using std::deque;
+using std::shared_ptr;
+using std::vector;
+
 namespace pv {
 namespace data {
 
-class AnalogSnapshot;
+class AnalogSegment;
 
-class Analog : public SignalData
+class Analog : public QObject, public SignalData
 {
+	Q_OBJECT
+
 public:
 	Analog();
 
-	void push_snapshot(
-		std::shared_ptr<AnalogSnapshot> &snapshot);
+	void push_segment(shared_ptr<AnalogSegment> &segment);
+
+	const deque< shared_ptr<AnalogSegment> >& analog_segments() const;
 
-	std::deque< std::shared_ptr<AnalogSnapshot> >&
-		get_snapshots();
+	vector< shared_ptr<Segment> > segments() const;
 
 	void clear();
 
-	uint64_t get_max_sample_count() const;
+	uint64_t max_sample_count() const;
+
+	void notify_samples_added(QObject* segment, uint64_t start_sample,
+		uint64_t end_sample);
+
+Q_SIGNALS:
+	void samples_cleared();
+
+	void samples_added(QObject* segment, uint64_t start_sample,
+		uint64_t end_sample);
 
 private:
-	std::deque< std::shared_ptr<AnalogSnapshot> > snapshots_;
+	deque< shared_ptr<AnalogSegment> > segments_;
 };
 
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_DATA_ANALOG_H
+#endif // PULSEVIEW_PV_DATA_ANALOG_HPP