X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fdata%2Flogic.cpp;h=b094a0c828334059029936cd48d40cbd22844dc8;hb=de2fc10b2b067705e623b9781a332ad8fa3f4f88;hp=96f0d1fe7e63afe40bd8a23f8124eae698ab413d;hpb=99503171d4f32570829df171521b4b9cbccb0503;p=pulseview.git
diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp
index 96f0d1f..b094a0c 100644
--- a/pv/data/logic.cpp
+++ b/pv/data/logic.cpp
@@ -14,14 +14,13 @@
* 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;
@@ -38,42 +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);
}
-const deque< shared_ptr >& Logic::logic_snapshots() const
+const deque< shared_ptr >& Logic::logic_segments() const
{
- return snapshots_;
+ return segments_;
}
-vector< shared_ptr > Logic::snapshots() const
+vector< shared_ptr > Logic::segments() const
{
- return vector< shared_ptr >(
- snapshots_.begin(), snapshots_.end());
+ 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();
}
-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 : snapshots_) {
+ for (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