Embedded/DSView
1
0
Fork 0
mirror of https://github.com/DreamSourceLab/DSView.git synced 2025-01-23 13:42:55 +08:00
Code Issues Projects Releases Wiki Activity

Optimize the rendering of decoding results

Browse Source
This commit is contained in:
dreamsourcelabTAI 2023-07-14 16:16:33 +08:00
parent 9c2e9edc3b
commit 2a9f8bdccc
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
DSView/pv/view/decodetrace.cpp
View File

@ -32,9 +32,7 @@
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QScrollArea> #include <QScrollArea>
#include <QApplication> #include <QApplication>
#include "decodetrace.h" #include "decodetrace.h"
#include "../sigsession.h" #include "../sigsession.h"
#include "../data/decoderstack.h" #include "../data/decoderstack.h"
#include "../data/decode/decoder.h" #include "../data/decode/decoder.h"
@ -53,6 +51,7 @@
#include "../dialogs/decoderoptionsdlg.h" #include "../dialogs/decoderoptionsdlg.h"
#include "../ui/langresource.h" #include "../ui/langresource.h"
#include "../config/appconfig.h" #include "../config/appconfig.h"
#include "../log.h"
using namespace boost; using namespace boost;
using namespace std; using namespace std;
@ -280,7 +279,7 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right, QColor fore, QColo
_decoder_stack->get_max_annotation(row); _decoder_stack->get_max_annotation(row);
const double max_annWidth = max_annotation / samples_per_pixel; const double max_annWidth = max_annotation / samples_per_pixel;
if ((max_annWidth > 100) || if ((max_annWidth > 20) ||
(max_annWidth > 10 && min_annWidth > 1) || (max_annWidth > 10 && min_annWidth > 1) ||
(max_annWidth == 0 && samples_per_pixel < 10)) { (max_annWidth == 0 && samples_per_pixel < 10)) {
std::vector<Annotation*> annotations; std::vector<Annotation*> annotations;
@ -288,15 +287,20 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right, QColor fore, QColo
start_sample, end_sample); start_sample, end_sample);
if (!annotations.empty()) { if (!annotations.empty()) {
for(Annotation *a : annotations) double last_x = -1;
for(Annotation *a : annotations){
draw_annotation(*a, p, get_text_colour(), draw_annotation(*a, p, get_text_colour(),
annotation_height, left, right, annotation_height, left, right,
samples_per_pixel, pixels_offset, y, samples_per_pixel, pixels_offset, y,
0, min_annWidth, fore, back); 0, min_annWidth, fore, back, last_x);
}
} }
} else { }
else {
draw_nodetail(p, annotation_height, left, right, y, 0, fore, back); draw_nodetail(p, annotation_height, left, right, y, 0, fore, back);
} }
y += annotation_height; y += annotation_height;
_cur_row_headings.push_back(row.title()); _cur_row_headings.push_back(row.title());
} }
@ -324,7 +328,7 @@ void DecodeTrace::paint_fore(QPainter &p, int left, int right, QColor fore, QCol
void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a, void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
QPainter &p, QColor text_color, int h, int left, int right, QPainter &p, QColor text_color, int h, int left, int right,
double samples_per_pixel, double pixels_offset, int y, double samples_per_pixel, double pixels_offset, int y,
size_t base_colour, double min_annWidth, QColor fore, QColor back) size_t base_colour, double min_annWidth, QColor fore, QColor back, double &last_x)
{ {
const double start = max(a.start_sample() / samples_per_pixel - const double start = max(a.start_sample() / samples_per_pixel -
pixels_offset, (double)left); pixels_offset, (double)left);
@ -338,6 +342,11 @@ void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
if (start > right + DrawPadding || end < left - DrawPadding) if (start > right + DrawPadding || end < left - DrawPadding)
return; return;
if (end - last_x <= 0.5){
return;
}
last_x = end;
if (_decoder_stack->get_mark_index() == (int64_t)(a.start_sample()+ a.end_sample())/2) { if (_decoder_stack->get_mark_index() == (int64_t)(a.start_sample()+ a.end_sample())/2) {
p.setPen(View::Blue); p.setPen(View::Blue);
int xpos = (start+end)/2; int xpos = (start+end)/2;

3
DSView/pv/view/decodetrace.h
View File

@ -149,7 +149,8 @@ private:
void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p, void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
QColor text_colour, int text_height, int left, int right, QColor text_colour, int text_height, int left, int right,
double samples_per_pixel, double pixels_offset, int y, double samples_per_pixel, double pixels_offset, int y,
size_t base_colour, double min_annWidth, QColor fore, QColor back); size_t base_colour, double min_annWidth, QColor fore, QColor back, double &last_x);
void draw_nodetail(QPainter &p, void draw_nodetail(QPainter &p,
int text_height, int left, int right, int y, int text_height, int left, int right, int y,
size_t base_colour, QColor fore, QColor back); size_t base_colour, QColor fore, QColor back);