From 51e77110d4316fd0106f8306f5e1f0523c5bf7d7 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Fri, 12 Oct 2012 22:41:01 +0100 Subject: [PATCH] Moved all classes into the pv namespace --- CMakeLists.txt | 36 ++++++++++--------- main.cpp | 4 +-- about.cpp => pv/about.cpp | 6 +++- about.h => pv/about.h | 4 +++ about.ui => pv/about.ui | 0 datasnapshot.cpp => pv/datasnapshot.cpp | 4 +++ datasnapshot.h => pv/datasnapshot.h | 4 +++ logicdata.cpp => pv/logicdata.cpp | 4 +++ logicdata.h => pv/logicdata.h | 4 +++ .../logicdatasnapshot.cpp | 4 +++ logicdatasnapshot.h => pv/logicdatasnapshot.h | 4 +++ logicsignal.cpp => pv/logicsignal.cpp | 4 +++ logicsignal.h => pv/logicsignal.h | 4 +++ mainwindow.cpp => pv/mainwindow.cpp | 4 +++ mainwindow.h => pv/mainwindow.h | 18 +++++----- samplingbar.cpp => pv/samplingbar.cpp | 4 +++ samplingbar.h => pv/samplingbar.h | 4 +++ signal.cpp => pv/signal.cpp | 4 +++ signal.h => pv/signal.h | 4 +++ signaldata.cpp => pv/signaldata.cpp | 6 +++- signaldata.h => pv/signaldata.h | 4 +++ sigsession.cpp => pv/sigsession.cpp | 4 +++ sigsession.h => pv/sigsession.h | 4 +++ pv/view/header.cpp | 4 +-- pv/view/view.cpp | 6 ++-- pv/view/view.h | 3 +- pv/view/viewport.cpp | 4 +-- test/logicdatasnapshot.cpp | 4 ++- 28 files changed, 121 insertions(+), 38 deletions(-) rename about.cpp => pv/about.cpp (98%) rename about.h => pv/about.h (97%) rename about.ui => pv/about.ui (100%) rename datasnapshot.cpp => pv/datasnapshot.cpp (97%) rename datasnapshot.h => pv/datasnapshot.h (97%) rename logicdata.cpp => pv/logicdata.cpp (97%) rename logicdata.h => pv/logicdata.h (97%) rename logicdatasnapshot.cpp => pv/logicdatasnapshot.cpp (99%) rename logicdatasnapshot.h => pv/logicdatasnapshot.h (98%) rename logicsignal.cpp => pv/logicsignal.cpp (99%) rename logicsignal.h => pv/logicsignal.h (98%) rename mainwindow.cpp => pv/mainwindow.cpp (99%) rename mainwindow.h => pv/mainwindow.h (98%) rename samplingbar.cpp => pv/samplingbar.cpp (99%) rename samplingbar.h => pv/samplingbar.h (97%) rename signal.cpp => pv/signal.cpp (98%) rename signal.h => pv/signal.h (98%) rename signaldata.cpp => pv/signaldata.cpp (96%) rename signaldata.h => pv/signaldata.h (96%) rename sigsession.cpp => pv/sigsession.cpp (99%) rename sigsession.h => pv/sigsession.h (98%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0cebe79..3741e2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,17 +39,17 @@ find_package(Boost 1.46 COMPONENTS unit_test_framework REQUIRED) set(VERSION 0.1.0) set(pulseview_SOURCES - about.cpp - datasnapshot.cpp - logicdata.cpp - logicdatasnapshot.cpp - logicsignal.cpp main.cpp - mainwindow.cpp - samplingbar.cpp - signaldata.cpp - sigsession.cpp - signal.cpp + pv/about.cpp + pv/datasnapshot.cpp + pv/logicdata.cpp + pv/logicdatasnapshot.cpp + pv/logicsignal.cpp + pv/mainwindow.cpp + pv/samplingbar.cpp + pv/signaldata.cpp + pv/sigsession.cpp + pv/signal.cpp pv/view/header.cpp pv/view/ruler.cpp pv/view/view.cpp @@ -57,10 +57,10 @@ set(pulseview_SOURCES ) set(pulseview_HEADERS - about.h - mainwindow.h - samplingbar.h - sigsession.h + pv/about.h + pv/mainwindow.h + pv/samplingbar.h + pv/sigsession.h pv/view/header.h pv/view/ruler.h pv/view/view.h @@ -68,7 +68,7 @@ set(pulseview_HEADERS ) set(pulseview_FORMS - about.ui + pv/about.ui ) set(pulseview_RESOURCES @@ -76,10 +76,10 @@ set(pulseview_RESOURCES ) set(pulseview_TEST_SOURCES + pv/datasnapshot.cpp + pv/logicdatasnapshot.cpp test/logicdatasnapshot.cpp test/test.cpp - datasnapshot.cpp - logicdatasnapshot.cpp ) qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS}) @@ -95,12 +95,14 @@ add_definitions(-DAPP_VERSION="${VERSION}") if(WIN32) include_directories( ${include_directories} + ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIRS} ${PKGDEPS_STATIC_INCLUDE_DIRS} ) else(WIN32) include_directories( ${include_directories} + ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIRS} ${PKGDEPS_INCLUDE_DIRS} ) diff --git a/main.cpp b/main.cpp index d15cff8..41f8589 100644 --- a/main.cpp +++ b/main.cpp @@ -26,7 +26,7 @@ extern "C" { #include #include -#include "mainwindow.h" +#include "pv/mainwindow.h" int main(int argc, char *argv[]) { @@ -63,7 +63,7 @@ int main(int argc, char *argv[]) } /* Initialise the main window */ - MainWindow w; + pv::MainWindow w; w.show(); /* Run the application */ diff --git a/about.cpp b/pv/about.cpp similarity index 98% rename from about.cpp rename to pv/about.cpp index 0551654..48c1f59 100644 --- a/about.cpp +++ b/pv/about.cpp @@ -25,7 +25,7 @@ extern "C" { #include #include "about.h" -#include "ui_about.h" +#include extern "C" { /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */ @@ -34,6 +34,8 @@ extern "C" { #include } +namespace pv { + About::About(QWidget *parent) : QDialog(parent), ui(new Ui::About) @@ -108,3 +110,5 @@ About::~About() { delete ui; } + +} // namespace pv diff --git a/about.h b/pv/about.h similarity index 97% rename from about.h rename to pv/about.h index 76c5065..31392b2 100644 --- a/about.h +++ b/pv/about.h @@ -31,6 +31,8 @@ namespace Ui { class About; } +namespace pv { + class About : public QDialog { Q_OBJECT @@ -44,4 +46,6 @@ private: std::auto_ptr supportedDoc; }; +} // namespace pv + #endif // ABOUT_H diff --git a/about.ui b/pv/about.ui similarity index 100% rename from about.ui rename to pv/about.ui diff --git a/datasnapshot.cpp b/pv/datasnapshot.cpp similarity index 97% rename from datasnapshot.cpp rename to pv/datasnapshot.cpp index 6933ea1..31acca1 100644 --- a/datasnapshot.cpp +++ b/pv/datasnapshot.cpp @@ -24,6 +24,8 @@ #include #include +namespace pv { + DataSnapshot::DataSnapshot(int unit_size) : _data(NULL), _sample_count(0), @@ -49,3 +51,5 @@ void DataSnapshot::append_data(void *data, uint64_t samples) data, samples * _unit_size); _sample_count += samples; } + +} // namespace pv diff --git a/datasnapshot.h b/pv/datasnapshot.h similarity index 97% rename from datasnapshot.h rename to pv/datasnapshot.h index 3bf12f9..221ebcd 100644 --- a/datasnapshot.h +++ b/pv/datasnapshot.h @@ -22,6 +22,8 @@ extern "C" { #include } +namespace pv { + class DataSnapshot { public: @@ -39,3 +41,5 @@ protected: uint64_t _sample_count; int _unit_size; }; + +} // namespace pv diff --git a/logicdata.cpp b/pv/logicdata.cpp similarity index 97% rename from logicdata.cpp rename to pv/logicdata.cpp index 73d35d7..c8b3b84 100644 --- a/logicdata.cpp +++ b/pv/logicdata.cpp @@ -24,6 +24,8 @@ using namespace boost; using namespace std; +namespace pv { + LogicData::LogicData(const sr_datafeed_meta_logic &meta) : SignalData(meta.samplerate > 0 ? meta.samplerate : 1), _num_probes(meta.num_probes) @@ -45,3 +47,5 @@ deque< shared_ptr >& LogicData::get_snapshots() { return _snapshots; } + +} // namespace pv diff --git a/logicdata.h b/pv/logicdata.h similarity index 97% rename from logicdata.h rename to pv/logicdata.h index cde8eef..b21d50a 100644 --- a/logicdata.h +++ b/pv/logicdata.h @@ -27,6 +27,8 @@ extern "C" { #include } +namespace pv { + class LogicDataSnapshot; class LogicData : public SignalData @@ -47,3 +49,5 @@ private: std::deque< boost::shared_ptr > _snapshots; }; + +} // namespace pv diff --git a/logicdatasnapshot.cpp b/pv/logicdatasnapshot.cpp similarity index 99% rename from logicdatasnapshot.cpp rename to pv/logicdatasnapshot.cpp index 62d8a90..347b7e2 100644 --- a/logicdatasnapshot.cpp +++ b/pv/logicdatasnapshot.cpp @@ -31,6 +31,8 @@ using namespace std; +namespace pv { + const int LogicDataSnapshot::MipMapScalePower = 4; const int LogicDataSnapshot::MipMapScaleFactor = 1 << MipMapScalePower; const float LogicDataSnapshot::LogMipMapScaleFactor = logf(MipMapScaleFactor); @@ -353,3 +355,5 @@ int64_t LogicDataSnapshot::pow2_ceil(int64_t x, unsigned int power) const int64_t p = 1 << power; return ((x < 0) ? x : (x + p - 1)) / p * p; } + +} // namespace pv diff --git a/logicdatasnapshot.h b/pv/logicdatasnapshot.h similarity index 98% rename from logicdatasnapshot.h rename to pv/logicdatasnapshot.h index 16e8edd..2154120 100644 --- a/logicdatasnapshot.h +++ b/pv/logicdatasnapshot.h @@ -31,6 +31,8 @@ namespace LogicDataSnapshotTest { class LongPulses; } +namespace pv { + class LogicDataSnapshot : public DataSnapshot { private: @@ -95,3 +97,5 @@ private: friend class LogicDataSnapshotTest::Pulses; friend class LogicDataSnapshotTest::LongPulses; }; + +} // namespace pv diff --git a/logicsignal.cpp b/pv/logicsignal.cpp similarity index 99% rename from logicsignal.cpp rename to pv/logicsignal.cpp index 5be9b01..7543f13 100644 --- a/logicsignal.cpp +++ b/pv/logicsignal.cpp @@ -29,6 +29,8 @@ using namespace boost; using namespace std; +namespace pv { + const float LogicSignal::Margin = 10.0f; const float LogicSignal::Oversampling = 2.0f; @@ -152,3 +154,5 @@ int LogicSignal::get_nominal_offset(const QRect &rect) const { return rect.bottom() - Margin; } + +} // namespace pv diff --git a/logicsignal.h b/pv/logicsignal.h similarity index 98% rename from logicsignal.h rename to pv/logicsignal.h index 81fe6a4..e12f0ca 100644 --- a/logicsignal.h +++ b/pv/logicsignal.h @@ -22,6 +22,8 @@ #include +namespace pv { + class LogicData; class LogicSignal : public Signal @@ -73,3 +75,5 @@ private: int _probe_index; boost::shared_ptr _data; }; + +} // namespace pv diff --git a/mainwindow.cpp b/pv/mainwindow.cpp similarity index 99% rename from mainwindow.cpp rename to pv/mainwindow.cpp index df250ef..2c48dfc 100644 --- a/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -47,6 +47,8 @@ extern "C" { #include } +namespace pv { + MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) { @@ -173,3 +175,5 @@ void MainWindow::run_stop() _sampling_bar->get_record_length(), _sampling_bar->get_sample_rate()); } + +} // namespace pv diff --git a/mainwindow.h b/pv/mainwindow.h similarity index 98% rename from mainwindow.h rename to pv/mainwindow.h index c0a4248..88cbd6f 100644 --- a/mainwindow.h +++ b/pv/mainwindow.h @@ -25,14 +25,6 @@ #include "sigsession.h" -class SamplingBar; - -namespace pv { -namespace view { -class View; -} -} - class QAction; class QMenuBar; class QMenu; @@ -41,6 +33,14 @@ class QStatusBar; class QToolBar; class QWidget; +namespace pv { + +class SamplingBar; + +namespace view { +class View; +} + class MainWindow : public QMainWindow { Q_OBJECT @@ -86,4 +86,6 @@ private slots: void run_stop(); }; +} // namespace pv + #endif // MAINWINDOW_H diff --git a/samplingbar.cpp b/pv/samplingbar.cpp similarity index 99% rename from samplingbar.cpp rename to pv/samplingbar.cpp index b2ca6e0..3104743 100644 --- a/samplingbar.cpp +++ b/pv/samplingbar.cpp @@ -30,6 +30,8 @@ extern "C" { #include "samplingbar.h" +namespace pv { + const uint64_t SamplingBar::RecordLengths[11] = { 1000000, 2000000, @@ -186,3 +188,5 @@ void SamplingBar::on_device_selected() { update_sample_rate_selector(); } + +} // namespace pv diff --git a/samplingbar.h b/pv/samplingbar.h similarity index 97% rename from samplingbar.h rename to pv/samplingbar.h index 695c5aa..170379e 100644 --- a/samplingbar.h +++ b/pv/samplingbar.h @@ -30,6 +30,8 @@ class QAction; +namespace pv { + class SamplingBar : public QToolBar { Q_OBJECT @@ -67,4 +69,6 @@ private: QToolButton _run_stop_button; }; +} // namespace pv + #endif // SAMPLINGBAR_H diff --git a/signal.cpp b/pv/signal.cpp similarity index 98% rename from signal.cpp rename to pv/signal.cpp index 77ee301..92ef808 100644 --- a/signal.cpp +++ b/pv/signal.cpp @@ -22,6 +22,8 @@ #include "extdef.h" +namespace pv { + const QSizeF Signal::LabelPadding(4, 0); Signal::Signal(QString name) : @@ -87,3 +89,5 @@ void Signal::paint_label(QPainter &p, const QRect &rect) p.setPen((colour.lightness() > 64) ? Qt::black : Qt::white); p.drawText(label_rect, Qt::AlignCenter | Qt::AlignVCenter, text); } + +} // namespace pv diff --git a/signal.h b/pv/signal.h similarity index 98% rename from signal.h rename to pv/signal.h index 27bd556..2351a2f 100644 --- a/signal.h +++ b/pv/signal.h @@ -26,6 +26,8 @@ #include +namespace pv { + class SignalData; class Signal @@ -73,3 +75,5 @@ protected: protected: QString _name; }; + +} // namespace pv diff --git a/signaldata.cpp b/pv/signaldata.cpp similarity index 96% rename from signaldata.cpp rename to pv/signaldata.cpp index d2573ff..cf0cb21 100644 --- a/signaldata.cpp +++ b/pv/signaldata.cpp @@ -22,6 +22,8 @@ using namespace std; +namespace pv { + SignalData::SignalData(double samplerate) : _samplerate(samplerate), _start_time(0) @@ -36,4 +38,6 @@ double SignalData::get_samplerate() const double SignalData::get_start_time() const { return _start_time; -} \ No newline at end of file +} + +} // namespace pv diff --git a/signaldata.h b/pv/signaldata.h similarity index 96% rename from signaldata.h rename to pv/signaldata.h index d85d436..57cd543 100644 --- a/signaldata.h +++ b/pv/signaldata.h @@ -20,6 +20,8 @@ #include +namespace pv { + class SignalData { public: @@ -33,3 +35,5 @@ protected: const double _samplerate; const double _start_time; }; + +} // namespace pv diff --git a/sigsession.cpp b/pv/sigsession.cpp similarity index 99% rename from sigsession.cpp rename to pv/sigsession.cpp index ac96833..40c46f0 100644 --- a/sigsession.cpp +++ b/pv/sigsession.cpp @@ -31,6 +31,8 @@ using namespace boost; using namespace std; +namespace pv { + // TODO: This should not be necessary SigSession* SigSession::_session = NULL; @@ -178,3 +180,5 @@ void SigSession::data_feed_in_proc(const struct sr_dev_inst *sdi, assert(_session); _session->data_feed_in(sdi, packet); } + +} // namespace pv diff --git a/sigsession.h b/pv/sigsession.h similarity index 98% rename from sigsession.h rename to pv/sigsession.h index f7ec385..40fce89 100644 --- a/sigsession.h +++ b/pv/sigsession.h @@ -32,6 +32,8 @@ extern "C" { #include } +namespace pv { + class LogicData; class LogicDataSnapshot; class Signal; @@ -77,4 +79,6 @@ private: static SigSession *_session; }; +} // namespace pv + #endif // SIGSESSION_H diff --git a/pv/view/header.cpp b/pv/view/header.cpp index 4efc0ab..aaa98ab 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -21,8 +21,8 @@ #include "header.h" #include "view.h" -#include "../../signal.h" -#include "../../sigsession.h" +#include "../signal.h" +#include "../sigsession.h" #include diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 697d071..9c4920f 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -32,9 +32,9 @@ #include "view.h" #include "viewport.h" -#include "../../logicdata.h" -#include "../../logicdatasnapshot.h" -#include "../../sigsession.h" +#include "../logicdata.h" +#include "../logicdatasnapshot.h" +#include "../sigsession.h" using namespace boost; using namespace std; diff --git a/pv/view/view.h b/pv/view/view.h index 042fa96..d2abbf0 100644 --- a/pv/view/view.h +++ b/pv/view/view.h @@ -25,9 +25,10 @@ #include +namespace pv { + class SigSession; -namespace pv { namespace view { class Header; diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp index d837067..c1490fc 100644 --- a/pv/view/viewport.cpp +++ b/pv/view/viewport.cpp @@ -21,8 +21,8 @@ #include "view.h" #include "viewport.h" -#include "../../sigsession.h" -#include "../../signal.h" +#include "../sigsession.h" +#include "../signal.h" #include diff --git a/test/logicdatasnapshot.cpp b/test/logicdatasnapshot.cpp index 4e31bfa..503b1dd 100644 --- a/test/logicdatasnapshot.cpp +++ b/test/logicdatasnapshot.cpp @@ -24,10 +24,12 @@ #include #include "../extdef.h" -#include "../logicdatasnapshot.h" +#include "../pv/logicdatasnapshot.h" using namespace std; +using pv::LogicDataSnapshot; + BOOST_AUTO_TEST_SUITE(LogicDataSnapshotTest) void push_logic(LogicDataSnapshot &s, unsigned int length, uint8_t value) -- 2.30.2