From 3aee725b2f5526d096c3fd632d8eca524280e560 Mon Sep 17 00:00:00 2001 From: DreamSourceLab Date: Sun, 12 Oct 2014 17:38:34 +0800 Subject: [PATCH] fix compile errors --- DSLogic-gui/CMakeLists.txt | 3 +-- DSLogic-gui/pv/data/decode/annotation.cpp | 2 +- DSLogic-gui/pv/mainwindow.cpp | 2 ++ DSLogic-gui/pv/sigsession.cpp | 5 ++++- DSLogic-gui/pv/sigsession.h | 2 ++ DSLogic-gui/pv/view/dsldial.cpp | 4 ++-- DSLogic-gui/pv/view/dsldial.h | 4 ++-- DSLogic-gui/pv/view/dsosignal.cpp | 4 ++-- DSLogic-gui/pv/view/dsosignal.h | 4 ++-- libsigrok4DSLogic/libsigrokdecode | 1 + 10 files changed, 19 insertions(+), 12 deletions(-) create mode 160000 libsigrok4DSLogic/libsigrokdecode diff --git a/DSLogic-gui/CMakeLists.txt b/DSLogic-gui/CMakeLists.txt index 6e7dd10..6f19112 100644 --- a/DSLogic-gui/CMakeLists.txt +++ b/DSLogic-gui/CMakeLists.txt @@ -34,7 +34,7 @@ project(DSLogic) option(DISABLE_WERROR "Build without -Werror" TRUE) option(ENABLE_SIGNALS "Build with UNIX signals" TRUE) -option(ENABLE_DECODE "Build with libsigrokdecode" TRUE) +option(ENABLE_DECODE "Build with libsigrokdecode" FALSE) option(ENABLE_COTIRE "Enable cotire" FALSE) option(ENABLE_TESTS "Enable unit tests" FALSE) option(STATIC_PKGDEPS_LIBS "Statically link to (pkg-config) libraries" FALSE) @@ -154,7 +154,6 @@ set(DSLogic_SOURCES pv/prop/string.cpp pv/prop/binding/binding.cpp pv/prop/binding/deviceoptions.cpp - pv/prop/binding/decoderoptions.cpp pv/toolbars/filebar.cpp pv/toolbars/logobar.cpp pv/toolbars/samplingbar.cpp diff --git a/DSLogic-gui/pv/data/decode/annotation.cpp b/DSLogic-gui/pv/data/decode/annotation.cpp index c3c7440..32d3897 100644 --- a/DSLogic-gui/pv/data/decode/annotation.cpp +++ b/DSLogic-gui/pv/data/decode/annotation.cpp @@ -40,7 +40,7 @@ Annotation::Annotation(const srd_proto_data *const pdata) : (const srd_proto_data_annotation*)pdata->data; assert(pda); - _format = pda->ann_format; + _format = pda->ann_class; const char *const *annotations = (char**)pda->ann_text; while(*annotations) { diff --git a/DSLogic-gui/pv/mainwindow.cpp b/DSLogic-gui/pv/mainwindow.cpp index db501b6..6292cca 100644 --- a/DSLogic-gui/pv/mainwindow.cpp +++ b/DSLogic-gui/pv/mainwindow.cpp @@ -521,9 +521,11 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event) else on_trigger(!_trigger_dock->isVisible()); break; +#ifdef ENABLE_DECODE case Qt::Key_D: on_protocol(!_protocol_dock->isVisible()); break; +#endif case Qt::Key_M: on_measure(!_measure_dock->isVisible()); break; diff --git a/DSLogic-gui/pv/sigsession.cpp b/DSLogic-gui/pv/sigsession.cpp index bb6f238..79c428d 100644 --- a/DSLogic-gui/pv/sigsession.cpp +++ b/DSLogic-gui/pv/sigsession.cpp @@ -476,9 +476,10 @@ void SigSession::init_signals() unsigned int dso_probe_count = 0; unsigned int analog_probe_count = 0; - +#ifdef ENABLE_DECODE // Clear the decode traces _decode_traces.clear(); +#endif // Detect what data types we will receive if(_dev_inst) { @@ -786,11 +787,13 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi, _cur_dso_snapshot.reset(); _cur_analog_snapshot.reset(); } +#ifdef ENABLE_DECODE for (vector< shared_ptr >::iterator i = _decode_traces.begin(); i != _decode_traces.end(); i++) (*i)->decoder()->stop_decode(); +#endif frame_ended(); break; } diff --git a/DSLogic-gui/pv/sigsession.h b/DSLogic-gui/pv/sigsession.h index 28fd79f..edd22f5 100644 --- a/DSLogic-gui/pv/sigsession.h +++ b/DSLogic-gui/pv/sigsession.h @@ -222,7 +222,9 @@ private: mutable boost::mutex _signals_mutex; std::vector< boost::shared_ptr > _signals; std::vector< boost::shared_ptr > _group_traces; +#ifdef ENABLE_DECODE std::vector< boost::shared_ptr > _decode_traces; +#endif mutable boost::mutex _data_mutex; boost::shared_ptr _logic_data; diff --git a/DSLogic-gui/pv/view/dsldial.cpp b/DSLogic-gui/pv/view/dsldial.cpp index ccdec2e..1557496 100644 --- a/DSLogic-gui/pv/view/dsldial.cpp +++ b/DSLogic-gui/pv/view/dsldial.cpp @@ -5,8 +5,8 @@ namespace pv { namespace view { -dslDial::dslDial(quint64 div, quint64 step, - QVector value, QVector unit) +dslDial::dslDial(const quint64 div, const quint64 step, + const QVector value, const QVector unit) { assert(div > 0); assert(step > 0); diff --git a/DSLogic-gui/pv/view/dsldial.h b/DSLogic-gui/pv/view/dsldial.h index 6925309..bf5872c 100644 --- a/DSLogic-gui/pv/view/dsldial.h +++ b/DSLogic-gui/pv/view/dsldial.h @@ -10,8 +10,8 @@ namespace view { class dslDial { public: - dslDial(quint64 div, quint64 step, - QVector value, QVector unit); + dslDial(const quint64 div, const quint64 step, + const QVector value, const QVector unit); virtual ~dslDial(); public: diff --git a/DSLogic-gui/pv/view/dsosignal.cpp b/DSLogic-gui/pv/view/dsosignal.cpp index b2b34a0..42e3ae1 100644 --- a/DSLogic-gui/pv/view/dsosignal.cpp +++ b/DSLogic-gui/pv/view/dsosignal.cpp @@ -113,9 +113,9 @@ DsoSignal::DsoSignal(boost::shared_ptr dev_inst, _trig_vpos(probe->index * 0.5 + 0.25), _zeroPos(probe->index * 0.5 + 0.25) { - QVector vValue; + QVector vValue; QVector vUnit; - QVector hValue; + QVector hValue; QVector hUnit; for(quint64 i = 0; i < vDialValueCount; i++) vValue.append(vDialValue[i]); diff --git a/DSLogic-gui/pv/view/dsosignal.h b/DSLogic-gui/pv/view/dsosignal.h index c6b6626..588c741 100644 --- a/DSLogic-gui/pv/view/dsosignal.h +++ b/DSLogic-gui/pv/view/dsosignal.h @@ -45,8 +45,8 @@ private: static const float EnvelopeThreshold; static const int HitCursorMargin = 3; - static const uint64_t vDialValueCount = 10; - static const uint64_t vDialValueStep = 1000; + static const quint64 vDialValueCount = 10; + static const quint64 vDialValueStep = 1000; static const uint64_t vDialUnitCount = 2; static const uint64_t hDialValueCount = 22; static const uint64_t hDialValueStep = 1000; diff --git a/libsigrok4DSLogic/libsigrokdecode b/libsigrok4DSLogic/libsigrokdecode new file mode 160000 index 0000000..280d554 --- /dev/null +++ b/libsigrok4DSLogic/libsigrokdecode @@ -0,0 +1 @@ +Subproject commit 280d554c29fc234d27be77d602436395d01da6dd -- 2.30.2