X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Flogic.cpp;h=4a13e568bc80ff38770a245b1e9b38b1861d15a9;hb=6daf265cd0e2a699a50ce434466881bd3b7f1d12;hp=3d7f27422a024d54e7970837c87d56c8a8bf3e2d;hpb=9aa2602a054146d1be4fe833a6d7135d7f307a27;p=pulseview.git
diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp
index 3d7f2742..4a13e568 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
@@ -33,6 +32,7 @@ namespace data {
Logic::Logic(unsigned int num_channels) :
SignalData(),
+ samplerate_(1), // Default is 1 Hz to prevent division-by-zero errors
num_channels_(num_channels)
{
assert(num_channels_ > 0);
@@ -43,10 +43,14 @@ 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);
+
+ if ((samplerate_ == 1) && (segment->samplerate() > 1))
+ samplerate_ = segment->samplerate();
+
+ connect(segment.get(), SIGNAL(completed()), this, SLOT(on_segment_completed()));
}
const deque< shared_ptr >& Logic::logic_segments() const
@@ -54,26 +58,60 @@ const deque< shared_ptr >& Logic::logic_segments() const
return segments_;
}
+deque< shared_ptr >& Logic::logic_segments()
+{
+ return segments_;
+}
+
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();
+ if (!segments_.empty()) {
+ segments_.clear();
+
+ samples_cleared();
+ }
}
-uint64_t Logic::get_max_sample_count() const
+void Logic::set_samplerate(double value)
+{
+ samplerate_ = value;
+}
+
+double Logic::get_samplerate() const
+{
+ return 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(shared_ptr segment, uint64_t start_sample,
+ uint64_t end_sample)
+{
+ samples_added(segment, start_sample, end_sample);
+}
+
+void Logic::on_segment_completed()
+{
+ segment_completed();
+}
+
} // namespace data
} // namespace pv