* 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_VIEW_DECODETRACE_H
-#define PULSEVIEW_PV_VIEW_DECODETRACE_H
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
#include "trace.hpp"
#include <list>
#include <map>
#include <memory>
+#include <vector>
#include <QSignalMapper>
-#include <pv/prop/binding/decoderoptions.hpp>
+#include <pv/binding/decoder.hpp>
#include <pv/data/decode/row.hpp>
+#include <pv/data/signalbase.hpp>
+
+using std::list;
+using std::map;
+using std::pair;
+using std::shared_ptr;
+using std::vector;
struct srd_channel;
struct srd_decoder;
namespace data {
class DecoderStack;
+class SignalBase;
namespace decode {
class Annotation;
class DecoderGroupBox;
}
-namespace view {
+namespace views {
+namespace TraceView {
class DecodeTrace : public Trace
{
struct ChannelSelector
{
const QComboBox *combo_;
- const std::shared_ptr<pv::data::decode::Decoder> decoder_;
+ const QComboBox *combo_initial_pin_;
+ const shared_ptr<pv::data::decode::Decoder> decoder_;
const srd_channel *pdch_;
};
static const int ArrowSize;
static const double EndCapWidth;
+ static const int RowTitleMargin;
static const int DrawPadding;
static const QColor Colours[16];
static const QColor OutlineColours[16];
public:
- DecodeTrace(pv::Session &session,
- std::shared_ptr<pv::data::DecoderStack> decoder_stack,
+ DecodeTrace(pv::Session &session, shared_ptr<data::SignalBase> signalbase,
int index);
bool enabled() const;
- const std::shared_ptr<pv::data::DecoderStack>& decoder() const;
+ const shared_ptr<pv::data::DecoderStack>& decoder() const;
+
+ shared_ptr<data::SignalBase> base() const;
/**
* Computes the vertical extents of the contents of this row item.
* @return A pair containing the minimum and maximum y-values.
*/
- std::pair<int, int> v_extents() const;
+ pair<int, int> v_extents() const;
/**
* Paints the background layer of the trace with a QPainter
* @param p the QPainter to paint into.
- * @param left the x-coordinate of the left edge of the signal.
- * @param right the x-coordinate of the right edge of the signal.
- **/
- void paint_back(QPainter &p, int left, int right);
+ * @param pp the painting parameters object to paint with..
+ */
+ void paint_back(QPainter &p, ViewItemPaintParams &pp);
/**
* Paints the mid-layer of the trace with a QPainter
* @param p the QPainter to paint into.
- * @param left the x-coordinate of the left edge of the signal
- * @param right the x-coordinate of the right edge of the signal
- **/
- void paint_mid(QPainter &p, int left, int right);
+ * @param pp the painting parameters object to paint with.
+ */
+ void paint_mid(QPainter &p, ViewItemPaintParams &pp);
/**
* Paints the foreground layer of the trace with a QPainter
* @param p the QPainter to paint into.
- * @param left the x-coordinate of the left edge of the signal
- * @param right the x-coordinate of the right edge of the signal
- **/
- void paint_fore(QPainter &p, int left, int right);
+ * @param pp the painting parameters object to paint with.
+ */
+ void paint_fore(QPainter &p, ViewItemPaintParams &pp);
void populate_popup_form(QWidget *parent, QFormLayout *form);
void delete_pressed();
private:
+ void draw_annotations(vector<pv::data::decode::Annotation> annotations,
+ QPainter &p, int h, const ViewItemPaintParams &pp, int y,
+ size_t base_colour, int row_title_width);
+
void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
- QColor text_colour, int text_height, int left, int right, int y,
- size_t base_colour) const;
+ int h, const ViewItemPaintParams &pp, int y,
+ size_t base_colour, int row_title_width) const;
+
+ void draw_annotation_block(vector<pv::data::decode::Annotation> annotations,
+ QPainter &p, int h, int y, size_t base_colour) const;
void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
- QColor fill, QColor outline, QColor text_color, int h, double x,
- int y) const;
+ int h, double x, int y) const;
void draw_range(const pv::data::decode::Annotation &a, QPainter &p,
- QColor fill, QColor outline, QColor text_color, int h, double start,
- double end, int y) const;
+ int h, double start, double end, int y, const ViewItemPaintParams &pp,
+ int row_title_width) const;
void draw_error(QPainter &p, const QString &message,
- int left, int right);
+ const ViewItemPaintParams &pp);
void draw_unresolved_period(QPainter &p, int h, int left,
int right) const;
- std::pair<double, double> get_pixels_offset_samples_per_pixel() const;
+ pair<double, double> get_pixels_offset_samples_per_pixel() const;
/**
* Determines the start and end sample for a given pixel range.
* @return Returns a pair containing the start sample and the end
* sample that correspond to the start and end coordinates.
*/
- std::pair<uint64_t, uint64_t> get_sample_range(int x_start, int x_end) const;
+ pair<uint64_t, uint64_t> get_sample_range(int x_start, int x_end) const;
int get_row_at_point(const QPoint &point);
const QString get_annotation_at_point(const QPoint &point);
- void hide_hover_annotation();
-
void create_decoder_form(int index,
- s
td::shared_ptr<pv::data::decode::Decoder> &dec,
+ shared_ptr<pv::data::decode::Decoder> &dec,
QWidget *parent, QFormLayout *form);
QComboBox* create_channel_selector(QWidget *parent,
- const std::shared_ptr<pv::data::decode::Decoder> &dec,
+ const shared_ptr<pv::data::decode::Decoder> &dec,
+ const srd_channel *const pdch);
+
+ QComboBox* create_channel_selector_initial_pin(QWidget *parent,
+ const shared_ptr<pv::data::decode::Decoder> &dec,
const srd_channel *const pdch);
- void commit_decoder_channels(
- std::shared_ptr<data::decode::Decoder> &dec);
+ void commit_decoder_channels(shared_ptr<data::decode::Decoder> &dec);
void commit_channels();
void on_channel_selected(int);
+ void on_initial_pin_selected(int);
+
void on_stack_decoder(srd_decoder *decoder);
void on_delete_decoder(int index);
private:
pv::Session &session_;
- std::shared_ptr<pv::data::DecoderStack> decoder_stack_;
+ vector<data::decode::Row> visible_rows_;
uint64_t decode_start_, decode_end_;
- std::list< std::shared_ptr<pv::prop::binding::DecoderOptions> >
- bindings_;
+ list< shared_ptr<pv::binding::Decoder> > bindings_;
+
+ list<ChannelSelector> channel_selectors_;
+ vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
- std::list<ChannelSelector> channel_selectors_;
- std::vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
+ map<data::decode::Row, int> row_title_widths_;
+ int row_height_, max_visible_rows_;
- std::vector<data::decode::Row> visible_rows_;
- int text_height_, row_height_;
+ int min_useful_label_width_;
QSignalMapper delete_mapper_, show_hide_mapper_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_DECODETRACE_H
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
projects / pulseview.git / blobdiff