X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Flogic.cpp;h=516060a0aec9013c139f8597dc0bf9bfd70de6aa;hb=8a07bc241694c10678968309bc8ee4e6076df3a3;hp=3d7f27422a024d54e7970837c87d56c8a8bf3e2d;hpb=9aa2602a054146d1be4fe833a6d7135d7f307a27;p=pulseview.git
diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp
index 3d7f274..516060a 100644
--- a/pv/data/logic.cpp
+++ b/pv/data/logic.cpp
@@ -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 .
*/
#include
@@ -43,10 +42,9 @@ unsigned int Logic::num_channels() const
return num_channels_;
}
-void Logic::push_segment(
- shared_ptr &segment)
+void Logic::push_segment(shared_ptr &segment)
{
- segments_.push_front(segment);
+ segments_.push_back(segment);
}
const deque< shared_ptr >& Logic::logic_segments() const
@@ -56,24 +54,44 @@ const deque< shared_ptr >& Logic::logic_segments() const
vector< shared_ptr > Logic::segments() const
{
- return vector< shared_ptr >(
- segments_.begin(), segments_.end());
+ return vector< shared_ptr >(segments_.begin(), segments_.end());
+}
+
+uint32_t Logic::get_segment_count() const
+{
+ return (uint32_t)segments_.size();
}
void Logic::clear()
{
segments_.clear();
+
+ samples_cleared();
}
-uint64_t Logic::get_max_sample_count() const
+double Logic::get_samplerate() const
+{
+ if (segments_.empty())
+ return 1.0;
+
+ return segments_.front()->samplerate();
+}
+
+uint64_t Logic::max_sample_count() const
{
uint64_t l = 0;
- for (std::shared_ptr s : segments_) {
+ for (const shared_ptr& s : segments_) {
assert(s);
l = max(l, s->get_sample_count());
}
return l;
}
+void Logic::notify_samples_added(QObject* segment, uint64_t start_sample,
+ uint64_t end_sample)
+{
+ samples_added(segment, start_sample, end_sample);
+}
+
} // namespace data
} // namespace pv