projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #1182 by only considering enabled channels
[pulseview.git]
/
pv
/
data
/
decode
/
rowdata.cpp
diff --git
a/pv/data/decode/rowdata.cpp
b/pv/data/decode/rowdata.cpp
index e7d82fd72c5a77713980f1f7e6c69b714a4c59cb..aff4a26b333b68b2672af073c87b8ad5c392d406 100644
(file)
--- a/
pv/data/decode/rowdata.cpp
+++ b/
pv/data/decode/rowdata.cpp
@@
-14,8
+14,7
@@
* 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 "rowdata.hpp"
*/
#include "rowdata.hpp"
@@
-26,10
+25,6
@@
namespace pv {
namespace data {
namespace decode {
namespace data {
namespace decode {
-RowData::RowData()
-{
-}
-
uint64_t RowData::get_max_sample() const
{
if (annotations_.empty())
uint64_t RowData::get_max_sample() const
{
if (annotations_.empty())
@@
-41,17
+36,17
@@
void RowData::get_annotation_subset(
vector<pv::data::decode::Annotation> &dest,
uint64_t start_sample, uint64_t end_sample) const
{
vector<pv::data::decode::Annotation> &dest,
uint64_t start_sample, uint64_t end_sample) const
{
- for (const auto
& annotation : annotations_)
+ for (const auto& annotation : annotations_)
if (annotation.end_sample() > start_sample &&
annotation.start_sample() <= end_sample)
dest.push_back(annotation);
}
if (annotation.end_sample() > start_sample &&
annotation.start_sample() <= end_sample)
dest.push_back(annotation);
}
-void RowData::
push_annotation(const Annotation &
a)
+void RowData::
emplace_annotation(srd_proto_data *pdat
a)
{
{
- annotations_.
push_back(
a);
+ annotations_.
emplace_back(pdat
a);
}
}
-}
//
decode
-}
//
data
-}
//
pv
+}
// namespace
decode
+}
// namespace
data
+}
// namespace
pv