From 1573bf16ba50d1c023ad3a9ce596f0ab6eaeacff Mon Sep 17 00:00:00 2001 From: Soeren Apel Date: Sat, 10 Jun 2017 15:37:28 +0200 Subject: [PATCH] Move trace view files --- CMakeLists.txt | 94 +++++++++---------- pv/data/decoderstack.cpp | 2 +- pv/mainwindow.cpp | 2 +- pv/popups/channels.cpp | 2 +- pv/session.cpp | 10 +- pv/toolbars/mainbar.cpp | 2 +- pv/{view => views/trace}/analogsignal.cpp | 9 +- pv/{view => views/trace}/analogsignal.hpp | 4 +- pv/{view => views/trace}/cursor.cpp | 4 +- pv/{view => views/trace}/cursor.hpp | 4 +- pv/{view => views/trace}/cursorpair.cpp | 4 +- pv/{view => views/trace}/cursorpair.hpp | 4 +- pv/{view => views/trace}/decodetrace.cpp | 8 +- pv/{view => views/trace}/decodetrace.hpp | 4 +- pv/{view => views/trace}/flag.cpp | 4 +- pv/{view => views/trace}/flag.hpp | 4 +- pv/{view => views/trace}/header.cpp | 4 +- pv/{view => views/trace}/header.hpp | 4 +- pv/{view => views/trace}/logicsignal.cpp | 5 +- pv/{view => views/trace}/logicsignal.hpp | 4 +- pv/{view => views/trace}/marginwidget.cpp | 4 +- pv/{view => views/trace}/marginwidget.hpp | 4 +- pv/{view => views/trace}/rowitem.cpp | 4 +- pv/{view => views/trace}/rowitem.hpp | 6 +- pv/{view => views/trace}/ruler.cpp | 4 +- pv/{view => views/trace}/ruler.hpp | 4 +- pv/{view => views/trace}/signal.cpp | 4 +- pv/{view => views/trace}/signal.hpp | 4 +- .../trace}/signalscalehandle.cpp | 4 +- .../trace}/signalscalehandle.hpp | 4 +- pv/views/trace/standardbar.cpp | 2 +- pv/{view => views/trace}/timeitem.cpp | 4 +- pv/{view => views/trace}/timeitem.hpp | 4 +- pv/{view => views/trace}/timemarker.cpp | 4 +- pv/{view => views/trace}/timemarker.hpp | 4 +- pv/{view => views/trace}/trace.cpp | 4 +- pv/{view => views/trace}/trace.hpp | 4 +- pv/{view => views/trace}/tracegroup.cpp | 4 +- pv/{view => views/trace}/tracegroup.hpp | 4 +- pv/{view => views/trace}/tracepalette.cpp | 4 +- pv/{view => views/trace}/tracepalette.hpp | 4 +- pv/{view => views/trace}/tracetreeitem.cpp | 4 +- pv/{view => views/trace}/tracetreeitem.hpp | 4 +- .../trace}/tracetreeitemowner.cpp | 4 +- .../trace}/tracetreeitemowner.hpp | 4 +- pv/{view => views/trace}/triggermarker.cpp | 4 +- pv/{view => views/trace}/triggermarker.hpp | 4 +- pv/{view => views/trace}/view.cpp | 4 +- pv/{view => views/trace}/view.hpp | 4 +- pv/{view => views/trace}/viewitem.cpp | 4 +- pv/{view => views/trace}/viewitem.hpp | 4 +- pv/{view => views/trace}/viewitemiterator.hpp | 4 +- pv/{view => views/trace}/viewitemowner.cpp | 4 +- pv/{view => views/trace}/viewitemowner.hpp | 4 +- .../trace}/viewitempaintparams.cpp | 4 +- .../trace}/viewitempaintparams.hpp | 4 +- pv/{view => views/trace}/viewport.cpp | 4 +- pv/{view => views/trace}/viewport.hpp | 4 +- pv/{view => views/trace}/viewwidget.cpp | 4 +- pv/{view => views/trace}/viewwidget.hpp | 6 +- test/CMakeLists.txt | 94 +++++++++---------- test/view/ruler.cpp | 2 +- 62 files changed, 218 insertions(+), 218 deletions(-) rename pv/{view => views/trace}/analogsignal.cpp (99%) rename pv/{view => views/trace}/analogsignal.hpp (99%) rename pv/{view => views/trace}/cursor.cpp (98%) rename pv/{view => views/trace}/cursor.hpp (97%) rename pv/{view => views/trace}/cursorpair.cpp (99%) rename pv/{view => views/trace}/cursorpair.hpp (98%) rename pv/{view => views/trace}/decodetrace.cpp (99%) rename pv/{view => views/trace}/decodetrace.hpp (99%) rename pv/{view => views/trace}/flag.cpp (98%) rename pv/{view => views/trace}/flag.hpp (97%) rename pv/{view => views/trace}/header.cpp (99%) rename pv/{view => views/trace}/header.hpp (97%) rename pv/{view => views/trace}/logicsignal.cpp (99%) rename pv/{view => views/trace}/logicsignal.hpp (98%) rename pv/{view => views/trace}/marginwidget.cpp (97%) rename pv/{view => views/trace}/marginwidget.hpp (97%) rename pv/{view => views/trace}/rowitem.cpp (95%) rename pv/{view => views/trace}/rowitem.hpp (93%) rename pv/{view => views/trace}/ruler.cpp (99%) rename pv/{view => views/trace}/ruler.hpp (99%) rename pv/{view => views/trace}/signal.cpp (98%) rename pv/{view => views/trace}/signal.hpp (98%) rename pv/{view => views/trace}/signalscalehandle.cpp (98%) rename pv/{view => views/trace}/signalscalehandle.hpp (98%) rename pv/{view => views/trace}/timeitem.cpp (95%) rename pv/{view => views/trace}/timeitem.hpp (97%) rename pv/{view => views/trace}/timemarker.cpp (99%) rename pv/{view => views/trace}/timemarker.hpp (98%) rename pv/{view => views/trace}/trace.cpp (99%) rename pv/{view => views/trace}/trace.hpp (98%) rename pv/{view => views/trace}/tracegroup.cpp (99%) rename pv/{view => views/trace}/tracegroup.hpp (98%) rename pv/{view => views/trace}/tracepalette.cpp (97%) rename pv/{view => views/trace}/tracepalette.hpp (96%) rename pv/{view => views/trace}/tracetreeitem.cpp (98%) rename pv/{view => views/trace}/tracetreeitem.hpp (98%) rename pv/{view => views/trace}/tracetreeitemowner.cpp (98%) rename pv/{view => views/trace}/tracetreeitemowner.hpp (98%) rename pv/{view => views/trace}/triggermarker.cpp (97%) rename pv/{view => views/trace}/triggermarker.hpp (97%) rename pv/{view => views/trace}/view.cpp (99%) rename pv/{view => views/trace}/view.hpp (99%) rename pv/{view => views/trace}/viewitem.cpp (98%) rename pv/{view => views/trace}/viewitem.hpp (98%) rename pv/{view => views/trace}/viewitemiterator.hpp (98%) rename pv/{view => views/trace}/viewitemowner.cpp (96%) rename pv/{view => views/trace}/viewitemowner.hpp (98%) rename pv/{view => views/trace}/viewitempaintparams.cpp (96%) rename pv/{view => views/trace}/viewitempaintparams.hpp (97%) rename pv/{view => views/trace}/viewport.cpp (99%) rename pv/{view => views/trace}/viewport.hpp (98%) rename pv/{view => views/trace}/viewwidget.cpp (99%) rename pv/{view => views/trace}/viewwidget.hpp (97%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 983dc537..f7c0eb39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -224,31 +224,31 @@ set(pulseview_SOURCES pv/prop/property.cpp pv/prop/string.cpp pv/toolbars/mainbar.cpp - pv/view/analogsignal.cpp - pv/view/cursor.cpp - pv/view/cursorpair.cpp - pv/view/flag.cpp - pv/view/header.cpp - pv/view/marginwidget.cpp - pv/view/logicsignal.cpp - pv/view/rowitem.cpp - pv/view/ruler.cpp - pv/view/signal.cpp - pv/view/signalscalehandle.cpp - pv/view/timeitem.cpp - pv/view/timemarker.cpp - pv/view/trace.cpp - pv/view/tracegroup.cpp - pv/view/tracepalette.cpp - pv/view/tracetreeitem.cpp - pv/view/tracetreeitemowner.cpp - pv/view/triggermarker.cpp - pv/view/view.cpp - pv/view/viewitem.cpp - pv/view/viewitemowner.cpp - pv/view/viewitempaintparams.cpp - pv/view/viewport.cpp - pv/view/viewwidget.cpp + pv/views/trace/analogsignal.cpp + pv/views/trace/cursor.cpp + pv/views/trace/cursorpair.cpp + pv/views/trace/flag.cpp + pv/views/trace/header.cpp + pv/views/trace/marginwidget.cpp + pv/views/trace/logicsignal.cpp + pv/views/trace/rowitem.cpp + pv/views/trace/ruler.cpp + pv/views/trace/signal.cpp + pv/views/trace/signalscalehandle.cpp + pv/views/trace/timeitem.cpp + pv/views/trace/timemarker.cpp + pv/views/trace/trace.cpp + pv/views/trace/tracegroup.cpp + pv/views/trace/tracepalette.cpp + pv/views/trace/tracetreeitem.cpp + pv/views/trace/tracetreeitemowner.cpp + pv/views/trace/triggermarker.cpp + pv/views/trace/view.cpp + pv/views/trace/viewitem.cpp + pv/views/trace/viewitemowner.cpp + pv/views/trace/viewitempaintparams.cpp + pv/views/trace/viewport.cpp + pv/views/trace/viewwidget.cpp pv/views/viewbase.cpp pv/views/trace/standardbar.cpp pv/widgets/colourbutton.cpp @@ -288,26 +288,26 @@ set(pulseview_HEADERS pv/prop/property.hpp pv/prop/string.hpp pv/toolbars/mainbar.hpp - pv/view/analogsignal.hpp - pv/view/cursor.hpp - pv/view/flag.hpp - pv/view/header.hpp - pv/view/logicsignal.hpp - pv/view/marginwidget.hpp - pv/view/rowitem.hpp - pv/view/ruler.hpp - pv/view/signal.hpp - pv/view/signalscalehandle.hpp - pv/view/timeitem.hpp - pv/view/timemarker.hpp - pv/view/trace.hpp - pv/view/tracegroup.hpp - pv/view/tracetreeitem.hpp - pv/view/triggermarker.hpp - pv/view/view.hpp - pv/view/viewitem.hpp - pv/view/viewport.hpp - pv/view/viewwidget.hpp + pv/views/trace/analogsignal.hpp + pv/views/trace/cursor.hpp + pv/views/trace/flag.hpp + pv/views/trace/header.hpp + pv/views/trace/logicsignal.hpp + pv/views/trace/marginwidget.hpp + pv/views/trace/rowitem.hpp + pv/views/trace/ruler.hpp + pv/views/trace/signal.hpp + pv/views/trace/signalscalehandle.hpp + pv/views/trace/timeitem.hpp + pv/views/trace/timemarker.hpp + pv/views/trace/trace.hpp + pv/views/trace/tracegroup.hpp + pv/views/trace/tracetreeitem.hpp + pv/views/trace/triggermarker.hpp + pv/views/trace/view.hpp + pv/views/trace/viewitem.hpp + pv/views/trace/viewport.hpp + pv/views/trace/viewwidget.hpp pv/views/viewbase.hpp pv/views/trace/standardbar.hpp pv/widgets/colourbutton.hpp @@ -339,14 +339,14 @@ if(ENABLE_DECODE) pv/data/decode/decoder.cpp pv/data/decode/row.cpp pv/data/decode/rowdata.cpp - pv/view/decodetrace.cpp + pv/views/trace/decodetrace.cpp pv/widgets/decodergroupbox.cpp pv/widgets/decodermenu.cpp ) list(APPEND pulseview_HEADERS pv/data/decoderstack.hpp - pv/view/decodetrace.hpp + pv/views/trace/decodetrace.hpp pv/widgets/decodergroupbox.hpp pv/widgets/decodermenu.hpp ) diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp index 561e229d..1e1d600d 100644 --- a/pv/data/decoderstack.cpp +++ b/pv/data/decoderstack.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include using std::lock_guard; using std::mutex; diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index e6686fed..e925bd63 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -45,7 +45,7 @@ #include "globalsettings.hpp" #include "toolbars/mainbar.hpp" #include "util.hpp" -#include "view/view.hpp" +#include "views/trace/view.hpp" #include "views/trace/standardbar.hpp" #include diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp index 49784bd7..ca142d68 100644 --- a/pv/popups/channels.cpp +++ b/pv/popups/channels.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include diff --git a/pv/session.cpp b/pv/session.cpp index c18f8094..66d80f1a 100644 --- a/pv/session.cpp +++ b/pv/session.cpp @@ -43,11 +43,11 @@ #include "toolbars/mainbar.hpp" -#include "view/analogsignal.hpp" -#include "view/decodetrace.hpp" -#include "view/logicsignal.hpp" -#include "view/signal.hpp" -#include "view/view.hpp" +#include "views/trace/analogsignal.hpp" +#include "views/trace/decodetrace.hpp" +#include "views/trace/logicsignal.hpp" +#include "views/trace/signal.hpp" +#include "views/trace/view.hpp" #include diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp index 31035436..76cd8ea1 100644 --- a/pv/toolbars/mainbar.cpp +++ b/pv/toolbars/mainbar.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #ifdef ENABLE_DECODE diff --git a/pv/view/analogsignal.cpp b/pv/views/trace/analogsignal.cpp similarity index 99% rename from pv/view/analogsignal.cpp rename to pv/views/trace/analogsignal.cpp index e0e0b16a..c5237953 100644 --- a/pv/view/analogsignal.cpp +++ b/pv/views/trace/analogsignal.cpp @@ -34,14 +34,15 @@ #include #include "analogsignal.hpp" +#include "logicsignal.hpp" +#include "view.hpp" + #include "pv/data/analog.hpp" #include "pv/data/analogsegment.hpp" #include "pv/data/logic.hpp" #include "pv/data/logicsegment.hpp" #include "pv/data/signalbase.hpp" #include "pv/globalsettings.hpp" -#include "pv/view/logicsignal.hpp" -#include "pv/view/view.hpp" #include @@ -58,7 +59,7 @@ using std::vector; namespace pv { namespace views { -namespace TraceView { +namespace trace { const QColor AnalogSignal::SignalColours[4] = { QColor(0xC4, 0xA0, 0x00), // Yellow @@ -852,6 +853,6 @@ void AnalogSignal::on_display_type_changed(int index) owner_->row_item_appearance_changed(false, true); } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/analogsignal.hpp b/pv/views/trace/analogsignal.hpp similarity index 99% rename from pv/view/analogsignal.hpp rename to pv/views/trace/analogsignal.hpp index 109cdd37..a1b3eeef 100644 --- a/pv/view/analogsignal.hpp +++ b/pv/views/trace/analogsignal.hpp @@ -39,7 +39,7 @@ class SignalBase; } namespace views { -namespace TraceView { +namespace trace { class AnalogSignal : public Signal { @@ -182,7 +182,7 @@ private: bool autoranging_; }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/cursor.cpp b/pv/views/trace/cursor.cpp similarity index 98% rename from pv/view/cursor.cpp rename to pv/views/trace/cursor.cpp index f22680b9..4fb4b65d 100644 --- a/pv/view/cursor.cpp +++ b/pv/views/trace/cursor.cpp @@ -39,7 +39,7 @@ using std::shared_ptr; namespace pv { namespace views { -namespace TraceView { +namespace trace { const QColor Cursor::FillColour(52, 101, 164); @@ -96,6 +96,6 @@ shared_ptr Cursor::get_other_cursor() const cursors->second() : cursors->first(); } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/cursor.hpp b/pv/views/trace/cursor.hpp similarity index 97% rename from pv/view/cursor.hpp rename to pv/views/trace/cursor.hpp index e78920e2..ad91b059 100644 --- a/pv/view/cursor.hpp +++ b/pv/views/trace/cursor.hpp @@ -32,7 +32,7 @@ class QPainter; namespace pv { namespace views { -namespace TraceView { +namespace trace { class Cursor : public TimeMarker { @@ -71,7 +71,7 @@ private: shared_ptr get_other_cursor() const; }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/cursorpair.cpp b/pv/views/trace/cursorpair.cpp similarity index 99% rename from pv/view/cursorpair.cpp rename to pv/views/trace/cursorpair.cpp index 05b9dfca..9a874405 100644 --- a/pv/view/cursorpair.cpp +++ b/pv/views/trace/cursorpair.cpp @@ -34,7 +34,7 @@ using std::pair; namespace pv { namespace views { -namespace TraceView { +namespace trace { const int CursorPair::DeltaPadding = 8; const QColor CursorPair::ViewportFillColour(220, 231, 243); @@ -190,6 +190,6 @@ pair CursorPair::get_cursor_offsets() const return pair(first_->get_x(), second_->get_x()); } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/cursorpair.hpp b/pv/views/trace/cursorpair.hpp similarity index 98% rename from pv/view/cursorpair.hpp rename to pv/views/trace/cursorpair.hpp index ee91ff42..7a73e198 100644 --- a/pv/view/cursorpair.hpp +++ b/pv/views/trace/cursorpair.hpp @@ -33,7 +33,7 @@ class QPainter; namespace pv { namespace views { -namespace TraceView { +namespace trace { class CursorPair : public TimeItem { @@ -108,7 +108,7 @@ private: QSizeF text_size_; }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/decodetrace.cpp b/pv/views/trace/decodetrace.cpp similarity index 99% rename from pv/view/decodetrace.cpp rename to pv/views/trace/decodetrace.cpp index 89d335d7..6ccd3fb8 100644 --- a/pv/view/decodetrace.cpp +++ b/pv/views/trace/decodetrace.cpp @@ -39,6 +39,8 @@ extern "C" { #include #include "decodetrace.hpp" +#include "view.hpp" +#include "viewport.hpp" #include #include @@ -48,8 +50,6 @@ extern "C" { #include #include #include -#include -#include #include #include @@ -70,7 +70,7 @@ using std::vector; namespace pv { namespace views { -namespace TraceView { +namespace trace { const QColor DecodeTrace::DecodeColours[4] = { QColor(0xEF, 0x29, 0x29), // Red @@ -1061,6 +1061,6 @@ void DecodeTrace::on_show_hide_decoder(int index) owner_->row_item_appearance_changed(false, true); } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/decodetrace.hpp b/pv/views/trace/decodetrace.hpp similarity index 99% rename from pv/view/decodetrace.hpp rename to pv/views/trace/decodetrace.hpp index 619c7327..e49d1229 100644 --- a/pv/view/decodetrace.hpp +++ b/pv/views/trace/decodetrace.hpp @@ -64,7 +64,7 @@ class DecoderGroupBox; } namespace views { -namespace TraceView { +namespace trace { class DecodeTrace : public Trace { @@ -228,7 +228,7 @@ private: QSignalMapper delete_mapper_, show_hide_mapper_; }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/flag.cpp b/pv/views/trace/flag.cpp similarity index 98% rename from pv/view/flag.cpp rename to pv/views/trace/flag.cpp index 662a6d02..1db843e0 100644 --- a/pv/view/flag.cpp +++ b/pv/views/trace/flag.cpp @@ -34,7 +34,7 @@ using std::shared_ptr; namespace pv { namespace views { -namespace TraceView { +namespace trace { const QColor Flag::FillColour(0x73, 0xD2, 0x16); @@ -109,6 +109,6 @@ void Flag::on_text_changed(const QString &text) view_.time_item_appearance_changed(true, false); } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/flag.hpp b/pv/views/trace/flag.hpp similarity index 97% rename from pv/view/flag.hpp rename to pv/views/trace/flag.hpp index 5dec187c..4f707bdd 100644 --- a/pv/view/flag.hpp +++ b/pv/views/trace/flag.hpp @@ -30,7 +30,7 @@ class QMenu; namespace pv { namespace views { -namespace TraceView { +namespace trace { class Flag : public TimeMarker, public enable_shared_from_this { @@ -78,7 +78,7 @@ private: QString text_; }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/header.cpp b/pv/views/trace/header.cpp similarity index 99% rename from pv/view/header.cpp rename to pv/views/trace/header.cpp index 7be804d0..58096dc0 100644 --- a/pv/view/header.cpp +++ b/pv/views/trace/header.cpp @@ -47,7 +47,7 @@ using std::vector; namespace pv { namespace views { -namespace TraceView { +namespace trace { const int Header::Padding = 12; @@ -210,6 +210,6 @@ void Header::on_ungroup() } while (restart); } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/header.hpp b/pv/views/trace/header.hpp similarity index 97% rename from pv/view/header.hpp rename to pv/views/trace/header.hpp index 6a4c9a39..0038abb1 100644 --- a/pv/view/header.hpp +++ b/pv/views/trace/header.hpp @@ -31,7 +31,7 @@ using std::vector; namespace pv { namespace views { -namespace TraceView { +namespace trace { class TraceTreeItem; class View; @@ -84,7 +84,7 @@ private Q_SLOTS: void on_ungroup(); }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/logicsignal.cpp b/pv/views/trace/logicsignal.cpp similarity index 99% rename from pv/view/logicsignal.cpp rename to pv/views/trace/logicsignal.cpp index 8a36afaf..9913d687 100644 --- a/pv/view/logicsignal.cpp +++ b/pv/views/trace/logicsignal.cpp @@ -38,7 +38,6 @@ #include #include #include -#include #include @@ -59,7 +58,7 @@ using sigrok::TriggerMatchType; namespace pv { namespace views { -namespace TraceView { +namespace trace { const float LogicSignal::Oversampling = 2.0f; @@ -532,6 +531,6 @@ void LogicSignal::on_trigger() modify_trigger(); } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/logicsignal.hpp b/pv/views/trace/logicsignal.hpp similarity index 98% rename from pv/view/logicsignal.hpp rename to pv/views/trace/logicsignal.hpp index cc62d910..2f5c66ba 100644 --- a/pv/view/logicsignal.hpp +++ b/pv/views/trace/logicsignal.hpp @@ -48,7 +48,7 @@ class Logic; } namespace views { -namespace TraceView { +namespace trace { class LogicSignal : public Signal { @@ -148,7 +148,7 @@ private: static QCache pixmap_cache_; }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/marginwidget.cpp b/pv/views/trace/marginwidget.cpp similarity index 97% rename from pv/view/marginwidget.cpp rename to pv/views/trace/marginwidget.cpp index 0d35c5fc..fa12c2b5 100644 --- a/pv/view/marginwidget.cpp +++ b/pv/views/trace/marginwidget.cpp @@ -30,7 +30,7 @@ using std::shared_ptr; namespace pv { namespace views { -namespace TraceView { +namespace trace { MarginWidget::MarginWidget(View &parent) : ViewWidget(parent) @@ -74,6 +74,6 @@ void MarginWidget::keyPressEvent(QKeyEvent *event) } } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/marginwidget.hpp b/pv/views/trace/marginwidget.hpp similarity index 97% rename from pv/view/marginwidget.hpp rename to pv/views/trace/marginwidget.hpp index ebe8cfc0..9a0686aa 100644 --- a/pv/view/marginwidget.hpp +++ b/pv/views/trace/marginwidget.hpp @@ -30,7 +30,7 @@ using std::shared_ptr; namespace pv { namespace views { -namespace TraceView { +namespace trace { class ViewItem; @@ -67,7 +67,7 @@ protected: virtual void keyPressEvent(QKeyEvent *event); }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/rowitem.cpp b/pv/views/trace/rowitem.cpp similarity index 95% rename from pv/view/rowitem.cpp rename to pv/views/trace/rowitem.cpp index 2353dd92..11a02e9b 100644 --- a/pv/view/rowitem.cpp +++ b/pv/views/trace/rowitem.cpp @@ -21,12 +21,12 @@ namespace pv { namespace views { -namespace TraceView { +namespace trace { void RowItem::hover_point_changed() { } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/rowitem.hpp b/pv/views/trace/rowitem.hpp similarity index 93% rename from pv/view/rowitem.hpp rename to pv/views/trace/rowitem.hpp index 79811e70..ae91d4be 100644 --- a/pv/view/rowitem.hpp +++ b/pv/views/trace/rowitem.hpp @@ -20,11 +20,11 @@ #ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_ROWITEM_HPP #define PULSEVIEW_PV_VIEWS_TRACEVIEW_ROWITEM_HPP -#include +#include "viewitem.hpp" namespace pv { namespace views { -namespace TraceView { +namespace trace { class RowItem : public ViewItem { @@ -34,7 +34,7 @@ public: virtual void hover_point_changed(); }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/ruler.cpp b/pv/views/trace/ruler.cpp similarity index 99% rename from pv/view/ruler.cpp rename to pv/views/trace/ruler.cpp index 712244a9..5455b209 100644 --- a/pv/view/ruler.cpp +++ b/pv/views/trace/ruler.cpp @@ -34,7 +34,7 @@ using std::vector; namespace pv { namespace views { -namespace TraceView { +namespace trace { const float Ruler::RulerHeight = 2.5f; // x Text Height const int Ruler::MinorTickSubdivision = 4; @@ -272,6 +272,6 @@ void Ruler::resizeEvent(QResizeEvent*) invalidate_tick_position_cache(); } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/ruler.hpp b/pv/views/trace/ruler.hpp similarity index 99% rename from pv/view/ruler.hpp rename to pv/views/trace/ruler.hpp index 1efd8737..40aae48d 100644 --- a/pv/view/ruler.hpp +++ b/pv/views/trace/ruler.hpp @@ -41,7 +41,7 @@ struct tick_position_test_2; namespace pv { namespace views { -namespace TraceView { +namespace trace { class TimeItem; class ViewItem; @@ -177,7 +177,7 @@ private Q_SLOTS: void invalidate_tick_position_cache(); }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/signal.cpp b/pv/views/trace/signal.cpp similarity index 98% rename from pv/view/signal.cpp rename to pv/views/trace/signal.cpp index 960cefa6..a55598cf 100644 --- a/pv/view/signal.cpp +++ b/pv/views/trace/signal.cpp @@ -40,7 +40,7 @@ using std::make_shared; namespace pv { namespace views { -namespace TraceView { +namespace trace { const char *const ChannelNames[] = { "CLK", @@ -183,6 +183,6 @@ void Signal::on_enabled_changed(bool enabled) owner_->extents_changed(true, true); } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/signal.hpp b/pv/views/trace/signal.hpp similarity index 98% rename from pv/view/signal.hpp rename to pv/views/trace/signal.hpp index 40ba52ea..83472818 100644 --- a/pv/view/signal.hpp +++ b/pv/views/trace/signal.hpp @@ -43,7 +43,7 @@ class SignalData; } namespace views { -namespace TraceView { +namespace trace { class Signal : public Trace, public ViewItemOwner { @@ -116,7 +116,7 @@ protected: QComboBox *name_widget_; }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/signalscalehandle.cpp b/pv/views/trace/signalscalehandle.cpp similarity index 98% rename from pv/view/signalscalehandle.cpp rename to pv/views/trace/signalscalehandle.cpp index 20a4cad4..11f9bdef 100644 --- a/pv/view/signalscalehandle.cpp +++ b/pv/views/trace/signalscalehandle.cpp @@ -30,7 +30,7 @@ using std::min; namespace pv { namespace views { -namespace TraceView { +namespace trace { SignalScaleHandle::SignalScaleHandle(Signal &owner) : owner_(owner) @@ -103,6 +103,6 @@ void SignalScaleHandle::paint_fore(QPainter &p, ViewItemPaintParams &pp) p.drawEllipse(r); } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/signalscalehandle.hpp b/pv/views/trace/signalscalehandle.hpp similarity index 98% rename from pv/view/signalscalehandle.hpp rename to pv/views/trace/signalscalehandle.hpp index 193d352f..54eb59e8 100644 --- a/pv/view/signalscalehandle.hpp +++ b/pv/views/trace/signalscalehandle.hpp @@ -24,7 +24,7 @@ namespace pv { namespace views { -namespace TraceView { +namespace trace { class Signal; @@ -87,7 +87,7 @@ private: Signal &owner_; }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/views/trace/standardbar.cpp b/pv/views/trace/standardbar.cpp index 6d8f97e6..fa02d167 100644 --- a/pv/views/trace/standardbar.cpp +++ b/pv/views/trace/standardbar.cpp @@ -22,9 +22,9 @@ #include #include "standardbar.hpp" +#include "view.hpp" #include -#include using pv::views::TraceView::View; diff --git a/pv/view/timeitem.cpp b/pv/views/trace/timeitem.cpp similarity index 95% rename from pv/view/timeitem.cpp rename to pv/views/trace/timeitem.cpp index 33fe7310..bd07e9b2 100644 --- a/pv/view/timeitem.cpp +++ b/pv/views/trace/timeitem.cpp @@ -22,7 +22,7 @@ namespace pv { namespace views { -namespace TraceView { +namespace trace { TimeItem::TimeItem(View &view) : view_(view) { @@ -34,6 +34,6 @@ void TimeItem::drag_by(const QPoint &delta) view_.scale()); } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/timeitem.hpp b/pv/views/trace/timeitem.hpp similarity index 97% rename from pv/view/timeitem.hpp rename to pv/views/trace/timeitem.hpp index c5af3b89..dd8d3c4a 100644 --- a/pv/view/timeitem.hpp +++ b/pv/views/trace/timeitem.hpp @@ -24,7 +24,7 @@ namespace pv { namespace views { -namespace TraceView { +namespace trace { class View; @@ -58,7 +58,7 @@ protected: View &view_; }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/timemarker.cpp b/pv/views/trace/timemarker.cpp similarity index 99% rename from pv/view/timemarker.cpp rename to pv/views/trace/timemarker.cpp index 853f7c02..487496d9 100644 --- a/pv/view/timemarker.cpp +++ b/pv/views/trace/timemarker.cpp @@ -39,7 +39,7 @@ using std::min; namespace pv { namespace views { -namespace TraceView { +namespace trace { const int TimeMarker::ArrowSize = 4; @@ -193,6 +193,6 @@ void TimeMarker::on_value_changed(const pv::util::Timestamp& value) set_time(value); } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/timemarker.hpp b/pv/views/trace/timemarker.hpp similarity index 98% rename from pv/view/timemarker.hpp rename to pv/views/trace/timemarker.hpp index dba52fa4..7c49948b 100644 --- a/pv/view/timemarker.hpp +++ b/pv/views/trace/timemarker.hpp @@ -37,7 +37,7 @@ namespace widgets { } namespace views { -namespace TraceView { +namespace trace { class View; @@ -127,7 +127,7 @@ protected: bool updating_value_widget_; }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/trace.cpp b/pv/views/trace/trace.cpp similarity index 99% rename from pv/view/trace.cpp rename to pv/views/trace/trace.cpp index e5733372..46d9edb9 100644 --- a/pv/view/trace.cpp +++ b/pv/views/trace/trace.cpp @@ -40,7 +40,7 @@ using std::shared_ptr; namespace pv { namespace views { -namespace TraceView { +namespace trace { const QPen Trace::AxisPen(QColor(0, 0, 0, 30 * 256 / 100)); const int Trace::LabelHitPadding = 2; @@ -279,6 +279,6 @@ void Trace::on_colouredit_changed(const QColor &colour) set_colour(colour); } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/trace.hpp b/pv/views/trace/trace.hpp similarity index 98% rename from pv/view/trace.hpp rename to pv/views/trace/trace.hpp index b6b15198..88b4ea6b 100644 --- a/pv/view/trace.hpp +++ b/pv/views/trace/trace.hpp @@ -47,7 +47,7 @@ class Popup; } namespace views { -namespace TraceView { +namespace trace { class Trace : public TraceTreeItem { @@ -140,7 +140,7 @@ private: QFormLayout *popup_form_; }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/tracegroup.cpp b/pv/views/trace/tracegroup.cpp similarity index 99% rename from pv/view/tracegroup.cpp rename to pv/views/trace/tracegroup.cpp index 265bc275..9bcc29e9 100644 --- a/pv/view/tracegroup.cpp +++ b/pv/views/trace/tracegroup.cpp @@ -34,7 +34,7 @@ using std::vector; namespace pv { namespace views { -namespace TraceView { +namespace trace { const int TraceGroup::Padding = 8; const int TraceGroup::Width = 12; @@ -223,6 +223,6 @@ void TraceGroup::extents_changed(bool horz, bool vert) owner_->extents_changed(horz, vert); } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/tracegroup.hpp b/pv/views/trace/tracegroup.hpp similarity index 98% rename from pv/view/tracegroup.hpp rename to pv/views/trace/tracegroup.hpp index b00d5bf5..6a72318a 100644 --- a/pv/view/tracegroup.hpp +++ b/pv/views/trace/tracegroup.hpp @@ -27,7 +27,7 @@ using std::pair; namespace pv { namespace views { -namespace TraceView { +namespace trace { class TraceGroup : public TraceTreeItem, public TraceTreeItemOwner { @@ -129,7 +129,7 @@ private Q_SLOTS: void on_ungroup(); }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/tracepalette.cpp b/pv/views/trace/tracepalette.cpp similarity index 97% rename from pv/view/tracepalette.cpp rename to pv/views/trace/tracepalette.cpp index d4cfdd7b..762eafc3 100644 --- a/pv/view/tracepalette.cpp +++ b/pv/views/trace/tracepalette.cpp @@ -21,7 +21,7 @@ namespace pv { namespace views { -namespace TraceView { +namespace trace { const QColor TracePalette::Colours[Cols * Rows] = { @@ -66,6 +66,6 @@ const QColor TracePalette::Colours[Cols * Rows] = { QColor(0xFF, 0xFF, 0xFF), // White }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/tracepalette.hpp b/pv/views/trace/tracepalette.hpp similarity index 96% rename from pv/view/tracepalette.hpp rename to pv/views/trace/tracepalette.hpp index 86536fe6..c3a87017 100644 --- a/pv/view/tracepalette.hpp +++ b/pv/views/trace/tracepalette.hpp @@ -24,7 +24,7 @@ namespace pv { namespace views { -namespace TraceView { +namespace trace { class TracePalette { @@ -34,7 +34,7 @@ public: static const QColor Colours[Cols * Rows]; }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/tracetreeitem.cpp b/pv/views/trace/tracetreeitem.cpp similarity index 98% rename from pv/view/tracetreeitem.cpp rename to pv/views/trace/tracetreeitem.cpp index a70ca32c..470b6ad3 100644 --- a/pv/view/tracetreeitem.cpp +++ b/pv/views/trace/tracetreeitem.cpp @@ -25,7 +25,7 @@ namespace pv { namespace views { -namespace TraceView { +namespace trace { TraceTreeItem::TraceTreeItem() : owner_(nullptr), @@ -138,6 +138,6 @@ QPoint TraceTreeItem::point(const QRect &rect) const return QPoint(rect.right(), get_visual_y()); } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/tracetreeitem.hpp b/pv/views/trace/tracetreeitem.hpp similarity index 98% rename from pv/view/tracetreeitem.hpp rename to pv/views/trace/tracetreeitem.hpp index 5b0bc615..7a4bf462 100644 --- a/pv/view/tracetreeitem.hpp +++ b/pv/views/trace/tracetreeitem.hpp @@ -31,7 +31,7 @@ using std::pair; namespace pv { namespace views { -namespace TraceView { +namespace trace { class TraceTreeItemOwner; @@ -129,7 +129,7 @@ private: QPropertyAnimation v_offset_animation_; }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/tracetreeitemowner.cpp b/pv/views/trace/tracetreeitemowner.cpp similarity index 98% rename from pv/view/tracetreeitemowner.cpp rename to pv/views/trace/tracetreeitemowner.cpp index bff63c76..a65c6217 100644 --- a/pv/view/tracetreeitemowner.cpp +++ b/pv/views/trace/tracetreeitemowner.cpp @@ -34,7 +34,7 @@ using std::vector; namespace pv { namespace views { -namespace TraceView { +namespace trace { const ViewItemOwner::item_list& TraceTreeItemOwner::child_items() const { @@ -114,6 +114,6 @@ void TraceTreeItemOwner::restack_items() { } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/tracetreeitemowner.hpp b/pv/views/trace/tracetreeitemowner.hpp similarity index 98% rename from pv/view/tracetreeitemowner.hpp rename to pv/views/trace/tracetreeitemowner.hpp index cfe7bf7b..57109007 100644 --- a/pv/view/tracetreeitemowner.hpp +++ b/pv/views/trace/tracetreeitemowner.hpp @@ -32,7 +32,7 @@ namespace pv { class Session; namespace views { -namespace TraceView { +namespace trace { class TraceTreeItem; class View; @@ -106,7 +106,7 @@ public: virtual void extents_changed(bool horz, bool vert) = 0; }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/triggermarker.cpp b/pv/views/trace/triggermarker.cpp similarity index 97% rename from pv/view/triggermarker.cpp rename to pv/views/trace/triggermarker.cpp index bac1e82d..31afba1c 100644 --- a/pv/view/triggermarker.cpp +++ b/pv/views/trace/triggermarker.cpp @@ -22,7 +22,7 @@ namespace pv { namespace views { -namespace TraceView { +namespace trace { const QColor TriggerMarker::Colour(0x00, 0x00, 0xB0); @@ -78,6 +78,6 @@ void TriggerMarker::paint_fore(QPainter &p, ViewItemPaintParams &pp) p.drawLine(QPointF(x, pp.top()), QPointF(x, pp.bottom())); } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/triggermarker.hpp b/pv/views/trace/triggermarker.hpp similarity index 97% rename from pv/view/triggermarker.hpp rename to pv/views/trace/triggermarker.hpp index b1610a5b..09017c0b 100644 --- a/pv/view/triggermarker.hpp +++ b/pv/views/trace/triggermarker.hpp @@ -24,7 +24,7 @@ namespace pv { namespace views { -namespace TraceView { +namespace trace { class TriggerMarker : public TimeItem { @@ -80,7 +80,7 @@ private: pv::util::Timestamp time_; }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/view.cpp b/pv/views/trace/view.cpp similarity index 99% rename from pv/view/view.cpp rename to pv/views/trace/view.cpp index eeda37cc..dbc0d203 100644 --- a/pv/view/view.cpp +++ b/pv/views/trace/view.cpp @@ -90,7 +90,7 @@ using std::vector; namespace pv { namespace views { -namespace TraceView { +namespace trace { const Timestamp View::MaxScale("1e9"); const Timestamp View::MinScale("1e-12"); @@ -1374,6 +1374,6 @@ void View::on_hover_point_changed() r->hover_point_changed(); } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/view.hpp b/pv/views/trace/view.hpp similarity index 99% rename from pv/view/view.hpp rename to pv/views/trace/view.hpp index 2fff8d25..bfa7ed3e 100644 --- a/pv/view/view.hpp +++ b/pv/views/trace/view.hpp @@ -60,7 +60,7 @@ class Logic; namespace views { -namespace TraceView { +namespace trace { class CursorHeader; class DecodeTrace; @@ -456,7 +456,7 @@ private: int saved_v_offset_; }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/viewitem.cpp b/pv/views/trace/viewitem.cpp similarity index 98% rename from pv/view/viewitem.cpp rename to pv/views/trace/viewitem.cpp index 7213f96d..61bc99f5 100644 --- a/pv/view/viewitem.cpp +++ b/pv/views/trace/viewitem.cpp @@ -27,7 +27,7 @@ namespace pv { namespace views { -namespace TraceView { +namespace trace { const QSizeF ViewItem::LabelPadding(4, 0); const int ViewItem::HighlightRadius = 3; @@ -135,6 +135,6 @@ QColor ViewItem::select_text_colour(QColor background) return (background.lightness() > 110) ? Qt::black : Qt::white; } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/viewitem.hpp b/pv/views/trace/viewitem.hpp similarity index 98% rename from pv/view/viewitem.hpp rename to pv/views/trace/viewitem.hpp index 978cb91c..e1cc2004 100644 --- a/pv/view/viewitem.hpp +++ b/pv/views/trace/viewitem.hpp @@ -37,7 +37,7 @@ class Popup; } namespace views { -namespace TraceView { +namespace trace { class ViewItemOwner; @@ -172,7 +172,7 @@ private: bool selected_; }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/viewitemiterator.hpp b/pv/views/trace/viewitemiterator.hpp similarity index 98% rename from pv/view/viewitemiterator.hpp rename to pv/views/trace/viewitemiterator.hpp index 91ace4e9..88600d08 100644 --- a/pv/view/viewitemiterator.hpp +++ b/pv/views/trace/viewitemiterator.hpp @@ -37,7 +37,7 @@ using std::stack; namespace pv { namespace views { -namespace TraceView { +namespace trace { template class ViewItemIterator { @@ -125,7 +125,7 @@ void swap(ViewItemIterator& a, ViewItemIterator& b) a.swap(b); } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/viewitemowner.cpp b/pv/views/trace/viewitemowner.cpp similarity index 96% rename from pv/view/viewitemowner.cpp rename to pv/views/trace/viewitemowner.cpp index 94876590..855cb1af 100644 --- a/pv/view/viewitemowner.cpp +++ b/pv/views/trace/viewitemowner.cpp @@ -25,7 +25,7 @@ namespace pv { namespace views { -namespace TraceView { +namespace trace { ViewItemOwner::iterator ViewItemOwner::begin() { @@ -47,6 +47,6 @@ ViewItemOwner::const_iterator ViewItemOwner::end() const return const_iterator(this); } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/viewitemowner.hpp b/pv/views/trace/viewitemowner.hpp similarity index 98% rename from pv/view/viewitemowner.hpp rename to pv/views/trace/viewitemowner.hpp index dcec370f..b8dbe202 100644 --- a/pv/view/viewitemowner.hpp +++ b/pv/views/trace/viewitemowner.hpp @@ -34,7 +34,7 @@ namespace pv { class Session; namespace views { -namespace TraceView { +namespace trace { class ViewItem; class View; @@ -94,7 +94,7 @@ protected: item_list items_; }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/viewitempaintparams.cpp b/pv/views/trace/viewitempaintparams.cpp similarity index 96% rename from pv/view/viewitempaintparams.cpp rename to pv/views/trace/viewitempaintparams.cpp index 5a0b815a..2d9cfbb5 100644 --- a/pv/view/viewitempaintparams.cpp +++ b/pv/views/trace/viewitempaintparams.cpp @@ -26,7 +26,7 @@ namespace pv { namespace views { -namespace TraceView { +namespace trace { ViewItemPaintParams::ViewItemPaintParams( const QRect &rect, double scale, const pv::util::Timestamp& offset) : @@ -48,6 +48,6 @@ int ViewItemPaintParams::text_height() return QFontMetrics(font()).height(); } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/viewitempaintparams.hpp b/pv/views/trace/viewitempaintparams.hpp similarity index 97% rename from pv/view/viewitempaintparams.hpp rename to pv/views/trace/viewitempaintparams.hpp index 9f2125c8..f39085ce 100644 --- a/pv/view/viewitempaintparams.hpp +++ b/pv/views/trace/viewitempaintparams.hpp @@ -27,7 +27,7 @@ namespace pv { namespace views { -namespace TraceView { +namespace trace { class ViewItemPaintParams { @@ -93,7 +93,7 @@ private: bool bg_colour_state_; }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/viewport.cpp b/pv/views/trace/viewport.cpp similarity index 99% rename from pv/view/viewport.cpp rename to pv/views/trace/viewport.cpp index 70282d29..d426a133 100644 --- a/pv/view/viewport.cpp +++ b/pv/views/trace/viewport.cpp @@ -44,7 +44,7 @@ using std::vector; namespace pv { namespace views { -namespace TraceView { +namespace trace { Viewport::Viewport(View &parent) : ViewWidget(parent), @@ -219,6 +219,6 @@ void Viewport::wheelEvent(QWheelEvent *event) } } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/viewport.hpp b/pv/views/trace/viewport.hpp similarity index 98% rename from pv/view/viewport.hpp rename to pv/views/trace/viewport.hpp index de3e681d..ab67f69f 100644 --- a/pv/view/viewport.hpp +++ b/pv/views/trace/viewport.hpp @@ -37,7 +37,7 @@ class Session; namespace pv { namespace views { -namespace TraceView { +namespace trace { class View; @@ -106,7 +106,7 @@ private: bool pinch_zoom_active_; }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/viewwidget.cpp b/pv/views/trace/viewwidget.cpp similarity index 99% rename from pv/view/viewwidget.cpp rename to pv/views/trace/viewwidget.cpp index ce5c27a8..5a1aa3c3 100644 --- a/pv/view/viewwidget.cpp +++ b/pv/views/trace/viewwidget.cpp @@ -31,7 +31,7 @@ using std::vector; namespace pv { namespace views { -namespace TraceView { +namespace trace { ViewWidget::ViewWidget(View &parent) : QWidget(&parent), @@ -305,6 +305,6 @@ void ViewWidget::leaveEvent(QEvent*) update(); } -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/pv/view/viewwidget.hpp b/pv/views/trace/viewwidget.hpp similarity index 97% rename from pv/view/viewwidget.hpp rename to pv/views/trace/viewwidget.hpp index 02c842a8..e4fb73c8 100644 --- a/pv/view/viewwidget.hpp +++ b/pv/views/trace/viewwidget.hpp @@ -31,7 +31,7 @@ class QTouchEvent; namespace pv { namespace views { -namespace TraceView { +namespace trace { class View; class ViewItem; @@ -139,14 +139,14 @@ Q_SIGNALS: void selection_changed(); protected: - pv::views::TraceView::View &view_; + pv::views::trace::View &view_; QPoint mouse_point_; QPoint mouse_down_point_; shared_ptr mouse_down_item_; bool item_dragging_; }; -} // namespace TraceView +} // namespace trace } // namespace views } // namespace pv diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 09678e84..8cab18fe 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -51,31 +51,31 @@ set(pulseview_TEST_SOURCES ${PROJECT_SOURCE_DIR}/pv/popups/channels.cpp ${PROJECT_SOURCE_DIR}/pv/popups/deviceoptions.cpp ${PROJECT_SOURCE_DIR}/pv/toolbars/mainbar.cpp - ${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/flag.cpp - ${PROJECT_SOURCE_DIR}/pv/view/header.cpp - ${PROJECT_SOURCE_DIR}/pv/view/marginwidget.cpp - ${PROJECT_SOURCE_DIR}/pv/view/logicsignal.cpp - ${PROJECT_SOURCE_DIR}/pv/view/rowitem.cpp - ${PROJECT_SOURCE_DIR}/pv/view/ruler.cpp - ${PROJECT_SOURCE_DIR}/pv/view/signal.cpp - ${PROJECT_SOURCE_DIR}/pv/view/signalscalehandle.cpp - ${PROJECT_SOURCE_DIR}/pv/view/timeitem.cpp - ${PROJECT_SOURCE_DIR}/pv/view/timemarker.cpp - ${PROJECT_SOURCE_DIR}/pv/view/trace.cpp - ${PROJECT_SOURCE_DIR}/pv/view/tracegroup.cpp - ${PROJECT_SOURCE_DIR}/pv/view/tracepalette.cpp - ${PROJECT_SOURCE_DIR}/pv/view/tracetreeitem.cpp - ${PROJECT_SOURCE_DIR}/pv/view/tracetreeitemowner.cpp - ${PROJECT_SOURCE_DIR}/pv/view/triggermarker.cpp - ${PROJECT_SOURCE_DIR}/pv/view/view.cpp - ${PROJECT_SOURCE_DIR}/pv/view/viewitem.cpp - ${PROJECT_SOURCE_DIR}/pv/view/viewitemowner.cpp - ${PROJECT_SOURCE_DIR}/pv/view/viewitempaintparams.cpp - ${PROJECT_SOURCE_DIR}/pv/view/viewport.cpp - ${PROJECT_SOURCE_DIR}/pv/view/viewwidget.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/analogsignal.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/cursor.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/cursorpair.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/flag.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/header.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/marginwidget.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/logicsignal.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/rowitem.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/ruler.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/signal.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/signalscalehandle.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/timeitem.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/timemarker.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/trace.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/tracegroup.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/tracepalette.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/tracetreeitem.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/tracetreeitemowner.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/triggermarker.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/view.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/viewitem.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/viewitemowner.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/viewitempaintparams.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/viewport.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/viewwidget.cpp ${PROJECT_SOURCE_DIR}/pv/views/viewbase.cpp ${PROJECT_SOURCE_DIR}/pv/views/trace/standardbar.cpp ${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.cpp @@ -120,26 +120,26 @@ set(pulseview_TEST_HEADERS ${PROJECT_SOURCE_DIR}/pv/prop/property.hpp ${PROJECT_SOURCE_DIR}/pv/prop/string.hpp ${PROJECT_SOURCE_DIR}/pv/toolbars/mainbar.hpp - ${PROJECT_SOURCE_DIR}/pv/view/analogsignal.hpp - ${PROJECT_SOURCE_DIR}/pv/view/cursor.hpp - ${PROJECT_SOURCE_DIR}/pv/view/flag.hpp - ${PROJECT_SOURCE_DIR}/pv/view/header.hpp - ${PROJECT_SOURCE_DIR}/pv/view/logicsignal.hpp - ${PROJECT_SOURCE_DIR}/pv/view/marginwidget.hpp - ${PROJECT_SOURCE_DIR}/pv/view/rowitem.hpp - ${PROJECT_SOURCE_DIR}/pv/view/ruler.hpp - ${PROJECT_SOURCE_DIR}/pv/view/signal.hpp - ${PROJECT_SOURCE_DIR}/pv/view/signalscalehandle.hpp - ${PROJECT_SOURCE_DIR}/pv/view/timeitem.hpp - ${PROJECT_SOURCE_DIR}/pv/view/timemarker.hpp - ${PROJECT_SOURCE_DIR}/pv/view/trace.hpp - ${PROJECT_SOURCE_DIR}/pv/view/tracegroup.hpp - ${PROJECT_SOURCE_DIR}/pv/view/tracetreeitem.hpp - ${PROJECT_SOURCE_DIR}/pv/view/triggermarker.hpp - ${PROJECT_SOURCE_DIR}/pv/view/view.hpp - ${PROJECT_SOURCE_DIR}/pv/view/viewitem.hpp - ${PROJECT_SOURCE_DIR}/pv/view/viewport.hpp - ${PROJECT_SOURCE_DIR}/pv/view/viewwidget.hpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/analogsignal.hpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/cursor.hpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/flag.hpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/header.hpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/logicsignal.hpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/marginwidget.hpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/rowitem.hpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/ruler.hpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/signal.hpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/signalscalehandle.hpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/timeitem.hpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/timemarker.hpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/trace.hpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/tracegroup.hpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/tracetreeitem.hpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/triggermarker.hpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/view.hpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/viewitem.hpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/viewport.hpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/viewwidget.hpp ${PROJECT_SOURCE_DIR}/pv/views/viewbase.hpp ${PROJECT_SOURCE_DIR}/pv/views/trace/standardbar.hpp ${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.hpp @@ -162,7 +162,7 @@ if(ENABLE_DECODE) ${PROJECT_SOURCE_DIR}/pv/data/decode/decoder.cpp ${PROJECT_SOURCE_DIR}/pv/data/decode/row.cpp ${PROJECT_SOURCE_DIR}/pv/data/decode/rowdata.cpp - ${PROJECT_SOURCE_DIR}/pv/view/decodetrace.cpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/decodetrace.cpp ${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.cpp ${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.cpp data/decoderstack.cpp @@ -170,7 +170,7 @@ if(ENABLE_DECODE) list(APPEND pulseview_TEST_HEADERS ${PROJECT_SOURCE_DIR}/pv/data/decoderstack.hpp - ${PROJECT_SOURCE_DIR}/pv/view/decodetrace.hpp + ${PROJECT_SOURCE_DIR}/pv/views/trace/decodetrace.hpp ${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.hpp ${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.hpp ) diff --git a/test/view/ruler.cpp b/test/view/ruler.cpp index 5230e240..9287975c 100644 --- a/test/view/ruler.cpp +++ b/test/view/ruler.cpp @@ -20,7 +20,7 @@ #include #include -#include "pv/view/ruler.hpp" +#include "pv/views/trace/ruler.hpp" #include "test/test.hpp" using namespace pv::views::TraceView; -- 2.30.2