projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
View: Make TimeItem derivatives snap to edges when ruler-dragged
[pulseview.git]
/
pv
/
views
/
trace
/
decodetrace.hpp
diff --git
a/pv/views/trace/decodetrace.hpp
b/pv/views/trace/decodetrace.hpp
index 692a5f710a3f653adfa93c8ebe6ba95a4ccc7e6b..3d25c3e4d7410f10853204ba21116dc363610c40 100644
(file)
--- a/
pv/views/trace/decodetrace.hpp
+++ b/
pv/views/trace/decodetrace.hpp
@@
-33,6
+33,7
@@
#include <QTimer>
#include <pv/binding/decoder.hpp>
#include <QTimer>
#include <pv/binding/decoder.hpp>
+#include <pv/data/decode/annotation.hpp>
#include <pv/data/decode/row.hpp>
#include <pv/data/signalbase.hpp>
#include <pv/data/decode/row.hpp>
#include <pv/data/signalbase.hpp>
@@
-50,14
+51,11
@@
namespace pv {
class Session;
namespace data {
class Session;
namespace data {
-class SignalBase;
struct DecodeChannel;
class DecodeSignal;
namespace decode {
struct DecodeChannel;
class DecodeSignal;
namespace decode {
-class Annotation;
class Decoder;
class Decoder;
-class Row;
}
} // namespace data
}
} // namespace data
@@
-120,7
+118,9
@@
public:
void populate_popup_form(QWidget *parent, QFormLayout *form);
void populate_popup_form(QWidget *parent, QFormLayout *form);
- QMenu* create_context_menu(QWidget *parent);
+ QMenu* create_header_context_menu(QWidget *parent);
+
+ virtual QMenu* create_view_context_menu(QWidget *parent, QPoint &click_pos);
void delete_pressed();
void delete_pressed();
@@
-133,14
+133,15
@@
private:
int h, const ViewItemPaintParams &pp, int y,
QColor row_color, int row_title_width) const;
int h, const ViewItemPaintParams &pp, int y,
QColor row_color, int row_title_width) const;
- void draw_annotation_block(vector<pv::data::decode::Annotation> annotations,
+ void draw_annotation_block(qreal start, qreal end,
+ pv::data::decode::Annotation::Class ann_class, bool use_ann_format,
QPainter &p, int h, int y, QColor row_color) const;
void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
QPainter &p, int h, int y, QColor row_color) const;
void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
- int h,
double
x, int y) const;
+ int h,
qreal
x, int y) const;
void draw_range(const pv::data::decode::Annotation &a, QPainter &p,
void draw_range(const pv::data::decode::Annotation &a, QPainter &p,
- int h,
double start, double
end, int y, const ViewItemPaintParams &pp,
+ int h,
qreal start, qreal
end, int y, const ViewItemPaintParams &pp,
int row_title_width) const;
void draw_error(QPainter &p, const QString &message,
int row_title_width) const;
void draw_error(QPainter &p, const QString &message,
@@
-158,7
+159,7
@@
private:
* @return Returns a pair containing the start sample and the end
* sample that correspond to the start and end coordinates.
*/
* @return Returns a pair containing the start sample and the end
* sample that correspond to the start and end coordinates.
*/
- pair<uint64_t, uint64_t> get_sample_range(int x_start, int x_end) const;
+ pair<uint64_t, uint64_t> get_
view_
sample_range(int x_start, int x_end) const;
QColor get_row_color(int row_index) const;
QColor get_annotation_color(QColor row_color, int annotation_index) const;
QColor get_row_color(int row_index) const;
QColor get_annotation_color(QColor row_color, int annotation_index) const;
@@
-176,14
+177,17
@@
private:
QComboBox* create_channel_selector_init_state(QWidget *parent,
const data::DecodeChannel *ch);
QComboBox* create_channel_selector_init_state(QWidget *parent,
const data::DecodeChannel *ch);
+ void export_annotations(vector<data::decode::Annotation> *annotations) const;
+
public:
public:
- void hover_point_changed(const QPoint &hp);
+ v
irtual v
oid hover_point_changed(const QPoint &hp);
private Q_SLOTS:
void on_new_annotations();
void on_delayed_trace_update();
void on_decode_reset();
void on_decode_finished();
private Q_SLOTS:
void on_new_annotations();
void on_delayed_trace_update();
void on_decode_reset();
void on_decode_finished();
+ void on_pause_decode();
void on_delete();
void on_delete();
@@
-199,17
+203,26
@@
private Q_SLOTS:
void on_show_hide_decoder(int index);
void on_show_hide_decoder(int index);
+ void on_export_row();
+ void on_export_all_rows();
+ void on_export_row_with_cursor();
+ void on_export_all_rows_with_cursor();
+ void on_export_row_from_here();
+ void on_export_all_rows_from_here();
+
private:
pv::Session &session_;
shared_ptr<data::DecodeSignal> decode_signal_;
vector<data::decode::Row> visible_rows_;
private:
pv::Session &session_;
shared_ptr<data::DecodeSignal> decode_signal_;
vector<data::decode::Row> visible_rows_;
- uint64_t decode_start_, decode_end_;
map<QComboBox*, uint16_t> channel_id_map_; // channel selector -> decode channel ID
map<QComboBox*, uint16_t> init_state_map_; // init state selector -> decode channel ID
list< shared_ptr<pv::binding::Decoder> > bindings_;
map<QComboBox*, uint16_t> channel_id_map_; // channel selector -> decode channel ID
map<QComboBox*, uint16_t> init_state_map_; // init state selector -> decode channel ID
list< shared_ptr<pv::binding::Decoder> > bindings_;
+ data::decode::Row *selected_row_;
+ pair<uint64_t, uint64_t> selected_sample_range_;
+
vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
map<data::decode::Row, int> row_title_widths_;
vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
map<data::decode::Row, int> row_title_widths_;