Merge pull request #50 from asanza/develop

Add support for export capture data into multiple file formats.

DSView/CMakeLists.txt

@@ -270,7 +270,7 @@ endif()
 #-------------------------------------------------------------------------------
 
 add_definitions(${QT_DEFINITIONS})
-add_definitions(-Wall -Wextra -Wno-return-type -Wno-ignored-qualifiers)
+add_definitions(-std=c++11 -Wall -Wextra -Wno-return-type -Wno-ignored-qualifiers)
 
 if(ENABLE_DECODE)
         add_definitions(-DENABLE_DECODE)

DSView/main.cpp

@@ -30,7 +30,7 @@
 
 #include <getopt.h>
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QDebug>
 #include <QFile>
 #include <QDir>

DSView/pv/devicemanager.cpp

@@ -31,7 +31,7 @@
 #include <stdexcept>
 #include <string>
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QObject>
 #include <QDebug>
 #include <QDir>

DSView/pv/dialogs/deviceoptions.cpp

@@ -37,7 +37,7 @@ using namespace std;
 namespace pv {
 namespace dialogs {
 
-DeviceOptions::DeviceOptions(QWidget *parent, shared_ptr<pv::device::DevInst> dev_inst) :
+DeviceOptions::DeviceOptions(QWidget *parent, boost::shared_ptr<pv::device::DevInst> dev_inst) :
 	QDialog(parent),
     _dev_inst(dev_inst),
 	_layout(this),

DSView/pv/dialogs/streamoptions.cpp

@@ -37,7 +37,7 @@ using namespace std;
 namespace pv {
 namespace dialogs {
 
-StreamOptions::StreamOptions(QWidget *parent, shared_ptr<pv::device::DevInst> dev_inst,
+StreamOptions::StreamOptions(QWidget *parent, boost::shared_ptr<pv::device::DevInst> dev_inst,
                              uint64_t sample_count, bool stream) :
 	QDialog(parent),
     _dev_inst(dev_inst),

DSView/pv/dialogs/waitingdialog.cpp

@@ -39,7 +39,7 @@ namespace dialogs {
 
 const QString WaitingDialog::TIPS_INFO = "Waiting";
 
-WaitingDialog::WaitingDialog(QWidget *parent, shared_ptr<pv::device::DevInst> dev_inst) :
+WaitingDialog::WaitingDialog(QWidget *parent, boost::shared_ptr<pv::device::DevInst> dev_inst) :
 	QDialog(parent),
     _dev_inst(dev_inst),
     _button_box(QDialogButtonBox::Save | QDialogButtonBox::Abort,

DSView/pv/mainwindow.cpp

@@ -225,8 +225,7 @@ void MainWindow::setup_ui()
 	// Set the title
     QString title = QApplication::applicationName()+" v"+QApplication::applicationVersion();
     std::string std_title = title.toStdString();
-    setWindowTitle(QApplication::translate("MainWindow", std_title.c_str(), 0,
-		QApplication::UnicodeUTF8));
+    setWindowTitle(QApplication::translate("MainWindow", std_title.c_str(), 0));
 
 	// Setup _session events
 	connect(&_session, SIGNAL(capture_state_changed(int)), this,
@@ -520,7 +519,7 @@ void MainWindow::on_screenShot()
                        tr("%1 Files (*.%2);;All Files (*)")
                        .arg(format.toUpper()).arg(format));
     if (!fileName.isEmpty())
-        pixmap.save(fileName, format.toAscii());
+        pixmap.save(fileName, format.toLatin1());
 }
 
 void MainWindow::on_save()

DSView/pv/sigsession.cpp

@@ -54,6 +54,9 @@
 
 #include <QDebug>
 #include <QMessageBox>
+#include <QProgressDialog>
+#include <QFile>
+#include <QtConcurrent/QtConcurrent>
 
 #include <boost/foreach.hpp>
 
@@ -179,6 +182,103 @@ void SigSession::save_file(const std::string &name){
                     snapshot->get_sample_count());
 }
 
+QList<QString> SigSession::getSuportedExportFormats(){
+    const struct sr_output_module** supportedModules = sr_output_list();
+    QList<QString> list;
+    while(*supportedModules){
+        if(*supportedModules == NULL)
+            break;
+        QString format((*supportedModules)->desc);
+        format.append(" (*.");
+        format.append((*supportedModules)->id);
+        format.append(")");
+        list.append(format);
+        *supportedModules++;
+    }
+    return list;
+}
+
+void SigSession::cancelSaveFile(){
+    saveFileThreadRunning = false;
+}
+
+void SigSession::export_file(const std::string &name, QWidget* parent, const std::string &ext){
+    const deque< boost::shared_ptr<pv::data::LogicSnapshot> > &snapshots =
+            _logic_data->get_snapshots();
+    if(snapshots.empty())
+        return;
+    const boost::shared_ptr<pv::data::LogicSnapshot> & snapshot =
+            snapshots.front();
+    const struct sr_output_module** supportedModules = sr_output_list();
+    const struct sr_output_module* outModule = NULL;
+    while(*supportedModules){
+        if(*supportedModules == NULL)
+            break;
+        if(!strcmp((*supportedModules)->id, ext.c_str())){
+            outModule = *supportedModules;
+            break;
+        }
+        *supportedModules++;
+    }
+    if(outModule == NULL)
+        return;
+    struct sr_output output;
+    GHashTable *params = g_hash_table_new(g_str_hash, g_str_equal);
+    GVariant* filenameGVariant = g_variant_new_string(name.c_str());
+    g_hash_table_insert(params, (char*)"filename", filenameGVariant);
+    output.module = (sr_output_module*) outModule;
+    output.sdi = _dev_inst->dev_inst();
+    output.param = NULL;
+    if(outModule->init)
+        outModule->init(&output, params);
+    QFile file(name.c_str());
+    file.open(QIODevice::WriteOnly | QIODevice::Text);
+    QTextStream out(&file);
+    QFuture<void> future = QtConcurrent::run([&]{
+        saveFileThreadRunning = true;
+        unsigned char* datat = (unsigned char*)snapshot->get_data();
+        unsigned int numsamples = snapshot->get_sample_count()*snapshot->unit_size();
+        GString *data_out;
+        int usize = 8192;
+        int size = usize;
+        struct sr_datafeed_logic lp;
+        struct sr_datafeed_packet p;
+        for(uint64_t i = 0; i < numsamples; i+=usize){
+            if(numsamples - i < usize)
+                size = numsamples - i;
+            lp.data = &datat[i];
+            lp.length = size;
+            lp.unitsize = snapshot->unit_size();
+            p.type = SR_DF_LOGIC;
+            p.payload = &lp;
+            outModule->receive(&output, &p, &data_out);
+            if(data_out){
+                out << (char*) data_out->str;
+                g_string_free(data_out,TRUE);
+            }
+            emit  progressSaveFileValueChanged(i*100/numsamples);
+            if(!saveFileThreadRunning)
+                break;
+        }
+    });
+    QFutureWatcher<void> watcher;
+    Qt::WindowFlags flags = Qt::CustomizeWindowHint;
+    QProgressDialog dlg(QString::fromUtf8("Exporting data... It can take a while."),
+                        QString::fromUtf8("Cancel"),0,100,parent,flags);
+    dlg.setWindowModality(Qt::WindowModal);
+    watcher.setFuture(future);
+    connect(&watcher,SIGNAL(finished()),&dlg,SLOT(cancel()));
+    connect(this,SIGNAL(progressSaveFileValueChanged(int)),&dlg,SLOT(setValue(int)));
+    connect(&dlg,SIGNAL(canceled()),this,SLOT(cancelSaveFile()));
+    dlg.exec();
+    future.waitForFinished();
+    // optional, as QFile destructor will already do it:
+    file.close();
+    outModule->cleanup(&output);
+    g_hash_table_destroy(params);
+    g_variant_unref(filenameGVariant);
+}
+
 void SigSession::set_default_device(boost::function<void (const QString)> error_handler)
 {
     shared_ptr<pv::device::DevInst> default_device;

DSView/pv/sigsession.h

@@ -43,6 +43,7 @@
 #include <QMap>
 #include <QVariant>
 #include <QTimer>
+#include <QtConcurrent/QtConcurrent>
 
 #include <libsigrok4DSL/libsigrok.h>
 #include <libusb.h>
@@ -86,8 +87,9 @@ class SigSession : public QObject
         Q_OBJECT
 
 private:
-    static const float Oversampling = 2.0f;
+    static constexpr float Oversampling = 2.0f;
     static const int ViewTime = 800;
+	bool saveFileThreadRunning = false;
 
 public:
 	enum capture_state {
@@ -115,6 +117,9 @@ public:
     void save_file(const std::string &name);
 
     void set_default_device(boost::function<void (const QString)> error_handler);
+    void export_file(const std::string &name, QWidget* parent, const std::string &ext);
+
+    void set_default_device();
 
     void release_device(device::DevInst *dev_inst);
 
@@ -132,6 +137,7 @@ public:
 
     std::vector< boost::shared_ptr<view::GroupSignal> >
         get_group_signals();
+    QList<QString> getSuportedExportFormats();
 
 #ifdef ENABLE_DECODE
     bool add_decoder(srd_decoder *const dec);
@@ -282,11 +288,15 @@ signals:
     void malloc_error();
 
     void zero_adj();
+    void progressSaveFileValueChanged(int percent);
 
 public slots:
     void reload();
     void refresh();
 
+private slots:
+    void cancelSaveFile();
+
 private:
 	// TODO: This should not be necessary. Multiple concurrent
 	// sessions should should be supported and it should be

DSView/pv/toolbars/filebar.cpp

@@ -48,7 +48,7 @@ FileBar::FileBar(SigSession &session, QWidget *parent) :
 
     _action_open = new QAction(this);
     _action_open->setText(QApplication::translate(
-        "File", "&Open...", 0, QApplication::UnicodeUTF8));
+        "File", "&Open...", 0));
     _action_open->setIcon(QIcon::fromTheme("file",
         QIcon(":/icons/open.png")));
     _action_open->setObjectName(QString::fromUtf8("actionOpen"));
@@ -57,16 +57,24 @@ FileBar::FileBar(SigSession &session, QWidget *parent) :
 
     _action_save = new QAction(this);
     _action_save->setText(QApplication::translate(
-        "File", "&Save...", 0, QApplication::UnicodeUTF8));
+        "File", "&Save...", 0));
     _action_save->setIcon(QIcon::fromTheme("file",
         QIcon(":/icons/save.png")));
     _action_save->setObjectName(QString::fromUtf8("actionSave"));
     _file_button.addAction(_action_save);
     connect(_action_save, SIGNAL(triggered()), this, SLOT(on_actionSave_triggered()));
 
+    _action_export = new QAction(this);
+    _action_export->setText(QApplication::translate("File", "&Export...", 0));
+    _action_export->setIcon(QIcon::fromTheme("file",QIcon(":/icons/instant.png")));
+    _action_export->setObjectName(QString::fromUtf8("actionExport"));
+    _file_button.addAction(_action_export);
+    connect(_action_export, SIGNAL(triggered()), this, SLOT(on_actionExport_triggered()));
+
+
     _action_capture = new QAction(this);
     _action_capture->setText(QApplication::translate(
-        "File", "&Capture...", 0, QApplication::UnicodeUTF8));
+        "File", "&Capture...", 0));
     _action_capture->setIcon(QIcon::fromTheme("file",
         QIcon(":/icons/capture.png")));
     _action_capture->setObjectName(QString::fromUtf8("actionCapture"));
@@ -84,7 +92,7 @@ void FileBar::on_actionOpen_triggered()
     // Show the dialog
     const QString file_name = QFileDialog::getOpenFileName(
         this, tr("Open File"), "", tr(
-            "DSView Sessions (*.dsl)"));
+            "DSView Sessions (*.dsl);;All Files (*.*)"));
     if (!file_name.isEmpty())
         load_file(file_name);
 }
