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

fix: The trigger waiting status text is flicker

Browse Source
This commit is contained in:
dreamsourcelabTAI 2023-03-06 11:42:30 +08:00
parent f1bf1c8da6
commit a0a1c9f0d4
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
DSView/pv/view/viewport.cpp
View File

@ -92,6 +92,9 @@ Viewport::Viewport(View &parent, View_type type) :
_clickX = 0;
_sample_received = 0;
_lst_wait_tigger_time = high_resolution_clock::now();
_tigger_wait_times = 0;
// drag inertial
_drag_strength = 0;
_drag_timer.setSingleShot(true);
@ -326,25 +329,44 @@ void Viewport::paintSignals(QPainter &p, QColor fore, QColor back)
uint8_t type;
bool roll = false;
QString type_str="";
GVariant *gvar = _view.session().get_device()->get_config(NULL, NULL, SR_CONF_ROLL);
if (gvar != NULL) {
roll = g_variant_get_boolean(gvar);
g_variant_unref(gvar);
}
gvar = _view.session().get_device()->get_config(NULL, NULL, SR_CONF_TRIGGER_SOURCE);
if (gvar != NULL) {
type = g_variant_get_byte(gvar);
g_variant_unref(gvar);
if (type == DSO_TRIGGER_AUTO && roll) {
type_str = L_S(STR_PAGE_DLG, S_ID(IDS_DLG_AUTO_ROLL), "Auto(Roll)");
} else if (type == DSO_TRIGGER_AUTO && !_view.session().trigd()) {
}
else if (type == DSO_TRIGGER_AUTO && !_view.session().trigd()) {
type_str = L_S(STR_PAGE_DLG, S_ID(IDS_DLG_AUTO), "Auto");
} else if (_waiting_trig > 0) {
}
else if (_waiting_trig > 0) {
type_str = L_S(STR_PAGE_DLG, S_ID(IDS_DLG_WAITING_TRIG), "Waiting Trig");
for (int i = 1; i < _waiting_trig; i++)
if (i % (WaitLoopTime / SigSession::FeedInterval) == 0)
for (int i = 0; i < _tigger_wait_times; i++){
type_str += ".";
} else {
}
high_resolution_clock::time_point cur_time = high_resolution_clock::now();
milliseconds timeInterval = std::chrono::duration_cast<milliseconds>(cur_time - _lst_wait_tigger_time);
int64_t time_keep = timeInterval.count();
if (time_keep >= 500){
_tigger_wait_times++;
_lst_wait_tigger_time = cur_time;
}
if (_tigger_wait_times > 4)
_tigger_wait_times = 0;
}
else {
type_str = L_S(STR_PAGE_DLG, S_ID(IDS_DLG_TRIG_D), "Trig'd");
}
}
@ -1195,6 +1217,7 @@ void Viewport::set_receive_len(quint64 length)
if (length == 0) {
_sample_received = 0;
start_trigger_timer(333);
_tigger_wait_times = 0;
}
else {
stop_trigger_timer();

7
DSView/pv/view/viewport.h
View File

@ -31,6 +31,7 @@
#include <QWidget>
#include <QNativeGestureEvent>
#include <QElapsedTimer>
#include <chrono>
#include "../view/view.h"
#include "../dsvdef.h"
@ -39,6 +40,9 @@ class QPainter;
class QPaintEvent;
class SigSession;
using std::chrono::high_resolution_clock;
using std::chrono::milliseconds;
namespace pv {
namespace view {
@ -207,6 +211,9 @@ private:
bool _curs_moved;
bool _xcurs_moved;
int _clickX;
high_resolution_clock::time_point _lst_wait_tigger_time;
int _tigger_wait_times;
};
} // namespace view