X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Flogic.cpp;h=516060a0aec9013c139f8597dc0bf9bfd70de6aa;hb=dde5aab3c1c55ef4bf7b255b976b23320bad384f;hp=8f1d294d5c7e9c27f10de34e960d1c9ee6f5570f;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;p=pulseview.git
diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp
index 8f1d294..516060a 100644
--- a/pv/data/logic.cpp
+++ b/pv/data/logic.cpp
@@ -14,18 +14,18 @@
* 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
#include "logic.hpp"
-#include "logicsnapshot.hpp"
+#include "logicsegment.hpp"
using std::deque;
using std::max;
using std::shared_ptr;
+using std::vector;
namespace pv {
namespace data {
@@ -37,36 +37,61 @@ Logic::Logic(unsigned int num_channels) :
assert(num_channels_ > 0);
}
-int Logic::get_num_channels() const
+unsigned int Logic::num_channels() const
{
return num_channels_;
}
-void Logic::push_snapshot(
- shared_ptr &snapshot)
+void Logic::push_segment(shared_ptr &segment)
{
- snapshots_.push_front(snapshot);
+ segments_.push_back(segment);
}
-deque< shared_ptr >& Logic::get_snapshots()
+const deque< shared_ptr >& Logic::logic_segments() const
{
- return snapshots_;
+ return segments_;
+}
+
+vector< shared_ptr > Logic::segments() const
+{
+ return vector< shared_ptr >(segments_.begin(), segments_.end());
+}
+
+uint32_t Logic::get_segment_count() const
+{
+ return (uint32_t)segments_.size();
}
void Logic::clear()
{
- snapshots_.clear();
+ segments_.clear();
+
+ samples_cleared();
+}
+
+double Logic::get_samplerate() const
+{
+ if (segments_.empty())
+ return 1.0;
+
+ return segments_.front()->samplerate();
}
-uint64_t Logic::get_max_sample_count() const
+uint64_t Logic::max_sample_count() const
{
uint64_t l = 0;
- for (std::shared_ptr s : snapshots_) {
+ 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