From 83738241443c6ebfc41c3a3ca6d5e8cca2bc1677 Mon Sep 17 00:00:00 2001 From: dreamsourcelabTAI Date: Tue, 26 Sep 2023 19:04:13 +0800 Subject: [PATCH] fix: Failed to restore the dutyfactor from data file --- DSView/pv/view/dsosignal.cpp | 2 ++ libsigrok4DSL/session_driver.c | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/DSView/pv/view/dsosignal.cpp b/DSView/pv/view/dsosignal.cpp index 78ce10d1..3dd239a5 100644 --- a/DSView/pv/view/dsosignal.cpp +++ b/DSView/pv/view/dsosignal.cpp @@ -853,6 +853,8 @@ void DsoSignal::paint_mid(QPainter &p, int left, int right, QColor fore, QColor (status.ch1_plevel ? status.ch1_cyc_plen - status.ch1_cyc_llen : status.ch1_cyc_tlen - status.ch1_cyc_plen + status.ch1_cyc_llen); _high_time = ((count == 0) ? 0 : samples / count) * tfactor; + // dsv_info("samples:%f,count:%d,tfactor:%f", + // samples, count, tfactor); samples = (index == 0) ? status.ch0_cyc_tlen + status.ch0_cyc_llen : status.ch1_cyc_flen + status.ch1_cyc_llen; _burst_time = samples * tfactor; diff --git a/libsigrok4DSL/session_driver.c b/libsigrok4DSL/session_driver.c index 7f840376..6da4b024 100644 --- a/libsigrok4DSL/session_driver.c +++ b/libsigrok4DSL/session_driver.c @@ -1061,6 +1061,7 @@ static int config_set(int id, GVariant *data, struct sr_dev_inst *sdi, struct session_vdev *vdev; const char *stropt; unsigned int i; + int pv; assert(sdi); assert(sdi->priv); @@ -1198,10 +1199,11 @@ static int config_set(int id, GVariant *data, struct sr_dev_inst *sdi, vdev->mstatus.ch1_cyc_plen = g_variant_get_uint32(data); break; case SR_CONF_STATUS_LLEN: + pv = g_variant_get_uint32(data); if (ch->index == 0) - vdev->mstatus.ch0_cyc_llen = g_variant_get_uint32(data); + vdev->mstatus.ch0_cyc_llen = pv; else - vdev->mstatus.ch0_cyc_llen = g_variant_get_uint32(data); + vdev->mstatus.ch1_cyc_llen = pv; break; case SR_CONF_STATUS_LEVEL: if (ch->index == 0)