projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logicsegment.cpp: Minor whitespace fix.
[pulseview.git]
/
pv
/
data
/
decode
/
rowdata.hpp
diff --git
a/pv/data/decode/rowdata.hpp
b/pv/data/decode/rowdata.hpp
index 568b1bb0ad554c6806eaf3d21b2b2fd4bafe526f..0589ec894eb444fad4f2d0d759c98a1eabc13fc7 100644
(file)
--- a/
pv/data/decode/rowdata.hpp
+++ b/
pv/data/decode/rowdata.hpp
@@
-14,44
+14,51
@@
* 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/>.
*/
*/
-#ifndef PULSEVIEW_PV_DATA_DECODE_ROWDATA_H
-#define PULSEVIEW_PV_DATA_DECODE_ROWDATA_H
+#ifndef PULSEVIEW_PV_DATA_DECODE_ROWDATA_H
PP
+#define PULSEVIEW_PV_DATA_DECODE_ROWDATA_H
PP
#include <vector>
#include <vector>
+#include <libsigrokdecode/libsigrokdecode.h>
+
#include "annotation.hpp"
#include "annotation.hpp"
+using std::vector;
+
namespace pv {
namespace data {
namespace decode {
namespace pv {
namespace data {
namespace decode {
+class Row;
+
class RowData
{
public:
class RowData
{
public:
- RowData();
+ RowData()
= default
;
public:
uint64_t get_max_sample() const;
/**
public:
uint64_t get_max_sample() const;
/**
- * Extracts sorted annotations between two period into a vector.
+ * Extracts annotations between the given sample range into a vector.
+ * Note: The annotations are unsorted and only annotations that fully
+ * fit into the sample range are considered.
*/
void get_annotation_subset(
*/
void get_annotation_subset(
-
std::
vector<pv::data::decode::Annotation> &dest,
+ vector<pv::data::decode::Annotation> &dest,
uint64_t start_sample, uint64_t end_sample) const;
uint64_t start_sample, uint64_t end_sample) const;
- void
push_annotation(const Annotation &a
);
+ void
emplace_annotation(srd_proto_data *pdata, const Row *row
);
private:
private:
-
std::
vector<Annotation> annotations_;
+ vector<Annotation> annotations_;
};
};
-}
-}
//
data
-}
//
pv
+}
// namespace decode
+}
// namespace
data
+}
// namespace
pv
-#endif // PULSEVIEW_PV_DATA_DECODE_ROWDATA_H
+#endif // PULSEVIEW_PV_DATA_DECODE_ROWDATA_H
PP