@@ -108,6 +116,45 @@ void FileBar::show_session_error(
     msg.exec();
 }
 
+void FileBar::on_actionExport_triggered(){
+    int unit_size;
+    uint64_t length;
+    void* buf = _session.get_buf(unit_size, length);
+    if (!buf) {
+        QMessageBox msg(this);
+        msg.setText("Data Export");
+        msg.setInformativeText("No Data to Save!");
+        msg.setStandardButtons(QMessageBox::Ok);
+        msg.setIcon(QMessageBox::Warning);
+        msg.exec();
+    } else if (_session.get_device()->dev_inst()->mode != LOGIC) {
+        QMessageBox msg(this);
+        msg.setText("Export Data");
+        msg.setInformativeText("DSLogic currently only support exporting logic data to file!");
+        msg.setStandardButtons(QMessageBox::Ok);
+        msg.setIcon(QMessageBox::Warning);
+        msg.exec();
+    }else {
+        QList<QString> supportedFormats = _session.getSuportedExportFormats();
+        QString filter;
+        for(int i = 0; i < supportedFormats.count();i++){
+            filter.append(supportedFormats[i]);
+            if(i < supportedFormats.count() - 1)
+                filter.append(";;");
+        }
+        QString file_name = QFileDialog::getSaveFileName(
+                    this, tr("Export Data"), "",filter,&filter);
+        if (!file_name.isEmpty()) {
+            QFileInfo f(file_name);
+            QStringList list = filter.split('.').last().split(')');
+            QString ext = list.first();
+            if(f.suffix().compare(ext))
+                file_name+=tr(".")+ext;
+            _session.export_file(file_name.toStdString(), this, ext.toStdString());
+        }
+    }
+}
+
 void FileBar::on_actionSave_triggered()
 {
     //save();
@@ -129,10 +176,13 @@ void FileBar::on_actionSave_triggered()
         msg.setIcon(QMessageBox::Warning);
         msg.exec();
     }else {
-        const QString file_name = QFileDialog::getSaveFileName(
+        QString file_name = QFileDialog::getSaveFileName(
                     this, tr("Save File"), "",
                     tr("DSView Session (*.dsl)"));
         if (!file_name.isEmpty()) {
+            QFileInfo f(file_name);
+            if(f.suffix().compare("dsl"))
+                file_name.append(tr(".dsl"));
             _session.save_file(file_name.toStdString());
         }
     }

DSView/pv/toolbars/filebar.h

@@ -58,6 +58,7 @@ private slots:
     void on_actionOpen_triggered();
     void on_actionSave_triggered();
     void on_actionCapture_triggered();
+    void on_actionExport_triggered();
 
 private:
     bool _enable;
@@ -67,6 +68,7 @@ private:
 
     QAction *_action_open;
     QAction *_action_save;
+    QAction *_action_export;
     QAction *_action_capture;
 
 };

