From c02e2d1e9e43d1aa104e258e4204e17617896f3e Mon Sep 17 00:00:00 2001 From: Anatol Pomozov Date: Mon, 14 Dec 2015 11:26:14 -0800 Subject: [PATCH 1/4] Fix misspellings using codespell tool --- DSView/pv/data/decoderstack.cpp | 2 +- DSView/pv/data/decoderstack.h | 2 +- NEWS | 8 ++++---- libsigrok4DSL/hardware/demo/demo.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DSView/pv/data/decoderstack.cpp b/DSView/pv/data/decoderstack.cpp index 1df0abb0..6d9442bf 100644 --- a/DSView/pv/data/decoderstack.cpp +++ b/DSView/pv/data/decoderstack.cpp @@ -409,7 +409,7 @@ void DecoderStack::decode_proc() prev_di = di; } - // Get the intial sample count + // Get the initial sample count { unique_lock input_lock(_input_mutex); sample_count = _sample_count = _snapshot->get_sample_count(); diff --git a/DSView/pv/data/decoderstack.h b/DSView/pv/data/decoderstack.h index b2cd65f8..24713e05 100644 --- a/DSView/pv/data/decoderstack.h +++ b/DSView/pv/data/decoderstack.h @@ -148,7 +148,7 @@ private: pv::SigSession &_session; /** - * This mutex prevents more than one decode operation occuring + * This mutex prevents more than one decode operation occurring * concurrently. * @todo A proper solution should be implemented to allow multiple * decode operations. diff --git a/NEWS b/NEWS index 7dd920f8..d13ac34f 100644 --- a/NEWS +++ b/NEWS @@ -50,14 +50,14 @@ * 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 export function, 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 + * Keep channel settings when reload occurred @ LA mode * Fix decoder issue when capture part of data @ LA mode * Fix stack decoder add issue @ LA mode * Fix other bugs @@ -84,14 +84,14 @@ * 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 export function, 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 + * Keep channel settings when reload occurred @ LA mode * Fix decoder issue when capture part of data @ LA mode * Fix stack decoder add issue @ LA mode * Fix other bugsnalyzer mode diff --git a/libsigrok4DSL/hardware/demo/demo.c b/libsigrok4DSL/hardware/demo/demo.c index a31467a5..03a0f0ce 100644 --- a/libsigrok4DSL/hardware/demo/demo.c +++ b/libsigrok4DSL/hardware/demo/demo.c @@ -1052,7 +1052,7 @@ static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) (void)cb_data; - sr_dbg("Stopping aquisition."); + sr_dbg("Stopping acquisition."); devc->stop = TRUE; sr_session_source_remove_channel(devc->channel); From a723b459d785b5a71af517b6c61df9e1320d36a4 Mon Sep 17 00:00:00 2001 From: teyssieuman Date: Wed, 6 Jan 2016 21:26:58 +0100 Subject: [PATCH 2/4] Remove some compilation warnings on linux --- DSView/pv/data/dsosnapshot.cpp | 6 ++---- DSView/pv/data/dsosnapshot.h | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/DSView/pv/data/dsosnapshot.cpp b/DSView/pv/data/dsosnapshot.cpp index 4e0e1b26..cf245049 100644 --- a/DSView/pv/data/dsosnapshot.cpp +++ b/DSView/pv/data/dsosnapshot.cpp @@ -237,9 +237,8 @@ void DsoSnapshot::append_payload_to_envelope_levels(bool header) _envelope_done = true; } -double DsoSnapshot::cal_vrms(double zero_off, int index) const +double DsoSnapshot::cal_vrms(double zero_off, unsigned int index) const { - assert(index >= 0); assert(index < _channel_num); // root-meam-squart value @@ -272,9 +271,8 @@ double DsoSnapshot::cal_vrms(double zero_off, int index) const return vrms; } -double DsoSnapshot::cal_vmean(int index) const +double DsoSnapshot::cal_vmean(unsigned int index) const { - assert(index >= 0); assert(index < _channel_num); // mean value diff --git a/DSView/pv/data/dsosnapshot.h b/DSView/pv/data/dsosnapshot.h index eb3788bc..56dfb18d 100644 --- a/DSView/pv/data/dsosnapshot.h +++ b/DSView/pv/data/dsosnapshot.h @@ -84,8 +84,8 @@ public: void enable_envelope(bool enable); - double cal_vrms(double zero_off, int index) const; - double cal_vmean(int index) const; + double cal_vrms(double zero_off, unsigned int index) const; + double cal_vmean(unsigned int index) const; private: void reallocate_envelope(Envelope &l); From 73cbab6f43d21a6868fccf1270a5d5d1fc1e3180 Mon Sep 17 00:00:00 2001 From: teyssieuman Date: Wed, 6 Jan 2016 22:07:03 +0100 Subject: [PATCH 3/4] Supress the "QT" error message that appears here: https://www.youtube.com/watch?v=bjITW4hfILs --- DSView/pv/dock/protocoldock.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DSView/pv/dock/protocoldock.cpp b/DSView/pv/dock/protocoldock.cpp index 37463923..48280abf 100644 --- a/DSView/pv/dock/protocoldock.cpp +++ b/DSView/pv/dock/protocoldock.cpp @@ -105,7 +105,7 @@ void ProtocolDock::paintEvent(QPaintEvent *) { QStyleOption opt; opt.init(this); - QPainter p(this); + QPainter p(this->viewport()); style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this); } From dd7b0106bab12865aaa45122cf76b76a81eba8a2 Mon Sep 17 00:00:00 2001 From: Bryant Date: Fri, 8 Jan 2016 19:49:17 -0800 Subject: [PATCH 4/4] Ignore compilation intermediates. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index caa12f24..2b0f916e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ *.lo CMakeFiles CMakeCache.txt +*.cxx_parameters autom4te.cache *.cmake !cmake_modules