X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fdata%2Flogic.cpp;h=516060a0aec9013c139f8597dc0bf9bfd70de6aa;hb=aa78b2df0c9cc94becf8621380c8da741a120d17;hp=e23283ac2952e23c3f87f0945e7fc91c5ce6b970;hpb=6ac6242b25cfbd4df14abe7580adc9d0f4cffe43;p=pulseview.git
diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp
index e23283a..516060a 100644
--- a/pv/data/logic.cpp
+++ b/pv/data/logic.cpp
@@ -14,59 +14,84 @@
* 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.h"
-#include "logicsnapshot.h"
+#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(unsigned int num_channels) :
SignalData(),
- _num_channels(num_channels)
+ num_channels_(num_channels)
{
- assert(_num_channels > 0);
+ assert(num_channels_ > 0);
}
-int Logic::get_num_channels() const
+unsigned int Logic::num_channels() const
{
- return _num_channels;
+ 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