DSView/pv/toolbars/logobar.cpp

@@ -47,7 +47,7 @@ LogoBar::LogoBar(SigSession &session, QWidget *parent) :
 
     _about = new QAction(this);
     _about->setText(QApplication::translate(
-        "File", "&About...", 0, QApplication::UnicodeUTF8));
+        "File", "&About...", 0));
     _about->setIcon(QIcon::fromTheme("file",
         QIcon(":/icons/about.png")));
     _about->setObjectName(QString::fromUtf8("actionAbout"));
@@ -56,7 +56,7 @@ LogoBar::LogoBar(SigSession &session, QWidget *parent) :
 
     _wiki = new QAction(this);
     _wiki->setText(QApplication::translate(
-        "File", "&Wiki", 0, QApplication::UnicodeUTF8));
+        "File", "&Wiki", 0));
     _wiki->setIcon(QIcon::fromTheme("file",
         QIcon(":/icons/wiki.png")));
     _wiki->setObjectName(QString::fromUtf8("actionWiki"));

DSView/pv/view/analogsignal.cpp

@@ -65,7 +65,7 @@ AnalogSignal::~AnalogSignal()
 {
 }
 
-shared_ptr<pv::data::SignalData> AnalogSignal::data() const
+boost::shared_ptr<pv::data::SignalData> AnalogSignal::data() const
 {
     return _data;
 }
