projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch segment storage from single vector to vector of arrays
[pulseview.git]
/
pv
/
data
/
logic.cpp
diff --git
a/pv/data/logic.cpp
b/pv/data/logic.cpp
index 9bcfd0a382ac39c020d396007d07a4e1885fbef8..9ba8f2c3d6e1a70ed761f88ea57d27dfff9d38a8 100644
(file)
--- a/
pv/data/logic.cpp
+++ b/
pv/data/logic.cpp
@@
-14,52
+14,60
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* 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 <http://www.gnu.org/licenses/>.
*/
*/
-#include "logic.h"
-#include "logicsnapshot.h"
+#include <cassert>
+
+#include "logic.hpp"
+#include "logicsegment.hpp"
-using boost::shared_ptr;
using std::deque;
using std::max;
using std::deque;
using std::max;
+using std::shared_ptr;
+using std::vector;
namespace pv {
namespace data {
namespace pv {
namespace data {
-Logic::Logic(unsigned int num_
probe
s) :
+Logic::Logic(unsigned int num_
channel
s) :
SignalData(),
SignalData(),
- _num_probes(num_probes)
+ num_channels_(num_channels)
+{
+ assert(num_channels_ > 0);
+}
+
+unsigned int Logic::num_channels() const
{
{
-
assert(_num_probes > 0)
;
+
return num_channels_
;
}
}
-int Logic::get_num_probes() const
+void Logic::push_segment(
+ shared_ptr<LogicSegment> &segment)
{
{
-
return _num_probes
;
+
segments_.push_front(segment)
;
}
}
-void Logic::push_snapshot(
- shared_ptr<LogicSnapshot> &snapshot)
+const deque< shared_ptr<LogicSegment> >& Logic::logic_segments() const
{
{
-
_snapshots.push_front(snapshot)
;
+
return segments_
;
}
}
-deque< shared_ptr<LogicSnapshot> >& Logic::get_snapshots()
+vector< shared_ptr<Segment> > Logic::segments() const
{
{
- return _snapshots;
+ return vector< shared_ptr<Segment> >(
+ segments_.begin(), segments_.end());
}
void Logic::clear()
{
}
void Logic::clear()
{
-
_snapshots
.clear();
+
segments_
.clear();
}
}
-uint64_t Logic::
get_
max_sample_count() const
+uint64_t Logic::max_sample_count() const
{
uint64_t l = 0;
{
uint64_t l = 0;
- for (
boost::shared_ptr<LogicSnapshot> s : _snapshots
) {
+ for (
std::shared_ptr<LogicSegment> s : segments_
) {
assert(s);
l = max(l, s->get_sample_count());
}
assert(s);
l = max(l, s->get_sample_count());
}