projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Segment: Implement temporary workaround for #1284
[pulseview.git]
/
pv
/
data
/
decode
/
annotation.cpp
diff --git
a/pv/data/decode/annotation.cpp
b/pv/data/decode/annotation.cpp
index 4a6890b5a4e519a5aac786d408d97953985a4836..e983b0df1c3e971ba7942c9ccadb86ed10e09bbb 100644
(file)
--- a/
pv/data/decode/annotation.cpp
+++ b/
pv/data/decode/annotation.cpp
@@
-14,79
+14,71
@@
* 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/>.
*/
extern "C" {
#include <libsigrokdecode/libsigrokdecode.h>
}
*/
extern "C" {
#include <libsigrokdecode/libsigrokdecode.h>
}
+#include <cassert>
#include <vector>
#include <vector>
-#include "annotation.h"
+#include "annotation.hpp"
+
+using std::vector;
namespace pv {
namespace data {
namespace decode {
namespace pv {
namespace data {
namespace decode {
-Annotation::Annotation(const srd_proto_data *const pdata) :
- _start_sample(pdata->start_sample),
- _end_sample(pdata->end_sample)
+Annotation::Annotation(const srd_proto_data *const pdata, const Row *row) :
+ start_sample_(pdata->start_sample),
+ end_sample_(pdata->end_sample),
+ row_(row)
{
assert(pdata);
const srd_proto_data_annotation *const pda =
(const srd_proto_data_annotation*)pdata->data;
assert(pda);
{
assert(pdata);
const srd_proto_data_annotation *const pda =
(const srd_proto_data_annotation*)pdata->data;
assert(pda);
- _format = pda->ann_format;
- _row = 0;
+ ann_class_ = (Class)(pda->ann_class);
const char *const *annotations = (char**)pda->ann_text;
const char *const *annotations = (char**)pda->ann_text;
- while(*annotations) {
-
_annotations
.push_back(QString::fromUtf8(*annotations));
+ while
(*annotations) {
+
annotations_
.push_back(QString::fromUtf8(*annotations));
annotations++;
}
}
uint64_t Annotation::start_sample() const
{
annotations++;
}
}
uint64_t Annotation::start_sample() const
{
- return
_start_sample
;
+ return
start_sample_
;
}
uint64_t Annotation::end_sample() const
{
}
uint64_t Annotation::end_sample() const
{
- return _end_sample;
-}
-
-int Annotation::format() const
-{
- return _format;
-}
-
-int Annotation::row() const
-{
- return _row;
+ return end_sample_;
}
}
-
int Annotation::pd_index
() const
+
Annotation::Class Annotation::ann_class
() const
{
{
- return
_pd_index
;
+ return
ann_class_
;
}
}
-const
std::
vector<QString>& Annotation::annotations() const
+const vector<QString>& Annotation::annotations() const
{
{
- return
_annotations
;
+ return
annotations_
;
}
}
-void Annotation::set_row(int row)
+const Row* Annotation::row() const
{
{
-
_row = row
;
+
return row_
;
}
}
-void Annotation::set_pd_index(int pd_index)
+bool Annotation::operator<(const Annotation &other) const
{
{
-
_pd_index = pd_index
;
+
return (start_sample_ < other.start_sample_)
;
}
} // namespace decode
}
} // namespace decode