From 71d0f5ae8e44189b9e1555229add91b1aeee34bc Mon Sep 17 00:00:00 2001 From: DreamSourceLab Date: Fri, 8 May 2015 16:21:36 +0800 Subject: [PATCH 1/4] Update NEWS file --- NEWS | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/NEWS b/NEWS index 55c50d60..62931347 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,22 @@ +0.93 (2015-05-08) +----------------- + * Upgrade to qt5 library + * Support stdc++11 + * Improve measure function @ LA mode + * Add duty cycle measure @ LA mode + * Fix out of range issue @ LA mode + * Add export funtion, support csv/vcd/gnuplot/zip @ LA mode; and csv @ DSO mode + * Add x1/x10/x100 probe options @ DSO mode + * Add measure function @ DSO mode + * Add voltage display of trigger value @ DSO mode + * Fix wave disappear issue @ DSO mode + * Fix trigger issue @ DSO stream mode + * Fix data repeat when set trigger @ LA stream mode + * Keep channel settings when reload occured @ LA mode + * Fix decoder issue when capture part of data @ LA mode + * Fix stack decoder add issue @ LA mode + * Fix other bugs + 0.92 (2015-04-15) ----------------- * Add DSLogic Pro and DSCope support From 81f7f01d0c99c47404f950b1336bdc5fb0da549b Mon Sep 17 00:00:00 2001 From: Anders Darander Date: Fri, 17 Apr 2015 07:26:40 +0200 Subject: [PATCH 2/4] gitignore: update for the DSView rename Signed-off-by: Anders Darander --- .gitignore | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d710987c..caa12f24 100644 --- a/.gitignore +++ b/.gitignore @@ -34,10 +34,10 @@ aclocal.m4 DSView/ui_*.h DSView/DSView DSView/install_manifest.txt +DSView/qrc_DSView.cpp -moc_*.cxx -moc_*.cxx_parameters -qrc_*.cxx +moc_*.cpp +moc_*.cpp_parameters libsigrok4DSL/version.h From 6c6766641b653d71b20c4c75a5da424449deb40c Mon Sep 17 00:00:00 2001 From: DreamSourceLab Date: Mon, 14 Dec 2015 21:57:22 +0800 Subject: [PATCH 3/4] bumped version number to 0.95 --- DSView/CMakeLists.txt | 2 +- NEWS | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/DSView/CMakeLists.txt b/DSView/CMakeLists.txt index d26d1c5f..c5703c64 100644 --- a/DSView/CMakeLists.txt +++ b/DSView/CMakeLists.txt @@ -103,7 +103,7 @@ set(DS_DESCRIPTION "A GUI for instruments of DreamSourceLab") set(DS_VERSION_MAJOR 0) set(DS_VERSION_MINOR 9) -set(DS_VERSION_MICRO 4) +set(DS_VERSION_MICRO 5) set(DS_VERSION_STRING ${DS_VERSION_MAJOR}.${DS_VERSION_MINOR}.${DS_VERSION_MICRO} ) diff --git a/NEWS b/NEWS index f1978f01..9e0f9982 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,26 @@ +0.95 (2015-12-14) +----------------- + --for logic analyzer + *add RLE compress mode + *improve mode setting strategy, fix channel number + *add edge count function + *fix memory leakage when run protocol decoder + *add signal height setting, improve display issue + *fix crash issue when add group signal + *fix channel enable/disable issue + *fix channel display issue when load file input + *add cursor by mouse double-click + *fix other issues + + --for oscilloscope + *add file export/load function + *fix wait time issue when trigger setted + *improve display of signal measure + *add Vrms/Vmean/Vp-p measure + *fix setting issue when load session + *imporve add/del of measure ruler + *fix other issues + 0.94 (2015-06-29) ----------------- * add session load/store function From dc3263c04c3c538d38033fc750d2a5a06bb334a5 Mon Sep 17 00:00:00 2001 From: DreamSourceLab Date: Tue, 15 Dec 2015 00:34:13 +0800 Subject: [PATCH 4/4] Fix compile warnings --- DSView/pv/dock/triggerdock.cpp | 1 - DSView/pv/toolbars/samplingbar.cpp | 6 ------ DSView/pv/view/dsosignal.cpp | 18 +++++++++--------- DSView/pv/view/header.cpp | 1 - INSTALL | 2 +- 5 files changed, 10 insertions(+), 18 deletions(-) diff --git a/DSView/pv/dock/triggerdock.cpp b/DSView/pv/dock/triggerdock.cpp index b997386c..aea64b19 100644 --- a/DSView/pv/dock/triggerdock.cpp +++ b/DSView/pv/dock/triggerdock.cpp @@ -267,7 +267,6 @@ void TriggerDock::paintEvent(QPaintEvent *) void TriggerDock::simple_trigger() { - int i; stages_label->setDisabled(true); stages_comboBox->setDisabled(true); _adv_tabWidget->setDisabled(true); diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp index a9c34f1e..85b45603 100644 --- a/DSView/pv/toolbars/samplingbar.cpp +++ b/DSView/pv/toolbars/samplingbar.cpp @@ -494,8 +494,6 @@ void SamplingBar::commit_sample_rate() void SamplingBar::on_samplecount_sel(int index) { uint64_t sample_count = 0; - uint64_t max_sample_count = 0; - bool stream_mode = false; qDebug() << "index: " << index; if (index >= 0) @@ -520,10 +518,6 @@ void SamplingBar::on_samplecount_sel(int index) void SamplingBar::on_samplerate_sel(int index) { uint64_t sample_rate = 0; - //uint64_t last_sample_rate = 0; - uint64_t max_sample_count = 0; - uint64_t sample_count = 0; - bool stream_mode = false; if (index >= 0) sample_rate = _sample_rate.itemData( diff --git a/DSView/pv/view/dsosignal.cpp b/DSView/pv/view/dsosignal.cpp index 11dff4d3..de5e0bbf 100644 --- a/DSView/pv/view/dsosignal.cpp +++ b/DSView/pv/view/dsosignal.cpp @@ -426,15 +426,15 @@ bool DsoSignal::load_settings() GVariant* gvar; // -- enable - bool enable; - gvar = _dev_inst->get_config(_probe, NULL, SR_CONF_EN_CH); - if (gvar != NULL) { - enable = g_variant_get_boolean(gvar); - g_variant_unref(gvar); - } else { - qDebug() << "ERROR: config_get SR_CONF_EN_CH failed."; - return false; - } + //bool enable; + //gvar = _dev_inst->get_config(_probe, NULL, SR_CONF_EN_CH); + //if (gvar != NULL) { + // enable = g_variant_get_boolean(gvar); + // g_variant_unref(gvar); + //} else { + // qDebug() << "ERROR: config_get SR_CONF_EN_CH failed."; + // return false; + //} // -- hdiv uint64_t hdiv; diff --git a/DSView/pv/view/header.cpp b/DSView/pv/view/header.cpp index 2a83f6c0..e6d20c37 100644 --- a/DSView/pv/view/header.cpp +++ b/DSView/pv/view/header.cpp @@ -140,7 +140,6 @@ void Header::mouseDoubleClickEvent(QMouseEvent *event) const vector< boost::shared_ptr > traces( _view.get_traces()); - int action; if (event->button() & Qt::LeftButton) { _mouse_down_point = event->pos(); diff --git a/INSTALL b/INSTALL index a75cb551..1ac01f09 100644 --- a/INSTALL +++ b/INSTALL @@ -49,7 +49,7 @@ Arch: Step2: Get the DSView source code - $ clone git://github.com/DreamSourceLab/DSView + $ git clone git://github.com/DreamSourceLab/DSView Step3: Building