@@ -86,7 +86,7 @@ void AnalogSignal::paint_mid(QPainter &p, int left, int right)
     assert(scale > 0);
     const double offset = _view->offset();
 
-	const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
+    const deque< boost::shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
 		_data->get_snapshots();
 	if (snapshots.empty())
 		return;

DSView/pv/view/devmode.cpp

@@ -68,7 +68,7 @@ void DevMode::set_device()
          l; l = l->next) {
         sr_dev_mode *mode = (sr_dev_mode *)l->data;
 
-        shared_ptr<QPushButton> mode_button = shared_ptr<QPushButton>(new QPushButton(NULL));
+        boost::shared_ptr<QPushButton> mode_button = boost::shared_ptr<QPushButton>(new QPushButton(NULL));
         mode_button->setFlat(true);
         mode_button->setText(mode->name);
 
@@ -97,7 +97,7 @@ void DevMode::paintEvent(QPaintEvent*)
 
     painter.setRenderHint(QPainter::Antialiasing);
     painter.setPen(Qt::NoPen);
-    for(std::map<shared_ptr<QPushButton>, sr_dev_mode *>::const_iterator i = _mode_button_list.begin();
+    for(std::map<boost::shared_ptr<QPushButton>, sr_dev_mode *>::const_iterator i = _mode_button_list.begin();
         i != _mode_button_list.end(); i++) {
         const boost::shared_ptr<device::DevInst> dev_inst = _view.session().get_device();
         assert(dev_inst);
@@ -118,7 +118,7 @@ void DevMode::on_mode_change()
     assert(dev_inst);
     QPushButton *button = qobject_cast<QPushButton *>(sender());
 
-    for(std::map<shared_ptr<QPushButton>, sr_dev_mode *>::const_iterator i = _mode_button_list.begin();
+    for(std::map<boost::shared_ptr<QPushButton>, sr_dev_mode *>::const_iterator i = _mode_button_list.begin();
         i != _mode_button_list.end(); i++) {
         if ((*i).first.get() == button) {
             if (dev_inst->dev_inst()->mode != (*i).second->mode) {

DSView/pv/view/dsosignal.cpp

@@ -109,7 +109,7 @@ const int DsoSignal::DownMargin = 30;
 const int DsoSignal::RightMargin = 30;
 
 DsoSignal::DsoSignal(boost::shared_ptr<pv::device::DevInst> dev_inst,
-                     shared_ptr<data::Dso> data,
+                     boost::shared_ptr<data::Dso> data,
                      const sr_channel * const probe):
     Signal(dev_inst, probe, DS_DSO),
     _data(data),
@@ -173,7 +173,7 @@ DsoSignal::~DsoSignal()
 {
 }
 
-shared_ptr<pv::data::SignalData> DsoSignal::data() const
+boost::shared_ptr<pv::data::SignalData> DsoSignal::data() const
 {
     return _data;
 }
@@ -582,7 +582,7 @@ void DsoSignal::paint_mid(QPainter &p, int left, int right)
             return;
 
         _scale = height * 1.0f / 256;
-        const shared_ptr<pv::data::DsoSnapshot> &snapshot =
+        const boost::shared_ptr<pv::data::DsoSnapshot> &snapshot =
             snapshots.front();
 
         const uint16_t number_channels = snapshot->get_channel_num();
@@ -846,8 +846,8 @@ void DsoSignal::paint_measure(QPainter &p)
             const double upPeriod = get_hDialValue() * DS_CONF_DSO_HDIVS * 0.8;
             const double dnPeriod = get_hDialValue() * DS_CONF_DSO_HDIVS * 0.2;
             if (_period > upPeriod) {
-                shared_ptr<view::DsoSignal> dsoSig;
-                BOOST_FOREACH(const shared_ptr<Trace> t, traces) {
+                boost::shared_ptr<view::DsoSignal> dsoSig;
+                BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces) {
                     if (dsoSig = dynamic_pointer_cast<view::DsoSignal>(t)) {
                         dsoSig->go_hDialNext(setted);
                         setted = true;
@@ -856,8 +856,8 @@ void DsoSignal::paint_measure(QPainter &p)
             } else if (_period > dnPeriod) {
                 _autoH = false;
             } else {
-                shared_ptr<view::DsoSignal> dsoSig;
-                BOOST_FOREACH(const shared_ptr<Trace> t, traces) {
+                boost::shared_ptr<view::DsoSignal> dsoSig;
+                BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces) {
                     if (dsoSig = dynamic_pointer_cast<view::DsoSignal>(t)) {
                         dsoSig->go_hDialPre(setted);
                         setted = true;

DSView/pv/view/groupsignal.cpp

@@ -63,7 +63,7 @@ bool GroupSignal::enabled() const
     return true;
 }
 
-shared_ptr<pv::data::SignalData> GroupSignal::data() const
+boost::shared_ptr<pv::data::SignalData> GroupSignal::data() const
 {
     return _data;
 }

DSView/pv/view/header.cpp

@@ -160,7 +160,7 @@ void Header::mouseDoubleClickEvent(QMouseEvent *event)
         const boost::shared_ptr<Trace> mTrace =
             get_mTrace(action, event->pos());
         if (action == Trace::LABEL && mTrace) {
-            shared_ptr<view::DsoSignal> dsoSig;
+            boost::shared_ptr<view::DsoSignal> dsoSig;
             if (dsoSig = dynamic_pointer_cast<view::DsoSignal>(mTrace)) {
                 dsoSig->auto_set();
             }
@@ -239,8 +239,8 @@ void Header::mousePressEvent(QMouseEvent *event)
             else
                 mTrace->set_trig(Trace::EDGETRIG);
         } else if (action == Trace::VDIAL && mTrace) {
-            shared_ptr<view::DsoSignal> dsoSig;
-            BOOST_FOREACH(const shared_ptr<Trace> t, traces) {
+            boost::shared_ptr<view::DsoSignal> dsoSig;
+            BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces) {
                 if (dsoSig = dynamic_pointer_cast<view::DsoSignal>(t)) {
                     dsoSig->set_hDialActive(false);
                     if (t != mTrace) {
@@ -251,17 +251,17 @@ void Header::mousePressEvent(QMouseEvent *event)
              if (dsoSig = dynamic_pointer_cast<view::DsoSignal>(mTrace))
                 dsoSig->set_vDialActive(!dsoSig->get_vDialActive());
         } else if (action == Trace::HDIAL && mTrace) {
-            shared_ptr<view::DsoSignal> dsoSig;
+            boost::shared_ptr<view::DsoSignal> dsoSig;
             if (dsoSig = dynamic_pointer_cast<view::DsoSignal>(mTrace)) {
                 if (dsoSig->get_hDialActive()) {
-                    BOOST_FOREACH(const shared_ptr<Trace> t, traces) {
+                    BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces) {
                         if(dsoSig = dynamic_pointer_cast<view::DsoSignal>(t)) {
                             dsoSig->set_vDialActive(false);
                             dsoSig->set_hDialActive(false);
                         }
                     }
                 } else {
-                    BOOST_FOREACH(const shared_ptr<Trace> t, traces) {
+                    BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces) {
                         if(dsoSig = dynamic_pointer_cast<view::DsoSignal>(t)) {
                             dsoSig->set_vDialActive(false);
                             dsoSig->set_hDialActive(true);
@@ -270,12 +270,12 @@ void Header::mousePressEvent(QMouseEvent *event)
                 }
             }
         } else if (action == Trace::CHEN && mTrace) {
-            shared_ptr<view::DsoSignal> dsoSig;
+            boost::shared_ptr<view::DsoSignal> dsoSig;
             if (dsoSig = dynamic_pointer_cast<view::DsoSignal>(mTrace)) {
                 dsoSig->set_enable(!dsoSig->enabled());
             }
         } else if (action == Trace::ACDC && mTrace) {
-            shared_ptr<view::DsoSignal> dsoSig;
+            boost::shared_ptr<view::DsoSignal> dsoSig;
             if (dsoSig = dynamic_pointer_cast<view::DsoSignal>(mTrace)) {
                 if (strcmp(_view.session().get_device()->dev_inst()->driver->name, "DSLogic") == 0)
                     dsoSig->set_acCoupling((dsoSig->get_acCoupling()+1)%2);
@@ -287,7 +287,7 @@ void Header::mousePressEvent(QMouseEvent *event)
         if (~QApplication::keyboardModifiers() & Qt::ControlModifier) {
             // Unselect all other Traces because the Ctrl is not
             // pressed
-            BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+            BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces)
                 if (t != mTrace)
                     t->select(false);
         }
@@ -330,13 +330,13 @@ void Header::wheelEvent(QWheelEvent *event)
     assert(event);
 
     if (event->orientation() == Qt::Vertical) {
-        const vector< shared_ptr<Trace> > traces(
+        const vector< boost::shared_ptr<Trace> > traces(
             _view.get_traces());
         // Vertical scrolling
         double shift = event->delta() / 20.0;
         bool setted = false;
-        BOOST_FOREACH(const shared_ptr<Trace> t, traces) {
-            shared_ptr<view::DsoSignal> dsoSig;
+        BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces) {
+            boost::shared_ptr<view::DsoSignal> dsoSig;
             if (dsoSig = dynamic_pointer_cast<view::DsoSignal>(t)) {
                 if (dsoSig->get_vDialActive()) {
                     if (shift > 1.0)
@@ -407,7 +407,7 @@ void Header::mouseMoveEvent(QMouseEvent *event)
                     // Ensure the Trace is selected
                     sig->select(true);
                 } else {
-                    shared_ptr<DsoSignal> dsoSig;
+                    boost::shared_ptr<DsoSignal> dsoSig;
                     if (dsoSig = dynamic_pointer_cast<DsoSignal>(sig)) {
                         dsoSig->set_zeroPos(y);
                         dsoSig->select(false);

DSView/pv/view/logicsignal.cpp

@@ -85,12 +85,12 @@ const sr_channel* LogicSignal::probe() const
     return _probe;
 }
 
-shared_ptr<pv::data::SignalData> LogicSignal::data() const
+boost::shared_ptr<pv::data::SignalData> LogicSignal::data() const
 {
     return _data;
 }
 
-shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
+boost::shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
 {
     return _data;
 }

DSView/pv/view/view.cpp

@@ -27,7 +27,7 @@
 
 #include <boost/foreach.hpp>
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QEvent>
 #include <QMouseEvent>
 #include <QScrollBar>
@@ -211,10 +211,10 @@ void View::zoom(double steps, int offset)
             _scale *= std::pow(3.0/2.0, -steps);
             _scale = max(min(_scale, _maxscale), _minscale);
         }else {
-            const vector< shared_ptr<Signal> > sigs(_session.get_signals());
+            const vector< boost::shared_ptr<Signal> > sigs(_session.get_signals());
             bool setted = false;
-            BOOST_FOREACH(const shared_ptr<Signal> s, sigs) {
-                shared_ptr<DsoSignal> dsoSig;
+            BOOST_FOREACH(const boost::shared_ptr<Signal> s, sigs) {
+                boost::shared_ptr<DsoSignal> dsoSig;
                 if (dsoSig = dynamic_pointer_cast<DsoSignal>(s)) {
                     if(steps > 0.5)
                         dsoSig->go_hDialPre(setted);
@@ -273,19 +273,19 @@ void View::set_preScale_preOffset()
     set_scale_offset(_preScale, _preOffset);
 }
 
-vector< shared_ptr<Trace> > View::get_traces() const
+vector< boost::shared_ptr<Trace> > View::get_traces() const
 {
-    const vector< shared_ptr<Signal> > sigs(_session.get_signals());
+    const vector< boost::shared_ptr<Signal> > sigs(_session.get_signals());
 #ifdef ENABLE_DECODE
-    const vector< shared_ptr<DecodeTrace> > decode_sigs(
+    const vector< boost::shared_ptr<DecodeTrace> > decode_sigs(
         _session.get_decode_signals());
-    vector< shared_ptr<Trace> > traces(
+    vector< boost::shared_ptr<Trace> > traces(
         sigs.size() + decode_sigs.size());
 #else
-    vector< shared_ptr<Trace> > traces(sigs.size());
+    vector< boost::shared_ptr<Trace> > traces(sigs.size());
 #endif
 
-    vector< shared_ptr<Trace> >::iterator i = traces.begin();
+    vector< boost::shared_ptr<Trace> >::iterator i = traces.begin();
     i = copy(sigs.begin(), sigs.end(), i);
 #ifdef ENABLE_DECODE
     i = copy(decode_sigs.begin(), decode_sigs.end(), i);
@@ -295,8 +295,8 @@ vector< shared_ptr<Trace> > View::get_traces() const
     return traces;
 }
 
-bool View::compare_trace_v_offsets(const shared_ptr<Trace> &a,
-    const shared_ptr<Trace> &b)
+bool View::compare_trace_v_offsets(const boost::shared_ptr<Trace> &a,
+    const boost::shared_ptr<Trace> &b)
 {
     assert(a);
     assert(b);
@@ -379,14 +379,14 @@ const QPointF& View::hover_point() const
 
 void View::normalize_layout()
 {
-    const vector< shared_ptr<Trace> > traces(get_traces());
+    const vector< boost::shared_ptr<Trace> > traces(get_traces());
 
 	int v_min = INT_MAX;
-    BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+    BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces)
         v_min = min(t->get_v_offset(), v_min);
 
 	const int delta = -min(v_min, 0);
-    BOOST_FOREACH(shared_ptr<Trace> t, traces)
+    BOOST_FOREACH(boost::shared_ptr<Trace> t, traces)
         t->set_v_offset(t->get_v_offset() + delta);
 
 	verticalScrollBar()->setSliderPosition(_v_offset + delta);
@@ -406,7 +406,7 @@ int View::get_signalHeight()
 
 void View::get_scroll_layout(double &length, double &offset) const
 {
-    const set< shared_ptr<data::SignalData> > data_set = _session.get_data();
+    const set< boost::shared_ptr<data::SignalData> > data_set = _session.get_data();
     if (data_set.empty())
 		return;
 
@@ -473,8 +473,8 @@ void View::update_scale()
 void View::signals_changed()
 {
     int total_rows = 0;
-    const vector< shared_ptr<Trace> > traces(get_traces());
-    BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+    const vector< boost::shared_ptr<Trace> > traces(get_traces());
+    BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces)
     {
         assert(t);
         if (dynamic_pointer_cast<DsoSignal>(t) ||
@@ -489,7 +489,7 @@ void View::signals_changed()
     _signalHeight = (int)((height <= 0) ? 1 : height);
     _spanY = _signalHeight + 2 * SignalMargin;
     int next_v_offset = SignalMargin;
-    BOOST_FOREACH(shared_ptr<Trace> t, traces) {
+    BOOST_FOREACH(boost::shared_ptr<Trace> t, traces) {
         t->set_view(this);
         const double traceHeight = _signalHeight*t->rows_size();
         t->set_signalHeight((int)traceHeight);
@@ -557,9 +557,9 @@ int View::headerWidth()
     QFont font = QApplication::font();
     QFontMetrics fm(font);
 
-    const vector< shared_ptr<Trace> > traces(get_traces());
+    const vector< boost::shared_ptr<Trace> > traces(get_traces());
     if (!traces.empty()){
-        BOOST_FOREACH(const shared_ptr<Trace> t, traces) {
+        BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces) {
             maxNameWidth = max(fm.boundingRect(t->get_name()).width(), maxNameWidth);
             maxLeftWidth = max(t->get_leftWidth(), maxLeftWidth);
             maxRightWidth = max(t->get_rightWidth(), maxRightWidth);
@@ -796,8 +796,8 @@ int View::get_view_width()
 {
     int view_width = 0;
     if (_session.get_device()->dev_inst()->mode == DSO) {
-        const vector< shared_ptr<Signal> > sigs(_session.get_signals());
-        BOOST_FOREACH(const shared_ptr<Signal> s, sigs) {
+        const vector< boost::shared_ptr<Signal> > sigs(_session.get_signals());
+        BOOST_FOREACH(const boost::shared_ptr<Signal> s, sigs) {
             view_width = max((double)view_width, s->get_view_rect().width());
         }
     } else {

DSView/pv/view/view.h

@@ -75,7 +75,7 @@ public:
 	static const QSizeF LabelPadding;
 
     static const int WellPixelsPerSample = 10.0f;
-    static const double MaxViewRate = 1.0f;
+    static constexpr double MaxViewRate = 1.0f;
     static const int MaxPixelsPerSample = 100.0f;
 
 public: