X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fdata%2Flogic.cpp;h=ac47c29d6ac12d004f44c23ccc80b6678e44e78b;hb=b82243f74a175f621af26aabbc0f32e2ecb125fa;hp=7b42e47497054c3fc6d359bf3ac860bb577fc09f;hpb=1b1ec774978b65209ce2b454cbf81da499b797d2;p=pulseview.git
diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp
index 7b42e47..ac47c29 100644
--- a/pv/data/logic.cpp
+++ b/pv/data/logic.cpp
@@ -14,40 +14,70 @@
* 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 .
*/
-#include "logic.h"
-#include "logicsnapshot.h"
+#include
-using namespace boost;
-using namespace std;
+#include "logic.hpp"
+#include "logicsegment.hpp"
+
+using std::deque;
+using std::max;
+using std::shared_ptr;
+using std::vector;
namespace pv {
namespace data {
-Logic::Logic(const sr_datafeed_meta_logic &meta,
- uint64_t samplerate) :
- SignalData(samplerate),
- _num_probes(meta.num_probes)
+Logic::Logic(unsigned int num_channels) :
+ SignalData(),
+ num_channels_(num_channels)
+{
+ assert(num_channels_ > 0);
+}
+
+unsigned int Logic::num_channels() const
+{
+ return num_channels_;
+}
+
+void Logic::push_segment(shared_ptr &segment)
{
+ segments_.push_front(segment);
}
-int Logic::get_num_probes() const
+const deque< shared_ptr >& Logic::logic_segments() const
{
- return _num_probes;
+ return segments_;
+}
+
+vector< shared_ptr > Logic::segments() const
+{
+ return vector< shared_ptr >(segments_.begin(), segments_.end());
+}
+
+void Logic::clear()
+{
+ segments_.clear();
+
+ samples_cleared();
}
-void Logic::push_snapshot(
- shared_ptr &snapshot)
+uint64_t Logic::max_sample_count() const
{
- _snapshots.push_front(snapshot);
+ uint64_t l = 0;
+ for (shared_ptr s : segments_) {
+ assert(s);
+ l = max(l, s->get_sample_count());
+ }
+ return l;
}
-deque< shared_ptr >& Logic::get_snapshots()
+void Logic::notify_samples_added(QObject* segment, uint64_t start_sample,
+ uint64_t end_sample)
{
- return _snapshots;
+ samples_added(segment, start_sample, end_sample);
}
} // namespace data