From b93295580db08d9008b9c9e49a3a3a86ef562f14 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Sat, 26 Oct 2013 12:54:58 +0100 Subject: [PATCH] Renamed DecodeSignal to DecodeTrace --- CMakeLists.txt | 4 +-- pv/sigsession.cpp | 12 +++---- pv/sigsession.h | 8 ++--- pv/view/{decodesignal.cpp => decodetrace.cpp} | 36 +++++++++---------- pv/view/{decodesignal.h => decodetrace.h} | 10 +++--- pv/view/view.cpp | 4 +-- test/CMakeLists.txt | 4 +-- test/data/decoder.cpp | 4 +-- 8 files changed, 41 insertions(+), 41 deletions(-) rename pv/view/{decodesignal.cpp => decodetrace.cpp} (87%) rename pv/view/{decodesignal.h => decodetrace.h} (92%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 03d856b7..ca89c107 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,7 +129,7 @@ set(pulseview_SOURCES pv/view/analogsignal.cpp pv/view/cursor.cpp pv/view/cursorpair.cpp - pv/view/decodesignal.cpp + pv/view/decodetrace.cpp pv/view/header.cpp pv/view/marginwidget.cpp pv/view/logicsignal.cpp @@ -166,7 +166,7 @@ set(pulseview_HEADERS pv/prop/string.h pv/toolbars/samplingbar.h pv/view/cursor.h - pv/view/decodesignal.h + pv/view/decodetrace.h pv/view/header.h pv/view/logicsignal.h pv/view/marginwidget.h diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp index aeb6d220..24a059ea 100644 --- a/pv/sigsession.cpp +++ b/pv/sigsession.cpp @@ -31,7 +31,7 @@ #include "data/logicsnapshot.h" #include "view/analogsignal.h" -#include "view/decodesignal.h" +#include "view/decodetrace.h" #include "view/logicsignal.h" #include @@ -227,8 +227,8 @@ bool SigSession::add_decoder(srd_decoder *const dec) decoder->set_probes(probes); // Create the decode signal - shared_ptr d( - new view::DecodeSignal(*this, decoder, + shared_ptr d( + new view::DecodeTrace(*this, decoder, _decode_traces.size())); _decode_traces.push_back(d); } @@ -242,15 +242,15 @@ bool SigSession::add_decoder(srd_decoder *const dec) return true; } -vector< shared_ptr > SigSession::get_decode_signals() const +vector< shared_ptr > SigSession::get_decode_signals() const { lock_guard lock(_signals_mutex); return _decode_traces; } -void SigSession::remove_decode_signal(view::DecodeSignal *signal) +void SigSession::remove_decode_signal(view::DecodeTrace *signal) { - for (vector< shared_ptr >::iterator i = + for (vector< shared_ptr >::iterator i = _decode_traces.begin(); i != _decode_traces.end(); i++) diff --git a/pv/sigsession.h b/pv/sigsession.h index 801c0a57..980fef94 100644 --- a/pv/sigsession.h +++ b/pv/sigsession.h @@ -49,7 +49,7 @@ class LogicSnapshot; } namespace view { -class DecodeSignal; +class DecodeTrace; class LogicSignal; class Signal; } @@ -96,10 +96,10 @@ public: bool add_decoder(srd_decoder *const dec); - std::vector< boost::shared_ptr > + std::vector< boost::shared_ptr > get_decode_signals() const; - void remove_decode_signal(view::DecodeSignal *signal); + void remove_decode_signal(view::DecodeTrace *signal); private: void set_capture_state(capture_state state); @@ -159,7 +159,7 @@ private: */ struct sr_dev_inst *_sdi; - std::vector< boost::shared_ptr > _decode_traces; + std::vector< boost::shared_ptr > _decode_traces; mutable boost::mutex _sampling_mutex; capture_state _capture_state; diff --git a/pv/view/decodesignal.cpp b/pv/view/decodetrace.cpp similarity index 87% rename from pv/view/decodesignal.cpp rename to pv/view/decodetrace.cpp index 9f81ab42..28443673 100644 --- a/pv/view/decodesignal.cpp +++ b/pv/view/decodetrace.cpp @@ -32,7 +32,7 @@ extern "C" { #include #include -#include "decodesignal.h" +#include "decodetrace.h" #include #include @@ -46,16 +46,16 @@ using namespace std; namespace pv { namespace view { -const QColor DecodeSignal::DecodeColours[4] = { +const QColor DecodeTrace::DecodeColours[4] = { QColor(0xEF, 0x29, 0x29), // Red QColor(0xFC, 0xE9, 0x4F), // Yellow QColor(0x8A, 0xE2, 0x34), // Green QColor(0x72, 0x9F, 0xCF) // Blue }; -const QColor DecodeSignal::ErrorBgColour = QColor(0xEF, 0x29, 0x29); +const QColor DecodeTrace::ErrorBgColour = QColor(0xEF, 0x29, 0x29); -DecodeSignal::DecodeSignal(pv::SigSession &session, +DecodeTrace::DecodeTrace(pv::SigSession &session, boost::shared_ptr decoder, int index) : Trace(session, QString(decoder->decoder()->name)), _decoder(decoder), @@ -69,28 +69,28 @@ DecodeSignal::DecodeSignal(pv::SigSession &session, this, SLOT(on_new_decode_data())); } -bool DecodeSignal::enabled() const +bool DecodeTrace::enabled() const { return true; } -const boost::shared_ptr& DecodeSignal::decoder() const +const boost::shared_ptr& DecodeTrace::decoder() const { return _decoder; } -void DecodeSignal::set_view(pv::view::View *view) +void DecodeTrace::set_view(pv::view::View *view) { assert(view); Trace::set_view(view); } -void DecodeSignal::paint_back(QPainter &p, int left, int right) +void DecodeTrace::paint_back(QPainter &p, int left, int right) { paint_axis(p, get_y(), left, right); } -void DecodeSignal::paint_mid(QPainter &p, int left, int right) +void DecodeTrace::paint_mid(QPainter &p, int left, int right) { using namespace pv::view::decode; @@ -126,7 +126,7 @@ void DecodeSignal::paint_mid(QPainter &p, int left, int right) } } -void DecodeSignal::populate_popup_form(QWidget *parent, QFormLayout *form) +void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form) { const GSList *probe; @@ -181,7 +181,7 @@ void DecodeSignal::populate_popup_form(QWidget *parent, QFormLayout *form) } } -QMenu* DecodeSignal::create_context_menu(QWidget *parent) +QMenu* DecodeTrace::create_context_menu(QWidget *parent) { QMenu *const menu = Trace::create_context_menu(parent); @@ -195,7 +195,7 @@ QMenu* DecodeSignal::create_context_menu(QWidget *parent) return menu; } -void DecodeSignal::draw_error(QPainter &p, const QString &message, +void DecodeTrace::draw_error(QPainter &p, const QString &message, int left, int right) { const int y = get_y(); @@ -216,7 +216,7 @@ void DecodeSignal::draw_error(QPainter &p, const QString &message, p.drawText(text_rect, message); } -QComboBox* DecodeSignal::create_probe_selector( +QComboBox* DecodeTrace::create_probe_selector( QWidget *parent, const srd_probe *const probe) { const vector< shared_ptr > sigs = _session.get_signals(); @@ -249,7 +249,7 @@ QComboBox* DecodeSignal::create_probe_selector( return selector; } -void DecodeSignal::commit_probes() +void DecodeTrace::commit_probes() { assert(_decoder); @@ -276,23 +276,23 @@ void DecodeSignal::commit_probes() _decoder->set_probes(probe_map); } -void DecodeSignal::on_new_decode_data() +void DecodeTrace::on_new_decode_data() { if (_view) _view->update_viewport(); } -void DecodeSignal::delete_pressed() +void DecodeTrace::delete_pressed() { on_delete(); } -void DecodeSignal::on_delete() +void DecodeTrace::on_delete() { _session.remove_decode_signal(this); } -void DecodeSignal::on_probe_selected(int) +void DecodeTrace::on_probe_selected(int) { commit_probes(); } diff --git a/pv/view/decodesignal.h b/pv/view/decodetrace.h similarity index 92% rename from pv/view/decodesignal.h rename to pv/view/decodetrace.h index 7977c1c3..6f7182f4 100644 --- a/pv/view/decodesignal.h +++ b/pv/view/decodetrace.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef PULSEVIEW_PV_VIEW_DECODESIGNAL_H -#define PULSEVIEW_PV_VIEW_DECODESIGNAL_H +#ifndef PULSEVIEW_PV_VIEW_DECODETRACE_H +#define PULSEVIEW_PV_VIEW_DECODETRACE_H #include "trace.h" @@ -41,7 +41,7 @@ class Decoder; namespace view { -class DecodeSignal : public Trace +class DecodeTrace : public Trace { Q_OBJECT @@ -50,7 +50,7 @@ private: static const QColor ErrorBgColour; public: - DecodeSignal(pv::SigSession &session, + DecodeTrace(pv::SigSession &session, boost::shared_ptr decoder, int index); bool enabled() const; @@ -110,4 +110,4 @@ private: } // namespace view } // namespace pv -#endif // PULSEVIEW_PV_VIEW_DECODESIGNAL_H +#endif // PULSEVIEW_PV_VIEW_DECODETRACE_H diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 42a2f79f..4cfb3978 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -30,7 +30,7 @@ #include #include -#include "decodesignal.h" +#include "decodetrace.h" #include "header.h" #include "ruler.h" #include "signal.h" @@ -168,7 +168,7 @@ vector< shared_ptr > View::get_traces() const { const vector< shared_ptr > sigs( session().get_signals()); - const vector< shared_ptr > decode_sigs( + const vector< shared_ptr > decode_sigs( session().get_decode_signals()); vector< shared_ptr > traces( sigs.size() + decode_sigs.size()); diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index e55e20de..6e578b70 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -54,7 +54,7 @@ set(pulseview_TEST_SOURCES ${PROJECT_SOURCE_DIR}/pv/view/analogsignal.cpp ${PROJECT_SOURCE_DIR}/pv/view/cursor.cpp ${PROJECT_SOURCE_DIR}/pv/view/cursorpair.cpp - ${PROJECT_SOURCE_DIR}/pv/view/decodesignal.cpp + ${PROJECT_SOURCE_DIR}/pv/view/decodetrace.cpp ${PROJECT_SOURCE_DIR}/pv/view/header.cpp ${PROJECT_SOURCE_DIR}/pv/view/logicsignal.cpp ${PROJECT_SOURCE_DIR}/pv/view/marginwidget.cpp @@ -85,7 +85,7 @@ set(pulseview_TEST_HEADERS ${PROJECT_SOURCE_DIR}/pv/prop/property.h ${PROJECT_SOURCE_DIR}/pv/prop/string.h ${PROJECT_SOURCE_DIR}/pv/view/cursor.h - ${PROJECT_SOURCE_DIR}/pv/view/decodesignal.h + ${PROJECT_SOURCE_DIR}/pv/view/decodetrace.h ${PROJECT_SOURCE_DIR}/pv/view/header.h ${PROJECT_SOURCE_DIR}/pv/view/logicsignal.h ${PROJECT_SOURCE_DIR}/pv/view/marginwidget.h diff --git a/test/data/decoder.cpp b/test/data/decoder.cpp index 0a54a866..6a48fb04 100644 --- a/test/data/decoder.cpp +++ b/test/data/decoder.cpp @@ -26,7 +26,7 @@ #include "../../pv/data/decoder.h" #include "../../pv/devicemanager.h" #include "../../pv/sigsession.h" -#include "../../pv/view/decodesignal.h" +#include "../../pv/view/decodetrace.h" using namespace boost; using namespace std; @@ -59,7 +59,7 @@ BOOST_AUTO_TEST_CASE(TwoDecoder) ss.add_decoder(dec); // Check the signals were created - const vector< shared_ptr > sigs = + const vector< shared_ptr > sigs = ss.get_decode_signals(); shared_ptr dec0 = sigs[0]->decoder(); -- 2.30.2