X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Flogic.hpp;h=07f8222c1946cc699828c6ac3cdc6c3d761eb67d;hp=d57df0cfe9e03020eed10a36e6fc6db34c11c6a5;hb=HEAD;hpb=99503171d4f32570829df171521b4b9cbccb0503

diff --git a/pv/data/logic.hpp b/pv/data/logic.hpp
index d57df0cf..07f8222c 100644
--- a/pv/data/logic.hpp
+++ b/pv/data/logic.hpp
@@ -14,47 +14,73 @@
  * 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_LOGIC_H
-#define PULSEVIEW_PV_DATA_LOGIC_H
+#ifndef PULSEVIEW_PV_DATA_LOGIC_HPP
+#define PULSEVIEW_PV_DATA_LOGIC_HPP
 
 #include "signaldata.hpp"
+#include "segment.hpp"
 
 #include <deque>
 
+#include <QObject>
+
+using std::deque;
+using std::shared_ptr;
+using std::vector;
+
 namespace pv {
 namespace data {
 
-class LogicSnapshot;
+class LogicSegment;
 
 class Logic : public SignalData
 {
+	Q_OBJECT
+
 public:
 	Logic(unsigned int num_channels);
 
-	int get_num_channels() const;
+	unsigned int num_channels() const;
 
-	void push_snapshot(
-		std::shared_ptr<LogicSnapshot> &snapshot);
+	void push_segment(shared_ptr<LogicSegment> &segment);
 
-	const std::deque< std::shared_ptr<LogicSnapshot> >&
-		logic_snapshots() const;
+	const deque< shared_ptr<LogicSegment> >& logic_segments() const;
+	deque< shared_ptr<LogicSegment> >& logic_segments();
 
-	std::vector< std::shared_ptr<Snapshot> > snapshots() const;
+	vector< shared_ptr<Segment> > segments() const;
+
+	uint32_t get_segment_count() const;
 
 	void clear();
 
-	uint64_t get_max_sample_count() const;
+	void set_samplerate(double value);
+
+	double get_samplerate() const;
+
+	uint64_t max_sample_count() const;
+
+	void notify_samples_added(shared_ptr<Segment> segment, uint64_t start_sample,
+		uint64_t end_sample);
+
+Q_SIGNALS:
+	void samples_cleared();
+
+	void samples_added(SharedPtrToSegment segment, uint64_t start_sample,
+		uint64_t end_sample);
+
+private Q_SLOTS:
+	void on_segment_completed();
 
 private:
+	double samplerate_;
 	const unsigned int num_channels_;
-	std::deque< std::shared_ptr<LogicSnapshot> > snapshots_;
+	deque< shared_ptr<LogicSegment> > segments_;
 };
 
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_DATA_LOGIC_H
+#endif // PULSEVIEW_PV_DATA_LOGIC_HPP