From 4c48653ccc17eb041526884a3c010e4c6f0797f6 Mon Sep 17 00:00:00 2001
From: dreamsourcelab tai <tzz@dreamsourcelab.com>
Date: Thu, 30 Sep 2021 11:17:04 +0800
Subject: [PATCH 01/58] suppor make zip in memory

---
 DSView/pv/ZipMaker.cpp | 199 +++++++++++++++++++++++++++++++++++++++++
 DSView/pv/ZipMaker.h   |  60 +++++++++++++
 2 files changed, 259 insertions(+)
 create mode 100644 DSView/pv/ZipMaker.cpp
 create mode 100644 DSView/pv/ZipMaker.h

diff --git a/DSView/pv/ZipMaker.cpp b/DSView/pv/ZipMaker.cpp
new file mode 100644
index 00000000..cdda2d33
--- /dev/null
+++ b/DSView/pv/ZipMaker.cpp
@@ -0,0 +1,199 @@
+
+/*
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
+ *
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include "ZipMaker.h"
+#include <zip.h>
+#include <stdio.h>
+#include <assert.h>
+#include <malloc.h>
+#include <errno.h>
+#include <string.h>
+
+  
+ZipMaker::ZipMaker() :
+    m_docSource(NULL),
+    m_errobj(NULL)
+{
+    m_error[0] = 0;   
+}
+
+ZipMaker::~ZipMaker()
+{
+    Release();
+}
+
+bool ZipMaker::CreateNew()
+{
+     Release();
+
+     m_errobj = new zip_error_t();
+     zip_error_init(m_errobj);
+
+     if ((m_docSource = zip_source_buffer_create(NULL, 0, 0, m_errobj)) == NULL) {
+        sprintf(m_error, "can't create source: %s", zip_error_strerror(m_errobj));
+    }
+ 
+    return m_docSource != NULL;
+}
+
+void ZipMaker::Release()
+{
+     if (m_errobj){
+        zip_error_fini(m_errobj); //release the error obj
+        delete m_errobj;
+        m_errobj = NULL;
+    }
+
+    if (m_docSource){
+       zip_source_free(m_docSource);
+       m_docSource = NULL;
+   }
+}
+
+bool ZipMaker::SaveToFile(const char *fileName){
+    assert(fileName);
+    assert(m_docSource); 
+
+    zip_stat_t zst;
+    if (zip_source_stat(m_docSource, &zst) < 0) {
+        sprintf(m_error, "can't stat source: %s\n", zip_error_strerror(zip_source_error(m_docSource)));
+        return 1;
+    }
+
+    long long size = zst.size;
+    void *data = NULL;
+    FILE *fp = NULL;
+    bool  berr = false;
+
+    if (zip_source_open(m_docSource) < 0) {
+        sprintf(m_error, "can't open source: %s\n", zip_error_strerror(zip_source_error(m_docSource)));
+        return false;
+    }
+    if (!berr && (data = malloc(size)) == NULL) {
+        sprintf(m_error, "malloc failed: %s\n", strerror(errno));
+        berr = true;
+    }
+
+    if ((zip_uint64_t)zip_source_read(m_docSource, data, size) < size) {
+        sprintf(m_error, "can't read data from source: %s\n", zip_error_strerror(zip_source_error(m_docSource)));
+        berr = true;
+    }
+
+    if (!berr && (fp = fopen(fileName, "wb")) == NULL) {
+        sprintf(m_error, "can't open %s: %s\n", fileName, strerror(errno));
+        berr = true;
+    }
+    if (!berr && fwrite(data, 1, size, fp) < size) {
+        sprintf(m_error, "can't write %s: %s\n", fileName, strerror(errno));
+        berr = true;
+        fclose(fp);
+    }
+    if (!berr && fclose(fp) < 0) {
+        sprintf(m_error, "can't write %s: %s\n", fileName, strerror(errno));
+        berr = true;
+    }
+
+    zip_source_close(m_docSource);
+    if (data){
+        free(data);
+    }        
+
+    return !berr;
+}
+
+bool ZipMaker::AddFromBuffer(const char *innerFile, const char *buffer, int buferSize)
+{
+    assert(buffer);
+    assert(innerFile);
+    assert(m_docSource); 
+
+    zip_t *zip_archive = zip_open_from_source(m_docSource, 0, m_errobj);
+    if (zip_archive == NULL)
+    {
+         sprintf(m_error, "can't open zip from source: %s", zip_error_strerror(m_errobj));
+         return false;
+    }
+
+   zip_source_keep(m_docSource);
+
+   zip_source_t *src = zip_source_buffer(zip_archive, buffer, buferSize, 0);
+   if (src == NULL){
+       sprintf(m_error, "zip_source_buffer error: %s", zip_error_strerror(zip_source_error(m_docSource)));
+       return false;
+   }
+
+    if (zip_file_add(zip_archive, innerFile, src, ZIP_FL_OVERWRITE) == -1)
+    {
+        sprintf(m_error, "zip_file_add error: %s", zip_error_strerror(zip_source_error(m_docSource)));
+        return false;
+    }
+
+    if (zip_close(zip_archive) < 0) {
+          sprintf(m_error, "zip_close'%s'", zip_strerror(zip_archive));
+          return false;
+    }
+
+    return true;
+}
+
+bool ZipMaker::AddFromFile(const char *localFile, const char *innerFile)
+{
+    assert(localFile);
+    assert(innerFile);
+    assert(m_docSource); 
+
+    zip_t *zip_archive = zip_open_from_source(m_docSource, 0, m_errobj);
+    if (zip_archive == NULL)
+    {
+         sprintf(m_error, "can't open zip from source: %s", zip_error_strerror(m_errobj));
+         return false;
+    }
+    
+    zip_source_keep(m_docSource);
+  
+    zip_source_t  *src = zip_source_file(zip_archive, localFile, 0, -1);
+    if (src == NULL){
+        sprintf(m_error, "zip_source_buffer error: %s\n", zip_error_strerror(zip_source_error(m_docSource)));
+        return false;
+    }
+
+    if (zip_add(zip_archive, innerFile, src) == -1)
+    {
+        sprintf(m_error, "zip_file_add error: %s\n", zip_error_strerror(zip_source_error(m_docSource)));
+        return false;
+    }
+
+     if (zip_close(zip_archive) < 0) {
+          sprintf(m_error, "zip_close'%s'", zip_strerror(zip_archive));
+          return false;
+    }
+
+    return true;
+}
+
+const char *ZipMaker::GetError()
+{
+    if (m_error[0])
+        return m_error;
+    return NULL;
+}
diff --git a/DSView/pv/ZipMaker.h b/DSView/pv/ZipMaker.h
new file mode 100644
index 00000000..621d16d7
--- /dev/null
+++ b/DSView/pv/ZipMaker.h
@@ -0,0 +1,60 @@
+/*
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
+ *
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#pragma once
+
+struct  zip_source;
+struct  zip_error;
+
+typedef struct zip_source zip_archive_source_t;
+typedef struct zip_error zip_err_t;
+
+class ZipMaker
+{
+public:
+    ZipMaker();
+
+    ~ZipMaker();
+
+    //create new zip archive in the memory
+    bool CreateNew();
+
+    //free the source
+    void Release();
+
+    //save data to file
+    bool SaveToFile(const char *fileName);
+
+    //add a inner file from  buffer
+    bool AddFromBuffer(const char *innerFile, const char *buffer, int buferSize);
+
+    //add a inner file from local file
+    bool AddFromFile(const char *localFile, const char *innerFile);
+
+    //get the last error
+    const char *GetError();
+
+private:
+    zip_archive_source_t    *m_docSource; //zip file handle
+    zip_err_t               *m_errobj;
+    char                     m_error[500];
+};

From 5933cc4b1b28aae44b196053beb9c0022896136f Mon Sep 17 00:00:00 2001
From: dreamsourcelab tai <tzz@dreamsourcelab.com>
Date: Thu, 30 Sep 2021 11:40:45 +0800
Subject: [PATCH 02/58] zip marker

---
 DSView/main.cpp                     |   7 +-
 DSView/pv/devicemanager.cpp         |   2 +-
 DSView/pv/dialogs/storeprogress.cpp |   2 +-
 DSView/pv/mainframe.cpp             |   5 +-
 DSView/pv/mainwindow.cpp            |   3 +-
 DSView/pv/mainwindow.h              |   4 +-
 DSView/pv/sigsession.cpp            |   9 +-
 DSView/pv/sigsession.h              |   3 +
 DSView/pv/storesession.cpp          |  70 +++++++++-
 DSView/pv/storesession.h            |   2 +
 DSView/pv/toolbars/filebar.h        |  12 +-
 DSView/pv/toolbars/logobar.h        |  10 +-
 DSView/pv/toolbars/samplingbar.h    | 198 ++++++++++++++--------------
 DSView/pv/toolbars/titlebar.cpp     |   3 +-
 DSView/pv/toolbars/titlebar.h       |  75 ++++++-----
 DSView/pv/toolbars/trigbar.h        |   8 +-
 DSView/pv/view/analogsignal.h       |   2 +
 DSView/pv/view/cursor.h             |   1 +
 DSView/pv/view/dsldial.cpp          |   4 +-
 DSView/pv/view/dsldial.h            |   2 +
 DSView/pv/view/dsosignal.h          |   2 +
 DSView/pv/view/groupsignal.h        |   1 +
 DSView/pv/view/header.cpp           |   3 +
 DSView/pv/view/header.h             |   2 +
 DSView/pv/view/lissajoustrace.h     |   4 +-
 DSView/pv/view/logicsignal.h        |   2 +
 DSView/pv/view/ruler.cpp            |   2 +-
 DSView/pv/view/ruler.h              |   2 +
 DSView/pv/view/selectableitem.h     |   1 +
 DSView/pv/view/signal.h             |   1 +
 DSView/pv/view/spectrumtrace.h      |   2 +
 DSView/pv/view/timemarker.h         |   1 +
 DSView/pv/view/view.h               |   1 +
 DSView/pv/view/viewport.cpp         |  13 +-
 DSView/pv/view/viewport.h           |   3 +
 DSView/pv/view/viewstatus.h         |   7 +-
 DSView/pv/view/xcursor.cpp          |   2 +-
 DSView/pv/view/xcursor.h            |   2 +
 libsigrok4DSL/hardware/demo/demo.h  |   5 +-
 libsigrok4DSL/session_file.c        |   1 +
 40 files changed, 305 insertions(+), 174 deletions(-)

diff --git a/DSView/main.cpp b/DSView/main.cpp
index cb3d83ae..fa87b03c 100755
--- a/DSView/main.cpp
+++ b/DSView/main.cpp
@@ -161,16 +161,17 @@ int main(int argc, char *argv[])
         dir.cd("share") &&
         dir.cd(QApplication::applicationName()) &&
         dir.cd("res")) {
+		// the path command like: cd ../share/DSView/res
         QString res_dir = dir.absolutePath() + "/";
         strcpy(DS_RES_PATH, res_dir.toUtf8().data());
     } else {
-        qDebug() << "ERROR: config files don't exist.";
+        qDebug() << "DSView run ERROR: config files don't exist.";
         return 1;
     }
 
 	// Initialise libsigrok
 	if (sr_init(&sr_ctx) != SR_OK) {
-		qDebug() << "ERROR: libsigrok init failed.";
+		qDebug() << "DSView run ERROR: libsigrok init failed.";
 		return 1;
 	}
 
@@ -194,7 +195,7 @@ int main(int argc, char *argv[])
             pv::MainFrame w(device_manager, open_file);
 			w.show();
             w.readSettings();
-            w.show_doc();
+            w.show_doc();  // to show the dailog for open help document
 
 			// Run the application
             ret = a.exec();
diff --git a/DSView/pv/devicemanager.cpp b/DSView/pv/devicemanager.cpp
index d7778be5..aacfd7d1 100755
--- a/DSView/pv/devicemanager.cpp
+++ b/DSView/pv/devicemanager.cpp
@@ -105,7 +105,7 @@ std::list<boost::shared_ptr<device::DevInst> > DeviceManager::driver_scan(
         } else {
 			i++;
         }
-	}
+    }
 
     // Clear all the old device instances from this driver
     sr_dev_clear(driver);
diff --git a/DSView/pv/dialogs/storeprogress.cpp b/DSView/pv/dialogs/storeprogress.cpp
index 2bb91a18..b74daaa4 100755
--- a/DSView/pv/dialogs/storeprogress.cpp
+++ b/DSView/pv/dialogs/storeprogress.cpp
@@ -69,7 +69,7 @@ void StoreProgress::timeout()
     if (_done) {
         _store_session.session().set_saving(false);
         save_done();
-        close();
+        close(); 
     } else {
         QTimer::singleShot(100, this, SLOT(timeout()));
     }
diff --git a/DSView/pv/mainframe.cpp b/DSView/pv/mainframe.cpp
index 4ed79087..714de50b 100755
--- a/DSView/pv/mainframe.cpp
+++ b/DSView/pv/mainframe.cpp
@@ -77,11 +77,10 @@ MainFrame::MainFrame(DeviceManager &device_manager,
     // Title
     _titleBar = new toolbars::TitleBar(true, this);
     _titleBar->installEventFilter(this);
-
+     
     // MainWindow
     _mainWindow = new MainWindow(device_manager, open_file_name, this);
     _mainWindow->setWindowFlags(Qt::Widget);
-
     _titleBar->setTitle(_mainWindow->windowTitle());
 
     QVBoxLayout *vbox = new QVBoxLayout();
@@ -185,7 +184,7 @@ void MainFrame::hide_border()
 }
 
 void MainFrame::show_border()
-{
+{ 
     _top_left->setVisible(true);
     _top_right->setVisible(true);
     _top->setVisible(true);
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index 2fea92dd..746f34f2 100755
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -870,6 +870,7 @@ void MainWindow::on_screenShot()
     }
 }
 
+//save file
 void MainWindow::on_save()
 {
     using pv::dialogs::StoreProgress;
@@ -1227,7 +1228,7 @@ bool MainWindow::store_session(QString name)
     QJsonDocument sessionDoc(sessionVar);
     //sessionFile.write(QString::fromUtf8(sessionDoc.toJson()));
     outStream << QString::fromUtf8(sessionDoc.toJson());
-    sessionFile.close();
+    sessionFile.close(); 
     return true;
 }
 
diff --git a/DSView/pv/mainwindow.h b/DSView/pv/mainwindow.h
index 0af21189..0069b1e5 100755
--- a/DSView/pv/mainwindow.h
+++ b/DSView/pv/mainwindow.h
@@ -63,6 +63,8 @@ namespace view {
 class View;
 }
 
+//The mainwindow,referenced by MainFrame
+//TODO: create graph view,toolbar,and show device list
 class MainWindow : public QMainWindow
 {
 	Q_OBJECT
@@ -186,7 +188,7 @@ private:
 	toolbars::SamplingBar *_sampling_bar;
     toolbars::TrigBar *_trig_bar;
     toolbars::FileBar *_file_bar;
-    toolbars::LogoBar *_logo_bar;
+    toolbars::LogoBar *_logo_bar; //help button, on top right
 
 #ifdef ENABLE_DECODE
     QDockWidget *_protocol_dock;
diff --git a/DSView/pv/sigsession.cpp b/DSView/pv/sigsession.cpp
index f55f1058..df1afdc0 100755
--- a/DSView/pv/sigsession.cpp
+++ b/DSView/pv/sigsession.cpp
@@ -156,6 +156,9 @@ boost::shared_ptr<device::DevInst> SigSession::get_device() const
     return _dev_inst;
 }
 
+/*
+  when be called, it will call 4DSL lib sr_session_new, and create a session struct in the lib
+*/
 void SigSession::set_device(boost::shared_ptr<device::DevInst> dev_inst)
 {
     using pv::device::Device;
@@ -746,8 +749,8 @@ void SigSession::init_signals()
             switch(probe->type) {
             case SR_CHANNEL_LOGIC:
                 if (probe->enabled)
-                    signal = boost::shared_ptr<view::Signal>(
-                        new view::LogicSignal(_dev_inst, _logic_data, probe));
+                   signal = boost::shared_ptr<view::Signal>(
+                       new view::LogicSignal(_dev_inst, _logic_data, probe));
                 break;
 
             case SR_CHANNEL_DSO:
@@ -803,7 +806,7 @@ void SigSession::reload()
                             boost::shared_ptr<view::LogicSignal> logicSig;
                             if ((logicSig = dynamic_pointer_cast<view::LogicSignal>(*i)))
                                 signal = boost::shared_ptr<view::Signal>(
-                                    new view::LogicSignal(logicSig, _logic_data, probe));
+                                  new view::LogicSignal(logicSig, _logic_data, probe));
                             break;
                         }
                         i++;
diff --git a/DSView/pv/sigsession.h b/DSView/pv/sigsession.h
index 96fd0649..0f9d46ca 100755
--- a/DSView/pv/sigsession.h
+++ b/DSView/pv/sigsession.h
@@ -92,6 +92,7 @@ class Decoder;
 class DecoderFactory;
 }
 
+//created by MainWindow
 class SigSession : public QObject
 {
         Q_OBJECT
@@ -291,8 +292,10 @@ private:
 	void feed_in_logic(const sr_datafeed_logic &logic);
     void feed_in_dso(const sr_datafeed_dso &dso);
 	void feed_in_analog(const sr_datafeed_analog &analog);
+    
 	void data_feed_in(const struct sr_dev_inst *sdi,
 		const struct sr_datafeed_packet *packet);
+
 	static void data_feed_in_proc(const struct sr_dev_inst *sdi,
 		const struct sr_datafeed_packet *packet, void *cb_data);
 
diff --git a/DSView/pv/storesession.cpp b/DSView/pv/storesession.cpp
index d41881ac..18ad1bd5 100755
--- a/DSView/pv/storesession.cpp
+++ b/DSView/pv/storesession.cpp
@@ -60,6 +60,20 @@ using std::vector;
 
 namespace pv {
 
+      char chunk_name[30] = {0};
+
+    void MakeChunkName(int chunk_num, int index, int type, int version){       
+        if (version == 2) {
+            const char *type_name = NULL;
+            type_name = (type == SR_CHANNEL_LOGIC) ? "L" :
+                    (type == SR_CHANNEL_DSO) ? "O" :
+                    (type == SR_CHANNEL_ANALOG) ? "A" : "U";
+            snprintf(chunk_name, 15, "%s-%d/%d", type_name, index, chunk_num);
+        } else {
+            snprintf(chunk_name, 15, "data");
+        }
+    }
+
 StoreSession::StoreSession(SigSession &session) :
 	_session(session),
     _outModule(NULL),
@@ -179,6 +193,8 @@ bool StoreSession::save_start(QString session_file)
     #else
         QString decoders_file = NULL;
     #endif
+
+       /*
         if (meta_file == NULL) {
             _error = tr("Generate temp file failed.");
         } else {
@@ -193,6 +209,23 @@ bool StoreSession::save_start(QString session_file)
                 return !_has_error;
             }
         }
+        */
+
+            //make zip file
+        if (meta_file != NULL && m_zipDoc.CreateNew())
+        {
+            if (   !m_zipDoc.AddFromFile(meta_file.toUtf8().data(), "header")
+                || !m_zipDoc.AddFromFile(decoders_file.toUtf8().data(), "decoders")
+                || !m_zipDoc.AddFromFile(session_file.toUtf8().data(), "session"))
+                {
+                        _has_error = true;
+                        _error = m_zipDoc.GetError();
+                }
+                else{
+                        _thread = boost::thread(&StoreSession::save_proc, this, snapshot);
+                        return !_has_error;
+                }        
+        }
     }
 
     QFile::remove(_file_name);
@@ -239,8 +272,13 @@ void StoreSession::save_proc(shared_ptr<data::Snapshot> snapshot)
                             memset(buf, sample ? 0xff : 0x0, size);
                         }
                     }
-                    ret = sr_session_append(_file_name.toUtf8().data(), buf, size,
-                                      i, ch_index, ch_type, File_Version);
+                    
+                   // ret = sr_session_append(_file_name.toUtf8().data(), buf, size,
+                    //                  i, ch_index, ch_type, File_Version);
+                    
+                    MakeChunkName(i, ch_index, ch_type, File_Version);
+                    ret = m_zipDoc.AddFromBuffer(chunk_name, (const char*)buf, size) ? SR_OK : -1;
+
                     if (ret != SR_OK) {
                         if (!_has_error) {
                             _has_error = true;
@@ -285,19 +323,30 @@ void StoreSession::save_proc(shared_ptr<data::Snapshot> snapshot)
                         memcpy(tmp, buf, buf_end-buf);
                         memcpy(tmp+(buf_end-buf), buf_start, buf+size-buf_end);
                     }
-                    ret = sr_session_append(_file_name.toUtf8().data(), tmp, size,
-                                      i, 0, ch_type, File_Version);
+
+                   ret = sr_session_append(_file_name.toUtf8().data(), tmp, size,
+                                     i, 0, ch_type, File_Version);
+
+                    MakeChunkName(i, 0, ch_type, File_Version);
+                    ret = m_zipDoc.AddFromBuffer(chunk_name, (const char*)tmp, size) ? SR_OK : -1;
+
                     buf += (size - _unit_count);
                     if (tmp)
                         free(tmp);
                 } else {
-                    ret = sr_session_append(_file_name.toUtf8().data(), buf, size,
-                                      i, 0, ch_type, File_Version);
+
+                  //  ret = sr_session_append(_file_name.toUtf8().data(), buf, size,
+                  //                 i, 0, ch_type, File_Version);
+
+                    MakeChunkName(i, 0, ch_type, File_Version);
+                    ret = m_zipDoc.AddFromBuffer(chunk_name, (const char*)buf, size) ? SR_OK : -1;
+
                     buf += size;
                 }
                 if (ret != SR_OK) {
                     if (!_has_error) {
                         _has_error = true;
+                        auto err = m_zipDoc.GetError();
                         _error = tr("Failed to create zip file. Please check write permission of this path.");
                     }
                     progress_updated();
@@ -314,6 +363,15 @@ void StoreSession::save_proc(shared_ptr<data::Snapshot> snapshot)
 
     if (_canceled || num == 0)
         QFile::remove(_file_name);
+    else {
+        bool bret = m_zipDoc.SaveToFile(_file_name.toUtf8().data());
+        m_zipDoc.Release();
+
+        if (!bret){
+            _has_error = true;
+            _error = m_zipDoc.GetError();
+        }
+    } 
 }
 
 QString StoreSession::meta_gen(boost::shared_ptr<data::Snapshot> snapshot)
diff --git a/DSView/pv/storesession.h b/DSView/pv/storesession.h
index 2f369385..09dc4e3a 100755
--- a/DSView/pv/storesession.h
+++ b/DSView/pv/storesession.h
@@ -31,6 +31,7 @@
 
 #include <libsigrok4DSL/libsigrok.h>
 #include <libsigrokdecode4DSL/libsigrokdecode.h>
+#include "ZipMaker.h"
 
 namespace pv {
 
@@ -106,6 +107,7 @@ private:
     bool _has_error;
 	QString _error;
     bool _canceled;
+    ZipMaker m_zipDoc;
 };
 
 } // pv
diff --git a/DSView/pv/toolbars/filebar.h b/DSView/pv/toolbars/filebar.h
index 3696fab5..0f55c3db 100755
--- a/DSView/pv/toolbars/filebar.h
+++ b/DSView/pv/toolbars/filebar.h
@@ -33,6 +33,8 @@
 namespace pv {
 namespace toolbars {
 
+//toolbar button,referenced by MainWindow
+//TODO: load session file, sorte session, load log data file, sorte data, export data
 class FileBar : public QToolBar
 {
     Q_OBJECT
@@ -55,12 +57,12 @@ private:
         const QString text, const QString info_text);
 
 signals:
-    void load_file(QString);
+    void load_file(QString); 
     void on_save();
     void on_export();
-    void on_screenShot();
-    void load_session(QString);
-    void store_session(QString);
+    void on_screenShot(); //post screen capture event message
+    void load_session(QString); //post load session event message
+    void store_session(QString); //post store session event message
 
 private slots:
     void on_actionLoad_triggered();
@@ -77,7 +79,7 @@ private:
 
     QMenu *_menu;
 
-    QMenu *_menu_session;
+    QMenu *_menu_session; //when the hardware device is connected,it will be enable
     QAction *_action_load;
     QAction *_action_store;
     QAction *_action_default;
diff --git a/DSView/pv/toolbars/logobar.h b/DSView/pv/toolbars/logobar.h
index caf686c5..691793a7 100755
--- a/DSView/pv/toolbars/logobar.h
+++ b/DSView/pv/toolbars/logobar.h
@@ -35,6 +35,8 @@
 namespace pv {
 namespace toolbars {
 
+//The tool button for help,is a ui class,referenced by MainWindow
+//TODO: switch language,submit bug descript,
 class LogoBar : public QToolBar
 {
     Q_OBJECT
@@ -44,6 +46,7 @@ public:
 
     void enable_toggle(bool enable);
 
+   //show the hardware device conneted status with logo picture
     void dsl_connected(bool conn);
 
 private:
@@ -57,8 +60,11 @@ private:
         const QString text, const QString info_text);
 
 signals:
-    void setLanguage(int language);
-    void openDoc();
+    //post event message to set language, MainWindow class receive it
+    void setLanguage(int language);  
+
+    //post event message to open user help document, MainWindow class receive it
+    void openDoc(); 
 
 private slots:
     void on_actionEn_triggered();
diff --git a/DSView/pv/toolbars/samplingbar.h b/DSView/pv/toolbars/samplingbar.h
index 567eff1f..a19298b9 100755
--- a/DSView/pv/toolbars/samplingbar.h
+++ b/DSView/pv/toolbars/samplingbar.h
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-
 #ifndef DSVIEW_PV_TOOLBARS_SAMPLINGBAR_H
 #define DSVIEW_PV_TOOLBARS_SAMPLINGBAR_H
 
@@ -40,134 +39,137 @@
 struct st_dev_inst;
 class QAction;
 
-namespace pv {
+namespace pv
+{ 
+    class SigSession;
 
-class SigSession;
+    namespace device
+    {
+       // class DevInst;
+    } 
 
-namespace device {
-class DevInst;
-}
+    namespace dialogs
+    {
+        class deviceoptions;
+        class Calibration;
+    }
 
-namespace dialogs {
-class deviceoptions;
-class Calibration;
-}
+    namespace toolbars
+    {
 
-namespace toolbars {
+        class SamplingBar : public QToolBar
+        {
+            Q_OBJECT
 
-class SamplingBar : public QToolBar
-{
-	Q_OBJECT
+        private:
+            static const int ComboBoxMaxWidth = 200;
+            static const int RefreshShort = 500;
+            static const uint64_t LogicMaxSWDepth64 = SR_GB(16);
+            static const uint64_t LogicMaxSWDepth32 = SR_GB(8);
+            static const uint64_t AnalogMaxSWDepth = SR_Mn(100);
+            static const QString RLEString;
+            static const QString DIVString;
+            static const uint64_t ZeroTimeBase = SR_US(2);
 
-private:
-    static const int ComboBoxMaxWidth = 200;
-    static const int RefreshShort = 500;
-    static const uint64_t LogicMaxSWDepth64 = SR_GB(16);
-    static const uint64_t LogicMaxSWDepth32 = SR_GB(8);
-    static const uint64_t AnalogMaxSWDepth = SR_Mn(100);
-    static const QString RLEString;
-    static const QString DIVString;
-    static const uint64_t ZeroTimeBase = SR_US(2);
+        public:
+            SamplingBar(SigSession &session, QWidget *parent);
 
-public:
-    SamplingBar(SigSession &session, QWidget *parent);
+            void set_device_list(const std::list<boost::shared_ptr<pv::device::DevInst>> &devices,
+                                 boost::shared_ptr<pv::device::DevInst> selected);
 
-    void set_device_list(const std::list< boost::shared_ptr<pv::device::DevInst> > &devices,
-                         boost::shared_ptr<pv::device::DevInst> selected);
+            boost::shared_ptr<pv::device::DevInst> get_selected_device() const;
 
-    boost::shared_ptr<pv::device::DevInst> get_selected_device() const;
+            void update_sample_rate_selector();
 
-    void update_sample_rate_selector();
+            void set_sampling(bool sampling);
+            bool get_sampling() const;
+            bool get_instant() const;
 
-	void set_sampling(bool sampling);
-    bool get_sampling() const;
-    bool get_instant() const;
+            void enable_toggle(bool enable);
 
-    void enable_toggle(bool enable);
+            void enable_run_stop(bool enable);
 
-    void enable_run_stop(bool enable);
+            void enable_instant(bool enable);
 
-    void enable_instant(bool enable);
+            double hori_knob(int dir);
+            double commit_hori_res();
+            double get_hori_res();
 
-    double hori_knob(int dir);
-    double commit_hori_res();
-    double get_hori_res();
+        public slots:
+            void set_sample_rate(uint64_t sample_rate);
 
-public slots:
-    void set_sample_rate(uint64_t sample_rate);
+        signals:
+            void run_stop();
+            void instant_stop();
+            void device_selected();
+            void device_updated();
+            void duration_changed();
+            void show_calibration();
+            void hide_calibration();
 
-signals:
-	void run_stop();
-    void instant_stop();
-    void device_selected();
-    void device_updated();
-    void duration_changed();
-    void show_calibration();
-    void hide_calibration();
+        private:
+            void changeEvent(QEvent *event);
+            void retranslateUi();
+            void reStyle();
 
-private:
-    void changeEvent(QEvent *event);
-    void retranslateUi();
-    void reStyle();
+            void update_sample_rate_selector_value();
+            void update_sample_count_selector();
+            void update_sample_count_selector_value();
+            void commit_settings();
+            void setting_adj();
 
-	void update_sample_rate_selector_value();
-    void update_sample_count_selector();
-    void update_sample_count_selector_value();
-    void commit_settings();
-    void setting_adj();
+        private slots:
+            void on_mode();
+            void on_run_stop();
+            void on_instant_stop();
+            void on_device_selected();
+            void on_samplerate_sel(int index);
+            void on_samplecount_sel(int index);
 
-private slots:
-    void on_mode();
-	void on_run_stop();
-    void on_instant_stop();
-    void on_device_selected();
-    void on_samplerate_sel(int index);
-    void on_samplecount_sel(int index);
+            void show_session_error(
+                const QString text, const QString info_text);
 
-    void show_session_error(
-        const QString text, const QString info_text);
+        public slots:
+            void on_configure();
+            void zero_adj();
+            void reload();
 
-public slots:
-    void on_configure();
-    void zero_adj();
-    void reload();
+        private:
+            SigSession &_session;
 
-private:
-    SigSession &_session;
+            mutable boost::recursive_mutex _sampling_mutex;
+            bool _enable;
+            bool _sampling;
 
-    mutable boost::recursive_mutex _sampling_mutex;
-    bool _enable;
-    bool _sampling;
+            QToolButton _device_type;
 
-    QToolButton _device_type;
+            QComboBox _device_selector;
+            std::map<const void *, boost::weak_ptr<device::DevInst>>
+                _device_selector_map;
+            bool _updating_device_selector;
 
-    QComboBox _device_selector;
-    std::map<const void*, boost::weak_ptr<device::DevInst> >
-        _device_selector_map;
-    bool _updating_device_selector;
+            QToolButton _configure_button;
 
-    QToolButton _configure_button;
+            QComboBox _sample_count;
+            QComboBox _sample_rate;
+            bool _updating_sample_rate;
+            bool _updating_sample_count;
 
-    QComboBox _sample_count;
-    QComboBox _sample_rate;
-    bool _updating_sample_rate;
-    bool _updating_sample_count;
+            QToolButton _run_stop_button;
+            QToolButton _instant_button;
+            QAction *_run_stop_action;
+            QAction *_instant_action;
 
-	QToolButton _run_stop_button;
-    QToolButton _instant_button;
-    QAction* _run_stop_action;
-    QAction* _instant_action;
+            QAction *_mode_action;
+            QToolButton _mode_button;
+            QMenu *_mode_menu;
+            QAction *_action_repeat;
+            QAction *_action_single;
 
-    QAction* _mode_action;
-    QToolButton _mode_button;
-    QMenu *_mode_menu;
-    QAction *_action_repeat;
-    QAction *_action_single;
+            bool _instant;
+        };
 
-    bool _instant;
-};
-
-} // namespace toolbars
+    } // namespace toolbars
 } // namespace pv
 
 #endif // DSVIEW_PV_TOOLBARS_SAMPLINGBAR_H
diff --git a/DSView/pv/toolbars/titlebar.cpp b/DSView/pv/toolbars/titlebar.cpp
index ed595925..dffb4bc4 100755
--- a/DSView/pv/toolbars/titlebar.cpp
+++ b/DSView/pv/toolbars/titlebar.cpp
@@ -101,7 +101,7 @@ void TitleBar::reStyle()
 }
 
 void TitleBar::paintEvent(QPaintEvent *event)
-{
+{  
     QStyleOption o;
     o.initFrom(this);
     QPainter p(this);
@@ -109,6 +109,7 @@ void TitleBar::paintEvent(QPaintEvent *event)
 
     p.setRenderHint(QPainter::Antialiasing, true);
 
+    //To draw product logo
     const int xgap = 2;
     const int xstart = 10;
     p.setPen(QPen(QColor(213, 15, 37, 255), 2, Qt::SolidLine));
diff --git a/DSView/pv/toolbars/titlebar.h b/DSView/pv/toolbars/titlebar.h
index d48878b1..5463af2f 100755
--- a/DSView/pv/toolbars/titlebar.h
+++ b/DSView/pv/toolbars/titlebar.h
@@ -26,50 +26,55 @@
 class QLabel;
 class QToolButton;
 
-namespace pv {
-namespace toolbars {
-
-class TitleBar : public QWidget
+namespace pv
 {
-    Q_OBJECT
+    namespace toolbars
+    {
 
-public:
-    TitleBar(bool top, QWidget *parent, bool hasClose = false);
-    void setTitle(QString title);
-    QPoint get_startPos() const;
-    QString title() const;
+//Window's titlebar, referenced by MainFrame,
+//The title area above the main screen,
+//Display logo and maximize \ minimize button
+        class TitleBar : public QWidget
+        {
+            Q_OBJECT
 
-private:
-    void changeEvent(QEvent *event);
-    void reStyle();
+        public:
+            TitleBar(bool top, QWidget *parent, bool hasClose = false);
+            void setTitle(QString title);
+            QPoint get_startPos() const;
+            QString title() const;
 
-signals:
-    void normalShow();
-    void maximizedShow();
+        private:
+            void changeEvent(QEvent *event);
+            void reStyle();
 
-public slots:
-    void showMaxRestore();
-    void setRestoreButton(bool max);
+        signals:
+            void normalShow();
+            void maximizedShow();
 
-protected:
-    void paintEvent(QPaintEvent *event);
-    void mousePressEvent(QMouseEvent *event);
-    void mouseMoveEvent(QMouseEvent *event);
-    void mouseReleaseEvent(QMouseEvent *event);
-    void mouseDoubleClickEvent(QMouseEvent *event);
+        public slots:
+            void showMaxRestore();
+            void setRestoreButton(bool max);
 
-    QLabel *_title;
-    QToolButton *_minimizeButton;
-    QToolButton *_maximizeButton;
-    QToolButton *_closeButton;
+        protected:
+            void paintEvent(QPaintEvent *event);
+            void mousePressEvent(QMouseEvent *event);
+            void mouseMoveEvent(QMouseEvent *event);
+            void mouseReleaseEvent(QMouseEvent *event);
+            void mouseDoubleClickEvent(QMouseEvent *event);
 
-    bool _moving;
-    bool _isTop;
-    bool _hasClose;
-    QPoint _startPos;
-};
+            QLabel *_title;
+            QToolButton *_minimizeButton;
+            QToolButton *_maximizeButton;
+            QToolButton *_closeButton;
 
-} // namespace toolbars
+            bool _moving;
+            bool _isTop;
+            bool _hasClose;
+            QPoint _startPos;
+        };
+
+    } // namespace toolbars
 } // namespace pv
 
 #endif // DSVIEW_PV_TOOLBARS_TITLEBAR_H
diff --git a/DSView/pv/toolbars/trigbar.h b/DSView/pv/toolbars/trigbar.h
index 6a86218f..fbddf0e0 100755
--- a/DSView/pv/toolbars/trigbar.h
+++ b/DSView/pv/toolbars/trigbar.h
@@ -34,6 +34,8 @@ class SigSession;
 
 namespace toolbars {
 
+//boolbar, referenced by MainWindow
+//TODO:show the property panel about protocol\trigger
 class TrigBar : public QToolBar
 {
     Q_OBJECT
@@ -57,9 +59,9 @@ private:
 
 signals:
     void setTheme(QString style);
-    void on_protocol(bool visible);
-    void on_trigger(bool visible);
-    void on_measure(bool visible);
+    void on_protocol(bool visible); //post decode button click event,to show or hide protocol property panel
+    void on_trigger(bool visible); //post decode button click event,to show or hide trigger property panel
+    void on_measure(bool visible);//post decode button click event,to show or hide measure property panel
     void on_search(bool visible);
     void show_lissajous(bool visible);
 
diff --git a/DSView/pv/view/analogsignal.h b/DSView/pv/view/analogsignal.h
index ac7ff67a..0555175d 100755
--- a/DSView/pv/view/analogsignal.h
+++ b/DSView/pv/view/analogsignal.h
@@ -37,6 +37,8 @@ class AnalogSnapshot;
 
 namespace view {
 
+//when device is data acquisition model, to draw trace
+//created by SigSession
 class AnalogSignal : public Signal
 {
     Q_OBJECT
diff --git a/DSView/pv/view/cursor.h b/DSView/pv/view/cursor.h
index 0248c9ce..2a33a8f2 100755
--- a/DSView/pv/view/cursor.h
+++ b/DSView/pv/view/cursor.h
@@ -33,6 +33,7 @@ class QPainter;
 namespace pv {
 namespace view {
 
+//created by View
 class Cursor : public TimeMarker
 {
 	Q_OBJECT
diff --git a/DSView/pv/view/dsldial.cpp b/DSView/pv/view/dsldial.cpp
index f20c872c..618817b1 100755
--- a/DSView/pv/view/dsldial.cpp
+++ b/DSView/pv/view/dsldial.cpp
@@ -48,7 +48,7 @@ dslDial::~dslDial()
 }
 
 void dslDial::paint(QPainter &p, QRectF dialRect, QColor dialColor, const QPoint pt, QString &pText)
-{
+{  
     p.setPen(dialColor);
     p.setBrush(dialColor);
 
@@ -108,6 +108,8 @@ void dslDial::paint(QPainter &p, QRectF dialRect, QColor dialColor, const QPoint
                    inc ? 10 : -10, hoverRect.width()/2 + 4);
         p.restore();
     }
+
+    (void*)0;
 }
 
 void dslDial::set_sel(uint64_t sel)
diff --git a/DSView/pv/view/dsldial.h b/DSView/pv/view/dsldial.h
index 973e0e6e..120b491c 100755
--- a/DSView/pv/view/dsldial.h
+++ b/DSView/pv/view/dsldial.h
@@ -28,6 +28,8 @@
 namespace pv {
 namespace view {
 
+//when device is oscilloscope model, to draw the dail on the left
+//created by DsoSignal
 class dslDial : public QObject
 {
     //Q_OBJECT
diff --git a/DSView/pv/view/dsosignal.h b/DSView/pv/view/dsosignal.h
index a1b040c4..a6f28ec2 100755
--- a/DSView/pv/view/dsosignal.h
+++ b/DSView/pv/view/dsosignal.h
@@ -38,6 +38,8 @@ class DsoSnapshot;
 
 namespace view {
 
+//when device is oscilloscope model,to draw trace
+//created by SigSession
 class DsoSignal : public Signal
 {
     Q_OBJECT
diff --git a/DSView/pv/view/groupsignal.h b/DSView/pv/view/groupsignal.h
index 358c300f..76f1a20f 100755
--- a/DSView/pv/view/groupsignal.h
+++ b/DSView/pv/view/groupsignal.h
@@ -40,6 +40,7 @@ class GroupSnapshot;
 
 namespace view {
 
+//created by SigSession
 class GroupSignal : public Trace
 {
 private:
diff --git a/DSView/pv/view/header.cpp b/DSView/pv/view/header.cpp
index 40bcaa43..9d794020 100755
--- a/DSView/pv/view/header.cpp
+++ b/DSView/pv/view/header.cpp
@@ -131,12 +131,15 @@ void Header::paintEvent(QPaintEvent*)
     const vector< boost::shared_ptr<Trace> > traces(
         _view.get_traces(ALL_VIEW));
 
+  //  auto num = traces.size();
+
     const bool dragging = !_drag_traces.empty();
     QColor fore(QWidget::palette().color(QWidget::foregroundRole()));
     fore.setAlpha(View::ForeAlpha);
     BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces)
 	{
         assert(t);
+       // auto ptr = t.get();
         t->paint_label(painter, w, dragging ? QPoint(-1, -1) : _mouse_point, fore);
 	}
 
diff --git a/DSView/pv/view/header.h b/DSView/pv/view/header.h
index 7362973a..1dc83c01 100755
--- a/DSView/pv/view/header.h
+++ b/DSView/pv/view/header.h
@@ -39,6 +39,8 @@ namespace view {
 class Trace;
 class View;
 
+//the left panel of main graph
+//created by View
 class Header : public QWidget
 {
 	Q_OBJECT
diff --git a/DSView/pv/view/lissajoustrace.h b/DSView/pv/view/lissajoustrace.h
index 1b5dd2f3..f5245d30 100755
--- a/DSView/pv/view/lissajoustrace.h
+++ b/DSView/pv/view/lissajoustrace.h
@@ -38,12 +38,14 @@ class DsoSnapshot;
 
 namespace view {
 
+//when device is oscilloscope mode, it can use to draw Lissajous graph
+//created by SigSession
 class LissajousTrace : public Trace
 {
     Q_OBJECT
 
 private:
-    static const int DIV_NUM = 10;
+    static const int DIV_NUM = 10; 
 
 public:
     LissajousTrace(bool enable,
diff --git a/DSView/pv/view/logicsignal.h b/DSView/pv/view/logicsignal.h
index 2cb30d4e..c9377c8a 100755
--- a/DSView/pv/view/logicsignal.h
+++ b/DSView/pv/view/logicsignal.h
@@ -39,6 +39,8 @@ class Analog;
 
 namespace view {
 
+//when device is logic analyzer mode, to draw logic signal trace
+//created by SigSession
 class LogicSignal : public Signal
 {
     Q_OBJECT
diff --git a/DSView/pv/view/ruler.cpp b/DSView/pv/view/ruler.cpp
index 86448b42..1108087b 100755
--- a/DSView/pv/view/ruler.cpp
+++ b/DSView/pv/view/ruler.cpp
@@ -168,7 +168,7 @@ void Ruler::rel_grabbed_cursor()
 }
 
 void Ruler::paintEvent(QPaintEvent*)
-{
+{   
     QStyleOption o;
     o.initFrom(this);
     QPainter p(this);
diff --git a/DSView/pv/view/ruler.h b/DSView/pv/view/ruler.h
index f3cf204d..18b310c9 100755
--- a/DSView/pv/view/ruler.h
+++ b/DSView/pv/view/ruler.h
@@ -33,6 +33,8 @@ namespace view {
 class TimeMarker;
 class View;
 
+//the rule panel on the top
+//created by View
 class Ruler : public QWidget
 {
 	Q_OBJECT
diff --git a/DSView/pv/view/selectableitem.h b/DSView/pv/view/selectableitem.h
index de9998a9..7859ee4e 100755
--- a/DSView/pv/view/selectableitem.h
+++ b/DSView/pv/view/selectableitem.h
@@ -35,6 +35,7 @@ namespace pv {
 
 namespace view {
 
+//Trace's base class
 class SelectableItem : public QObject
 {
 	Q_OBJECT
diff --git a/DSView/pv/view/signal.h b/DSView/pv/view/signal.h
index 0c37ca9d..ff7eb5b0 100755
--- a/DSView/pv/view/signal.h
+++ b/DSView/pv/view/signal.h
@@ -50,6 +50,7 @@ class DevInst;
 
 namespace view {
 
+//draw signal trace base class
 class Signal : public Trace
 {
     Q_OBJECT
diff --git a/DSView/pv/view/spectrumtrace.h b/DSView/pv/view/spectrumtrace.h
index e8a08796..ea78082d 100755
--- a/DSView/pv/view/spectrumtrace.h
+++ b/DSView/pv/view/spectrumtrace.h
@@ -40,6 +40,8 @@ class SpectrumStack;
 
 namespace view {
 
+//draw Scope signal trace
+//created by SigSession
 class SpectrumTrace : public Trace
 {
     Q_OBJECT
diff --git a/DSView/pv/view/timemarker.h b/DSView/pv/view/timemarker.h
index 7a5425b8..abcb63d6 100755
--- a/DSView/pv/view/timemarker.h
+++ b/DSView/pv/view/timemarker.h
@@ -37,6 +37,7 @@ namespace view {
 
 class View;
 
+//the Cursor's base class
 class TimeMarker : public QObject
 {
 	Q_OBJECT
diff --git a/DSView/pv/view/view.h b/DSView/pv/view/view.h
index 58893ec8..e059d461 100755
--- a/DSView/pv/view/view.h
+++ b/DSView/pv/view/view.h
@@ -67,6 +67,7 @@ class Trace;
 class Viewport;
 class LissajousFigure;
 
+//created by MainWindow
 class View : public QScrollArea {
 	Q_OBJECT
 
diff --git a/DSView/pv/view/viewport.cpp b/DSView/pv/view/viewport.cpp
index 16cdce97..e5fa036a 100755
--- a/DSView/pv/view/viewport.cpp
+++ b/DSView/pv/view/viewport.cpp
@@ -138,7 +138,7 @@ bool Viewport::event(QEvent *event)
 }
 
 void Viewport::paintEvent(QPaintEvent *event)
-{
+{   
     (void)event;
 
     using pv::view::Signal;
@@ -156,12 +156,15 @@ void Viewport::paintEvent(QPaintEvent *event)
     const vector< boost::shared_ptr<Trace> > traces(_view.get_traces(_type));
     BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces)
     {
-        assert(t);
+        assert(t); 
+    
         t->paint_back(p, 0, _view.get_view_width(), fore, back);
         if (_view.back_ready())
             break;
     }
 
+    //auto st = _view.session().get_capture_state();
+
     if (_view.session().get_device()->dev_inst()->mode == LOGIC ||
         _view.session().get_instant()) {
         switch(_view.session().get_capture_state()) {
@@ -207,6 +210,10 @@ void Viewport::paintSignals(QPainter &p, QColor fore, QColor back)
         BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces)
         {
             assert(t);
+           // auto ptr = t.get();
+           // ptr->paint_mid(p, 0, t->get_view_rect().right(), fore, back);
+         //   continue;
+
             if (t->enabled())
                 t->paint_mid(p, 0, t->get_view_rect().right(), fore, back);
         }
@@ -228,7 +235,7 @@ void Viewport::paintSignals(QPainter &p, QColor fore, QColor back)
             {
                 assert(t);
                 if (t->enabled())
-                    t->paint_mid(dbp, 0, t->get_view_rect().right(), fore, back);
+                    t->paint_mid(dbp, 0, t->get_view_rect().right(), fore, back);      
             }
             _need_update = false;
         }
diff --git a/DSView/pv/view/viewport.h b/DSView/pv/view/viewport.h
index 9a9689cf..c1d298f1 100755
--- a/DSView/pv/view/viewport.h
+++ b/DSView/pv/view/viewport.h
@@ -48,6 +48,9 @@ namespace view {
 class Signal;
 class View;
 
+//main graph view port, in the middle region
+//draw the left and right rule scale
+//created by View
 class Viewport : public QWidget
 {
 	Q_OBJECT
diff --git a/DSView/pv/view/viewstatus.h b/DSView/pv/view/viewstatus.h
index 804dfbfa..c4a006eb 100755
--- a/DSView/pv/view/viewstatus.h
+++ b/DSView/pv/view/viewstatus.h
@@ -41,12 +41,15 @@ namespace view {
 class View;
 class DsoSignal;
 
-
+//created by View
 class ViewStatus : public QWidget
 {
     Q_OBJECT
+
 public:
-    ViewStatus(SigSession &session, View &parent);
+   ViewStatus(SigSession &session, View &parent);
+
+public: 
 
     void paintEvent(QPaintEvent *);
     void mousePressEvent(QMouseEvent *);
diff --git a/DSView/pv/view/xcursor.cpp b/DSView/pv/view/xcursor.cpp
index 2566505d..a96daf20 100755
--- a/DSView/pv/view/xcursor.cpp
+++ b/DSView/pv/view/xcursor.cpp
@@ -132,7 +132,7 @@ void XCursor::set_value(XCur_type type, double value)
 }
 
 void XCursor::paint(QPainter &p, const QRect &rect, XCur_type highlight,  int order)
-{
+{ 
     const int arrow = 3;
     const int x = rect.left() + _yvalue * rect.width();
     const int y0 = rect.top() + _value0 * rect.height();
diff --git a/DSView/pv/view/xcursor.h b/DSView/pv/view/xcursor.h
index 7f5901ba..e64d80b8 100755
--- a/DSView/pv/view/xcursor.h
+++ b/DSView/pv/view/xcursor.h
@@ -41,9 +41,11 @@ namespace view {
 class View;
 class DsoSignal;
 
+//created by View
 class XCursor : public QObject
 {
 	Q_OBJECT
+  
 public:
     enum XCur_type {
         XCur_None = -2,
diff --git a/libsigrok4DSL/hardware/demo/demo.h b/libsigrok4DSL/hardware/demo/demo.h
index 08a6f421..5a474ea0 100755
--- a/libsigrok4DSL/hardware/demo/demo.h
+++ b/libsigrok4DSL/hardware/demo/demo.h
@@ -168,8 +168,9 @@ static const struct DEMO_profile supported_Demo[] = {
       (1 << DEMO_LOGIC100x16) |
       (1 << DEMO_ANALOG10x2) |
       (1 << DEMO_DSO200x2),
-      SR_Mn(100),
-      SR_Kn(20),
+     SR_Mn(100),
+     // SR_Gn(16),
+      SR_Kn(20),              
       0,
       vdivs10to2000,
       0,
diff --git a/libsigrok4DSL/session_file.c b/libsigrok4DSL/session_file.c
index 4ae027db..ec76d4a5 100755
--- a/libsigrok4DSL/session_file.c
+++ b/libsigrok4DSL/session_file.c
@@ -621,6 +621,7 @@ SR_API int sr_session_append(const char *filename, const unsigned char *buf,
         goto err;
     }
     if (zip_file_add(archive, chunk_name, logicsrc, ZIP_FL_OVERWRITE) == -1) {
+   // if (zip_add(archive, chunk_name, logicsrc) == -1) {
         goto err;
     }
     if ((ret = zip_close(archive)) == -1) {

From 386f19eaa856e09ed438f0a3cdfc0b1c367c64b0 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Fri, 8 Oct 2021 14:40:43 +0800
Subject: [PATCH 03/58] test git

---
 DSView/pv/ZipMaker.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/DSView/pv/ZipMaker.h b/DSView/pv/ZipMaker.h
index 621d16d7..5858dfb2 100644
--- a/DSView/pv/ZipMaker.h
+++ b/DSView/pv/ZipMaker.h
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+//test git
+
 #pragma once
 
 struct  zip_source;

From f9368d112c58154f28a40b15f975d0e9934d358c Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Fri, 8 Oct 2021 14:53:17 +0800
Subject: [PATCH 04/58] test git 2

---
 DSView/pv/ZipMaker.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DSView/pv/ZipMaker.h b/DSView/pv/ZipMaker.h
index 5858dfb2..2e988c12 100644
--- a/DSView/pv/ZipMaker.h
+++ b/DSView/pv/ZipMaker.h
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-//test git
+//test git 2
 
 #pragma once
 

From d679e240b51c68103301b88f840bfa880181fae3 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Mon, 11 Oct 2021 17:25:27 +0800
Subject: [PATCH 05/58] decoder's annotation string be from resource table

---
 DSView/pv/data/decode/AnnotationResTable.cpp | 56 ++++++++++++++++++++
 DSView/pv/data/decode/AnnotationResTable.h   | 48 +++++++++++++++++
 DSView/pv/data/decode/annotation.cpp         | 40 +++++++++++---
 DSView/pv/data/decode/annotation.h           | 16 ++++--
 DSView/pv/data/decode/row.h                  |  2 +-
 DSView/pv/data/decoderstack.cpp              |  2 +-
 DSView/pv/data/decoderstack.h                |  4 +-
 DSView/pv/mainwindow.cpp                     |  6 ++-
 DSView/pv/view/analogsignal.h                |  2 +-
 DSView/pv/view/devmode.cpp                   |  4 +-
 DSView/pv/view/devmode.h                     |  1 +
 DSView/pv/view/spectrumtrace.h               |  2 +-
 DSView/pv/view/viewport.cpp                  | 11 +++-
 13 files changed, 172 insertions(+), 22 deletions(-)
 create mode 100644 DSView/pv/data/decode/AnnotationResTable.cpp
 create mode 100644 DSView/pv/data/decode/AnnotationResTable.h

diff --git a/DSView/pv/data/decode/AnnotationResTable.cpp b/DSView/pv/data/decode/AnnotationResTable.cpp
new file mode 100644
index 00000000..805129f3
--- /dev/null
+++ b/DSView/pv/data/decode/AnnotationResTable.cpp
@@ -0,0 +1,56 @@
+/*
+ * This file is part of the PulseView project.
+ *
+ * Copyright (C) 2013 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2014 DreamSourceLab <support@dreamsourcelab.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include "AnnotationResTable.h"
+#include <assert.h>
+ 
+
+AnnotationResTable::AnnotationResTable(){
+    
+}
+
+AnnotationResTable::~AnnotationResTable(){
+     
+}
+
+int AnnotationResTable::MakeIndex(const std::string &key, AnnotationStringList *&ls)
+{   
+    auto fd =m_indexs.find(key);
+    if (fd != m_indexs.end()){
+        return (*fd).second;
+    } 
+ 
+    int dex = m_indexs.size();
+    m_indexs[key] = dex;
+
+    //make a new string vector
+    m_resourceTable.push_back(AnnotationStringList());
+    ls = &m_resourceTable[dex];
+   
+    return dex;
+}
+
+const AnnotationStringList& AnnotationResTable::GetString(int index){
+    int num = m_resourceTable.size();
+    assert(index >= 0 && index < num);
+    return m_resourceTable[index];
+}
+ 
diff --git a/DSView/pv/data/decode/AnnotationResTable.h b/DSView/pv/data/decode/AnnotationResTable.h
new file mode 100644
index 00000000..21639ae5
--- /dev/null
+++ b/DSView/pv/data/decode/AnnotationResTable.h
@@ -0,0 +1,48 @@
+/*
+ * This file is part of the PulseView project.
+ *
+ * Copyright (C) 2013 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2014 DreamSourceLab <support@dreamsourcelab.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#pragma once
+
+#include <map>
+#include <string>
+#include <vector>
+#include <QString>
+
+typedef std::vector<QString> AnnotationStringList;
+ 
+class AnnotationResTable{
+
+    public:
+       AnnotationResTable();
+
+       ~AnnotationResTable();
+
+       int MakeIndex(const std::string &key, AnnotationStringList *&ls);
+
+       const AnnotationStringList& GetString(int index);
+
+       inline int GetCount(){return m_resourceTable.size();}
+ 
+
+    private:
+        std::map<std::string, int> m_indexs;
+        std::vector<AnnotationStringList> m_resourceTable;
+};
\ No newline at end of file
diff --git a/DSView/pv/data/decode/annotation.cpp b/DSView/pv/data/decode/annotation.cpp
index 7f23e36e..dbb10075 100755
--- a/DSView/pv/data/decode/annotation.cpp
+++ b/DSView/pv/data/decode/annotation.cpp
@@ -25,11 +25,16 @@
 #include <assert.h>
 
 #include "annotation.h"
-
+#include "AnnotationResTable.h"
+#include <cstring>
+ 
 namespace pv {
 namespace data {
 namespace decode {
 
+//a find talbe instance
+AnnotationResTable *Annotation::m_resTable = new AnnotationResTable();
+
 Annotation::Annotation(const srd_proto_data *const pdata) :
 	_start_sample(pdata->start_sample),
 	_end_sample(pdata->end_sample)
@@ -40,13 +45,31 @@ Annotation::Annotation(const srd_proto_data *const pdata) :
 	assert(pda);
 
     _format = pda->ann_class;
-    _type = pda->ann_type;
+    _type = pda->ann_type; 
 
+	_strIndex = 0;
+
+	std::string key; 
+	//make resource find key
     const char *const *annotations = (char**)pda->ann_text;
-    while(*annotations) {
-        _annotations.push_back(QString::fromUtf8(*annotations));
-		annotations++;
+    while(*annotations) { 
+        const char *ptr = *annotations;
+		key.append(ptr, strlen(ptr));
+		annotations++;  
 	}
+
+	AnnotationStringList *annotationArray = NULL;
+    _strIndex = Annotation::m_resTable->MakeIndex(key, annotationArray);
+     
+    //save new string lines
+	if (annotationArray){
+        annotations = (char **)pda->ann_text;
+		while (*annotations)
+		{
+			annotationArray->push_back(QString::fromUtf8(*annotations));
+			annotations++;
+		}
+	} 
 }
 
 Annotation::Annotation()
@@ -57,7 +80,7 @@ Annotation::Annotation()
 
 Annotation::~Annotation()
 {
-    _annotations.clear();
+     
 }
 
 uint64_t Annotation::start_sample() const
@@ -82,8 +105,9 @@ int Annotation::type() const
 
 const std::vector<QString>& Annotation::annotations() const
 {
-	return _annotations;
-}
+     return Annotation::m_resTable->GetString(_strIndex);
+} 
+ 
 
 } // namespace decode
 } // namespace data
diff --git a/DSView/pv/data/decode/annotation.h b/DSView/pv/data/decode/annotation.h
index 03e208ef..f55035b0 100755
--- a/DSView/pv/data/decode/annotation.h
+++ b/DSView/pv/data/decode/annotation.h
@@ -26,6 +26,8 @@
 
 #include <QString>
 
+class AnnotationResTable;
+
 struct srd_proto_data;
 
 namespace pv {
@@ -37,20 +39,26 @@ class Annotation
 public:
 	Annotation(const srd_proto_data *const pdata);
     Annotation();
+public:
+
     ~Annotation();
 
 	uint64_t start_sample() const;
 	uint64_t end_sample() const;
 	int format() const;
-    int type() const;
+    int type() const;  
+
+public:
 	const std::vector<QString>& annotations() const;
 
 private:
 	uint64_t _start_sample;
 	uint64_t _end_sample;
-	int _format;
-    int _type;
-	std::vector<QString> _annotations; 
+	short 	_format;
+    short 	_type;
+	short 	_strIndex;
+ 
+	static AnnotationResTable *  m_resTable;
 };
 
 } // namespace decode
diff --git a/DSView/pv/data/decode/row.h b/DSView/pv/data/decode/row.h
index 9466a68d..1b2fb84f 100755
--- a/DSView/pv/data/decode/row.h
+++ b/DSView/pv/data/decode/row.h
@@ -52,7 +52,7 @@ public:
 private:
 	const srd_decoder *_decoder;
 	const srd_decoder_annotation_row *_row;
-    int _order;
+    int _order; 
 };
 
 } // decode
diff --git a/DSView/pv/data/decoderstack.cpp b/DSView/pv/data/decoderstack.cpp
index 60bb699e..1c4f6602 100755
--- a/DSView/pv/data/decoderstack.cpp
+++ b/DSView/pv/data/decoderstack.cpp
@@ -658,7 +658,7 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
 	// Add the annotation
     boost::lock_guard<boost::recursive_mutex> lock(d->_output_mutex);
     if (!(*row_iter).second.push_annotation(a))
-        d->_no_memory = true;
+        d->_no_memory = true; 
 }
 
 void DecoderStack::on_new_frame()
diff --git a/DSView/pv/data/decoderstack.h b/DSView/pv/data/decoderstack.h
index c7baf7cc..091a9d96 100755
--- a/DSView/pv/data/decoderstack.h
+++ b/DSView/pv/data/decoderstack.h
@@ -77,9 +77,11 @@ public:
     };
 
 public:
-	DecoderStack(pv::SigSession &_session,
+   	DecoderStack(pv::SigSession &_session,
 		const srd_decoder *const decoder);
 
+public:
+
 	virtual ~DecoderStack();
 
     const std::list< boost::shared_ptr<decode::Decoder> >& stack() const;
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index 746f34f2..b585a0f9 100755
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -518,9 +518,11 @@ void MainWindow::device_attach()
 
     struct sr_dev_driver **const drivers = sr_driver_list();
     struct sr_dev_driver **driver;
+ 
     for (driver = drivers; *driver; driver++)
-        if (*driver)
-            _device_manager.driver_scan(*driver);
+         if (*driver)
+          _device_manager.driver_scan(*driver);
+
 
     _session.set_default_device(boost::bind(&MainWindow::session_error, this,
                                             QString(tr("Set Default Device failed")), _1));
diff --git a/DSView/pv/view/analogsignal.h b/DSView/pv/view/analogsignal.h
index 0555175d..94e29290 100755
--- a/DSView/pv/view/analogsignal.h
+++ b/DSView/pv/view/analogsignal.h
@@ -37,7 +37,7 @@ class AnalogSnapshot;
 
 namespace view {
 
-//when device is data acquisition model, to draw trace
+//when device is data acquisition model, to draw signal trace
 //created by SigSession
 class AnalogSignal : public Signal
 {
diff --git a/DSView/pv/view/devmode.cpp b/DSView/pv/view/devmode.cpp
index f567a7a0..572f9651 100755
--- a/DSView/pv/view/devmode.cpp
+++ b/DSView/pv/view/devmode.cpp
@@ -90,7 +90,7 @@ void DevMode::changeEvent(QEvent *event)
 }
 
 void DevMode::set_device()
-{
+{ 
     const boost::shared_ptr<device::DevInst> dev_inst = _session.get_device();
     assert(dev_inst);
    
@@ -142,7 +142,7 @@ void DevMode::set_device()
 }
 
 void DevMode::paintEvent(QPaintEvent*)
-{
+{ 
     using pv::view::Trace;
 
     QStyleOption o;
diff --git a/DSView/pv/view/devmode.h b/DSView/pv/view/devmode.h
index 999f1df0..6dc2f5d9 100755
--- a/DSView/pv/view/devmode.h
+++ b/DSView/pv/view/devmode.h
@@ -50,6 +50,7 @@ class SigSession;
 
 namespace view {
 
+//devece work mode select list
 class DevMode : public QWidget
 {
 	Q_OBJECT
diff --git a/DSView/pv/view/spectrumtrace.h b/DSView/pv/view/spectrumtrace.h
index ea78082d..7173188b 100755
--- a/DSView/pv/view/spectrumtrace.h
+++ b/DSView/pv/view/spectrumtrace.h
@@ -40,7 +40,7 @@ class SpectrumStack;
 
 namespace view {
 
-//draw Scope signal trace
+//when device is oscillcopse mode, to draw signal trace
 //created by SigSession
 class SpectrumTrace : public Trace
 {
diff --git a/DSView/pv/view/viewport.cpp b/DSView/pv/view/viewport.cpp
index e5fa036a..4646fd9d 100755
--- a/DSView/pv/view/viewport.cpp
+++ b/DSView/pv/view/viewport.cpp
@@ -157,7 +157,7 @@ void Viewport::paintEvent(QPaintEvent *event)
     BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces)
     {
         assert(t); 
-    
+  
         t->paint_back(p, 0, _view.get_view_width(), fore, back);
         if (_view.back_ready())
             break;
@@ -234,6 +234,15 @@ void Viewport::paintSignals(QPainter &p, QColor fore, QColor back)
             BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces)
             {
                 assert(t);
+
+                /*
+                auto ptr = t->get();
+                if (ptr->enabled()){
+                     ptr->paint_mid(dbp, 0, t->get_view_rect().right(), fore, back); 
+                     continue;
+                }
+               */
+
                 if (t->enabled())
                     t->paint_mid(dbp, 0, t->get_view_rect().right(), fore, back);      
             }

From ea11b484702236671fd40a341b0c677b3c48429d Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Mon, 11 Oct 2021 17:28:03 +0800
Subject: [PATCH 06/58] not change

---
 DSView/pv/data/decode/annotation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DSView/pv/data/decode/annotation.cpp b/DSView/pv/data/decode/annotation.cpp
index dbb10075..1a0c0fce 100755
--- a/DSView/pv/data/decode/annotation.cpp
+++ b/DSView/pv/data/decode/annotation.cpp
@@ -61,7 +61,7 @@ Annotation::Annotation(const srd_proto_data *const pdata) :
 	AnnotationStringList *annotationArray = NULL;
     _strIndex = Annotation::m_resTable->MakeIndex(key, annotationArray);
      
-    //save new string lines
+     //save new string lines
 	if (annotationArray){
         annotations = (char **)pda->ann_text;
 		while (*annotations)

From a80151e3c038bc7d24924c367497a01bd5e633e0 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Fri, 15 Oct 2021 17:26:50 +0800
Subject: [PATCH 07/58] able to specify the protocol's data display format, for
 bin/ocx/hex/dec/ascii..

---
 DSView/main.cpp                       |   3 +
 DSView/pv/config/appconfig.cpp        | 186 ++++++++++++++
 DSView/pv/config/appconfig.h          |  75 ++++++
 DSView/pv/data/decode/annotation.cpp  | 178 ++++++++++++-
 DSView/pv/data/decode/annotation.h    |   6 +-
 DSView/pv/data/decode/decoder.cpp     |   1 +
 DSView/pv/data/decode/decoderstatus.h |  38 +++
 DSView/pv/data/decode/row.h           |   5 +-
 DSView/pv/data/decoderstack.cpp       |   7 +-
 DSView/pv/data/decoderstack.h         |   7 +-
 DSView/pv/dialogs/dsmessagebox.cpp    |  16 +-
 DSView/pv/dialogs/dsmessagebox.h      |   6 +-
 DSView/pv/dock/protocoldock.cpp       | 344 +++++++++++---------------
 DSView/pv/dock/protocoldock.h         |  30 +--
 DSView/pv/dock/protocolitemlayer.cpp  | 152 ++++++++++++
 DSView/pv/dock/protocolitemlayer.h    |  79 ++++++
 DSView/pv/dsvdef.cpp                  |  46 ++++
 DSView/pv/dsvdef.h                    |  39 +++
 DSView/pv/mainwindow.cpp              |  14 +-
 DSView/pv/prop/binding/binding.cpp    |  14 +-
 DSView/pv/sigsession.cpp              |   7 +-
 DSView/pv/sigsession.h                |   4 +-
 DSView/pv/storesession.cpp            |   1 -
 DSView/pv/ui/msgbox.cpp               |  56 +++++
 DSView/pv/ui/msgbox.h                 |  33 +++
 DSView/pv/view/decodetrace.cpp        |  36 ++-
 DSView/pv/view/decodetrace.h          |   1 +
 27 files changed, 1126 insertions(+), 258 deletions(-)
 create mode 100644 DSView/pv/config/appconfig.cpp
 create mode 100644 DSView/pv/config/appconfig.h
 create mode 100644 DSView/pv/data/decode/decoderstatus.h
 create mode 100644 DSView/pv/dock/protocolitemlayer.cpp
 create mode 100644 DSView/pv/dock/protocolitemlayer.h
 create mode 100644 DSView/pv/dsvdef.cpp
 create mode 100644 DSView/pv/dsvdef.h
 create mode 100644 DSView/pv/ui/msgbox.cpp
 create mode 100644 DSView/pv/ui/msgbox.h

diff --git a/DSView/main.cpp b/DSView/main.cpp
index fa87b03c..1a51a86f 100755
--- a/DSView/main.cpp
+++ b/DSView/main.cpp
@@ -41,6 +41,7 @@
 #include "mystyle.h"
 #include "pv/devicemanager.h"
 #include "pv/mainframe.h"
+#include "pv/config/appconfig.h"
 
 #include "config.h"
 
@@ -186,6 +187,8 @@ int main(int argc, char *argv[])
 		// Load the protocol decoders
 		srd_decoder_load_all();
 #endif
+		//load app config
+		AppConfig::Instance().Load("./appconfig.json");
 
 		try {
 			// Create the device manager, initialise the drivers
diff --git a/DSView/pv/config/appconfig.cpp b/DSView/pv/config/appconfig.cpp
new file mode 100644
index 00000000..ac5d1c28
--- /dev/null
+++ b/DSView/pv/config/appconfig.cpp
@@ -0,0 +1,186 @@
+/*
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
+ *
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include "appconfig.h"
+#include <assert.h>
+#include <QFile>
+#include <QFileInfo>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QTextStream>
+#include <QStringList>
+
+#define MAX_PROTOCOL_FORMAT_LIST 15
+
+StringPair::StringPair(const string &key, const string &value)
+{
+    m_key = key;
+    m_value = value;
+}
+
+//------------function
+QString FormatArrayToString(vector<StringPair> &protocolFormats){
+    QString str;
+
+    for (StringPair &o : protocolFormats){
+         if (!str.isEmpty()){
+             str += ";";
+         }
+         std::string line;
+         line += o.m_key;
+         line += "=";
+         line += o.m_value;
+         str += line.c_str();
+    }
+
+    return str;
+}
+
+void StringToFormatArray(const QString &str, vector<StringPair> &protocolFormats){
+    QStringList arr = str.split(";");
+    for (int i=0; i<arr.size(); i++){
+        QString line = arr[i];
+        if (!line.isEmpty()){
+            QStringList vs = line.split("=");
+            if (vs.size() == 2){
+                protocolFormats.push_back(StringPair(vs[0].toStdString(), vs[1].toStdString()));
+            }
+        }
+    }
+}
+
+//------------AppConfig
+
+AppConfig::AppConfig()
+{
+    
+}
+
+AppConfig::~AppConfig()
+{
+}
+
+ AppConfig& AppConfig::Instance()
+ {
+     static AppConfig *ins = NULL;
+     if (ins == NULL){
+         ins = new AppConfig();
+     }
+     return *ins;
+ }
+
+bool AppConfig::Load(const char *file)
+{
+    assert(file);
+    m_fileName = file;
+
+    QFile qf(file);
+    if (qf.open(QIODevice::ReadOnly))
+    {
+        QByteArray bytes = qf.readAll();
+        qf.close();
+
+        string json;
+        json.append(bytes.data(), bytes.size());
+        FromJson(json);
+        return true;
+    }
+
+    return false;
+}
+
+bool AppConfig::Save()
+{
+    if (m_fileName != "")
+    { 
+        QFile qf(m_fileName.c_str());
+        if (qf.open(QIODevice::WriteOnly | QIODevice::Text))
+        { 
+            string json = ToJsonString();
+            QByteArray bytes(json.c_str(), json.size());
+
+            QTextStream _stream(&qf);
+            _stream.setCodec("UTF-8");
+            _stream << QString::fromUtf8(bytes);
+            qf.close();
+
+            return true;
+        }
+    }
+    return false;
+}
+
+  string AppConfig::ToJsonString()
+  {
+      QJsonObject jobj; 
+      QString  profomats = FormatArrayToString(m_protocolFormats);
+      jobj["ProtocolFormats"] = QJsonValue::fromVariant(profomats);
+
+      QJsonDocument jdoc(jobj);
+      QByteArray bytes = jdoc.toJson();
+      string json;
+      json.append(bytes.data(), bytes.size());
+      return json;  
+  }
+
+  void AppConfig::FromJson(string &json)
+  {
+      if (!json.size())
+        return;
+
+      QByteArray bytes(json.c_str(), json.size());
+      QJsonDocument jdoc = QJsonDocument::fromJson(bytes);
+      QJsonObject jobj = jdoc.object();
+
+      if (jobj.contains("ProtocolFormats")){
+          m_protocolFormats.clear();
+          StringToFormatArray(jobj["ProtocolFormats"].toString(), m_protocolFormats);
+      } 
+  }
+
+void AppConfig::SetProtocolFormat(const string &protocolName, const string &value)
+{
+    for (StringPair &o : m_protocolFormats){
+        if (o.m_key == protocolName){
+            o.m_value = value;
+            return;
+        }    
+    }
+    if (m_protocolFormats.size() > MAX_PROTOCOL_FORMAT_LIST){
+        while (m_protocolFormats.size() < MAX_PROTOCOL_FORMAT_LIST)
+        {
+           m_protocolFormats.erase(m_protocolFormats.begin());
+        }
+    }
+
+    m_protocolFormats.push_back(StringPair(protocolName,value));    
+}
+
+string AppConfig::GetProtocolFormat(const string &protocolName)
+{
+     for (StringPair &o : m_protocolFormats){
+        if (o.m_key == protocolName){ 
+            return o.m_value;
+        }
+    }
+    return "";
+}
diff --git a/DSView/pv/config/appconfig.h b/DSView/pv/config/appconfig.h
new file mode 100644
index 00000000..ec2b2ee1
--- /dev/null
+++ b/DSView/pv/config/appconfig.h
@@ -0,0 +1,75 @@
+/*
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
+ *
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+using namespace std;
+
+struct app_status{
+
+
+};
+
+
+class StringPair
+{
+public:
+   StringPair(const string &key, const string &value);
+   string m_key;
+   string m_value;
+};
+
+class config_data
+{
+  public:
+
+    
+};
+
+class AppConfig
+{
+private:
+  AppConfig();
+
+  ~AppConfig();
+
+public:
+  static AppConfig &Instance();
+  bool Load(const char *file);
+  bool Save();
+  string ToJsonString();
+  void FromJson(string &json);
+
+  void SetProtocolFormat(const string &protocolName, const string &value);
+  string GetProtocolFormat(const string &protocolName);  
+
+public:
+  config_data m_data;
+  app_status  m_status;
+
+private:
+  string m_fileName;
+  vector<StringPair> m_protocolFormats;
+};
diff --git a/DSView/pv/data/decode/annotation.cpp b/DSView/pv/data/decode/annotation.cpp
index 1a0c0fce..c0838d04 100755
--- a/DSView/pv/data/decode/annotation.cpp
+++ b/DSView/pv/data/decode/annotation.cpp
@@ -27,7 +27,91 @@
 #include "annotation.h"
 #include "AnnotationResTable.h"
 #include <cstring>
- 
+#include <assert.h>
+#include <string.h>
+#include "../../config/appconfig.h"
+#include "decoderstatus.h"
+#include "../../dsvdef.h"
+
+#define DECODER_MAX_DATA_BLOCK_LEN 300
+#define FORMAT_TMP_BUFFER_SIZE 1200
+
+const char g_bin_cvt_table[] = "0000000100100011010001010110011110001001101010111100110111101111";
+char g_bin_format_tmp_buffer[FORMAT_TMP_BUFFER_SIZE + 3];
+char g_oct_format_tmp_buffer[FORMAT_TMP_BUFFER_SIZE + 6];
+std::vector<QString> g_format_ret_vector;
+
+char* bin2oct_string(char *buf, int size, const char *bin, int len){
+	char *wr = buf + size - 1;
+	*wr = 0; //end flag
+
+	char *rd = (char*)bin + len - 1; //move to last byte
+
+	char tmp[3]; 
+
+	while (rd >= bin && wr > buf)
+	{  
+		wr--;
+
+		int num = 0;
+
+		while (rd >= bin && num < 3)
+		{
+			tmp[2-num] = *rd;			 
+			rd--;
+			num++;
+		}
+
+		//fill
+		while (num < 3)
+		{
+			tmp[2-num] = '0';
+			++num;
+		}
+		
+
+	    if (strncmp(tmp, "000", 3) == 0)
+			*wr = '0';
+		else if (strncmp(tmp, "001", 3) == 0)
+			*wr = '1';
+		else if (strncmp(tmp, "010", 3) == 0)
+			*wr = '2';
+		else if (strncmp(tmp, "011", 3) == 0)
+			*wr = '3';
+		else if (strncmp(tmp, "100", 3) == 0)
+			*wr = '4';
+		else if (strncmp(tmp, "101", 3) == 0)
+			*wr = '5';
+		else if (strncmp(tmp, "110", 3) == 0)
+			*wr = '6';
+		else if (strncmp(tmp, "111", 3) == 0)
+			*wr = '7';
+	} 
+
+	return wr;
+}
+
+long long bin2long_string(const char *bin, int len)
+{
+	char *rd = (char *)bin + len - 1; //move to last byte
+	int dex = 0;
+	long long value = 0;
+	long long bv = 0;
+
+    while (rd >= bin)
+	{
+		if (*rd == '1')
+		{
+			bv = 1 << dex;
+			value += bv;
+		}
+		rd--;
+		++dex;
+	}
+
+	return value;
+}
+
 namespace pv {
 namespace data {
 namespace decode {
@@ -35,7 +119,7 @@ namespace decode {
 //a find talbe instance
 AnnotationResTable *Annotation::m_resTable = new AnnotationResTable();
 
-Annotation::Annotation(const srd_proto_data *const pdata) :
+Annotation::Annotation(const srd_proto_data *const pdata, DecoderStatus *status) :
 	_start_sample(pdata->start_sample),
 	_end_sample(pdata->end_sample)
 {
@@ -45,7 +129,13 @@ Annotation::Annotation(const srd_proto_data *const pdata) :
 	assert(pda);
 
     _format = pda->ann_class;
-    _type = pda->ann_type; 
+    _type = pda->ann_type;
+	_status = status;
+
+	//have numerical
+	if (_type >= 100 && _type < 200){
+		 status->m_bNumerical = true;
+	}
 
 	_strIndex = 0;
 
@@ -105,7 +195,87 @@ int Annotation::type() const
 
 const std::vector<QString>& Annotation::annotations() const
 {
-     return Annotation::m_resTable->GetString(_strIndex);
+	 assert(_status);
+
+     int fmt = _status->m_format;
+     const std::vector<QString>& vct = Annotation::m_resTable->GetString(_strIndex);
+
+     if (!(_type >= 100 && _type < 200) || fmt == DecoderDataFormat::ascii || fmt == DecoderDataFormat::hex){
+        return vct;
+     }
+	 if (vct.size() != 1){
+		 return vct;
+	 }
+
+	 //flow, convert to oct\dec\bin format
+	 const char *data = vct[0].toStdString().c_str();
+	 if (*data == 0 || *data == '['){
+		 return vct;
+	 }
+	
+	 //convert to bin format
+	 char *buf = g_bin_format_tmp_buffer + FORMAT_TMP_BUFFER_SIZE;
+	 *(buf + 1) = 0; //set the end flag
+	 *buf = 0;
+
+	 int len = strlen(data);
+	  //buffer is not enough
+	 if (len > DECODER_MAX_DATA_BLOCK_LEN){
+		 return vct;
+	 }
+
+     char *rd = (char*)data + len - 1; //move to last byte
+	 char c = 0;
+	 int dex = 0;
+
+	 while (rd >= data)
+	 {
+		 c = *rd;
+		 dex = (int)(c <= '9' ? (c - '0') : (c - 'A' + 10));
+         char *ptable = (char*)g_bin_cvt_table + dex * 4;
+
+		 buf -= 4; //move to left for 4 bytes
+		 buf[0] = ptable[0];
+		 buf[1] = ptable[1];
+		 buf[2] = ptable[2];
+		 buf[3] = ptable[3];
+	
+		 rd--;
+	 }
+	 
+	 std::vector<QString> &vct2 = g_format_ret_vector;
+	 if (vct2.size() == 0){
+		 vct2.push_back(QString());
+	 }
+
+	 //get bin format 
+	 if (fmt == DecoderDataFormat::bin){
+		 vct2[0].clear();
+		 vct2[0].append(buf);
+		 return vct2;
+	 }
+
+	 //get oct format
+	 if (fmt == DecoderDataFormat::oct){
+		 char *oct_buf = bin2oct_string(g_oct_format_tmp_buffer, 
+		                  sizeof(g_oct_format_tmp_buffer), buf,  len * 4);
+		 vct2[0].clear();
+		 vct2[0].append(oct_buf);
+		 return vct2;
+	 }
+
+	//64 bit integer
+	 if (fmt == DecoderDataFormat::dec && len * 4 <= 64){
+         long long lv = bin2long_string(buf, len *4);
+		 char vbuf[30] = {0};
+    	 sprintf(vbuf, "%lld", lv);
+
+		 vct2[0].clear();
+		 vct2[0].append(vbuf);
+		 return vct2;
+	 }
+
+	 return vct2;
 } 
  
 
diff --git a/DSView/pv/data/decode/annotation.h b/DSView/pv/data/decode/annotation.h
index f55035b0..d45d0e5b 100755
--- a/DSView/pv/data/decode/annotation.h
+++ b/DSView/pv/data/decode/annotation.h
@@ -27,6 +27,7 @@
 #include <QString>
 
 class AnnotationResTable;
+class DecoderStatus;
 
 struct srd_proto_data;
 
@@ -37,7 +38,7 @@ namespace decode {
 class Annotation
 {
 public:
-	Annotation(const srd_proto_data *const pdata);
+	Annotation(const srd_proto_data *const pdata, DecoderStatus *status);
     Annotation();
 public:
 
@@ -55,8 +56,9 @@ private:
 	uint64_t _start_sample;
 	uint64_t _end_sample;
 	short 	_format;
-    short 	_type;
+    short 	_type; //100-199: is a numerical value type,can show hex/oct format
 	short 	_strIndex;
+	DecoderStatus *_status;
  
 	static AnnotationResTable *  m_resTable;
 };
diff --git a/DSView/pv/data/decode/decoder.cpp b/DSView/pv/data/decode/decoder.cpp
index 486340cc..94d1efe3 100755
--- a/DSView/pv/data/decode/decoder.cpp
+++ b/DSView/pv/data/decode/decoder.cpp
@@ -109,6 +109,7 @@ uint64_t Decoder::decode_end() const
     return _decode_end;
 }
 
+//apply setting
 bool Decoder::commit()
 {
     if (_setted) {
diff --git a/DSView/pv/data/decode/decoderstatus.h b/DSView/pv/data/decode/decoderstatus.h
new file mode 100644
index 00000000..d80780b3
--- /dev/null
+++ b/DSView/pv/data/decode/decoderstatus.h
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the PulseView project.
+ *
+ * Copyright (C) 2013 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2014 DreamSourceLab <support@dreamsourcelab.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#pragma once
+
+class DecoderStatus
+{
+public:
+    DecoderStatus()
+    {
+        m_bNumerical = false;
+        m_format = 0;
+        sdr_decoder_handle = NULL;
+    }
+
+public:
+    bool m_bNumerical; //when decoder get any numerical data,it will be set
+    int  m_format; //protocol format code
+    void *sdr_decoder_handle;
+};
\ No newline at end of file
diff --git a/DSView/pv/data/decode/row.h b/DSView/pv/data/decode/row.h
index 1b2fb84f..d6fa4ac6 100755
--- a/DSView/pv/data/decode/row.h
+++ b/DSView/pv/data/decode/row.h
@@ -36,12 +36,15 @@ class Row
 {
 public:
 	Row();
-    ~Row();
 
 	Row(const srd_decoder *decoder,
         const srd_decoder_annotation_row *row = NULL,
         const int order = -1);
 
+public:
+	
+    ~Row(); 
+
 	const srd_decoder* decoder() const;
 	const srd_decoder_annotation_row* row() const;
 
diff --git a/DSView/pv/data/decoderstack.cpp b/DSView/pv/data/decoderstack.cpp
index 1c4f6602..7f946dd1 100755
--- a/DSView/pv/data/decoderstack.cpp
+++ b/DSView/pv/data/decoderstack.cpp
@@ -53,7 +53,7 @@ const unsigned int DecoderStack::DecodeNotifyPeriod = 1024;
 boost::mutex DecoderStack::_global_decode_mutex;
 
 DecoderStack::DecoderStack(pv::SigSession &session,
-	const srd_decoder *const dec) :
+	const srd_decoder *const dec, DecoderStatus *decoder_status) :
 	_session(session),
 	_sample_count(0),
 	_frame_complete(false),
@@ -73,6 +73,8 @@ DecoderStack::DecoderStack(pv::SigSession &session,
     _stack.push_back(boost::shared_ptr<decode::Decoder>(
 		new decode::Decoder(dec)));
 
+        _decoder_status = decoder_status;
+
     build_row();
 }
 
@@ -612,6 +614,7 @@ uint64_t DecoderStack::sample_rate() const
     return _samplerate;
 }
 
+//the decode callback, annotation object will be create
 void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
 {
 	assert(pdata);
@@ -626,7 +629,7 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
         return;
     }
 
-	const Annotation a(pdata);
+    const Annotation a(pdata, d->_decoder_status);
 
 	// Find the row
 	assert(pdata->pdo);
diff --git a/DSView/pv/data/decoderstack.h b/DSView/pv/data/decoderstack.h
index 091a9d96..311a819f 100755
--- a/DSView/pv/data/decoderstack.h
+++ b/DSView/pv/data/decoderstack.h
@@ -36,10 +36,12 @@
 #include "../data/decode/rowdata.h"
 #include "../data/signaldata.h"
 
+class DecoderStatus;
+
 namespace DecoderStackTest {
 class TwoDecoderStack;
 }
-
+ 
 namespace pv {
 
 class SigSession;
@@ -78,7 +80,7 @@ public:
 
 public:
    	DecoderStack(pv::SigSession &_session,
-		const srd_decoder *const decoder);
+		const srd_decoder *const decoder, DecoderStatus *decoder_status);
 
 public:
 
@@ -203,6 +205,7 @@ private:
     bool _no_memory;
 
     int64_t _mark_index;
+    DecoderStatus *_decoder_status;
 
 	friend class DecoderStackTest::TwoDecoderStack;
 };
diff --git a/DSView/pv/dialogs/dsmessagebox.cpp b/DSView/pv/dialogs/dsmessagebox.cpp
index 70445d7e..6a2a225d 100755
--- a/DSView/pv/dialogs/dsmessagebox.cpp
+++ b/DSView/pv/dialogs/dsmessagebox.cpp
@@ -32,9 +32,10 @@
 namespace pv {
 namespace dialogs {
 
-DSMessageBox::DSMessageBox(QWidget *parent) :
+DSMessageBox::DSMessageBox(QWidget *parent,const char *title) :
     QDialog(parent),
-    _moving(false)
+    _moving(false),
+    _clickType(0)
 {
     setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);
     setAttribute(Qt::WA_TranslucentBackground);
@@ -53,7 +54,14 @@ DSMessageBox::DSMessageBox(QWidget *parent) :
     _msg->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);
 
     _titlebar = new toolbars::TitleBar(false, this);
-    _titlebar->setTitle(tr("Message"));
+
+    if (title){ 
+        _titlebar->setTitle(QString(title));
+    }
+    else{
+        _titlebar->setTitle(tr("Message"));
+    }
+   
     _titlebar->installEventFilter(this);
 
     mlayout->addWidget(_titlebar);
@@ -120,6 +128,8 @@ int DSMessageBox::exec()
 void DSMessageBox::on_button(QAbstractButton *btn)
 {
     QMessageBox::ButtonRole role = _msg->buttonRole(btn);
+    _clickType  = (int)role;
+    
     if (role == QMessageBox::AcceptRole)
         accept();
     else
diff --git a/DSView/pv/dialogs/dsmessagebox.h b/DSView/pv/dialogs/dsmessagebox.h
index 5fc2ea30..fa6a8dfb 100755
--- a/DSView/pv/dialogs/dsmessagebox.h
+++ b/DSView/pv/dialogs/dsmessagebox.h
@@ -38,10 +38,13 @@ class DSMessageBox : public QDialog
 	Q_OBJECT
 
 public:
-    DSMessageBox(QWidget *parent);
+    DSMessageBox(QWidget *parent, const char *title=0);
+
     QMessageBox *mBox();
 
     int exec();
+    
+    inline int GetLastClick(){return _clickType;}
 
 protected:
     void accept();
@@ -60,6 +63,7 @@ private:
     toolbars::TitleBar *_titlebar;
     bool _moving;
     QPoint _startPos;
+    int _clickType;
 };
 
 } // namespace dialogs
diff --git a/DSView/pv/dock/protocoldock.cpp b/DSView/pv/dock/protocoldock.cpp
index 2039c9da..a811218e 100755
--- a/DSView/pv/dock/protocoldock.cpp
+++ b/DSView/pv/dock/protocoldock.cpp
@@ -26,8 +26,7 @@
 #include "../data/decodermodel.h"
 #include "../data/decoderstack.h"
 #include "../dialogs/protocollist.h"
-#include "../dialogs/protocolexp.h"
-#include "../dialogs/dsmessagebox.h"
+#include "../dialogs/protocolexp.h" 
 #include "../view/view.h"
 
 #include <QObject>
@@ -44,14 +43,19 @@
 #include <QProgressDialog>
 #include <QtConcurrent/QtConcurrent>
 #include <QSizePolicy>
+#include <assert.h>
 
 #include <boost/foreach.hpp>
 #include <boost/shared_ptr.hpp>
 #include <algorithm>
+#include "../ui/msgbox.h"
+#include "../dsvdef.h"
+#include "../config/appconfig.h"
+#include "../data/decode/decoderstatus.h"
 
 namespace pv {
 namespace dock {
-
+   
 ProtocolDock::ProtocolDock(QWidget *parent, view::View &view, SigSession &session) :
     QScrollArea(parent),
     _session(session),
@@ -90,12 +94,7 @@ ProtocolDock::ProtocolDock(QWidget *parent, view::View &view, SigSession &sessio
     hori_layout->addWidget(_del_all_button);
     hori_layout->addWidget(_protocol_combobox);
     hori_layout->addStretch(1);
-
-    connect(_add_button, SIGNAL(clicked()),
-            this, SLOT(add_protocol()));
-    connect(_del_all_button, SIGNAL(clicked()),
-            this, SLOT(del_protocol()));
-
+ 
     _up_layout = new QVBoxLayout();
     _up_layout->addLayout(hori_layout);
     _up_layout->addStretch(1);
@@ -111,18 +110,12 @@ ProtocolDock::ProtocolDock(QWidget *parent, view::View &view, SigSession &sessio
 
     _dn_set_button = new QPushButton(_dn_widget);
     _dn_set_button->setFlat(true);
-    connect(_dn_set_button, SIGNAL(clicked()),
-            this, SLOT(set_model()));
 
     _dn_save_button = new QPushButton(_dn_widget);
-    _dn_save_button->setFlat(true);
-    connect(_dn_save_button, SIGNAL(clicked()),
-            this, SLOT(export_table_view()));
+    _dn_save_button->setFlat(true);   
 
     _dn_nav_button = new QPushButton(_dn_widget);
-    _dn_nav_button->setFlat(true);
-    connect(_dn_nav_button, SIGNAL(clicked()),
-            this, SLOT(nav_table_view()));
+    _dn_nav_button->setFlat(true);  
 
     QHBoxLayout *dn_title_layout = new QHBoxLayout();
     _dn_title_label = new QLabel(_dn_widget);
@@ -142,10 +135,6 @@ ProtocolDock::ProtocolDock(QWidget *parent, view::View &view, SigSession &sessio
 
     _pre_button = new QPushButton(_dn_widget);
     _nxt_button = new QPushButton(_dn_widget);
-    connect(_pre_button, SIGNAL(clicked()),
-            this, SLOT(search_pre()));
-    connect(_nxt_button, SIGNAL(clicked()),
-            this, SLOT(search_nxt()));
 
     _search_button = new QPushButton(this);
     _search_button->setFixedWidth(_search_button->height());
@@ -194,6 +183,20 @@ ProtocolDock::ProtocolDock(QWidget *parent, view::View &view, SigSession &sessio
     //_split_widget->setGeometry(0, 0, sizeHint().width(), 500);
     _split_widget->setObjectName("protocolWidget");
 
+    connect(_dn_nav_button, SIGNAL(clicked()),this, SLOT(nav_table_view()));
+
+    connect(_dn_save_button, SIGNAL(clicked()),this, SLOT(export_table_view()));
+
+    connect(_dn_set_button, SIGNAL(clicked()),this, SLOT(set_model()));
+
+    connect(_pre_button, SIGNAL(clicked()),this, SLOT(search_pre()));
+
+    connect(_nxt_button, SIGNAL(clicked()),this, SLOT(search_nxt()));
+
+    connect(_add_button, SIGNAL(clicked()),this, SLOT(on_add_protocol()));
+
+    connect(_del_all_button, SIGNAL(clicked()),this, SLOT(on_del_all_protocol()));
+
     connect(&_session, SIGNAL(decode_done()), this, SLOT(update_model()));
     connect(this, SIGNAL(protocol_updated()), this, SLOT(update_model()));
     connect(_table_view, SIGNAL(clicked(QModelIndex)), this, SLOT(item_clicked(QModelIndex)));
@@ -206,6 +209,11 @@ ProtocolDock::ProtocolDock(QWidget *parent, view::View &view, SigSession &sessio
 
 ProtocolDock::~ProtocolDock()
 {
+    //destroy protocol item layers
+   for (auto it = _protocolItems.begin(); it != _protocolItems.end(); it++){
+       delete (*it);
+   }
+   _protocolItems.clear();
 }
 
 void ProtocolDock::changeEvent(QEvent *event)
@@ -237,21 +245,13 @@ void ProtocolDock::reStyle()
     _nxt_button->setIcon(QIcon(iconPath+"/next.svg"));
     _search_button->setIcon(QIcon(iconPath+"/search.svg"));
 
-    for (QVector <QPushButton *>::const_iterator i = _del_button_list.begin();
-         i != _del_button_list.end(); i++)
-        (*i)->setIcon(QIcon(iconPath+"/del.svg"));
-
-    for (QVector <QPushButton *>::const_iterator i = _set_button_list.begin();
-         i != _set_button_list.end(); i++)
-        (*i)->setIcon(QIcon(iconPath+"/gear.svg"));
+    for (auto it = _protocolItems.begin(); it != _protocolItems.end(); it++){
+       (*it)->ResetStyle();
+    } 
 }
 
 void ProtocolDock::paintEvent(QPaintEvent *)
-{
-//    QStyleOption opt;
-//    opt.init(this);
-//    QPainter p(this);
-//    style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
+{ 
 }
 
 void ProtocolDock::resizeEvent(QResizeEvent *event)
@@ -298,179 +298,72 @@ bool ProtocolDock::sel_protocol(QString id)
         return false;
 }
 
-void ProtocolDock::add_protocol()
+void ProtocolDock::on_add_protocol()
 {
     add_protocol(false);
 }
 
 void ProtocolDock::add_protocol(bool silent)
-{
-    if (_session.get_device()->dev_inst()->mode != LOGIC) {
-        dialogs::DSMessageBox msg(this);
-        msg.mBox()->setText(tr("Protocol Analyzer"));
-        msg.mBox()->setInformativeText(tr("Protocol Analyzer is only valid in Digital Mode!"));
-        msg.mBox()->setStandardButtons(QMessageBox::Ok);
-        msg.mBox()->setIcon(QMessageBox::Warning);
-        msg.exec();
-    } else {
-        srd_decoder *const decoder =
-            (srd_decoder*)(_protocol_combobox->itemData(_protocol_combobox->currentIndex())).value<void*>();
-        if (_session.add_decoder(decoder, silent)) {
-            //std::list <int > _sel_probes = dlg.get_sel_probes();
-            //QMap <QString, QVariant>& _options = dlg.get_options();
-            //QMap <QString, int> _options_index = dlg.get_options_index();
+{    
+    if (_session.get_device()->dev_inst()->mode != LOGIC) {         
+        MsgBox::Show(NULL, "Protocol Analyzer\nProtocol Analyzer is only valid in Digital Mode!", this);
+        return;
+    } 
 
-            QString iconPath = ":/icons/" + qApp->property("Style").toString();
-            QPushButton *_del_button = new QPushButton(_up_widget);
-            QPushButton *_set_button = new QPushButton(_up_widget);
-            _del_button->setFlat(true);
-            _del_button->setIcon(QIcon(iconPath+"/del.svg"));
-            _set_button->setFlat(true);
-            _set_button->setIcon(QIcon(iconPath+"/gear.svg"));
-            QLabel *_protocol_label = new QLabel(_up_widget);
-            QLabel *_progress_label = new QLabel(_up_widget);
+    srd_decoder *const decoder = 
+          (srd_decoder *)(_protocol_combobox->itemData(_protocol_combobox->currentIndex())).value<void *>();
 
-            _del_button->setCheckable(true);
-            _protocol_label->setText(_protocol_combobox->currentText());
+    DecoderStatus *dstatus = new DecoderStatus();
+    dstatus->m_format = (int)DecoderDataFormat::hex;
 
-            connect(_del_button, SIGNAL(clicked()),
-                    this, SLOT(del_protocol()));
-            connect(_set_button, SIGNAL(clicked()),
-                    this, SLOT(rst_protocol()));
+    if (_session.add_decoder(decoder, silent, dstatus))
+    {
+        //crate item layer
+        QString protocolName = _protocol_combobox->currentText();
+        ProtocolItemLayer *layer = new ProtocolItemLayer(_up_widget, protocolName, this);
+        _protocolItems.push_back(layer);
+        _up_layout->insertLayout(_protocolItems.size(), layer);
+        layer->m_decoderStatus = dstatus;
 
-            _del_button_list.push_back(_del_button);
-            _set_button_list.push_back(_set_button);
-            _protocol_label_list.push_back(_protocol_label);
-            _progress_label_list.push_back(_progress_label);
-            _protocol_index_list.push_back(_protocol_combobox->currentIndex());
-
-            QHBoxLayout *hori_layout = new QHBoxLayout();
-            hori_layout->addWidget(_set_button);
-            hori_layout->addWidget(_del_button);
-            hori_layout->addWidget(_protocol_label);
-            hori_layout->addWidget(_progress_label);
-            hori_layout->addStretch(1);
-            _hori_layout_list.push_back(hori_layout);
-            _up_layout->insertLayout(_del_button_list.size(), hori_layout);
-
-            // progress connection
-            const std::vector< boost::shared_ptr<pv::view::DecodeTrace> > decode_sigs(
-                _session.get_decode_signals());
-            connect(decode_sigs.back().get(), SIGNAL(decoded_progress(int)), this, SLOT(decoded_progress(int)));
-
-            protocol_updated();
+        //set current protocol format
+        string fmt = AppConfig::Instance().GetProtocolFormat(protocolName.toStdString());
+        if (fmt != ""){
+            layer->SetProtocolFormat(fmt.c_str());
+             dstatus->m_format = DecoderDataFormat::Parse(fmt.c_str());
         }
+
+        //progress connection
+        const std::vector<boost::shared_ptr<pv::view::DecodeTrace>> decode_sigs(_session.get_decode_signals());
+
+        connect(decode_sigs.back().get(), SIGNAL(decoded_progress(int)), this, SLOT(decoded_progress(int)));
+
+        protocol_updated(); 
     }
 }
+ 
+ void ProtocolDock::on_del_all_protocol(){
+     if (_protocolItems.size() == 0){
+        MsgBox::Show(NULL, "No Protocol Analyzer to delete!", this);
+        return;
+     }
 
-void ProtocolDock::rst_protocol()
-{
-    int rst_index = 0;
-    for (QVector <QPushButton *>::const_iterator i = _set_button_list.begin();
-         i != _set_button_list.end(); i++) {
-        QPushButton *button = qobject_cast<QPushButton *>(sender());
-        if ((*i) == button) {
-            //pv::decoder::DemoConfig dlg(this, _session.get_device(), _protocol_index_list.at(rst_index));
-            //dlg.set_config(_session.get_decode_probes(rst_index), _session.get_decode_options_index(rst_index));
-            //if (dlg.exec()) {
-                //std::list <int > _sel_probes = dlg.get_sel_probes();
-                //QMap <QString, QVariant>& _options = dlg.get_options();
-                //QMap <QString, int> _options_index = dlg.get_options_index();
-
-                //_session.rst_protocol_analyzer(rst_index, _sel_probes, _options, _options_index);
-            //}
-            _session.rst_decoder(rst_index);
-            break;
-        }
-        rst_index++;
+    if (MsgBox::Confirm("Are you sure to remove all protocol analyzer?", this)){
+         del_all_protocol();
     }
-    protocol_updated();
-}
-
-void ProtocolDock::del_protocol()
-{
-    if (_del_all_button->isChecked()) {
-        _del_all_button->setChecked(false);
-        if (_hori_layout_list.size() > 0) {
-            int del_index = 0;
-            for (QVector <QHBoxLayout *>::const_iterator i = _hori_layout_list.begin();
-                 i != _hori_layout_list.end(); i++) {
-                _up_layout->removeItem((*i));
-                delete (*i);
-                delete _del_button_list.at(del_index);
-                delete _set_button_list.at(del_index);
-                delete _protocol_label_list.at(del_index);
-                delete _progress_label_list.at(del_index);
-
-                _session.remove_decode_signal(0);
-                del_index++;
-            }
-            _hori_layout_list.clear();
-            _del_button_list.clear();
-            _set_button_list.clear();
-            _protocol_label_list.clear();
-            _progress_label_list.clear();
-            _protocol_index_list.clear();
-        } else {
-            dialogs::DSMessageBox msg(NULL);
-            msg.mBox()->setText(tr("Protocol Analyzer"));
-            msg.mBox()->setInformativeText(tr("No Protocol Analyzer to delete!"));
-            msg.mBox()->setStandardButtons(QMessageBox::Ok);
-            msg.mBox()->setIcon(QMessageBox::Warning);
-            msg.exec();
-        }
-    } else {
-       int del_index = 0;
-       for (QVector <QPushButton *>::const_iterator i = _del_button_list.begin();
-            i != _del_button_list.end(); i++) {
-           if ((*i)->isChecked()) {
-               _up_layout->removeItem(_hori_layout_list.at(del_index));
-
-               delete _hori_layout_list.at(del_index);
-               delete _del_button_list.at(del_index);
-               delete _set_button_list.at(del_index);
-               delete _protocol_label_list.at(del_index);
-               delete _progress_label_list.at(del_index);
-
-               _hori_layout_list.remove(del_index);
-               _del_button_list.remove(del_index);
-               _set_button_list.remove(del_index);
-               _protocol_label_list.remove(del_index);
-               _progress_label_list.remove(del_index);
-               _protocol_index_list.remove(del_index);
-
-               _session.remove_decode_signal(del_index);
-               break;
-           }
-           del_index++;
-       }
-    }
-    protocol_updated();
-}
+ }
+ 
 
 void ProtocolDock::del_all_protocol()
-{
-    if (_hori_layout_list.size() > 0) {
-        int del_index = 0;
-        for (QVector <QHBoxLayout *>::const_iterator i = _hori_layout_list.begin();
-             i != _hori_layout_list.end(); i++) {
-            _up_layout->removeItem((*i));
-            delete (*i);
-            delete _del_button_list.at(del_index);
-            delete _set_button_list.at(del_index);
-            delete _protocol_label_list.at(del_index);
-            delete _progress_label_list.at(del_index);
-
+{  
+    if (_protocolItems.size() > 0)
+    {
+        for (auto it = _protocolItems.begin(); it != _protocolItems.end(); it++)
+        {
+            _up_layout->removeItem((*it));
+            delete (*it); //destory control
             _session.remove_decode_signal(0);
-            del_index++;
         }
-        _hori_layout_list.clear();
-        _del_button_list.clear();
-        _set_button_list.clear();
-        _protocol_label_list.clear();
-        _progress_label_list.clear();
-        _protocol_index_list.clear();
-
+        _protocolItems.clear();
         protocol_updated();
     }
 }
@@ -484,20 +377,33 @@ void ProtocolDock::decoded_progress(int progress)
     const std::vector< boost::shared_ptr<pv::view::DecodeTrace> > decode_sigs(
         _session.get_decode_signals());
     int index = 0;
+
     BOOST_FOREACH(boost::shared_ptr<pv::view::DecodeTrace> d, decode_sigs) {
         pg = d->get_progress();
         if (d->decoder()->out_of_memory())
             err = tr("(Out of Memory)");
-        QString progress_str = QString::number(pg) + "%" + err;
-        if (pg == 100)
-            _progress_label_list.at(index)->setStyleSheet("color:green;");
-        else
-            _progress_label_list.at(index)->setStyleSheet("color:red;");
-        _progress_label_list.at(index)->setText(progress_str);
+
+        if (index < _protocolItems.size())
+        {
+            ProtocolItemLayer &lay =  *(_protocolItems.at(index));
+            lay.SetProgress(pg, err);
+
+            //when decode complete, check data format
+            if (pg == 100)
+            {
+              // bool flag = ((DecoderStatus*)lay.m_decoderStatus)->m_bNumerical;
+              // lay.LoadFormatSelect(!flag);
+              // QString &protocolName = lay.GetProtocolName();
+              // lay.SetProtocolFormat(protocolName.toStdString().c_str());
+            }
+        }
+
         index++;
     }
-    if (pg == 0 || pg % 10 == 1)
-        update_model();
+
+    if (pg == 0 || pg % 10 == 1){
+         update_model();
+    }  
 }
 
 void ProtocolDock::set_model()
@@ -836,6 +742,52 @@ void ProtocolDock::search_update()
     //search_done();
 }
 
+ //-------------------IProtocolItemLayerCallback
+void ProtocolDock::OnProtocolSetting(void *handle){
+     int dex = 0;
+    for (auto it = _protocolItems.begin(); it != _protocolItems.end(); it++){
+       if ((*it) == handle){
+           _session.rst_decoder(dex);         
+            protocol_updated();
+           break;
+       }
+       dex++;
+   }
+}
+
+void ProtocolDock::OnProtocolDelete(void *handle){
+    if (!MsgBox::Confirm("Are you sure to remove this protocol analyzer?", this)){
+         return;
+    }
+
+     int dex = 0;
+     for (auto it = _protocolItems.begin(); it != _protocolItems.end(); it++){
+       if ((*it) == handle){
+           delete (*it);
+           _up_layout->removeItem((*it)); //remove child control
+           _protocolItems.remove(dex);
+           _session.remove_decode_signal(dex);
+            protocol_updated();
+           break;
+       }
+       dex++;
+   }
+}
+
+void ProtocolDock::OnProtocolFormatChanged(QString format, void *handle){
+    for (auto it = _protocolItems.begin(); it != _protocolItems.end(); it++){
+       if ((*it) == handle){
+           QString &name = (*it)->GetProtocolName();
+           AppConfig::Instance().SetProtocolFormat(name.toStdString(), format.toStdString());
+           AppConfig::Instance().Save();
+           (*it)->m_decoderStatus->m_format = DecoderDataFormat::Parse(format.toStdString().c_str());
+           protocol_updated();
+           break;
+       }
+   }
+} 
+//-------------------------
+
 
 } // namespace dock
 } // namespace pv
diff --git a/DSView/pv/dock/protocoldock.h b/DSView/pv/dock/protocoldock.h
index f5bc4534..d0d35af8 100755
--- a/DSView/pv/dock/protocoldock.h
+++ b/DSView/pv/dock/protocoldock.h
@@ -41,11 +41,11 @@
 #include <boost/thread.hpp>
 
 #include "../data/decodermodel.h"
-
+#include "protocolitemlayer.h"
 namespace pv {
 
 class SigSession;
-
+  
 namespace data {
 class DecoderModel;
 }
@@ -55,8 +55,8 @@ class View;
 }
 
 namespace dock {
-
-class ProtocolDock : public QScrollArea
+  
+class ProtocolDock : public QScrollArea,public IProtocolItemLayerCallback
 {
     Q_OBJECT
 
@@ -79,13 +79,18 @@ protected:
     void paintEvent(QPaintEvent *);
     void resizeEvent(QResizeEvent *);
 
+private:
+    //IProtocolItemLayerCallback
+    void OnProtocolSetting(void *handle);
+    void OnProtocolDelete(void *handle);
+    void OnProtocolFormatChanged(QString format, void *handle);
+
 signals:
     void protocol_updated();
 
 private slots:
-    void add_protocol();
-    void rst_protocol();
-    void del_protocol();
+    void on_add_protocol(); 
+    void on_del_all_protocol();
     void decoded_progress(int progress);
     void set_model();
     void update_model();
@@ -125,19 +130,14 @@ private:
 
     QPushButton *_add_button;
     QPushButton *_del_all_button;
-    QComboBox *_protocol_combobox;
-    QVector <QPushButton *> _del_button_list;
-    QVector <QPushButton *> _set_button_list;
-    QVector <QLabel *> _protocol_label_list;
-    QVector <QLabel *> _progress_label_list;
-    QVector <int > _protocol_index_list;
-    QVector <QHBoxLayout *> _hori_layout_list;
+    QComboBox *_protocol_combobox; 
+    QVector <int > _protocol_index_list; 
     QVBoxLayout *_up_layout;
+    QVector <ProtocolItemLayer*> _protocolItems; //protocol item layers
 
     QPushButton *_dn_set_button;
     QPushButton *_dn_save_button;
     QPushButton *_dn_nav_button;
-
     QPushButton *_search_button;
 
     mutable boost::mutex _search_mutex;
diff --git a/DSView/pv/dock/protocolitemlayer.cpp b/DSView/pv/dock/protocolitemlayer.cpp
new file mode 100644
index 00000000..1a0996e1
--- /dev/null
+++ b/DSView/pv/dock/protocolitemlayer.cpp
@@ -0,0 +1,152 @@
+/*
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
+ *
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include "protocolitemlayer.h"
+#include "../dsvdef.h"
+#include <QtCore> 
+#include <assert.h>
+ 
+namespace pv {
+namespace dock {
+
+ProtocolItemLayer::ProtocolItemLayer(QWidget *parent, QString protocolName, IProtocolItemLayerCallback *callback){
+        assert(parent);
+        assert(callback);
+
+        m_callback = callback;
+        _protocolName = protocolName;
+        m_bSetting = false;
+
+        _protocol_label = new QLabel(parent);
+        _progress_label = new QLabel(parent);
+        _set_button = new QPushButton(parent);
+        _del_button = new QPushButton(parent);
+        _format_combox = new QComboBox(parent);
+
+        QString iconPath = ":/icons/" + qApp->property("Style").toString();
+        _del_button->setFlat(true);
+        _del_button->setIcon(QIcon(iconPath + "/del.svg"));
+        _set_button->setFlat(true);
+        _set_button->setIcon(QIcon(iconPath + "/gear.svg"));
+        _protocol_label->setText(protocolName);
+
+        m_singleFlag = true;
+        m_decoderStatus = NULL;
+
+        LoadFormatSelect(false);
+ 
+        QHBoxLayout *hori_layout = this;
+        hori_layout->addWidget(_set_button);
+        hori_layout->addWidget(_del_button);
+        hori_layout->addWidget(_format_combox);
+        hori_layout->addWidget(_protocol_label);
+        hori_layout->addWidget(_progress_label);      
+
+        hori_layout->addStretch(1);
+
+        connect(_del_button, SIGNAL(clicked()),this, SLOT(on_del_protocol()));
+        
+        connect(_set_button, SIGNAL(clicked()),this, SLOT(on_set_protocol()));
+
+        connect(_format_combox, SIGNAL(currentIndexChanged(int)),this, SLOT(on_format_select_changed(int)));
+}
+
+ProtocolItemLayer::~ProtocolItemLayer(){
+        DESTROY_OBJECT(_set_button);
+        DESTROY_OBJECT(_del_button);
+        DESTROY_OBJECT(_protocol_label);
+        DESTROY_OBJECT(_progress_label);
+        DESTROY_OBJECT(_format_combox);
+}
+
+//-------------control event
+void ProtocolItemLayer::on_set_protocol()
+{
+    m_callback->OnProtocolSetting(this);
+}
+
+void ProtocolItemLayer::on_del_protocol(){
+    m_callback->OnProtocolDelete(this);
+}
+
+void ProtocolItemLayer::on_format_select_changed(int index){
+    if (index >= 0 && !m_bSetting){
+        QString text = _format_combox->currentText();
+        m_callback->OnProtocolFormatChanged(text, this);
+    } 
+}
+//-----------------
+
+ void ProtocolItemLayer::SetProgress(int progress, QString text){
+      QString str = QString::number(progress) + "%" + text;
+
+       if (progress == 100)
+            _progress_label->setStyleSheet("color:green;");
+        else
+            _progress_label->setStyleSheet("color:red;");
+        _progress_label->setText(str);
+ }
+
+void ProtocolItemLayer::ResetStyle(){
+    QString iconPath = ":/icons/" + qApp->property("Style").toString();
+     _del_button->setIcon(QIcon(iconPath + "/del.svg"));
+    _set_button->setIcon(QIcon(iconPath + "/gear.svg"));
+}
+
+void ProtocolItemLayer::LoadFormatSelect(bool bSingle)
+{
+    if (bSingle == m_singleFlag){
+        return;
+    }
+    m_singleFlag = bSingle;
+
+    m_bSetting = true;
+    _format_combox->clear();
+    _format_combox->addItem("ascii");
+    int dex = 0;
+
+    if (!bSingle)
+    {
+        _format_combox->addItem("dec");
+        _format_combox->addItem("hex");
+        _format_combox->addItem("oct");
+        _format_combox->addItem("bin");
+        dex = 2;
+    }
+    
+    _format_combox->setCurrentIndex(dex);
+    m_bSetting = false;
+}
+
+ void ProtocolItemLayer::SetProtocolFormat(const char *format)
+ {
+     assert(format);
+
+     m_bSetting = true;
+     int dex = DecoderDataFormat::Parse(format);
+     if (dex < (int)_format_combox->count()){
+         _format_combox->setCurrentIndex(dex);
+     }
+     m_bSetting = false;
+ }
+
+} //dock
+} //pv
diff --git a/DSView/pv/dock/protocolitemlayer.h b/DSView/pv/dock/protocolitemlayer.h
new file mode 100644
index 00000000..9f4c8b62
--- /dev/null
+++ b/DSView/pv/dock/protocolitemlayer.h
@@ -0,0 +1,79 @@
+/*
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
+ *
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#pragma once
+
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QComboBox>
+#include <QLabel>
+#include <QComboBox>
+#include <QString>
+
+class DecoderStatus;
+ 
+namespace pv{
+namespace dock{
+
+class IProtocolItemLayerCallback
+ {
+    public:
+        virtual void OnProtocolSetting(void *handle)=0;
+        virtual void OnProtocolDelete(void *handle)=0;
+        virtual void OnProtocolFormatChanged(QString format, void *handle)=0;
+};
+
+class ProtocolItemLayer: public QHBoxLayout
+{
+    Q_OBJECT
+
+public:
+    ProtocolItemLayer(QWidget *parent, QString protocolName, IProtocolItemLayerCallback *callback);
+    ~ProtocolItemLayer();
+
+    void SetProgress(int progress, QString text);
+    void ResetStyle();
+    void LoadFormatSelect(bool bSingle);
+    inline QString &GetProtocolName(){return _protocolName;}
+    void SetProtocolFormat(const char *format);
+
+private slots: 
+    void on_set_protocol(); 
+    void on_del_protocol();
+    void on_format_select_changed(int index);
+
+public:
+    DecoderStatus *m_decoderStatus; //DecoderStatus
+  
+private:
+    QLabel *_protocol_label;
+    QLabel *_progress_label;
+    QPushButton *_set_button;
+    QPushButton *_del_button;
+    QComboBox  *_format_combox;
+    IProtocolItemLayerCallback *m_callback;
+    QString _protocolName;
+    bool    m_bSetting;
+    bool    m_singleFlag;
+};
+
+ } //dock
+} //pv
diff --git a/DSView/pv/dsvdef.cpp b/DSView/pv/dsvdef.cpp
new file mode 100644
index 00000000..c6478b51
--- /dev/null
+++ b/DSView/pv/dsvdef.cpp
@@ -0,0 +1,46 @@
+/*
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
+ *
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include "dsvdef.h"
+#include <string.h>
+
+namespace DecoderDataFormat
+{
+      int Parse(const char *name){
+        if (strcmp(name, "ascii") == 0){
+            return (int)ascii;
+        }
+        if (strcmp(name, "dec") == 0){
+            return (int)dec;
+        }
+         if (strcmp(name, "hex") == 0){
+            return (int)hex;
+        }
+         if (strcmp(name, "oct") == 0){
+            return (int)oct;
+        }
+         if (strcmp(name, "bin") == 0){
+            return (int)bin;
+        }
+        return (int)ascii;
+    }
+}
diff --git a/DSView/pv/dsvdef.h b/DSView/pv/dsvdef.h
new file mode 100644
index 00000000..2647f613
--- /dev/null
+++ b/DSView/pv/dsvdef.h
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
+ *
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#pragma once
+ 
+#define DESTROY_OBJECT(p) if ((p)){delete (p); p = NULL;}
+
+namespace DecoderDataFormat
+{
+    enum _data_format
+    {
+        ascii = 0,
+        dec,
+        hex,
+        oct,
+        bin
+    };
+
+    int Parse(const char *name);       
+}
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index b585a0f9..06c30bc9 100755
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -90,6 +90,7 @@
 #include <glib.h>
 #include <list>
 #include <libusb.h>
+#include "../ui/msgbox.h"
 
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
@@ -938,12 +939,7 @@ bool MainWindow::load_session_json(QJsonDocument json, bool file_dev)
     const sr_dev_inst *const sdi = _session.get_device()->dev_inst();
     if ((!file_dev && strcmp(sdi->driver->name, sessionObj["Device"].toString().toUtf8()) != 0) ||
         sdi->mode != sessionObj["DeviceMode"].toDouble()) {
-        dialogs::DSMessageBox msg(this);
-        msg.mBox()->setText(tr("Session Error"));
-        msg.mBox()->setInformativeText(tr("Session File is not compatible with current device or mode!"));
-        msg.mBox()->setStandardButtons(QMessageBox::Ok);
-        msg.mBox()->setIcon(QMessageBox::Warning);
-        msg.exec();
+        MsgBox::Show(NULL, "Session File is not compatible with current device or mode!", this);
         return false;
     }
 
@@ -1128,12 +1124,6 @@ bool MainWindow::store_session(QString name)
 {
     QFile sessionFile(name);
     if (!sessionFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
-//        dialogs::DSMessageBox msg(this);
-//        msg.mBox()->setText(tr("File Error"));
-//        msg.mBox()->setInformativeText(tr("Couldn't open session file to write!"));
-//        msg.mBox()->setStandardButtons(QMessageBox::Ok);
-//        msg.mBox()->setIcon(QMessageBox::Warning);
-//        msg.exec();
         qDebug("Warning: Couldn't open session file to write!");
         return false;
     }
diff --git a/DSView/pv/prop/binding/binding.cpp b/DSView/pv/prop/binding/binding.cpp
index c5252716..db9a0453 100755
--- a/DSView/pv/prop/binding/binding.cpp
+++ b/DSView/pv/prop/binding/binding.cpp
@@ -56,12 +56,18 @@ void Binding::add_properties_to_form(QFormLayout *layout,
     {
         assert(p);
 
-        QWidget *const widget = p->get_widget(layout->parentWidget(),
-            auto_commit);
+        QWidget *const widget = p->get_widget(layout->parentWidget(), auto_commit);
+
         if (p->labeled_widget())
             layout->addRow(widget);
-        else
-            layout->addRow(p->label(), widget);
+        else{
+            const QString &lbstr = p->label();
+            //remove data format options
+            if (lbstr == "Data format"){
+                continue;                
+            }   
+            layout->addRow(p->label(), widget);             
+        } 
     }
 }
 
diff --git a/DSView/pv/sigsession.cpp b/DSView/pv/sigsession.cpp
index df1afdc0..1912088f 100755
--- a/DSView/pv/sigsession.cpp
+++ b/DSView/pv/sigsession.cpp
@@ -66,6 +66,7 @@
 #include <QtConcurrent/QtConcurrent>
 
 #include <boost/foreach.hpp>
+#include "data/decode/decoderstatus.h"
 
 //using boost::dynamic_pointer_cast;
 //using boost::function;
@@ -1366,8 +1367,8 @@ uint16_t SigSession::get_ch_num(int type)
 }
 
 #ifdef ENABLE_DECODE
-bool SigSession::add_decoder(srd_decoder *const dec, bool silent)
-{
+bool SigSession::add_decoder(srd_decoder *const dec, bool silent, DecoderStatus *dstatus)
+{ 
     bool ret = false;
     map<const srd_channel*, int> probes;
     boost::shared_ptr<data::DecoderStack> decoder_stack;
@@ -1377,7 +1378,7 @@ bool SigSession::add_decoder(srd_decoder *const dec, bool silent)
 
         // Create the decoder
         decoder_stack = boost::shared_ptr<data::DecoderStack>(
-            new data::DecoderStack(*this, dec));
+            new data::DecoderStack(*this, dec, dstatus));
 
         // Make a list of all the probes
         std::vector<const srd_channel*> all_probes;
diff --git a/DSView/pv/sigsession.h b/DSView/pv/sigsession.h
index 0f9d46ca..c895c07e 100755
--- a/DSView/pv/sigsession.h
+++ b/DSView/pv/sigsession.h
@@ -55,6 +55,8 @@
 struct srd_decoder;
 struct srd_channel;
 
+class DecoderStatus;
+
 namespace pv {
 
 class DeviceManager;
@@ -178,7 +180,7 @@ public:
         get_group_signals();
 
 #ifdef ENABLE_DECODE
-    bool add_decoder(srd_decoder *const dec, bool silent);
+    bool add_decoder(srd_decoder *const dec, bool silent, DecoderStatus *dstatus);
 
     std::vector< boost::shared_ptr<view::DecodeTrace> >
         get_decode_signals() const;
diff --git a/DSView/pv/storesession.cpp b/DSView/pv/storesession.cpp
index 18ad1bd5..e77345bd 100755
--- a/DSView/pv/storesession.cpp
+++ b/DSView/pv/storesession.cpp
@@ -346,7 +346,6 @@ void StoreSession::save_proc(shared_ptr<data::Snapshot> snapshot)
                 if (ret != SR_OK) {
                     if (!_has_error) {
                         _has_error = true;
-                        auto err = m_zipDoc.GetError();
                         _error = tr("Failed to create zip file. Please check write permission of this path.");
                     }
                     progress_updated();
diff --git a/DSView/pv/ui/msgbox.cpp b/DSView/pv/ui/msgbox.cpp
new file mode 100644
index 00000000..4c9a6357
--- /dev/null
+++ b/DSView/pv/ui/msgbox.cpp
@@ -0,0 +1,56 @@
+/*
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
+ *
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+#include "msgbox.h"
+#include "../dialogs/dsmessagebox.h"
+#include <assert.h>
+#include <QMessageBox>
+#include <QString>
+
+//QMessageBox::information(NULL, "Title", "Content",QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
+//QMessageBox::information(NULL, "Title", "Content",QMessageBox::Yes|QMessageBox::No);
+//QMessageBox::information(NULL, "Title", "Content");
+//QMessageBox::information(NULL, "Title", "Content",QMessageBox::Yes|QMessageBox::No|QMessageBox::Abort);
+
+void MsgBox::Show(const char *title, const char *text, QWidget *parent)
+{
+    assert(text);
+
+    pv::dialogs::DSMessageBox msg(parent, title);
+     msg.mBox()->setText(QString(text));
+   // msg.mBox()->setInformativeText(QString(text));
+    msg.mBox()->setStandardButtons(QMessageBox::Ok);
+    msg.mBox()->setIcon(QMessageBox::Warning);
+    msg.exec();
+}
+
+bool MsgBox::Confirm(const char *text, QWidget *parent)
+{
+    assert(text);
+
+    pv::dialogs::DSMessageBox msg(parent, "Question");
+    msg.mBox()->setText(QString(text));
+    msg.mBox()->setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+    msg.mBox()->setIcon(QMessageBox::Question);
+    msg.exec();
+    int click = msg.GetLastClick();
+    return (click == (int)QMessageBox::YesRole);
+}
diff --git a/DSView/pv/ui/msgbox.h b/DSView/pv/ui/msgbox.h
new file mode 100644
index 00000000..7b725158
--- /dev/null
+++ b/DSView/pv/ui/msgbox.h
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
+ *
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#pragma once
+
+class QWidget;
+
+class MsgBox
+{
+public:
+    static void Show(const char *title, const char *text, QWidget *parent=0);
+
+    static bool Confirm(const char *text, QWidget *parent=0);
+};
\ No newline at end of file
diff --git a/DSView/pv/view/decodetrace.cpp b/DSView/pv/view/decodetrace.cpp
index 733497fb..e44f1dce 100755
--- a/DSView/pv/view/decodetrace.cpp
+++ b/DSView/pv/view/decodetrace.cpp
@@ -52,10 +52,11 @@
 #include "../device/devinst.h"
 #include "../view/cursor.h"
 #include "../toolbars/titlebar.h"
+#include "../dsvdef.h"
 
 using namespace boost;
 using namespace std;
-
+ 
 namespace pv {
 namespace view {
 
@@ -138,14 +139,20 @@ DecodeTrace::DecodeTrace(pv::SigSession &session,
         this, SLOT(on_new_decode_data()));
     connect(_decoder_stack.get(), SIGNAL(decode_done()),
         this, SLOT(on_decode_done()));
+
+        _start_comboBox = NULL;
+        _end_comboBox = NULL; 
+        _pub_input_layer = NULL;
 }
 
 DecodeTrace::~DecodeTrace()
 {
-    if (_popup_form)
-        delete _popup_form;
-    if (_popup)
-        delete _popup;
+    DESTROY_OBJECT(_start_comboBox);
+    DESTROY_OBJECT(_end_comboBox); 
+    DESTROY_OBJECT(_pub_input_layer);
+    DESTROY_OBJECT(_popup_form);
+    DESTROY_OBJECT(_popup);
+
     _cur_row_headings.clear();
     _decoder_forms.clear();
     _probe_selectors.clear();
@@ -342,6 +349,7 @@ void DecodeTrace::paint_fore(QPainter &p, int left, int right, QColor fore, QCol
     (void)back;
 }
 
+//to show decoder's property setting dialog
 bool DecodeTrace::create_popup()
 {
     int ret = false;
@@ -363,10 +371,12 @@ bool DecodeTrace::create_popup()
         }
     }
 
-    delete _popup_form;
-    delete _popup;
-    _popup = NULL;
-    _popup_form = NULL;
+    //destroy object   
+    DESTROY_OBJECT(_start_comboBox);
+    DESTROY_OBJECT(_end_comboBox);  
+    DESTROY_OBJECT(_pub_input_layer);
+    DESTROY_OBJECT(_popup_form);
+    DESTROY_OBJECT(_popup);
 
     return ret;
 }
@@ -409,7 +419,7 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
 
     if (stack.empty()) {
 		QLabel *const l = new QLabel(
-			tr("<p><i>No decoders in the stack</i></p>"));
+			tr("<p><i>No decoders in the stack</i></p>")); 
 		l->setAlignment(Qt::AlignCenter);
 		form->addRow(l);
     } else {
@@ -422,7 +432,11 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
 			tr("<i>* Required channels</i>"), parent));
 	}
 
-    // Add region combobox
+    //public input layer
+   // QFormLayout *publay =  new QFormLayout();
+   // form->addRow(publay); 
+
+    //Add region combobox
     _start_comboBox = new QComboBox(parent);
     _end_comboBox = new QComboBox(parent);
     _start_comboBox->addItem(RegionStart);
diff --git a/DSView/pv/view/decodetrace.h b/DSView/pv/view/decodetrace.h
index 1fcb1257..924cf333 100755
--- a/DSView/pv/view/decodetrace.h
+++ b/DSView/pv/view/decodetrace.h
@@ -213,6 +213,7 @@ private:
     int _start_index, _end_index;
     int _start_count, _end_count;
     QComboBox *_start_comboBox, *_end_comboBox;
+	QFormLayout *_pub_input_layer;
     int _progress;
 
 	std::list< boost::shared_ptr<pv::prop::binding::DecoderOptions> >

From 3de6eb1ada82438453310cbb9cadca4bb0cdef6d Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Tue, 19 Oct 2021 16:17:46 +0800
Subject: [PATCH 08/58] optimize save session speed

---
 DSView/main.cpp             |    5 +-
 DSView/pv/ZipMaker.cpp      |  312 +++--
 DSView/pv/ZipMaker.h        |   53 +-
 DSView/pv/minizip/crypt.h   |  131 +++
 DSView/pv/minizip/ioapi.c   |  247 ++++
 DSView/pv/minizip/ioapi.h   |  208 ++++
 DSView/pv/minizip/iowin32.c |  462 ++++++++
 DSView/pv/minizip/iowin32.h |   28 +
 DSView/pv/minizip/miniunz.c |  660 +++++++++++
 DSView/pv/minizip/minizip.c |  520 +++++++++
 DSView/pv/minizip/mztools.c |  291 +++++
 DSView/pv/minizip/mztools.h |   37 +
 DSView/pv/minizip/unzip.c   | 2125 +++++++++++++++++++++++++++++++++++
 DSView/pv/minizip/unzip.h   |  437 +++++++
 DSView/pv/minizip/zip.c     | 2007 +++++++++++++++++++++++++++++++++
 DSView/pv/minizip/zip.h     |  362 ++++++
 DSView/pv/storesession.cpp  |    8 +-
 17 files changed, 7755 insertions(+), 138 deletions(-)
 create mode 100644 DSView/pv/minizip/crypt.h
 create mode 100644 DSView/pv/minizip/ioapi.c
 create mode 100644 DSView/pv/minizip/ioapi.h
 create mode 100644 DSView/pv/minizip/iowin32.c
 create mode 100644 DSView/pv/minizip/iowin32.h
 create mode 100644 DSView/pv/minizip/miniunz.c
 create mode 100644 DSView/pv/minizip/minizip.c
 create mode 100644 DSView/pv/minizip/mztools.c
 create mode 100644 DSView/pv/minizip/mztools.h
 create mode 100644 DSView/pv/minizip/unzip.c
 create mode 100644 DSView/pv/minizip/unzip.h
 create mode 100644 DSView/pv/minizip/zip.c
 create mode 100644 DSView/pv/minizip/zip.h

diff --git a/DSView/main.cpp b/DSView/main.cpp
index 1a51a86f..04ad160e 100755
--- a/DSView/main.cpp
+++ b/DSView/main.cpp
@@ -42,7 +42,6 @@
 #include "pv/devicemanager.h"
 #include "pv/mainframe.h"
 #include "pv/config/appconfig.h"
-
 #include "config.h"
 
 char DS_RES_PATH[256];
@@ -58,10 +57,10 @@ void usage()
 		"  -V, --version                   Show release version\n"
 		"  -h, -?, --help                  Show help option\n"
 		"\n", DS_BIN_NAME, DS_DESCRIPTION);
-}
+} 
 
 int main(int argc, char *argv[])
-{
+{  
 	int ret = 0;
 	struct sr_context *sr_ctx = NULL;
 	const char *open_file = NULL;
diff --git a/DSView/pv/ZipMaker.cpp b/DSView/pv/ZipMaker.cpp
index cdda2d33..69f6ef0d 100644
--- a/DSView/pv/ZipMaker.cpp
+++ b/DSView/pv/ZipMaker.cpp
@@ -21,20 +21,23 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "ZipMaker.h"
-#include <zip.h>
-#include <stdio.h>
+#include "ZipMaker.h" 
 #include <assert.h>
 #include <malloc.h>
-#include <errno.h>
 #include <string.h>
+#include <sys/stat.h>
+#include <time.h>
+
+#include "minizip/zip.h"
+#include "minizip/unzip.h"
 
   
 ZipMaker::ZipMaker() :
-    m_docSource(NULL),
-    m_errobj(NULL)
+    m_zDoc(NULL)
 {
-    m_error[0] = 0;   
+    m_error[0] = 0; 
+    m_opt_compress_level = Z_DEFAULT_COMPRESSION;
+    m_zi = NULL;
 }
 
 ZipMaker::~ZipMaker()
@@ -42,116 +45,78 @@ ZipMaker::~ZipMaker()
     Release();
 }
 
-bool ZipMaker::CreateNew()
+bool ZipMaker::CreateNew(const char *fileName, bool bAppend)
 {
+     assert(fileName);
+
      Release();
-
-     m_errobj = new zip_error_t();
-     zip_error_init(m_errobj);
-
-     if ((m_docSource = zip_source_buffer_create(NULL, 0, 0, m_errobj)) == NULL) {
-        sprintf(m_error, "can't create source: %s", zip_error_strerror(m_errobj));
-    }
  
-    return m_docSource != NULL;
+     m_zDoc = zipOpen64(fileName, bAppend); 
+     if (m_zDoc == NULL) {
+        strcpy(m_error, "zipOpen64 error");
+    } 
+
+//make zip inner file time 
+    m_zi = new zip_fileinfo();
+
+    time_t rawtime;
+    time (&rawtime);
+    struct tm *tinf= localtime(&rawtime);
+
+    struct tm &ti = *tinf;
+    zip_fileinfo &zi= *(zip_fileinfo*)m_zi;
+
+    zi.tmz_date.tm_year = ti.tm_year;
+    zi.tmz_date.tm_mon  = ti.tm_mon;
+    zi.tmz_date.tm_mday = ti.tm_mday;
+    zi.tmz_date.tm_hour = ti.tm_hour;
+    zi.tmz_date.tm_min  = ti.tm_min;
+    zi.tmz_date.tm_sec  = ti.tm_sec;
+    zi.dosDate = 0;
+      
+    return m_zDoc != NULL;
 }
 
 void ZipMaker::Release()
-{
-     if (m_errobj){
-        zip_error_fini(m_errobj); //release the error obj
-        delete m_errobj;
-        m_errobj = NULL;
-    }
-
-    if (m_docSource){
-       zip_source_free(m_docSource);
-       m_docSource = NULL;
+{  
+    if (m_zDoc){
+       zipClose((zipFile)m_zDoc, NULL);
+       m_zDoc = NULL;       
+   }
+   if (m_zi){
+       delete ((zip_fileinfo*)m_zi);
+       m_zi = NULL;
    }
 }
 
-bool ZipMaker::SaveToFile(const char *fileName){
-    assert(fileName);
-    assert(m_docSource); 
-
-    zip_stat_t zst;
-    if (zip_source_stat(m_docSource, &zst) < 0) {
-        sprintf(m_error, "can't stat source: %s\n", zip_error_strerror(zip_source_error(m_docSource)));
-        return 1;
-    }
-
-    long long size = zst.size;
-    void *data = NULL;
-    FILE *fp = NULL;
-    bool  berr = false;
-
-    if (zip_source_open(m_docSource) < 0) {
-        sprintf(m_error, "can't open source: %s\n", zip_error_strerror(zip_source_error(m_docSource)));
-        return false;
-    }
-    if (!berr && (data = malloc(size)) == NULL) {
-        sprintf(m_error, "malloc failed: %s\n", strerror(errno));
-        berr = true;
-    }
-
-    if ((zip_uint64_t)zip_source_read(m_docSource, data, size) < size) {
-        sprintf(m_error, "can't read data from source: %s\n", zip_error_strerror(zip_source_error(m_docSource)));
-        berr = true;
-    }
-
-    if (!berr && (fp = fopen(fileName, "wb")) == NULL) {
-        sprintf(m_error, "can't open %s: %s\n", fileName, strerror(errno));
-        berr = true;
-    }
-    if (!berr && fwrite(data, 1, size, fp) < size) {
-        sprintf(m_error, "can't write %s: %s\n", fileName, strerror(errno));
-        berr = true;
-        fclose(fp);
-    }
-    if (!berr && fclose(fp) < 0) {
-        sprintf(m_error, "can't write %s: %s\n", fileName, strerror(errno));
-        berr = true;
-    }
-
-    zip_source_close(m_docSource);
-    if (data){
-        free(data);
-    }        
-
-    return !berr;
+bool ZipMaker::Close(){
+    if (m_zDoc){
+       zipClose((zipFile)m_zDoc, NULL);
+       m_zDoc = NULL;
+       return true;
+   }
+   return false;     
 }
 
-bool ZipMaker::AddFromBuffer(const char *innerFile, const char *buffer, int buferSize)
+bool ZipMaker::AddFromBuffer(const char *innerFile, const char *buffer, unsigned int buferSize)
 {
     assert(buffer);
     assert(innerFile);
-    assert(m_docSource); 
+    assert(m_zDoc);   
+    int level = m_opt_compress_level;
 
-    zip_t *zip_archive = zip_open_from_source(m_docSource, 0, m_errobj);
-    if (zip_archive == NULL)
-    {
-         sprintf(m_error, "can't open zip from source: %s", zip_error_strerror(m_errobj));
-         return false;
+    if (level < Z_DEFAULT_COMPRESSION  || level > Z_BEST_COMPRESSION){
+        level = Z_DEFAULT_COMPRESSION;
     }
 
-   zip_source_keep(m_docSource);
+    zipOpenNewFileInZip((zipFile)m_zDoc,innerFile,(zip_fileinfo*)m_zi,
+                                NULL,0,NULL,0,NULL ,
+                                Z_DEFLATED,
+                                level);
 
-   zip_source_t *src = zip_source_buffer(zip_archive, buffer, buferSize, 0);
-   if (src == NULL){
-       sprintf(m_error, "zip_source_buffer error: %s", zip_error_strerror(zip_source_error(m_docSource)));
-       return false;
-   }
+    zipWriteInFileInZip((zipFile)m_zDoc, buffer, (unsigned int)buferSize);
 
-    if (zip_file_add(zip_archive, innerFile, src, ZIP_FL_OVERWRITE) == -1)
-    {
-        sprintf(m_error, "zip_file_add error: %s", zip_error_strerror(zip_source_error(m_docSource)));
-        return false;
-    }
-
-    if (zip_close(zip_archive) < 0) {
-          sprintf(m_error, "zip_close'%s'", zip_strerror(zip_archive));
-          return false;
-    }
+    zipCloseFileInZip((zipFile)m_zDoc);
 
     return true;
 }
@@ -159,36 +124,41 @@ bool ZipMaker::AddFromBuffer(const char *innerFile, const char *buffer, int bufe
 bool ZipMaker::AddFromFile(const char *localFile, const char *innerFile)
 {
     assert(localFile);
-    assert(innerFile);
-    assert(m_docSource); 
 
-    zip_t *zip_archive = zip_open_from_source(m_docSource, 0, m_errobj);
-    if (zip_archive == NULL)
-    {
-         sprintf(m_error, "can't open zip from source: %s", zip_error_strerror(m_errobj));
-         return false;
-    }
-    
-    zip_source_keep(m_docSource);
-  
-    zip_source_t  *src = zip_source_file(zip_archive, localFile, 0, -1);
-    if (src == NULL){
-        sprintf(m_error, "zip_source_buffer error: %s\n", zip_error_strerror(zip_source_error(m_docSource)));
+    struct stat st;
+    FILE *fp;
+    char *data = NULL;
+    long long size = 0;
+
+    if ((fp = fopen(localFile, "rb")) == NULL) {
+        strcpy(m_error, "fopen error");        
         return false;
     }
 
-    if (zip_add(zip_archive, innerFile, src) == -1)
-    {
-        sprintf(m_error, "zip_file_add error: %s\n", zip_error_strerror(zip_source_error(m_docSource)));
+    if (fstat(fileno(fp), &st) < 0) {
+        strcpy(m_error, "fstat error");    
+        fclose(fp);
+        return -1;
+    } 
+
+    if ((data = (char*)malloc((size_t)st.st_size)) == NULL) {
+        strcpy(m_error, "can't malloc buffer");
+        fclose(fp);
         return false;
     }
 
-     if (zip_close(zip_archive) < 0) {
-          sprintf(m_error, "zip_close'%s'", zip_strerror(zip_archive));
-          return false;
+    if (fread(data, 1, (size_t)st.st_size, fp) < (size_t)st.st_size) {
+        strcpy(m_error, "fread error");
+        free(data);
+        fclose(fp);
+        return false;
     }
 
-    return true;
+    fclose(fp);
+    size = (size_t)st.st_size;
+
+    bool ret = AddFromBuffer(innerFile, data, size);
+    return ret;
 }
 
 const char *ZipMaker::GetError()
@@ -197,3 +167,107 @@ const char *ZipMaker::GetError()
         return m_error;
     return NULL;
 }
+
+
+//------------------------ZipDecompress
+  ZipDecompress::ZipDecompress()
+  {
+      m_uzDoc = NULL;
+      m_curIndex = 0;
+      m_fileCount = 0;
+      m_bufferSize = 0;
+      m_buffer = NULL;
+  }
+
+  ZipDecompress::~ZipDecompress()
+  {
+      Close();    
+  }
+
+  bool ZipDecompress::Open(const char *fileName)
+  {
+      assert(fileName);
+      m_uzDoc = unzOpen64(fileName);
+
+      if (m_uzDoc){
+          m_uzi = new unz_file_info64();
+          unz_global_info64 inf;
+          unzGetGlobalInfo64((unzFile)m_uzDoc, &inf);
+          m_fileCount = (int)inf.number_entry;
+      }
+      return m_uzDoc != NULL;
+  }
+
+  void ZipDecompress::Close()
+  {
+      if (m_uzDoc)
+      {
+          unzClose((unzFile)m_uzDoc);
+          m_uzDoc = NULL;
+      }
+      if (m_uzi){
+          delete ((unz_file_info64*)m_uzi);
+          m_uzi = NULL;
+      }
+      if (m_buffer){
+          free(m_buffer);
+          m_buffer = NULL;
+      }
+  }
+
+  bool ZipDecompress::ReadNextFileData(UnZipFileInfo &inf)
+{
+    assert(m_uzDoc);
+
+    if (m_curIndex >= m_fileCount){
+        strcpy(m_error, "read index is last");
+        return false;
+    }
+    m_curIndex++;
+ 
+    int ret = unzGetCurrentFileInfo64((unzFile)m_uzDoc, (unz_file_info64*)m_uzi, inf.inFileName, 256, NULL, 0, NULL, 0);
+    if (ret != UNZ_OK){
+        strcpy(m_error, "unzGetCurrentFileInfo64 error");
+        return false;
+     }
+     unz_file_info64 &uzinf = *(unz_file_info64*)m_uzi;
+     inf.dataLen = uzinf.uncompressed_size;
+     inf.inFileNameLen = uzinf.size_filename;
+
+     // need malloc memory buffer
+     if (m_buffer == NULL || inf.dataLen > m_bufferSize){
+         if (m_buffer) free(m_buffer);
+         m_buffer = NULL;
+
+         m_buffer = malloc(inf.dataLen + 10);
+         if (m_buffer == NULL){
+             strcpy(m_error, "malloc get null");
+            return false;
+         }
+     }
+
+     inf.pData = m_buffer; 
+
+     unzOpenCurrentFile((unzFile)m_uzDoc);
+
+     //read file data to buffer
+     void *buf = inf.pData;
+     long long buflen = inf.dataLen;
+     long long rdlen = 0;
+
+    while (rdlen < inf.dataLen)
+    {
+        int dlen = unzReadCurrentFile((unzFile)m_uzDoc, buf, buflen);
+        if (dlen == 0){
+            break;
+        }
+        rdlen += dlen;
+        buf = buf + dlen; //move pointer
+        buflen = inf.dataLen - rdlen;
+    } 
+ 
+     unzCloseCurrentFile((unzFile)m_uzDoc);
+     unzGoToNextFile((unzFile)m_uzDoc);
+
+     return true;
+}
diff --git a/DSView/pv/ZipMaker.h b/DSView/pv/ZipMaker.h
index 2e988c12..703c440d 100644
--- a/DSView/pv/ZipMaker.h
+++ b/DSView/pv/ZipMaker.h
@@ -22,14 +22,17 @@
 
 //test git 2
 
-#pragma once
+#pragma once 
 
-struct  zip_source;
-struct  zip_error;
-
-typedef struct zip_source zip_archive_source_t;
-typedef struct zip_error zip_err_t;
+typedef struct
+{
+    char  inFileName[256];
+    int   inFileNameLen;
+    void *pData;
+    long long dataLen;
+} UnZipFileInfo;
 
+ 
 class ZipMaker
 {
 public:
@@ -38,16 +41,16 @@ public:
     ~ZipMaker();
 
     //create new zip archive in the memory
-    bool CreateNew();
+    bool CreateNew(const char *fileName, bool bAppend);
 
     //free the source
     void Release();
 
     //save data to file
-    bool SaveToFile(const char *fileName);
+    bool Close();
 
     //add a inner file from  buffer
-    bool AddFromBuffer(const char *innerFile, const char *buffer, int buferSize);
+    bool AddFromBuffer(const char *innerFile, const char *buffer, unsigned int buferSize);
 
     //add a inner file from local file
     bool AddFromFile(const char *localFile, const char *innerFile);
@@ -55,8 +58,34 @@ public:
     //get the last error
     const char *GetError();
 
+public:
+    int m_opt_compress_level;
+
 private:
-    zip_archive_source_t    *m_docSource; //zip file handle
-    zip_err_t               *m_errobj;
-    char                     m_error[500];
+    void    *m_zDoc; //zip file handle
+    void    *m_zi; //life must as m_zDoc; 
+    char     m_error[500];
+};
+
+class ZipDecompress
+{
+public:
+    ZipDecompress();
+
+    ~ZipDecompress();
+
+    bool Open(const char *fileName);
+
+    void Close();
+
+    bool ReadNextFileData(UnZipFileInfo &inf);
+
+private:
+    void    *m_uzDoc;
+    void    *m_uzi;
+    int      m_fileCount;
+    int      m_curIndex;
+    char     m_error[500];
+    void    *m_buffer; // file read buffer
+    long long m_bufferSize;
 };
diff --git a/DSView/pv/minizip/crypt.h b/DSView/pv/minizip/crypt.h
new file mode 100644
index 00000000..1e9e8200
--- /dev/null
+++ b/DSView/pv/minizip/crypt.h
@@ -0,0 +1,131 @@
+/* crypt.h -- base code for crypt/uncrypt ZIPfile
+
+
+   Version 1.01e, February 12th, 2005
+
+   Copyright (C) 1998-2005 Gilles Vollant
+
+   This code is a modified version of crypting code in Infozip distribution
+
+   The encryption/decryption parts of this source code (as opposed to the
+   non-echoing password parts) were originally written in Europe.  The
+   whole source package can be freely distributed, including from the USA.
+   (Prior to January 2000, re-export from the US was a violation of US law.)
+
+   This encryption code is a direct transcription of the algorithm from
+   Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
+   file (appnote.txt) is distributed with the PKZIP program (even in the
+   version without encryption capabilities).
+
+   If you don't need crypting in your application, just define symbols
+   NOCRYPT and NOUNCRYPT.
+
+   This code support the "Traditional PKWARE Encryption".
+
+   The new AES encryption added on Zip format by Winzip (see the page
+   http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong
+   Encryption is not supported.
+*/
+
+#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
+
+/***********************************************************************
+ * Return the next byte in the pseudo-random sequence
+ */
+static int decrypt_byte(unsigned long* pkeys, const z_crc_t* pcrc_32_tab)
+{
+    unsigned temp;  /* POTENTIAL BUG:  temp*(temp^1) may overflow in an
+                     * unpredictable manner on 16-bit systems; not a problem
+                     * with any known compiler so far, though */
+
+    temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
+    return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
+}
+
+/***********************************************************************
+ * Update the encryption keys with the next byte of plain text
+ */
+static int update_keys(unsigned long* pkeys,const z_crc_t* pcrc_32_tab,int c)
+{
+    (*(pkeys+0)) = CRC32((*(pkeys+0)), c);
+    (*(pkeys+1)) += (*(pkeys+0)) & 0xff;
+    (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1;
+    {
+      register int keyshift = (int)((*(pkeys+1)) >> 24);
+      (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift);
+    }
+    return c;
+}
+
+
+/***********************************************************************
+ * Initialize the encryption keys and the random header according to
+ * the given password.
+ */
+static void init_keys(const char* passwd,unsigned long* pkeys,const z_crc_t* pcrc_32_tab)
+{
+    *(pkeys+0) = 305419896L;
+    *(pkeys+1) = 591751049L;
+    *(pkeys+2) = 878082192L;
+    while (*passwd != '\0') {
+        update_keys(pkeys,pcrc_32_tab,(int)*passwd);
+        passwd++;
+    }
+}
+
+#define zdecode(pkeys,pcrc_32_tab,c) \
+    (update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab)))
+
+#define zencode(pkeys,pcrc_32_tab,c,t) \
+    (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c))
+
+#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED
+
+#define RAND_HEAD_LEN  12
+   /* "last resort" source for second part of crypt seed pattern */
+#  ifndef ZCR_SEED2
+#    define ZCR_SEED2 3141592654UL     /* use PI as default pattern */
+#  endif
+
+static int crypthead(const char* passwd,      /* password string */
+                     unsigned char* buf,      /* where to write header */
+                     int bufSize,
+                     unsigned long* pkeys,
+                     const z_crc_t* pcrc_32_tab,
+                     unsigned long crcForCrypting)
+{
+    int n;                       /* index in random header */
+    int t;                       /* temporary */
+    int c;                       /* random byte */
+    unsigned char header[RAND_HEAD_LEN-2]; /* random header */
+    static unsigned calls = 0;   /* ensure different random header each time */
+
+    if (bufSize<RAND_HEAD_LEN)
+      return 0;
+
+    /* First generate RAND_HEAD_LEN-2 random bytes. We encrypt the
+     * output of rand() to get less predictability, since rand() is
+     * often poorly implemented.
+     */
+    if (++calls == 1)
+    {
+        srand((unsigned)(time(NULL) ^ ZCR_SEED2));
+    }
+    init_keys(passwd, pkeys, pcrc_32_tab);
+    for (n = 0; n < RAND_HEAD_LEN-2; n++)
+    {
+        c = (rand() >> 7) & 0xff;
+        header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t);
+    }
+    /* Encrypt random header (last two bytes is high word of crc) */
+    init_keys(passwd, pkeys, pcrc_32_tab);
+    for (n = 0; n < RAND_HEAD_LEN-2; n++)
+    {
+        buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t);
+    }
+    buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);
+    buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);
+    return n;
+}
+
+#endif
diff --git a/DSView/pv/minizip/ioapi.c b/DSView/pv/minizip/ioapi.c
new file mode 100644
index 00000000..7f5c191b
--- /dev/null
+++ b/DSView/pv/minizip/ioapi.c
@@ -0,0 +1,247 @@
+/* ioapi.h -- IO base function header for compress/uncompress .zip
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+*/
+
+#if defined(_WIN32) && (!(defined(_CRT_SECURE_NO_WARNINGS)))
+        #define _CRT_SECURE_NO_WARNINGS
+#endif
+
+#if defined(__APPLE__) || defined(IOAPI_NO_64)
+// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
+#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
+#define FTELLO_FUNC(stream) ftello(stream)
+#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
+#else
+#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
+#define FTELLO_FUNC(stream) ftello64(stream)
+#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
+#endif
+
+
+#include "ioapi.h"
+
+voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode)
+{
+    if (pfilefunc->zfile_func64.zopen64_file != NULL)
+        return (*(pfilefunc->zfile_func64.zopen64_file)) (pfilefunc->zfile_func64.opaque,filename,mode);
+    else
+    {
+        return (*(pfilefunc->zopen32_file))(pfilefunc->zfile_func64.opaque,(const char*)filename,mode);
+    }
+}
+
+long call_zseek64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin)
+{
+    if (pfilefunc->zfile_func64.zseek64_file != NULL)
+        return (*(pfilefunc->zfile_func64.zseek64_file)) (pfilefunc->zfile_func64.opaque,filestream,offset,origin);
+    else
+    {
+        uLong offsetTruncated = (uLong)offset;
+        if (offsetTruncated != offset)
+            return -1;
+        else
+            return (*(pfilefunc->zseek32_file))(pfilefunc->zfile_func64.opaque,filestream,offsetTruncated,origin);
+    }
+}
+
+ZPOS64_T call_ztell64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream)
+{
+    if (pfilefunc->zfile_func64.zseek64_file != NULL)
+        return (*(pfilefunc->zfile_func64.ztell64_file)) (pfilefunc->zfile_func64.opaque,filestream);
+    else
+    {
+        uLong tell_uLong = (*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream);
+        if ((tell_uLong) == MAXU32)
+            return (ZPOS64_T)-1;
+        else
+            return tell_uLong;
+    }
+}
+
+void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32)
+{
+    p_filefunc64_32->zfile_func64.zopen64_file = NULL;
+    p_filefunc64_32->zopen32_file = p_filefunc32->zopen_file;
+    p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
+    p_filefunc64_32->zfile_func64.zread_file = p_filefunc32->zread_file;
+    p_filefunc64_32->zfile_func64.zwrite_file = p_filefunc32->zwrite_file;
+    p_filefunc64_32->zfile_func64.ztell64_file = NULL;
+    p_filefunc64_32->zfile_func64.zseek64_file = NULL;
+    p_filefunc64_32->zfile_func64.zclose_file = p_filefunc32->zclose_file;
+    p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
+    p_filefunc64_32->zfile_func64.opaque = p_filefunc32->opaque;
+    p_filefunc64_32->zseek32_file = p_filefunc32->zseek_file;
+    p_filefunc64_32->ztell32_file = p_filefunc32->ztell_file;
+}
+
+
+
+static voidpf  ZCALLBACK fopen_file_func OF((voidpf opaque, const char* filename, int mode));
+static uLong   ZCALLBACK fread_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+static uLong   ZCALLBACK fwrite_file_func OF((voidpf opaque, voidpf stream, const void* buf,uLong size));
+static ZPOS64_T ZCALLBACK ftell64_file_func OF((voidpf opaque, voidpf stream));
+static long    ZCALLBACK fseek64_file_func OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
+static int     ZCALLBACK fclose_file_func OF((voidpf opaque, voidpf stream));
+static int     ZCALLBACK ferror_file_func OF((voidpf opaque, voidpf stream));
+
+static voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode)
+{
+    FILE* file = NULL;
+    const char* mode_fopen = NULL;
+    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
+        mode_fopen = "rb";
+    else
+    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
+        mode_fopen = "r+b";
+    else
+    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
+        mode_fopen = "wb";
+
+    if ((filename!=NULL) && (mode_fopen != NULL))
+        file = fopen(filename, mode_fopen);
+    return file;
+}
+
+static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename, int mode)
+{
+    FILE* file = NULL;
+    const char* mode_fopen = NULL;
+    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
+        mode_fopen = "rb";
+    else
+    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
+        mode_fopen = "r+b";
+    else
+    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
+        mode_fopen = "wb";
+
+    if ((filename!=NULL) && (mode_fopen != NULL))
+        file = FOPEN_FUNC((const char*)filename, mode_fopen);
+    return file;
+}
+
+
+static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size)
+{
+    uLong ret;
+    ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
+    return ret;
+}
+
+static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size)
+{
+    uLong ret;
+    ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
+    return ret;
+}
+
+static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
+{
+    long ret;
+    ret = ftell((FILE *)stream);
+    return ret;
+}
+
+
+static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)
+{
+    ZPOS64_T ret;
+    ret = FTELLO_FUNC((FILE *)stream);
+    return ret;
+}
+
+static long ZCALLBACK fseek_file_func (voidpf  opaque, voidpf stream, uLong offset, int origin)
+{
+    int fseek_origin=0;
+    long ret;
+    switch (origin)
+    {
+    case ZLIB_FILEFUNC_SEEK_CUR :
+        fseek_origin = SEEK_CUR;
+        break;
+    case ZLIB_FILEFUNC_SEEK_END :
+        fseek_origin = SEEK_END;
+        break;
+    case ZLIB_FILEFUNC_SEEK_SET :
+        fseek_origin = SEEK_SET;
+        break;
+    default: return -1;
+    }
+    ret = 0;
+    if (fseek((FILE *)stream, offset, fseek_origin) != 0)
+        ret = -1;
+    return ret;
+}
+
+static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T offset, int origin)
+{
+    int fseek_origin=0;
+    long ret;
+    switch (origin)
+    {
+    case ZLIB_FILEFUNC_SEEK_CUR :
+        fseek_origin = SEEK_CUR;
+        break;
+    case ZLIB_FILEFUNC_SEEK_END :
+        fseek_origin = SEEK_END;
+        break;
+    case ZLIB_FILEFUNC_SEEK_SET :
+        fseek_origin = SEEK_SET;
+        break;
+    default: return -1;
+    }
+    ret = 0;
+
+    if(FSEEKO_FUNC((FILE *)stream, offset, fseek_origin) != 0)
+                        ret = -1;
+
+    return ret;
+}
+
+
+static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
+{
+    int ret;
+    ret = fclose((FILE *)stream);
+    return ret;
+}
+
+static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream)
+{
+    int ret;
+    ret = ferror((FILE *)stream);
+    return ret;
+}
+
+void fill_fopen_filefunc (pzlib_filefunc_def)
+  zlib_filefunc_def* pzlib_filefunc_def;
+{
+    pzlib_filefunc_def->zopen_file = fopen_file_func;
+    pzlib_filefunc_def->zread_file = fread_file_func;
+    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
+    pzlib_filefunc_def->ztell_file = ftell_file_func;
+    pzlib_filefunc_def->zseek_file = fseek_file_func;
+    pzlib_filefunc_def->zclose_file = fclose_file_func;
+    pzlib_filefunc_def->zerror_file = ferror_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
+
+void fill_fopen64_filefunc (zlib_filefunc64_def*  pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen64_file = fopen64_file_func;
+    pzlib_filefunc_def->zread_file = fread_file_func;
+    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
+    pzlib_filefunc_def->ztell64_file = ftell64_file_func;
+    pzlib_filefunc_def->zseek64_file = fseek64_file_func;
+    pzlib_filefunc_def->zclose_file = fclose_file_func;
+    pzlib_filefunc_def->zerror_file = ferror_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
diff --git a/DSView/pv/minizip/ioapi.h b/DSView/pv/minizip/ioapi.h
new file mode 100644
index 00000000..8dcbdb06
--- /dev/null
+++ b/DSView/pv/minizip/ioapi.h
@@ -0,0 +1,208 @@
+/* ioapi.h -- IO base function header for compress/uncompress .zip
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+         Changes
+
+    Oct-2009 - Defined ZPOS64_T to fpos_t on windows and u_int64_t on linux. (might need to find a better why for this)
+    Oct-2009 - Change to fseeko64, ftello64 and fopen64 so large files would work on linux.
+               More if/def section may be needed to support other platforms
+    Oct-2009 - Defined fxxxx64 calls to normal fopen/ftell/fseek so they would compile on windows.
+                          (but you should use iowin32.c for windows instead)
+
+*/
+
+#ifndef _ZLIBIOAPI64_H
+#define _ZLIBIOAPI64_H
+
+#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
+
+  // Linux needs this to support file operation on files larger then 4+GB
+  // But might need better if/def to select just the platforms that needs them.
+
+        #ifndef __USE_FILE_OFFSET64
+                #define __USE_FILE_OFFSET64
+        #endif
+        #ifndef __USE_LARGEFILE64
+                #define __USE_LARGEFILE64
+        #endif
+        #ifndef _LARGEFILE64_SOURCE
+                #define _LARGEFILE64_SOURCE
+        #endif
+        #ifndef _FILE_OFFSET_BIT
+                #define _FILE_OFFSET_BIT 64
+        #endif
+
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "zlib.h"
+
+#if defined(USE_FILE32API)
+#define fopen64 fopen
+#define ftello64 ftell
+#define fseeko64 fseek
+#else
+#ifdef __FreeBSD__
+#define fopen64 fopen
+#define ftello64 ftello
+#define fseeko64 fseeko
+#endif
+#ifdef _MSC_VER
+ #define fopen64 fopen
+ #if (_MSC_VER >= 1400) && (!(defined(NO_MSCVER_FILE64_FUNC)))
+  #define ftello64 _ftelli64
+  #define fseeko64 _fseeki64
+ #else // old MSC
+  #define ftello64 ftell
+  #define fseeko64 fseek
+ #endif
+#endif
+#endif
+
+/*
+#ifndef ZPOS64_T
+  #ifdef _WIN32
+                #define ZPOS64_T fpos_t
+  #else
+    #include <stdint.h>
+    #define ZPOS64_T uint64_t
+  #endif
+#endif
+*/
+
+#ifdef HAVE_MINIZIP64_CONF_H
+#include "mz64conf.h"
+#endif
+
+/* a type choosen by DEFINE */
+#ifdef HAVE_64BIT_INT_CUSTOM
+typedef  64BIT_INT_CUSTOM_TYPE ZPOS64_T;
+#else
+#ifdef HAS_STDINT_H
+#include "stdint.h"
+typedef uint64_t ZPOS64_T;
+#else
+
+/* Maximum unsigned 32-bit value used as placeholder for zip64 */
+#define MAXU32 0xffffffff
+
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+typedef unsigned __int64 ZPOS64_T;
+#else
+typedef unsigned long long int ZPOS64_T;
+#endif
+#endif
+#endif
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#define ZLIB_FILEFUNC_SEEK_CUR (1)
+#define ZLIB_FILEFUNC_SEEK_END (2)
+#define ZLIB_FILEFUNC_SEEK_SET (0)
+
+#define ZLIB_FILEFUNC_MODE_READ      (1)
+#define ZLIB_FILEFUNC_MODE_WRITE     (2)
+#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
+
+#define ZLIB_FILEFUNC_MODE_EXISTING (4)
+#define ZLIB_FILEFUNC_MODE_CREATE   (8)
+
+
+#ifndef ZCALLBACK
+ #if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
+   #define ZCALLBACK CALLBACK
+ #else
+   #define ZCALLBACK
+ #endif
+#endif
+
+
+
+
+typedef voidpf   (ZCALLBACK *open_file_func)      OF((voidpf opaque, const char* filename, int mode));
+typedef uLong    (ZCALLBACK *read_file_func)      OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+typedef uLong    (ZCALLBACK *write_file_func)     OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+typedef int      (ZCALLBACK *close_file_func)     OF((voidpf opaque, voidpf stream));
+typedef int      (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
+
+typedef long     (ZCALLBACK *tell_file_func)      OF((voidpf opaque, voidpf stream));
+typedef long     (ZCALLBACK *seek_file_func)      OF((voidpf opaque, voidpf stream, uLong offset, int origin));
+
+
+/* here is the "old" 32 bits structure structure */
+typedef struct zlib_filefunc_def_s
+{
+    open_file_func      zopen_file;
+    read_file_func      zread_file;
+    write_file_func     zwrite_file;
+    tell_file_func      ztell_file;
+    seek_file_func      zseek_file;
+    close_file_func     zclose_file;
+    testerror_file_func zerror_file;
+    voidpf              opaque;
+} zlib_filefunc_def;
+
+typedef ZPOS64_T (ZCALLBACK *tell64_file_func)    OF((voidpf opaque, voidpf stream));
+typedef long     (ZCALLBACK *seek64_file_func)    OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
+typedef voidpf   (ZCALLBACK *open64_file_func)    OF((voidpf opaque, const void* filename, int mode));
+
+typedef struct zlib_filefunc64_def_s
+{
+    open64_file_func    zopen64_file;
+    read_file_func      zread_file;
+    write_file_func     zwrite_file;
+    tell64_file_func    ztell64_file;
+    seek64_file_func    zseek64_file;
+    close_file_func     zclose_file;
+    testerror_file_func zerror_file;
+    voidpf              opaque;
+} zlib_filefunc64_def;
+
+void fill_fopen64_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def));
+void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
+
+/* now internal definition, only for zip.c and unzip.h */
+typedef struct zlib_filefunc64_32_def_s
+{
+    zlib_filefunc64_def zfile_func64;
+    open_file_func      zopen32_file;
+    tell_file_func      ztell32_file;
+    seek_file_func      zseek32_file;
+} zlib_filefunc64_32_def;
+
+
+#define ZREAD64(filefunc,filestream,buf,size)     ((*((filefunc).zfile_func64.zread_file))   ((filefunc).zfile_func64.opaque,filestream,buf,size))
+#define ZWRITE64(filefunc,filestream,buf,size)    ((*((filefunc).zfile_func64.zwrite_file))  ((filefunc).zfile_func64.opaque,filestream,buf,size))
+//#define ZTELL64(filefunc,filestream)            ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream))
+//#define ZSEEK64(filefunc,filestream,pos,mode)   ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode))
+#define ZCLOSE64(filefunc,filestream)             ((*((filefunc).zfile_func64.zclose_file))  ((filefunc).zfile_func64.opaque,filestream))
+#define ZERROR64(filefunc,filestream)             ((*((filefunc).zfile_func64.zerror_file))  ((filefunc).zfile_func64.opaque,filestream))
+
+voidpf call_zopen64 OF((const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode));
+long    call_zseek64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin));
+ZPOS64_T call_ztell64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream));
+
+void    fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32);
+
+#define ZOPEN64(filefunc,filename,mode)         (call_zopen64((&(filefunc)),(filename),(mode)))
+#define ZTELL64(filefunc,filestream)            (call_ztell64((&(filefunc)),(filestream)))
+#define ZSEEK64(filefunc,filestream,pos,mode)   (call_zseek64((&(filefunc)),(filestream),(pos),(mode)))
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/DSView/pv/minizip/iowin32.c b/DSView/pv/minizip/iowin32.c
new file mode 100644
index 00000000..274f39eb
--- /dev/null
+++ b/DSView/pv/minizip/iowin32.c
@@ -0,0 +1,462 @@
+/* iowin32.c -- IO base function header for compress/uncompress .zip
+     Version 1.1, February 14h, 2010
+     part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+     For more info read MiniZip_info.txt
+
+*/
+
+#include <stdlib.h>
+
+#include "zlib.h"
+#include "ioapi.h"
+#include "iowin32.h"
+
+#ifndef INVALID_HANDLE_VALUE
+#define INVALID_HANDLE_VALUE (0xFFFFFFFF)
+#endif
+
+#ifndef INVALID_SET_FILE_POINTER
+#define INVALID_SET_FILE_POINTER ((DWORD)-1)
+#endif
+
+
+// see Include/shared/winapifamily.h in the Windows Kit
+#if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API)))
+#if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP)
+#define IOWIN32_USING_WINRT_API 1
+#endif
+#endif
+
+voidpf  ZCALLBACK win32_open_file_func  OF((voidpf opaque, const char* filename, int mode));
+uLong   ZCALLBACK win32_read_file_func  OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+uLong   ZCALLBACK win32_write_file_func OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+ZPOS64_T ZCALLBACK win32_tell64_file_func  OF((voidpf opaque, voidpf stream));
+long    ZCALLBACK win32_seek64_file_func  OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
+int     ZCALLBACK win32_close_file_func OF((voidpf opaque, voidpf stream));
+int     ZCALLBACK win32_error_file_func OF((voidpf opaque, voidpf stream));
+
+typedef struct
+{
+    HANDLE hf;
+    int error;
+} WIN32FILE_IOWIN;
+
+
+static void win32_translate_open_mode(int mode,
+                                      DWORD* lpdwDesiredAccess,
+                                      DWORD* lpdwCreationDisposition,
+                                      DWORD* lpdwShareMode,
+                                      DWORD* lpdwFlagsAndAttributes)
+{
+    *lpdwDesiredAccess = *lpdwShareMode = *lpdwFlagsAndAttributes = *lpdwCreationDisposition = 0;
+
+    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
+    {
+        *lpdwDesiredAccess = GENERIC_READ;
+        *lpdwCreationDisposition = OPEN_EXISTING;
+        *lpdwShareMode = FILE_SHARE_READ;
+    }
+    else if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
+    {
+        *lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
+        *lpdwCreationDisposition = OPEN_EXISTING;
+    }
+    else if (mode & ZLIB_FILEFUNC_MODE_CREATE)
+    {
+        *lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
+        *lpdwCreationDisposition = CREATE_ALWAYS;
+    }
+}
+
+static voidpf win32_build_iowin(HANDLE hFile)
+{
+    voidpf ret=NULL;
+
+    if ((hFile != NULL) && (hFile != INVALID_HANDLE_VALUE))
+    {
+        WIN32FILE_IOWIN w32fiow;
+        w32fiow.hf = hFile;
+        w32fiow.error = 0;
+        ret = malloc(sizeof(WIN32FILE_IOWIN));
+
+        if (ret==NULL)
+            CloseHandle(hFile);
+        else
+            *((WIN32FILE_IOWIN*)ret) = w32fiow;
+    }
+    return ret;
+}
+
+voidpf ZCALLBACK win32_open64_file_func (voidpf opaque,const void* filename,int mode)
+{
+    const char* mode_fopen = NULL;
+    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
+    HANDLE hFile = NULL;
+
+    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
+
+#ifdef IOWIN32_USING_WINRT_API
+#ifdef UNICODE
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFile2((LPCTSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
+#else
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+    {
+        WCHAR filenameW[FILENAME_MAX + 0x200 + 1];
+        MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200);
+        hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
+    }
+#endif
+#else
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
+#endif
+
+    return win32_build_iowin(hFile);
+}
+
+
+voidpf ZCALLBACK win32_open64_file_funcA (voidpf opaque,const void* filename,int mode)
+{
+    const char* mode_fopen = NULL;
+    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
+    HANDLE hFile = NULL;
+
+    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
+
+#ifdef IOWIN32_USING_WINRT_API
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+    {
+        WCHAR filenameW[FILENAME_MAX + 0x200 + 1];
+        MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200);
+        hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
+    }
+#else
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFileA((LPCSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
+#endif
+
+    return win32_build_iowin(hFile);
+}
+
+
+voidpf ZCALLBACK win32_open64_file_funcW (voidpf opaque,const void* filename,int mode)
+{
+    const char* mode_fopen = NULL;
+    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
+    HANDLE hFile = NULL;
+
+    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
+
+#ifdef IOWIN32_USING_WINRT_API
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFile2((LPCWSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition,NULL);
+#else
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFileW((LPCWSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
+#endif
+
+    return win32_build_iowin(hFile);
+}
+
+
+voidpf ZCALLBACK win32_open_file_func (voidpf opaque,const char* filename,int mode)
+{
+    const char* mode_fopen = NULL;
+    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
+    HANDLE hFile = NULL;
+
+    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
+
+#ifdef IOWIN32_USING_WINRT_API
+#ifdef UNICODE
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFile2((LPCTSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
+#else
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+    {
+        WCHAR filenameW[FILENAME_MAX + 0x200 + 1];
+        MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200);
+        hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
+    }
+#endif
+#else
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
+#endif
+
+    return win32_build_iowin(hFile);
+}
+
+
+uLong ZCALLBACK win32_read_file_func (voidpf opaque, voidpf stream, void* buf,uLong size)
+{
+    uLong ret=0;
+    HANDLE hFile = NULL;
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
+
+    if (hFile != NULL)
+    {
+        if (!ReadFile(hFile, buf, size, &ret, NULL))
+        {
+            DWORD dwErr = GetLastError();
+            if (dwErr == ERROR_HANDLE_EOF)
+                dwErr = 0;
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+        }
+    }
+
+    return ret;
+}
+
+
+uLong ZCALLBACK win32_write_file_func (voidpf opaque,voidpf stream,const void* buf,uLong size)
+{
+    uLong ret=0;
+    HANDLE hFile = NULL;
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
+
+    if (hFile != NULL)
+    {
+        if (!WriteFile(hFile, buf, size, &ret, NULL))
+        {
+            DWORD dwErr = GetLastError();
+            if (dwErr == ERROR_HANDLE_EOF)
+                dwErr = 0;
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+        }
+    }
+
+    return ret;
+}
+
+static BOOL MySetFilePointerEx(HANDLE hFile, LARGE_INTEGER pos, LARGE_INTEGER *newPos,  DWORD dwMoveMethod)
+{
+#ifdef IOWIN32_USING_WINRT_API
+    return SetFilePointerEx(hFile, pos, newPos, dwMoveMethod);
+#else
+    LONG lHigh = pos.HighPart;
+    DWORD dwNewPos = SetFilePointer(hFile, pos.LowPart, &lHigh, dwMoveMethod);
+    BOOL fOk = TRUE;
+    if (dwNewPos == 0xFFFFFFFF)
+        if (GetLastError() != NO_ERROR)
+            fOk = FALSE;
+    if ((newPos != NULL) && (fOk))
+    {
+        newPos->LowPart = dwNewPos;
+        newPos->HighPart = lHigh;
+    }
+    return fOk;
+#endif
+}
+
+long ZCALLBACK win32_tell_file_func (voidpf opaque,voidpf stream)
+{
+    long ret=-1;
+    HANDLE hFile = NULL;
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
+    if (hFile != NULL)
+    {
+        LARGE_INTEGER pos;
+        pos.QuadPart = 0;
+
+        if (!MySetFilePointerEx(hFile, pos, &pos, FILE_CURRENT))
+        {
+            DWORD dwErr = GetLastError();
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+            ret = -1;
+        }
+        else
+            ret=(long)pos.LowPart;
+    }
+    return ret;
+}
+
+ZPOS64_T ZCALLBACK win32_tell64_file_func (voidpf opaque, voidpf stream)
+{
+    ZPOS64_T ret= (ZPOS64_T)-1;
+    HANDLE hFile = NULL;
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream)->hf;
+
+    if (hFile)
+    {
+        LARGE_INTEGER pos;
+        pos.QuadPart = 0;
+
+        if (!MySetFilePointerEx(hFile, pos, &pos, FILE_CURRENT))
+        {
+            DWORD dwErr = GetLastError();
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+            ret = (ZPOS64_T)-1;
+        }
+        else
+            ret=pos.QuadPart;
+    }
+    return ret;
+}
+
+
+long ZCALLBACK win32_seek_file_func (voidpf opaque,voidpf stream,uLong offset,int origin)
+{
+    DWORD dwMoveMethod=0xFFFFFFFF;
+    HANDLE hFile = NULL;
+
+    long ret=-1;
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
+    switch (origin)
+    {
+    case ZLIB_FILEFUNC_SEEK_CUR :
+        dwMoveMethod = FILE_CURRENT;
+        break;
+    case ZLIB_FILEFUNC_SEEK_END :
+        dwMoveMethod = FILE_END;
+        break;
+    case ZLIB_FILEFUNC_SEEK_SET :
+        dwMoveMethod = FILE_BEGIN;
+        break;
+    default: return -1;
+    }
+
+    if (hFile != NULL)
+    {
+        LARGE_INTEGER pos;
+        pos.QuadPart = offset;
+        if (!MySetFilePointerEx(hFile, pos, NULL, dwMoveMethod))
+        {
+            DWORD dwErr = GetLastError();
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+            ret = -1;
+        }
+        else
+            ret=0;
+    }
+    return ret;
+}
+
+long ZCALLBACK win32_seek64_file_func (voidpf opaque, voidpf stream,ZPOS64_T offset,int origin)
+{
+    DWORD dwMoveMethod=0xFFFFFFFF;
+    HANDLE hFile = NULL;
+    long ret=-1;
+
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream)->hf;
+
+    switch (origin)
+    {
+        case ZLIB_FILEFUNC_SEEK_CUR :
+            dwMoveMethod = FILE_CURRENT;
+            break;
+        case ZLIB_FILEFUNC_SEEK_END :
+            dwMoveMethod = FILE_END;
+            break;
+        case ZLIB_FILEFUNC_SEEK_SET :
+            dwMoveMethod = FILE_BEGIN;
+            break;
+        default: return -1;
+    }
+
+    if (hFile)
+    {
+        LARGE_INTEGER pos;
+        pos.QuadPart = offset;
+        if (!MySetFilePointerEx(hFile, pos, NULL, dwMoveMethod))
+        {
+            DWORD dwErr = GetLastError();
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+            ret = -1;
+        }
+        else
+            ret=0;
+    }
+    return ret;
+}
+
+int ZCALLBACK win32_close_file_func (voidpf opaque, voidpf stream)
+{
+    int ret=-1;
+
+    if (stream!=NULL)
+    {
+        HANDLE hFile;
+        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
+        if (hFile != NULL)
+        {
+            CloseHandle(hFile);
+            ret=0;
+        }
+        free(stream);
+    }
+    return ret;
+}
+
+int ZCALLBACK win32_error_file_func (voidpf opaque,voidpf stream)
+{
+    int ret=-1;
+    if (stream!=NULL)
+    {
+        ret = ((WIN32FILE_IOWIN*)stream) -> error;
+    }
+    return ret;
+}
+
+void fill_win32_filefunc (zlib_filefunc_def* pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen_file = win32_open_file_func;
+    pzlib_filefunc_def->zread_file = win32_read_file_func;
+    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
+    pzlib_filefunc_def->ztell_file = win32_tell_file_func;
+    pzlib_filefunc_def->zseek_file = win32_seek_file_func;
+    pzlib_filefunc_def->zclose_file = win32_close_file_func;
+    pzlib_filefunc_def->zerror_file = win32_error_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
+
+void fill_win32_filefunc64(zlib_filefunc64_def* pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen64_file = win32_open64_file_func;
+    pzlib_filefunc_def->zread_file = win32_read_file_func;
+    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
+    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
+    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
+    pzlib_filefunc_def->zclose_file = win32_close_file_func;
+    pzlib_filefunc_def->zerror_file = win32_error_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
+
+
+void fill_win32_filefunc64A(zlib_filefunc64_def* pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen64_file = win32_open64_file_funcA;
+    pzlib_filefunc_def->zread_file = win32_read_file_func;
+    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
+    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
+    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
+    pzlib_filefunc_def->zclose_file = win32_close_file_func;
+    pzlib_filefunc_def->zerror_file = win32_error_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
+
+
+void fill_win32_filefunc64W(zlib_filefunc64_def* pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen64_file = win32_open64_file_funcW;
+    pzlib_filefunc_def->zread_file = win32_read_file_func;
+    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
+    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
+    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
+    pzlib_filefunc_def->zclose_file = win32_close_file_func;
+    pzlib_filefunc_def->zerror_file = win32_error_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
diff --git a/DSView/pv/minizip/iowin32.h b/DSView/pv/minizip/iowin32.h
new file mode 100644
index 00000000..0ca0969a
--- /dev/null
+++ b/DSView/pv/minizip/iowin32.h
@@ -0,0 +1,28 @@
+/* iowin32.h -- IO base function header for compress/uncompress .zip
+     Version 1.1, February 14h, 2010
+     part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+*/
+
+#include <windows.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void fill_win32_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
+void fill_win32_filefunc64 OF((zlib_filefunc64_def* pzlib_filefunc_def));
+void fill_win32_filefunc64A OF((zlib_filefunc64_def* pzlib_filefunc_def));
+void fill_win32_filefunc64W OF((zlib_filefunc64_def* pzlib_filefunc_def));
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/DSView/pv/minizip/miniunz.c b/DSView/pv/minizip/miniunz.c
new file mode 100644
index 00000000..3d65401b
--- /dev/null
+++ b/DSView/pv/minizip/miniunz.c
@@ -0,0 +1,660 @@
+/*
+   miniunz.c
+   Version 1.1, February 14h, 2010
+   sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications of Unzip for Zip64
+         Copyright (C) 2007-2008 Even Rouault
+
+         Modifications for Zip64 support on both zip and unzip
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+*/
+
+#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
+        #ifndef __USE_FILE_OFFSET64
+                #define __USE_FILE_OFFSET64
+        #endif
+        #ifndef __USE_LARGEFILE64
+                #define __USE_LARGEFILE64
+        #endif
+        #ifndef _LARGEFILE64_SOURCE
+                #define _LARGEFILE64_SOURCE
+        #endif
+        #ifndef _FILE_OFFSET_BIT
+                #define _FILE_OFFSET_BIT 64
+        #endif
+#endif
+
+#ifdef __APPLE__
+// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
+#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
+#define FTELLO_FUNC(stream) ftello(stream)
+#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
+#else
+#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
+#define FTELLO_FUNC(stream) ftello64(stream)
+#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
+#endif
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <errno.h>
+#include <fcntl.h>
+
+#ifdef _WIN32
+# include <direct.h>
+# include <io.h>
+#else
+# include <unistd.h>
+# include <utime.h>
+#endif
+
+
+#include "unzip.h"
+
+#define CASESENSITIVITY (0)
+#define WRITEBUFFERSIZE (8192)
+#define MAXFILENAME (256)
+
+#ifdef _WIN32
+#define USEWIN32IOAPI
+#include "iowin32.h"
+#endif
+/*
+  mini unzip, demo of unzip package
+
+  usage :
+  Usage : miniunz [-exvlo] file.zip [file_to_extract] [-d extractdir]
+
+  list the file in the zipfile, and print the content of FILE_ID.ZIP or README.TXT
+    if it exists
+*/
+
+
+/* change_file_date : change the date/time of a file
+    filename : the filename of the file where date/time must be modified
+    dosdate : the new date at the MSDos format (4 bytes)
+    tmu_date : the SAME new date at the tm_unz format */
+void change_file_date(filename,dosdate,tmu_date)
+    const char *filename;
+    uLong dosdate;
+    tm_unz tmu_date;
+{
+#ifdef _WIN32
+  HANDLE hFile;
+  FILETIME ftm,ftLocal,ftCreate,ftLastAcc,ftLastWrite;
+
+  hFile = CreateFileA(filename,GENERIC_READ | GENERIC_WRITE,
+                      0,NULL,OPEN_EXISTING,0,NULL);
+  GetFileTime(hFile,&ftCreate,&ftLastAcc,&ftLastWrite);
+  DosDateTimeToFileTime((WORD)(dosdate>>16),(WORD)dosdate,&ftLocal);
+  LocalFileTimeToFileTime(&ftLocal,&ftm);
+  SetFileTime(hFile,&ftm,&ftLastAcc,&ftm);
+  CloseHandle(hFile);
+#else
+#ifdef unix || __APPLE__
+  struct utimbuf ut;
+  struct tm newdate;
+  newdate.tm_sec = tmu_date.tm_sec;
+  newdate.tm_min=tmu_date.tm_min;
+  newdate.tm_hour=tmu_date.tm_hour;
+  newdate.tm_mday=tmu_date.tm_mday;
+  newdate.tm_mon=tmu_date.tm_mon;
+  if (tmu_date.tm_year > 1900)
+      newdate.tm_year=tmu_date.tm_year - 1900;
+  else
+      newdate.tm_year=tmu_date.tm_year ;
+  newdate.tm_isdst=-1;
+
+  ut.actime=ut.modtime=mktime(&newdate);
+  utime(filename,&ut);
+#endif
+#endif
+}
+
+
+/* mymkdir and change_file_date are not 100 % portable
+   As I don't know well Unix, I wait feedback for the unix portion */
+
+int mymkdir(dirname)
+    const char* dirname;
+{
+    int ret=0;
+#ifdef _WIN32
+    ret = _mkdir(dirname);
+#elif unix
+    ret = mkdir (dirname,0775);
+#elif __APPLE__
+    ret = mkdir (dirname,0775);
+#endif
+    return ret;
+}
+
+int makedir (newdir)
+    char *newdir;
+{
+  char *buffer ;
+  char *p;
+  int  len = (int)strlen(newdir);
+
+  if (len <= 0)
+    return 0;
+
+  buffer = (char*)malloc(len+1);
+        if (buffer==NULL)
+        {
+                printf("Error allocating memory\n");
+                return UNZ_INTERNALERROR;
+        }
+  strcpy(buffer,newdir);
+
+  if (buffer[len-1] == '/') {
+    buffer[len-1] = '\0';
+  }
+  if (mymkdir(buffer) == 0)
+    {
+      free(buffer);
+      return 1;
+    }
+
+  p = buffer+1;
+  while (1)
+    {
+      char hold;
+
+      while(*p && *p != '\\' && *p != '/')
+        p++;
+      hold = *p;
+      *p = 0;
+      if ((mymkdir(buffer) == -1) && (errno == ENOENT))
+        {
+          printf("couldn't create directory %s\n",buffer);
+          free(buffer);
+          return 0;
+        }
+      if (hold == 0)
+        break;
+      *p++ = hold;
+    }
+  free(buffer);
+  return 1;
+}
+
+void do_banner()
+{
+    printf("MiniUnz 1.01b, demo of zLib + Unz package written by Gilles Vollant\n");
+    printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n");
+}
+
+void do_help()
+{
+    printf("Usage : miniunz [-e] [-x] [-v] [-l] [-o] [-p password] file.zip [file_to_extr.] [-d extractdir]\n\n" \
+           "  -e  Extract without pathname (junk paths)\n" \
+           "  -x  Extract with pathname\n" \
+           "  -v  list files\n" \
+           "  -l  list files\n" \
+           "  -d  directory to extract into\n" \
+           "  -o  overwrite files without prompting\n" \
+           "  -p  extract crypted file using password\n\n");
+}
+
+void Display64BitsSize(ZPOS64_T n, int size_char)
+{
+  /* to avoid compatibility problem , we do here the conversion */
+  char number[21];
+  int offset=19;
+  int pos_string = 19;
+  number[20]=0;
+  for (;;) {
+      number[offset]=(char)((n%10)+'0');
+      if (number[offset] != '0')
+          pos_string=offset;
+      n/=10;
+      if (offset==0)
+          break;
+      offset--;
+  }
+  {
+      int size_display_string = 19-pos_string;
+      while (size_char > size_display_string)
+      {
+          size_char--;
+          printf(" ");
+      }
+  }
+
+  printf("%s",&number[pos_string]);
+}
+
+int do_list(uf)
+    unzFile uf;
+{
+    uLong i;
+    unz_global_info64 gi;
+    int err;
+
+    err = unzGetGlobalInfo64(uf,&gi);
+    if (err!=UNZ_OK)
+        printf("error %d with zipfile in unzGetGlobalInfo \n",err);
+    printf("  Length  Method     Size Ratio   Date    Time   CRC-32     Name\n");
+    printf("  ------  ------     ---- -----   ----    ----   ------     ----\n");
+    for (i=0;i<gi.number_entry;i++)
+    {
+        char filename_inzip[256];
+        unz_file_info64 file_info;
+        uLong ratio=0;
+        const char *string_method;
+        char charCrypt=' ';
+        err = unzGetCurrentFileInfo64(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
+        if (err!=UNZ_OK)
+        {
+            printf("error %d with zipfile in unzGetCurrentFileInfo\n",err);
+            break;
+        }
+        if (file_info.uncompressed_size>0)
+            ratio = (uLong)((file_info.compressed_size*100)/file_info.uncompressed_size);
+
+        /* display a '*' if the file is crypted */
+        if ((file_info.flag & 1) != 0)
+            charCrypt='*';
+
+        if (file_info.compression_method==0)
+            string_method="Stored";
+        else
+        if (file_info.compression_method==Z_DEFLATED)
+        {
+            uInt iLevel=(uInt)((file_info.flag & 0x6)/2);
+            if (iLevel==0)
+              string_method="Defl:N";
+            else if (iLevel==1)
+              string_method="Defl:X";
+            else if ((iLevel==2) || (iLevel==3))
+              string_method="Defl:F"; /* 2:fast , 3 : extra fast*/
+        }
+        else
+        if (file_info.compression_method==Z_BZIP2ED)
+        {
+              string_method="BZip2 ";
+        }
+        else
+            string_method="Unkn. ";
+
+        Display64BitsSize(file_info.uncompressed_size,7);
+        printf("  %6s%c",string_method,charCrypt);
+        Display64BitsSize(file_info.compressed_size,7);
+        printf(" %3lu%%  %2.2lu-%2.2lu-%2.2lu  %2.2lu:%2.2lu  %8.8lx   %s\n",
+                ratio,
+                (uLong)file_info.tmu_date.tm_mon + 1,
+                (uLong)file_info.tmu_date.tm_mday,
+                (uLong)file_info.tmu_date.tm_year % 100,
+                (uLong)file_info.tmu_date.tm_hour,(uLong)file_info.tmu_date.tm_min,
+                (uLong)file_info.crc,filename_inzip);
+        if ((i+1)<gi.number_entry)
+        {
+            err = unzGoToNextFile(uf);
+            if (err!=UNZ_OK)
+            {
+                printf("error %d with zipfile in unzGoToNextFile\n",err);
+                break;
+            }
+        }
+    }
+
+    return 0;
+}
+
+
+int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)
+    unzFile uf;
+    const int* popt_extract_without_path;
+    int* popt_overwrite;
+    const char* password;
+{
+    char filename_inzip[256];
+    char* filename_withoutpath;
+    char* p;
+    int err=UNZ_OK;
+    FILE *fout=NULL;
+    void* buf;
+    uInt size_buf;
+
+    unz_file_info64 file_info;
+    uLong ratio=0;
+    err = unzGetCurrentFileInfo64(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
+
+    if (err!=UNZ_OK)
+    {
+        printf("error %d with zipfile in unzGetCurrentFileInfo\n",err);
+        return err;
+    }
+
+    size_buf = WRITEBUFFERSIZE;
+    buf = (void*)malloc(size_buf);
+    if (buf==NULL)
+    {
+        printf("Error allocating memory\n");
+        return UNZ_INTERNALERROR;
+    }
+
+    p = filename_withoutpath = filename_inzip;
+    while ((*p) != '\0')
+    {
+        if (((*p)=='/') || ((*p)=='\\'))
+            filename_withoutpath = p+1;
+        p++;
+    }
+
+    if ((*filename_withoutpath)=='\0')
+    {
+        if ((*popt_extract_without_path)==0)
+        {
+            printf("creating directory: %s\n",filename_inzip);
+            mymkdir(filename_inzip);
+        }
+    }
+    else
+    {
+        const char* write_filename;
+        int skip=0;
+
+        if ((*popt_extract_without_path)==0)
+            write_filename = filename_inzip;
+        else
+            write_filename = filename_withoutpath;
+
+        err = unzOpenCurrentFilePassword(uf,password);
+        if (err!=UNZ_OK)
+        {
+            printf("error %d with zipfile in unzOpenCurrentFilePassword\n",err);
+        }
+
+        if (((*popt_overwrite)==0) && (err==UNZ_OK))
+        {
+            char rep=0;
+            FILE* ftestexist;
+            ftestexist = FOPEN_FUNC(write_filename,"rb");
+            if (ftestexist!=NULL)
+            {
+                fclose(ftestexist);
+                do
+                {
+                    char answer[128];
+                    int ret;
+
+                    printf("The file %s exists. Overwrite ? [y]es, [n]o, [A]ll: ",write_filename);
+                    ret = scanf("%1s",answer);
+                    if (ret != 1)
+                    {
+                       exit(EXIT_FAILURE);
+                    }
+                    rep = answer[0] ;
+                    if ((rep>='a') && (rep<='z'))
+                        rep -= 0x20;
+                }
+                while ((rep!='Y') && (rep!='N') && (rep!='A'));
+            }
+
+            if (rep == 'N')
+                skip = 1;
+
+            if (rep == 'A')
+                *popt_overwrite=1;
+        }
+
+        if ((skip==0) && (err==UNZ_OK))
+        {
+            fout=FOPEN_FUNC(write_filename,"wb");
+            /* some zipfile don't contain directory alone before file */
+            if ((fout==NULL) && ((*popt_extract_without_path)==0) &&
+                                (filename_withoutpath!=(char*)filename_inzip))
+            {
+                char c=*(filename_withoutpath-1);
+                *(filename_withoutpath-1)='\0';
+                makedir(write_filename);
+                *(filename_withoutpath-1)=c;
+                fout=FOPEN_FUNC(write_filename,"wb");
+            }
+
+            if (fout==NULL)
+            {
+                printf("error opening %s\n",write_filename);
+            }
+        }
+
+        if (fout!=NULL)
+        {
+            printf(" extracting: %s\n",write_filename);
+
+            do
+            {
+                err = unzReadCurrentFile(uf,buf,size_buf);
+                if (err<0)
+                {
+                    printf("error %d with zipfile in unzReadCurrentFile\n",err);
+                    break;
+                }
+                if (err>0)
+                    if (fwrite(buf,err,1,fout)!=1)
+                    {
+                        printf("error in writing extracted file\n");
+                        err=UNZ_ERRNO;
+                        break;
+                    }
+            }
+            while (err>0);
+            if (fout)
+                    fclose(fout);
+
+            if (err==0)
+                change_file_date(write_filename,file_info.dosDate,
+                                 file_info.tmu_date);
+        }
+
+        if (err==UNZ_OK)
+        {
+            err = unzCloseCurrentFile (uf);
+            if (err!=UNZ_OK)
+            {
+                printf("error %d with zipfile in unzCloseCurrentFile\n",err);
+            }
+        }
+        else
+            unzCloseCurrentFile(uf); /* don't lose the error */
+    }
+
+    free(buf);
+    return err;
+}
+
+
+int do_extract(uf,opt_extract_without_path,opt_overwrite,password)
+    unzFile uf;
+    int opt_extract_without_path;
+    int opt_overwrite;
+    const char* password;
+{
+    uLong i;
+    unz_global_info64 gi;
+    int err;
+    FILE* fout=NULL;
+
+    err = unzGetGlobalInfo64(uf,&gi);
+    if (err!=UNZ_OK)
+        printf("error %d with zipfile in unzGetGlobalInfo \n",err);
+
+    for (i=0;i<gi.number_entry;i++)
+    {
+        if (do_extract_currentfile(uf,&opt_extract_without_path,
+                                      &opt_overwrite,
+                                      password) != UNZ_OK)
+            break;
+
+        if ((i+1)<gi.number_entry)
+        {
+            err = unzGoToNextFile(uf);
+            if (err!=UNZ_OK)
+            {
+                printf("error %d with zipfile in unzGoToNextFile\n",err);
+                break;
+            }
+        }
+    }
+
+    return 0;
+}
+
+int do_extract_onefile(uf,filename,opt_extract_without_path,opt_overwrite,password)
+    unzFile uf;
+    const char* filename;
+    int opt_extract_without_path;
+    int opt_overwrite;
+    const char* password;
+{
+    int err = UNZ_OK;
+    if (unzLocateFile(uf,filename,CASESENSITIVITY)!=UNZ_OK)
+    {
+        printf("file %s not found in the zipfile\n",filename);
+        return 2;
+    }
+
+    if (do_extract_currentfile(uf,&opt_extract_without_path,
+                                      &opt_overwrite,
+                                      password) == UNZ_OK)
+        return 0;
+    else
+        return 1;
+}
+
+
+int main(argc,argv)
+    int argc;
+    char *argv[];
+{
+    const char *zipfilename=NULL;
+    const char *filename_to_extract=NULL;
+    const char *password=NULL;
+    char filename_try[MAXFILENAME+16] = "";
+    int i;
+    int ret_value=0;
+    int opt_do_list=0;
+    int opt_do_extract=1;
+    int opt_do_extract_withoutpath=0;
+    int opt_overwrite=0;
+    int opt_extractdir=0;
+    const char *dirname=NULL;
+    unzFile uf=NULL;
+
+    do_banner();
+    if (argc==1)
+    {
+        do_help();
+        return 0;
+    }
+    else
+    {
+        for (i=1;i<argc;i++)
+        {
+            if ((*argv[i])=='-')
+            {
+                const char *p=argv[i]+1;
+
+                while ((*p)!='\0')
+                {
+                    char c=*(p++);;
+                    if ((c=='l') || (c=='L'))
+                        opt_do_list = 1;
+                    if ((c=='v') || (c=='V'))
+                        opt_do_list = 1;
+                    if ((c=='x') || (c=='X'))
+                        opt_do_extract = 1;
+                    if ((c=='e') || (c=='E'))
+                        opt_do_extract = opt_do_extract_withoutpath = 1;
+                    if ((c=='o') || (c=='O'))
+                        opt_overwrite=1;
+                    if ((c=='d') || (c=='D'))
+                    {
+                        opt_extractdir=1;
+                        dirname=argv[i+1];
+                    }
+
+                    if (((c=='p') || (c=='P')) && (i+1<argc))
+                    {
+                        password=argv[i+1];
+                        i++;
+                    }
+                }
+            }
+            else
+            {
+                if (zipfilename == NULL)
+                    zipfilename = argv[i];
+                else if ((filename_to_extract==NULL) && (!opt_extractdir))
+                        filename_to_extract = argv[i] ;
+            }
+        }
+    }
+
+    if (zipfilename!=NULL)
+    {
+
+#        ifdef USEWIN32IOAPI
+        zlib_filefunc64_def ffunc;
+#        endif
+
+        strncpy(filename_try, zipfilename,MAXFILENAME-1);
+        /* strncpy doesnt append the trailing NULL, of the string is too long. */
+        filename_try[ MAXFILENAME ] = '\0';
+
+#        ifdef USEWIN32IOAPI
+        fill_win32_filefunc64A(&ffunc);
+        uf = unzOpen2_64(zipfilename,&ffunc);
+#        else
+        uf = unzOpen64(zipfilename);
+#        endif
+        if (uf==NULL)
+        {
+            strcat(filename_try,".zip");
+#            ifdef USEWIN32IOAPI
+            uf = unzOpen2_64(filename_try,&ffunc);
+#            else
+            uf = unzOpen64(filename_try);
+#            endif
+        }
+    }
+
+    if (uf==NULL)
+    {
+        printf("Cannot open %s or %s.zip\n",zipfilename,zipfilename);
+        return 1;
+    }
+    printf("%s opened\n",filename_try);
+
+    if (opt_do_list==1)
+        ret_value = do_list(uf);
+    else if (opt_do_extract==1)
+    {
+#ifdef _WIN32
+        if (opt_extractdir && _chdir(dirname))
+#else
+        if (opt_extractdir && chdir(dirname))
+#endif
+        {
+          printf("Error changing into %s, aborting\n", dirname);
+          exit(-1);
+        }
+
+        if (filename_to_extract == NULL)
+            ret_value = do_extract(uf, opt_do_extract_withoutpath, opt_overwrite, password);
+        else
+            ret_value = do_extract_onefile(uf, filename_to_extract, opt_do_extract_withoutpath, opt_overwrite, password);
+    }
+
+    unzClose(uf);
+
+    return ret_value;
+}
diff --git a/DSView/pv/minizip/minizip.c b/DSView/pv/minizip/minizip.c
new file mode 100644
index 00000000..4288962e
--- /dev/null
+++ b/DSView/pv/minizip/minizip.c
@@ -0,0 +1,520 @@
+/*
+   minizip.c
+   Version 1.1, February 14h, 2010
+   sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications of Unzip for Zip64
+         Copyright (C) 2007-2008 Even Rouault
+
+         Modifications for Zip64 support on both zip and unzip
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+*/
+
+
+#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
+        #ifndef __USE_FILE_OFFSET64
+                #define __USE_FILE_OFFSET64
+        #endif
+        #ifndef __USE_LARGEFILE64
+                #define __USE_LARGEFILE64
+        #endif
+        #ifndef _LARGEFILE64_SOURCE
+                #define _LARGEFILE64_SOURCE
+        #endif
+        #ifndef _FILE_OFFSET_BIT
+                #define _FILE_OFFSET_BIT 64
+        #endif
+#endif
+
+#ifdef __APPLE__
+// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
+#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
+#define FTELLO_FUNC(stream) ftello(stream)
+#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
+#else
+#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
+#define FTELLO_FUNC(stream) ftello64(stream)
+#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
+#endif
+
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <errno.h>
+#include <fcntl.h>
+
+#ifdef _WIN32
+# include <direct.h>
+# include <io.h>
+#else
+# include <unistd.h>
+# include <utime.h>
+# include <sys/types.h>
+# include <sys/stat.h>
+#endif
+
+#include "zip.h"
+
+#ifdef _WIN32
+        #define USEWIN32IOAPI
+        #include "iowin32.h"
+#endif
+
+
+
+#define WRITEBUFFERSIZE (16384)
+#define MAXFILENAME (256)
+
+#ifdef _WIN32
+uLong filetime(f, tmzip, dt)
+    char *f;                /* name of file to get info on */
+    tm_zip *tmzip;             /* return value: access, modific. and creation times */
+    uLong *dt;             /* dostime */
+{
+  int ret = 0;
+  {
+      FILETIME ftLocal;
+      HANDLE hFind;
+      WIN32_FIND_DATAA ff32;
+
+      hFind = FindFirstFileA(f,&ff32);
+      if (hFind != INVALID_HANDLE_VALUE)
+      {
+        FileTimeToLocalFileTime(&(ff32.ftLastWriteTime),&ftLocal);
+        FileTimeToDosDateTime(&ftLocal,((LPWORD)dt)+1,((LPWORD)dt)+0);
+        FindClose(hFind);
+        ret = 1;
+      }
+  }
+  return ret;
+}
+#else
+#ifdef unix || __APPLE__
+uLong filetime(f, tmzip, dt)
+    char *f;               /* name of file to get info on */
+    tm_zip *tmzip;         /* return value: access, modific. and creation times */
+    uLong *dt;             /* dostime */
+{
+  int ret=0;
+  struct stat s;        /* results of stat() */
+  struct tm* filedate;
+  time_t tm_t=0;
+
+  if (strcmp(f,"-")!=0)
+  {
+    char name[MAXFILENAME+1];
+    int len = strlen(f);
+    if (len > MAXFILENAME)
+      len = MAXFILENAME;
+
+    strncpy(name, f,MAXFILENAME-1);
+    /* strncpy doesnt append the trailing NULL, of the string is too long. */
+    name[ MAXFILENAME ] = '\0';
+
+    if (name[len - 1] == '/')
+      name[len - 1] = '\0';
+    /* not all systems allow stat'ing a file with / appended */
+    if (stat(name,&s)==0)
+    {
+      tm_t = s.st_mtime;
+      ret = 1;
+    }
+  }
+  filedate = localtime(&tm_t);
+
+  tmzip->tm_sec  = filedate->tm_sec;
+  tmzip->tm_min  = filedate->tm_min;
+  tmzip->tm_hour = filedate->tm_hour;
+  tmzip->tm_mday = filedate->tm_mday;
+  tmzip->tm_mon  = filedate->tm_mon ;
+  tmzip->tm_year = filedate->tm_year;
+
+  return ret;
+}
+#else
+uLong filetime(f, tmzip, dt)
+    char *f;                /* name of file to get info on */
+    tm_zip *tmzip;             /* return value: access, modific. and creation times */
+    uLong *dt;             /* dostime */
+{
+    return 0;
+}
+#endif
+#endif
+
+
+
+
+int check_exist_file(filename)
+    const char* filename;
+{
+    FILE* ftestexist;
+    int ret = 1;
+    ftestexist = FOPEN_FUNC(filename,"rb");
+    if (ftestexist==NULL)
+        ret = 0;
+    else
+        fclose(ftestexist);
+    return ret;
+}
+
+void do_banner()
+{
+    printf("MiniZip 1.1, demo of zLib + MiniZip64 package, written by Gilles Vollant\n");
+    printf("more info on MiniZip at http://www.winimage.com/zLibDll/minizip.html\n\n");
+}
+
+void do_help()
+{
+    printf("Usage : minizip [-o] [-a] [-0 to -9] [-p password] [-j] file.zip [files_to_add]\n\n" \
+           "  -o  Overwrite existing file.zip\n" \
+           "  -a  Append to existing file.zip\n" \
+           "  -0  Store only\n" \
+           "  -1  Compress faster\n" \
+           "  -9  Compress better\n\n" \
+           "  -j  exclude path. store only the file name.\n\n");
+}
+
+/* calculate the CRC32 of a file,
+   because to encrypt a file, we need known the CRC32 of the file before */
+int getFileCrc(const char* filenameinzip,void*buf,unsigned long size_buf,unsigned long* result_crc)
+{
+   unsigned long calculate_crc=0;
+   int err=ZIP_OK;
+   FILE * fin = FOPEN_FUNC(filenameinzip,"rb");
+
+   unsigned long size_read = 0;
+   unsigned long total_read = 0;
+   if (fin==NULL)
+   {
+       err = ZIP_ERRNO;
+   }
+
+    if (err == ZIP_OK)
+        do
+        {
+            err = ZIP_OK;
+            size_read = (int)fread(buf,1,size_buf,fin);
+            if (size_read < size_buf)
+                if (feof(fin)==0)
+            {
+                printf("error in reading %s\n",filenameinzip);
+                err = ZIP_ERRNO;
+            }
+
+            if (size_read>0)
+                calculate_crc = crc32(calculate_crc,buf,size_read);
+            total_read += size_read;
+
+        } while ((err == ZIP_OK) && (size_read>0));
+
+    if (fin)
+        fclose(fin);
+
+    *result_crc=calculate_crc;
+    printf("file %s crc %lx\n", filenameinzip, calculate_crc);
+    return err;
+}
+
+int isLargeFile(const char* filename)
+{
+  int largeFile = 0;
+  ZPOS64_T pos = 0;
+  FILE* pFile = FOPEN_FUNC(filename, "rb");
+
+  if(pFile != NULL)
+  {
+    int n = FSEEKO_FUNC(pFile, 0, SEEK_END);
+    pos = FTELLO_FUNC(pFile);
+
+                printf("File : %s is %lld bytes\n", filename, pos);
+
+    if(pos >= 0xffffffff)
+     largeFile = 1;
+
+                fclose(pFile);
+  }
+
+ return largeFile;
+}
+
+int main(argc,argv)
+    int argc;
+    char *argv[];
+{
+    int i;
+    int opt_overwrite=0;
+    int opt_compress_level=Z_DEFAULT_COMPRESSION;
+    int opt_exclude_path=0;
+    int zipfilenamearg = 0;
+    char filename_try[MAXFILENAME+16];
+    int zipok;
+    int err=0;
+    int size_buf=0;
+    void* buf=NULL;
+    const char* password=NULL;
+
+
+    do_banner();
+    if (argc==1)
+    {
+        do_help();
+        return 0;
+    }
+    else
+    {
+        for (i=1;i<argc;i++)
+        {
+            if ((*argv[i])=='-')
+            {
+                const char *p=argv[i]+1;
+
+                while ((*p)!='\0')
+                {
+                    char c=*(p++);;
+                    if ((c=='o') || (c=='O'))
+                        opt_overwrite = 1;
+                    if ((c=='a') || (c=='A'))
+                        opt_overwrite = 2;
+                    if ((c>='0') && (c<='9'))
+                        opt_compress_level = c-'0';
+                    if ((c=='j') || (c=='J'))
+                        opt_exclude_path = 1;
+
+                    if (((c=='p') || (c=='P')) && (i+1<argc))
+                    {
+                        password=argv[i+1];
+                        i++;
+                    }
+                }
+            }
+            else
+            {
+                if (zipfilenamearg == 0)
+                {
+                    zipfilenamearg = i ;
+                }
+            }
+        }
+    }
+
+    size_buf = WRITEBUFFERSIZE;
+    buf = (void*)malloc(size_buf);
+    if (buf==NULL)
+    {
+        printf("Error allocating memory\n");
+        return ZIP_INTERNALERROR;
+    }
+
+    if (zipfilenamearg==0)
+    {
+        zipok=0;
+    }
+    else
+    {
+        int i,len;
+        int dot_found=0;
+
+        zipok = 1 ;
+        strncpy(filename_try, argv[zipfilenamearg],MAXFILENAME-1);
+        /* strncpy doesnt append the trailing NULL, of the string is too long. */
+        filename_try[ MAXFILENAME ] = '\0';
+
+        len=(int)strlen(filename_try);
+        for (i=0;i<len;i++)
+            if (filename_try[i]=='.')
+                dot_found=1;
+
+        if (dot_found==0)
+            strcat(filename_try,".zip");
+
+        if (opt_overwrite==2)
+        {
+            /* if the file don't exist, we not append file */
+            if (check_exist_file(filename_try)==0)
+                opt_overwrite=1;
+        }
+        else
+        if (opt_overwrite==0)
+            if (check_exist_file(filename_try)!=0)
+            {
+                char rep=0;
+                do
+                {
+                    char answer[128];
+                    int ret;
+                    printf("The file %s exists. Overwrite ? [y]es, [n]o, [a]ppend : ",filename_try);
+                    ret = scanf("%1s",answer);
+                    if (ret != 1)
+                    {
+                       exit(EXIT_FAILURE);
+                    }
+                    rep = answer[0] ;
+                    if ((rep>='a') && (rep<='z'))
+                        rep -= 0x20;
+                }
+                while ((rep!='Y') && (rep!='N') && (rep!='A'));
+                if (rep=='N')
+                    zipok = 0;
+                if (rep=='A')
+                    opt_overwrite = 2;
+            }
+    }
+
+    if (zipok==1)
+    {
+        zipFile zf;
+        int errclose;
+#        ifdef USEWIN32IOAPI
+        zlib_filefunc64_def ffunc;
+        fill_win32_filefunc64A(&ffunc);
+        zf = zipOpen2_64(filename_try,(opt_overwrite==2) ? 2 : 0,NULL,&ffunc);
+#        else
+        zf = zipOpen64(filename_try,(opt_overwrite==2) ? 2 : 0);
+#        endif
+
+        if (zf == NULL)
+        {
+            printf("error opening %s\n",filename_try);
+            err= ZIP_ERRNO;
+        }
+        else
+            printf("creating %s\n",filename_try);
+
+        for (i=zipfilenamearg+1;(i<argc) && (err==ZIP_OK);i++)
+        {
+            if (!((((*(argv[i]))=='-') || ((*(argv[i]))=='/')) &&
+                  ((argv[i][1]=='o') || (argv[i][1]=='O') ||
+                   (argv[i][1]=='a') || (argv[i][1]=='A') ||
+                   (argv[i][1]=='p') || (argv[i][1]=='P') ||
+                   ((argv[i][1]>='0') || (argv[i][1]<='9'))) &&
+                  (strlen(argv[i]) == 2)))
+            {
+                FILE * fin;
+                int size_read;
+                const char* filenameinzip = argv[i];
+                const char *savefilenameinzip;
+                zip_fileinfo zi;
+                unsigned long crcFile=0;
+                int zip64 = 0;
+
+                zi.tmz_date.tm_sec = zi.tmz_date.tm_min = zi.tmz_date.tm_hour =
+                zi.tmz_date.tm_mday = zi.tmz_date.tm_mon = zi.tmz_date.tm_year = 0;
+                zi.dosDate = 0;
+                zi.internal_fa = 0;
+                zi.external_fa = 0;
+                filetime(filenameinzip,&zi.tmz_date,&zi.dosDate);
+
+/*
+                err = zipOpenNewFileInZip(zf,filenameinzip,&zi,
+                                 NULL,0,NULL,0,NULL / * comment * /,
+                                 (opt_compress_level != 0) ? Z_DEFLATED : 0,
+                                 opt_compress_level);
+*/
+                if ((password != NULL) && (err==ZIP_OK))
+                    err = getFileCrc(filenameinzip,buf,size_buf,&crcFile);
+
+                zip64 = isLargeFile(filenameinzip);
+
+                                                         /* The path name saved, should not include a leading slash. */
+               /*if it did, windows/xp and dynazip couldn't read the zip file. */
+                 savefilenameinzip = filenameinzip;
+                 while( savefilenameinzip[0] == '\\' || savefilenameinzip[0] == '/' )
+                 {
+                     savefilenameinzip++;
+                 }
+
+                 /*should the zip file contain any path at all?*/
+                 if( opt_exclude_path )
+                 {
+                     const char *tmpptr;
+                     const char *lastslash = 0;
+                     for( tmpptr = savefilenameinzip; *tmpptr; tmpptr++)
+                     {
+                         if( *tmpptr == '\\' || *tmpptr == '/')
+                         {
+                             lastslash = tmpptr;
+                         }
+                     }
+                     if( lastslash != NULL )
+                     {
+                         savefilenameinzip = lastslash+1; // base filename follows last slash.
+                     }
+                 }
+
+                 /**/
+                err = zipOpenNewFileInZip3_64(zf,savefilenameinzip,&zi,
+                                 NULL,0,NULL,0,NULL /* comment*/,
+                                 (opt_compress_level != 0) ? Z_DEFLATED : 0,
+                                 opt_compress_level,0,
+                                 /* -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, */
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 password,crcFile, zip64);
+
+                if (err != ZIP_OK)
+                    printf("error in opening %s in zipfile\n",filenameinzip);
+                else
+                {
+                    fin = FOPEN_FUNC(filenameinzip,"rb");
+                    if (fin==NULL)
+                    {
+                        err=ZIP_ERRNO;
+                        printf("error in opening %s for reading\n",filenameinzip);
+                    }
+                }
+
+                if (err == ZIP_OK)
+                    do
+                    {
+                        err = ZIP_OK;
+                        size_read = (int)fread(buf,1,size_buf,fin);
+                        if (size_read < size_buf)
+                            if (feof(fin)==0)
+                        {
+                            printf("error in reading %s\n",filenameinzip);
+                            err = ZIP_ERRNO;
+                        }
+
+                        if (size_read>0)
+                        {
+                            err = zipWriteInFileInZip (zf,buf,size_read);
+                            if (err<0)
+                            {
+                                printf("error in writing %s in the zipfile\n",
+                                                 filenameinzip);
+                            }
+
+                        }
+                    } while ((err == ZIP_OK) && (size_read>0));
+
+                if (fin)
+                    fclose(fin);
+
+                if (err<0)
+                    err=ZIP_ERRNO;
+                else
+                {
+                    err = zipCloseFileInZip(zf);
+                    if (err!=ZIP_OK)
+                        printf("error in closing %s in the zipfile\n",
+                                    filenameinzip);
+                }
+            }
+        }
+        errclose = zipClose(zf,NULL);
+        if (errclose != ZIP_OK)
+            printf("error in closing %s\n",filename_try);
+    }
+    else
+    {
+       do_help();
+    }
+
+    free(buf);
+    return 0;
+}
diff --git a/DSView/pv/minizip/mztools.c b/DSView/pv/minizip/mztools.c
new file mode 100644
index 00000000..96891c2e
--- /dev/null
+++ b/DSView/pv/minizip/mztools.c
@@ -0,0 +1,291 @@
+/*
+  Additional tools for Minizip
+  Code: Xavier Roche '2004
+  License: Same as ZLIB (www.gzip.org)
+*/
+
+/* Code */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "zlib.h"
+#include "unzip.h"
+
+#define READ_8(adr)  ((unsigned char)*(adr))
+#define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8) )
+#define READ_32(adr) ( READ_16(adr) | (READ_16((adr)+2) << 16) )
+
+#define WRITE_8(buff, n) do { \
+  *((unsigned char*)(buff)) = (unsigned char) ((n) & 0xff); \
+} while(0)
+#define WRITE_16(buff, n) do { \
+  WRITE_8((unsigned char*)(buff), n); \
+  WRITE_8(((unsigned char*)(buff)) + 1, (n) >> 8); \
+} while(0)
+#define WRITE_32(buff, n) do { \
+  WRITE_16((unsigned char*)(buff), (n) & 0xffff); \
+  WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \
+} while(0)
+
+extern int ZEXPORT unzRepair(file, fileOut, fileOutTmp, nRecovered, bytesRecovered)
+const char* file;
+const char* fileOut;
+const char* fileOutTmp;
+uLong* nRecovered;
+uLong* bytesRecovered;
+{
+  int err = Z_OK;
+  FILE* fpZip = fopen(file, "rb");
+  FILE* fpOut = fopen(fileOut, "wb");
+  FILE* fpOutCD = fopen(fileOutTmp, "wb");
+  if (fpZip != NULL &&  fpOut != NULL) {
+    int entries = 0;
+    uLong totalBytes = 0;
+    char header[30];
+    char filename[1024];
+    char extra[1024];
+    int offset = 0;
+    int offsetCD = 0;
+    while ( fread(header, 1, 30, fpZip) == 30 ) {
+      int currentOffset = offset;
+
+      /* File entry */
+      if (READ_32(header) == 0x04034b50) {
+        unsigned int version = READ_16(header + 4);
+        unsigned int gpflag = READ_16(header + 6);
+        unsigned int method = READ_16(header + 8);
+        unsigned int filetime = READ_16(header + 10);
+        unsigned int filedate = READ_16(header + 12);
+        unsigned int crc = READ_32(header + 14); /* crc */
+        unsigned int cpsize = READ_32(header + 18); /* compressed size */
+        unsigned int uncpsize = READ_32(header + 22); /* uncompressed sz */
+        unsigned int fnsize = READ_16(header + 26); /* file name length */
+        unsigned int extsize = READ_16(header + 28); /* extra field length */
+        filename[0] = extra[0] = '\0';
+
+        /* Header */
+        if (fwrite(header, 1, 30, fpOut) == 30) {
+          offset += 30;
+        } else {
+          err = Z_ERRNO;
+          break;
+        }
+
+        /* Filename */
+        if (fnsize > 0) {
+          if (fnsize < sizeof(filename)) {
+            if (fread(filename, 1, fnsize, fpZip) == fnsize) {
+                if (fwrite(filename, 1, fnsize, fpOut) == fnsize) {
+                offset += fnsize;
+              } else {
+                err = Z_ERRNO;
+                break;
+              }
+            } else {
+              err = Z_ERRNO;
+              break;
+            }
+          } else {
+            err = Z_ERRNO;
+            break;
+          }
+        } else {
+          err = Z_STREAM_ERROR;
+          break;
+        }
+
+        /* Extra field */
+        if (extsize > 0) {
+          if (extsize < sizeof(extra)) {
+            if (fread(extra, 1, extsize, fpZip) == extsize) {
+              if (fwrite(extra, 1, extsize, fpOut) == extsize) {
+                offset += extsize;
+                } else {
+                err = Z_ERRNO;
+                break;
+              }
+            } else {
+              err = Z_ERRNO;
+              break;
+            }
+          } else {
+            err = Z_ERRNO;
+            break;
+          }
+        }
+
+        /* Data */
+        {
+          int dataSize = cpsize;
+          if (dataSize == 0) {
+            dataSize = uncpsize;
+          }
+          if (dataSize > 0) {
+            char* data = malloc(dataSize);
+            if (data != NULL) {
+              if ((int)fread(data, 1, dataSize, fpZip) == dataSize) {
+                if ((int)fwrite(data, 1, dataSize, fpOut) == dataSize) {
+                  offset += dataSize;
+                  totalBytes += dataSize;
+                } else {
+                  err = Z_ERRNO;
+                }
+              } else {
+                err = Z_ERRNO;
+              }
+              free(data);
+              if (err != Z_OK) {
+                break;
+              }
+            } else {
+              err = Z_MEM_ERROR;
+              break;
+            }
+          }
+        }
+
+        /* Central directory entry */
+        {
+          char header[46];
+          char* comment = "";
+          int comsize = (int) strlen(comment);
+          WRITE_32(header, 0x02014b50);
+          WRITE_16(header + 4, version);
+          WRITE_16(header + 6, version);
+          WRITE_16(header + 8, gpflag);
+          WRITE_16(header + 10, method);
+          WRITE_16(header + 12, filetime);
+          WRITE_16(header + 14, filedate);
+          WRITE_32(header + 16, crc);
+          WRITE_32(header + 20, cpsize);
+          WRITE_32(header + 24, uncpsize);
+          WRITE_16(header + 28, fnsize);
+          WRITE_16(header + 30, extsize);
+          WRITE_16(header + 32, comsize);
+          WRITE_16(header + 34, 0);     /* disk # */
+          WRITE_16(header + 36, 0);     /* int attrb */
+          WRITE_32(header + 38, 0);     /* ext attrb */
+          WRITE_32(header + 42, currentOffset);
+          /* Header */
+          if (fwrite(header, 1, 46, fpOutCD) == 46) {
+            offsetCD += 46;
+
+            /* Filename */
+            if (fnsize > 0) {
+              if (fwrite(filename, 1, fnsize, fpOutCD) == fnsize) {
+                offsetCD += fnsize;
+              } else {
+                err = Z_ERRNO;
+                break;
+              }
+            } else {
+              err = Z_STREAM_ERROR;
+              break;
+            }
+
+            /* Extra field */
+            if (extsize > 0) {
+              if (fwrite(extra, 1, extsize, fpOutCD) == extsize) {
+                offsetCD += extsize;
+              } else {
+                err = Z_ERRNO;
+                break;
+              }
+            }
+
+            /* Comment field */
+            if (comsize > 0) {
+              if ((int)fwrite(comment, 1, comsize, fpOutCD) == comsize) {
+                offsetCD += comsize;
+              } else {
+                err = Z_ERRNO;
+                break;
+              }
+            }
+
+
+          } else {
+            err = Z_ERRNO;
+            break;
+          }
+        }
+
+        /* Success */
+        entries++;
+
+      } else {
+        break;
+      }
+    }
+
+    /* Final central directory  */
+    {
+      int entriesZip = entries;
+      char header[22];
+      char* comment = ""; // "ZIP File recovered by zlib/minizip/mztools";
+      int comsize = (int) strlen(comment);
+      if (entriesZip > 0xffff) {
+        entriesZip = 0xffff;
+      }
+      WRITE_32(header, 0x06054b50);
+      WRITE_16(header + 4, 0);    /* disk # */
+      WRITE_16(header + 6, 0);    /* disk # */
+      WRITE_16(header + 8, entriesZip);   /* hack */
+      WRITE_16(header + 10, entriesZip);  /* hack */
+      WRITE_32(header + 12, offsetCD);    /* size of CD */
+      WRITE_32(header + 16, offset);      /* offset to CD */
+      WRITE_16(header + 20, comsize);     /* comment */
+
+      /* Header */
+      if (fwrite(header, 1, 22, fpOutCD) == 22) {
+
+        /* Comment field */
+        if (comsize > 0) {
+          if ((int)fwrite(comment, 1, comsize, fpOutCD) != comsize) {
+            err = Z_ERRNO;
+          }
+        }
+
+      } else {
+        err = Z_ERRNO;
+      }
+    }
+
+    /* Final merge (file + central directory) */
+    fclose(fpOutCD);
+    if (err == Z_OK) {
+      fpOutCD = fopen(fileOutTmp, "rb");
+      if (fpOutCD != NULL) {
+        int nRead;
+        char buffer[8192];
+        while ( (nRead = (int)fread(buffer, 1, sizeof(buffer), fpOutCD)) > 0) {
+          if ((int)fwrite(buffer, 1, nRead, fpOut) != nRead) {
+            err = Z_ERRNO;
+            break;
+          }
+        }
+        fclose(fpOutCD);
+      }
+    }
+
+    /* Close */
+    fclose(fpZip);
+    fclose(fpOut);
+
+    /* Wipe temporary file */
+    (void)remove(fileOutTmp);
+
+    /* Number of recovered entries */
+    if (err == Z_OK) {
+      if (nRecovered != NULL) {
+        *nRecovered = entries;
+      }
+      if (bytesRecovered != NULL) {
+        *bytesRecovered = totalBytes;
+      }
+    }
+  } else {
+    err = Z_STREAM_ERROR;
+  }
+  return err;
+}
diff --git a/DSView/pv/minizip/mztools.h b/DSView/pv/minizip/mztools.h
new file mode 100644
index 00000000..a49a426e
--- /dev/null
+++ b/DSView/pv/minizip/mztools.h
@@ -0,0 +1,37 @@
+/*
+  Additional tools for Minizip
+  Code: Xavier Roche '2004
+  License: Same as ZLIB (www.gzip.org)
+*/
+
+#ifndef _zip_tools_H
+#define _zip_tools_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef _ZLIB_H
+#include "zlib.h"
+#endif
+
+#include "unzip.h"
+
+/* Repair a ZIP file (missing central directory)
+   file: file to recover
+   fileOut: output file after recovery
+   fileOutTmp: temporary file name used for recovery
+*/
+extern int ZEXPORT unzRepair(const char* file,
+                             const char* fileOut,
+                             const char* fileOutTmp,
+                             uLong* nRecovered,
+                             uLong* bytesRecovered);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
diff --git a/DSView/pv/minizip/unzip.c b/DSView/pv/minizip/unzip.c
new file mode 100644
index 00000000..bcfb9416
--- /dev/null
+++ b/DSView/pv/minizip/unzip.c
@@ -0,0 +1,2125 @@
+/* unzip.c -- IO for uncompress .zip files using zlib
+   Version 1.1, February 14h, 2010
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications of Unzip for Zip64
+         Copyright (C) 2007-2008 Even Rouault
+
+         Modifications for Zip64 support on both zip and unzip
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+
+  ------------------------------------------------------------------------------------
+  Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
+  compatibility with older software. The following is from the original crypt.c.
+  Code woven in by Terry Thorsen 1/2003.
+
+  Copyright (c) 1990-2000 Info-ZIP.  All rights reserved.
+
+  See the accompanying file LICENSE, version 2000-Apr-09 or later
+  (the contents of which are also included in zip.h) for terms of use.
+  If, for some reason, all these files are missing, the Info-ZIP license
+  also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html
+
+        crypt.c (full version) by Info-ZIP.      Last revised:  [see crypt.h]
+
+  The encryption/decryption parts of this source code (as opposed to the
+  non-echoing password parts) were originally written in Europe.  The
+  whole source package can be freely distributed, including from the USA.
+  (Prior to January 2000, re-export from the US was a violation of US law.)
+
+        This encryption code is a direct transcription of the algorithm from
+  Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
+  file (appnote.txt) is distributed with the PKZIP program (even in the
+  version without encryption capabilities).
+
+        ------------------------------------------------------------------------------------
+
+        Changes in unzip.c
+
+        2007-2008 - Even Rouault - Addition of cpl_unzGetCurrentFileZStreamPos
+  2007-2008 - Even Rouault - Decoration of symbol names unz* -> cpl_unz*
+  2007-2008 - Even Rouault - Remove old C style function prototypes
+  2007-2008 - Even Rouault - Add unzip support for ZIP64
+
+        Copyright (C) 2007-2008 Even Rouault
+
+
+        Oct-2009 - Mathias Svensson - Removed cpl_* from symbol names (Even Rouault added them but since this is now moved to a new project (minizip64) I renamed them again).
+  Oct-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G
+                                should only read the compressed/uncompressed size from the Zip64 format if
+                                the size from normal header was 0xFFFFFFFF
+  Oct-2009 - Mathias Svensson - Applied some bug fixes from paches recived from Gilles Vollant
+        Oct-2009 - Mathias Svensson - Applied support to unzip files with compression mathod BZIP2 (bzip2 lib is required)
+                                Patch created by Daniel Borca
+
+  Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
+
+  Copyright (C) 1998 - 2010 Gilles Vollant, Even Rouault, Mathias Svensson
+
+*/
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef NOUNCRYPT
+        #define NOUNCRYPT
+#endif
+
+#include "zlib.h"
+#include "unzip.h"
+
+#ifdef STDC
+#  include <stddef.h>
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+#ifdef NO_ERRNO_H
+    extern int errno;
+#else
+#   include <errno.h>
+#endif
+
+
+#ifndef local
+#  define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
+
+
+#ifndef CASESENSITIVITYDEFAULT_NO
+#  if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES)
+#    define CASESENSITIVITYDEFAULT_NO
+#  endif
+#endif
+
+
+#ifndef UNZ_BUFSIZE
+#define UNZ_BUFSIZE (16384)
+#endif
+
+#ifndef UNZ_MAXFILENAMEINZIP
+#define UNZ_MAXFILENAMEINZIP (256)
+#endif
+
+#ifndef ALLOC
+# define ALLOC(size) (malloc(size))
+#endif
+#ifndef TRYFREE
+# define TRYFREE(p) {if (p) free(p);}
+#endif
+
+#define SIZECENTRALDIRITEM (0x2e)
+#define SIZEZIPLOCALHEADER (0x1e)
+
+
+const char unz_copyright[] =
+   " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
+
+/* unz_file_info_interntal contain internal info about a file in zipfile*/
+typedef struct unz_file_info64_internal_s
+{
+    ZPOS64_T offset_curfile;/* relative offset of local header 8 bytes */
+} unz_file_info64_internal;
+
+
+/* file_in_zip_read_info_s contain internal information about a file in zipfile,
+    when reading and decompress it */
+typedef struct
+{
+    char  *read_buffer;         /* internal buffer for compressed data */
+    z_stream stream;            /* zLib stream structure for inflate */
+
+#ifdef HAVE_BZIP2
+    bz_stream bstream;          /* bzLib stream structure for bziped */
+#endif
+
+    ZPOS64_T pos_in_zipfile;       /* position in byte on the zipfile, for fseek*/
+    uLong stream_initialised;   /* flag set if stream structure is initialised*/
+
+    ZPOS64_T offset_local_extrafield;/* offset of the local extra field */
+    uInt  size_local_extrafield;/* size of the local extra field */
+    ZPOS64_T pos_local_extrafield;   /* position in the local extra field in read*/
+    ZPOS64_T total_out_64;
+
+    uLong crc32;                /* crc32 of all data uncompressed */
+    uLong crc32_wait;           /* crc32 we must obtain after decompress all */
+    ZPOS64_T rest_read_compressed; /* number of byte to be decompressed */
+    ZPOS64_T rest_read_uncompressed;/*number of byte to be obtained after decomp*/
+    zlib_filefunc64_32_def z_filefunc;
+    voidpf filestream;        /* io structore of the zipfile */
+    uLong compression_method;   /* compression method (0==store) */
+    ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+    int   raw;
+} file_in_zip64_read_info_s;
+
+
+/* unz64_s contain internal information about the zipfile
+*/
+typedef struct
+{
+    zlib_filefunc64_32_def z_filefunc;
+    int is64bitOpenFunction;
+    voidpf filestream;        /* io structore of the zipfile */
+    unz_global_info64 gi;       /* public global information */
+    ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+    ZPOS64_T num_file;             /* number of the current file in the zipfile*/
+    ZPOS64_T pos_in_central_dir;   /* pos of the current file in the central dir*/
+    ZPOS64_T current_file_ok;      /* flag about the usability of the current file*/
+    ZPOS64_T central_pos;          /* position of the beginning of the central dir*/
+
+    ZPOS64_T size_central_dir;     /* size of the central directory  */
+    ZPOS64_T offset_central_dir;   /* offset of start of central directory with
+                                   respect to the starting disk number */
+
+    unz_file_info64 cur_file_info; /* public info about the current file in zip*/
+    unz_file_info64_internal cur_file_info_internal; /* private info about it*/
+    file_in_zip64_read_info_s* pfile_in_zip_read; /* structure about the current
+                                        file if we are decompressing it */
+    int encrypted;
+
+    int isZip64;
+
+#    ifndef NOUNCRYPT
+    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
+    const z_crc_t* pcrc_32_tab;
+#    endif
+} unz64_s;
+
+
+#ifndef NOUNCRYPT
+#include "crypt.h"
+#endif
+
+/* ===========================================================================
+     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
+   for end of file.
+   IN assertion: the stream s has been successfully opened for reading.
+*/
+
+
+local int unz64local_getByte OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
+    voidpf filestream,
+    int *pi));
+
+local int unz64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi)
+{
+    unsigned char c;
+    int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
+    if (err==1)
+    {
+        *pi = (int)c;
+        return UNZ_OK;
+    }
+    else
+    {
+        if (ZERROR64(*pzlib_filefunc_def,filestream))
+            return UNZ_ERRNO;
+        else
+            return UNZ_EOF;
+    }
+}
+
+
+/* ===========================================================================
+   Reads a long in LSB order from the given gz_stream. Sets
+*/
+local int unz64local_getShort OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
+    voidpf filestream,
+    uLong *pX));
+
+local int unz64local_getShort (const zlib_filefunc64_32_def* pzlib_filefunc_def,
+                             voidpf filestream,
+                             uLong *pX)
+{
+    uLong x ;
+    int i = 0;
+    int err;
+
+    err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (uLong)i;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((uLong)i)<<8;
+
+    if (err==UNZ_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+local int unz64local_getLong OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
+    voidpf filestream,
+    uLong *pX));
+
+local int unz64local_getLong (const zlib_filefunc64_32_def* pzlib_filefunc_def,
+                            voidpf filestream,
+                            uLong *pX)
+{
+    uLong x ;
+    int i = 0;
+    int err;
+
+    err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (uLong)i;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((uLong)i)<<8;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((uLong)i)<<16;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<24;
+
+    if (err==UNZ_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+local int unz64local_getLong64 OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
+    voidpf filestream,
+    ZPOS64_T *pX));
+
+
+local int unz64local_getLong64 (const zlib_filefunc64_32_def* pzlib_filefunc_def,
+                            voidpf filestream,
+                            ZPOS64_T *pX)
+{
+    ZPOS64_T x ;
+    int i = 0;
+    int err;
+
+    err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (ZPOS64_T)i;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<8;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<16;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<24;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<32;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<40;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<48;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<56;
+
+    if (err==UNZ_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+/* My own strcmpi / strcasecmp */
+local int strcmpcasenosensitive_internal (const char* fileName1, const char* fileName2)
+{
+    for (;;)
+    {
+        char c1=*(fileName1++);
+        char c2=*(fileName2++);
+        if ((c1>='a') && (c1<='z'))
+            c1 -= 0x20;
+        if ((c2>='a') && (c2<='z'))
+            c2 -= 0x20;
+        if (c1=='\0')
+            return ((c2=='\0') ? 0 : -1);
+        if (c2=='\0')
+            return 1;
+        if (c1<c2)
+            return -1;
+        if (c1>c2)
+            return 1;
+    }
+}
+
+
+#ifdef  CASESENSITIVITYDEFAULT_NO
+#define CASESENSITIVITYDEFAULTVALUE 2
+#else
+#define CASESENSITIVITYDEFAULTVALUE 1
+#endif
+
+#ifndef STRCMPCASENOSENTIVEFUNCTION
+#define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal
+#endif
+
+/*
+   Compare two filename (fileName1,fileName2).
+   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
+   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
+                                                                or strcasecmp)
+   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
+        (like 1 on Unix, 2 on Windows)
+
+*/
+extern int ZEXPORT unzStringFileNameCompare (const char*  fileName1,
+                                                 const char*  fileName2,
+                                                 int iCaseSensitivity)
+
+{
+    if (iCaseSensitivity==0)
+        iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
+
+    if (iCaseSensitivity==1)
+        return strcmp(fileName1,fileName2);
+
+    return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);
+}
+
+#ifndef BUFREADCOMMENT
+#define BUFREADCOMMENT (0x400)
+#endif
+
+/*
+  Locate the Central directory of a zipfile (at the end, just before
+    the global comment)
+*/
+local ZPOS64_T unz64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
+local ZPOS64_T unz64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
+{
+    unsigned char* buf;
+    ZPOS64_T uSizeFile;
+    ZPOS64_T uBackRead;
+    ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
+    ZPOS64_T uPosFound=0;
+
+    if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+        return 0;
+
+
+    uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
+
+    if (uMaxBack>uSizeFile)
+        uMaxBack = uSizeFile;
+
+    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+    if (buf==NULL)
+        return 0;
+
+    uBackRead = 4;
+    while (uBackRead<uMaxBack)
+    {
+        uLong uReadSize;
+        ZPOS64_T uReadPos ;
+        int i;
+        if (uBackRead+BUFREADCOMMENT>uMaxBack)
+            uBackRead = uMaxBack;
+        else
+            uBackRead+=BUFREADCOMMENT;
+        uReadPos = uSizeFile-uBackRead ;
+
+        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+                     (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
+        if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            break;
+
+        if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+            break;
+
+        for (i=(int)uReadSize-3; (i--)>0;)
+            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
+                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
+            {
+                uPosFound = uReadPos+i;
+                break;
+            }
+
+        if (uPosFound!=0)
+            break;
+    }
+    TRYFREE(buf);
+    return uPosFound;
+}
+
+
+/*
+  Locate the Central directory 64 of a zipfile (at the end, just before
+    the global comment)
+*/
+local ZPOS64_T unz64local_SearchCentralDir64 OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
+    voidpf filestream));
+
+local ZPOS64_T unz64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def,
+                                      voidpf filestream)
+{
+    unsigned char* buf;
+    ZPOS64_T uSizeFile;
+    ZPOS64_T uBackRead;
+    ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
+    ZPOS64_T uPosFound=0;
+    uLong uL;
+                ZPOS64_T relativeOffset;
+
+    if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+        return 0;
+
+
+    uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
+
+    if (uMaxBack>uSizeFile)
+        uMaxBack = uSizeFile;
+
+    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+    if (buf==NULL)
+        return 0;
+
+    uBackRead = 4;
+    while (uBackRead<uMaxBack)
+    {
+        uLong uReadSize;
+        ZPOS64_T uReadPos;
+        int i;
+        if (uBackRead+BUFREADCOMMENT>uMaxBack)
+            uBackRead = uMaxBack;
+        else
+            uBackRead+=BUFREADCOMMENT;
+        uReadPos = uSizeFile-uBackRead ;
+
+        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+                     (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
+        if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            break;
+
+        if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+            break;
+
+        for (i=(int)uReadSize-3; (i--)>0;)
+            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
+                ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
+            {
+                uPosFound = uReadPos+i;
+                break;
+            }
+
+        if (uPosFound!=0)
+            break;
+    }
+    TRYFREE(buf);
+    if (uPosFound == 0)
+        return 0;
+
+    /* Zip64 end of central directory locator */
+    if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return 0;
+
+    /* the signature, already checked */
+    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
+        return 0;
+
+    /* number of the disk with the start of the zip64 end of  central directory */
+    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
+        return 0;
+    if (uL != 0)
+        return 0;
+
+    /* relative offset of the zip64 end of central directory record */
+    if (unz64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=UNZ_OK)
+        return 0;
+
+    /* total number of disks */
+    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
+        return 0;
+    if (uL != 1)
+        return 0;
+
+    /* Goto end of central directory record */
+    if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return 0;
+
+     /* the signature */
+    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
+        return 0;
+
+    if (uL != 0x06064b50)
+        return 0;
+
+    return relativeOffset;
+}
+
+/*
+  Open a Zip file. path contain the full pathname (by example,
+     on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer
+     "zlib/zlib114.zip".
+     If the zipfile cannot be opened (file doesn't exist or in not valid), the
+       return value is NULL.
+     Else, the return value is a unzFile Handle, usable with other function
+       of this unzip package.
+*/
+local unzFile unzOpenInternal (const void *path,
+                               zlib_filefunc64_32_def* pzlib_filefunc64_32_def,
+                               int is64bitOpenFunction)
+{
+    unz64_s us;
+    unz64_s *s;
+    ZPOS64_T central_pos;
+    uLong   uL;
+
+    uLong number_disk;          /* number of the current dist, used for
+                                   spaning ZIP, unsupported, always 0*/
+    uLong number_disk_with_CD;  /* number the the disk with central dir, used
+                                   for spaning ZIP, unsupported, always 0*/
+    ZPOS64_T number_entry_CD;      /* total number of entries in
+                                   the central dir
+                                   (same than number_entry on nospan) */
+
+    int err=UNZ_OK;
+
+    if (unz_copyright[0]!=' ')
+        return NULL;
+
+    us.z_filefunc.zseek32_file = NULL;
+    us.z_filefunc.ztell32_file = NULL;
+    if (pzlib_filefunc64_32_def==NULL)
+        fill_fopen64_filefunc(&us.z_filefunc.zfile_func64);
+    else
+        us.z_filefunc = *pzlib_filefunc64_32_def;
+    us.is64bitOpenFunction = is64bitOpenFunction;
+
+
+
+    us.filestream = ZOPEN64(us.z_filefunc,
+                                                 path,
+                                                 ZLIB_FILEFUNC_MODE_READ |
+                                                 ZLIB_FILEFUNC_MODE_EXISTING);
+    if (us.filestream==NULL)
+        return NULL;
+
+    central_pos = unz64local_SearchCentralDir64(&us.z_filefunc,us.filestream);
+    if (central_pos)
+    {
+        uLong uS;
+        ZPOS64_T uL64;
+
+        us.isZip64 = 1;
+
+        if (ZSEEK64(us.z_filefunc, us.filestream,
+                                      central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        err=UNZ_ERRNO;
+
+        /* the signature, already checked */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* size of zip64 end of central directory record */
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&uL64)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* version made by */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uS)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* version needed to extract */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uS)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* number of this disk */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* number of the disk with the start of the central directory */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* total number of entries in the central directory on this disk */
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* total number of entries in the central directory */
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        if ((number_entry_CD!=us.gi.number_entry) ||
+            (number_disk_with_CD!=0) ||
+            (number_disk!=0))
+            err=UNZ_BADZIPFILE;
+
+        /* size of the central directory */
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* offset of start of central directory with respect to the
+          starting disk number */
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        us.gi.size_comment = 0;
+    }
+    else
+    {
+        central_pos = unz64local_SearchCentralDir(&us.z_filefunc,us.filestream);
+        if (central_pos==0)
+            err=UNZ_ERRNO;
+
+        us.isZip64 = 0;
+
+        if (ZSEEK64(us.z_filefunc, us.filestream,
+                                        central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            err=UNZ_ERRNO;
+
+        /* the signature, already checked */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* number of this disk */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* number of the disk with the start of the central directory */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* total number of entries in the central dir on this disk */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+        us.gi.number_entry = uL;
+
+        /* total number of entries in the central dir */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+        number_entry_CD = uL;
+
+        if ((number_entry_CD!=us.gi.number_entry) ||
+            (number_disk_with_CD!=0) ||
+            (number_disk!=0))
+            err=UNZ_BADZIPFILE;
+
+        /* size of the central directory */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+        us.size_central_dir = uL;
+
+        /* offset of start of central directory with respect to the
+            starting disk number */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+        us.offset_central_dir = uL;
+
+        /* zipfile comment length */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)
+            err=UNZ_ERRNO;
+    }
+
+    if ((central_pos<us.offset_central_dir+us.size_central_dir) &&
+        (err==UNZ_OK))
+        err=UNZ_BADZIPFILE;
+
+    if (err!=UNZ_OK)
+    {
+        ZCLOSE64(us.z_filefunc, us.filestream);
+        return NULL;
+    }
+
+    us.byte_before_the_zipfile = central_pos -
+                            (us.offset_central_dir+us.size_central_dir);
+    us.central_pos = central_pos;
+    us.pfile_in_zip_read = NULL;
+    us.encrypted = 0;
+
+
+    s=(unz64_s*)ALLOC(sizeof(unz64_s));
+    if( s != NULL)
+    {
+        *s=us;
+        unzGoToFirstFile((unzFile)s);
+    }
+    return (unzFile)s;
+}
+
+
+extern unzFile ZEXPORT unzOpen2 (const char *path,
+                                        zlib_filefunc_def* pzlib_filefunc32_def)
+{
+    if (pzlib_filefunc32_def != NULL)
+    {
+        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
+        fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
+        return unzOpenInternal(path, &zlib_filefunc64_32_def_fill, 0);
+    }
+    else
+        return unzOpenInternal(path, NULL, 0);
+}
+
+extern unzFile ZEXPORT unzOpen2_64 (const void *path,
+                                     zlib_filefunc64_def* pzlib_filefunc_def)
+{
+    if (pzlib_filefunc_def != NULL)
+    {
+        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
+        zlib_filefunc64_32_def_fill.zfile_func64 = *pzlib_filefunc_def;
+        zlib_filefunc64_32_def_fill.ztell32_file = NULL;
+        zlib_filefunc64_32_def_fill.zseek32_file = NULL;
+        return unzOpenInternal(path, &zlib_filefunc64_32_def_fill, 1);
+    }
+    else
+        return unzOpenInternal(path, NULL, 1);
+}
+
+extern unzFile ZEXPORT unzOpen (const char *path)
+{
+    return unzOpenInternal(path, NULL, 0);
+}
+
+extern unzFile ZEXPORT unzOpen64 (const void *path)
+{
+    return unzOpenInternal(path, NULL, 1);
+}
+
+/*
+  Close a ZipFile opened with unzOpen.
+  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
+    these files MUST be closed with unzCloseCurrentFile before call unzClose.
+  return UNZ_OK if there is no problem. */
+extern int ZEXPORT unzClose (unzFile file)
+{
+    unz64_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+
+    if (s->pfile_in_zip_read!=NULL)
+        unzCloseCurrentFile(file);
+
+    ZCLOSE64(s->z_filefunc, s->filestream);
+    TRYFREE(s);
+    return UNZ_OK;
+}
+
+
+/*
+  Write info about the ZipFile in the *pglobal_info structure.
+  No preparation of the structure is needed
+  return UNZ_OK if there is no problem. */
+extern int ZEXPORT unzGetGlobalInfo64 (unzFile file, unz_global_info64* pglobal_info)
+{
+    unz64_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    *pglobal_info=s->gi;
+    return UNZ_OK;
+}
+
+extern int ZEXPORT unzGetGlobalInfo (unzFile file, unz_global_info* pglobal_info32)
+{
+    unz64_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    /* to do : check if number_entry is not truncated */
+    pglobal_info32->number_entry = (uLong)s->gi.number_entry;
+    pglobal_info32->size_comment = s->gi.size_comment;
+    return UNZ_OK;
+}
+/*
+   Translate date/time from Dos format to tm_unz (readable more easilty)
+*/
+local void unz64local_DosDateToTmuDate (ZPOS64_T ulDosDate, tm_unz* ptm)
+{
+    ZPOS64_T uDate;
+    uDate = (ZPOS64_T)(ulDosDate>>16);
+    ptm->tm_mday = (uInt)(uDate&0x1f) ;
+    ptm->tm_mon =  (uInt)((((uDate)&0x1E0)/0x20)-1) ;
+    ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;
+
+    ptm->tm_hour = (uInt) ((ulDosDate &0xF800)/0x800);
+    ptm->tm_min =  (uInt) ((ulDosDate&0x7E0)/0x20) ;
+    ptm->tm_sec =  (uInt) (2*(ulDosDate&0x1f)) ;
+}
+
+/*
+  Get Info about the current file in the zipfile, with internal only info
+*/
+local int unz64local_GetCurrentFileInfoInternal OF((unzFile file,
+                                                  unz_file_info64 *pfile_info,
+                                                  unz_file_info64_internal
+                                                  *pfile_info_internal,
+                                                  char *szFileName,
+                                                  uLong fileNameBufferSize,
+                                                  void *extraField,
+                                                  uLong extraFieldBufferSize,
+                                                  char *szComment,
+                                                  uLong commentBufferSize));
+
+local int unz64local_GetCurrentFileInfoInternal (unzFile file,
+                                                  unz_file_info64 *pfile_info,
+                                                  unz_file_info64_internal
+                                                  *pfile_info_internal,
+                                                  char *szFileName,
+                                                  uLong fileNameBufferSize,
+                                                  void *extraField,
+                                                  uLong extraFieldBufferSize,
+                                                  char *szComment,
+                                                  uLong commentBufferSize)
+{
+    unz64_s* s;
+    unz_file_info64 file_info;
+    unz_file_info64_internal file_info_internal;
+    int err=UNZ_OK;
+    uLong uMagic;
+    long lSeek=0;
+    uLong uL;
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    if (ZSEEK64(s->z_filefunc, s->filestream,
+              s->pos_in_central_dir+s->byte_before_the_zipfile,
+              ZLIB_FILEFUNC_SEEK_SET)!=0)
+        err=UNZ_ERRNO;
+
+
+    /* we check the magic */
+    if (err==UNZ_OK)
+    {
+        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
+            err=UNZ_ERRNO;
+        else if (uMagic!=0x02014b50)
+            err=UNZ_BADZIPFILE;
+    }
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    unz64local_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
+        err=UNZ_ERRNO;
+    file_info.compressed_size = uL;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
+        err=UNZ_ERRNO;
+    file_info.uncompressed_size = uL;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+                // relative offset of local header
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
+        err=UNZ_ERRNO;
+    file_info_internal.offset_curfile = uL;
+
+    lSeek+=file_info.size_filename;
+    if ((err==UNZ_OK) && (szFileName!=NULL))
+    {
+        uLong uSizeRead ;
+        if (file_info.size_filename<fileNameBufferSize)
+        {
+            *(szFileName+file_info.size_filename)='\0';
+            uSizeRead = file_info.size_filename;
+        }
+        else
+            uSizeRead = fileNameBufferSize;
+
+        if ((file_info.size_filename>0) && (fileNameBufferSize>0))
+            if (ZREAD64(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
+                err=UNZ_ERRNO;
+        lSeek -= uSizeRead;
+    }
+
+    // Read extrafield
+    if ((err==UNZ_OK) && (extraField!=NULL))
+    {
+        ZPOS64_T uSizeRead ;
+        if (file_info.size_file_extra<extraFieldBufferSize)
+            uSizeRead = file_info.size_file_extra;
+        else
+            uSizeRead = extraFieldBufferSize;
+
+        if (lSeek!=0)
+        {
+            if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+                lSeek=0;
+            else
+                err=UNZ_ERRNO;
+        }
+
+        if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
+            if (ZREAD64(s->z_filefunc, s->filestream,extraField,(uLong)uSizeRead)!=uSizeRead)
+                err=UNZ_ERRNO;
+
+        lSeek += file_info.size_file_extra - (uLong)uSizeRead;
+    }
+    else
+        lSeek += file_info.size_file_extra;
+
+
+    if ((err==UNZ_OK) && (file_info.size_file_extra != 0))
+    {
+                                uLong acc = 0;
+
+        // since lSeek now points to after the extra field we need to move back
+        lSeek -= file_info.size_file_extra;
+
+        if (lSeek!=0)
+        {
+            if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+                lSeek=0;
+            else
+                err=UNZ_ERRNO;
+        }
+
+        while(acc < file_info.size_file_extra)
+        {
+            uLong headerId;
+                                                uLong dataSize;
+
+            if (unz64local_getShort(&s->z_filefunc, s->filestream,&headerId) != UNZ_OK)
+                err=UNZ_ERRNO;
+
+            if (unz64local_getShort(&s->z_filefunc, s->filestream,&dataSize) != UNZ_OK)
+                err=UNZ_ERRNO;
+
+            /* ZIP64 extra fields */
+            if (headerId == 0x0001)
+            {
+                                                        uLong uL;
+
+                                                                if(file_info.uncompressed_size == MAXU32)
+                                                                {
+                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
+                                                                                        err=UNZ_ERRNO;
+                                                                }
+
+                                                                if(file_info.compressed_size == MAXU32)
+                                                                {
+                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
+                                                                                  err=UNZ_ERRNO;
+                                                                }
+
+                                                                if(file_info_internal.offset_curfile == MAXU32)
+                                                                {
+                                                                        /* Relative Header offset */
+                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
+                                                                                err=UNZ_ERRNO;
+                                                                }
+
+                                                                if(file_info.disk_num_start == MAXU32)
+                                                                {
+                                                                        /* Disk Start Number */
+                                                                        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
+                                                                                err=UNZ_ERRNO;
+                                                                }
+
+            }
+            else
+            {
+                if (ZSEEK64(s->z_filefunc, s->filestream,dataSize,ZLIB_FILEFUNC_SEEK_CUR)!=0)
+                    err=UNZ_ERRNO;
+            }
+
+            acc += 2 + 2 + dataSize;
+        }
+    }
+
+    if ((err==UNZ_OK) && (szComment!=NULL))
+    {
+        uLong uSizeRead ;
+        if (file_info.size_file_comment<commentBufferSize)
+        {
+            *(szComment+file_info.size_file_comment)='\0';
+            uSizeRead = file_info.size_file_comment;
+        }
+        else
+            uSizeRead = commentBufferSize;
+
+        if (lSeek!=0)
+        {
+            if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+                lSeek=0;
+            else
+                err=UNZ_ERRNO;
+        }
+
+        if ((file_info.size_file_comment>0) && (commentBufferSize>0))
+            if (ZREAD64(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
+                err=UNZ_ERRNO;
+        lSeek+=file_info.size_file_comment - uSizeRead;
+    }
+    else
+        lSeek+=file_info.size_file_comment;
+
+
+    if ((err==UNZ_OK) && (pfile_info!=NULL))
+        *pfile_info=file_info;
+
+    if ((err==UNZ_OK) && (pfile_info_internal!=NULL))
+        *pfile_info_internal=file_info_internal;
+
+    return err;
+}
+
+
+
+/*
+  Write info about the ZipFile in the *pglobal_info structure.
+  No preparation of the structure is needed
+  return UNZ_OK if there is no problem.
+*/
+extern int ZEXPORT unzGetCurrentFileInfo64 (unzFile file,
+                                          unz_file_info64 * pfile_info,
+                                          char * szFileName, uLong fileNameBufferSize,
+                                          void *extraField, uLong extraFieldBufferSize,
+                                          char* szComment,  uLong commentBufferSize)
+{
+    return unz64local_GetCurrentFileInfoInternal(file,pfile_info,NULL,
+                                                szFileName,fileNameBufferSize,
+                                                extraField,extraFieldBufferSize,
+                                                szComment,commentBufferSize);
+}
+
+extern int ZEXPORT unzGetCurrentFileInfo (unzFile file,
+                                          unz_file_info * pfile_info,
+                                          char * szFileName, uLong fileNameBufferSize,
+                                          void *extraField, uLong extraFieldBufferSize,
+                                          char* szComment,  uLong commentBufferSize)
+{
+    int err;
+    unz_file_info64 file_info64;
+    err = unz64local_GetCurrentFileInfoInternal(file,&file_info64,NULL,
+                                                szFileName,fileNameBufferSize,
+                                                extraField,extraFieldBufferSize,
+                                                szComment,commentBufferSize);
+    if ((err==UNZ_OK) && (pfile_info != NULL))
+    {
+        pfile_info->version = file_info64.version;
+        pfile_info->version_needed = file_info64.version_needed;
+        pfile_info->flag = file_info64.flag;
+        pfile_info->compression_method = file_info64.compression_method;
+        pfile_info->dosDate = file_info64.dosDate;
+        pfile_info->crc = file_info64.crc;
+
+        pfile_info->size_filename = file_info64.size_filename;
+        pfile_info->size_file_extra = file_info64.size_file_extra;
+        pfile_info->size_file_comment = file_info64.size_file_comment;
+
+        pfile_info->disk_num_start = file_info64.disk_num_start;
+        pfile_info->internal_fa = file_info64.internal_fa;
+        pfile_info->external_fa = file_info64.external_fa;
+
+        pfile_info->tmu_date = file_info64.tmu_date,
+
+
+        pfile_info->compressed_size = (uLong)file_info64.compressed_size;
+        pfile_info->uncompressed_size = (uLong)file_info64.uncompressed_size;
+
+    }
+    return err;
+}
+/*
+  Set the current file of the zipfile to the first file.
+  return UNZ_OK if there is no problem
+*/
+extern int ZEXPORT unzGoToFirstFile (unzFile file)
+{
+    int err=UNZ_OK;
+    unz64_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    s->pos_in_central_dir=s->offset_central_dir;
+    s->num_file=0;
+    err=unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                             &s->cur_file_info_internal,
+                                             NULL,0,NULL,0,NULL,0);
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+/*
+  Set the current file of the zipfile to the next file.
+  return UNZ_OK if there is no problem
+  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
+*/
+extern int ZEXPORT unzGoToNextFile (unzFile  file)
+{
+    unz64_s* s;
+    int err;
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
+    if (s->gi.number_entry != 0xffff)    /* 2^16 files overflow hack */
+      if (s->num_file+1==s->gi.number_entry)
+        return UNZ_END_OF_LIST_OF_FILE;
+
+    s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
+            s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
+    s->num_file++;
+    err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                               &s->cur_file_info_internal,
+                                               NULL,0,NULL,0,NULL,0);
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+
+/*
+  Try locate the file szFileName in the zipfile.
+  For the iCaseSensitivity signification, see unzStringFileNameCompare
+
+  return value :
+  UNZ_OK if the file is found. It becomes the current file.
+  UNZ_END_OF_LIST_OF_FILE if the file is not found
+*/
+extern int ZEXPORT unzLocateFile (unzFile file, const char *szFileName, int iCaseSensitivity)
+{
+    unz64_s* s;
+    int err;
+
+    /* We remember the 'current' position in the file so that we can jump
+     * back there if we fail.
+     */
+    unz_file_info64 cur_file_infoSaved;
+    unz_file_info64_internal cur_file_info_internalSaved;
+    ZPOS64_T num_fileSaved;
+    ZPOS64_T pos_in_central_dirSaved;
+
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+
+    if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)
+        return UNZ_PARAMERROR;
+
+    s=(unz64_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
+
+    /* Save the current state */
+    num_fileSaved = s->num_file;
+    pos_in_central_dirSaved = s->pos_in_central_dir;
+    cur_file_infoSaved = s->cur_file_info;
+    cur_file_info_internalSaved = s->cur_file_info_internal;
+
+    err = unzGoToFirstFile(file);
+
+    while (err == UNZ_OK)
+    {
+        char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
+        err = unzGetCurrentFileInfo64(file,NULL,
+                                    szCurrentFileName,sizeof(szCurrentFileName)-1,
+                                    NULL,0,NULL,0);
+        if (err == UNZ_OK)
+        {
+            if (unzStringFileNameCompare(szCurrentFileName,
+                                            szFileName,iCaseSensitivity)==0)
+                return UNZ_OK;
+            err = unzGoToNextFile(file);
+        }
+    }
+
+    /* We failed, so restore the state of the 'current file' to where we
+     * were.
+     */
+    s->num_file = num_fileSaved ;
+    s->pos_in_central_dir = pos_in_central_dirSaved ;
+    s->cur_file_info = cur_file_infoSaved;
+    s->cur_file_info_internal = cur_file_info_internalSaved;
+    return err;
+}
+
+
+/*
+///////////////////////////////////////////
+// Contributed by Ryan Haksi (mailto://cryogen@infoserve.net)
+// I need random access
+//
+// Further optimization could be realized by adding an ability
+// to cache the directory in memory. The goal being a single
+// comprehensive file read to put the file I need in a memory.
+*/
+
+/*
+typedef struct unz_file_pos_s
+{
+    ZPOS64_T pos_in_zip_directory;   // offset in file
+    ZPOS64_T num_of_file;            // # of file
+} unz_file_pos;
+*/
+
+extern int ZEXPORT unzGetFilePos64(unzFile file, unz64_file_pos*  file_pos)
+{
+    unz64_s* s;
+
+    if (file==NULL || file_pos==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
+
+    file_pos->pos_in_zip_directory  = s->pos_in_central_dir;
+    file_pos->num_of_file           = s->num_file;
+
+    return UNZ_OK;
+}
+
+extern int ZEXPORT unzGetFilePos(
+    unzFile file,
+    unz_file_pos* file_pos)
+{
+    unz64_file_pos file_pos64;
+    int err = unzGetFilePos64(file,&file_pos64);
+    if (err==UNZ_OK)
+    {
+        file_pos->pos_in_zip_directory = (uLong)file_pos64.pos_in_zip_directory;
+        file_pos->num_of_file = (uLong)file_pos64.num_of_file;
+    }
+    return err;
+}
+
+extern int ZEXPORT unzGoToFilePos64(unzFile file, const unz64_file_pos* file_pos)
+{
+    unz64_s* s;
+    int err;
+
+    if (file==NULL || file_pos==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+
+    /* jump to the right spot */
+    s->pos_in_central_dir = file_pos->pos_in_zip_directory;
+    s->num_file           = file_pos->num_of_file;
+
+    /* set the current file */
+    err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                               &s->cur_file_info_internal,
+                                               NULL,0,NULL,0,NULL,0);
+    /* return results */
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+extern int ZEXPORT unzGoToFilePos(
+    unzFile file,
+    unz_file_pos* file_pos)
+{
+    unz64_file_pos file_pos64;
+    if (file_pos == NULL)
+        return UNZ_PARAMERROR;
+
+    file_pos64.pos_in_zip_directory = file_pos->pos_in_zip_directory;
+    file_pos64.num_of_file = file_pos->num_of_file;
+    return unzGoToFilePos64(file,&file_pos64);
+}
+
+/*
+// Unzip Helper Functions - should be here?
+///////////////////////////////////////////
+*/
+
+/*
+  Read the local header of the current zipfile
+  Check the coherency of the local header and info in the end of central
+        directory about this file
+  store in *piSizeVar the size of extra info in local header
+        (filename and size of extra field data)
+*/
+local int unz64local_CheckCurrentFileCoherencyHeader (unz64_s* s, uInt* piSizeVar,
+                                                    ZPOS64_T * poffset_local_extrafield,
+                                                    uInt  * psize_local_extrafield)
+{
+    uLong uMagic,uData,uFlags;
+    uLong size_filename;
+    uLong size_extra_field;
+    int err=UNZ_OK;
+
+    *piSizeVar = 0;
+    *poffset_local_extrafield = 0;
+    *psize_local_extrafield = 0;
+
+    if (ZSEEK64(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +
+                                s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return UNZ_ERRNO;
+
+
+    if (err==UNZ_OK)
+    {
+        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
+            err=UNZ_ERRNO;
+        else if (uMagic!=0x04034b50)
+            err=UNZ_BADZIPFILE;
+    }
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
+        err=UNZ_ERRNO;
+/*
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
+        err=UNZ_BADZIPFILE;
+*/
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
+        err=UNZ_BADZIPFILE;
+
+    if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
+/* #ifdef HAVE_BZIP2 */
+                         (s->cur_file_info.compression_method!=Z_BZIP2ED) &&
+/* #endif */
+                         (s->cur_file_info.compression_method!=Z_DEFLATED))
+        err=UNZ_BADZIPFILE;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */
+        err=UNZ_ERRNO;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) && ((uFlags & 8)==0))
+        err=UNZ_BADZIPFILE;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */
+        err=UNZ_ERRNO;
+    else if (uData != 0xFFFFFFFF && (err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) && ((uFlags & 8)==0))
+        err=UNZ_BADZIPFILE;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */
+        err=UNZ_ERRNO;
+    else if (uData != 0xFFFFFFFF && (err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) && ((uFlags & 8)==0))
+        err=UNZ_BADZIPFILE;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
+        err=UNZ_BADZIPFILE;
+
+    *piSizeVar += (uInt)size_filename;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)
+        err=UNZ_ERRNO;
+    *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
+                                    SIZEZIPLOCALHEADER + size_filename;
+    *psize_local_extrafield = (uInt)size_extra_field;
+
+    *piSizeVar += (uInt)size_extra_field;
+
+    return err;
+}
+
+/*
+  Open for reading data the current file in the zipfile.
+  If there is no error and the file is opened, the return value is UNZ_OK.
+*/
+extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method,
+                                            int* level, int raw, const char* password)
+{
+    int err=UNZ_OK;
+    uInt iSizeVar;
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    ZPOS64_T offset_local_extrafield;  /* offset of the local extra field */
+    uInt  size_local_extrafield;    /* size of the local extra field */
+#    ifndef NOUNCRYPT
+    char source[12];
+#    else
+    if (password != NULL)
+        return UNZ_PARAMERROR;
+#    endif
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_PARAMERROR;
+
+    if (s->pfile_in_zip_read != NULL)
+        unzCloseCurrentFile(file);
+
+    if (unz64local_CheckCurrentFileCoherencyHeader(s,&iSizeVar, &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
+        return UNZ_BADZIPFILE;
+
+    pfile_in_zip_read_info = (file_in_zip64_read_info_s*)ALLOC(sizeof(file_in_zip64_read_info_s));
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_INTERNALERROR;
+
+    pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);
+    pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;
+    pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;
+    pfile_in_zip_read_info->pos_local_extrafield=0;
+    pfile_in_zip_read_info->raw=raw;
+
+    if (pfile_in_zip_read_info->read_buffer==NULL)
+    {
+        TRYFREE(pfile_in_zip_read_info);
+        return UNZ_INTERNALERROR;
+    }
+
+    pfile_in_zip_read_info->stream_initialised=0;
+
+    if (method!=NULL)
+        *method = (int)s->cur_file_info.compression_method;
+
+    if (level!=NULL)
+    {
+        *level = 6;
+        switch (s->cur_file_info.flag & 0x06)
+        {
+          case 6 : *level = 1; break;
+          case 4 : *level = 2; break;
+          case 2 : *level = 9; break;
+        }
+    }
+
+    if ((s->cur_file_info.compression_method!=0) &&
+/* #ifdef HAVE_BZIP2 */
+        (s->cur_file_info.compression_method!=Z_BZIP2ED) &&
+/* #endif */
+        (s->cur_file_info.compression_method!=Z_DEFLATED))
+
+        err=UNZ_BADZIPFILE;
+
+    pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
+    pfile_in_zip_read_info->crc32=0;
+    pfile_in_zip_read_info->total_out_64=0;
+    pfile_in_zip_read_info->compression_method = s->cur_file_info.compression_method;
+    pfile_in_zip_read_info->filestream=s->filestream;
+    pfile_in_zip_read_info->z_filefunc=s->z_filefunc;
+    pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
+
+    pfile_in_zip_read_info->stream.total_out = 0;
+
+    if ((s->cur_file_info.compression_method==Z_BZIP2ED) && (!raw))
+    {
+#ifdef HAVE_BZIP2
+      pfile_in_zip_read_info->bstream.bzalloc = (void *(*) (void *, int, int))0;
+      pfile_in_zip_read_info->bstream.bzfree = (free_func)0;
+      pfile_in_zip_read_info->bstream.opaque = (voidpf)0;
+      pfile_in_zip_read_info->bstream.state = (voidpf)0;
+
+      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
+      pfile_in_zip_read_info->stream.zfree = (free_func)0;
+      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
+      pfile_in_zip_read_info->stream.next_in = (voidpf)0;
+      pfile_in_zip_read_info->stream.avail_in = 0;
+
+      err=BZ2_bzDecompressInit(&pfile_in_zip_read_info->bstream, 0, 0);
+      if (err == Z_OK)
+        pfile_in_zip_read_info->stream_initialised=Z_BZIP2ED;
+      else
+      {
+        TRYFREE(pfile_in_zip_read_info);
+        return err;
+      }
+#else
+      pfile_in_zip_read_info->raw=1;
+#endif
+    }
+    else if ((s->cur_file_info.compression_method==Z_DEFLATED) && (!raw))
+    {
+      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
+      pfile_in_zip_read_info->stream.zfree = (free_func)0;
+      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
+      pfile_in_zip_read_info->stream.next_in = 0;
+      pfile_in_zip_read_info->stream.avail_in = 0;
+
+      err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
+      if (err == Z_OK)
+        pfile_in_zip_read_info->stream_initialised=Z_DEFLATED;
+      else
+      {
+        TRYFREE(pfile_in_zip_read_info);
+        return err;
+      }
+        /* windowBits is passed < 0 to tell that there is no zlib header.
+         * Note that in this case inflate *requires* an extra "dummy" byte
+         * after the compressed stream in order to complete decompression and
+         * return Z_STREAM_END.
+         * In unzip, i don't wait absolutely Z_STREAM_END because I known the
+         * size of both compressed and uncompressed data
+         */
+    }
+    pfile_in_zip_read_info->rest_read_compressed =
+            s->cur_file_info.compressed_size ;
+    pfile_in_zip_read_info->rest_read_uncompressed =
+            s->cur_file_info.uncompressed_size ;
+
+
+    pfile_in_zip_read_info->pos_in_zipfile =
+            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +
+              iSizeVar;
+
+    pfile_in_zip_read_info->stream.avail_in = (uInt)0;
+
+    s->pfile_in_zip_read = pfile_in_zip_read_info;
+                s->encrypted = 0;
+
+#    ifndef NOUNCRYPT
+    if (password != NULL)
+    {
+        int i;
+        s->pcrc_32_tab = get_crc_table();
+        init_keys(password,s->keys,s->pcrc_32_tab);
+        if (ZSEEK64(s->z_filefunc, s->filestream,
+                  s->pfile_in_zip_read->pos_in_zipfile +
+                     s->pfile_in_zip_read->byte_before_the_zipfile,
+                  SEEK_SET)!=0)
+            return UNZ_INTERNALERROR;
+        if(ZREAD64(s->z_filefunc, s->filestream,source, 12)<12)
+            return UNZ_INTERNALERROR;
+
+        for (i = 0; i<12; i++)
+            zdecode(s->keys,s->pcrc_32_tab,source[i]);
+
+        s->pfile_in_zip_read->pos_in_zipfile+=12;
+        s->encrypted=1;
+    }
+#    endif
+
+
+    return UNZ_OK;
+}
+
+extern int ZEXPORT unzOpenCurrentFile (unzFile file)
+{
+    return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
+}
+
+extern int ZEXPORT unzOpenCurrentFilePassword (unzFile file, const char*  password)
+{
+    return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
+}
+
+extern int ZEXPORT unzOpenCurrentFile2 (unzFile file, int* method, int* level, int raw)
+{
+    return unzOpenCurrentFile3(file, method, level, raw, NULL);
+}
+
+/** Addition for GDAL : START */
+
+extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64( unzFile file)
+{
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    s=(unz64_s*)file;
+    if (file==NULL)
+        return 0; //UNZ_PARAMERROR;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+    if (pfile_in_zip_read_info==NULL)
+        return 0; //UNZ_PARAMERROR;
+    return pfile_in_zip_read_info->pos_in_zipfile +
+                         pfile_in_zip_read_info->byte_before_the_zipfile;
+}
+
+/** Addition for GDAL : END */
+
+/*
+  Read bytes from the current file.
+  buf contain buffer where data must be copied
+  len the size of buf.
+
+  return the number of byte copied if somes bytes are copied
+  return 0 if the end of file was reached
+  return <0 with error code if there is an error
+    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
+*/
+extern int ZEXPORT unzReadCurrentFile  (unzFile file, voidp buf, unsigned len)
+{
+    int err=UNZ_OK;
+    uInt iRead = 0;
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+
+    if (pfile_in_zip_read_info->read_buffer == NULL)
+        return UNZ_END_OF_LIST_OF_FILE;
+    if (len==0)
+        return 0;
+
+    pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;
+
+    pfile_in_zip_read_info->stream.avail_out = (uInt)len;
+
+    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&
+        (!(pfile_in_zip_read_info->raw)))
+        pfile_in_zip_read_info->stream.avail_out =
+            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
+
+    if ((len>pfile_in_zip_read_info->rest_read_compressed+
+           pfile_in_zip_read_info->stream.avail_in) &&
+         (pfile_in_zip_read_info->raw))
+        pfile_in_zip_read_info->stream.avail_out =
+            (uInt)pfile_in_zip_read_info->rest_read_compressed+
+            pfile_in_zip_read_info->stream.avail_in;
+
+    while (pfile_in_zip_read_info->stream.avail_out>0)
+    {
+        if ((pfile_in_zip_read_info->stream.avail_in==0) &&
+            (pfile_in_zip_read_info->rest_read_compressed>0))
+        {
+            uInt uReadThis = UNZ_BUFSIZE;
+            if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)
+                uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;
+            if (uReadThis == 0)
+                return UNZ_EOF;
+            if (ZSEEK64(pfile_in_zip_read_info->z_filefunc,
+                      pfile_in_zip_read_info->filestream,
+                      pfile_in_zip_read_info->pos_in_zipfile +
+                         pfile_in_zip_read_info->byte_before_the_zipfile,
+                         ZLIB_FILEFUNC_SEEK_SET)!=0)
+                return UNZ_ERRNO;
+            if (ZREAD64(pfile_in_zip_read_info->z_filefunc,
+                      pfile_in_zip_read_info->filestream,
+                      pfile_in_zip_read_info->read_buffer,
+                      uReadThis)!=uReadThis)
+                return UNZ_ERRNO;
+
+
+#            ifndef NOUNCRYPT
+            if(s->encrypted)
+            {
+                uInt i;
+                for(i=0;i<uReadThis;i++)
+                  pfile_in_zip_read_info->read_buffer[i] =
+                      zdecode(s->keys,s->pcrc_32_tab,
+                              pfile_in_zip_read_info->read_buffer[i]);
+            }
+#            endif
+
+
+            pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
+
+            pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
+
+            pfile_in_zip_read_info->stream.next_in =
+                (Bytef*)pfile_in_zip_read_info->read_buffer;
+            pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
+        }
+
+        if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw))
+        {
+            uInt uDoCopy,i ;
+
+            if ((pfile_in_zip_read_info->stream.avail_in == 0) &&
+                (pfile_in_zip_read_info->rest_read_compressed == 0))
+                return (iRead==0) ? UNZ_EOF : iRead;
+
+            if (pfile_in_zip_read_info->stream.avail_out <
+                            pfile_in_zip_read_info->stream.avail_in)
+                uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
+            else
+                uDoCopy = pfile_in_zip_read_info->stream.avail_in ;
+
+            for (i=0;i<uDoCopy;i++)
+                *(pfile_in_zip_read_info->stream.next_out+i) =
+                        *(pfile_in_zip_read_info->stream.next_in+i);
+
+            pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uDoCopy;
+
+            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
+                                pfile_in_zip_read_info->stream.next_out,
+                                uDoCopy);
+            pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;
+            pfile_in_zip_read_info->stream.avail_in -= uDoCopy;
+            pfile_in_zip_read_info->stream.avail_out -= uDoCopy;
+            pfile_in_zip_read_info->stream.next_out += uDoCopy;
+            pfile_in_zip_read_info->stream.next_in += uDoCopy;
+            pfile_in_zip_read_info->stream.total_out += uDoCopy;
+            iRead += uDoCopy;
+        }
+        else if (pfile_in_zip_read_info->compression_method==Z_BZIP2ED)
+        {
+#ifdef HAVE_BZIP2
+            uLong uTotalOutBefore,uTotalOutAfter;
+            const Bytef *bufBefore;
+            uLong uOutThis;
+
+            pfile_in_zip_read_info->bstream.next_in        = (char*)pfile_in_zip_read_info->stream.next_in;
+            pfile_in_zip_read_info->bstream.avail_in       = pfile_in_zip_read_info->stream.avail_in;
+            pfile_in_zip_read_info->bstream.total_in_lo32  = pfile_in_zip_read_info->stream.total_in;
+            pfile_in_zip_read_info->bstream.total_in_hi32  = 0;
+            pfile_in_zip_read_info->bstream.next_out       = (char*)pfile_in_zip_read_info->stream.next_out;
+            pfile_in_zip_read_info->bstream.avail_out      = pfile_in_zip_read_info->stream.avail_out;
+            pfile_in_zip_read_info->bstream.total_out_lo32 = pfile_in_zip_read_info->stream.total_out;
+            pfile_in_zip_read_info->bstream.total_out_hi32 = 0;
+
+            uTotalOutBefore = pfile_in_zip_read_info->bstream.total_out_lo32;
+            bufBefore = (const Bytef *)pfile_in_zip_read_info->bstream.next_out;
+
+            err=BZ2_bzDecompress(&pfile_in_zip_read_info->bstream);
+
+            uTotalOutAfter = pfile_in_zip_read_info->bstream.total_out_lo32;
+            uOutThis = uTotalOutAfter-uTotalOutBefore;
+
+            pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uOutThis;
+
+            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,bufBefore, (uInt)(uOutThis));
+            pfile_in_zip_read_info->rest_read_uncompressed -= uOutThis;
+            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
+
+            pfile_in_zip_read_info->stream.next_in   = (Bytef*)pfile_in_zip_read_info->bstream.next_in;
+            pfile_in_zip_read_info->stream.avail_in  = pfile_in_zip_read_info->bstream.avail_in;
+            pfile_in_zip_read_info->stream.total_in  = pfile_in_zip_read_info->bstream.total_in_lo32;
+            pfile_in_zip_read_info->stream.next_out  = (Bytef*)pfile_in_zip_read_info->bstream.next_out;
+            pfile_in_zip_read_info->stream.avail_out = pfile_in_zip_read_info->bstream.avail_out;
+            pfile_in_zip_read_info->stream.total_out = pfile_in_zip_read_info->bstream.total_out_lo32;
+
+            if (err==BZ_STREAM_END)
+              return (iRead==0) ? UNZ_EOF : iRead;
+            if (err!=BZ_OK)
+              break;
+#endif
+        } // end Z_BZIP2ED
+        else
+        {
+            ZPOS64_T uTotalOutBefore,uTotalOutAfter;
+            const Bytef *bufBefore;
+            ZPOS64_T uOutThis;
+            int flush=Z_SYNC_FLUSH;
+
+            uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;
+            bufBefore = pfile_in_zip_read_info->stream.next_out;
+
+            /*
+            if ((pfile_in_zip_read_info->rest_read_uncompressed ==
+                     pfile_in_zip_read_info->stream.avail_out) &&
+                (pfile_in_zip_read_info->rest_read_compressed == 0))
+                flush = Z_FINISH;
+            */
+            err=inflate(&pfile_in_zip_read_info->stream,flush);
+
+            if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL))
+              err = Z_DATA_ERROR;
+
+            uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
+            uOutThis = uTotalOutAfter-uTotalOutBefore;
+
+            pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uOutThis;
+
+            pfile_in_zip_read_info->crc32 =
+                crc32(pfile_in_zip_read_info->crc32,bufBefore,
+                        (uInt)(uOutThis));
+
+            pfile_in_zip_read_info->rest_read_uncompressed -=
+                uOutThis;
+
+            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
+
+            if (err==Z_STREAM_END)
+                return (iRead==0) ? UNZ_EOF : iRead;
+            if (err!=Z_OK)
+                break;
+        }
+    }
+
+    if (err==Z_OK)
+        return iRead;
+    return err;
+}
+
+
+/*
+  Give the current position in uncompressed data
+*/
+extern z_off_t ZEXPORT unztell (unzFile file)
+{
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+    return (z_off_t)pfile_in_zip_read_info->stream.total_out;
+}
+
+extern ZPOS64_T ZEXPORT unztell64 (unzFile file)
+{
+
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return (ZPOS64_T)-1;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return (ZPOS64_T)-1;
+
+    return pfile_in_zip_read_info->total_out_64;
+}
+
+
+/*
+  return 1 if the end of file was reached, 0 elsewhere
+*/
+extern int ZEXPORT unzeof (unzFile file)
+{
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+    if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
+        return 1;
+    else
+        return 0;
+}
+
+
+
+/*
+Read extra field from the current file (opened by unzOpenCurrentFile)
+This is the local-header version of the extra field (sometimes, there is
+more info in the local-header version than in the central-header)
+
+  if buf==NULL, it return the size of the local extra field that can be read
+
+  if buf!=NULL, len is the size of the buffer, the extra header is copied in
+    buf.
+  the return value is the number of bytes copied in buf, or (if <0)
+    the error code
+*/
+extern int ZEXPORT unzGetLocalExtrafield (unzFile file, voidp buf, unsigned len)
+{
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    uInt read_now;
+    ZPOS64_T size_to_read;
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+    size_to_read = (pfile_in_zip_read_info->size_local_extrafield -
+                pfile_in_zip_read_info->pos_local_extrafield);
+
+    if (buf==NULL)
+        return (int)size_to_read;
+
+    if (len>size_to_read)
+        read_now = (uInt)size_to_read;
+    else
+        read_now = (uInt)len ;
+
+    if (read_now==0)
+        return 0;
+
+    if (ZSEEK64(pfile_in_zip_read_info->z_filefunc,
+              pfile_in_zip_read_info->filestream,
+              pfile_in_zip_read_info->offset_local_extrafield +
+              pfile_in_zip_read_info->pos_local_extrafield,
+              ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return UNZ_ERRNO;
+
+    if (ZREAD64(pfile_in_zip_read_info->z_filefunc,
+              pfile_in_zip_read_info->filestream,
+              buf,read_now)!=read_now)
+        return UNZ_ERRNO;
+
+    return (int)read_now;
+}
+
+/*
+  Close the file in zip opened with unzOpenCurrentFile
+  Return UNZ_CRCERROR if all the file was read but the CRC is not good
+*/
+extern int ZEXPORT unzCloseCurrentFile (unzFile file)
+{
+    int err=UNZ_OK;
+
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+
+    if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&
+        (!pfile_in_zip_read_info->raw))
+    {
+        if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)
+            err=UNZ_CRCERROR;
+    }
+
+
+    TRYFREE(pfile_in_zip_read_info->read_buffer);
+    pfile_in_zip_read_info->read_buffer = NULL;
+    if (pfile_in_zip_read_info->stream_initialised == Z_DEFLATED)
+        inflateEnd(&pfile_in_zip_read_info->stream);
+#ifdef HAVE_BZIP2
+    else if (pfile_in_zip_read_info->stream_initialised == Z_BZIP2ED)
+        BZ2_bzDecompressEnd(&pfile_in_zip_read_info->bstream);
+#endif
+
+
+    pfile_in_zip_read_info->stream_initialised = 0;
+    TRYFREE(pfile_in_zip_read_info);
+
+    s->pfile_in_zip_read=NULL;
+
+    return err;
+}
+
+
+/*
+  Get the global comment string of the ZipFile, in the szComment buffer.
+  uSizeBuf is the size of the szComment buffer.
+  return the number of byte copied or an error code <0
+*/
+extern int ZEXPORT unzGetGlobalComment (unzFile file, char * szComment, uLong uSizeBuf)
+{
+    unz64_s* s;
+    uLong uReadThis ;
+    if (file==NULL)
+        return (int)UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+
+    uReadThis = uSizeBuf;
+    if (uReadThis>s->gi.size_comment)
+        uReadThis = s->gi.size_comment;
+
+    if (ZSEEK64(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return UNZ_ERRNO;
+
+    if (uReadThis>0)
+    {
+      *szComment='\0';
+      if (ZREAD64(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)
+        return UNZ_ERRNO;
+    }
+
+    if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))
+        *(szComment+s->gi.size_comment)='\0';
+    return (int)uReadThis;
+}
+
+/* Additions by RX '2004 */
+extern ZPOS64_T ZEXPORT unzGetOffset64(unzFile file)
+{
+    unz64_s* s;
+
+    if (file==NULL)
+          return 0; //UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    if (!s->current_file_ok)
+      return 0;
+    if (s->gi.number_entry != 0 && s->gi.number_entry != 0xffff)
+      if (s->num_file==s->gi.number_entry)
+         return 0;
+    return s->pos_in_central_dir;
+}
+
+extern uLong ZEXPORT unzGetOffset (unzFile file)
+{
+    ZPOS64_T offset64;
+
+    if (file==NULL)
+          return 0; //UNZ_PARAMERROR;
+    offset64 = unzGetOffset64(file);
+    return (uLong)offset64;
+}
+
+extern int ZEXPORT unzSetOffset64(unzFile file, ZPOS64_T pos)
+{
+    unz64_s* s;
+    int err;
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+
+    s->pos_in_central_dir = pos;
+    s->num_file = s->gi.number_entry;      /* hack */
+    err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                              &s->cur_file_info_internal,
+                                              NULL,0,NULL,0,NULL,0);
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+extern int ZEXPORT unzSetOffset (unzFile file, uLong pos)
+{
+    return unzSetOffset64(file,pos);
+}
diff --git a/DSView/pv/minizip/unzip.h b/DSView/pv/minizip/unzip.h
new file mode 100644
index 00000000..2104e391
--- /dev/null
+++ b/DSView/pv/minizip/unzip.h
@@ -0,0 +1,437 @@
+/* unzip.h -- IO for uncompress .zip files using zlib
+   Version 1.1, February 14h, 2010
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications of Unzip for Zip64
+         Copyright (C) 2007-2008 Even Rouault
+
+         Modifications for Zip64 support on both zip and unzip
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+         ---------------------------------------------------------------------------------
+
+        Condition of use and distribution are the same than zlib :
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  ---------------------------------------------------------------------------------
+
+        Changes
+
+        See header of unzip64.c
+
+*/
+
+#ifndef _unz64_H
+#define _unz64_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef _ZLIB_H
+#include "zlib.h"
+#endif
+
+#ifndef  _ZLIBIOAPI_H
+#include "ioapi.h"
+#endif
+
+#ifdef HAVE_BZIP2
+#include "bzlib.h"
+#endif
+
+#define Z_BZIP2ED 12
+
+#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
+/* like the STRICT of WIN32, we define a pointer that cannot be converted
+    from (void*) without cast */
+typedef struct TagunzFile__ { int unused; } unzFile__;
+typedef unzFile__ *unzFile;
+#else
+typedef voidp unzFile;
+#endif
+
+
+#define UNZ_OK                          (0)
+#define UNZ_END_OF_LIST_OF_FILE         (-100)
+#define UNZ_ERRNO                       (Z_ERRNO)
+#define UNZ_EOF                         (0)
+#define UNZ_PARAMERROR                  (-102)
+#define UNZ_BADZIPFILE                  (-103)
+#define UNZ_INTERNALERROR               (-104)
+#define UNZ_CRCERROR                    (-105)
+
+/* tm_unz contain date/time info */
+typedef struct tm_unz_s
+{
+    uInt tm_sec;            /* seconds after the minute - [0,59] */
+    uInt tm_min;            /* minutes after the hour - [0,59] */
+    uInt tm_hour;           /* hours since midnight - [0,23] */
+    uInt tm_mday;           /* day of the month - [1,31] */
+    uInt tm_mon;            /* months since January - [0,11] */
+    uInt tm_year;           /* years - [1980..2044] */
+} tm_unz;
+
+/* unz_global_info structure contain global data about the ZIPfile
+   These data comes from the end of central dir */
+typedef struct unz_global_info64_s
+{
+    ZPOS64_T number_entry;         /* total number of entries in
+                                     the central dir on this disk */
+    uLong size_comment;         /* size of the global comment of the zipfile */
+} unz_global_info64;
+
+typedef struct unz_global_info_s
+{
+    uLong number_entry;         /* total number of entries in
+                                     the central dir on this disk */
+    uLong size_comment;         /* size of the global comment of the zipfile */
+} unz_global_info;
+
+/* unz_file_info contain information about a file in the zipfile */
+typedef struct unz_file_info64_s
+{
+    uLong version;              /* version made by                 2 bytes */
+    uLong version_needed;       /* version needed to extract       2 bytes */
+    uLong flag;                 /* general purpose bit flag        2 bytes */
+    uLong compression_method;   /* compression method              2 bytes */
+    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
+    uLong crc;                  /* crc-32                          4 bytes */
+    ZPOS64_T compressed_size;   /* compressed size                 8 bytes */
+    ZPOS64_T uncompressed_size; /* uncompressed size               8 bytes */
+    uLong size_filename;        /* filename length                 2 bytes */
+    uLong size_file_extra;      /* extra field length              2 bytes */
+    uLong size_file_comment;    /* file comment length             2 bytes */
+
+    uLong disk_num_start;       /* disk number start               2 bytes */
+    uLong internal_fa;          /* internal file attributes        2 bytes */
+    uLong external_fa;          /* external file attributes        4 bytes */
+
+    tm_unz tmu_date;
+} unz_file_info64;
+
+typedef struct unz_file_info_s
+{
+    uLong version;              /* version made by                 2 bytes */
+    uLong version_needed;       /* version needed to extract       2 bytes */
+    uLong flag;                 /* general purpose bit flag        2 bytes */
+    uLong compression_method;   /* compression method              2 bytes */
+    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
+    uLong crc;                  /* crc-32                          4 bytes */
+    uLong compressed_size;      /* compressed size                 4 bytes */
+    uLong uncompressed_size;    /* uncompressed size               4 bytes */
+    uLong size_filename;        /* filename length                 2 bytes */
+    uLong size_file_extra;      /* extra field length              2 bytes */
+    uLong size_file_comment;    /* file comment length             2 bytes */
+
+    uLong disk_num_start;       /* disk number start               2 bytes */
+    uLong internal_fa;          /* internal file attributes        2 bytes */
+    uLong external_fa;          /* external file attributes        4 bytes */
+
+    tm_unz tmu_date;
+} unz_file_info;
+
+extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
+                                                 const char* fileName2,
+                                                 int iCaseSensitivity));
+/*
+   Compare two filename (fileName1,fileName2).
+   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
+   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
+                                or strcasecmp)
+   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
+    (like 1 on Unix, 2 on Windows)
+*/
+
+
+extern unzFile ZEXPORT unzOpen OF((const char *path));
+extern unzFile ZEXPORT unzOpen64 OF((const void *path));
+/*
+  Open a Zip file. path contain the full pathname (by example,
+     on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
+     "zlib/zlib113.zip".
+     If the zipfile cannot be opened (file don't exist or in not valid), the
+       return value is NULL.
+     Else, the return value is a unzFile Handle, usable with other function
+       of this unzip package.
+     the "64" function take a const void* pointer, because the path is just the
+       value passed to the open64_file_func callback.
+     Under Windows, if UNICODE is defined, using fill_fopen64_filefunc, the path
+       is a pointer to a wide unicode string (LPCTSTR is LPCWSTR), so const char*
+       does not describe the reality
+*/
+
+
+extern unzFile ZEXPORT unzOpen2 OF((const char *path,
+                                    zlib_filefunc_def* pzlib_filefunc_def));
+/*
+   Open a Zip file, like unzOpen, but provide a set of file low level API
+      for read/write the zip file (see ioapi.h)
+*/
+
+extern unzFile ZEXPORT unzOpen2_64 OF((const void *path,
+                                    zlib_filefunc64_def* pzlib_filefunc_def));
+/*
+   Open a Zip file, like unz64Open, but provide a set of file low level API
+      for read/write the zip file (see ioapi.h)
+*/
+
+extern int ZEXPORT unzClose OF((unzFile file));
+/*
+  Close a ZipFile opened with unzOpen.
+  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
+    these files MUST be closed with unzCloseCurrentFile before call unzClose.
+  return UNZ_OK if there is no problem. */
+
+extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
+                                        unz_global_info *pglobal_info));
+
+extern int ZEXPORT unzGetGlobalInfo64 OF((unzFile file,
+                                        unz_global_info64 *pglobal_info));
+/*
+  Write info about the ZipFile in the *pglobal_info structure.
+  No preparation of the structure is needed
+  return UNZ_OK if there is no problem. */
+
+
+extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
+                                           char *szComment,
+                                           uLong uSizeBuf));
+/*
+  Get the global comment string of the ZipFile, in the szComment buffer.
+  uSizeBuf is the size of the szComment buffer.
+  return the number of byte copied or an error code <0
+*/
+
+
+/***************************************************************************/
+/* Unzip package allow you browse the directory of the zipfile */
+
+extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
+/*
+  Set the current file of the zipfile to the first file.
+  return UNZ_OK if there is no problem
+*/
+
+extern int ZEXPORT unzGoToNextFile OF((unzFile file));
+/*
+  Set the current file of the zipfile to the next file.
+  return UNZ_OK if there is no problem
+  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
+*/
+
+extern int ZEXPORT unzLocateFile OF((unzFile file,
+                     const char *szFileName,
+                     int iCaseSensitivity));
+/*
+  Try locate the file szFileName in the zipfile.
+  For the iCaseSensitivity signification, see unzStringFileNameCompare
+
+  return value :
+  UNZ_OK if the file is found. It becomes the current file.
+  UNZ_END_OF_LIST_OF_FILE if the file is not found
+*/
+
+
+/* ****************************************** */
+/* Ryan supplied functions */
+/* unz_file_info contain information about a file in the zipfile */
+typedef struct unz_file_pos_s
+{
+    uLong pos_in_zip_directory;   /* offset in zip file directory */
+    uLong num_of_file;            /* # of file */
+} unz_file_pos;
+
+extern int ZEXPORT unzGetFilePos(
+    unzFile file,
+    unz_file_pos* file_pos);
+
+extern int ZEXPORT unzGoToFilePos(
+    unzFile file,
+    unz_file_pos* file_pos);
+
+typedef struct unz64_file_pos_s
+{
+    ZPOS64_T pos_in_zip_directory;   /* offset in zip file directory */
+    ZPOS64_T num_of_file;            /* # of file */
+} unz64_file_pos;
+
+extern int ZEXPORT unzGetFilePos64(
+    unzFile file,
+    unz64_file_pos* file_pos);
+
+extern int ZEXPORT unzGoToFilePos64(
+    unzFile file,
+    const unz64_file_pos* file_pos);
+
+/* ****************************************** */
+
+extern int ZEXPORT unzGetCurrentFileInfo64 OF((unzFile file,
+                         unz_file_info64 *pfile_info,
+                         char *szFileName,
+                         uLong fileNameBufferSize,
+                         void *extraField,
+                         uLong extraFieldBufferSize,
+                         char *szComment,
+                         uLong commentBufferSize));
+
+extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
+                         unz_file_info *pfile_info,
+                         char *szFileName,
+                         uLong fileNameBufferSize,
+                         void *extraField,
+                         uLong extraFieldBufferSize,
+                         char *szComment,
+                         uLong commentBufferSize));
+/*
+  Get Info about the current file
+  if pfile_info!=NULL, the *pfile_info structure will contain somes info about
+        the current file
+  if szFileName!=NULL, the filemane string will be copied in szFileName
+            (fileNameBufferSize is the size of the buffer)
+  if extraField!=NULL, the extra field information will be copied in extraField
+            (extraFieldBufferSize is the size of the buffer).
+            This is the Central-header version of the extra field
+  if szComment!=NULL, the comment string of the file will be copied in szComment
+            (commentBufferSize is the size of the buffer)
+*/
+
+
+/** Addition for GDAL : START */
+
+extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64 OF((unzFile file));
+
+/** Addition for GDAL : END */
+
+
+/***************************************************************************/
+/* for reading the content of the current zipfile, you can open it, read data
+   from it, and close it (you can close it before reading all the file)
+   */
+
+extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
+/*
+  Open for reading data the current file in the zipfile.
+  If there is no error, the return value is UNZ_OK.
+*/
+
+extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,
+                                                  const char* password));
+/*
+  Open for reading data the current file in the zipfile.
+  password is a crypting password
+  If there is no error, the return value is UNZ_OK.
+*/
+
+extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,
+                                           int* method,
+                                           int* level,
+                                           int raw));
+/*
+  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
+    if raw==1
+  *method will receive method of compression, *level will receive level of
+     compression
+  note : you can set level parameter as NULL (if you did not want known level,
+         but you CANNOT set method parameter as NULL
+*/
+
+extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,
+                                           int* method,
+                                           int* level,
+                                           int raw,
+                                           const char* password));
+/*
+  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
+    if raw==1
+  *method will receive method of compression, *level will receive level of
+     compression
+  note : you can set level parameter as NULL (if you did not want known level,
+         but you CANNOT set method parameter as NULL
+*/
+
+
+extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
+/*
+  Close the file in zip opened with unzOpenCurrentFile
+  Return UNZ_CRCERROR if all the file was read but the CRC is not good
+*/
+
+extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
+                      voidp buf,
+                      unsigned len));
+/*
+  Read bytes from the current file (opened by unzOpenCurrentFile)
+  buf contain buffer where data must be copied
+  len the size of buf.
+
+  return the number of byte copied if somes bytes are copied
+  return 0 if the end of file was reached
+  return <0 with error code if there is an error
+    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
+*/
+
+extern z_off_t ZEXPORT unztell OF((unzFile file));
+
+extern ZPOS64_T ZEXPORT unztell64 OF((unzFile file));
+/*
+  Give the current position in uncompressed data
+*/
+
+extern int ZEXPORT unzeof OF((unzFile file));
+/*
+  return 1 if the end of file was reached, 0 elsewhere
+*/
+
+extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
+                                             voidp buf,
+                                             unsigned len));
+/*
+  Read extra field from the current file (opened by unzOpenCurrentFile)
+  This is the local-header version of the extra field (sometimes, there is
+    more info in the local-header version than in the central-header)
+
+  if buf==NULL, it return the size of the local extra field
+
+  if buf!=NULL, len is the size of the buffer, the extra header is copied in
+    buf.
+  the return value is the number of bytes copied in buf, or (if <0)
+    the error code
+*/
+
+/***************************************************************************/
+
+/* Get the current file offset */
+extern ZPOS64_T ZEXPORT unzGetOffset64 (unzFile file);
+extern uLong ZEXPORT unzGetOffset (unzFile file);
+
+/* Set the current file offset */
+extern int ZEXPORT unzSetOffset64 (unzFile file, ZPOS64_T pos);
+extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _unz64_H */
diff --git a/DSView/pv/minizip/zip.c b/DSView/pv/minizip/zip.c
new file mode 100644
index 00000000..44e88a9c
--- /dev/null
+++ b/DSView/pv/minizip/zip.c
@@ -0,0 +1,2007 @@
+/* zip.c -- IO on .zip files using zlib
+   Version 1.1, February 14h, 2010
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+         Changes
+   Oct-2009 - Mathias Svensson - Remove old C style function prototypes
+   Oct-2009 - Mathias Svensson - Added Zip64 Support when creating new file archives
+   Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions.
+   Oct-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data
+                                 It is used when recreting zip archive with RAW when deleting items from a zip.
+                                 ZIP64 data is automatically added to items that needs it, and existing ZIP64 data need to be removed.
+   Oct-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required)
+   Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
+
+*/
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include "zlib.h"
+#include "zip.h"
+
+#ifdef STDC
+#  include <stddef.h>
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+#ifdef NO_ERRNO_H
+    extern int errno;
+#else
+#   include <errno.h>
+#endif
+
+
+#ifndef local
+#  define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
+
+#ifndef VERSIONMADEBY
+# define VERSIONMADEBY   (0x0) /* platform depedent */
+#endif
+
+#ifndef Z_BUFSIZE
+#define Z_BUFSIZE (64*1024) //(16384)
+#endif
+
+#ifndef Z_MAXFILENAMEINZIP
+#define Z_MAXFILENAMEINZIP (256)
+#endif
+
+#ifndef ALLOC
+# define ALLOC(size) (malloc(size))
+#endif
+#ifndef TRYFREE
+# define TRYFREE(p) {if (p) free(p);}
+#endif
+
+/*
+#define SIZECENTRALDIRITEM (0x2e)
+#define SIZEZIPLOCALHEADER (0x1e)
+*/
+
+/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
+
+
+// NOT sure that this work on ALL platform
+#define MAKEULONG64(a, b) ((ZPOS64_T)(((unsigned long)(a)) | ((ZPOS64_T)((unsigned long)(b))) << 32))
+
+#ifndef SEEK_CUR
+#define SEEK_CUR    1
+#endif
+
+#ifndef SEEK_END
+#define SEEK_END    2
+#endif
+
+#ifndef SEEK_SET
+#define SEEK_SET    0
+#endif
+
+#ifndef DEF_MEM_LEVEL
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+#endif
+const char zip_copyright[] =" zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
+
+
+#define SIZEDATA_INDATABLOCK (4096-(4*4))
+
+#define LOCALHEADERMAGIC    (0x04034b50)
+#define CENTRALHEADERMAGIC  (0x02014b50)
+#define ENDHEADERMAGIC      (0x06054b50)
+#define ZIP64ENDHEADERMAGIC      (0x6064b50)
+#define ZIP64ENDLOCHEADERMAGIC   (0x7064b50)
+
+#define FLAG_LOCALHEADER_OFFSET (0x06)
+#define CRC_LOCALHEADER_OFFSET  (0x0e)
+
+#define SIZECENTRALHEADER (0x2e) /* 46 */
+
+typedef struct linkedlist_datablock_internal_s
+{
+  struct linkedlist_datablock_internal_s* next_datablock;
+  uLong  avail_in_this_block;
+  uLong  filled_in_this_block;
+  uLong  unused; /* for future use and alignment */
+  unsigned char data[SIZEDATA_INDATABLOCK];
+} linkedlist_datablock_internal;
+
+typedef struct linkedlist_data_s
+{
+    linkedlist_datablock_internal* first_block;
+    linkedlist_datablock_internal* last_block;
+} linkedlist_data;
+
+
+typedef struct
+{
+    z_stream stream;            /* zLib stream structure for inflate */
+#ifdef HAVE_BZIP2
+    bz_stream bstream;          /* bzLib stream structure for bziped */
+#endif
+
+    int  stream_initialised;    /* 1 is stream is initialised */
+    uInt pos_in_buffered_data;  /* last written byte in buffered_data */
+
+    ZPOS64_T pos_local_header;     /* offset of the local header of the file
+                                     currenty writing */
+    char* central_header;       /* central header data for the current file */
+    uLong size_centralExtra;
+    uLong size_centralheader;   /* size of the central header for cur file */
+    uLong size_centralExtraFree; /* Extra bytes allocated to the centralheader but that are not used */
+    uLong flag;                 /* flag of the file currently writing */
+
+    int  method;                /* compression method of file currenty wr.*/
+    int  raw;                   /* 1 for directly writing raw data */
+    Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/
+    uLong dosDate;
+    uLong crc32;
+    int  encrypt;
+    int  zip64;               /* Add ZIP64 extened information in the extra field */
+    ZPOS64_T pos_zip64extrainfo;
+    ZPOS64_T totalCompressedData;
+    ZPOS64_T totalUncompressedData;
+#ifndef NOCRYPT
+    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
+    const z_crc_t* pcrc_32_tab;
+    int crypt_header_size;
+#endif
+} curfile64_info;
+
+typedef struct
+{
+    zlib_filefunc64_32_def z_filefunc;
+    voidpf filestream;        /* io structore of the zipfile */
+    linkedlist_data central_dir;/* datablock with central dir in construction*/
+    int  in_opened_file_inzip;  /* 1 if a file in the zip is currently writ.*/
+    curfile64_info ci;            /* info on the file curretly writing */
+
+    ZPOS64_T begin_pos;            /* position of the beginning of the zipfile */
+    ZPOS64_T add_position_when_writing_offset;
+    ZPOS64_T number_entry;
+
+#ifndef NO_ADDFILEINEXISTINGZIP
+    char *globalcomment;
+#endif
+
+} zip64_internal;
+
+
+#ifndef NOCRYPT
+#define INCLUDECRYPTINGCODE_IFCRYPTALLOWED
+#include "crypt.h"
+#endif
+
+local linkedlist_datablock_internal* allocate_new_datablock()
+{
+    linkedlist_datablock_internal* ldi;
+    ldi = (linkedlist_datablock_internal*)
+                 ALLOC(sizeof(linkedlist_datablock_internal));
+    if (ldi!=NULL)
+    {
+        ldi->next_datablock = NULL ;
+        ldi->filled_in_this_block = 0 ;
+        ldi->avail_in_this_block = SIZEDATA_INDATABLOCK ;
+    }
+    return ldi;
+}
+
+local void free_datablock(linkedlist_datablock_internal* ldi)
+{
+    while (ldi!=NULL)
+    {
+        linkedlist_datablock_internal* ldinext = ldi->next_datablock;
+        TRYFREE(ldi);
+        ldi = ldinext;
+    }
+}
+
+local void init_linkedlist(linkedlist_data* ll)
+{
+    ll->first_block = ll->last_block = NULL;
+}
+
+local void free_linkedlist(linkedlist_data* ll)
+{
+    free_datablock(ll->first_block);
+    ll->first_block = ll->last_block = NULL;
+}
+
+
+local int add_data_in_datablock(linkedlist_data* ll, const void* buf, uLong len)
+{
+    linkedlist_datablock_internal* ldi;
+    const unsigned char* from_copy;
+
+    if (ll==NULL)
+        return ZIP_INTERNALERROR;
+
+    if (ll->last_block == NULL)
+    {
+        ll->first_block = ll->last_block = allocate_new_datablock();
+        if (ll->first_block == NULL)
+            return ZIP_INTERNALERROR;
+    }
+
+    ldi = ll->last_block;
+    from_copy = (unsigned char*)buf;
+
+    while (len>0)
+    {
+        uInt copy_this;
+        uInt i;
+        unsigned char* to_copy;
+
+        if (ldi->avail_in_this_block==0)
+        {
+            ldi->next_datablock = allocate_new_datablock();
+            if (ldi->next_datablock == NULL)
+                return ZIP_INTERNALERROR;
+            ldi = ldi->next_datablock ;
+            ll->last_block = ldi;
+        }
+
+        if (ldi->avail_in_this_block < len)
+            copy_this = (uInt)ldi->avail_in_this_block;
+        else
+            copy_this = (uInt)len;
+
+        to_copy = &(ldi->data[ldi->filled_in_this_block]);
+
+        for (i=0;i<copy_this;i++)
+            *(to_copy+i)=*(from_copy+i);
+
+        ldi->filled_in_this_block += copy_this;
+        ldi->avail_in_this_block -= copy_this;
+        from_copy += copy_this ;
+        len -= copy_this;
+    }
+    return ZIP_OK;
+}
+
+
+
+/****************************************************************************/
+
+#ifndef NO_ADDFILEINEXISTINGZIP
+/* ===========================================================================
+   Inputs a long in LSB order to the given file
+   nbByte == 1, 2 ,4 or 8 (byte, short or long, ZPOS64_T)
+*/
+
+local int zip64local_putValue OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte));
+local int zip64local_putValue (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte)
+{
+    unsigned char buf[8];
+    int n;
+    for (n = 0; n < nbByte; n++)
+    {
+        buf[n] = (unsigned char)(x & 0xff);
+        x >>= 8;
+    }
+    if (x != 0)
+      {     /* data overflow - hack for ZIP64 (X Roche) */
+      for (n = 0; n < nbByte; n++)
+        {
+          buf[n] = 0xff;
+        }
+      }
+
+    if (ZWRITE64(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte)
+        return ZIP_ERRNO;
+    else
+        return ZIP_OK;
+}
+
+local void zip64local_putValue_inmemory OF((void* dest, ZPOS64_T x, int nbByte));
+local void zip64local_putValue_inmemory (void* dest, ZPOS64_T x, int nbByte)
+{
+    unsigned char* buf=(unsigned char*)dest;
+    int n;
+    for (n = 0; n < nbByte; n++) {
+        buf[n] = (unsigned char)(x & 0xff);
+        x >>= 8;
+    }
+
+    if (x != 0)
+    {     /* data overflow - hack for ZIP64 */
+       for (n = 0; n < nbByte; n++)
+       {
+          buf[n] = 0xff;
+       }
+    }
+}
+
+/****************************************************************************/
+
+
+local uLong zip64local_TmzDateToDosDate(const tm_zip* ptm)
+{
+    uLong year = (uLong)ptm->tm_year;
+    if (year>=1980)
+        year-=1980;
+    else if (year>=80)
+        year-=80;
+    return
+      (uLong) (((ptm->tm_mday) + (32 * (ptm->tm_mon+1)) + (512 * year)) << 16) |
+        ((ptm->tm_sec/2) + (32* ptm->tm_min) + (2048 * (uLong)ptm->tm_hour));
+}
+
+
+/****************************************************************************/
+
+local int zip64local_getByte OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi));
+
+local int zip64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def,voidpf filestream,int* pi)
+{
+    unsigned char c;
+    int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
+    if (err==1)
+    {
+        *pi = (int)c;
+        return ZIP_OK;
+    }
+    else
+    {
+        if (ZERROR64(*pzlib_filefunc_def,filestream))
+            return ZIP_ERRNO;
+        else
+            return ZIP_EOF;
+    }
+}
+
+
+/* ===========================================================================
+   Reads a long in LSB order from the given gz_stream. Sets
+*/
+local int zip64local_getShort OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pX));
+
+local int zip64local_getShort (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX)
+{
+    uLong x ;
+    int i = 0;
+    int err;
+
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (uLong)i;
+
+    if (err==ZIP_OK)
+        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<8;
+
+    if (err==ZIP_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+local int zip64local_getLong OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pX));
+
+local int zip64local_getLong (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX)
+{
+    uLong x ;
+    int i = 0;
+    int err;
+
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (uLong)i;
+
+    if (err==ZIP_OK)
+        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<8;
+
+    if (err==ZIP_OK)
+        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<16;
+
+    if (err==ZIP_OK)
+        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<24;
+
+    if (err==ZIP_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+local int zip64local_getLong64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX));
+
+
+local int zip64local_getLong64 (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX)
+{
+  ZPOS64_T x;
+  int i = 0;
+  int err;
+
+  err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x = (ZPOS64_T)i;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<8;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<16;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<24;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<32;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<40;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<48;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<56;
+
+  if (err==ZIP_OK)
+    *pX = x;
+  else
+    *pX = 0;
+
+  return err;
+}
+
+#ifndef BUFREADCOMMENT
+#define BUFREADCOMMENT (0x400)
+#endif
+/*
+  Locate the Central directory of a zipfile (at the end, just before
+    the global comment)
+*/
+local ZPOS64_T zip64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
+
+local ZPOS64_T zip64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
+{
+  unsigned char* buf;
+  ZPOS64_T uSizeFile;
+  ZPOS64_T uBackRead;
+  ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
+  ZPOS64_T uPosFound=0;
+
+  if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+    return 0;
+
+
+  uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
+
+  if (uMaxBack>uSizeFile)
+    uMaxBack = uSizeFile;
+
+  buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+  if (buf==NULL)
+    return 0;
+
+  uBackRead = 4;
+  while (uBackRead<uMaxBack)
+  {
+    uLong uReadSize;
+    ZPOS64_T uReadPos ;
+    int i;
+    if (uBackRead+BUFREADCOMMENT>uMaxBack)
+      uBackRead = uMaxBack;
+    else
+      uBackRead+=BUFREADCOMMENT;
+    uReadPos = uSizeFile-uBackRead ;
+
+    uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+      (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
+    if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+      break;
+
+    if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+      break;
+
+    for (i=(int)uReadSize-3; (i--)>0;)
+      if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
+        ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
+      {
+        uPosFound = uReadPos+i;
+        break;
+      }
+
+      if (uPosFound!=0)
+        break;
+  }
+  TRYFREE(buf);
+  return uPosFound;
+}
+
+/*
+Locate the End of Zip64 Central directory locator and from there find the CD of a zipfile (at the end, just before
+the global comment)
+*/
+local ZPOS64_T zip64local_SearchCentralDir64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
+
+local ZPOS64_T zip64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
+{
+  unsigned char* buf;
+  ZPOS64_T uSizeFile;
+  ZPOS64_T uBackRead;
+  ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
+  ZPOS64_T uPosFound=0;
+  uLong uL;
+  ZPOS64_T relativeOffset;
+
+  if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+    return 0;
+
+  uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
+
+  if (uMaxBack>uSizeFile)
+    uMaxBack = uSizeFile;
+
+  buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+  if (buf==NULL)
+    return 0;
+
+  uBackRead = 4;
+  while (uBackRead<uMaxBack)
+  {
+    uLong uReadSize;
+    ZPOS64_T uReadPos;
+    int i;
+    if (uBackRead+BUFREADCOMMENT>uMaxBack)
+      uBackRead = uMaxBack;
+    else
+      uBackRead+=BUFREADCOMMENT;
+    uReadPos = uSizeFile-uBackRead ;
+
+    uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+      (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
+    if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+      break;
+
+    if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+      break;
+
+    for (i=(int)uReadSize-3; (i--)>0;)
+    {
+      // Signature "0x07064b50" Zip64 end of central directory locater
+      if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
+      {
+        uPosFound = uReadPos+i;
+        break;
+      }
+    }
+
+      if (uPosFound!=0)
+        break;
+  }
+
+  TRYFREE(buf);
+  if (uPosFound == 0)
+    return 0;
+
+  /* Zip64 end of central directory locator */
+  if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
+    return 0;
+
+  /* the signature, already checked */
+  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
+    return 0;
+
+  /* number of the disk with the start of the zip64 end of  central directory */
+  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
+    return 0;
+  if (uL != 0)
+    return 0;
+
+  /* relative offset of the zip64 end of central directory record */
+  if (zip64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=ZIP_OK)
+    return 0;
+
+  /* total number of disks */
+  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
+    return 0;
+  if (uL != 1)
+    return 0;
+
+  /* Goto Zip64 end of central directory record */
+  if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
+    return 0;
+
+  /* the signature */
+  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
+    return 0;
+
+  if (uL != 0x06064b50) // signature of 'Zip64 end of central directory'
+    return 0;
+
+  return relativeOffset;
+}
+
+int LoadCentralDirectoryRecord(zip64_internal* pziinit)
+{
+  int err=ZIP_OK;
+  ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+
+  ZPOS64_T size_central_dir;     /* size of the central directory  */
+  ZPOS64_T offset_central_dir;   /* offset of start of central directory */
+  ZPOS64_T central_pos;
+  uLong uL;
+
+  uLong number_disk;          /* number of the current dist, used for
+                              spaning ZIP, unsupported, always 0*/
+  uLong number_disk_with_CD;  /* number the the disk with central dir, used
+                              for spaning ZIP, unsupported, always 0*/
+  ZPOS64_T number_entry;
+  ZPOS64_T number_entry_CD;      /* total number of entries in
+                                the central dir
+                                (same than number_entry on nospan) */
+  uLong VersionMadeBy;
+  uLong VersionNeeded;
+  uLong size_comment;
+
+  int hasZIP64Record = 0;
+
+  // check first if we find a ZIP64 record
+  central_pos = zip64local_SearchCentralDir64(&pziinit->z_filefunc,pziinit->filestream);
+  if(central_pos > 0)
+  {
+    hasZIP64Record = 1;
+  }
+  else if(central_pos == 0)
+  {
+    central_pos = zip64local_SearchCentralDir(&pziinit->z_filefunc,pziinit->filestream);
+  }
+
+/* disable to allow appending to empty ZIP archive
+        if (central_pos==0)
+            err=ZIP_ERRNO;
+*/
+
+  if(hasZIP64Record)
+  {
+    ZPOS64_T sizeEndOfCentralDirectory;
+    if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos, ZLIB_FILEFUNC_SEEK_SET) != 0)
+      err=ZIP_ERRNO;
+
+    /* the signature, already checked */
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* size of zip64 end of central directory record */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &sizeEndOfCentralDirectory)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* version made by */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionMadeBy)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* version needed to extract */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionNeeded)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* number of this disk */
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* number of the disk with the start of the central directory */
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* total number of entries in the central directory on this disk */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &number_entry)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* total number of entries in the central directory */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&number_entry_CD)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
+      err=ZIP_BADZIPFILE;
+
+    /* size of the central directory */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&size_central_dir)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* offset of start of central directory with respect to the
+    starting disk number */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&offset_central_dir)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    // TODO..
+    // read the comment from the standard central header.
+    size_comment = 0;
+  }
+  else
+  {
+    // Read End of central Directory info
+    if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+      err=ZIP_ERRNO;
+
+    /* the signature, already checked */
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* number of this disk */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* number of the disk with the start of the central directory */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* total number of entries in the central dir on this disk */
+    number_entry = 0;
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+    else
+      number_entry = uL;
+
+    /* total number of entries in the central dir */
+    number_entry_CD = 0;
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+    else
+      number_entry_CD = uL;
+
+    if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
+      err=ZIP_BADZIPFILE;
+
+    /* size of the central directory */
+    size_central_dir = 0;
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+    else
+      size_central_dir = uL;
+
+    /* offset of start of central directory with respect to the starting disk number */
+    offset_central_dir = 0;
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+    else
+      offset_central_dir = uL;
+
+
+    /* zipfile global comment length */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &size_comment)!=ZIP_OK)
+      err=ZIP_ERRNO;
+  }
+
+  if ((central_pos<offset_central_dir+size_central_dir) &&
+    (err==ZIP_OK))
+    err=ZIP_BADZIPFILE;
+
+  if (err!=ZIP_OK)
+  {
+    ZCLOSE64(pziinit->z_filefunc, pziinit->filestream);
+    return ZIP_ERRNO;
+  }
+
+  if (size_comment>0)
+  {
+    pziinit->globalcomment = (char*)ALLOC(size_comment+1);
+    if (pziinit->globalcomment)
+    {
+      size_comment = ZREAD64(pziinit->z_filefunc, pziinit->filestream, pziinit->globalcomment,size_comment);
+      pziinit->globalcomment[size_comment]=0;
+    }
+  }
+
+  byte_before_the_zipfile = central_pos - (offset_central_dir+size_central_dir);
+  pziinit->add_position_when_writing_offset = byte_before_the_zipfile;
+
+  {
+    ZPOS64_T size_central_dir_to_read = size_central_dir;
+    size_t buf_size = SIZEDATA_INDATABLOCK;
+    void* buf_read = (void*)ALLOC(buf_size);
+    if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir + byte_before_the_zipfile, ZLIB_FILEFUNC_SEEK_SET) != 0)
+      err=ZIP_ERRNO;
+
+    while ((size_central_dir_to_read>0) && (err==ZIP_OK))
+    {
+      ZPOS64_T read_this = SIZEDATA_INDATABLOCK;
+      if (read_this > size_central_dir_to_read)
+        read_this = size_central_dir_to_read;
+
+      if (ZREAD64(pziinit->z_filefunc, pziinit->filestream,buf_read,(uLong)read_this) != read_this)
+        err=ZIP_ERRNO;
+
+      if (err==ZIP_OK)
+        err = add_data_in_datablock(&pziinit->central_dir,buf_read, (uLong)read_this);
+
+      size_central_dir_to_read-=read_this;
+    }
+    TRYFREE(buf_read);
+  }
+  pziinit->begin_pos = byte_before_the_zipfile;
+  pziinit->number_entry = number_entry_CD;
+
+  if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir+byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET) != 0)
+    err=ZIP_ERRNO;
+
+  return err;
+}
+
+
+#endif /* !NO_ADDFILEINEXISTINGZIP*/
+
+
+/************************************************************/
+extern zipFile ZEXPORT zipOpen3 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_32_def* pzlib_filefunc64_32_def)
+{
+    zip64_internal ziinit;
+    zip64_internal* zi;
+    int err=ZIP_OK;
+
+    ziinit.z_filefunc.zseek32_file = NULL;
+    ziinit.z_filefunc.ztell32_file = NULL;
+    if (pzlib_filefunc64_32_def==NULL)
+        fill_fopen64_filefunc(&ziinit.z_filefunc.zfile_func64);
+    else
+        ziinit.z_filefunc = *pzlib_filefunc64_32_def;
+
+    ziinit.filestream = ZOPEN64(ziinit.z_filefunc,
+                  pathname,
+                  (append == APPEND_STATUS_CREATE) ?
+                  (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_CREATE) :
+                    (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_EXISTING));
+
+    if (ziinit.filestream == NULL)
+        return NULL;
+
+    if (append == APPEND_STATUS_CREATEAFTER)
+        ZSEEK64(ziinit.z_filefunc,ziinit.filestream,0,SEEK_END);
+
+    ziinit.begin_pos = ZTELL64(ziinit.z_filefunc,ziinit.filestream);
+    ziinit.in_opened_file_inzip = 0;
+    ziinit.ci.stream_initialised = 0;
+    ziinit.number_entry = 0;
+    ziinit.add_position_when_writing_offset = 0;
+    init_linkedlist(&(ziinit.central_dir));
+
+
+
+    zi = (zip64_internal*)ALLOC(sizeof(zip64_internal));
+    if (zi==NULL)
+    {
+        ZCLOSE64(ziinit.z_filefunc,ziinit.filestream);
+        return NULL;
+    }
+
+    /* now we add file in a zipfile */
+#    ifndef NO_ADDFILEINEXISTINGZIP
+    ziinit.globalcomment = NULL;
+    if (append == APPEND_STATUS_ADDINZIP)
+    {
+      // Read and Cache Central Directory Records
+      err = LoadCentralDirectoryRecord(&ziinit);
+    }
+
+    if (globalcomment)
+    {
+      *globalcomment = ziinit.globalcomment;
+    }
+#    endif /* !NO_ADDFILEINEXISTINGZIP*/
+
+    if (err != ZIP_OK)
+    {
+#    ifndef NO_ADDFILEINEXISTINGZIP
+        TRYFREE(ziinit.globalcomment);
+#    endif /* !NO_ADDFILEINEXISTINGZIP*/
+        TRYFREE(zi);
+        return NULL;
+    }
+    else
+    {
+        *zi = ziinit;
+        return (zipFile)zi;
+    }
+}
+
+extern zipFile ZEXPORT zipOpen2 (const char *pathname, int append, zipcharpc* globalcomment, zlib_filefunc_def* pzlib_filefunc32_def)
+{
+    if (pzlib_filefunc32_def != NULL)
+    {
+        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
+        fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
+        return zipOpen3(pathname, append, globalcomment, &zlib_filefunc64_32_def_fill);
+    }
+    else
+        return zipOpen3(pathname, append, globalcomment, NULL);
+}
+
+extern zipFile ZEXPORT zipOpen2_64 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_def* pzlib_filefunc_def)
+{
+    if (pzlib_filefunc_def != NULL)
+    {
+        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
+        zlib_filefunc64_32_def_fill.zfile_func64 = *pzlib_filefunc_def;
+        zlib_filefunc64_32_def_fill.ztell32_file = NULL;
+        zlib_filefunc64_32_def_fill.zseek32_file = NULL;
+        return zipOpen3(pathname, append, globalcomment, &zlib_filefunc64_32_def_fill);
+    }
+    else
+        return zipOpen3(pathname, append, globalcomment, NULL);
+}
+
+
+
+extern zipFile ZEXPORT zipOpen (const char* pathname, int append)
+{
+    return zipOpen3((const void*)pathname,append,NULL,NULL);
+}
+
+extern zipFile ZEXPORT zipOpen64 (const void* pathname, int append)
+{
+    return zipOpen3(pathname,append,NULL,NULL);
+}
+
+int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
+{
+  /* write the local header */
+  int err;
+  uInt size_filename = (uInt)strlen(filename);
+  uInt size_extrafield = size_extrafield_local;
+
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)LOCALHEADERMAGIC, 4);
+
+  if (err==ZIP_OK)
+  {
+    if(zi->ci.zip64)
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);/* version needed to extract */
+    else
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)20,2);/* version needed to extract */
+  }
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.flag,2);
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.method,2);
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.dosDate,4);
+
+  // CRC / Compressed size / Uncompressed size will be filled in later and rewritten later
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* crc 32, unknown */
+  if (err==ZIP_OK)
+  {
+    if(zi->ci.zip64)
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* compressed size, unknown */
+    else
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* compressed size, unknown */
+  }
+  if (err==ZIP_OK)
+  {
+    if(zi->ci.zip64)
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* uncompressed size, unknown */
+    else
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* uncompressed size, unknown */
+  }
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_filename,2);
+
+  if(zi->ci.zip64)
+  {
+    size_extrafield += 20;
+  }
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_extrafield,2);
+
+  if ((err==ZIP_OK) && (size_filename > 0))
+  {
+    if (ZWRITE64(zi->z_filefunc,zi->filestream,filename,size_filename)!=size_filename)
+      err = ZIP_ERRNO;
+  }
+
+  if ((err==ZIP_OK) && (size_extrafield_local > 0))
+  {
+    if (ZWRITE64(zi->z_filefunc, zi->filestream, extrafield_local, size_extrafield_local) != size_extrafield_local)
+      err = ZIP_ERRNO;
+  }
+
+
+  if ((err==ZIP_OK) && (zi->ci.zip64))
+  {
+      // write the Zip64 extended info
+      short HeaderID = 1;
+      short DataSize = 16;
+      ZPOS64_T CompressedSize = 0;
+      ZPOS64_T UncompressedSize = 0;
+
+      // Remember position of Zip64 extended info for the local file header. (needed when we update size after done with file)
+      zi->ci.pos_zip64extrainfo = ZTELL64(zi->z_filefunc,zi->filestream);
+
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)HeaderID,2);
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)DataSize,2);
+
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)UncompressedSize,8);
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)CompressedSize,8);
+  }
+
+  return err;
+}
+
+/*
+ NOTE.
+ When writing RAW the ZIP64 extended information in extrafield_local and extrafield_global needs to be stripped
+ before calling this function it can be done with zipRemoveExtraInfoBlock
+
+ It is not done here because then we need to realloc a new buffer since parameters are 'const' and I want to minimize
+ unnecessary allocations.
+ */
+extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                         const void* extrafield_local, uInt size_extrafield_local,
+                                         const void* extrafield_global, uInt size_extrafield_global,
+                                         const char* comment, int method, int level, int raw,
+                                         int windowBits,int memLevel, int strategy,
+                                         const char* password, uLong crcForCrypting,
+                                         uLong versionMadeBy, uLong flagBase, int zip64)
+{
+    zip64_internal* zi;
+    uInt size_filename;
+    uInt size_comment;
+    uInt i;
+    int err = ZIP_OK;
+
+#    ifdef NOCRYPT
+    (crcForCrypting);
+    if (password != NULL)
+        return ZIP_PARAMERROR;
+#    endif
+
+    if (file == NULL)
+        return ZIP_PARAMERROR;
+
+#ifdef HAVE_BZIP2
+    if ((method!=0) && (method!=Z_DEFLATED) && (method!=Z_BZIP2ED))
+      return ZIP_PARAMERROR;
+#else
+    if ((method!=0) && (method!=Z_DEFLATED))
+      return ZIP_PARAMERROR;
+#endif
+
+    zi = (zip64_internal*)file;
+
+    if (zi->in_opened_file_inzip == 1)
+    {
+        err = zipCloseFileInZip (file);
+        if (err != ZIP_OK)
+            return err;
+    }
+
+    if (filename==NULL)
+        filename="-";
+
+    if (comment==NULL)
+        size_comment = 0;
+    else
+        size_comment = (uInt)strlen(comment);
+
+    size_filename = (uInt)strlen(filename);
+
+    if (zipfi == NULL)
+        zi->ci.dosDate = 0;
+    else
+    {
+        if (zipfi->dosDate != 0)
+            zi->ci.dosDate = zipfi->dosDate;
+        else
+          zi->ci.dosDate = zip64local_TmzDateToDosDate(&zipfi->tmz_date);
+    }
+
+    zi->ci.flag = flagBase;
+    if ((level==8) || (level==9))
+      zi->ci.flag |= 2;
+    if (level==2)
+      zi->ci.flag |= 4;
+    if (level==1)
+      zi->ci.flag |= 6;
+    if (password != NULL)
+      zi->ci.flag |= 1;
+
+    zi->ci.crc32 = 0;
+    zi->ci.method = method;
+    zi->ci.encrypt = 0;
+    zi->ci.stream_initialised = 0;
+    zi->ci.pos_in_buffered_data = 0;
+    zi->ci.raw = raw;
+    zi->ci.pos_local_header = ZTELL64(zi->z_filefunc,zi->filestream);
+
+    zi->ci.size_centralheader = SIZECENTRALHEADER + size_filename + size_extrafield_global + size_comment;
+    zi->ci.size_centralExtraFree = 32; // Extra space we have reserved in case we need to add ZIP64 extra info data
+
+    zi->ci.central_header = (char*)ALLOC((uInt)zi->ci.size_centralheader + zi->ci.size_centralExtraFree);
+
+    zi->ci.size_centralExtra = size_extrafield_global;
+    zip64local_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4);
+    /* version info */
+    zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)versionMadeBy,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)20,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4);
+    zip64local_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/
+    zip64local_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/
+    zip64local_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/
+    zip64local_putValue_inmemory(zi->ci.central_header+28,(uLong)size_filename,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)size_extrafield_global,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+32,(uLong)size_comment,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+34,(uLong)0,2); /*disk nm start*/
+
+    if (zipfi==NULL)
+        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2);
+    else
+        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2);
+
+    if (zipfi==NULL)
+        zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4);
+    else
+        zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);
+
+    if(zi->ci.pos_local_header >= 0xffffffff)
+      zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)0xffffffff,4);
+    else
+      zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header - zi->add_position_when_writing_offset,4);
+
+    for (i=0;i<size_filename;i++)
+        *(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i);
+
+    for (i=0;i<size_extrafield_global;i++)
+        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+i) =
+              *(((const char*)extrafield_global)+i);
+
+    for (i=0;i<size_comment;i++)
+        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+
+              size_extrafield_global+i) = *(comment+i);
+    if (zi->ci.central_header == NULL)
+        return ZIP_INTERNALERROR;
+
+    zi->ci.zip64 = zip64;
+    zi->ci.totalCompressedData = 0;
+    zi->ci.totalUncompressedData = 0;
+    zi->ci.pos_zip64extrainfo = 0;
+
+    err = Write_LocalFileHeader(zi, filename, size_extrafield_local, extrafield_local);
+
+#ifdef HAVE_BZIP2
+    zi->ci.bstream.avail_in = (uInt)0;
+    zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
+    zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
+    zi->ci.bstream.total_in_hi32 = 0;
+    zi->ci.bstream.total_in_lo32 = 0;
+    zi->ci.bstream.total_out_hi32 = 0;
+    zi->ci.bstream.total_out_lo32 = 0;
+#endif
+
+    zi->ci.stream.avail_in = (uInt)0;
+    zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
+    zi->ci.stream.next_out = zi->ci.buffered_data;
+    zi->ci.stream.total_in = 0;
+    zi->ci.stream.total_out = 0;
+    zi->ci.stream.data_type = Z_BINARY;
+
+#ifdef HAVE_BZIP2
+    if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED || zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
+#else
+    if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+#endif
+    {
+        if(zi->ci.method == Z_DEFLATED)
+        {
+          zi->ci.stream.zalloc = (alloc_func)0;
+          zi->ci.stream.zfree = (free_func)0;
+          zi->ci.stream.opaque = (voidpf)0;
+
+          if (windowBits>0)
+              windowBits = -windowBits;
+
+          err = deflateInit2(&zi->ci.stream, level, Z_DEFLATED, windowBits, memLevel, strategy);
+
+          if (err==Z_OK)
+              zi->ci.stream_initialised = Z_DEFLATED;
+        }
+        else if(zi->ci.method == Z_BZIP2ED)
+        {
+#ifdef HAVE_BZIP2
+            // Init BZip stuff here
+          zi->ci.bstream.bzalloc = 0;
+          zi->ci.bstream.bzfree = 0;
+          zi->ci.bstream.opaque = (voidpf)0;
+
+          err = BZ2_bzCompressInit(&zi->ci.bstream, level, 0,35);
+          if(err == BZ_OK)
+            zi->ci.stream_initialised = Z_BZIP2ED;
+#endif
+        }
+
+    }
+
+#    ifndef NOCRYPT
+    zi->ci.crypt_header_size = 0;
+    if ((err==Z_OK) && (password != NULL))
+    {
+        unsigned char bufHead[RAND_HEAD_LEN];
+        unsigned int sizeHead;
+        zi->ci.encrypt = 1;
+        zi->ci.pcrc_32_tab = get_crc_table();
+        /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/
+
+        sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting);
+        zi->ci.crypt_header_size = sizeHead;
+
+        if (ZWRITE64(zi->z_filefunc,zi->filestream,bufHead,sizeHead) != sizeHead)
+                err = ZIP_ERRNO;
+    }
+#    endif
+
+    if (err==Z_OK)
+        zi->in_opened_file_inzip = 1;
+    return err;
+}
+
+extern int ZEXPORT zipOpenNewFileInZip4 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                         const void* extrafield_local, uInt size_extrafield_local,
+                                         const void* extrafield_global, uInt size_extrafield_global,
+                                         const char* comment, int method, int level, int raw,
+                                         int windowBits,int memLevel, int strategy,
+                                         const char* password, uLong crcForCrypting,
+                                         uLong versionMadeBy, uLong flagBase)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, raw,
+                                 windowBits, memLevel, strategy,
+                                 password, crcForCrypting, versionMadeBy, flagBase, 0);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip3 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                         const void* extrafield_local, uInt size_extrafield_local,
+                                         const void* extrafield_global, uInt size_extrafield_global,
+                                         const char* comment, int method, int level, int raw,
+                                         int windowBits,int memLevel, int strategy,
+                                         const char* password, uLong crcForCrypting)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, raw,
+                                 windowBits, memLevel, strategy,
+                                 password, crcForCrypting, VERSIONMADEBY, 0, 0);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip3_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                         const void* extrafield_local, uInt size_extrafield_local,
+                                         const void* extrafield_global, uInt size_extrafield_global,
+                                         const char* comment, int method, int level, int raw,
+                                         int windowBits,int memLevel, int strategy,
+                                         const char* password, uLong crcForCrypting, int zip64)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, raw,
+                                 windowBits, memLevel, strategy,
+                                 password, crcForCrypting, VERSIONMADEBY, 0, zip64);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip2(zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                        const void* extrafield_local, uInt size_extrafield_local,
+                                        const void* extrafield_global, uInt size_extrafield_global,
+                                        const char* comment, int method, int level, int raw)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, raw,
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 NULL, 0, VERSIONMADEBY, 0, 0);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip2_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                        const void* extrafield_local, uInt size_extrafield_local,
+                                        const void* extrafield_global, uInt size_extrafield_global,
+                                        const char* comment, int method, int level, int raw, int zip64)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, raw,
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 NULL, 0, VERSIONMADEBY, 0, zip64);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                        const void* extrafield_local, uInt size_extrafield_local,
+                                        const void*extrafield_global, uInt size_extrafield_global,
+                                        const char* comment, int method, int level, int zip64)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, 0,
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 NULL, 0, VERSIONMADEBY, 0, zip64);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                        const void* extrafield_local, uInt size_extrafield_local,
+                                        const void*extrafield_global, uInt size_extrafield_global,
+                                        const char* comment, int method, int level)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, 0,
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 NULL, 0, VERSIONMADEBY, 0, 0);
+}
+
+local int zip64FlushWriteBuffer(zip64_internal* zi)
+{
+    int err=ZIP_OK;
+
+    if (zi->ci.encrypt != 0)
+    {
+#ifndef NOCRYPT
+        uInt i;
+        int t;
+        for (i=0;i<zi->ci.pos_in_buffered_data;i++)
+            zi->ci.buffered_data[i] = zencode(zi->ci.keys, zi->ci.pcrc_32_tab, zi->ci.buffered_data[i],t);
+#endif
+    }
+
+    if (ZWRITE64(zi->z_filefunc,zi->filestream,zi->ci.buffered_data,zi->ci.pos_in_buffered_data) != zi->ci.pos_in_buffered_data)
+      err = ZIP_ERRNO;
+
+    zi->ci.totalCompressedData += zi->ci.pos_in_buffered_data;
+
+#ifdef HAVE_BZIP2
+    if(zi->ci.method == Z_BZIP2ED)
+    {
+      zi->ci.totalUncompressedData += zi->ci.bstream.total_in_lo32;
+      zi->ci.bstream.total_in_lo32 = 0;
+      zi->ci.bstream.total_in_hi32 = 0;
+    }
+    else
+#endif
+    {
+      zi->ci.totalUncompressedData += zi->ci.stream.total_in;
+      zi->ci.stream.total_in = 0;
+    }
+
+
+    zi->ci.pos_in_buffered_data = 0;
+
+    return err;
+}
+
+extern int ZEXPORT zipWriteInFileInZip (zipFile file,const void* buf,unsigned int len)
+{
+    zip64_internal* zi;
+    int err=ZIP_OK;
+
+    if (file == NULL)
+        return ZIP_PARAMERROR;
+    zi = (zip64_internal*)file;
+
+    if (zi->in_opened_file_inzip == 0)
+        return ZIP_PARAMERROR;
+
+    zi->ci.crc32 = crc32(zi->ci.crc32,buf,(uInt)len);
+
+#ifdef HAVE_BZIP2
+    if(zi->ci.method == Z_BZIP2ED && (!zi->ci.raw))
+    {
+      zi->ci.bstream.next_in = (void*)buf;
+      zi->ci.bstream.avail_in = len;
+      err = BZ_RUN_OK;
+
+      while ((err==BZ_RUN_OK) && (zi->ci.bstream.avail_in>0))
+      {
+        if (zi->ci.bstream.avail_out == 0)
+        {
+          if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+            err = ZIP_ERRNO;
+          zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
+          zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
+        }
+
+
+        if(err != BZ_RUN_OK)
+          break;
+
+        if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
+        {
+          uLong uTotalOutBefore_lo = zi->ci.bstream.total_out_lo32;
+//          uLong uTotalOutBefore_hi = zi->ci.bstream.total_out_hi32;
+          err=BZ2_bzCompress(&zi->ci.bstream,  BZ_RUN);
+
+          zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore_lo) ;
+        }
+      }
+
+      if(err == BZ_RUN_OK)
+        err = ZIP_OK;
+    }
+    else
+#endif
+    {
+      zi->ci.stream.next_in = (Bytef*)buf;
+      zi->ci.stream.avail_in = len;
+
+      while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))
+      {
+          if (zi->ci.stream.avail_out == 0)
+          {
+              if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+                  err = ZIP_ERRNO;
+              zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
+              zi->ci.stream.next_out = zi->ci.buffered_data;
+          }
+
+
+          if(err != ZIP_OK)
+              break;
+
+          if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+          {
+              uLong uTotalOutBefore = zi->ci.stream.total_out;
+              err=deflate(&zi->ci.stream,  Z_NO_FLUSH);
+              if(uTotalOutBefore > zi->ci.stream.total_out)
+              {
+                int bBreak = 0;
+                bBreak++;
+              }
+
+              zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
+          }
+          else
+          {
+              uInt copy_this,i;
+              if (zi->ci.stream.avail_in < zi->ci.stream.avail_out)
+                  copy_this = zi->ci.stream.avail_in;
+              else
+                  copy_this = zi->ci.stream.avail_out;
+
+              for (i = 0; i < copy_this; i++)
+                  *(((char*)zi->ci.stream.next_out)+i) =
+                      *(((const char*)zi->ci.stream.next_in)+i);
+              {
+                  zi->ci.stream.avail_in -= copy_this;
+                  zi->ci.stream.avail_out-= copy_this;
+                  zi->ci.stream.next_in+= copy_this;
+                  zi->ci.stream.next_out+= copy_this;
+                  zi->ci.stream.total_in+= copy_this;
+                  zi->ci.stream.total_out+= copy_this;
+                  zi->ci.pos_in_buffered_data += copy_this;
+              }
+          }
+      }// while(...)
+    }
+
+    return err;
+}
+
+extern int ZEXPORT zipCloseFileInZipRaw (zipFile file, uLong uncompressed_size, uLong crc32)
+{
+    return zipCloseFileInZipRaw64 (file, uncompressed_size, crc32);
+}
+
+extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_size, uLong crc32)
+{
+    zip64_internal* zi;
+    ZPOS64_T compressed_size;
+    uLong invalidValue = 0xffffffff;
+    short datasize = 0;
+    int err=ZIP_OK;
+
+    if (file == NULL)
+        return ZIP_PARAMERROR;
+    zi = (zip64_internal*)file;
+
+    if (zi->in_opened_file_inzip == 0)
+        return ZIP_PARAMERROR;
+    zi->ci.stream.avail_in = 0;
+
+    if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+                {
+                        while (err==ZIP_OK)
+                        {
+                                uLong uTotalOutBefore;
+                                if (zi->ci.stream.avail_out == 0)
+                                {
+                                        if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+                                                err = ZIP_ERRNO;
+                                        zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
+                                        zi->ci.stream.next_out = zi->ci.buffered_data;
+                                }
+                                uTotalOutBefore = zi->ci.stream.total_out;
+                                err=deflate(&zi->ci.stream,  Z_FINISH);
+                                zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
+                        }
+                }
+    else if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
+    {
+#ifdef HAVE_BZIP2
+      err = BZ_FINISH_OK;
+      while (err==BZ_FINISH_OK)
+      {
+        uLong uTotalOutBefore;
+        if (zi->ci.bstream.avail_out == 0)
+        {
+          if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+            err = ZIP_ERRNO;
+          zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
+          zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
+        }
+        uTotalOutBefore = zi->ci.bstream.total_out_lo32;
+        err=BZ2_bzCompress(&zi->ci.bstream,  BZ_FINISH);
+        if(err == BZ_STREAM_END)
+          err = Z_STREAM_END;
+
+        zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore);
+      }
+
+      if(err == BZ_FINISH_OK)
+        err = ZIP_OK;
+#endif
+    }
+
+    if (err==Z_STREAM_END)
+        err=ZIP_OK; /* this is normal */
+
+    if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK))
+                {
+        if (zip64FlushWriteBuffer(zi)==ZIP_ERRNO)
+            err = ZIP_ERRNO;
+                }
+
+    if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+    {
+        int tmp_err = deflateEnd(&zi->ci.stream);
+        if (err == ZIP_OK)
+            err = tmp_err;
+        zi->ci.stream_initialised = 0;
+    }
+#ifdef HAVE_BZIP2
+    else if((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
+    {
+      int tmperr = BZ2_bzCompressEnd(&zi->ci.bstream);
+                        if (err==ZIP_OK)
+                                err = tmperr;
+                        zi->ci.stream_initialised = 0;
+    }
+#endif
+
+    if (!zi->ci.raw)
+    {
+        crc32 = (uLong)zi->ci.crc32;
+        uncompressed_size = zi->ci.totalUncompressedData;
+    }
+    compressed_size = zi->ci.totalCompressedData;
+
+#    ifndef NOCRYPT
+    compressed_size += zi->ci.crypt_header_size;
+#    endif
+
+    // update Current Item crc and sizes,
+    if(compressed_size >= 0xffffffff || uncompressed_size >= 0xffffffff || zi->ci.pos_local_header >= 0xffffffff)
+    {
+      /*version Made by*/
+      zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)45,2);
+      /*version needed*/
+      zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)45,2);
+
+    }
+
+    zip64local_putValue_inmemory(zi->ci.central_header+16,crc32,4); /*crc*/
+
+
+    if(compressed_size >= 0xffffffff)
+      zip64local_putValue_inmemory(zi->ci.central_header+20, invalidValue,4); /*compr size*/
+    else
+      zip64local_putValue_inmemory(zi->ci.central_header+20, compressed_size,4); /*compr size*/
+
+    /// set internal file attributes field
+    if (zi->ci.stream.data_type == Z_ASCII)
+        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)Z_ASCII,2);
+
+    if(uncompressed_size >= 0xffffffff)
+      zip64local_putValue_inmemory(zi->ci.central_header+24, invalidValue,4); /*uncompr size*/
+    else
+      zip64local_putValue_inmemory(zi->ci.central_header+24, uncompressed_size,4); /*uncompr size*/
+
+    // Add ZIP64 extra info field for uncompressed size
+    if(uncompressed_size >= 0xffffffff)
+      datasize += 8;
+
+    // Add ZIP64 extra info field for compressed size
+    if(compressed_size >= 0xffffffff)
+      datasize += 8;
+
+    // Add ZIP64 extra info field for relative offset to local file header of current file
+    if(zi->ci.pos_local_header >= 0xffffffff)
+      datasize += 8;
+
+    if(datasize > 0)
+    {
+      char* p = NULL;
+
+      if((uLong)(datasize + 4) > zi->ci.size_centralExtraFree)
+      {
+        // we can not write more data to the buffer that we have room for.
+        return ZIP_BADZIPFILE;
+      }
+
+      p = zi->ci.central_header + zi->ci.size_centralheader;
+
+      // Add Extra Information Header for 'ZIP64 information'
+      zip64local_putValue_inmemory(p, 0x0001, 2); // HeaderID
+      p += 2;
+      zip64local_putValue_inmemory(p, datasize, 2); // DataSize
+      p += 2;
+
+      if(uncompressed_size >= 0xffffffff)
+      {
+        zip64local_putValue_inmemory(p, uncompressed_size, 8);
+        p += 8;
+      }
+
+      if(compressed_size >= 0xffffffff)
+      {
+        zip64local_putValue_inmemory(p, compressed_size, 8);
+        p += 8;
+      }
+
+      if(zi->ci.pos_local_header >= 0xffffffff)
+      {
+        zip64local_putValue_inmemory(p, zi->ci.pos_local_header, 8);
+        p += 8;
+      }
+
+      // Update how much extra free space we got in the memory buffer
+      // and increase the centralheader size so the new ZIP64 fields are included
+      // ( 4 below is the size of HeaderID and DataSize field )
+      zi->ci.size_centralExtraFree -= datasize + 4;
+      zi->ci.size_centralheader += datasize + 4;
+
+      // Update the extra info size field
+      zi->ci.size_centralExtra += datasize + 4;
+      zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)zi->ci.size_centralExtra,2);
+    }
+
+    if (err==ZIP_OK)
+        err = add_data_in_datablock(&zi->central_dir, zi->ci.central_header, (uLong)zi->ci.size_centralheader);
+
+    free(zi->ci.central_header);
+
+    if (err==ZIP_OK)
+    {
+        // Update the LocalFileHeader with the new values.
+
+        ZPOS64_T cur_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
+
+        if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            err = ZIP_ERRNO;
+
+        if (err==ZIP_OK)
+            err = zip64local_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */
+
+        if(uncompressed_size >= 0xffffffff || compressed_size >= 0xffffffff )
+        {
+          if(zi->ci.pos_zip64extrainfo > 0)
+          {
+            // Update the size in the ZIP64 extended field.
+            if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_zip64extrainfo + 4,ZLIB_FILEFUNC_SEEK_SET)!=0)
+              err = ZIP_ERRNO;
+
+            if (err==ZIP_OK) /* compressed size, unknown */
+              err = zip64local_putValue(&zi->z_filefunc, zi->filestream, uncompressed_size, 8);
+
+            if (err==ZIP_OK) /* uncompressed size, unknown */
+              err = zip64local_putValue(&zi->z_filefunc, zi->filestream, compressed_size, 8);
+          }
+          else
+              err = ZIP_BADZIPFILE; // Caller passed zip64 = 0, so no room for zip64 info -> fatal
+        }
+        else
+        {
+          if (err==ZIP_OK) /* compressed size, unknown */
+              err = zip64local_putValue(&zi->z_filefunc,zi->filestream,compressed_size,4);
+
+          if (err==ZIP_OK) /* uncompressed size, unknown */
+              err = zip64local_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,4);
+        }
+
+        if (ZSEEK64(zi->z_filefunc,zi->filestream, cur_pos_inzip,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            err = ZIP_ERRNO;
+    }
+
+    zi->number_entry ++;
+    zi->in_opened_file_inzip = 0;
+
+    return err;
+}
+
+extern int ZEXPORT zipCloseFileInZip (zipFile file)
+{
+    return zipCloseFileInZipRaw (file,0,0);
+}
+
+int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
+{
+  int err = ZIP_OK;
+  ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writing_offset;
+
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDLOCHEADERMAGIC,4);
+
+  /*num disks*/
+    if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
+
+  /*relative offset*/
+    if (err==ZIP_OK) /* Relative offset to the Zip64EndOfCentralDirectory */
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream, pos,8);
+
+  /*total disks*/ /* Do not support spawning of disk so always say 1 here*/
+    if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)1,4);
+
+    return err;
+}
+
+int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
+{
+  int err = ZIP_OK;
+
+  uLong Zip64DataSize = 44;
+
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDHEADERMAGIC,4);
+
+  if (err==ZIP_OK) /* size of this 'zip64 end of central directory' */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)Zip64DataSize,8); // why ZPOS64_T of this ?
+
+  if (err==ZIP_OK) /* version made by */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
+
+  if (err==ZIP_OK) /* version needed */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
+
+  if (err==ZIP_OK) /* number of this disk */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
+
+  if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
+
+  if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
+    err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
+
+  if (err==ZIP_OK) /* total number of entries in the central dir */
+    err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
+
+  if (err==ZIP_OK) /* size of the central directory */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)size_centraldir,8);
+
+  if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
+  {
+    ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (ZPOS64_T)pos,8);
+  }
+  return err;
+}
+int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
+{
+  int err = ZIP_OK;
+
+  /*signature*/
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4);
+
+  if (err==ZIP_OK) /* number of this disk */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
+
+  if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
+
+  if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
+  {
+    {
+      if(zi->number_entry >= 0xFFFF)
+        err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
+      else
+        err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
+    }
+  }
+
+  if (err==ZIP_OK) /* total number of entries in the central dir */
+  {
+    if(zi->number_entry >= 0xFFFF)
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
+    else
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
+  }
+
+  if (err==ZIP_OK) /* size of the central directory */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4);
+
+  if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
+  {
+    ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
+    if(pos >= 0xffffffff)
+    {
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)0xffffffff,4);
+    }
+    else
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writing_offset),4);
+  }
+
+   return err;
+}
+
+int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
+{
+  int err = ZIP_OK;
+  uInt size_global_comment = 0;
+
+  if(global_comment != NULL)
+    size_global_comment = (uInt)strlen(global_comment);
+
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_global_comment,2);
+
+  if (err == ZIP_OK && size_global_comment > 0)
+  {
+    if (ZWRITE64(zi->z_filefunc,zi->filestream, global_comment, size_global_comment) != size_global_comment)
+      err = ZIP_ERRNO;
+  }
+  return err;
+}
+
+extern int ZEXPORT zipClose (zipFile file, const char* global_comment)
+{
+    zip64_internal* zi;
+    int err = 0;
+    uLong size_centraldir = 0;
+    ZPOS64_T centraldir_pos_inzip;
+    ZPOS64_T pos;
+
+    if (file == NULL)
+        return ZIP_PARAMERROR;
+
+    zi = (zip64_internal*)file;
+
+    if (zi->in_opened_file_inzip == 1)
+    {
+        err = zipCloseFileInZip (file);
+    }
+
+#ifndef NO_ADDFILEINEXISTINGZIP
+    if (global_comment==NULL)
+        global_comment = zi->globalcomment;
+#endif
+
+    centraldir_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
+
+    if (err==ZIP_OK)
+    {
+        linkedlist_datablock_internal* ldi = zi->central_dir.first_block;
+        while (ldi!=NULL)
+        {
+            if ((err==ZIP_OK) && (ldi->filled_in_this_block>0))
+            {
+                if (ZWRITE64(zi->z_filefunc,zi->filestream, ldi->data, ldi->filled_in_this_block) != ldi->filled_in_this_block)
+                    err = ZIP_ERRNO;
+            }
+
+            size_centraldir += ldi->filled_in_this_block;
+            ldi = ldi->next_datablock;
+        }
+    }
+    free_linkedlist(&(zi->central_dir));
+
+    pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
+    if(pos >= 0xffffffff || zi->number_entry > 0xFFFF)
+    {
+      ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream);
+      Write_Zip64EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
+
+      Write_Zip64EndOfCentralDirectoryLocator(zi, Zip64EOCDpos);
+    }
+
+    if (err==ZIP_OK)
+      err = Write_EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
+
+    if(err == ZIP_OK)
+      err = Write_GlobalComment(zi, global_comment);
+
+    if (ZCLOSE64(zi->z_filefunc,zi->filestream) != 0)
+        if (err == ZIP_OK)
+            err = ZIP_ERRNO;
+
+#ifndef NO_ADDFILEINEXISTINGZIP
+    TRYFREE(zi->globalcomment);
+#endif
+    TRYFREE(zi);
+
+    return err;
+}
+
+extern int ZEXPORT zipRemoveExtraInfoBlock (char* pData, int* dataLen, short sHeader)
+{
+  char* p = pData;
+  int size = 0;
+  char* pNewHeader;
+  char* pTmp;
+  short header;
+  short dataSize;
+
+  int retVal = ZIP_OK;
+
+  if(pData == NULL || *dataLen < 4)
+    return ZIP_PARAMERROR;
+
+  pNewHeader = (char*)ALLOC(*dataLen);
+  pTmp = pNewHeader;
+
+  while(p < (pData + *dataLen))
+  {
+    header = *(short*)p;
+    dataSize = *(((short*)p)+1);
+
+    if( header == sHeader ) // Header found.
+    {
+      p += dataSize + 4; // skip it. do not copy to temp buffer
+    }
+    else
+    {
+      // Extra Info block should not be removed, So copy it to the temp buffer.
+      memcpy(pTmp, p, dataSize + 4);
+      p += dataSize + 4;
+      size += dataSize + 4;
+    }
+
+  }
+
+  if(size < *dataLen)
+  {
+    // clean old extra info block.
+    memset(pData,0, *dataLen);
+
+    // copy the new extra info block over the old
+    if(size > 0)
+      memcpy(pData, pNewHeader, size);
+
+    // set the new extra info size
+    *dataLen = size;
+
+    retVal = ZIP_OK;
+  }
+  else
+    retVal = ZIP_ERRNO;
+
+  TRYFREE(pNewHeader);
+
+  return retVal;
+}
diff --git a/DSView/pv/minizip/zip.h b/DSView/pv/minizip/zip.h
new file mode 100644
index 00000000..8aaebb62
--- /dev/null
+++ b/DSView/pv/minizip/zip.h
@@ -0,0 +1,362 @@
+/* zip.h -- IO on .zip files using zlib
+   Version 1.1, February 14h, 2010
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+         ---------------------------------------------------------------------------
+
+   Condition of use and distribution are the same than zlib :
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+        ---------------------------------------------------------------------------
+
+        Changes
+
+        See header of zip.h
+
+*/
+
+#ifndef _zip12_H
+#define _zip12_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//#define HAVE_BZIP2
+
+#ifndef _ZLIB_H
+#include "zlib.h"
+#endif
+
+#ifndef _ZLIBIOAPI_H
+#include "ioapi.h"
+#endif
+
+#ifdef HAVE_BZIP2
+#include "bzlib.h"
+#endif
+
+#define Z_BZIP2ED 12
+
+#if defined(STRICTZIP) || defined(STRICTZIPUNZIP)
+/* like the STRICT of WIN32, we define a pointer that cannot be converted
+    from (void*) without cast */
+typedef struct TagzipFile__ { int unused; } zipFile__;
+typedef zipFile__ *zipFile;
+#else
+typedef voidp zipFile;
+#endif
+
+#define ZIP_OK                          (0)
+#define ZIP_EOF                         (0)
+#define ZIP_ERRNO                       (Z_ERRNO)
+#define ZIP_PARAMERROR                  (-102)
+#define ZIP_BADZIPFILE                  (-103)
+#define ZIP_INTERNALERROR               (-104)
+
+#ifndef DEF_MEM_LEVEL
+#  if MAX_MEM_LEVEL >= 8
+#    define DEF_MEM_LEVEL 8
+#  else
+#    define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#  endif
+#endif
+/* default memLevel */
+
+/* tm_zip contain date/time info */
+typedef struct tm_zip_s
+{
+    uInt tm_sec;            /* seconds after the minute - [0,59] */
+    uInt tm_min;            /* minutes after the hour - [0,59] */
+    uInt tm_hour;           /* hours since midnight - [0,23] */
+    uInt tm_mday;           /* day of the month - [1,31] */
+    uInt tm_mon;            /* months since January - [0,11] */
+    uInt tm_year;           /* years - [1980..2044] */
+} tm_zip;
+
+typedef struct
+{
+    tm_zip      tmz_date;       /* date in understandable format           */
+    uLong       dosDate;       /* if dos_date == 0, tmu_date is used      */
+/*    uLong       flag;        */   /* general purpose bit flag        2 bytes */
+
+    uLong       internal_fa;    /* internal file attributes        2 bytes */
+    uLong       external_fa;    /* external file attributes        4 bytes */
+} zip_fileinfo;
+
+typedef const char* zipcharpc;
+
+
+#define APPEND_STATUS_CREATE        (0)
+#define APPEND_STATUS_CREATEAFTER   (1)
+#define APPEND_STATUS_ADDINZIP      (2)
+
+extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append));
+extern zipFile ZEXPORT zipOpen64 OF((const void *pathname, int append));
+/*
+  Create a zipfile.
+     pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on
+       an Unix computer "zlib/zlib113.zip".
+     if the file pathname exist and append==APPEND_STATUS_CREATEAFTER, the zip
+       will be created at the end of the file.
+         (useful if the file contain a self extractor code)
+     if the file pathname exist and append==APPEND_STATUS_ADDINZIP, we will
+       add files in existing zip (be sure you don't add file that doesn't exist)
+     If the zipfile cannot be opened, the return value is NULL.
+     Else, the return value is a zipFile Handle, usable with other function
+       of this zip package.
+*/
+
+/* Note : there is no delete function into a zipfile.
+   If you want delete file into a zipfile, you must open a zipfile, and create another
+   Of couse, you can use RAW reading and writing to copy the file you did not want delte
+*/
+
+extern zipFile ZEXPORT zipOpen2 OF((const char *pathname,
+                                   int append,
+                                   zipcharpc* globalcomment,
+                                   zlib_filefunc_def* pzlib_filefunc_def));
+
+extern zipFile ZEXPORT zipOpen2_64 OF((const void *pathname,
+                                   int append,
+                                   zipcharpc* globalcomment,
+                                   zlib_filefunc64_def* pzlib_filefunc_def));
+
+extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
+                       const char* filename,
+                       const zip_fileinfo* zipfi,
+                       const void* extrafield_local,
+                       uInt size_extrafield_local,
+                       const void* extrafield_global,
+                       uInt size_extrafield_global,
+                       const char* comment,
+                       int method,
+                       int level));
+
+extern int ZEXPORT zipOpenNewFileInZip64 OF((zipFile file,
+                       const char* filename,
+                       const zip_fileinfo* zipfi,
+                       const void* extrafield_local,
+                       uInt size_extrafield_local,
+                       const void* extrafield_global,
+                       uInt size_extrafield_global,
+                       const char* comment,
+                       int method,
+                       int level,
+                       int zip64));
+
+/*
+  Open a file in the ZIP for writing.
+  filename : the filename in zip (if NULL, '-' without quote will be used
+  *zipfi contain supplemental information
+  if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local
+    contains the extrafield data the the local header
+  if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global
+    contains the extrafield data the the local header
+  if comment != NULL, comment contain the comment string
+  method contain the compression method (0 for store, Z_DEFLATED for deflate)
+  level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
+  zip64 is set to 1 if a zip64 extended information block should be added to the local file header.
+                    this MUST be '1' if the uncompressed size is >= 0xffffffff.
+
+*/
+
+
+extern int ZEXPORT zipOpenNewFileInZip2 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw));
+
+
+extern int ZEXPORT zipOpenNewFileInZip2_64 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int zip64));
+/*
+  Same than zipOpenNewFileInZip, except if raw=1, we write raw file
+ */
+
+extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int windowBits,
+                                            int memLevel,
+                                            int strategy,
+                                            const char* password,
+                                            uLong crcForCrypting));
+
+extern int ZEXPORT zipOpenNewFileInZip3_64 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int windowBits,
+                                            int memLevel,
+                                            int strategy,
+                                            const char* password,
+                                            uLong crcForCrypting,
+                                            int zip64
+                                            ));
+
+/*
+  Same than zipOpenNewFileInZip2, except
+    windowBits,memLevel,,strategy : see parameter strategy in deflateInit2
+    password : crypting password (NULL for no crypting)
+    crcForCrypting : crc of file to compress (needed for crypting)
+ */
+
+extern int ZEXPORT zipOpenNewFileInZip4 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int windowBits,
+                                            int memLevel,
+                                            int strategy,
+                                            const char* password,
+                                            uLong crcForCrypting,
+                                            uLong versionMadeBy,
+                                            uLong flagBase
+                                            ));
+
+
+extern int ZEXPORT zipOpenNewFileInZip4_64 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int windowBits,
+                                            int memLevel,
+                                            int strategy,
+                                            const char* password,
+                                            uLong crcForCrypting,
+                                            uLong versionMadeBy,
+                                            uLong flagBase,
+                                            int zip64
+                                            ));
+/*
+  Same than zipOpenNewFileInZip4, except
+    versionMadeBy : value for Version made by field
+    flag : value for flag field (compression level info will be added)
+ */
+
+
+extern int ZEXPORT zipWriteInFileInZip OF((zipFile file,
+                       const void* buf,
+                       unsigned len));
+/*
+  Write data in the zipfile
+*/
+
+extern int ZEXPORT zipCloseFileInZip OF((zipFile file));
+/*
+  Close the current file in the zipfile
+*/
+
+extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file,
+                                            uLong uncompressed_size,
+                                            uLong crc32));
+
+extern int ZEXPORT zipCloseFileInZipRaw64 OF((zipFile file,
+                                            ZPOS64_T uncompressed_size,
+                                            uLong crc32));
+
+/*
+  Close the current file in the zipfile, for file opened with
+    parameter raw=1 in zipOpenNewFileInZip2
+  uncompressed_size and crc32 are value for the uncompressed size
+*/
+
+extern int ZEXPORT zipClose OF((zipFile file,
+                const char* global_comment));
+/*
+  Close the zipfile
+*/
+
+
+extern int ZEXPORT zipRemoveExtraInfoBlock OF((char* pData, int* dataLen, short sHeader));
+/*
+  zipRemoveExtraInfoBlock -  Added by Mathias Svensson
+
+  Remove extra information block from a extra information data for the local file header or central directory header
+
+  It is needed to remove ZIP64 extra information blocks when before data is written if using RAW mode.
+
+  0x0001 is the signature header for the ZIP64 extra information blocks
+
+  usage.
+                        Remove ZIP64 Extra information from a central director extra field data
+              zipRemoveExtraInfoBlock(pCenDirExtraFieldData, &nCenDirExtraFieldDataLen, 0x0001);
+
+                        Remove ZIP64 Extra information from a Local File Header extra field data
+        zipRemoveExtraInfoBlock(pLocalHeaderExtraFieldData, &nLocalHeaderExtraFieldDataLen, 0x0001);
+*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _zip64_H */
diff --git a/DSView/pv/storesession.cpp b/DSView/pv/storesession.cpp
index e77345bd..0d37207a 100755
--- a/DSView/pv/storesession.cpp
+++ b/DSView/pv/storesession.cpp
@@ -212,7 +212,7 @@ bool StoreSession::save_start(QString session_file)
         */
 
             //make zip file
-        if (meta_file != NULL && m_zipDoc.CreateNew())
+        if (meta_file != NULL && m_zipDoc.CreateNew(_file_name.toUtf8().data(), false))
         {
             if (   !m_zipDoc.AddFromFile(meta_file.toUtf8().data(), "header")
                 || !m_zipDoc.AddFromFile(decoders_file.toUtf8().data(), "decoders")
@@ -324,8 +324,8 @@ void StoreSession::save_proc(shared_ptr<data::Snapshot> snapshot)
                         memcpy(tmp+(buf_end-buf), buf_start, buf+size-buf_end);
                     }
 
-                   ret = sr_session_append(_file_name.toUtf8().data(), tmp, size,
-                                     i, 0, ch_type, File_Version);
+                  // ret = sr_session_append(_file_name.toUtf8().data(), tmp, size,
+                    //                 i, 0, ch_type, File_Version);
 
                     MakeChunkName(i, 0, ch_type, File_Version);
                     ret = m_zipDoc.AddFromBuffer(chunk_name, (const char*)tmp, size) ? SR_OK : -1;
@@ -363,7 +363,7 @@ void StoreSession::save_proc(shared_ptr<data::Snapshot> snapshot)
     if (_canceled || num == 0)
         QFile::remove(_file_name);
     else {
-        bool bret = m_zipDoc.SaveToFile(_file_name.toUtf8().data());
+        bool bret = m_zipDoc.Close();
         m_zipDoc.Release();
 
         if (!bret){

From dd2630c4fbc4effd0e1c3dddf189e685083435c1 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Fri, 22 Oct 2021 18:12:41 +0800
Subject: [PATCH 09/58] titlebar able process window move

---
 DSView/pv/ZipMaker.cpp                  |   2 +-
 DSView/pv/dialogs/applicationpardlg.cpp |  53 ++++++++
 DSView/pv/dialogs/applicationpardlg.h   |  52 ++++++++
 DSView/pv/dialogs/deviceoptions.cpp     |   3 +-
 DSView/pv/dialogs/dsdialog.cpp          | 159 ++++++++++++------------
 DSView/pv/dialogs/dsdialog.h            |  46 ++++---
 DSView/pv/dialogs/dsmessagebox.cpp      | 105 +++++++---------
 DSView/pv/dialogs/dsmessagebox.h        |  29 ++---
 DSView/pv/dock/protocoldock.cpp         |  40 +++---
 DSView/pv/dock/protocoldock.h           |   2 +-
 DSView/pv/dock/protocolitemlayer.cpp    |  19 +--
 DSView/pv/dock/protocolitemlayer.h      |   2 +-
 DSView/pv/dsvdef.cpp                    |  21 ++++
 DSView/pv/dsvdef.h                      |  15 ++-
 DSView/pv/interface/uicallback.h        |   8 ++
 DSView/pv/mainframe.cpp                 |  93 ++++++++------
 DSView/pv/mainframe.h                   |  16 ++-
 DSView/pv/toolbars/filebar.cpp          |  26 ++--
 DSView/pv/toolbars/titlebar.cpp         |  91 +++++++++-----
 DSView/pv/toolbars/titlebar.h           |  82 ++++++------
 DSView/pv/toolbars/trigbar.cpp          |  71 +++++++----
 DSView/pv/toolbars/trigbar.h            |   4 +-
 DSView/pv/ui/msgbox.cpp                 |   3 +-
 DSView/pv/view/decodetrace.cpp          |  19 +--
 DSView/pv/view/viewport.cpp             |   2 +-
 libsigrok4DSL/hardware/demo/demo.h      |   4 +-
 26 files changed, 576 insertions(+), 391 deletions(-)
 create mode 100644 DSView/pv/dialogs/applicationpardlg.cpp
 create mode 100644 DSView/pv/dialogs/applicationpardlg.h
 create mode 100644 DSView/pv/interface/uicallback.h

diff --git a/DSView/pv/ZipMaker.cpp b/DSView/pv/ZipMaker.cpp
index 69f6ef0d..add6a080 100644
--- a/DSView/pv/ZipMaker.cpp
+++ b/DSView/pv/ZipMaker.cpp
@@ -36,7 +36,7 @@ ZipMaker::ZipMaker() :
     m_zDoc(NULL)
 {
     m_error[0] = 0; 
-    m_opt_compress_level = Z_DEFAULT_COMPRESSION;
+    m_opt_compress_level = Z_BEST_SPEED;
     m_zi = NULL;
 }
 
diff --git a/DSView/pv/dialogs/applicationpardlg.cpp b/DSView/pv/dialogs/applicationpardlg.cpp
new file mode 100644
index 00000000..26e07484
--- /dev/null
+++ b/DSView/pv/dialogs/applicationpardlg.cpp
@@ -0,0 +1,53 @@
+/*
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
+ *
+ * Copyright (C) 2015 DreamSourceLab <support@dreamsourcelab.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include "applicationpardlg.h"
+#include "dsdialog.h"
+
+namespace pv
+{
+namespace dialogs
+{
+
+ApplicationParamDlg::ApplicationParamDlg()
+{
+    m_ret = false;
+}
+
+ApplicationParamDlg::~ApplicationParamDlg()
+{
+}
+
+bool ApplicationParamDlg::ShowDlg(QWidget *parent)
+{
+    DSDialog dlg(parent, true, true);
+    dlg.exec();
+    return m_ret;
+}
+
+//------------IDlgCallback
+void ApplicationParamDlg::OnDlgResult(bool bYes){
+    m_ret = bYes;
+ }
+
+} //
+}//
+
diff --git a/DSView/pv/dialogs/applicationpardlg.h b/DSView/pv/dialogs/applicationpardlg.h
new file mode 100644
index 00000000..71e35d51
--- /dev/null
+++ b/DSView/pv/dialogs/applicationpardlg.h
@@ -0,0 +1,52 @@
+/*
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
+ *
+ * Copyright (C) 2015 DreamSourceLab <support@dreamsourcelab.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#pragma once
+
+#include <QObject>
+#include <QWidget> 
+#include "../interface/uicallback.h"
+
+namespace pv
+{
+ namespace dialogs
+{
+
+    class ApplicationParamDlg : private IDlgCallback
+    {
+       // Q_OBJECT
+
+    public:
+        ApplicationParamDlg();
+        ~ApplicationParamDlg();
+
+        bool ShowDlg(QWidget *parent);
+
+    //IDlgCallback
+    private:
+        void OnDlgResult(bool bYes);
+
+    private:
+        bool  m_ret; 
+    };
+
+}//
+}//
diff --git a/DSView/pv/dialogs/deviceoptions.cpp b/DSView/pv/dialogs/deviceoptions.cpp
index 8d5800dd..3ac73ad2 100755
--- a/DSView/pv/dialogs/deviceoptions.cpp
+++ b/DSView/pv/dialogs/deviceoptions.cpp
@@ -40,8 +40,7 @@ namespace dialogs {
 DeviceOptions::DeviceOptions(QWidget *parent, boost::shared_ptr<pv::device::DevInst> dev_inst) :
     DSDialog(parent),
     _dev_inst(dev_inst),
-    _button_box(QDialogButtonBox::Ok,
-		Qt::Horizontal, this),
+    _button_box(QDialogButtonBox::Ok, Qt::Horizontal, this),
     _device_options_binding(_dev_inst->dev_inst())
 {
     _props_box = new QGroupBox(tr("Mode"), this);
diff --git a/DSView/pv/dialogs/dsdialog.cpp b/DSView/pv/dialogs/dsdialog.cpp
index 359a4971..81165b3f 100755
--- a/DSView/pv/dialogs/dsdialog.cpp
+++ b/DSView/pv/dialogs/dsdialog.cpp
@@ -28,118 +28,121 @@
 #include <QMouseEvent>
 #include <QVBoxLayout>
 #include <QAbstractButton>
+#include "../dsvdef.h"
 
 namespace pv {
 namespace dialogs {
 
-DSDialog::DSDialog(QWidget *parent, bool hasClose) :
-    QDialog(parent),
-    _moving(false)
+DSDialog::DSDialog() : DSDialog(NULL, false, false)
 {
+}
+
+DSDialog::DSDialog(QWidget *parent): DSDialog(parent, false, false)
+{
+}
+
+DSDialog::DSDialog(QWidget *parent, bool hasClose): DSDialog(parent, hasClose, false)
+{
+}
+
+DSDialog::DSDialog(QWidget *parent, bool hasClose, bool bBaseButton) :
+    QDialog(NULL), //must be null, otherwise window can not able to move
+    m_bBaseButton(bBaseButton)
+{
+    (void)parent;
+
+    _base_layout = NULL;
+    _main_layout = NULL;
+    _main_widget = NULL;
+    _titlebar = NULL;
+    _shadow = NULL; 
+    _base_button = NULL;
+
+    m_callback = NULL; 
+    
     setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);
     setAttribute(Qt::WA_TranslucentBackground);
 
-    build_main(hasClose);
+    build_base(hasClose); 
+}
 
-    _layout = new QVBoxLayout(this);
-    _layout->addWidget(_main);
-    setLayout(_layout);
+DSDialog::~DSDialog()
+{ 
+    DESTROY_QT_OBJECT(_base_layout);
+    DESTROY_QT_OBJECT(_main_layout);
+    DESTROY_QT_OBJECT(_main_widget);
+    DESTROY_QT_OBJECT(_titlebar);
+    DESTROY_QT_OBJECT(_shadow);
+    DESTROY_QT_OBJECT(_base_button);
 }
 
 void DSDialog::accept()
 {
     using namespace Qt;
 
+    if (m_callback){
+        m_callback->OnDlgResult(true);
+    }
+
     QDialog::accept();
 }
 
 void DSDialog::reject()
 {
     using namespace Qt;
+    if (m_callback){
+        m_callback->OnDlgResult(false);
+    }
 
     QDialog::reject();
 }
-
-bool DSDialog::eventFilter(QObject *object, QEvent *event)
-{
-    (void)object;
-    const QEvent::Type type = event->type();
-    const QMouseEvent *const mouse_event = (QMouseEvent*)event;
-    if (type == QEvent::MouseMove) {
-        if (_moving && mouse_event->buttons().testFlag(Qt::LeftButton)) {
-            move(mouse_event->globalPos() - _startPos);
-        }
-        return true;
-    } else if (type == QEvent::MouseButtonPress) {
-        if (mouse_event->buttons().testFlag(Qt::LeftButton)) {
-            _moving = true;
-#ifndef _WIN32
-            _startPos = mouse_event->pos() +
-                        QPoint(_layout->margin(), _layout->margin()) +
-                        QPoint(_layout->spacing(), _layout->spacing()) +
-                        QPoint(_mlayout->margin(), _mlayout->margin()) +
-                        QPoint(_mlayout->spacing(), _mlayout->spacing());
-#else
-            _startPos = mouse_event->pos() +
-                        QPoint(_layout->margin(), _layout->margin()) +
-                        QPoint(_layout->spacing(), _layout->spacing());
-#endif
-        }
-    } else if (type == QEvent::MouseButtonRelease) {
-        if (mouse_event->buttons().testFlag(Qt::LeftButton)) {
-            _moving = false;
-        }
-    }
-    return false;
-}
-
-QVBoxLayout* DSDialog::layout()
-{
-    return _mlayout;
-}
-
-QWidget* DSDialog::mainWidget()
-{
-    return _main;
-}
-
+  
 void DSDialog::setTitle(QString title)
 {
-    _titlebar->setTitle(title);
+    if (_titlebar){
+         _titlebar->setTitle(title);
+    } 
 }
 
-void DSDialog::reload(bool hasClose)
+void DSDialog::reload()
 {
-    QString title;
-    if (_titlebar)
-        title = _titlebar->title();
-    if (_main)
-        delete _main;
-
-    build_main(hasClose);
-    _titlebar->setTitle(title);
-    _layout->addWidget(_main);
+    show();
 }
 
-void DSDialog::build_main(bool hasClose)
-{
-    _main = new QWidget(this);
-    _mlayout = new QVBoxLayout(_main);
-    _main->setLayout(_mlayout);
-    //_mlayout->setMargin(5);
-    //_mlayout->setSpacing(5);
+int DSDialog::exec()
+{ 
+      //ok,cancel
+    if (m_bBaseButton){
+        _base_button = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,Qt::Horizontal, this);
+        _main_layout->addWidget(_base_button);//, 5, 1, 1, 1, Qt::AlignHCenter | Qt::AlignBottom);
+        connect(_base_button, SIGNAL(rejected()), this, SLOT(reject()));
+        connect(_base_button, SIGNAL(accepted()), this, SLOT(accept()));
+    }
+ 
+    return QDialog::exec();
+}
 
-    Shadow *bodyShadow = new Shadow(_main);
-    bodyShadow->setBlurRadius(10.0);
-    bodyShadow->setDistance(3.0);
-    bodyShadow->setColor(QColor(0, 0, 0, 80));
-    _main->setAutoFillBackground(true);
-    _main->setGraphicsEffect(bodyShadow);
 
+void DSDialog::build_base(bool hasClose)
+{    
+    _main_widget = new QWidget(this);
+    _main_layout = new QVBoxLayout(_main_widget);
     _titlebar = new toolbars::TitleBar(false, this, hasClose);
-    _titlebar->installEventFilter(this);
-    _mlayout->addWidget(_titlebar);
-}
+    _base_layout = new QVBoxLayout(this); 
+  
+    _main_widget->setLayout(_main_layout);
+    _main_widget->setAutoFillBackground(true);
+
+    _shadow  = new Shadow(_main_widget);
+    _shadow->setBlurRadius(10.0);
+    _shadow->setDistance(3.0);
+    _shadow->setColor(QColor(0, 0, 0, 80));
+    _main_widget->setGraphicsEffect(_shadow);
+  
+    _main_layout->addWidget(_titlebar);  
+    _base_layout->addWidget(_main_widget);
+    setLayout(_base_layout);  
+} 
 
 } // namespace dialogs
 } // namespace pv
diff --git a/DSView/pv/dialogs/dsdialog.h b/DSView/pv/dialogs/dsdialog.h
index cefc614d..22799aa2 100755
--- a/DSView/pv/dialogs/dsdialog.h
+++ b/DSView/pv/dialogs/dsdialog.h
@@ -26,40 +26,56 @@
 #include <QDialog>
 #include <QWidget>
 #include <QVBoxLayout>
+#include <QDialogButtonBox>
 
 #include "../toolbars/titlebar.h"
+#include "../interface/uicallback.h"
 
+class QDialogButtonBox;
+ 
+ 
 namespace pv {
 namespace dialogs {
 
+    class Shadow;
+
+//DSView any dialog base class
 class DSDialog : public QDialog
 {
 	Q_OBJECT
 
 public:
-    DSDialog(QWidget *parent = 0, bool hasClose = false);
-    QVBoxLayout *layout();
-    QWidget *mainWidget();
+    DSDialog();
+    DSDialog(QWidget *parent);
+    DSDialog(QWidget *parent, bool hasClose);
+    DSDialog(QWidget *parent, bool hasClose, bool bBaseButton);
+    ~DSDialog();
 
+    inline void SetCallback(IDlgCallback *callback){m_callback = callback;}
+    inline QVBoxLayout *layout(){return _main_layout;}
     void setTitle(QString title);
-    void reload(bool hasClose);
+    void reload(); 
+    int exec();
 
 protected:
     void accept();
     void reject();
-    //void mousePressEvent(QMouseEvent *event);
-    //void mouseReleaseEvent(QMouseEvent *event);
-    bool eventFilter(QObject *object, QEvent *event);
-private:
-    void build_main(bool hasClose);
 
 private:
-    QVBoxLayout *_layout;
-    QVBoxLayout *_mlayout;
-    QWidget *_main;
-    toolbars::TitleBar *_titlebar;
-    bool _moving;
-    QPoint _startPos;
+    void build_base(bool hasClose); 
+
+private:
+    QVBoxLayout         *_base_layout;
+    QWidget             *_main_widget;
+    QVBoxLayout         *_main_layout;
+    toolbars::TitleBar  *_titlebar;
+    Shadow              *_shadow;
+    QDialogButtonBox    *_base_button; 
+   
+    QPoint              _startPos; 
+    bool                 m_bBaseButton; 
+
+    IDlgCallback        *m_callback;
 };
 
 } // namespace dialogs
diff --git a/DSView/pv/dialogs/dsmessagebox.cpp b/DSView/pv/dialogs/dsmessagebox.cpp
index 6a2a225d..eb8f8bbd 100755
--- a/DSView/pv/dialogs/dsmessagebox.cpp
+++ b/DSView/pv/dialogs/dsmessagebox.cpp
@@ -28,32 +28,42 @@
 #include <QMouseEvent>
 #include <QVBoxLayout>
 #include <QAbstractButton>
+#include "../dsvdef.h"
 
 namespace pv {
 namespace dialogs {
 
 DSMessageBox::DSMessageBox(QWidget *parent,const char *title) :
-    QDialog(parent),
-    _moving(false),
-    _clickType(0)
+    QDialog(NULL) //must be null, otherwise window can not able to move
 {
+    _layout = NULL;
+    _main_widget = NULL;
+    _msg = NULL;
+    _titlebar = NULL;
+    _shadow = NULL;  
+    _main_layout = NULL;
+
+    _bClickYes = false;
+
     setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);
     setAttribute(Qt::WA_TranslucentBackground);
-    _main = new QWidget(this);
-    QVBoxLayout *mlayout = new QVBoxLayout(_main);
-    _main->setLayout(mlayout);
 
-    Shadow *bodyShadow = new Shadow();
-    bodyShadow->setBlurRadius(10.0);
-    bodyShadow->setDistance(3.0);
-    bodyShadow->setColor(QColor(0, 0, 0, 80));
-    _main->setAutoFillBackground(true);
-    _main->setGraphicsEffect(bodyShadow);
+    _main_widget = new QWidget(this);
+    _main_layout = new QVBoxLayout(_main_widget);
+    _main_widget->setLayout(_main_layout);  
 
+    _shadow = new Shadow();
     _msg = new QMessageBox(this);
-    _msg->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);
-
     _titlebar = new toolbars::TitleBar(false, this);
+    _layout = new QVBoxLayout(this);
+ 
+    _shadow->setBlurRadius(10.0);
+    _shadow->setDistance(3.0);
+    _shadow->setColor(QColor(0, 0, 0, 80));
+
+    _main_widget->setAutoFillBackground(true);
+    _main_widget->setGraphicsEffect(_shadow);  
+    _msg->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);   
 
     if (title){ 
         _titlebar->setTitle(QString(title));
@@ -61,20 +71,27 @@ DSMessageBox::DSMessageBox(QWidget *parent,const char *title) :
     else{
         _titlebar->setTitle(tr("Message"));
     }
-   
-    _titlebar->installEventFilter(this);
+    
+    _main_layout->addWidget(_titlebar);
+    _main_layout->addWidget(_msg);   
+    _layout->addWidget(_main_widget);
 
-    mlayout->addWidget(_titlebar);
-    mlayout->addWidget(_msg);
-
-    _layout = new QVBoxLayout(this);
-    _layout->addWidget(_main);
     setLayout(_layout);
 
-    //connect(_msg, SIGNAL(finished(int)), this, SLOT(accept()));
     connect(_msg, SIGNAL(buttonClicked(QAbstractButton*)), this, SLOT(on_button(QAbstractButton*)));
 }
 
+
+DSMessageBox::~DSMessageBox()
+{
+    DESTROY_QT_OBJECT(_layout);
+    DESTROY_QT_OBJECT(_main_widget);
+    DESTROY_QT_OBJECT(_msg);
+    DESTROY_QT_OBJECT(_titlebar);
+    DESTROY_QT_OBJECT(_shadow);
+    DESTROY_QT_OBJECT(_main_layout);
+}
+
 void DSMessageBox::accept()
 {
     using namespace Qt;
@@ -88,50 +105,20 @@ void DSMessageBox::reject()
 
     QDialog::reject();
 }
-
-bool DSMessageBox::eventFilter(QObject *object, QEvent *event)
-{
-    (void)object;
-    const QEvent::Type type = event->type();
-    const QMouseEvent *const mouse_event = (QMouseEvent*)event;
-    if (type == QEvent::MouseMove) {
-        if (_moving && mouse_event->buttons().testFlag(Qt::LeftButton)) {
-            move(mouse_event->globalPos() - _startPos);
-        }
-        return true;
-    } else if (type == QEvent::MouseButtonPress) {
-        if (mouse_event->buttons().testFlag(Qt::LeftButton)) {
-            _moving = true;
-            _startPos = mouse_event->pos() +
-                        QPoint(_layout->margin(), _layout->margin()) +
-                        QPoint(_layout->spacing(), _layout->spacing());
-        }
-    } else if (type == QEvent::MouseButtonRelease) {
-        if (mouse_event->buttons().testFlag(Qt::LeftButton)) {
-            _moving = false;
-        }
-    }
-    return false;
-}
-
+  
 QMessageBox* DSMessageBox::mBox()
 {
     return _msg;
 }
-
-int DSMessageBox::exec()
-{
-    //_msg->show();
-    return QDialog::exec();
-}
-
+  
 void DSMessageBox::on_button(QAbstractButton *btn)
 {
     QMessageBox::ButtonRole role = _msg->buttonRole(btn);
-    _clickType  = (int)role;
-    
-    if (role == QMessageBox::AcceptRole)
-        accept();
+
+    if (role == QMessageBox::AcceptRole || role == QMessageBox::YesRole){
+        _bClickYes = true;
+         accept();
+    } 
     else
         reject();
 }
diff --git a/DSView/pv/dialogs/dsmessagebox.h b/DSView/pv/dialogs/dsmessagebox.h
index fa6a8dfb..7b2a1038 100755
--- a/DSView/pv/dialogs/dsmessagebox.h
+++ b/DSView/pv/dialogs/dsmessagebox.h
@@ -33,6 +33,8 @@
 namespace pv {
 namespace dialogs {
 
+     class Shadow;
+
 class DSMessageBox : public QDialog
 {
 	Q_OBJECT
@@ -40,30 +42,29 @@ class DSMessageBox : public QDialog
 public:
     DSMessageBox(QWidget *parent, const char *title=0);
 
-    QMessageBox *mBox();
+    ~DSMessageBox();
 
-    int exec();
+    QMessageBox *mBox(); 
     
-    inline int GetLastClick(){return _clickType;}
+    inline int IsYes(){return _bClickYes;}
 
 protected:
     void accept();
-    void reject();
-    //void mousePressEvent(QMouseEvent *event);
-    //void mouseReleaseEvent(QMouseEvent *event);
-    bool eventFilter(QObject *object, QEvent *event);
+    void reject();  
 
 private slots:
     void on_button(QAbstractButton* btn);
 
 private:
-    QVBoxLayout *_layout;
-    QWidget *_main;
-    QMessageBox *_msg;
-    toolbars::TitleBar *_titlebar;
-    bool _moving;
-    QPoint _startPos;
-    int _clickType;
+    QVBoxLayout         *_layout;
+    QVBoxLayout         *_main_layout;
+    QWidget             *_main_widget;
+    QMessageBox         *_msg;
+    toolbars::TitleBar  *_titlebar;
+    Shadow              *_shadow;
+ 
+    QPoint              _startPos;
+    bool                _bClickYes;
 };
 
 } // namespace dialogs
diff --git a/DSView/pv/dock/protocoldock.cpp b/DSView/pv/dock/protocoldock.cpp
index a811218e..9098ca94 100755
--- a/DSView/pv/dock/protocoldock.cpp
+++ b/DSView/pv/dock/protocoldock.cpp
@@ -210,10 +210,10 @@ ProtocolDock::ProtocolDock(QWidget *parent, view::View &view, SigSession &sessio
 ProtocolDock::~ProtocolDock()
 {
     //destroy protocol item layers
-   for (auto it = _protocolItems.begin(); it != _protocolItems.end(); it++){
-       delete (*it);
+   for (auto it = _protocol_items.begin(); it != _protocol_items.end(); it++){
+       DESTROY_QT_LATER(*it);
    }
-   _protocolItems.clear();
+   _protocol_items.clear();
 }
 
 void ProtocolDock::changeEvent(QEvent *event)
@@ -245,7 +245,7 @@ void ProtocolDock::reStyle()
     _nxt_button->setIcon(QIcon(iconPath+"/next.svg"));
     _search_button->setIcon(QIcon(iconPath+"/search.svg"));
 
-    for (auto it = _protocolItems.begin(); it != _protocolItems.end(); it++){
+    for (auto it = _protocol_items.begin(); it != _protocol_items.end(); it++){
        (*it)->ResetStyle();
     } 
 }
@@ -321,8 +321,8 @@ void ProtocolDock::add_protocol(bool silent)
         //crate item layer
         QString protocolName = _protocol_combobox->currentText();
         ProtocolItemLayer *layer = new ProtocolItemLayer(_up_widget, protocolName, this);
-        _protocolItems.push_back(layer);
-        _up_layout->insertLayout(_protocolItems.size(), layer);
+        _protocol_items.push_back(layer);
+        _up_layout->insertLayout(_protocol_items.size(), layer);
         layer->m_decoderStatus = dstatus;
 
         //set current protocol format
@@ -342,7 +342,7 @@ void ProtocolDock::add_protocol(bool silent)
 }
  
  void ProtocolDock::on_del_all_protocol(){
-     if (_protocolItems.size() == 0){
+     if (_protocol_items.size() == 0){
         MsgBox::Show(NULL, "No Protocol Analyzer to delete!", this);
         return;
      }
@@ -355,15 +355,14 @@ void ProtocolDock::add_protocol(bool silent)
 
 void ProtocolDock::del_all_protocol()
 {  
-    if (_protocolItems.size() > 0)
+    if (_protocol_items.size() > 0)
     {
-        for (auto it = _protocolItems.begin(); it != _protocolItems.end(); it++)
+        for (auto it = _protocol_items.begin(); it != _protocol_items.end(); it++)
         {
-            _up_layout->removeItem((*it));
-            delete (*it); //destory control
+             DESTROY_QT_LATER((*it)); //destory control
             _session.remove_decode_signal(0);
         }
-        _protocolItems.clear();
+        _protocol_items.clear();
         protocol_updated();
     }
 }
@@ -383,9 +382,9 @@ void ProtocolDock::decoded_progress(int progress)
         if (d->decoder()->out_of_memory())
             err = tr("(Out of Memory)");
 
-        if (index < _protocolItems.size())
+        if (index < _protocol_items.size())
         {
-            ProtocolItemLayer &lay =  *(_protocolItems.at(index));
+            ProtocolItemLayer &lay =  *(_protocol_items.at(index));
             lay.SetProgress(pg, err);
 
             //when decode complete, check data format
@@ -745,7 +744,7 @@ void ProtocolDock::search_update()
  //-------------------IProtocolItemLayerCallback
 void ProtocolDock::OnProtocolSetting(void *handle){
      int dex = 0;
-    for (auto it = _protocolItems.begin(); it != _protocolItems.end(); it++){
+    for (auto it = _protocol_items.begin(); it != _protocol_items.end(); it++){
        if ((*it) == handle){
            _session.rst_decoder(dex);         
             protocol_updated();
@@ -761,13 +760,12 @@ void ProtocolDock::OnProtocolDelete(void *handle){
     }
 
      int dex = 0;
-     for (auto it = _protocolItems.begin(); it != _protocolItems.end(); it++){
+     for (auto it = _protocol_items.begin(); it != _protocol_items.end(); it++){
        if ((*it) == handle){
-           delete (*it);
-           _up_layout->removeItem((*it)); //remove child control
-           _protocolItems.remove(dex);
+           DESTROY_QT_LATER(*it); 
+           _protocol_items.remove(dex);
            _session.remove_decode_signal(dex);
-            protocol_updated();
+           protocol_updated();
            break;
        }
        dex++;
@@ -775,7 +773,7 @@ void ProtocolDock::OnProtocolDelete(void *handle){
 }
 
 void ProtocolDock::OnProtocolFormatChanged(QString format, void *handle){
-    for (auto it = _protocolItems.begin(); it != _protocolItems.end(); it++){
+    for (auto it = _protocol_items.begin(); it != _protocol_items.end(); it++){
        if ((*it) == handle){
            QString &name = (*it)->GetProtocolName();
            AppConfig::Instance().SetProtocolFormat(name.toStdString(), format.toStdString());
diff --git a/DSView/pv/dock/protocoldock.h b/DSView/pv/dock/protocoldock.h
index d0d35af8..8b7a1a39 100755
--- a/DSView/pv/dock/protocoldock.h
+++ b/DSView/pv/dock/protocoldock.h
@@ -133,7 +133,7 @@ private:
     QComboBox *_protocol_combobox; 
     QVector <int > _protocol_index_list; 
     QVBoxLayout *_up_layout;
-    QVector <ProtocolItemLayer*> _protocolItems; //protocol item layers
+    QVector <ProtocolItemLayer*> _protocol_items; //protocol item layers
 
     QPushButton *_dn_set_button;
     QPushButton *_dn_save_button;
diff --git a/DSView/pv/dock/protocolitemlayer.cpp b/DSView/pv/dock/protocolitemlayer.cpp
index 1a0996e1..5a51dce1 100644
--- a/DSView/pv/dock/protocolitemlayer.cpp
+++ b/DSView/pv/dock/protocolitemlayer.cpp
@@ -22,11 +22,11 @@
 #include "protocolitemlayer.h"
 #include "../dsvdef.h"
 #include <QtCore> 
-#include <assert.h>
+#include <assert.h> 
  
 namespace pv {
 namespace dock {
-
+  
 ProtocolItemLayer::ProtocolItemLayer(QWidget *parent, QString protocolName, IProtocolItemLayerCallback *callback){
         assert(parent);
         assert(callback);
@@ -58,7 +58,7 @@ ProtocolItemLayer::ProtocolItemLayer(QWidget *parent, QString protocolName, IPro
         hori_layout->addWidget(_del_button);
         hori_layout->addWidget(_format_combox);
         hori_layout->addWidget(_protocol_label);
-        hori_layout->addWidget(_progress_label);      
+        hori_layout->addWidget(_progress_label);   
 
         hori_layout->addStretch(1);
 
@@ -69,13 +69,14 @@ ProtocolItemLayer::ProtocolItemLayer(QWidget *parent, QString protocolName, IPro
         connect(_format_combox, SIGNAL(currentIndexChanged(int)),this, SLOT(on_format_select_changed(int)));
 }
 
-ProtocolItemLayer::~ProtocolItemLayer(){
-        DESTROY_OBJECT(_set_button);
-        DESTROY_OBJECT(_del_button);
-        DESTROY_OBJECT(_protocol_label);
-        DESTROY_OBJECT(_progress_label);
-        DESTROY_OBJECT(_format_combox);
+ProtocolItemLayer::~ProtocolItemLayer(){ 
+     DESTROY_QT_OBJECT(_progress_label);
+     DESTROY_QT_OBJECT(_protocol_label);
+     DESTROY_QT_OBJECT(_set_button);
+     DESTROY_QT_OBJECT(_del_button);
+     DESTROY_QT_OBJECT(_format_combox);
 }
+ 
 
 //-------------control event
 void ProtocolItemLayer::on_set_protocol()
diff --git a/DSView/pv/dock/protocolitemlayer.h b/DSView/pv/dock/protocolitemlayer.h
index 9f4c8b62..45901ef4 100644
--- a/DSView/pv/dock/protocolitemlayer.h
+++ b/DSView/pv/dock/protocolitemlayer.h
@@ -54,7 +54,7 @@ public:
     void LoadFormatSelect(bool bSingle);
     inline QString &GetProtocolName(){return _protocolName;}
     void SetProtocolFormat(const char *format);
-
+  
 private slots: 
     void on_set_protocol(); 
     void on_del_protocol();
diff --git a/DSView/pv/dsvdef.cpp b/DSView/pv/dsvdef.cpp
index c6478b51..e5203dbe 100644
--- a/DSView/pv/dsvdef.cpp
+++ b/DSView/pv/dsvdef.cpp
@@ -44,3 +44,24 @@ namespace DecoderDataFormat
         return (int)ascii;
     }
 }
+
+
+namespace app
+{
+    QWidget* get_app_window_instance(QWidget *ins, bool bSet){
+
+        static QWidget *g_ins = NULL;
+        if (bSet){
+            g_ins = ins;
+        }
+        return g_ins;
+    }
+
+    bool is_app_top_window(QWidget* w){
+         QWidget *top =get_app_window_instance(NULL, NULL);
+         if (top && top == w){
+             return true;
+         }
+         return false;
+      }
+}
diff --git a/DSView/pv/dsvdef.h b/DSView/pv/dsvdef.h
index 2647f613..c35a7de0 100644
--- a/DSView/pv/dsvdef.h
+++ b/DSView/pv/dsvdef.h
@@ -21,8 +21,12 @@
  */
 
 #pragma once
- 
-#define DESTROY_OBJECT(p) if ((p)){delete (p); p = NULL;}
+
+class QWidget;
+
+#define DESTROY_OBJECT(p) if((p)){delete (p); p = NULL;} 
+#define DESTROY_QT_OBJECT(p) if((p)){((p))->deleteLater(); p = NULL;}
+#define DESTROY_QT_LATER(p) ((p))->deleteLater();
 
 namespace DecoderDataFormat
 {
@@ -37,3 +41,10 @@ namespace DecoderDataFormat
 
     int Parse(const char *name);       
 }
+
+namespace app
+{
+    QWidget* get_app_window_instance(QWidget *ins, bool bSet);
+
+    bool is_app_top_window(QWidget* w);
+}
diff --git a/DSView/pv/interface/uicallback.h b/DSView/pv/interface/uicallback.h
new file mode 100644
index 00000000..8af7964b
--- /dev/null
+++ b/DSView/pv/interface/uicallback.h
@@ -0,0 +1,8 @@
+
+#pragma once
+
+class IDlgCallback
+{
+public:
+    virtual void OnDlgResult(bool bYes)=0;
+};
diff --git a/DSView/pv/mainframe.cpp b/DSView/pv/mainframe.cpp
index 714de50b..50759235 100755
--- a/DSView/pv/mainframe.cpp
+++ b/DSView/pv/mainframe.cpp
@@ -42,6 +42,7 @@
 #include <QMessageBox>
 #include <QApplication>
 #include <QScreen>
+#include "dsvdef.h"
 
 #include <algorithm>
 
@@ -68,15 +69,15 @@ MainFrame::MainFrame(DeviceManager &device_manager,
         QSize(), QIcon::Normal, QIcon::Off);
     setWindowIcon(icon);
 
-    _moving = false;
-    _draging = false;
-    _startPos = None;
+    app::get_app_window_instance(this, true);
+ 
+    _bDraging = false;
+    _hit_border = None;
     _freezing = false;
     _minimized = false;
 
     // Title
     _titleBar = new toolbars::TitleBar(true, this);
-    _titleBar->installEventFilter(this);
      
     // MainWindow
     _mainWindow = new MainWindow(device_manager, open_file_name, this);
@@ -223,41 +224,55 @@ bool MainFrame::eventFilter(QObject *object, QEvent *event)
     int newLeft;
     int newTop;
 
-    if (type == QEvent::MouseMove && !isMaximized()) {
-        if (!(mouse_event->buttons() || Qt::NoButton)) {
-            if (object == _top_left) {
-                _startPos = TopLeft;
+    if (type != QEvent::MouseMove 
+        && type != QEvent::MouseButtonPress 
+        && type != QEvent::MouseButtonRelease
+        && type != QEvent::Leave){
+        return QFrame::eventFilter(object, event);
+    }
+
+    //when window is maximized, or is moving, call return 
+    if (isMaximized() || _titleBar->IsMoving()){
+       return QFrame::eventFilter(object, event);
+    }
+
+    if (!_bDraging && type == QEvent::MouseMove && (!(mouse_event->buttons() || Qt::NoButton))){
+           if (object == _top_left) {
+                _hit_border = TopLeft;
                 setCursor(Qt::SizeFDiagCursor);
             } else if (object == _bottom_right) {
-                _startPos = BottomRight;
+                _hit_border = BottomRight;
                 setCursor(Qt::SizeFDiagCursor);
             } else if (object == _top_right) {
-                _startPos = TopRight;
+                _hit_border = TopRight;
                 setCursor(Qt::SizeBDiagCursor);
             } else if (object == _bottom_left) {
-                _startPos = BottomLeft;
+                _hit_border = BottomLeft;
                 setCursor(Qt::SizeBDiagCursor);
             } else if (object == _left) {
-                _startPos = Left;
+                _hit_border = Left;
                 setCursor(Qt::SizeHorCursor);
             } else if (object == _right) {
-                _startPos = Right;
+                _hit_border = Right;
                 setCursor(Qt::SizeHorCursor);
             } else if (object == _bottom) {
-                _startPos = Bottom;
+                _hit_border = Bottom;
                 setCursor(Qt::SizeVerCursor);
             } else if (object == _top) {
-                _startPos = Top;
+                _hit_border = Top;
                 setCursor(Qt::SizeVerCursor);
             } else {
-                _startPos = None;
+                _hit_border = None;
                 setCursor(Qt::ArrowCursor);
             }
-        } else if(mouse_event->buttons().testFlag(Qt::LeftButton)) {
-            if (_moving) {
-                this->move(mouse_event->globalPos() - _lastMousePosition);
-            } else if (!_freezing) {
-                switch (_startPos) {
+
+            return QFrame::eventFilter(object, event);
+    }
+
+  if (type == QEvent::MouseMove) {
+         if(mouse_event->buttons().testFlag(Qt::LeftButton)) {
+            if (!_freezing) {
+                switch (_hit_border) {
                 case TopLeft:
                     newWidth = std::max(_dragStartGeometry.right() - mouse_event->globalX(), minimumWidth());
                     newHeight = std::max(_dragStartGeometry.bottom() - mouse_event->globalY(), minimumHeight());
@@ -325,31 +340,27 @@ bool MainFrame::eventFilter(QObject *object, QEvent *event)
             } 
             return true;
         }
-    } else if (type == QEvent::MouseButtonPress) {
-        if (mouse_event->button() == Qt::LeftButton)
-            if (_titleBar->rect().contains(mouse_event->pos()) &&
-                _startPos == None) {
-            _moving = true;
-            _lastMousePosition = mouse_event->pos() +
-                                 //QPoint(Margin, Margin) +
-                                 QPoint(geometry().left() - frameGeometry().left(), frameGeometry().right() - geometry().right());
-        }
-        if (_startPos != None)
-            _draging = true;
+    }
+     else if (type == QEvent::MouseButtonPress) {
+        if (mouse_event->button() == Qt::LeftButton) 
+        if (_hit_border != None)
+            _bDraging = true;
         _timer.start(50);
         _dragStartGeometry = geometry();
-    } else if (type == QEvent::MouseButtonRelease) {
+    } 
+    else if (type == QEvent::MouseButtonRelease) {
         if (mouse_event->button() == Qt::LeftButton) {
-            _moving = false;
-            _draging = false;
+         
+            _bDraging = false;
             _timer.stop();
         }
-    } else if (!_draging && type == QEvent::Leave) {
-        _startPos = None;
+    } else if (!_bDraging && type == QEvent::Leave) {
+        _hit_border = None;
         setCursor(Qt::ArrowCursor);
-    }
-
-    return QObject::eventFilter(object, event);
+    } 
+    
+ 
+    return QFrame::eventFilter(object, event);
 }
 
 void MainFrame::writeSettings()
@@ -406,7 +417,7 @@ void MainFrame::show_doc()
     const QString DOC_KEY("ShowDocuments");
     QSettings settings(QApplication::organizationName(), QApplication::applicationName());
     if (!settings.contains(DOC_KEY)) {
-        dialogs::DSDialog dlg(this);
+        dialogs::DSDialog dlg(this, true);
         dlg.setTitle(tr("Document"));
 
         QLabel tipsLabel;
diff --git a/DSView/pv/mainframe.h b/DSView/pv/mainframe.h
index 615dd3f1..7e6711ce 100755
--- a/DSView/pv/mainframe.h
+++ b/DSView/pv/mainframe.h
@@ -104,15 +104,13 @@ private:
     widgets::Border *_top_right;
     widgets::Border *_bottom_left;
     widgets::Border *_bottom_right;
-
-    bool _moving;
-    bool _draging;
-    QPoint _lastMousePosition;
-    QRect _dragStartGeometry;
-    int _startPos;
-    QTimer _timer;
-    bool _freezing;
-    bool _minimized;
+ 
+    bool    _bDraging; 
+    QRect   _dragStartGeometry;
+    int     _hit_border;
+    QTimer  _timer;
+    bool    _freezing;
+    bool    _minimized;
 };
 
 } // namespace pv
diff --git a/DSView/pv/toolbars/filebar.cpp b/DSView/pv/toolbars/filebar.cpp
index a61939e6..5efbca7f 100755
--- a/DSView/pv/toolbars/filebar.cpp
+++ b/DSView/pv/toolbars/filebar.cpp
@@ -28,8 +28,8 @@
 #include <QApplication>
 
 #include "filebar.h"
-#include "../device/devinst.h"
-#include "../dialogs/dsmessagebox.h"
+#include "../device/devinst.h" 
+#include "../ui/msgbox.h"
 
 #include <deque>
 
@@ -107,7 +107,7 @@ void FileBar::changeEvent(QEvent *event)
 void FileBar::retranslateUi()
 {
     _file_button.setText(tr("File"));
-    _menu_session->setTitle(tr("Settings"));
+    _menu_session->setTitle(tr("Con&fig..."));
     _action_load->setText(tr("&Load..."));
     _action_store->setText(tr("S&tore..."));
     _action_default->setText(tr("&Default..."));
@@ -157,13 +157,8 @@ void FileBar::session_error(
 
 void FileBar::show_session_error(
     const QString text, const QString info_text)
-{
-    dialogs::DSMessageBox msg(this);
-    msg.mBox()->setText(text);
-    msg.mBox()->setInformativeText(info_text);
-    msg.mBox()->setStandardButtons(QMessageBox::Ok);
-    msg.mBox()->setIcon(QMessageBox::Warning);
-    msg.exec();
+{  
+    MsgBox::Show(NULL, info_text.toStdString().c_str(), this);
 }
 
 void FileBar::on_actionLoad_triggered()
@@ -189,14 +184,9 @@ void FileBar::on_actionDefault_triggered()
     QDir dir(QCoreApplication::applicationDirPath());
     assert(dir.cd("res"));
 #endif
-    if (!dir.exists()) {
-        dialogs::DSMessageBox msg(this);
-        msg.mBox()->setText(tr("Session Load"));
-        msg.mBox()->setInformativeText(tr("Cannot find default session file for this device!"));
-        msg.mBox()->setStandardButtons(QMessageBox::Ok);
-        msg.mBox()->setIcon(QMessageBox::Warning);
-        msg.exec();
-        return;
+    if (!dir.exists()) { 
+          MsgBox::Show(NULL, "Cannot find default session file for this device!", this);
+          return;
     }
 
     QString driver_name = _session.get_device()->name();
diff --git a/DSView/pv/toolbars/titlebar.cpp b/DSView/pv/toolbars/titlebar.cpp
index dffb4bc4..fa2a6310 100755
--- a/DSView/pv/toolbars/titlebar.cpp
+++ b/DSView/pv/toolbars/titlebar.cpp
@@ -30,24 +30,35 @@
 #include <QApplication>
 #include <QPainter>
 #include <QStyleOption>
+#include <assert.h>
 
+#include "../dsvdef.h"
 
 namespace pv {
 namespace toolbars {
 
 TitleBar::TitleBar(bool top, QWidget *parent, bool hasClose) :
     QWidget(parent),
+    _parent(parent),
     _moving(false),
     _isTop(top),
     _hasClose(hasClose)
 {
+   _title = NULL;
+   _minimizeButton = NULL;
+   _maximizeButton = NULL;
+   _closeButton = NULL;
+   _lay = NULL;
+
+   assert(parent);
+
     setObjectName("TitleBar");
     setContentsMargins(0,0,0,0);
     setFixedHeight(32);
 
     _title = new QLabel(this);
-    QHBoxLayout *hbox = new QHBoxLayout(this);
-    hbox->addWidget(_title);
+    _lay = new QHBoxLayout(this);
+    _lay->addWidget(_title);
 
     if (_isTop) {
         _minimizeButton = new QToolButton(this);
@@ -55,8 +66,8 @@ TitleBar::TitleBar(bool top, QWidget *parent, bool hasClose) :
         _maximizeButton = new QToolButton(this);
         _maximizeButton->setObjectName("MaximizeButton");
 
-        hbox->addWidget(_minimizeButton);
-        hbox->addWidget(_maximizeButton);
+        _lay->addWidget(_minimizeButton);
+        _lay->addWidget(_maximizeButton);
 
         connect(this, SIGNAL( normalShow() ), parent, SLOT(showNormal() ) );
         connect(this, SIGNAL( maximizedShow() ), parent, SLOT(showMaximized() ) );
@@ -67,17 +78,26 @@ TitleBar::TitleBar(bool top, QWidget *parent, bool hasClose) :
     if (_isTop || _hasClose) {
         _closeButton= new QToolButton(this);
         _closeButton->setObjectName("CloseButton");
-        hbox->addWidget(_closeButton);
+        _lay->addWidget(_closeButton);
         connect(_closeButton, SIGNAL( clicked() ), parent, SLOT(close() ) );
     }
 
-    hbox->insertStretch(0, 500);
-    hbox->insertStretch(2, 500);
-    hbox->setMargin(0);
-    hbox->setSpacing(0);
+    _lay->insertStretch(0, 500);
+    _lay->insertStretch(2, 500);
+    _lay->setMargin(0);
+    _lay->setSpacing(0);
+
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 }
 
+TitleBar::~TitleBar(){
+    DESTROY_QT_OBJECT(_title);
+    DESTROY_QT_OBJECT(_minimizeButton);
+    DESTROY_QT_OBJECT(_maximizeButton);
+    DESTROY_QT_OBJECT(_closeButton);
+    DESTROY_QT_OBJECT(_lay);
+}
+
 void TitleBar::changeEvent(QEvent *event)
 {
     if (event->type() == QEvent::StyleChange)
@@ -101,7 +121,8 @@ void TitleBar::reStyle()
 }
 
 void TitleBar::paintEvent(QPaintEvent *event)
-{  
+{ 
+    //draw logo icon
     QStyleOption o;
     o.initFrom(this);
     QPainter p(this);
@@ -109,7 +130,6 @@ void TitleBar::paintEvent(QPaintEvent *event)
 
     p.setRenderHint(QPainter::Antialiasing, true);
 
-    //To draw product logo
     const int xgap = 2;
     const int xstart = 10;
     p.setPen(QPen(QColor(213, 15, 37, 255), 2, Qt::SolidLine));
@@ -139,12 +159,7 @@ void TitleBar::setTitle(QString title)
 {
     _title->setText(title);
 }
-
-QPoint TitleBar::get_startPos() const
-{
-    return _startPos;
-}
-
+  
 QString TitleBar::title() const
 {
     return _title->text();
@@ -171,35 +186,49 @@ void TitleBar::setRestoreButton(bool max)
         _maximizeButton->setIcon(QIcon(iconPath+"/restore.svg"));
     }
 }
-
+  
 void TitleBar::mousePressEvent(QMouseEvent* event)
-{
+{ 
     if(event->button() == Qt::LeftButton && !parentWidget()->isMaximized()) {
-        _moving = true;
-        _startPos = mapToParent(event->pos());
-    }
+        int x = event->pos().x();
+        int y = event->pos().y(); 
+        bool bTopWidow = app::is_app_top_window(_parent);
+        bool bClick = (x >= 6 && y >= 5 && x <= width() - 6);  //top window need resize hit check
+ 
+        if (!bTopWidow || bClick ){
+            _moving = true; 
+            _startPos = event->globalPos() - _parent->frameGeometry().topLeft();
+            event->accept();
+            return;
+        } 
+    }  
+    QWidget::mousePressEvent(event);
 }
 
 void TitleBar::mouseMoveEvent(QMouseEvent *event)
-{
-    if(_moving && event->buttons().testFlag(Qt::LeftButton)) {
-        parentWidget()->move(event->globalPos() - _startPos);
-    }
+{ 
+    if(_moving){ 
+      _parent->move(event->globalPos() - _startPos); 
+       event->accept();
+       return;
+    } 
+    QWidget::mouseMoveEvent(event);
 }
 
 void TitleBar::mouseReleaseEvent(QMouseEvent* event)
 {
-    if(event->button() == Qt::LeftButton) {
-        _moving = false;
-    }
+    _moving = false;
+    QWidget::mouseReleaseEvent(event);
 }
 
 void TitleBar::mouseDoubleClickEvent(QMouseEvent *event)
 {
-    if (_isTop)
-        showMaxRestore();
+    if (_isTop){
+         showMaxRestore();
+    }       
     QWidget::mouseDoubleClickEvent(event);
 }
 
+ 
 } // namespace toolbars
 } // namespace pv
diff --git a/DSView/pv/toolbars/titlebar.h b/DSView/pv/toolbars/titlebar.h
index 5463af2f..a216485b 100755
--- a/DSView/pv/toolbars/titlebar.h
+++ b/DSView/pv/toolbars/titlebar.h
@@ -25,56 +25,56 @@
 #include <QWidget>
 class QLabel;
 class QToolButton;
+class QHBoxLayout;
 
-namespace pv
+namespace pv {
+namespace toolbars {
+
+class TitleBar : public QWidget
 {
-    namespace toolbars
-    {
+    Q_OBJECT
 
-//Window's titlebar, referenced by MainFrame,
-//The title area above the main screen,
-//Display logo and maximize \ minimize button
-        class TitleBar : public QWidget
-        {
-            Q_OBJECT
+public:
+    TitleBar(bool top, QWidget *parent, bool hasClose = false);
+    ~TitleBar();
+    
+    void setTitle(QString title); 
+    QString title() const;
 
-        public:
-            TitleBar(bool top, QWidget *parent, bool hasClose = false);
-            void setTitle(QString title);
-            QPoint get_startPos() const;
-            QString title() const;
+private:
+    void changeEvent(QEvent *event);
+    void reStyle();
 
-        private:
-            void changeEvent(QEvent *event);
-            void reStyle();
+signals:
+    void normalShow();
+    void maximizedShow();
 
-        signals:
-            void normalShow();
-            void maximizedShow();
+public slots:
+    void showMaxRestore();
+    void setRestoreButton(bool max);
+    inline bool IsMoving(){return _moving;}
 
-        public slots:
-            void showMaxRestore();
-            void setRestoreButton(bool max);
+protected:
+    void paintEvent(QPaintEvent *event);
+    void mousePressEvent(QMouseEvent *event);
+    void mouseMoveEvent(QMouseEvent *event);
+    void mouseReleaseEvent(QMouseEvent *event);
+    void mouseDoubleClickEvent(QMouseEvent *event);
+ 
+    QLabel *_title;
+    QToolButton *_minimizeButton;
+    QToolButton *_maximizeButton;
+    QToolButton *_closeButton;
+    QHBoxLayout *_lay;
 
-        protected:
-            void paintEvent(QPaintEvent *event);
-            void mousePressEvent(QMouseEvent *event);
-            void mouseMoveEvent(QMouseEvent *event);
-            void mouseReleaseEvent(QMouseEvent *event);
-            void mouseDoubleClickEvent(QMouseEvent *event);
+    bool _moving;
+    bool _isTop;
+    bool _hasClose;
+    QPoint _startPos;
+    QWidget *_parent;
+};
 
-            QLabel *_title;
-            QToolButton *_minimizeButton;
-            QToolButton *_maximizeButton;
-            QToolButton *_closeButton;
-
-            bool _moving;
-            bool _isTop;
-            bool _hasClose;
-            QPoint _startPos;
-        };
-
-    } // namespace toolbars
+} // namespace toolbars
 } // namespace pv
 
 #endif // DSVIEW_PV_TOOLBARS_TITLEBAR_H
diff --git a/DSView/pv/toolbars/trigbar.cpp b/DSView/pv/toolbars/trigbar.cpp
index c4344027..d63d857b 100755
--- a/DSView/pv/toolbars/trigbar.cpp
+++ b/DSView/pv/toolbars/trigbar.cpp
@@ -30,6 +30,7 @@
 #include <QApplication>
 #include <QBitmap>
 #include <QPainter>
+#include "../dialogs/applicationpardlg.h"
 
 namespace pv {
 namespace toolbars {
@@ -50,16 +51,7 @@ TrigBar::TrigBar(SigSession &session, QWidget *parent) :
 {
     setMovable(false);
     setContentsMargins(0,0,0,0);
-
-    connect(&_trig_button, SIGNAL(clicked()),
-        this, SLOT(trigger_clicked()));
-    connect(&_protocol_button, SIGNAL(clicked()),
-        this, SLOT(protocol_clicked()));
-    connect(&_measure_button, SIGNAL(clicked()),
-            this, SLOT(measure_clicked()));
-    connect(&_search_button, SIGNAL(clicked()),
-            this, SLOT(search_clicked()));
-
+ 
     _trig_button.setCheckable(true);
 #ifdef ENABLE_DECODE
     _protocol_button.setCheckable(true);
@@ -69,12 +61,10 @@ TrigBar::TrigBar(SigSession &session, QWidget *parent) :
 
     _action_fft = new QAction(this);
     _action_fft->setObjectName(QString::fromUtf8("actionFft"));
-    connect(_action_fft, SIGNAL(triggered()), this, SLOT(on_actionFft_triggered()));
-
+   
     _action_math = new QAction(this);
     _action_math->setObjectName(QString::fromUtf8("actionMath"));
-    connect(_action_math, SIGNAL(triggered()), this, SLOT(on_actionMath_triggered()));
-
+     
     _function_menu = new QMenu(this);
     _function_menu->setContentsMargins(0,0,0,0);
     _function_menu->addAction(_action_fft);
@@ -84,25 +74,27 @@ TrigBar::TrigBar(SigSession &session, QWidget *parent) :
 
     _action_lissajous = new QAction(this);
     _action_lissajous->setObjectName(QString::fromUtf8("actionLissajous"));
-    connect(_action_lissajous, SIGNAL(triggered()), this, SLOT(on_actionLissajous_triggered()));
-
+   
     _dark_style = new QAction(this);
     _dark_style->setObjectName(QString::fromUtf8("actionDark"));
-    connect(_dark_style, SIGNAL(triggered()), this, SLOT(on_actionDark_triggered()));
-
+    
     _light_style = new QAction(this);
     _light_style->setObjectName(QString::fromUtf8("actionLight"));
-    connect(_light_style, SIGNAL(triggered()), this, SLOT(on_actionLight_triggered()));
-
+     
     _themes = new QMenu(this);
     _themes->setObjectName(QString::fromUtf8("menuThemes"));
     _themes->addAction(_light_style);
     _themes->addAction(_dark_style);
 
+     _appParam_action = new QAction(this);
+
     _display_menu = new QMenu(this);
     _display_menu->setContentsMargins(0,0,0,0);
+    
+    _display_menu->addAction(_appParam_action);
+    _display_menu->addAction(_action_lissajous);    
     _display_menu->addMenu(_themes);
-    _display_menu->addAction(_action_lissajous);
+
     _display_button.setPopupMode(QToolButton::InstantPopup);
     _display_button.setMenu(_display_menu);
 
@@ -119,10 +111,22 @@ TrigBar::TrigBar(SigSession &session, QWidget *parent) :
     _protocol_action = addWidget(&_protocol_button);
     _measure_action = addWidget(&_measure_button);
     _search_action = addWidget(&_search_button);
-    _function_action = addWidget(&_function_button);
-    _display_action = addWidget(&_display_button);
-
+    _function_action = addWidget(&_function_button); 
+    _display_action = addWidget(&_display_button); //must be created
+ 
     retranslateUi();
+
+    connect(&_trig_button, SIGNAL(clicked()),this, SLOT(trigger_clicked()));
+    connect(&_protocol_button, SIGNAL(clicked()),this, SLOT(protocol_clicked()));
+    connect(&_measure_button, SIGNAL(clicked()),this, SLOT(measure_clicked()));
+    connect(&_search_button, SIGNAL(clicked()), this, SLOT(search_clicked()));
+
+    connect(_action_fft, SIGNAL(triggered()), this, SLOT(on_actionFft_triggered()));
+    connect(_action_math, SIGNAL(triggered()), this, SLOT(on_actionMath_triggered()));
+    connect(_action_lissajous, SIGNAL(triggered()), this, SLOT(on_actionLissajous_triggered()));
+    connect(_dark_style, SIGNAL(triggered()), this, SLOT(on_actionDark_triggered()));
+    connect(_light_style, SIGNAL(triggered()), this, SLOT(on_actionLight_triggered()));
+    connect(_appParam_action, SIGNAL(triggered()), this, SLOT(on_application_param()));
 }
 
 void TrigBar::changeEvent(QEvent *event)
@@ -141,14 +145,18 @@ void TrigBar::retranslateUi()
     _measure_button.setText(tr("Measure"));
     _search_button.setText(tr("Search"));
     _function_button.setText(tr("Function"));
-    _display_button.setText(tr("Display"));
+    _display_button.setText(tr("Setting"));
+ 
+    _action_lissajous->setText(tr("&Lissajous"));
+
     _themes->setTitle(tr("Themes"));
     _dark_style->setText(tr("Dark"));
     _light_style->setText(tr("Light"));
-    _action_lissajous->setText(tr("&Lissajous"));
 
     _action_fft->setText(tr("FFT"));
     _action_math->setText(tr("Math"));
+
+    _appParam_action->setText(tr("Application"));
 }
 
 void TrigBar::reStyle()
@@ -167,6 +175,9 @@ void TrigBar::reStyle()
     _action_lissajous->setIcon(QIcon(iconPath+"/lissajous.svg"));
     _dark_style->setIcon(QIcon(iconPath+"/dark.svg"));
     _light_style->setIcon(QIcon(iconPath+"/light.svg"));
+
+     _appParam_action->setIcon(QIcon(iconPath+"/params.svg"));
+
     _themes->setIcon(QIcon(iconPath+"/"+qApp->property("Style").toString()+".svg"));
 }
 
@@ -304,5 +315,13 @@ void TrigBar::on_actionLissajous_triggered()
     lissajous_dlg.exec();
 }
 
+ void TrigBar::on_application_param(){
+     pv::dialogs::MathOptions math_dlg(_session, this);
+    math_dlg.exec();
+    return;
+     pv::dialogs::ApplicationParamDlg dlg;
+     dlg.ShowDlg(this);
+ }
+
 } // namespace toolbars
 } // namespace pv
diff --git a/DSView/pv/toolbars/trigbar.h b/DSView/pv/toolbars/trigbar.h
index fbddf0e0..c98e5366 100755
--- a/DSView/pv/toolbars/trigbar.h
+++ b/DSView/pv/toolbars/trigbar.h
@@ -83,6 +83,7 @@ public slots:
 
     void on_actionFft_triggered();
     void on_actionMath_triggered();
+    void on_application_param();
 
 private:
     SigSession& _session;
@@ -97,7 +98,7 @@ private:
     QAction* _protocol_action;
     QAction* _measure_action;
     QAction* _search_action;
-    QAction* _function_action;
+    QAction* _function_action; 
     QAction* _display_action;
 
     QMenu* _function_menu;
@@ -106,6 +107,7 @@ private:
 
     QMenu* _display_menu;
     QMenu *_themes;
+    QAction *_appParam_action;
     QAction *_dark_style;
     QAction *_light_style;
     QAction* _action_lissajous;
diff --git a/DSView/pv/ui/msgbox.cpp b/DSView/pv/ui/msgbox.cpp
index 4c9a6357..88b415db 100644
--- a/DSView/pv/ui/msgbox.cpp
+++ b/DSView/pv/ui/msgbox.cpp
@@ -51,6 +51,5 @@ bool MsgBox::Confirm(const char *text, QWidget *parent)
     msg.mBox()->setStandardButtons(QMessageBox::Yes | QMessageBox::No);
     msg.mBox()->setIcon(QMessageBox::Question);
     msg.exec();
-    int click = msg.GetLastClick();
-    return (click == (int)QMessageBox::YesRole);
+    return msg.IsYes();
 }
diff --git a/DSView/pv/view/decodetrace.cpp b/DSView/pv/view/decodetrace.cpp
index e44f1dce..97e99f92 100755
--- a/DSView/pv/view/decodetrace.cpp
+++ b/DSView/pv/view/decodetrace.cpp
@@ -146,14 +146,7 @@ DecodeTrace::DecodeTrace(pv::SigSession &session,
 }
 
 DecodeTrace::~DecodeTrace()
-{
-    DESTROY_OBJECT(_start_comboBox);
-    DESTROY_OBJECT(_end_comboBox); 
-    DESTROY_OBJECT(_pub_input_layer);
-    DESTROY_OBJECT(_popup_form);
-    DESTROY_OBJECT(_popup);
-
-    _cur_row_headings.clear();
+{   _cur_row_headings.clear();
     _decoder_forms.clear();
     _probe_selectors.clear();
     _bindings.clear();
@@ -371,13 +364,7 @@ bool DecodeTrace::create_popup()
         }
     }
 
-    //destroy object   
-    DESTROY_OBJECT(_start_comboBox);
-    DESTROY_OBJECT(_end_comboBox);  
-    DESTROY_OBJECT(_pub_input_layer);
-    DESTROY_OBJECT(_popup_form);
-    DESTROY_OBJECT(_popup);
-
+    //destroy object
     return ret;
 }
 
@@ -389,7 +376,7 @@ void DecodeTrace::create_popup_form()
     // which then goes out of scope destroying the layout and all the child
     // widgets.
     if (_popup_form)
-        _popup->reload(false);
+        _popup->reload();
 
     _popup_form = new QFormLayout();
     _popup_form->setVerticalSpacing(5);
diff --git a/DSView/pv/view/viewport.cpp b/DSView/pv/view/viewport.cpp
index 4646fd9d..141884c8 100755
--- a/DSView/pv/view/viewport.cpp
+++ b/DSView/pv/view/viewport.cpp
@@ -501,7 +501,7 @@ void Viewport::paintProgress(QPainter &p, QColor fore, QColor back)
 void Viewport::mousePressEvent(QMouseEvent *event)
 {
 	assert(event);
-
+    
 	_mouse_down_point = event->pos();
 	_mouse_down_offset = _view.offset();
     _drag_strength = 0;
diff --git a/libsigrok4DSL/hardware/demo/demo.h b/libsigrok4DSL/hardware/demo/demo.h
index 5a474ea0..7fbb87e5 100755
--- a/libsigrok4DSL/hardware/demo/demo.h
+++ b/libsigrok4DSL/hardware/demo/demo.h
@@ -168,8 +168,8 @@ static const struct DEMO_profile supported_Demo[] = {
       (1 << DEMO_LOGIC100x16) |
       (1 << DEMO_ANALOG10x2) |
       (1 << DEMO_DSO200x2),
-     SR_Mn(100),
-     // SR_Gn(16),
+     //SR_Mn(100),
+      SR_Gn(16),
       SR_Kn(20),              
       0,
       vdivs10to2000,

From 1afaf9d53c9e67b7278e082d970be40c48656cad Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Mon, 25 Oct 2021 15:16:30 +0800
Subject: [PATCH 10/58] add view quick scroll check flag

---
 DSView/pv/config/appconfig.cpp          | 14 +++++++-
 DSView/pv/config/appconfig.h            | 22 ++++--------
 DSView/pv/dialogs/applicationpardlg.cpp | 38 +++++++++++++++-----
 DSView/pv/dialogs/applicationpardlg.h   |  6 ++--
 DSView/pv/dialogs/calibration.cpp       | 17 ++++++++-
 DSView/pv/dialogs/calibration.h         |  4 +--
 DSView/pv/dialogs/deviceoptions.cpp     | 15 +++++++-
 DSView/pv/dialogs/deviceoptions.h       |  5 +--
 DSView/pv/dialogs/dsdialog.cpp          | 13 +++++--
 DSView/pv/dialogs/dsdialog.h            |  2 ++
 DSView/pv/dialogs/dsomeasure.cpp        |  8 +++++
 DSView/pv/dialogs/dsomeasure.h          | 11 +++---
 DSView/pv/dialogs/fftoptions.cpp        | 20 +++++++++--
 DSView/pv/dialogs/fftoptions.h          |  5 +--
 DSView/pv/dialogs/interval.cpp          |  5 +++
 DSView/pv/dialogs/lissajousoptions.cpp  |  7 ++++
 DSView/pv/dialogs/lissajousoptions.h    |  5 +--
 DSView/pv/toolbars/trigbar.cpp          |  5 ++-
 DSView/pv/view/viewport.cpp             | 47 +++++++++++++------------
 19 files changed, 175 insertions(+), 74 deletions(-)

diff --git a/DSView/pv/config/appconfig.cpp b/DSView/pv/config/appconfig.cpp
index ac5d1c28..44c62989 100644
--- a/DSView/pv/config/appconfig.cpp
+++ b/DSView/pv/config/appconfig.cpp
@@ -72,7 +72,7 @@ void StringToFormatArray(const QString &str, vector<StringPair> &protocolFormats
 
 AppConfig::AppConfig()
 {
-    
+    _appOptions.quickScroll = true;
 }
 
 AppConfig::~AppConfig()
@@ -135,6 +135,12 @@ bool AppConfig::Save()
       QString  profomats = FormatArrayToString(m_protocolFormats);
       jobj["ProtocolFormats"] = QJsonValue::fromVariant(profomats);
 
+      //application options
+      QJsonObject app; 
+      app["QuickScroll"] = QJsonValue::fromVariant(_appOptions.quickScroll);
+  
+      jobj["Application"] = QJsonValue::fromVariant(app);
+
       QJsonDocument jdoc(jobj);
       QByteArray bytes = jdoc.toJson();
       string json;
@@ -155,6 +161,12 @@ bool AppConfig::Save()
           m_protocolFormats.clear();
           StringToFormatArray(jobj["ProtocolFormats"].toString(), m_protocolFormats);
       } 
+
+      //application node
+      if (jobj.contains("Application")){
+          QJsonObject app = jobj["Application"].toObject();
+          _appOptions.quickScroll = app["QuickScroll"].toBool();
+      } 
   }
 
 void AppConfig::SetProtocolFormat(const string &protocolName, const string &value)
diff --git a/DSView/pv/config/appconfig.h b/DSView/pv/config/appconfig.h
index ec2b2ee1..a5c93aea 100644
--- a/DSView/pv/config/appconfig.h
+++ b/DSView/pv/config/appconfig.h
@@ -26,13 +26,7 @@
 #include <vector>
 
 using namespace std;
-
-struct app_status{
-
-
-};
-
-
+  
 class StringPair
 {
 public:
@@ -41,13 +35,12 @@ public:
    string m_value;
 };
 
-class config_data
-{
-  public:
-
-    
+struct AppOptions
+{  
+    bool  quickScroll;    
 };
 
+  
 class AppConfig
 {
 private:
@@ -63,11 +56,10 @@ public:
   void FromJson(string &json);
 
   void SetProtocolFormat(const string &protocolName, const string &value);
-  string GetProtocolFormat(const string &protocolName);  
+  string GetProtocolFormat(const string &protocolName); 
 
 public:
-  config_data m_data;
-  app_status  m_status;
+  AppOptions _appOptions;
 
 private:
   string m_fileName;
diff --git a/DSView/pv/dialogs/applicationpardlg.cpp b/DSView/pv/dialogs/applicationpardlg.cpp
index 26e07484..b27da3a5 100644
--- a/DSView/pv/dialogs/applicationpardlg.cpp
+++ b/DSView/pv/dialogs/applicationpardlg.cpp
@@ -21,6 +21,10 @@
 
 #include "applicationpardlg.h"
 #include "dsdialog.h"
+#include <QFormLayout>
+#include <QCheckBox>
+#include <QString>
+#include "../config/appconfig.h"
 
 namespace pv
 {
@@ -29,7 +33,7 @@ namespace dialogs
 
 ApplicationParamDlg::ApplicationParamDlg()
 {
-    m_ret = false;
+   
 }
 
 ApplicationParamDlg::~ApplicationParamDlg()
@@ -39,14 +43,32 @@ ApplicationParamDlg::~ApplicationParamDlg()
 bool ApplicationParamDlg::ShowDlg(QWidget *parent)
 {
     DSDialog dlg(parent, true, true);
-    dlg.exec();
-    return m_ret;
-}
+    dlg.setMinimumSize(300, 200);
+    QFormLayout &lay = *(new QFormLayout());
+    lay.setContentsMargins(0,20,0,30);
 
-//------------IDlgCallback
-void ApplicationParamDlg::OnDlgResult(bool bYes){
-    m_ret = bYes;
- }
+    //show config
+    AppOptions &_app = AppConfig::Instance()._appOptions;
+
+    QCheckBox *ck_quickScroll = new QCheckBox();
+    ck_quickScroll->setChecked(_app.quickScroll);
+    lay.addRow("Quick scroll", ck_quickScroll);
+    dlg.layout()->addLayout(&lay);  
+     
+    dlg.exec();
+
+    bool ret = dlg.IsClickYes();
+
+    //save config
+    if (ret){
+        _app.quickScroll = ck_quickScroll->isChecked();
+
+        AppConfig::Instance().Save();
+    }
+   
+   return ret;
+}
+ 
 
 } //
 }//
diff --git a/DSView/pv/dialogs/applicationpardlg.h b/DSView/pv/dialogs/applicationpardlg.h
index 71e35d51..e890c985 100644
--- a/DSView/pv/dialogs/applicationpardlg.h
+++ b/DSView/pv/dialogs/applicationpardlg.h
@@ -23,14 +23,13 @@
 
 #include <QObject>
 #include <QWidget> 
-#include "../interface/uicallback.h"
 
 namespace pv
 {
  namespace dialogs
 {
 
-    class ApplicationParamDlg : private IDlgCallback
+    class ApplicationParamDlg 
     {
        // Q_OBJECT
 
@@ -44,8 +43,7 @@ namespace pv
     private:
         void OnDlgResult(bool bYes);
 
-    private:
-        bool  m_ret; 
+ 
     };
 
 }//
diff --git a/DSView/pv/dialogs/calibration.cpp b/DSView/pv/dialogs/calibration.cpp
index 36298622..e91d1722 100755
--- a/DSView/pv/dialogs/calibration.cpp
+++ b/DSView/pv/dialogs/calibration.cpp
@@ -31,6 +31,7 @@
 
 #include "../view/trace.h"
 #include "../dialogs/dsmessagebox.h"
+#include "../dsvdef.h"
 
 using namespace boost;
 using namespace std;
@@ -44,7 +45,13 @@ const QString Calibration::VCOMB = QT_TR_NOOP(" VCOMB");
 
 Calibration::Calibration(QWidget *parent) :
     DSDialog(parent)
-{
+{ 
+    _save_btn = NULL;
+    _abort_btn = NULL;
+    _reset_btn = NULL;
+    _exit_btn = NULL;
+    _flayout = NULL;
+
 #ifdef Q_OS_DARWIN
     Qt::WindowFlags flags = windowFlags();
     this->setWindowFlags(flags | Qt::Tool);
@@ -89,6 +96,14 @@ Calibration::Calibration(QWidget *parent) :
     retranslateUi();
 }
 
+Calibration::~Calibration(){ 
+    DESTROY_QT_OBJECT(_save_btn);
+    DESTROY_QT_OBJECT(_abort_btn);
+    DESTROY_QT_OBJECT(_reset_btn);
+    DESTROY_QT_OBJECT(_exit_btn);
+    DESTROY_QT_OBJECT(_flayout);
+}
+
 void Calibration::changeEvent(QEvent *event)
 {
     if (event->type() == QEvent::LanguageChange)
diff --git a/DSView/pv/dialogs/calibration.h b/DSView/pv/dialogs/calibration.h
index 97bf7ce2..8418606e 100755
--- a/DSView/pv/dialogs/calibration.h
+++ b/DSView/pv/dialogs/calibration.h
@@ -50,6 +50,7 @@ private:
 
 public:
     Calibration(QWidget *parent);
+    ~Calibration();
 
     void set_device(boost::shared_ptr<pv::device::DevInst> dev_inst);
 protected:
@@ -69,8 +70,7 @@ private slots:
 
 private:
     boost::shared_ptr<pv::device::DevInst>  _dev_inst;
-
-    toolbars::TitleBar *_titlebar;
+ 
     QPushButton *_save_btn;
     QPushButton *_abort_btn;
     QPushButton *_reset_btn;
diff --git a/DSView/pv/dialogs/deviceoptions.cpp b/DSView/pv/dialogs/deviceoptions.cpp
index 3ac73ad2..fe8513ed 100755
--- a/DSView/pv/dialogs/deviceoptions.cpp
+++ b/DSView/pv/dialogs/deviceoptions.cpp
@@ -30,10 +30,11 @@
 
 #include "dsmessagebox.h"
 #include <pv/prop/property.h>
+#include "../dsvdef.h"
 
 using namespace boost;
 using namespace std;
-
+ 
 namespace pv {
 namespace dialogs {
 
@@ -43,6 +44,11 @@ DeviceOptions::DeviceOptions(QWidget *parent, boost::shared_ptr<pv::device::DevI
     _button_box(QDialogButtonBox::Ok, Qt::Horizontal, this),
     _device_options_binding(_dev_inst->dev_inst())
 {
+     _dynamic_box = NULL;
+     _props_box = NULL;
+     _config_button = NULL;
+     _cali_button = NULL;
+
     _props_box = new QGroupBox(tr("Mode"), this);
     _props_box->setLayout(get_property_form(_props_box));
     _layout.addWidget(_props_box);
@@ -73,6 +79,13 @@ DeviceOptions::DeviceOptions(QWidget *parent, boost::shared_ptr<pv::device::DevI
     _mode_check.start();
 }
 
+DeviceOptions::~DeviceOptions(){
+    DESTROY_QT_OBJECT(_dynamic_box);
+    DESTROY_QT_OBJECT(_props_box);
+    DESTROY_QT_OBJECT(_config_button);
+    DESTROY_QT_OBJECT(_cali_button);
+}
+
 void DeviceOptions::accept()
 {
 	using namespace Qt;
diff --git a/DSView/pv/dialogs/deviceoptions.h b/DSView/pv/dialogs/deviceoptions.h
index 0b9591f7..ae803c8a 100755
--- a/DSView/pv/dialogs/deviceoptions.h
+++ b/DSView/pv/dialogs/deviceoptions.h
@@ -57,6 +57,8 @@ class DeviceOptions : public DSDialog
 public:
     DeviceOptions(QWidget *parent, boost::shared_ptr<pv::device::DevInst> dev_inst);
 
+    ~DeviceOptions();
+
 protected:
 	void accept();
     void reject();
@@ -84,8 +86,7 @@ private slots:
 
 private:
     boost::shared_ptr<pv::device::DevInst>  _dev_inst;
-	QVBoxLayout _layout;
-    toolbars::TitleBar *_titlebar;
+	QVBoxLayout _layout; 
 
     QGroupBox *_dynamic_box;
     QGridLayout _dynamic_layout;
diff --git a/DSView/pv/dialogs/dsdialog.cpp b/DSView/pv/dialogs/dsdialog.cpp
index 81165b3f..1d8f15ff 100755
--- a/DSView/pv/dialogs/dsdialog.cpp
+++ b/DSView/pv/dialogs/dsdialog.cpp
@@ -59,6 +59,7 @@ DSDialog::DSDialog(QWidget *parent, bool hasClose, bool bBaseButton) :
     _base_button = NULL;
 
     m_callback = NULL; 
+    _clickYes = false;
     
     setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);
     setAttribute(Qt::WA_TranslucentBackground);
@@ -80,19 +81,23 @@ void DSDialog::accept()
 {
     using namespace Qt;
 
+    _clickYes = true;
     if (m_callback){
         m_callback->OnDlgResult(true);
     }
 
+
     QDialog::accept();
 }
 
 void DSDialog::reject()
 {
     using namespace Qt;
+    _clickYes = false;
+
     if (m_callback){
         m_callback->OnDlgResult(false);
-    }
+    } 
 
     QDialog::reject();
 }
@@ -114,7 +119,8 @@ int DSDialog::exec()
       //ok,cancel
     if (m_bBaseButton){
         _base_button = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,Qt::Horizontal, this);
-        _main_layout->addWidget(_base_button);//, 5, 1, 1, 1, Qt::AlignHCenter | Qt::AlignBottom);
+         _main_layout->addWidget(_base_button);//, 5, 1, 1, 1, Qt::AlignHCenter | Qt::AlignBottom);
+        //_main_layout->addWidget(_base_button,0, Qt::AlignHCenter | Qt::AlignBottom);
         connect(_base_button, SIGNAL(rejected()), this, SLOT(reject()));
         connect(_base_button, SIGNAL(accepted()), this, SLOT(accept()));
     }
@@ -142,6 +148,9 @@ void DSDialog::build_base(bool hasClose)
     _main_layout->addWidget(_titlebar);  
     _base_layout->addWidget(_main_widget);
     setLayout(_base_layout);  
+
+    _main_layout->setAlignment(Qt::AlignCenter | Qt::AlignTop);
+  
 } 
 
 } // namespace dialogs
diff --git a/DSView/pv/dialogs/dsdialog.h b/DSView/pv/dialogs/dsdialog.h
index 22799aa2..00f83ef7 100755
--- a/DSView/pv/dialogs/dsdialog.h
+++ b/DSView/pv/dialogs/dsdialog.h
@@ -56,6 +56,7 @@ public:
     void setTitle(QString title);
     void reload(); 
     int exec();
+    inline bool IsClickYes(){return _clickYes;}
 
 protected:
     void accept();
@@ -74,6 +75,7 @@ private:
    
     QPoint              _startPos; 
     bool                 m_bBaseButton; 
+    bool                _clickYes;
 
     IDlgCallback        *m_callback;
 };
diff --git a/DSView/pv/dialogs/dsomeasure.cpp b/DSView/pv/dialogs/dsomeasure.cpp
index d1acaa19..a454d86c 100755
--- a/DSView/pv/dialogs/dsomeasure.cpp
+++ b/DSView/pv/dialogs/dsomeasure.cpp
@@ -31,6 +31,7 @@
 #include <QBitmap>
 
 #include <boost/foreach.hpp>
+#include "../dsvdef.h"
 
 using namespace boost;
 using namespace std;
@@ -48,6 +49,8 @@ DsoMeasure::DsoMeasure(SigSession &session, View &parent,
     _button_box(QDialogButtonBox::Reset | QDialogButtonBox::Cancel,
         Qt::Horizontal, this)
 {
+    _measure_tab = NULL;
+
     setMinimumSize(500, 400);
 
     _measure_tab = new QTabWidget(this);
@@ -79,6 +82,10 @@ DsoMeasure::DsoMeasure(SigSession &session, View &parent,
     connect(_session.get_device().get(), SIGNAL(device_updated()), this, SLOT(reject()));
 }
 
+DsoMeasure::~DsoMeasure(){
+    DESTROY_QT_OBJECT(_measure_tab);
+}
+
 void DsoMeasure::add_measure(QWidget *widget, const boost::shared_ptr<view::DsoSignal> dsoSig)
 {
     const int Column = 5;
@@ -86,6 +93,7 @@ void DsoMeasure::add_measure(QWidget *widget, const boost::shared_ptr<view::DsoS
     QGridLayout *layout = new QGridLayout(widget);
     layout->setMargin(0);
     layout->setSpacing(0);
+    
     for (int i=DSO_MS_BEGIN+1; i<DSO_MS_END; i++) {
         QToolButton *button = new QToolButton(this);
         button->setProperty("id", QVariant(i));
diff --git a/DSView/pv/dialogs/dsomeasure.h b/DSView/pv/dialogs/dsomeasure.h
index ab9c25ea..5016fda7 100755
--- a/DSView/pv/dialogs/dsomeasure.h
+++ b/DSView/pv/dialogs/dsomeasure.h
@@ -49,8 +49,9 @@ class DsoMeasure : public DSDialog
 	Q_OBJECT
 
 public:
-    DsoMeasure(SigSession &session, view::View &parent,
-               unsigned int position, int last_sig_index);
+    DsoMeasure(SigSession &session, view::View &parent, unsigned int position, int last_sig_index);
+
+    ~DsoMeasure();
 
     static QString get_ms_icon(int ms_type);
     static QString get_ms_text(int ms_type);
@@ -70,12 +71,10 @@ private:
     SigSession &_session;
     view::View &_view;
     unsigned int _position;
-
-    toolbars::TitleBar *_titlebar;
+ 
     QDialogButtonBox _button_box;
     QTabWidget *_measure_tab;
-    QVBoxLayout _layout;
-    std::vector<QToolButton *> _mbtn_vec;
+    QVBoxLayout _layout; 
 };
 
 } // namespace dialogs
diff --git a/DSView/pv/dialogs/fftoptions.cpp b/DSView/pv/dialogs/fftoptions.cpp
index 3436ff7f..9202500d 100755
--- a/DSView/pv/dialogs/fftoptions.cpp
+++ b/DSView/pv/dialogs/fftoptions.cpp
@@ -34,7 +34,7 @@
 
 using namespace boost;
 using namespace std;
-
+ 
 namespace pv {
 namespace dialogs {
 
@@ -44,6 +44,18 @@ FftOptions::FftOptions(QWidget *parent, SigSession &session) :
     _button_box(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
         Qt::Horizontal, this)
 {
+    _len_combobox = NULL;
+    _interval_combobox = NULL;
+    _en_checkbox = NULL;
+    _ch_combobox = NULL;
+    _window_combobox = NULL;
+    _dc_checkbox = NULL;
+    _view_combobox = NULL;
+    _dbv_combobox = NULL;
+    _hint_label = NULL;
+    _glayout = NULL;
+    _layout = NULL;
+
     _en_checkbox = new QCheckBox(this);
     _len_combobox = new QComboBox(this);
     _interval_combobox = new QComboBox(this);
@@ -173,7 +185,7 @@ FftOptions::FftOptions(QWidget *parent, SigSession &session) :
     QPixmap pixmap(hint_pic);
     _hint_label->setPixmap(pixmap);
 
-    _glayout = new QGridLayout();
+    _glayout = new QGridLayout();  //QGridLayout
     _glayout->setVerticalSpacing(5);
     _glayout->addWidget(new QLabel(tr("FFT Enable: "), this), 0, 0);
     _glayout->addWidget(_en_checkbox, 0, 1);
@@ -208,6 +220,10 @@ FftOptions::FftOptions(QWidget *parent, SigSession &session) :
     connect(_session.get_device().get(), SIGNAL(device_updated()), this, SLOT(reject()));
 }
 
+FftOptions::~FftOptions(){
+
+}
+
 void FftOptions::accept()
 {
     using namespace Qt;
diff --git a/DSView/pv/dialogs/fftoptions.h b/DSView/pv/dialogs/fftoptions.h
index b16dfe60..2486c871 100755
--- a/DSView/pv/dialogs/fftoptions.h
+++ b/DSView/pv/dialogs/fftoptions.h
@@ -52,6 +52,8 @@ private:
 public:
     FftOptions(QWidget *parent, SigSession &session);
 
+    ~FftOptions();
+
 protected:
     void accept();
     void reject();
@@ -63,8 +65,7 @@ private slots:
 private:
     SigSession &_session;
     uint64_t _sample_limit;
-
-    toolbars::TitleBar *_titlebar;
+ 
     QComboBox *_len_combobox;
     QComboBox *_interval_combobox;
     QCheckBox *_en_checkbox;
diff --git a/DSView/pv/dialogs/interval.cpp b/DSView/pv/dialogs/interval.cpp
index e2ff752b..7ab456b7 100755
--- a/DSView/pv/dialogs/interval.cpp
+++ b/DSView/pv/dialogs/interval.cpp
@@ -32,6 +32,11 @@ Interval::Interval(SigSession &session, QWidget *parent) :
     _button_box(QDialogButtonBox::Ok,
         Qt::Horizontal, this)
 {
+    _interval_label = NULL;
+    _interval_spinBox = NULL;
+    _interval_slider = NULL;
+
+
     setMinimumWidth(300);
     _interval_label = new QLabel(tr("Interval(s): "), this);
     _interval_spinBox = new QSpinBox(this);
diff --git a/DSView/pv/dialogs/lissajousoptions.cpp b/DSView/pv/dialogs/lissajousoptions.cpp
index 5f502f81..02c98167 100755
--- a/DSView/pv/dialogs/lissajousoptions.cpp
+++ b/DSView/pv/dialogs/lissajousoptions.cpp
@@ -33,6 +33,7 @@
 
 #include <boost/foreach.hpp>
 
+
 using namespace boost;
 using namespace std;
 using namespace pv::view;
@@ -46,6 +47,12 @@ LissajousOptions::LissajousOptions(SigSession &session, QWidget *parent) :
     _button_box(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
         Qt::Horizontal, this)
 {
+    _enable = NULL;
+    _x_group = NULL;
+    _y_group = NULL;
+    _percent = NULL;
+    _layout = NULL;
+
     setMinimumSize(300, 300);
 
     _enable = new QCheckBox(this);
diff --git a/DSView/pv/dialogs/lissajousoptions.h b/DSView/pv/dialogs/lissajousoptions.h
index b3fd13f1..b0653548 100755
--- a/DSView/pv/dialogs/lissajousoptions.h
+++ b/DSView/pv/dialogs/lissajousoptions.h
@@ -73,10 +73,11 @@ private:
     QGroupBox *_x_group;
     QGroupBox *_y_group;
     QSlider *_percent;
+    QGridLayout *_layout;
+
     QVector<QRadioButton *> _x_radio;
     QVector<QRadioButton *> _y_radio;
-    QDialogButtonBox _button_box;
-    QGridLayout *_layout;
+    QDialogButtonBox _button_box;  
 };
 
 } // namespace dialogs
diff --git a/DSView/pv/toolbars/trigbar.cpp b/DSView/pv/toolbars/trigbar.cpp
index d63d857b..95f336f4 100755
--- a/DSView/pv/toolbars/trigbar.cpp
+++ b/DSView/pv/toolbars/trigbar.cpp
@@ -316,9 +316,8 @@ void TrigBar::on_actionLissajous_triggered()
 }
 
  void TrigBar::on_application_param(){
-     pv::dialogs::MathOptions math_dlg(_session, this);
-    math_dlg.exec();
-    return;
+   //  pv::dialogs::MathOptions math_dlg(_session, this);  math_dlg.exec();   return;
+    
      pv::dialogs::ApplicationParamDlg dlg;
      dlg.ShowDlg(this);
  }
diff --git a/DSView/pv/view/viewport.cpp b/DSView/pv/view/viewport.cpp
index 141884c8..1bf6720f 100755
--- a/DSView/pv/view/viewport.cpp
+++ b/DSView/pv/view/viewport.cpp
@@ -37,12 +37,12 @@
 
 #include <QMouseEvent>
 #include <QStyleOption>
-#include <QPainterPath>
-
-#include <math.h>
-
+#include <QPainterPath> 
+#include <math.h> 
 #include <boost/foreach.hpp>
 
+#include "../config/appconfig.h"
+
 using namespace boost;
 using namespace std;
 
@@ -91,24 +91,20 @@ Viewport::Viewport(View &parent, View_type type) :
     // drag inertial
     _drag_strength = 0;
     _drag_timer.setSingleShot(true);
-
-    connect(&trigger_timer, SIGNAL(timeout()),
-            this, SLOT(on_trigger_timer()));
-    connect(&_drag_timer, SIGNAL(timeout()),
-            this, SLOT(on_drag_timer()));
-
-    connect(&_view.session(), &SigSession::receive_data,
-            this, &Viewport::set_receive_len);
-
+ 
     _cmenu = new QMenu(this);
     QAction *yAction = _cmenu->addAction(tr("Add Y-cursor"));
     QAction *xAction = _cmenu->addAction(tr("Add X-cursor"));
+ 
+    setContextMenuPolicy(Qt::CustomContextMenu);
+
+    connect(&trigger_timer, SIGNAL(timeout()),this, SLOT(on_trigger_timer()));
+    connect(&_drag_timer, SIGNAL(timeout()),this, SLOT(on_drag_timer()));
+    connect(&_view.session(), &SigSession::receive_data, this, &Viewport::set_receive_len);
+
     connect(yAction, SIGNAL(triggered(bool)), this, SLOT(add_cursor_y()));
     connect(xAction, SIGNAL(triggered(bool)), this, SLOT(add_cursor_x()));
-
-    setContextMenuPolicy(Qt::CustomContextMenu);
-    connect(this, SIGNAL(customContextMenuRequested(const QPoint&)),
-            this, SLOT(show_contextmenu(const QPoint&)));
+    connect(this, SIGNAL(customContextMenuRequested(const QPoint&)),this, SLOT(show_contextmenu(const QPoint&)));
 }
 
 int Viewport::get_total_height() const
@@ -757,14 +753,19 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
 void Viewport::mouseReleaseEvent(QMouseEvent *event)
 {
     assert(event);
-
-    if (_type == TIME_VIEW) {
+    
+    if (_type != TIME_VIEW){
+        update();
+        return;
+    }
+  
         if ((_action_type == NO_ACTION) &&
             (event->button() == Qt::LeftButton)) {
             if (_view.session().get_device()->dev_inst()->mode == LOGIC &&
                 _view.session().get_capture_state() == SigSession::Stopped) {
-                // priority 1
-                if (_action_type == NO_ACTION) {
+                //priority 1
+                //try to quick scroll view
+                if (_action_type == NO_ACTION && AppConfig::Instance()._appOptions.quickScroll) {
                     const double strength = _drag_strength*DragTimerInterval*1.0/_elapsed_time.elapsed();
                     if (_elapsed_time.elapsed() < 200 &&
                         abs(_drag_strength) < MinorDragOffsetUp &&
@@ -936,7 +937,7 @@ void Viewport::mouseReleaseEvent(QMouseEvent *event)
             }
             _action_type = NO_ACTION;
         }
-    }
+    
     update();
 }
 
@@ -1621,7 +1622,7 @@ void Viewport::on_trigger_timer()
 }
 
 void Viewport::on_drag_timer()
-{
+{   
     const int64_t offset = _view.offset();
     const double scale = _view.scale();
     if (_view.session().get_capture_state() == SigSession::Stopped &&

From a2acb95deddfd7935942294a33befdad34f36c19 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Mon, 25 Oct 2021 15:24:58 +0800
Subject: [PATCH 11/58] none

---
 DSView/pv/view/viewport.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DSView/pv/view/viewport.cpp b/DSView/pv/view/viewport.cpp
index 1bf6720f..f4c475f6 100755
--- a/DSView/pv/view/viewport.cpp
+++ b/DSView/pv/view/viewport.cpp
@@ -764,7 +764,7 @@ void Viewport::mouseReleaseEvent(QMouseEvent *event)
             if (_view.session().get_device()->dev_inst()->mode == LOGIC &&
                 _view.session().get_capture_state() == SigSession::Stopped) {
                 //priority 1
-                //try to quick scroll view
+                //try to quick scroll view...
                 if (_action_type == NO_ACTION && AppConfig::Instance()._appOptions.quickScroll) {
                     const double strength = _drag_strength*DragTimerInterval*1.0/_elapsed_time.elapsed();
                     if (_elapsed_time.elapsed() < 200 &&

From 91dd746f2d2aef3f950a594bc127ba67f951c429 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Mon, 25 Oct 2021 16:51:34 +0800
Subject: [PATCH 12/58] disable toolbar context menu

---
 DSView/pv/dialogs/applicationpardlg.cpp |   1 +
 DSView/pv/mainwindow.cpp                | 136 ++++++++++--------------
 DSView/pv/storesession.cpp              |  23 +++-
 DSView/pv/toolbars/filebar.cpp          |  30 +++---
 4 files changed, 90 insertions(+), 100 deletions(-)

diff --git a/DSView/pv/dialogs/applicationpardlg.cpp b/DSView/pv/dialogs/applicationpardlg.cpp
index b27da3a5..469e0657 100644
--- a/DSView/pv/dialogs/applicationpardlg.cpp
+++ b/DSView/pv/dialogs/applicationpardlg.cpp
@@ -43,6 +43,7 @@ ApplicationParamDlg::~ApplicationParamDlg()
 bool ApplicationParamDlg::ShowDlg(QWidget *parent)
 {
     DSDialog dlg(parent, true, true);
+    dlg.setTitle("Application options");
     dlg.setMinimumSize(300, 200);
     QFormLayout &lay = *(new QFormLayout());
     lay.setContentsMargins(0,20,0,30);
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index 06c30bc9..70828a2a 100755
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -109,6 +109,9 @@ MainWindow::MainWindow(DeviceManager &device_manager,
     _msg(NULL)
 {
 	setup_ui();
+
+    setContextMenuPolicy(Qt::NoContextMenu);
+
 	if (open_file_name) {
         qDebug("Open file: %s", open_file_name);
         const QString s(QString::fromUtf8(open_file_name));
@@ -119,7 +122,7 @@ MainWindow::MainWindow(DeviceManager &device_manager,
 }
 
 void MainWindow::setup_ui()
-{
+{ 
 	setObjectName(QString::fromUtf8("MainWindow"));
     setContentsMargins(0,0,0,0);
     layout()->setMargin(0);
@@ -141,34 +144,7 @@ void MainWindow::setup_ui()
     _file_bar->setObjectName("file_bar");
     _logo_bar = new toolbars::LogoBar(_session, this);
     _logo_bar->setObjectName("logo_bar");
-
-    connect(_trig_bar, SIGNAL(on_protocol(bool)), this,
-            SLOT(on_protocol(bool)));
-    connect(_trig_bar, SIGNAL(on_trigger(bool)), this,
-            SLOT(on_trigger(bool)));
-    connect(_trig_bar, SIGNAL(on_measure(bool)), this,
-            SLOT(on_measure(bool)));
-    connect(_trig_bar, SIGNAL(on_search(bool)), this,
-            SLOT(on_search(bool)));
-    connect(_trig_bar, SIGNAL(setTheme(QString)), this,
-            SLOT(switchTheme(QString)));
-    connect(_file_bar, SIGNAL(load_file(QString)), this,
-            SLOT(load_file(QString)));
-    connect(_file_bar, SIGNAL(on_save()), this,
-            SLOT(on_save()));
-    connect(_file_bar, SIGNAL(on_export()), this,
-            SLOT(on_export()));
-    connect(_file_bar, SIGNAL(on_screenShot()), this,
-            SLOT(on_screenShot()), Qt::QueuedConnection);
-    connect(_file_bar, SIGNAL(load_session(QString)), this,
-            SLOT(load_session(QString)));
-    connect(_file_bar, SIGNAL(store_session(QString)), this,
-            SLOT(store_session(QString)));
-    connect(_logo_bar, SIGNAL(setLanguage(int)), this,
-            SLOT(switchLanguage(int)));
-    connect(_logo_bar, SIGNAL(openDoc()), this,
-            SLOT(openDoc()));
-
+ 
     // trigger dock
     _trigger_dock=new QDockWidget(tr("Trigger Setting..."),this);
     _trigger_dock->setObjectName("trigger_dock");
@@ -190,28 +166,7 @@ void MainWindow::setup_ui()
     // Setup _view widget
     _view = new pv::view::View(_session, _sampling_bar, this);
     _vertical_layout->addWidget(_view);
-
-    connect(_sampling_bar, SIGNAL(device_selected()), this,
-            SLOT(update_device_list()));
-    connect(_sampling_bar, SIGNAL(device_updated()), this,
-        SLOT(reload()));
-    connect(_sampling_bar, SIGNAL(run_stop()), this,
-        SLOT(run_stop()));
-    connect(_sampling_bar, SIGNAL(instant_stop()), this,
-        SLOT(instant_stop()));
-    connect(_sampling_bar, SIGNAL(duration_changed()), _trigger_widget,
-        SLOT(device_updated()));
-    connect(_sampling_bar, SIGNAL(duration_changed()), _view,
-        SLOT(timebase_changed()));
-    connect(_sampling_bar, SIGNAL(show_calibration()), _view,
-        SLOT(show_calibration()));
-    connect(_trig_bar, SIGNAL(show_lissajous(bool)), _view,
-        SLOT(show_lissajous(bool)));
-    connect(_dso_trigger_widget, SIGNAL(set_trig_pos(int)), _view,
-        SLOT(set_trig_pos(int)));
-    connect(_view, SIGNAL(auto_trig(int)), _dso_trigger_widget,
-        SLOT(auto_trig(int)));
-
+ 
     setIconSize(QSize(40,40));
     addToolBar(_sampling_bar);
     addToolBar(_trig_bar);
@@ -230,8 +185,7 @@ void MainWindow::setup_ui()
     _protocol_widget = new dock::ProtocolDock(_protocol_dock, *_view, _session);
     _protocol_dock->setWidget(_protocol_widget);
     qDebug() << "Protocol decoder enabled!\n";
-
-    connect(_protocol_widget, SIGNAL(protocol_updated()), _view, SLOT(signals_changed()));
+ 
 #endif
     // measure dock
     _measure_dock=new QDockWidget(tr("Measurement"),this);
@@ -265,35 +219,6 @@ void MainWindow::setup_ui()
     std::string std_title = title.toStdString();
     setWindowTitle(QApplication::translate("MainWindow", std_title.c_str(), 0));
 
-	// Setup _session events
-	connect(&_session, SIGNAL(capture_state_changed(int)), this,
-		SLOT(capture_state_changed(int)));
-    connect(&_session, SIGNAL(device_attach()), this,
-            SLOT(device_attach()), Qt::QueuedConnection);
-    connect(&_session, SIGNAL(device_detach()), this,
-            SLOT(device_detach()), Qt::QueuedConnection);
-    connect(&_session, SIGNAL(session_error()), this,
-            SLOT(show_error()), Qt::QueuedConnection);
-    connect(&_session, SIGNAL(session_save()), this,
-            SLOT(session_save()));
-    connect(&_session, SIGNAL(data_updated()), _measure_widget,
-            SLOT(reCalc()));
-    connect(&_session, SIGNAL(repeat_resume()), this,
-            SLOT(repeat_resume()));
-    connect(&_session, SIGNAL(update_capture()), _view,
-            SLOT(update_hori_res()), Qt::DirectConnection);
-
-    connect(&_session, SIGNAL(cur_snap_samplerate_changed()), _measure_widget,
-            SLOT(cursor_update()));
-    connect(_view, SIGNAL(cursor_update()), _measure_widget,
-            SLOT(cursor_update()));
-    connect(_view, SIGNAL(cursor_moving()), _measure_widget,
-            SLOT(cursor_moving()));
-    connect(_view, SIGNAL(cursor_moved()), _measure_widget,
-            SLOT(reCalc()));
-    connect(_view, SIGNAL(prgRate(int)), this, SIGNAL(prgRate(int)));
-    connect(_view, SIGNAL(device_changed(bool)),
-            this, SLOT(device_changed(bool)), Qt::DirectConnection);
 
     // event filter
     _view->installEventFilter(this);
@@ -330,6 +255,53 @@ void MainWindow::setup_ui()
                                              QString(tr("Hotplug failed")), _1));
 
     retranslateUi();
+
+
+	// Setup _session events
+    connect(&_session, SIGNAL(capture_state_changed(int)), this, SLOT(capture_state_changed(int)));
+    connect(&_session, SIGNAL(device_attach()), this, SLOT(device_attach()), Qt::QueuedConnection);
+    connect(&_session, SIGNAL(device_detach()), this, SLOT(device_detach()), Qt::QueuedConnection);
+    connect(&_session, SIGNAL(session_error()), this, SLOT(show_error()), Qt::QueuedConnection);
+    connect(&_session, SIGNAL(session_save()), this, SLOT(session_save()));
+    connect(&_session, SIGNAL(data_updated()), _measure_widget, SLOT(reCalc()));
+    connect(&_session, SIGNAL(repeat_resume()), this, SLOT(repeat_resume()));
+    connect(&_session, SIGNAL(update_capture()), _view, SLOT(update_hori_res()), Qt::DirectConnection);
+    connect(&_session, SIGNAL(cur_snap_samplerate_changed()), _measure_widget, SLOT(cursor_update()));
+    connect(_view, SIGNAL(cursor_update()), _measure_widget, SLOT(cursor_update()));
+    connect(_view, SIGNAL(cursor_moving()), _measure_widget, SLOT(cursor_moving()));
+    connect(_view, SIGNAL(cursor_moved()), _measure_widget, SLOT(reCalc()));
+    connect(_view, SIGNAL(prgRate(int)), this, SIGNAL(prgRate(int)));
+    connect(_view, SIGNAL(device_changed(bool)), this, SLOT(device_changed(bool)), Qt::DirectConnection);
+
+    //tool bar event
+    connect(_trig_bar, SIGNAL(on_protocol(bool)), this, SLOT(on_protocol(bool)));
+    connect(_trig_bar, SIGNAL(on_trigger(bool)), this, SLOT(on_trigger(bool)));
+    connect(_trig_bar, SIGNAL(on_measure(bool)), this, SLOT(on_measure(bool)));
+    connect(_trig_bar, SIGNAL(on_search(bool)), this, SLOT(on_search(bool)));
+    connect(_trig_bar, SIGNAL(setTheme(QString)), this, SLOT(switchTheme(QString)));
+    connect(_file_bar, SIGNAL(load_file(QString)), this, SLOT(load_file(QString)));
+    connect(_file_bar, SIGNAL(on_save()), this, SLOT(on_save()));
+    connect(_file_bar, SIGNAL(on_export()), this, SLOT(on_export()));
+    connect(_file_bar, SIGNAL(on_screenShot()), this, SLOT(on_screenShot()), Qt::QueuedConnection);
+    connect(_file_bar, SIGNAL(load_session(QString)), this, SLOT(load_session(QString)));
+    connect(_file_bar, SIGNAL(store_session(QString)), this, SLOT(store_session(QString)));
+    connect(_logo_bar, SIGNAL(setLanguage(int)), this, SLOT(switchLanguage(int)));
+    connect(_logo_bar, SIGNAL(openDoc()), this, SLOT(openDoc()));
+
+#ifdef ENABLE_DECODE
+    connect(_protocol_widget, SIGNAL(protocol_updated()), _view, SLOT(signals_changed()));
+#endif
+
+    connect(_sampling_bar, SIGNAL(device_selected()), this, SLOT(update_device_list()));
+    connect(_sampling_bar, SIGNAL(device_updated()), this, SLOT(reload()));
+    connect(_sampling_bar, SIGNAL(run_stop()), this, SLOT(run_stop()));
+    connect(_sampling_bar, SIGNAL(instant_stop()), this, SLOT(instant_stop()));
+    connect(_sampling_bar, SIGNAL(duration_changed()), _trigger_widget, SLOT(device_updated()));
+    connect(_sampling_bar, SIGNAL(duration_changed()), _view, SLOT(timebase_changed()));
+    connect(_sampling_bar, SIGNAL(show_calibration()), _view, SLOT(show_calibration()));
+    connect(_trig_bar, SIGNAL(show_lissajous(bool)), _view, SLOT(show_lissajous(bool)));
+    connect(_dso_trigger_widget, SIGNAL(set_trig_pos(int)), _view, SLOT(set_trig_pos(int)));
+    connect(_view, SIGNAL(auto_trig(int)), _dso_trigger_widget, SLOT(auto_trig(int)));
 }
 
 
diff --git a/DSView/pv/storesession.cpp b/DSView/pv/storesession.cpp
index 0d37207a..ca8c51d2 100755
--- a/DSView/pv/storesession.cpp
+++ b/DSView/pv/storesession.cpp
@@ -568,6 +568,7 @@ QString StoreSession::meta_gen(boost::shared_ptr<data::Snapshot> snapshot)
     return metafile;
 }
 
+//export as csv file
 bool StoreSession::export_start()
 {
     std::set<int> type_set;
@@ -596,6 +597,7 @@ bool StoreSession::export_start()
     const QString DIR_KEY("ExportPath");
     QSettings settings(QApplication::organizationName(), QApplication::applicationName());
     QString default_name = settings.value(DIR_KEY).toString() + "/" + _session.get_device()->name() + "-";
+
     for (const GSList *l = _session.get_device()->get_dev_mode_list();
          l; l = l->next) {
         const sr_dev_mode *mode = (const sr_dev_mode *)l->data;
@@ -616,6 +618,7 @@ bool StoreSession::export_start()
     }
     _file_name = QFileDialog::getSaveFileName(
                 NULL, tr("Export Data"), default_name,filter,&filter);
+
     if (!_file_name.isEmpty()) {
         QFileInfo f(_file_name);
         QStringList list = filter.split('.').last().split(')');
@@ -681,6 +684,7 @@ void StoreSession::export_proc(shared_ptr<data::Snapshot> snapshot)
     output.param = NULL;
     if(_outModule->init)
         _outModule->init(&output, params);
+
     QFile file(_file_name);
     file.open(QIODevice::WriteOnly | QIODevice::Text);
     QTextStream out(&file);
@@ -692,9 +696,11 @@ void StoreSession::export_proc(shared_ptr<data::Snapshot> snapshot)
     struct sr_datafeed_packet p;
     struct sr_datafeed_meta meta;
     struct sr_config *src;
+
     src = sr_config_new(SR_CONF_SAMPLERATE,
             g_variant_new_uint64(_session.cur_snap_samplerate()));
     meta.config = g_slist_append(NULL, src);
+
     src = sr_config_new(SR_CONF_LIMIT_SAMPLES,
             g_variant_new_uint64(snapshot->get_sample_count()));
     meta.config = g_slist_append(meta.config, src);
@@ -743,6 +749,7 @@ void StoreSession::export_proc(shared_ptr<data::Snapshot> snapshot)
         bool sample;
         std::vector<uint8_t *> buf_vec;
         std::vector<bool> buf_sample;
+
         for (int blk = 0; !boost::this_thread::interruption_requested()  &&
                           blk < blk_num; blk++) {
             uint64_t buf_sample_num = logic_snapshot->get_block_size(blk) * 8;
@@ -764,6 +771,7 @@ void StoreSession::export_proc(shared_ptr<data::Snapshot> snapshot)
             unsigned int usize = 8192;
             unsigned int size = usize;
             struct sr_datafeed_logic lp;
+
             for(uint64_t i = 0; !boost::this_thread::interruption_requested() &&
                                 i < buf_sample_num; i+=usize){
                 if(buf_sample_num - i < usize)
@@ -773,8 +781,9 @@ void StoreSession::export_proc(shared_ptr<data::Snapshot> snapshot)
                     _has_error = true;
                     _error = tr("xbuffer malloc failed.");
                     return;
-                }
+                }                
                 memset(xbuf, 0, size * unitsize);
+
                 for (uint64_t j = 0; j < size; j++) {
                     for (unsigned int k = 0; k < buf_vec.size(); k++) {
                         if (buf_vec[k] == NULL && buf_sample[k])
@@ -783,6 +792,7 @@ void StoreSession::export_proc(shared_ptr<data::Snapshot> snapshot)
                             xbuf[j*unitsize+k/8] +=  1 << k%8;
                     }
                 }
+
                 lp.data = xbuf;
                 lp.length = size * unitsize;
                 lp.unitsize = unitsize;
@@ -790,6 +800,7 @@ void StoreSession::export_proc(shared_ptr<data::Snapshot> snapshot)
                 p.status = SR_PKT_OK;
                 p.payload = &lp;
                 _outModule->receive(&output, &p, &data_out);
+
                 if(data_out){
                     out << QString::fromUtf8((char*) data_out->str);
                     g_string_free(data_out,TRUE);
@@ -801,35 +812,41 @@ void StoreSession::export_proc(shared_ptr<data::Snapshot> snapshot)
                 progress_updated();
             }
         }
+
     } else if (channel_type == SR_CHANNEL_DSO) {
         _unit_count = snapshot->get_sample_count();
         unsigned char* datat = (unsigned char*)snapshot->get_data();
         unsigned int usize = 8192;
         unsigned int size = usize;
-        struct sr_datafeed_dso dp;
+        struct sr_datafeed_dso dp; 
+
         for(uint64_t i = 0; !boost::this_thread::interruption_requested() && i < _unit_count; i+=usize){
             if(_unit_count - i < usize)
                 size = _unit_count - i;
+
             dp.data = &datat[i*snapshot->get_channel_num()];
             dp.num_samples = size;
             p.type = SR_DF_DSO;
             p.status = SR_PKT_OK;
             p.payload = &dp;
             _outModule->receive(&output, &p, &data_out);
+
             if(data_out){
                 out << (char*) data_out->str;
                 g_string_free(data_out,TRUE);
             }
-
+            
             _units_stored += size;
             progress_updated();
         }
+
     } else if (channel_type == SR_CHANNEL_ANALOG) {
         _unit_count = snapshot->get_sample_count();
         unsigned char* datat = (unsigned char*)snapshot->get_data();
         unsigned int usize = 8192;
         unsigned int size = usize;
         struct sr_datafeed_analog ap;
+
         for(uint64_t i = 0; !boost::this_thread::interruption_requested() && i < _unit_count; i+=usize){
             if(_unit_count - i < usize)
                 size = _unit_count - i;
diff --git a/DSView/pv/toolbars/filebar.cpp b/DSView/pv/toolbars/filebar.cpp
index 5efbca7f..ea0b47ac 100755
--- a/DSView/pv/toolbars/filebar.cpp
+++ b/DSView/pv/toolbars/filebar.cpp
@@ -47,16 +47,13 @@ FileBar::FileBar(SigSession &session, QWidget *parent) :
 
     _action_load = new QAction(this);
     _action_load->setObjectName(QString::fromUtf8("actionLoad"));
-    connect(_action_load, SIGNAL(triggered()), this, SLOT(on_actionLoad_triggered()));
-
+ 
     _action_store = new QAction(this);
     _action_store->setObjectName(QString::fromUtf8("actionStore"));
-    connect(_action_store, SIGNAL(triggered()), this, SLOT(on_actionStore_triggered()));
-
+ 
     _action_default = new QAction(this);
     _action_default->setObjectName(QString::fromUtf8("actionDefault"));
-    connect(_action_default, SIGNAL(triggered()), this, SLOT(on_actionDefault_triggered()));
-
+  
     _menu_session = new QMenu(this);
     _menu_session->setObjectName(QString::fromUtf8("menuSession"));
     _menu_session->addAction(_action_load);
@@ -65,21 +62,16 @@ FileBar::FileBar(SigSession &session, QWidget *parent) :
 
     _action_open = new QAction(this);
     _action_open->setObjectName(QString::fromUtf8("actionOpen"));
-    connect(_action_open, SIGNAL(triggered()), this, SLOT(on_actionOpen_triggered()));
-
+    
     _action_save = new QAction(this);
     _action_save->setObjectName(QString::fromUtf8("actionSave"));
-    connect(_action_save, SIGNAL(triggered()), this, SIGNAL(on_save()));
-
+     
     _action_export = new QAction(this);
     _action_export->setObjectName(QString::fromUtf8("actionExport"));
-    connect(_action_export, SIGNAL(triggered()), this, SIGNAL(on_export()));
-
-
+     
     _action_capture = new QAction(this);
     _action_capture->setObjectName(QString::fromUtf8("actionCapture"));
-    connect(_action_capture, SIGNAL(triggered()), this, SLOT(on_actionCapture_triggered()));
-
+ 
     _file_button.setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
     _file_button.setPopupMode(QToolButton::InstantPopup);
 
@@ -93,6 +85,14 @@ FileBar::FileBar(SigSession &session, QWidget *parent) :
     addWidget(&_file_button);
 
     retranslateUi();
+
+    connect(_action_load, SIGNAL(triggered()), this, SLOT(on_actionLoad_triggered()));
+    connect(_action_store, SIGNAL(triggered()), this, SLOT(on_actionStore_triggered()));
+    connect(_action_default, SIGNAL(triggered()), this, SLOT(on_actionDefault_triggered()));
+    connect(_action_open, SIGNAL(triggered()), this, SLOT(on_actionOpen_triggered()));
+    connect(_action_save, SIGNAL(triggered()), this, SIGNAL(on_save()));
+    connect(_action_export, SIGNAL(triggered()), this, SIGNAL(on_export()));
+    connect(_action_capture, SIGNAL(triggered()), this, SLOT(on_actionCapture_triggered()));
 }
 
 void FileBar::changeEvent(QEvent *event)

From fed30a0e572aeccb7e99145c553fcc3de1b4b0de Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Thu, 28 Oct 2021 11:03:50 +0800
Subject: [PATCH 13/58] update app config manager

---
 DSView/main.cpp                         |  17 +-
 DSView/pv/config/appconfig.cpp          | 266 +++++++++++++++---------
 DSView/pv/config/appconfig.h            |  60 ++++--
 DSView/pv/data/signaldata.cpp           |   6 +-
 DSView/pv/data/signaldata.h             |   8 +-
 DSView/pv/devicemanager.cpp             |   3 +-
 DSView/pv/dialogs/about.cpp             |   7 +-
 DSView/pv/dialogs/applicationpardlg.cpp |   9 +-
 DSView/pv/dialogs/protocolexp.cpp       |  25 ++-
 DSView/pv/dialogs/waitingdialog.cpp     |   3 +-
 DSView/pv/dock/dsotriggerdock.cpp       |   2 +-
 DSView/pv/dock/measuredock.cpp          |   9 +-
 DSView/pv/dock/protocoldock.cpp         |   3 +-
 DSView/pv/dock/protocolitemlayer.cpp    |   5 +-
 DSView/pv/dock/searchdock.cpp           |   3 +-
 DSView/pv/dock/triggerdock.cpp          |   2 +-
 DSView/pv/mainframe.cpp                 |  67 +++---
 DSView/pv/mainwindow.cpp                | 228 +++++++++++---------
 DSView/pv/mainwindow.h                  |   8 +-
 DSView/pv/sigsession.cpp                |  41 ++--
 DSView/pv/sigsession.h                  |   8 +-
 DSView/pv/storesession.cpp              | 115 ++++++----
 DSView/pv/storesession.h                |  10 +-
 DSView/pv/toolbars/filebar.cpp          |  74 ++++---
 DSView/pv/toolbars/logobar.cpp          |  13 +-
 DSView/pv/toolbars/samplingbar.cpp      |  61 +++---
 DSView/pv/toolbars/titlebar.cpp         |  10 +-
 DSView/pv/toolbars/trigbar.cpp          |  28 +--
 DSView/pv/toolbars/trigbar.h            |   2 +-
 DSView/pv/view/decodetrace.cpp          |   4 +-
 DSView/pv/view/devmode.cpp              |  22 +-
 DSView/pv/view/header.cpp               |   4 +-
 DSView/pv/view/selectableitem.cpp       |   4 +-
 DSView/pv/view/signal.cpp               |   3 +-
 DSView/pv/view/trace.cpp                |   6 +-
 DSView/pv/view/view.cpp                 |  11 +-
 DSView/pv/widgets/border.cpp            |  11 +-
 DSView/pv/widgets/decodergroupbox.cpp   |   6 +-
 DSView/pv/widgets/decodergroupbox.h     |   2 +-
 39 files changed, 692 insertions(+), 474 deletions(-)

diff --git a/DSView/main.cpp b/DSView/main.cpp
index 04ad160e..e1714572 100755
--- a/DSView/main.cpp
+++ b/DSView/main.cpp
@@ -21,9 +21,7 @@
  */
 
 #include <libsigrok4DSL/libsigrok.h>
-#ifdef ENABLE_DECODE
 #include <libsigrokdecode4DSL/libsigrokdecode.h>
-#endif
 
 #include <stdint.h>
 #include <getopt.h>
@@ -33,7 +31,6 @@
 #include <QFile>
 #include <QDir>
 #include <QTranslator>
-#include <QSettings>
 #include <QDesktopServices>
 #include <QStyle>
 
@@ -130,9 +127,9 @@ int main(int argc, char *argv[])
 			const int loglevel = atoi(optarg);
 			sr_log_loglevel_set(loglevel);
 
-#ifdef ENABLE_DECODE
+
 			srd_log_loglevel_set(loglevel);
-#endif
+
 
 			break;
 		}
@@ -176,7 +173,7 @@ int main(int argc, char *argv[])
 	}
 
 	do {
-#ifdef ENABLE_DECODE
+
 		// Initialise libsigrokdecode
 		if (srd_init(NULL) != SRD_OK) {
 			qDebug() << "ERROR: libsigrokdecode init failed.";
@@ -185,9 +182,9 @@ int main(int argc, char *argv[])
 
 		// Load the protocol decoders
 		srd_decoder_load_all();
-#endif
+
 		//load app config
-		AppConfig::Instance().Load("./appconfig.json");
+		AppConfig::Instance().LoadAll();
 
 		try {
 			// Create the device manager, initialise the drivers
@@ -206,10 +203,10 @@ int main(int argc, char *argv[])
 			qDebug() << e.what();
 		}
 
-#ifdef ENABLE_DECODE
+
 		// Destroy libsigrokdecode
 		srd_exit();
-#endif
+
 
 	} while (0);
 
diff --git a/DSView/pv/config/appconfig.cpp b/DSView/pv/config/appconfig.cpp
index 44c62989..ae418bfc 100644
--- a/DSView/pv/config/appconfig.cpp
+++ b/DSView/pv/config/appconfig.cpp
@@ -20,15 +20,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "appconfig.h"
-#include <assert.h>
-#include <QFile>
-#include <QFileInfo>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QTextStream>
-#include <QStringList>
-
+#include "appconfig.h" 
+#include <QApplication>
+#include <QSettings>
+#include <QLocale>
+  
 #define MAX_PROTOCOL_FORMAT_LIST 15
 
 StringPair::StringPair(const string &key, const string &value)
@@ -44,12 +40,10 @@ QString FormatArrayToString(vector<StringPair> &protocolFormats){
     for (StringPair &o : protocolFormats){
          if (!str.isEmpty()){
              str += ";";
-         }
-         std::string line;
-         line += o.m_key;
-         line += "=";
-         line += o.m_value;
-         str += line.c_str();
+         } 
+         str += o.m_key.c_str();
+         str += "=";
+         str += o.m_value.c_str(); 
     }
 
     return str;
@@ -68,11 +62,112 @@ void StringToFormatArray(const QString &str, vector<StringPair> &protocolFormats
     }
 }
 
+//read write field
+
+void getFiled(const char *key, QSettings &st, QString &f, const char *dv){
+    f = st.value(key, dv).toString();
+}
+void getFiled(const char *key, QSettings &st, int &f, int dv){
+    f = st.value(key, dv).toInt();
+}
+void getFiled(const char *key, QSettings &st, bool &f, bool dv){
+    f = st.value(key, dv).toBool();
+}
+ 
+void setFiled(const char *key, QSettings &st, QString f){
+    st.setValue(key, f);
+}
+void setFiled(const char *key, QSettings &st, int f){
+    st.setValue(key, f);
+}
+void setFiled(const char *key, QSettings &st, bool f){
+    st.setValue(key, f);
+}
+
+
+///------ app
+void _loadApp(AppOptions &o, QSettings &st){
+    st.beginGroup("Application"); 
+    getFiled("quickScroll", st, o.quickScroll, true);
+    getFiled("warnofMultiTrig", st, o.warnofMultiTrig, true);
+
+
+    QString fmt;
+    getFiled("protocalFormats", st, fmt, "");
+    if (fmt != ""){
+         StringToFormatArray(fmt, o.m_protocolFormats);
+    }
+   
+    st.endGroup();  
+}
+
+void _saveApp(AppOptions &o, QSettings &st){
+    st.beginGroup("Application");
+    setFiled("quickScroll", st, o.quickScroll);
+    setFiled("warnofMultiTrig", st, o.warnofMultiTrig);
+
+
+    QString fmt =  FormatArrayToString(o.m_protocolFormats);
+    setFiled("protocalFormats", st, fmt);
+    st.endGroup();  
+}
+
+//-----frame
+void _loadFrame(FrameOptions &o, QSettings &st){
+    st.beginGroup("MainFrame"); 
+    getFiled("style", st, o.style, "dark");
+    getFiled("language", st, o.language, -1);
+    getFiled("isMax", st, o.isMax, false);  
+    o.geometry = st.value("geometry", QByteArray()).toByteArray();
+    o.windowState = st.value("windowState", QByteArray()).toByteArray();
+    st.endGroup();
+
+    if (o.language == -1){
+        //get local language
+        QLocale locale;
+        o.language = locale.language();
+    }
+}
+
+void _saveFrame(FrameOptions &o, QSettings &st){
+    st.beginGroup("MainFrame");
+    setFiled("style", st, o.style);
+    setFiled("language", st, o.language);
+    setFiled("isMax", st, o.isMax);  
+    st.setValue("geometry", o.geometry); 
+    st.setValue("windowState", o.windowState); 
+    st.endGroup();
+}
+
+//------history
+void _loadHistory(UserHistory &o, QSettings &st){
+    st.beginGroup("UserHistory");
+    getFiled("exportDir", st, o.exportDir, ""); 
+    getFiled("saveDir", st, o.saveDir, ""); 
+    getFiled("showDocuments", st, o.showDocuments, true);
+    getFiled("screenShotPath", st, o.screenShotPath, ""); 
+    getFiled("sessionDir", st, o.sessionDir, ""); 
+    getFiled("openDir", st, o.openDir, ""); 
+    getFiled("protocolExportPath", st, o.protocolExportPath, ""); 
+    st.endGroup();
+}
+ 
+void _saveHistory(UserHistory &o, QSettings &st){
+    st.beginGroup("UserHistory");
+    setFiled("exportDir", st, o.exportDir); 
+    setFiled("saveDir", st, o.saveDir); 
+    setFiled("showDocuments", st, o.showDocuments); 
+    setFiled("screenShotPath", st, o.screenShotPath); 
+    setFiled("sessionDir", st, o.sessionDir); 
+    setFiled("openDir", st, o.openDir); 
+    setFiled("protocolExportPath", st, o.protocolExportPath); 
+    st.endGroup();
+}
+
 //------------AppConfig
 
 AppConfig::AppConfig()
-{
-    _appOptions.quickScroll = true;
+{ 
 }
 
 AppConfig::~AppConfig()
@@ -88,111 +183,88 @@ AppConfig::~AppConfig()
      return *ins;
  }
 
-bool AppConfig::Load(const char *file)
-{
-    assert(file);
-    m_fileName = file;
-
-    QFile qf(file);
-    if (qf.open(QIODevice::ReadOnly))
-    {
-        QByteArray bytes = qf.readAll();
-        qf.close();
-
-        string json;
-        json.append(bytes.data(), bytes.size());
-        FromJson(json);
-        return true;
-    }
-
-    return false;
+void AppConfig::LoadAll()
+{   
+    QSettings st(QApplication::organizationName(), QApplication::applicationName());
+    _loadApp(_appOptions, st);
+    _loadHistory(_userHistory, st);
+    _loadFrame(_frameOptions, st);
 }
 
-bool AppConfig::Save()
-{
-    if (m_fileName != "")
-    { 
-        QFile qf(m_fileName.c_str());
-        if (qf.open(QIODevice::WriteOnly | QIODevice::Text))
-        { 
-            string json = ToJsonString();
-            QByteArray bytes(json.c_str(), json.size());
-
-            QTextStream _stream(&qf);
-            _stream.setCodec("UTF-8");
-            _stream << QString::fromUtf8(bytes);
-            qf.close();
-
-            return true;
-        }
-    }
-    return false;
-}
-
-  string AppConfig::ToJsonString()
+  void AppConfig::SaveApp()
   {
-      QJsonObject jobj; 
-      QString  profomats = FormatArrayToString(m_protocolFormats);
-      jobj["ProtocolFormats"] = QJsonValue::fromVariant(profomats);
-
-      //application options
-      QJsonObject app; 
-      app["QuickScroll"] = QJsonValue::fromVariant(_appOptions.quickScroll);
-  
-      jobj["Application"] = QJsonValue::fromVariant(app);
-
-      QJsonDocument jdoc(jobj);
-      QByteArray bytes = jdoc.toJson();
-      string json;
-      json.append(bytes.data(), bytes.size());
-      return json;  
+      QSettings st(QApplication::organizationName(), QApplication::applicationName());
+      _saveApp(_appOptions, st);
   }
 
-  void AppConfig::FromJson(string &json)
+  void AppConfig::SaveHistory()
   {
-      if (!json.size())
-        return;
-
-      QByteArray bytes(json.c_str(), json.size());
-      QJsonDocument jdoc = QJsonDocument::fromJson(bytes);
-      QJsonObject jobj = jdoc.object();
-
-      if (jobj.contains("ProtocolFormats")){
-          m_protocolFormats.clear();
-          StringToFormatArray(jobj["ProtocolFormats"].toString(), m_protocolFormats);
-      } 
-
-      //application node
-      if (jobj.contains("Application")){
-          QJsonObject app = jobj["Application"].toObject();
-          _appOptions.quickScroll = app["QuickScroll"].toBool();
-      } 
+      QSettings st(QApplication::organizationName(), QApplication::applicationName());
+       _saveHistory(_userHistory, st);
   }
 
+  void AppConfig::SaveFrame()
+  {
+      QSettings st(QApplication::organizationName(), QApplication::applicationName());
+      _saveFrame(_frameOptions, st);
+  }
+ 
+
 void AppConfig::SetProtocolFormat(const string &protocolName, const string &value)
 {
-    for (StringPair &o : m_protocolFormats){
+    bool bChange = false;
+    for (StringPair &o : _appOptions.m_protocolFormats){
         if (o.m_key == protocolName){
             o.m_value = value;
-            return;
+            bChange = true;
+            break;
         }    
     }
-    if (m_protocolFormats.size() > MAX_PROTOCOL_FORMAT_LIST){
-        while (m_protocolFormats.size() < MAX_PROTOCOL_FORMAT_LIST)
+
+    if (!bChange)
+    {
+        if (_appOptions.m_protocolFormats.size() > MAX_PROTOCOL_FORMAT_LIST)
         {
-           m_protocolFormats.erase(m_protocolFormats.begin());
+            while (_appOptions.m_protocolFormats.size() < MAX_PROTOCOL_FORMAT_LIST)
+            {
+                _appOptions.m_protocolFormats.erase(_appOptions.m_protocolFormats.begin());
+            }
         }
+        _appOptions.m_protocolFormats.push_back(StringPair(protocolName, value));
+        bChange = true;
     }
 
-    m_protocolFormats.push_back(StringPair(protocolName,value));    
+    if (bChange){
+        SaveApp();
+    }
 }
 
 string AppConfig::GetProtocolFormat(const string &protocolName)
 {
-     for (StringPair &o : m_protocolFormats){
+     for (StringPair &o : _appOptions.m_protocolFormats){
         if (o.m_key == protocolName){ 
             return o.m_value;
         }
     }
     return "";
 }
+
+//-------------api
+QString GetDirectoryName(QString path)
+{
+    int lstdex = path.lastIndexOf('/');
+    if (lstdex != -1)
+    {
+        return path.left(lstdex);
+    }
+    return path;
+}
+
+QString GetIconPath()
+{ 
+    QString style = AppConfig::Instance()._frameOptions.style;
+    if (style == ""){
+        style = "dark";
+    }
+    return ":/icons/" + style;
+}
diff --git a/DSView/pv/config/appconfig.h b/DSView/pv/config/appconfig.h
index a5c93aea..14b1d5d6 100644
--- a/DSView/pv/config/appconfig.h
+++ b/DSView/pv/config/appconfig.h
@@ -24,8 +24,18 @@
 
 #include <string>
 #include <vector>
+#include <QString>
+#include <QByteArray>
 
 using namespace std;
+
+//--------------------api
+
+QString GetDirectoryName(QString path);
+
+QString GetIconPath();
+
+//------------------class
   
 class StringPair
 {
@@ -35,33 +45,57 @@ public:
    string m_value;
 };
 
-struct AppOptions
+class AppOptions
 {  
-    bool  quickScroll;    
+  public:
+    bool  quickScroll;
+    bool  warnofMultiTrig;
+
+
+    vector<StringPair> m_protocolFormats;
+};
+ 
+class FrameOptions
+{
+public:
+  QString     style;
+  int         language;
+  QByteArray  geometry;
+  bool        isMax;
+  QByteArray  windowState;
+};
+
+class UserHistory
+{
+public:
+  QString   exportDir;
+  QString   saveDir;
+  bool      showDocuments;
+  QString   screenShotPath;
+  QString   sessionDir;
+  QString   openDir;
+  QString   protocolExportPath;
 };
 
-  
 class AppConfig
 {
 private:
   AppConfig();
-
   ~AppConfig();
 
 public:
   static AppConfig &Instance();
-  bool Load(const char *file);
-  bool Save();
-  string ToJsonString();
-  void FromJson(string &json);
 
+  void LoadAll();
+  void SaveApp();  
+  void SaveHistory();
+  void SaveFrame();
+  
   void SetProtocolFormat(const string &protocolName, const string &value);
   string GetProtocolFormat(const string &protocolName); 
 
 public:
-  AppOptions _appOptions;
-
-private:
-  string m_fileName;
-  vector<StringPair> m_protocolFormats;
+  AppOptions    _appOptions;
+  UserHistory   _userHistory;
+  FrameOptions  _frameOptions; 
 };
diff --git a/DSView/pv/data/signaldata.cpp b/DSView/pv/data/signaldata.cpp
index 19005905..31c60937 100755
--- a/DSView/pv/data/signaldata.cpp
+++ b/DSView/pv/data/signaldata.cpp
@@ -33,11 +33,7 @@ SignalData::SignalData() :
 }
 
 SignalData::~SignalData() {}
-
-double SignalData::samplerate() const
-{
-	return _samplerate;
-}
+ 
 
 void SignalData::set_samplerate(double samplerate)
 {
diff --git a/DSView/pv/data/signaldata.h b/DSView/pv/data/signaldata.h
index 7ade4ddd..76f9588a 100755
--- a/DSView/pv/data/signaldata.h
+++ b/DSView/pv/data/signaldata.h
@@ -35,17 +35,17 @@ class SignalData
 public:
     SignalData();
     virtual ~SignalData() = 0;
+
 public:
-    double samplerate() const;
+    inline double samplerate()const 
+        {return _samplerate; }
+
     void set_samplerate(double samplerate);
-
     virtual void clear() = 0;
-
     virtual void init() = 0;
 
 protected:
     mutable boost::recursive_mutex _mutex;
-
     double _samplerate;
 };
 
diff --git a/DSView/pv/devicemanager.cpp b/DSView/pv/devicemanager.cpp
index aacfd7d1..08bf0946 100755
--- a/DSView/pv/devicemanager.cpp
+++ b/DSView/pv/devicemanager.cpp
@@ -29,8 +29,7 @@
 #include <sstream>
 #include <stdexcept>
 #include <string>
-
-#include <QApplication>
+ 
 #include <QObject>
 #include <QDebug>
 #include <QDir>
diff --git a/DSView/pv/dialogs/about.cpp b/DSView/pv/dialogs/about.cpp
index ef9079b5..a0a40099 100755
--- a/DSView/pv/dialogs/about.cpp
+++ b/DSView/pv/dialogs/about.cpp
@@ -31,6 +31,7 @@
 #include <QTextCodec>
 
 #include "about.h"
+#include "../config/appconfig.h"
 
 namespace pv {
 namespace dialogs {
@@ -80,7 +81,11 @@ About::About(QWidget *parent) :
     QDir dir(DS_RES_PATH);
     dir.cdUp();
     #endif
-    QString filename = dir.absolutePath() + "/NEWS" + QString::number(qApp->property("Language").toInt());
+
+    AppConfig &app = AppConfig::Instance(); 
+    int lan = app._frameOptions.language;
+
+    QString filename = dir.absolutePath() + "/NEWS" + QString::number(lan);
     QFile news(filename);
     if (news.open(QIODevice::ReadOnly)) {
         QTextCodec *code=QTextCodec::codecForName("UTF-8");
diff --git a/DSView/pv/dialogs/applicationpardlg.cpp b/DSView/pv/dialogs/applicationpardlg.cpp
index 469e0657..ed4e99fc 100644
--- a/DSView/pv/dialogs/applicationpardlg.cpp
+++ b/DSView/pv/dialogs/applicationpardlg.cpp
@@ -49,10 +49,10 @@ bool ApplicationParamDlg::ShowDlg(QWidget *parent)
     lay.setContentsMargins(0,20,0,30);
 
     //show config
-    AppOptions &_app = AppConfig::Instance()._appOptions;
+    AppConfig &app = AppConfig::Instance();
 
     QCheckBox *ck_quickScroll = new QCheckBox();
-    ck_quickScroll->setChecked(_app.quickScroll);
+    ck_quickScroll->setChecked(app._appOptions.quickScroll);
     lay.addRow("Quick scroll", ck_quickScroll);
     dlg.layout()->addLayout(&lay);  
      
@@ -62,9 +62,8 @@ bool ApplicationParamDlg::ShowDlg(QWidget *parent)
 
     //save config
     if (ret){
-        _app.quickScroll = ck_quickScroll->isChecked();
-
-        AppConfig::Instance().Save();
+        app._appOptions.quickScroll = ck_quickScroll->isChecked();
+        app.SaveApp();
     }
    
    return ret;
diff --git a/DSView/pv/dialogs/protocolexp.cpp b/DSView/pv/dialogs/protocolexp.cpp
index 4d93b9f8..8956e4ad 100755
--- a/DSView/pv/dialogs/protocolexp.cpp
+++ b/DSView/pv/dialogs/protocolexp.cpp
@@ -22,8 +22,7 @@
 #include "protocolexp.h"
 
 #include <boost/foreach.hpp>
-
-#include <QApplication>
+ 
 #include <QFormLayout>
 #include <QListWidget>
 #include <QFile>
@@ -39,6 +38,7 @@
 #include "../data/decode/annotation.h"
 #include "../view/decodetrace.h"
 #include "../data/decodermodel.h"
+#include "../config/appconfig.h"
 
 using namespace boost;
 using namespace std;
@@ -118,15 +118,20 @@ void ProtocolExp::accept()
             if(i < supportedFormats.count() - 1)
                 filter.append(";;");
         }
-        const QString DIR_KEY("ProtocolExportPath");
-        QSettings settings(QApplication::organizationName(), QApplication::applicationName());
+
+        AppConfig &app = AppConfig::Instance();         
+        
         QString default_filter = _format_combobox->currentText();
 
-        QString default_name = settings.value(DIR_KEY).toString() + "/" + "decoder-";
+        QString default_name = app._userHistory.protocolExportPath + "/" + "decoder-";
         default_name += _session.get_session_time().toString("-yyMMdd-hhmmss");
 
         QString file_name = QFileDialog::getSaveFileName(
-                    this, tr("Export Data"), default_name,filter,&default_filter);
+                    this, 
+                    tr("Export Data"), 
+                    default_name,filter,
+                    &default_filter);
+
         if (!file_name.isEmpty()) {
             QFileInfo f(file_name);
             QStringList list = default_filter.split('.').last().split(')');
@@ -134,8 +139,12 @@ void ProtocolExp::accept()
             if(f.suffix().compare(ext))
                 file_name+=tr(".")+ext;
 
-            QDir CurrentDir;
-            settings.setValue(DIR_KEY, CurrentDir.filePath(file_name));
+            QString fname = GetDirectoryName(file_name);
+            if (fname != app._userHistory.openDir)
+            {
+                app._userHistory.protocolExportPath = fname;
+                app.SaveHistory();
+            }
 
             QFile file(file_name);
             file.open(QIODevice::WriteOnly | QIODevice::Text);
diff --git a/DSView/pv/dialogs/waitingdialog.cpp b/DSView/pv/dialogs/waitingdialog.cpp
index f4144ec5..c901cbdf 100755
--- a/DSView/pv/dialogs/waitingdialog.cpp
+++ b/DSView/pv/dialogs/waitingdialog.cpp
@@ -32,6 +32,7 @@
 
 #include "../view/trace.h"
 #include "../view/dsosignal.h"
+#include "../config/appconfig.h"
 
 using namespace boost;
 using namespace std;
@@ -62,7 +63,7 @@ WaitingDialog::WaitingDialog(QWidget *parent, SigSession &session, int key) :
     warning_tips->setFont(font);
     warning_tips->setAlignment(Qt::AlignCenter);
 
-    QString iconPath = ":/icons/" + qApp->property("Style").toString();
+    QString iconPath = GetIconPath();
     label = new QLabel(this);
     movie = new QMovie(iconPath+"/wait.gif");
     label->setMovie(movie);
diff --git a/DSView/pv/dock/dsotriggerdock.cpp b/DSView/pv/dock/dsotriggerdock.cpp
index 5e54dce7..08bc64b6 100755
--- a/DSView/pv/dock/dsotriggerdock.cpp
+++ b/DSView/pv/dock/dsotriggerdock.cpp
@@ -200,7 +200,7 @@ void DsoTriggerDock::retranslateUi()
 
 void DsoTriggerDock::reStyle()
 {
-    //QString iconPath = ":/icons/" + qApp->property("Style").toString();
+     
 }
 
 void DsoTriggerDock::paintEvent(QPaintEvent *)
diff --git a/DSView/pv/dock/measuredock.cpp b/DSView/pv/dock/measuredock.cpp
index 0892d229..fc7644f6 100755
--- a/DSView/pv/dock/measuredock.cpp
+++ b/DSView/pv/dock/measuredock.cpp
@@ -41,6 +41,7 @@
 #include <QPainter>
 #include <QRegExpValidator>
 #include <QMessageBox>
+#include "../config/appconfig.h"
 
 using namespace boost;
 
@@ -183,7 +184,7 @@ void MeasureDock::retranslateUi()
 
 void MeasureDock::reStyle()
 {
-    QString iconPath = ":/icons/" + qApp->property("Style").toString();
+    QString iconPath = GetIconPath();
 
     _dist_add_btn->setIcon(QIcon(iconPath+"/add.svg"));
     _edge_add_btn->setIcon(QIcon(iconPath+"/add.svg"));
@@ -247,7 +248,7 @@ void MeasureDock::cursor_update()
     update_edge();
 
     int index = 1;
-    QString iconPath = ":/icons/" + qApp->property("Style").toString();
+    QString iconPath = GetIconPath();
     for(std::list<Cursor*>::iterator i = _view.get_cursorList().begin();
         i != _view.get_cursorList().end(); i++) {
         QString curCursor = QString::number(index);
@@ -336,7 +337,7 @@ void MeasureDock::add_dist_measure()
     row_widget->setLayout(row_layout);
     _dist_row_widget_vec.push_back(row_widget);
 
-    QString iconPath = ":/icons/" + qApp->property("Style").toString();
+    QString iconPath = GetIconPath();
     QToolButton *del_btn = new QToolButton(row_widget);
     del_btn->setIcon(QIcon(iconPath+"/del.svg"));
     del_btn->setCheckable(true);
@@ -402,7 +403,7 @@ void MeasureDock::add_edge_measure()
     row_widget->setLayout(row_layout);
     _edge_row_widget_vec.push_back(row_widget);
 
-    QString iconPath = ":/icons/" + qApp->property("Style").toString();
+    QString iconPath = GetIconPath();
     QToolButton *del_btn = new QToolButton(row_widget);
     del_btn->setIcon(QIcon(iconPath+"/del.svg"));
     del_btn->setCheckable(true);
diff --git a/DSView/pv/dock/protocoldock.cpp b/DSView/pv/dock/protocoldock.cpp
index 9098ca94..c4709222 100755
--- a/DSView/pv/dock/protocoldock.cpp
+++ b/DSView/pv/dock/protocoldock.cpp
@@ -234,7 +234,7 @@ void ProtocolDock::retranslateUi()
 
 void ProtocolDock::reStyle()
 {
-    QString iconPath = ":/icons/" + qApp->property("Style").toString();
+    QString iconPath = GetIconPath();
 
     _add_button->setIcon(QIcon(iconPath+"/add.svg"));
     _del_all_button->setIcon(QIcon(iconPath+"/del.svg"));
@@ -777,7 +777,6 @@ void ProtocolDock::OnProtocolFormatChanged(QString format, void *handle){
        if ((*it) == handle){
            QString &name = (*it)->GetProtocolName();
            AppConfig::Instance().SetProtocolFormat(name.toStdString(), format.toStdString());
-           AppConfig::Instance().Save();
            (*it)->m_decoderStatus->m_format = DecoderDataFormat::Parse(format.toStdString().c_str());
            protocol_updated();
            break;
diff --git a/DSView/pv/dock/protocolitemlayer.cpp b/DSView/pv/dock/protocolitemlayer.cpp
index 5a51dce1..bde54209 100644
--- a/DSView/pv/dock/protocolitemlayer.cpp
+++ b/DSView/pv/dock/protocolitemlayer.cpp
@@ -23,6 +23,7 @@
 #include "../dsvdef.h"
 #include <QtCore> 
 #include <assert.h> 
+#include "../config/appconfig.h"
  
 namespace pv {
 namespace dock {
@@ -41,7 +42,7 @@ ProtocolItemLayer::ProtocolItemLayer(QWidget *parent, QString protocolName, IPro
         _del_button = new QPushButton(parent);
         _format_combox = new QComboBox(parent);
 
-        QString iconPath = ":/icons/" + qApp->property("Style").toString();
+        QString iconPath = GetIconPath();
         _del_button->setFlat(true);
         _del_button->setIcon(QIcon(iconPath + "/del.svg"));
         _set_button->setFlat(true);
@@ -107,7 +108,7 @@ void ProtocolItemLayer::on_format_select_changed(int index){
  }
 
 void ProtocolItemLayer::ResetStyle(){
-    QString iconPath = ":/icons/" + qApp->property("Style").toString();
+    QString iconPath = GetIconPath();
      _del_button->setIcon(QIcon(iconPath + "/del.svg"));
     _set_button->setIcon(QIcon(iconPath + "/gear.svg"));
 }
diff --git a/DSView/pv/dock/searchdock.cpp b/DSView/pv/dock/searchdock.cpp
index 162b58a0..1372ca78 100755
--- a/DSView/pv/dock/searchdock.cpp
+++ b/DSView/pv/dock/searchdock.cpp
@@ -42,6 +42,7 @@
 
 #include <stdint.h>
 #include <boost/shared_ptr.hpp>
+#include "../config/appconfig.h"
 
 namespace pv {
 namespace dock {
@@ -109,7 +110,7 @@ void SearchDock::retranslateUi()
 
 void SearchDock::reStyle()
 {
-    QString iconPath = ":/icons/" + qApp->property("Style").toString();
+    QString iconPath = GetIconPath();
 
     _pre_button.setIcon(QIcon(iconPath+"/pre.svg"));
     _nxt_button.setIcon(QIcon(iconPath+"/next.svg"));
diff --git a/DSView/pv/dock/triggerdock.cpp b/DSView/pv/dock/triggerdock.cpp
index 6c727e85..e38ea7dc 100755
--- a/DSView/pv/dock/triggerdock.cpp
+++ b/DSView/pv/dock/triggerdock.cpp
@@ -160,7 +160,7 @@ void TriggerDock::retranslateUi()
 
 void TriggerDock::reStyle()
 {
-    //QString iconPath = ":/icons/" + qApp->property("Style").toString();
+     
 }
 
 void TriggerDock::paintEvent(QPaintEvent *)
diff --git a/DSView/pv/mainframe.cpp b/DSView/pv/mainframe.cpp
index 50759235..9beb1187 100755
--- a/DSView/pv/mainframe.cpp
+++ b/DSView/pv/mainframe.cpp
@@ -39,10 +39,13 @@
 #include <QDesktopWidget>
 #include <QDesktopServices>
 #include <QPushButton>
-#include <QMessageBox>
-#include <QApplication>
+#include <QMessageBox> 
 #include <QScreen>
+#include <QApplication>
+
 #include "dsvdef.h"
+#include "config/appconfig.h"
+#include "../ui/msgbox.h"
 
 #include <algorithm>
 
@@ -132,6 +135,7 @@ MainFrame::MainFrame(DeviceManager &device_manager,
 
     connect(&_timer, SIGNAL(timeout()), this, SLOT(unfreezing()));
     //readSettings();
+  
 }
 
 void MainFrame::changeEvent(QEvent* event)
@@ -364,34 +368,20 @@ bool MainFrame::eventFilter(QObject *object, QEvent *event)
 }
 
 void MainFrame::writeSettings()
-{
-    QSettings settings(QApplication::organizationName(), QApplication::applicationName());
-
-    settings.beginGroup("MainFrame");
-    settings.setValue("style", qApp->property("Style").toString());
-    settings.setValue("language", qApp->property("Language").toInt());
-    settings.setValue("geometry", saveGeometry());
-    settings.setValue("isMax", isMaximized());
-    settings.endGroup();
+{  
+    AppConfig &app = AppConfig::Instance();
+    app._frameOptions.isMax = isMaximized();
+    app._frameOptions.geometry = saveGeometry();
+    app.SaveFrame(); 
 }
 
 void MainFrame::readSettings()
 {
-    QSettings settings(QApplication::organizationName(), QApplication::applicationName());
+    AppConfig &app = AppConfig::Instance(); 
+   
+    _mainWindow->switchLanguage(app._frameOptions.language);
 
-    settings.beginGroup("MainFrame");
-    bool isMax = settings.value("isMax", false).toBool();
-    const QByteArray geometry = settings.value("geometry", QByteArray()).toByteArray();
-    // defaut language
-    if (settings.contains("language")) {
-        _mainWindow->switchLanguage(settings.value("language").toInt());
-    } else {
-        QLocale locale;
-        _mainWindow->switchLanguage(locale.language());
-    }
-    settings.endGroup();
-
-    if (geometry.isEmpty()) {
+    if (app._frameOptions.geometry.isEmpty()) {
         QScreen *screen=QGuiApplication::primaryScreen ();
         const QRect availableGeometry = screen->availableGeometry();
         resize(availableGeometry.width() / 2, availableGeometry.height() / 1.5);
@@ -399,12 +389,20 @@ void MainFrame::readSettings()
         const int origY = std::max(0, (availableGeometry.height() - height()) / 2);
         move(origX, origY);
     } else {
-        restoreGeometry(geometry);
+        try
+        {            
+         QByteArray ge = app._frameOptions.geometry;
+         restoreGeometry(ge);
+        }
+        catch(...)
+        {
+             MsgBox::Show(NULL, "restore frame status error!");
+        } 
     }
 
     // restore dockwidgets
     _mainWindow->restore_dock();
-    _titleBar->setRestoreButton(isMax);
+    _titleBar->setRestoreButton(app._frameOptions.isMax);
 }
 
 void MainFrame::setTaskbarProgress(int progress)
@@ -414,14 +412,15 @@ void MainFrame::setTaskbarProgress(int progress)
 
 void MainFrame::show_doc()
 {
-    const QString DOC_KEY("ShowDocuments");
-    QSettings settings(QApplication::organizationName(), QApplication::applicationName());
-    if (!settings.contains(DOC_KEY)) {
+     AppConfig &app = AppConfig::Instance(); 
+     int lan = app._frameOptions.language;
+      
+    if (app._userHistory.showDocuments) {
         dialogs::DSDialog dlg(this, true);
         dlg.setTitle(tr("Document"));
 
         QLabel tipsLabel;
-        tipsLabel.setPixmap(QPixmap(":/icons/showDoc"+QString::number(_mainWindow->language())+".png"));
+        tipsLabel.setPixmap(QPixmap(":/icons/showDoc"+QString::number(lan)+".png"));
         QMessageBox msg;
         msg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);
         msg.setContentsMargins(0, 0, 0, 0);
@@ -441,8 +440,10 @@ void MainFrame::show_doc()
         if (msg.clickedButton() == openButton) {
             _mainWindow->openDoc();
         }
-        if (msg.clickedButton() == noMoreButton)
-              settings.setValue(DOC_KEY, false);
+        if (msg.clickedButton() == noMoreButton){
+            app._userHistory.showDocuments = false;
+            app.SaveHistory();
+        }   
     }
 }
 
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index 70828a2a..0e6294fe 100755
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -21,17 +21,16 @@
  */
 
 
-#ifdef ENABLE_DECODE
+
 #include <libsigrokdecode4DSL/libsigrokdecode.h>
 #include "dock/protocoldock.h"
-#endif
+
 
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
 #include <boost/shared_ptr.hpp>
 
 #include <QAction>
-#include <QApplication>
 #include <QButtonGroup>
 #include <QFileDialog>
 #include <QMessageBox>
@@ -48,6 +47,7 @@
 #include <QEvent>
 #include <QtGlobal>
 #include <QScreen>
+#include <QApplication>
 
 #include "mainwindow.h"
 
@@ -91,6 +91,7 @@
 #include <list>
 #include <libusb.h>
 #include "../ui/msgbox.h"
+#include "config/appconfig.h"
 
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
@@ -174,7 +175,7 @@ void MainWindow::setup_ui()
     addToolBar(_logo_bar);
 
     // Setup the dockWidget
-#ifdef ENABLE_DECODE
+
     // protocol dock
     _protocol_dock=new QDockWidget(tr("Protocol"),this);
     _protocol_dock->setObjectName("protocol_dock");
@@ -186,7 +187,7 @@ void MainWindow::setup_ui()
     _protocol_dock->setWidget(_protocol_widget);
     qDebug() << "Protocol decoder enabled!\n";
  
-#endif
+
     // measure dock
     _measure_dock=new QDockWidget(tr("Measurement"),this);
     _measure_dock->setObjectName("measure_dock");
@@ -206,9 +207,9 @@ void MainWindow::setup_ui()
     _search_widget = new dock::SearchDock(_search_dock, *_view, _session);
     _search_dock->setWidget(_search_widget);
 
-#ifdef ENABLE_DECODE
+
     addDockWidget(Qt::RightDockWidgetArea,_protocol_dock);
-#endif
+
     addDockWidget(Qt::RightDockWidgetArea,_trigger_dock);
     addDockWidget(Qt::RightDockWidgetArea,_dso_trigger_dock);
     addDockWidget(Qt::RightDockWidgetArea, _measure_dock);
@@ -228,9 +229,9 @@ void MainWindow::setup_ui()
     _logo_bar->installEventFilter(this);
     _dso_trigger_dock->installEventFilter(this);
     _trigger_dock->installEventFilter(this);
-#ifdef ENABLE_DECODE
+
     _protocol_dock->installEventFilter(this);
-#endif
+
     _measure_dock->installEventFilter(this);
     _search_dock->installEventFilter(this);
 
@@ -239,13 +240,10 @@ void MainWindow::setup_ui()
                                             QString(tr("Set Default Device failed")), _1));
 
     // defaut language
-    QSettings settings(QApplication::organizationName(), QApplication::applicationName());
-    QLocale locale;
-    settings.beginGroup("MainFrame");
-    switchLanguage(settings.value("language", locale.language()).toInt());
-    switchTheme(settings.value("style", "dark").toString());
-    settings.endGroup();
-
+    AppConfig &app = AppConfig::Instance();
+    switchLanguage(app._frameOptions.language);
+    switchTheme(app._frameOptions.style);
+  
     // UI initial
     _measure_widget->add_dist_measure();
 
@@ -288,9 +286,9 @@ void MainWindow::setup_ui()
     connect(_logo_bar, SIGNAL(setLanguage(int)), this, SLOT(switchLanguage(int)));
     connect(_logo_bar, SIGNAL(openDoc()), this, SLOT(openDoc()));
 
-#ifdef ENABLE_DECODE
+
     connect(_protocol_widget, SIGNAL(protocol_updated()), _view, SLOT(signals_changed()));
-#endif
+
 
     connect(_sampling_bar, SIGNAL(device_selected()), this, SLOT(update_device_list()));
     connect(_sampling_bar, SIGNAL(device_updated()), this, SLOT(reload()));
@@ -329,21 +327,23 @@ void MainWindow::update_device_list()
     if (_msg)
         _msg->close();
 
-    switchLanguage(_language);
+    AppConfig &app = AppConfig::Instance(); 
+
+    switchLanguage(app._frameOptions.language);
     _session.stop_capture();
     _view->reload();
     _trigger_widget->device_updated();
-#ifdef ENABLE_DECODE
+
     _protocol_widget->del_all_protocol();
-#endif
+
     _trig_bar->reload();
 
-    shared_ptr<pv::device::DevInst> selected_device = _session.get_device();
+    boost::shared_ptr<pv::device::DevInst> selected_device = _session.get_device();
     _device_manager.add_device(selected_device);
     _session.init_signals();
     _sampling_bar->set_device_list(_device_manager.devices(), selected_device);
 
-    shared_ptr<pv::device::File> file_dev;
+    boost::shared_ptr<pv::device::File> file_dev;
     if((file_dev = dynamic_pointer_cast<pv::device::File>(selected_device))) {
         // check version
         if (selected_device->dev_inst()->mode == LOGIC) {
@@ -360,11 +360,11 @@ void MainWindow::update_device_list()
             }
         }
 
-        #ifdef ENABLE_DECODE
+  
         // load decoders
         StoreSession ss(_session);
         ss.load_decoders(_protocol_widget, file_dev->get_decoders());
-        #endif
+    
 
         // load session
         load_session_json(file_dev->get_session(), true);
@@ -386,7 +386,7 @@ void MainWindow::update_device_list()
         #endif
         if (dir.exists()) {
             QString str = dir.absolutePath() + "/";
-            QString lang_name = ".ses" + QString::number(_language);
+            QString lang_name = ".ses" + QString::number(app._frameOptions.language);
             QString ses_name = str +
                                selected_device->name() +
                                QString::number(selected_device->dev_inst()->mode) +
@@ -712,11 +712,14 @@ void MainWindow::session_save()
     #else
     QString path = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
     #endif
+
+     AppConfig &app = AppConfig::Instance();
+
     if(dir.mkpath(path)) {
         dir.cd(path);
         QString driver_name = _session.get_device()->name();
         QString mode_name = QString::number(_session.get_device()->dev_inst()->mode);
-        QString lang_name = ".ses" + QString::number(_language);
+        QString lang_name = ".ses" + QString::number(app._frameOptions.language);
         QString file_name = dir.absolutePath() + "/" +
                             driver_name + mode_name +
                             lang_name + ".dsc";
@@ -725,9 +728,9 @@ void MainWindow::session_save()
             store_session(file_name);
         }
     }
-
-    QSettings settings(QApplication::organizationName(), QApplication::applicationName());
-    settings.setValue("windowState", saveState());
+ 
+    app._frameOptions.windowState = saveState();
+    app.SaveFrame(); 
 }
 
 void MainWindow::closeEvent(QCloseEvent *event)
@@ -739,9 +742,9 @@ void MainWindow::closeEvent(QCloseEvent *event)
 
 void MainWindow::on_protocol(bool visible)
 {
-#ifdef ENABLE_DECODE
+
     _protocol_dock->setVisible(visible);
-#endif
+
 }
 
 void MainWindow::on_trigger(bool visible)
@@ -761,8 +764,8 @@ void MainWindow::on_trigger(bool visible)
 void MainWindow::commit_trigger(bool instant)
 {
     int i = 0;
-    const QString TRIG_KEY("WarnofMultiTrig");
-    QSettings settings(QApplication::organizationName(), QApplication::applicationName());
+    
+     AppConfig &app = AppConfig::Instance();  
 
     ds_trigger_init();
 
@@ -781,8 +784,7 @@ void MainWindow::commit_trigger(bool instant)
                     i++;
             }
         }
-        if (!settings.contains(TRIG_KEY) &&
-            i > 1) {
+        if (app._appOptions.warnofMultiTrig && i > 1) {
             dialogs::DSMessageBox msg(this);
             msg.mBox()->setText(tr("Trigger"));
             msg.mBox()->setInformativeText(tr("Trigger setted on multiple channels! "
@@ -806,7 +808,10 @@ void MainWindow::commit_trigger(bool instant)
                 }
             }
             if (msg.mBox()->clickedButton() == noMoreButton)
-                  settings.setValue(TRIG_KEY, false);
+            {
+                app._appOptions.warnofMultiTrig  = false;
+                app.SaveApp();                
+            }
         }
     }
 }
@@ -824,9 +829,8 @@ void MainWindow::on_search(bool visible)
 
 void MainWindow::on_screenShot()
 {
-    const QString DIR_KEY("ScreenShotPath");
-    QSettings settings(QApplication::organizationName(), QApplication::applicationName());
-    QString default_name = settings.value(DIR_KEY).toString() + "/DSView" + QDateTime::currentDateTime().toString("-yyMMdd-hhmmss");
+    AppConfig &app = AppConfig::Instance();     
+    QString default_name = app._userHistory.screenShotPath + "/DSView" + QDateTime::currentDateTime().toString("-yyMMdd-hhmmss");
     QPixmap pixmap;
     QScreen *screen = QGuiApplication::primaryScreen();
     QDesktopWidget *desktop = QApplication::desktop();
@@ -838,10 +842,16 @@ void MainWindow::on_screenShot()
                        tr("Save As"), default_name,
                        tr("%1 Files (*.%2);;All Files (*)")
                        .arg(format.toUpper()).arg(format));
-    if (!fileName.isEmpty()) {
-        QDir CurrentDir;
-        settings.setValue(DIR_KEY, CurrentDir.filePath(fileName));
+
+    if (!fileName.isEmpty()) { 
         pixmap.save(fileName, format.toLatin1());
+ 
+        fileName = GetDirectoryName(fileName);
+
+        if (app._userHistory.screenShotPath != fileName){
+            app._userHistory.screenShotPath = fileName;
+            app.SaveHistory();            
+        }
     }
 }
 
@@ -915,6 +925,8 @@ bool MainWindow::load_session_json(QJsonDocument json, bool file_dev)
         return false;
     }
 
+    AppConfig &app = AppConfig::Instance(); 
+
     // check language
     if (sessionObj.contains("Language")) {
         switchLanguage(sessionObj["Language"].toInt());
@@ -922,7 +934,7 @@ bool MainWindow::load_session_json(QJsonDocument json, bool file_dev)
         bool language_matched = _session.get_device()->set_config(NULL, NULL, SR_CONF_OPERATION_MODE,
                                           g_variant_new_string(sessionObj["Operation Mode"].toString().toUtf8()));
         if (!language_matched) {
-            if (_language != QLocale::Chinese)
+            if (app._frameOptions.language != QLocale::Chinese)
                 switchLanguage(QLocale::Chinese);
             else
                 switchLanguage(QLocale::English);
@@ -930,11 +942,11 @@ bool MainWindow::load_session_json(QJsonDocument json, bool file_dev)
     }
 
     // clear decoders
-    #ifdef ENABLE_DECODE
+  
     if (sdi->mode == LOGIC) {
         _protocol_widget->del_all_protocol();
     }
-    #endif
+ 
 
     // load device settings
     GVariant *gvar_opts;
@@ -1075,13 +1087,13 @@ bool MainWindow::load_session_json(QJsonDocument json, bool file_dev)
     }
     on_trigger(false);
 
-    #ifdef ENABLE_DECODE
+    
     // load decoders
     if (sessionObj.contains("decoder")) {
         StoreSession ss(_session);
         ss.load_decoders(_protocol_widget, sessionObj["decoder"].toArray());
     }
-    #endif
+
 
     // load measure
     if (sessionObj.contains("measure")) {
@@ -1103,6 +1115,8 @@ bool MainWindow::store_session(QString name)
     outStream.setCodec("UTF-8");
     //outStream.setGenerateByteOrderMark(true); // UTF-8 without BOM
 
+    AppConfig &app = AppConfig::Instance(); 
+
     GVariant *gvar_opts;
     GVariant *gvar;
     gsize num_opts;
@@ -1112,7 +1126,7 @@ bool MainWindow::store_session(QString name)
     sessionVar["Version"]= QJsonValue::fromVariant(Session_Version);
     sessionVar["Device"] = QJsonValue::fromVariant(sdi->driver->name);
     sessionVar["DeviceMode"] = QJsonValue::fromVariant(sdi->mode);
-    sessionVar["Language"] = QJsonValue::fromVariant(_language);
+    sessionVar["Language"] = QJsonValue::fromVariant(app._frameOptions.language);
 
     if ((sr_config_list(sdi->driver, sdi, NULL, SR_CONF_DEVICE_SESSIONS, &gvar_opts) != SR_OK))
         return false;   /* Driver supports no device instance sessions. */
@@ -1180,10 +1194,10 @@ bool MainWindow::store_session(QString name)
         sessionVar["trigger"] = _trigger_widget->get_session();
     }
 
-    #ifdef ENABLE_DECODE
+   
     StoreSession ss(_session);
     sessionVar["decoder"] = ss.json_decoders();
-    #endif
+
 
     if (_session.get_device()->dev_inst()->mode == DSO) {
         sessionVar["measure"] = _view->get_viewstatus()->get_session();
@@ -1198,9 +1212,20 @@ bool MainWindow::store_session(QString name)
 
 void MainWindow::restore_dock()
 {
-    // default dockwidget size
-    QSettings settings(QApplication::organizationName(), QApplication::applicationName());
-    restoreState(settings.value("windowState").toByteArray());
+    // default dockwidget size 
+    AppConfig &app = AppConfig::Instance(); 
+    QByteArray st = app._frameOptions.windowState;
+    if (!st.isEmpty()){
+        try
+        {
+            restoreState(st);     
+        }        
+        catch(...)
+        { 
+            MsgBox::Show(NULL, "restore window status error!");
+        } 
+    } 
+
     if (_session.get_device()->dev_inst()->mode != DSO) {
         _dso_trigger_dock->setVisible(false);
         _trig_bar->update_trig_btn(_trigger_dock->isVisible());
@@ -1209,9 +1234,9 @@ void MainWindow::restore_dock()
         _trig_bar->update_trig_btn(_dso_trigger_dock->isVisible());
     }
     if (_session.get_device()->dev_inst()->mode != LOGIC) {
-#ifdef ENABLE_DECODE
+
         on_protocol(false);
-#endif
+
     }
     _trig_bar->update_protocol_btn(_protocol_dock->isVisible());
     _trig_bar->update_measure_btn(_measure_dock->isVisible());
@@ -1223,7 +1248,7 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event)
     (void) object;
 
     if ( event->type() == QEvent::KeyPress ) {
-        const vector< shared_ptr<view::Signal> > sigs(_session.get_signals());
+        const vector< boost::shared_ptr<view::Signal> > sigs(_session.get_signals());
         QKeyEvent *ke = (QKeyEvent *) event;
         switch(ke->key()) {
         case Qt::Key_S:
@@ -1238,11 +1263,11 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event)
             else
                 on_trigger(!_trigger_dock->isVisible());
             break;
-#ifdef ENABLE_DECODE
+
         case Qt::Key_D:
             on_protocol(!_protocol_dock->isVisible());
             break;
-#endif
+
         case Qt::Key_M:
             on_measure(!_measure_dock->isVisible());
             break;
@@ -1268,8 +1293,8 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event)
             _view->zoom(-1);
             break;
         case Qt::Key_0:
-            BOOST_FOREACH(const shared_ptr<view::Signal> s, sigs) {
-                shared_ptr<view::DsoSignal> dsoSig;
+            BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, sigs) {
+                boost::shared_ptr<view::DsoSignal> dsoSig;
                 if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
                     if (dsoSig->get_index() == 0)
                         dsoSig->set_vDialActive(!dsoSig->get_vDialActive());
@@ -1281,8 +1306,8 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event)
             update();
             break;
         case Qt::Key_1:
-            BOOST_FOREACH(const shared_ptr<view::Signal> s, sigs) {
-                shared_ptr<view::DsoSignal> dsoSig;
+            BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, sigs) {
+                boost::shared_ptr<view::DsoSignal> dsoSig;
                 if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
                     if (dsoSig->get_index() == 1)
                         dsoSig->set_vDialActive(!dsoSig->get_vDialActive());
@@ -1294,8 +1319,8 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event)
             update();
             break;
         case Qt::Key_Up:
-            BOOST_FOREACH(const shared_ptr<view::Signal> s, sigs) {
-                shared_ptr<view::DsoSignal> dsoSig;
+            BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, sigs) {
+                boost::shared_ptr<view::DsoSignal> dsoSig;
                 if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
                     if (dsoSig->get_vDialActive()) {
                         dsoSig->go_vDialNext(true);
@@ -1306,8 +1331,8 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event)
             }
             break;
         case Qt::Key_Down:
-            BOOST_FOREACH(const shared_ptr<view::Signal> s, sigs) {
-                shared_ptr<view::DsoSignal> dsoSig;
+            BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, sigs) {
+                boost::shared_ptr<view::DsoSignal> dsoSig;
                 if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
                     if (dsoSig->get_vDialActive()) {
                         dsoSig->go_vDialPre(true);
@@ -1324,46 +1349,51 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event)
     }
     return false;
 }
-
-int MainWindow::language() const
-{
-    return _language;
-}
-
+ 
 void MainWindow::switchLanguage(int language)
 {
-    shared_ptr<pv::device::DevInst> dev = _session.get_device();
+    boost::shared_ptr<pv::device::DevInst> dev = _session.get_device();
     dev->set_config(NULL, NULL, SR_CONF_LANGUAGE, g_variant_new_int16(language));
+    AppConfig &app = AppConfig::Instance();
 
-    if (_language != language) {
-        _language = language;
-        if (_language != QLocale::English) {
-            _qtTrans.load(":/qt_"+QString::number(_language));
-            qApp->installTranslator(&_qtTrans);
-            _myTrans.load(":/my_"+QString::number(_language));
-            qApp->installTranslator(&_myTrans);
-            retranslateUi();
-        } else {
-            qApp->removeTranslator(&_qtTrans);
-            qApp->removeTranslator(&_myTrans);
-            retranslateUi();
-        }
-        qApp->setProperty("Language", _language);
+    if (app._frameOptions.language != language)
+    {
+        app._frameOptions.language = language;
+        app.SaveFrame();
+    }
+
+    if (language != QLocale::English)
+    {
+        _qtTrans.load(":/qt_" + QString::number(language));
+        qApp->installTranslator(&_qtTrans);
+        _myTrans.load(":/my_" + QString::number(language));
+        qApp->installTranslator(&_myTrans);
+        retranslateUi();
+    }
+    else
+    {
+        qApp->removeTranslator(&_qtTrans);
+        qApp->removeTranslator(&_myTrans);
+        retranslateUi();
     }
 }
 
 void MainWindow::switchTheme(QString style)
 {
-    if (_style != style) {
-        _style = style;
-        qApp->setProperty("Style", _style);
-        QString qssRes = ":/"+_style+".qss";
-        QFile qss(qssRes);
-        qss.open(QFile::ReadOnly | QFile::Text);
-        qApp->setStyleSheet(qss.readAll());
-        qss.close();
-        _session.data_updated();
+    AppConfig &app = AppConfig::Instance();
+
+    if (app._frameOptions.style != style)
+    {
+        app._frameOptions.style = style;
+        app.SaveFrame();
     }
+
+    QString qssRes = ":/" + style + ".qss";
+    QFile qss(qssRes);
+    qss.open(QFile::ReadOnly | QFile::Text);
+    qApp->setStyleSheet(qss.readAll());
+    qss.close();
+    _session.data_updated();
 }
 
 void MainWindow::openDoc()
@@ -1374,8 +1404,10 @@ void MainWindow::openDoc()
     QDir dir(DS_RES_PATH);
     dir.cdUp();
     #endif
+    AppConfig &app = AppConfig::Instance(); 
+    int lan = app._frameOptions.language;
     QDesktopServices::openUrl(
-                QUrl("file:///"+dir.absolutePath() + "/ug"+QString::number(_language)+".pdf"));
+                QUrl("file:///"+dir.absolutePath() + "/ug"+QString::number(lan)+".pdf"));
 }
 
 } // namespace pv
diff --git a/DSView/pv/mainwindow.h b/DSView/pv/mainwindow.h
index 0069b1e5..59fd8d3b 100755
--- a/DSView/pv/mainwindow.h
+++ b/DSView/pv/mainwindow.h
@@ -88,7 +88,7 @@ private:
 
 public slots:
     void session_save();
-    int language() const;
+ 
     void openDoc();
 
     void switchLanguage(int language);
@@ -190,10 +190,10 @@ private:
     toolbars::FileBar *_file_bar;
     toolbars::LogoBar *_logo_bar; //help button, on top right
 
-#ifdef ENABLE_DECODE
+
     QDockWidget *_protocol_dock;
     dock::ProtocolDock *_protocol_widget;
-#endif
+
 
     QDockWidget *_trigger_dock;
     QDockWidget *_dso_trigger_dock;
@@ -204,8 +204,6 @@ private:
     QDockWidget *_search_dock;
     dock::SearchDock * _search_widget;
 
-    int _language;
-    QString _style;
     QTranslator _qtTrans;
     QTranslator _myTrans;
 };
diff --git a/DSView/pv/sigsession.cpp b/DSView/pv/sigsession.cpp
index 1912088f..7ceed522 100755
--- a/DSView/pv/sigsession.cpp
+++ b/DSView/pv/sigsession.cpp
@@ -20,9 +20,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifdef ENABLE_DECODE
+
 #include <libsigrokdecode4DSL/libsigrokdecode.h>
-#endif
+
 
 #include "sigsession.h"
 #include "mainwindow.h"
@@ -110,9 +110,9 @@ SigSession::SigSession(DeviceManager &device_manager) :
     _noData_cnt = 0;
     _data_lock = false;
     _data_updated = false;
-    #ifdef ENABLE_DECODE
+
     _decoder_model = new pv::data::DecoderModel(this);
-    #endif
+
     _lissajous_trace = NULL;
     _math_trace = NULL;
     _saving = false;
@@ -173,9 +173,9 @@ void SigSession::set_device(boost::shared_ptr<device::DevInst> dev_inst)
     }
 
     _dev_inst = dev_inst;
-#ifdef ENABLE_DECODE
+
     _decode_traces.clear();
-#endif
+
     _group_traces.clear();
 
     if (_dev_inst) {
@@ -324,11 +324,11 @@ void SigSession::set_cur_snap_samplerate(uint64_t samplerate)
     if (_group_data)
         _group_data->set_samplerate(_cur_snap_samplerate);
 
-#ifdef ENABLE_DECODE
+
     // DecoderStack
     BOOST_FOREACH(const boost::shared_ptr<view::DecodeTrace> d, _decode_traces)
         d->decoder()->set_samplerate(_cur_snap_samplerate);
-#endif
+
     // Math
     if (_math_trace && _math_trace->enabled())
         _math_trace->get_math_stack()->set_samplerate(_dev_inst->get_sample_rate());
@@ -415,7 +415,7 @@ void SigSession::container_init()
     if (_math_trace)
         _math_trace->get_math_stack()->init();
 
-#ifdef ENABLE_DECODE
+
     // DecoderModel
     //pv::data::DecoderModel *decoder_model = get_decoder_model();
     //decoder_model->setDecoderStack(NULL);
@@ -425,7 +425,7 @@ void SigSession::container_init()
         assert(d);
         d->decoder()->init();
     }
-#endif
+
 }
 
 void SigSession::start_capture(bool instant,
@@ -489,13 +489,13 @@ void SigSession::start_capture(bool instant,
 void SigSession::stop_capture()
 {
     data_unlock();
-#ifdef ENABLE_DECODE
+
     for (vector< boost::shared_ptr<view::DecodeTrace> >::iterator i =
         _decode_traces.begin();
         i != _decode_traces.end();
         i++)
         (*i)->decoder()->stop_decode();
-#endif
+
     if (get_capture_state() != Running)
 		return;
 
@@ -707,10 +707,10 @@ void SigSession::init_signals()
     if (_group_data)
         _group_data->clear();
 
-#ifdef ENABLE_DECODE
+
     // Clear the decode traces
     _decode_traces.clear();
-#endif
+
 
     // Detect what data types we will receive
     if(_dev_inst) {
@@ -865,13 +865,13 @@ void SigSession::refresh(int holdtime)
     if (_logic_data) {
         _logic_data->init();
         //_cur_logic_snapshot.reset();
-#ifdef ENABLE_DECODE
+
         BOOST_FOREACH(const boost::shared_ptr<view::DecodeTrace> d, _decode_traces)
         {
             assert(d);
             d->decoder()->init();
         }
-#endif
+
     }
     if (_dso_data) {
         _dso_data->init();
@@ -1143,6 +1143,7 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
 
     if (_data_lock && packet->type != SR_DF_END)
         return;
+        
     if (packet->type != SR_DF_END &&
         packet->status != SR_PKT_OK) {
         _error = Pkt_data_err;
@@ -1207,10 +1208,10 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
             _cur_logic_snapshot->capture_ended();
             _cur_dso_snapshot->capture_ended();
             _cur_analog_snapshot->capture_ended();
-#ifdef ENABLE_DECODE
+
             BOOST_FOREACH(const boost::shared_ptr<view::DecodeTrace> d, _decode_traces)
                 d->frame_ended();
-#endif
+
 		}
 
         if (packet->status != SR_PKT_OK) {
@@ -1366,7 +1367,7 @@ uint16_t SigSession::get_ch_num(int type)
     return num_channels;
 }
 
-#ifdef ENABLE_DECODE
+
 bool SigSession::add_decoder(srd_decoder *const dec, bool silent, DecoderStatus *dstatus)
 { 
     bool ret = false;
@@ -1506,7 +1507,7 @@ pv::data::DecoderModel* SigSession::get_decoder_model() const
 {
     return _decoder_model;
 }
-#endif
+
 
 void SigSession::spectrum_rebuild()
 {
diff --git a/DSView/pv/sigsession.h b/DSView/pv/sigsession.h
index c895c07e..6d66c0b5 100755
--- a/DSView/pv/sigsession.h
+++ b/DSView/pv/sigsession.h
@@ -179,7 +179,7 @@ public:
     std::vector< boost::shared_ptr<view::GroupSignal> >
         get_group_signals();
 
-#ifdef ENABLE_DECODE
+
     bool add_decoder(srd_decoder *const dec, bool silent, DecoderStatus *dstatus);
 
     std::vector< boost::shared_ptr<view::DecodeTrace> >
@@ -194,7 +194,7 @@ public:
     void rst_decoder(view::DecodeTrace *signal);
 
     pv::data::DecoderModel* get_decoder_model() const;
-#endif
+
 
     std::vector< boost::shared_ptr<view::SpectrumTrace> >
         get_spectrum_traces();
@@ -323,10 +323,10 @@ private:
     //mutable boost::mutex _signals_mutex;
 	std::vector< boost::shared_ptr<view::Signal> > _signals;
     std::vector< boost::shared_ptr<view::GroupSignal> > _group_traces;
-#ifdef ENABLE_DECODE
+
     std::vector< boost::shared_ptr<view::DecodeTrace> > _decode_traces;
     pv::data::DecoderModel *_decoder_model;
-#endif
+
     std::vector< boost::shared_ptr<view::SpectrumTrace> > _spectrum_traces;
     boost::shared_ptr<view::LissajousTrace> _lissajous_trace;
     boost::shared_ptr<view::MathTrace> _math_trace;
diff --git a/DSView/pv/storesession.cpp b/DSView/pv/storesession.cpp
index ca8c51d2..5c9c7eef 100755
--- a/DSView/pv/storesession.cpp
+++ b/DSView/pv/storesession.cpp
@@ -41,13 +41,13 @@
 #include <pv/dock/protocoldock.h>
 
 #include <boost/foreach.hpp>
-
-#include <QApplication>
+ 
 #include <QFileDialog>
 
+#include "config/appconfig.h"
+
 using boost::dynamic_pointer_cast;
 using boost::mutex;
-using boost::shared_ptr;
 using boost::thread;
 using boost::lock_guard;
 using std::deque;
@@ -161,10 +161,20 @@ bool StoreSession::save_start(QString session_file)
         _error = tr("No data to save.");
         return false;
     }
+ 
+
+    //root dir 
+    QString default_name;
+
+    AppConfig &app = AppConfig::Instance(); 
+    if (app._userHistory.saveDir != "")
+    {
+        default_name = app._userHistory.saveDir + "/"  + _session.get_device()->name() + "-";
+    } 
+    else{
+        default_name =  _session.get_device()->name() + "-";
+    } 
 
-    const QString DIR_KEY("SavePath");
-    QSettings settings(QApplication::organizationName(), QApplication::applicationName());
-    QString default_name = settings.value(DIR_KEY).toString() + "/" + _session.get_device()->name() + "-";
     for (const GSList *l = _session.get_device()->get_dev_mode_list();
          l; l = l->next) {
         const sr_dev_mode *mode = (const sr_dev_mode *)l->data;
@@ -173,26 +183,32 @@ bool StoreSession::save_start(QString session_file)
             break;
         }
     }
+
     default_name += _session.get_session_time().toString("-yyMMdd-hhmmss");
 
     // Show the dialog
-    _file_name = QFileDialog::getSaveFileName(
-                    NULL, tr("Save File"), default_name,
+    QString svFilePath = QFileDialog::getSaveFileName(
+                    NULL, 
+                    tr("Save File"), 
+                    default_name,
                     tr("DSView Data (*.dsl)"));
 
-    if (!_file_name.isEmpty()) {
-        QFileInfo f(_file_name);
+    if (!svFilePath.isEmpty()) {
+        QFileInfo f(svFilePath);
         if(f.suffix().compare("dsl"))
-            _file_name.append(tr(".dsl"));
-        QDir CurrentDir;
-        settings.setValue(DIR_KEY, CurrentDir.filePath(_file_name));
+            svFilePath.append(tr(".dsl"));
+
+        _file_name =  svFilePath;  
+        svFilePath = GetDirectoryName(svFilePath);
+
+        if (svFilePath != app._userHistory.saveDir){
+           app._userHistory.saveDir = svFilePath; 
+            app.SaveHistory();
+        }     
 
         QString meta_file = meta_gen(snapshot);
-    #ifdef ENABLE_DECODE
+   
         QString decoders_file = decoders_gen();
-    #else
-        QString decoders_file = NULL;
-    #endif
 
        /*
         if (meta_file == NULL) {
@@ -233,15 +249,15 @@ bool StoreSession::save_start(QString session_file)
     return false;
 }
 
-void StoreSession::save_proc(shared_ptr<data::Snapshot> snapshot)
+void StoreSession::save_proc(boost::shared_ptr<data::Snapshot> snapshot)
 {
 	assert(snapshot);
 
     int ret = SR_ERR;
     int num = 0;
-    shared_ptr<data::LogicSnapshot> logic_snapshot;
-    shared_ptr<data::AnalogSnapshot> analog_snapshot;
-    shared_ptr<data::DsoSnapshot> dso_snapshot;
+    boost::shared_ptr<data::LogicSnapshot> logic_snapshot;
+    boost::shared_ptr<data::AnalogSnapshot> analog_snapshot;
+    boost::shared_ptr<data::DsoSnapshot> dso_snapshot;
 
     if ((logic_snapshot = boost::dynamic_pointer_cast<data::LogicSnapshot>(snapshot))) {
         uint16_t to_save_probes = 0;
@@ -424,7 +440,7 @@ QString StoreSession::meta_gen(boost::shared_ptr<data::Snapshot> snapshot)
         fprintf(meta, "total blocks = %d\n", snapshot->get_block_num());
     }
 
-    shared_ptr<data::LogicSnapshot> logic_snapshot;
+    boost::shared_ptr<data::LogicSnapshot> logic_snapshot;
     if ((logic_snapshot = dynamic_pointer_cast<data::LogicSnapshot>(snapshot))) {
         uint16_t to_save_probes = 0;
         for (l = sdi->channels; l; l = l->next) {
@@ -479,7 +495,7 @@ QString StoreSession::meta_gen(boost::shared_ptr<data::Snapshot> snapshot)
     } else if (sdi->mode == LOGIC) {
         fprintf(meta, "trigger time = %lld\n", _session.get_session_time().toMSecsSinceEpoch());
     } else if (sdi->mode == ANALOG) {
-        shared_ptr<data::AnalogSnapshot> analog_snapshot;
+        boost::shared_ptr<data::AnalogSnapshot> analog_snapshot;
         if ((analog_snapshot = dynamic_pointer_cast<data::AnalogSnapshot>(snapshot))) {
             uint8_t tmp_u8 = analog_snapshot->get_unit_bytes();
             fprintf(meta, "bits = %d\n", tmp_u8*8);
@@ -574,7 +590,8 @@ bool StoreSession::export_start()
     std::set<int> type_set;
     BOOST_FOREACH(const boost::shared_ptr<view::Signal> sig, _session.get_signals()) {
         assert(sig);
-        type_set.insert(sig->get_type());
+        int _tp = sig->get_type();
+        type_set.insert(_tp);
     }
 
     if (type_set.size() > 1) {
@@ -594,9 +611,16 @@ bool StoreSession::export_start()
         return false;
     }
 
-    const QString DIR_KEY("ExportPath");
-    QSettings settings(QApplication::organizationName(), QApplication::applicationName());
-    QString default_name = settings.value(DIR_KEY).toString() + "/" + _session.get_device()->name() + "-";
+    AppConfig &app = AppConfig::Instance(); 
+ 
+    QString default_name;
+    if (app._userHistory.exportDir != "")
+    {
+       default_name = app._userHistory.exportDir  + "/"  + _session.get_device()->name() + "-";
+    } 
+    else{
+        default_name =  _session.get_device()->name() + "-";
+    }  
 
     for (const GSList *l = _session.get_device()->get_dev_mode_list();
          l; l = l->next) {
@@ -616,17 +640,28 @@ bool StoreSession::export_start()
         if(i < supportedFormats.count() - 1)
             filter.append(";;");
     }
-    _file_name = QFileDialog::getSaveFileName(
-                NULL, tr("Export Data"), default_name,filter,&filter);
 
-    if (!_file_name.isEmpty()) {
+    QString svFilePath = QFileDialog::getSaveFileName(
+                NULL, 
+                tr("Export Data"), 
+                default_name,
+                filter,
+                &filter);
+
+    if (!svFilePath.isEmpty()) {
         QFileInfo f(_file_name);
         QStringList list = filter.split('.').last().split(')');
         _suffix = list.first();
         if(f.suffix().compare(_suffix))
-            _file_name += tr(".") + _suffix;
-        QDir CurrentDir;
-        settings.setValue(DIR_KEY, CurrentDir.filePath(_file_name));
+            svFilePath += tr(".") + _suffix;
+
+         _file_name =  svFilePath;  
+        svFilePath = GetDirectoryName(svFilePath);
+
+        if (svFilePath != app._userHistory.exportDir ){
+            app._userHistory.exportDir  = svFilePath;
+            app.SaveHistory();
+        }      
 
         const struct sr_output_module** supportedModules = sr_output_list();
         while(*supportedModules){
@@ -651,13 +686,13 @@ bool StoreSession::export_start()
     return false;
 }
 
-void StoreSession::export_proc(shared_ptr<data::Snapshot> snapshot)
+void StoreSession::export_proc(boost::shared_ptr<data::Snapshot> snapshot)
 {
     assert(snapshot);
 
-    shared_ptr<data::LogicSnapshot> logic_snapshot;
-    shared_ptr<data::AnalogSnapshot> analog_snapshot;
-    shared_ptr<data::DsoSnapshot> dso_snapshot;
+    boost::shared_ptr<data::LogicSnapshot> logic_snapshot;
+    boost::shared_ptr<data::AnalogSnapshot> analog_snapshot;
+    boost::shared_ptr<data::DsoSnapshot> dso_snapshot;
     int channel_type;
 
     if ((logic_snapshot = boost::dynamic_pointer_cast<data::LogicSnapshot>(snapshot))) {
@@ -835,7 +870,7 @@ void StoreSession::export_proc(shared_ptr<data::Snapshot> snapshot)
                 out << (char*) data_out->str;
                 g_string_free(data_out,TRUE);
             }
-            
+
             _units_stored += size;
             progress_updated();
         }
@@ -876,7 +911,7 @@ void StoreSession::export_proc(shared_ptr<data::Snapshot> snapshot)
     progress_updated();
 }
 
-#ifdef ENABLE_DECODE
+ 
 QString StoreSession::decoders_gen()
 {
     QDir dir;
@@ -1129,7 +1164,7 @@ void StoreSession::load_decoders(dock::ProtocolDock *widget, QJsonArray dec_arra
     }
 
 }
-#endif
+ 
 
 double StoreSession::get_integer(GVariant *var)
 {
diff --git a/DSView/pv/storesession.h b/DSView/pv/storesession.h
index 09dc4e3a..75dcbb2a 100755
--- a/DSView/pv/storesession.h
+++ b/DSView/pv/storesession.h
@@ -26,7 +26,7 @@
 #include <string>
 
 #include <boost/thread.hpp>
-
+#include <boost/shared_ptr.hpp>
 #include <QObject>
 
 #include <libsigrok4DSL/libsigrok.h>
@@ -75,15 +75,15 @@ private:
     void save_proc(boost::shared_ptr<pv::data::Snapshot> snapshot);
     QString meta_gen(boost::shared_ptr<data::Snapshot> snapshot);
     void export_proc(boost::shared_ptr<pv::data::Snapshot> snapshot);
-    #ifdef ENABLE_DECODE
+   
     QString decoders_gen();
-    #endif
+ 
 
 public:
-    #ifdef ENABLE_DECODE
+    
     QJsonArray json_decoders();
     void load_decoders(dock::ProtocolDock *widget, QJsonArray dec_array);
-    #endif
+ 
 
 private:
     QList<QString> getSuportedExportFormats();
diff --git a/DSView/pv/toolbars/filebar.cpp b/DSView/pv/toolbars/filebar.cpp
index ea0b47ac..14a337f7 100755
--- a/DSView/pv/toolbars/filebar.cpp
+++ b/DSView/pv/toolbars/filebar.cpp
@@ -24,12 +24,12 @@
 #include <boost/shared_ptr.hpp>
 
 #include <QMetaObject>
-#include <QFileDialog>
-#include <QApplication>
+#include <QFileDialog> 
 
 #include "filebar.h"
 #include "../device/devinst.h" 
 #include "../ui/msgbox.h"
+#include "../config/appconfig.h"
 
 #include <deque>
 
@@ -54,6 +54,7 @@ FileBar::FileBar(SigSession &session, QWidget *parent) :
     _action_default = new QAction(this);
     _action_default->setObjectName(QString::fromUtf8("actionDefault"));
   
+    //second level menu
     _menu_session = new QMenu(this);
     _menu_session->setObjectName(QString::fromUtf8("menuSession"));
     _menu_session->addAction(_action_load);
@@ -107,7 +108,7 @@ void FileBar::changeEvent(QEvent *event)
 void FileBar::retranslateUi()
 {
     _file_button.setText(tr("File"));
-    _menu_session->setTitle(tr("Con&fig..."));
+    _menu_session->setTitle(tr("Con&fig...")); //load,save session file
     _action_load->setText(tr("&Load..."));
     _action_store->setText(tr("S&tore..."));
     _action_default->setText(tr("&Default..."));
@@ -119,7 +120,7 @@ void FileBar::retranslateUi()
 
 void FileBar::reStyle()
 {
-    QString iconPath = ":/icons/" + qApp->property("Style").toString();
+    QString iconPath = GetIconPath();
 
     _action_load->setIcon(QIcon(iconPath+"/open.svg"));
     _action_store->setIcon(QIcon(iconPath+"/save.svg"));
@@ -134,15 +135,23 @@ void FileBar::reStyle()
 
 void FileBar::on_actionOpen_triggered()
 {
-    const QString DIR_KEY("OpenPath");
-    QSettings settings(QApplication::organizationName(), QApplication::applicationName());
+    //open data file
+    AppConfig &app = AppConfig::Instance(); 
+
     // Show the dialog
     const QString file_name = QFileDialog::getOpenFileName(
-        this, tr("Open File"), settings.value(DIR_KEY).toString(), tr(
-            "DSView Data (*.dsl)"));
-    if (!file_name.isEmpty()) {
-        QDir CurrentDir;
-        settings.setValue(DIR_KEY, CurrentDir.absoluteFilePath(file_name));
+        this, 
+        tr("Open File"), 
+        app._userHistory.openDir,
+        tr("DSView Data (*.dsl)"));
+
+    if (!file_name.isEmpty()) { 
+        QString fname = GetDirectoryName(file_name);
+        if (fname != app._userHistory.openDir){
+            app._userHistory.openDir = fname;
+            app.SaveHistory();
+        }
+
         load_file(file_name);
     }
 }
@@ -162,16 +171,23 @@ void FileBar::show_session_error(
 }
 
 void FileBar::on_actionLoad_triggered()
-{
-    const QString DIR_KEY("SessionLoadPath");
-    QSettings settings(QApplication::organizationName(), QApplication::applicationName());
-    // Show the dialog
+{ 
+    //load session file
+    AppConfig &app = AppConfig::Instance();      
+
     const QString file_name = QFileDialog::getOpenFileName(
-        this, tr("Open Session"), settings.value(DIR_KEY).toString(), tr(
-            "DSView Session (*.dsc)"));
+        this, 
+        tr("Open Session"), 
+        app._userHistory.sessionDir, 
+        tr("DSView Session (*.dsc)"));
+
     if (!file_name.isEmpty()) {
-        QDir CurrentDir;
-        settings.setValue(DIR_KEY, CurrentDir.absoluteFilePath(file_name));
+        QString fname = GetDirectoryName(file_name);
+        if (fname != app._userHistory.sessionDir){
+            app._userHistory.sessionDir = fname;
+            app.SaveHistory();
+        }
+         
         load_session(file_name);
     }
 }
@@ -205,17 +221,27 @@ void FileBar::on_actionDefault_triggered()
 
 void FileBar::on_actionStore_triggered()
 {
-    const QString DIR_KEY("SessionStorePath");
-    QSettings settings(QApplication::organizationName(), QApplication::applicationName());
+    //store session file
+  
+      AppConfig &app = AppConfig::Instance();  
+
     QString file_name = QFileDialog::getSaveFileName(
-                this, tr("Save Session"), settings.value(DIR_KEY).toString(),
+                this, 
+                tr("Save Session"),
+                app._userHistory.sessionDir,
                 tr("DSView Session (*.dsc)"));
+
     if (!file_name.isEmpty()) {
         QFileInfo f(file_name);
         if(f.suffix().compare("dsc"))
             file_name.append(tr(".dsc"));
-        QDir CurrentDir;
-        settings.setValue(DIR_KEY, CurrentDir.absoluteFilePath(file_name));
+
+        QString fname = GetDirectoryName(file_name);
+        if (fname != app._userHistory.sessionDir){
+            app._userHistory.sessionDir = fname;
+            app.SaveHistory();
+        }
+         
         store_session(file_name);
     }
 }
diff --git a/DSView/pv/toolbars/logobar.cpp b/DSView/pv/toolbars/logobar.cpp
index 0904c12b..8b0f8a05 100755
--- a/DSView/pv/toolbars/logobar.cpp
+++ b/DSView/pv/toolbars/logobar.cpp
@@ -23,14 +23,14 @@
 #include <boost/foreach.hpp>
 
 #include <QMetaObject>
-#include <QFileDialog>
-#include <QApplication>
+#include <QFileDialog> 
 #include <QDesktopServices>
 #include <QUrl>
 
 #include "logobar.h"
 #include "../dialogs/about.h"
 #include "../dialogs/dsmessagebox.h"
+#include "../config/appconfig.h"
 
 namespace pv {
 namespace toolbars {
@@ -116,7 +116,8 @@ void LogoBar::retranslateUi()
     _manual->setText(tr("&Manual"));
     _issue->setText(tr("&Bug Report"));
 
-    if (qApp->property("Language") == QLocale::Chinese)
+    AppConfig &app = AppConfig::Instance(); 
+    if (app._frameOptions.language == QLocale::Chinese)
         _language->setIcon(QIcon(":/icons/Chinese.svg"));
     else
         _language->setIcon(QIcon(":/icons/English.svg"));
@@ -124,7 +125,7 @@ void LogoBar::retranslateUi()
 
 void LogoBar::reStyle()
 {
-    QString iconPath = ":/icons/" + qApp->property("Style").toString();
+    QString iconPath = GetIconPath();
 
     _about->setIcon(QIcon(iconPath+"/about.svg"));
     _manual->setIcon(QIcon(iconPath+"/manual.svg"));
@@ -138,7 +139,7 @@ void LogoBar::reStyle()
 void LogoBar::dsl_connected(bool conn)
 {
     _connected = conn;
-    QString iconPath = ":/icons/" + qApp->property("Style").toString();
+    QString iconPath =  GetIconPath();
     if (_connected)
         _logo_button.setIcon(QIcon(iconPath+"/logo_color.svg"));
     else
@@ -175,7 +176,7 @@ void LogoBar::on_actionCn_triggered()
 {
     _language->setIcon(QIcon::fromTheme("file",
         QIcon(":/icons/Chinese.svg")));
-    setLanguage(QLocale::Chinese);
+    setLanguage(QLocale::Chinese);   
 }
 
 void LogoBar::on_actionAbout_triggered()
diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp
index 7a06a71d..2f3bd4fb 100755
--- a/DSView/pv/toolbars/samplingbar.cpp
+++ b/DSView/pv/toolbars/samplingbar.cpp
@@ -30,7 +30,6 @@
 #include <QDebug>
 #include <QLabel>
 #include <QAbstractItemView>
-#include <QApplication>
 
 #include "../devicemanager.h"
 #include "../device/devinst.h"
@@ -39,9 +38,9 @@
 #include "../dialogs/dsmessagebox.h"
 #include "../view/dsosignal.h"
 #include "../dialogs/interval.h"
+#include "../config/appconfig.h"
+
 
-using namespace boost;
-using boost::shared_ptr;
 using std::map;
 using std::max;
 using std::min;
@@ -149,7 +148,7 @@ void SamplingBar::changeEvent(QEvent *event)
 
 void SamplingBar::retranslateUi()
 {
-    shared_ptr<pv::device::DevInst> dev_inst = get_selected_device();
+    boost::shared_ptr<pv::device::DevInst> dev_inst = get_selected_device();
     if (dev_inst && dev_inst->dev_inst()) {
         if (dev_inst->name().contains("virtual-demo"))
             _device_type.setText(tr("Demo"));
@@ -194,7 +193,7 @@ void SamplingBar::retranslateUi()
 
 void SamplingBar::reStyle()
 {
-    shared_ptr<pv::device::DevInst> dev_inst = get_selected_device();
+    boost::shared_ptr<pv::device::DevInst> dev_inst = get_selected_device();
     if (dev_inst && dev_inst->dev_inst()) {
         if (dev_inst->name().contains("virtual-demo"))
             _device_type.setIcon(QIcon(":/icons/demo.svg"));
@@ -215,8 +214,8 @@ void SamplingBar::reStyle()
         }
     }
 
-    if (!qApp->property("Style").isNull()) {
-        QString iconPath = ":/icons/" + qApp->property("Style").toString();
+    if (true) {
+        QString iconPath = GetIconPath();
         _configure_button.setIcon(QIcon(iconPath+"/params.svg"));
         _mode_button.setIcon(_session.get_run_mode() == pv::SigSession::Single ? QIcon(iconPath+"/modes.svg") :
                                                                                  QIcon(iconPath+"/moder.svg"));
@@ -229,8 +228,8 @@ void SamplingBar::reStyle()
 }
 
 void SamplingBar::set_device_list(
-    const std::list< shared_ptr<pv::device::DevInst> > &devices,
-    shared_ptr<pv::device::DevInst> selected)
+    const std::list<boost::shared_ptr<pv::device::DevInst> > &devices,
+    boost::shared_ptr<pv::device::DevInst> selected)
 {
     int selected_index = -1;
 
@@ -241,7 +240,7 @@ void SamplingBar::set_device_list(
     _device_selector.clear();
     _device_selector_map.clear();
 
-    BOOST_FOREACH (shared_ptr<pv::device::DevInst> dev_inst, devices) {
+    BOOST_FOREACH (boost::shared_ptr<pv::device::DevInst> dev_inst, devices) {
         assert(dev_inst);
         const QString title = dev_inst->format_device_title();
         const void *id = dev_inst->get_id();
@@ -267,11 +266,11 @@ void SamplingBar::set_device_list(
     _updating_device_selector = false;
 }
 
-shared_ptr<pv::device::DevInst> SamplingBar::get_selected_device() const
+boost::shared_ptr<pv::device::DevInst> SamplingBar::get_selected_device() const
 {
     const int index = _device_selector.currentIndex();
     if (index < 0)
-        return shared_ptr<pv::device::DevInst>();
+        return boost::shared_ptr<pv::device::DevInst>();
 
     const void *const id =
         _device_selector.itemData(index).value<void*>();
@@ -280,9 +279,9 @@ shared_ptr<pv::device::DevInst> SamplingBar::get_selected_device() const
     map<const void*, boost::weak_ptr<device::DevInst> >::
         const_iterator iter = _device_selector_map.find(id);
     if (iter == _device_selector_map.end())
-        return shared_ptr<pv::device::DevInst>();
+        return boost::shared_ptr<pv::device::DevInst>();
 
-    return shared_ptr<pv::device::DevInst>((*iter).second);
+    return boost::shared_ptr<pv::device::DevInst>((*iter).second);
 }
 
 void SamplingBar::on_configure()
@@ -290,7 +289,7 @@ void SamplingBar::on_configure()
     hide_calibration();
 
     int  ret;
-    shared_ptr<pv::device::DevInst> dev_inst = get_selected_device();
+    boost::shared_ptr<pv::device::DevInst> dev_inst = get_selected_device();
     assert(dev_inst);
 
     pv::dialogs::DeviceOptions dlg(this, dev_inst);
@@ -401,8 +400,8 @@ void SamplingBar::set_sampling(bool sampling)
     _configure_button.setEnabled(!sampling);
     _device_selector.setEnabled(!sampling);
 
-    if (!qApp->property("Style").isNull()) {
-        QString iconPath = ":/icons/" + qApp->property("Style").toString();
+    if (true) {
+        QString iconPath = GetIconPath();
         if (_instant) {
             _instant_button.setIcon(sampling ? QIcon(iconPath+"/stop.svg") : QIcon(iconPath+"/single.svg"));
         } else {
@@ -439,7 +438,7 @@ void SamplingBar::update_sample_rate_selector()
 
     disconnect(&_sample_rate, SIGNAL(currentIndexChanged(int)),
         this, SLOT(on_samplerate_sel(int)));
-    const shared_ptr<device::DevInst> dev_inst = get_selected_device();
+    const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
     if (!dev_inst)
         return;
 
@@ -513,7 +512,7 @@ void SamplingBar::update_sample_rate_selector_value()
 void SamplingBar::on_samplerate_sel(int index)
 {
     (void)index;
-    const shared_ptr<device::DevInst> dev_inst = get_selected_device();
+    const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
     if (dev_inst->dev_inst()->mode != DSO)
         update_sample_count_selector();
 }
@@ -539,7 +538,7 @@ void SamplingBar::update_sample_count_selector()
     assert(!_updating_sample_count);
     _updating_sample_count = true;
 
-    const shared_ptr<device::DevInst> dev_inst = get_selected_device();
+    const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
     GVariant* gvar = dev_inst->get_config(NULL, NULL, SR_CONF_STREAM);
     if (gvar != NULL) {
         stream_mode = g_variant_get_boolean(gvar);
@@ -672,7 +671,7 @@ void SamplingBar::update_sample_count_selector_value()
 
     GVariant* gvar;
     double duration;
-    const shared_ptr<device::DevInst> dev_inst = get_selected_device();
+    const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
     if (dev_inst->dev_inst()->mode == DSO) {
         gvar = dev_inst->get_config(NULL, NULL, SR_CONF_TIMEBASE);
         if (gvar != NULL) {
@@ -715,7 +714,7 @@ void SamplingBar::on_samplecount_sel(int index)
 {
     (void)index;
 
-    const shared_ptr<device::DevInst> dev_inst = get_selected_device();
+    const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
     if (dev_inst->dev_inst()->mode == DSO)
         commit_hori_res();
     duration_changed();
@@ -753,7 +752,7 @@ double SamplingBar::commit_hori_res()
     const double hori_res = _sample_count.itemData(
                            _sample_count.currentIndex()).value<double>();
 
-    const shared_ptr<device::DevInst> dev_inst = get_selected_device();
+    const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
     const uint64_t sample_limit = dev_inst->get_sample_limit();
     GVariant* gvar;
     uint64_t max_sample_rate;
@@ -781,7 +780,7 @@ double SamplingBar::commit_hori_res()
 void SamplingBar::commit_settings()
 {
     bool test = false;
-    const shared_ptr<device::DevInst> dev_inst = get_selected_device();
+    const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
     if (dev_inst && dev_inst->owner()) {
         GVariant *gvar = dev_inst->get_config(NULL, NULL, SR_CONF_TEST);
         if (gvar != NULL) {
@@ -799,7 +798,7 @@ void SamplingBar::commit_settings()
         const uint64_t sample_rate = _sample_rate.itemData(
                 _sample_rate.currentIndex()).value<uint64_t>();
 
-        const shared_ptr<device::DevInst> dev_inst = get_selected_device();
+        const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
         if (dev_inst) {
             if (sample_rate != dev_inst->get_sample_rate())
                 dev_inst->set_config(NULL, NULL,
@@ -831,7 +830,7 @@ void SamplingBar::on_run_stop()
         enable_instant(false);
         commit_settings();
         _instant = false;
-        const shared_ptr<device::DevInst> dev_inst = get_selected_device();
+        const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
         if (!dev_inst)
             return;
         if (dev_inst->dev_inst()->mode == DSO) {
@@ -883,7 +882,7 @@ void SamplingBar::on_instant_stop()
         enable_instant(false);
         commit_settings();
         _instant = true;
-        const shared_ptr<device::DevInst> dev_inst = get_selected_device();
+        const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
         if (!dev_inst)
             return;
         if (dev_inst->dev_inst()->mode == DSO) {
@@ -922,7 +921,7 @@ void SamplingBar::on_device_selected()
     _session.stop_capture();
     _session.session_save();
 
-    const shared_ptr<device::DevInst> dev_inst = get_selected_device();
+    const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
     if (!dev_inst)
         return;
 
@@ -937,7 +936,7 @@ void SamplingBar::on_device_selected()
 void SamplingBar::enable_toggle(bool enable)
 {
     bool test = false;
-    const shared_ptr<device::DevInst> dev_inst = get_selected_device();
+    const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
     if (dev_inst && dev_inst->owner()) {
         GVariant *gvar = dev_inst->get_config(NULL, NULL, SR_CONF_TEST);
         if (gvar != NULL) {
@@ -985,7 +984,7 @@ void SamplingBar::show_session_error(
 
 void SamplingBar::reload()
 {
-    QString iconPath = ":/icons/" + qApp->property("Style").toString();
+    QString iconPath = GetIconPath();
     if (_session.get_device()->dev_inst()->mode == LOGIC) {
         if (_session.get_device()->name() == "virtual-session") {
             _mode_action->setVisible(false);
@@ -1016,7 +1015,7 @@ void SamplingBar::reload()
 
 void SamplingBar::on_mode()
 {
-    QString iconPath = ":/icons/" + qApp->property("Style").toString();
+    QString iconPath = GetIconPath();
     QAction *act = qobject_cast<QAction *>(sender());
     if (act == _action_single) {
         _mode_button.setIcon(QIcon(iconPath+"/modes.svg"));
diff --git a/DSView/pv/toolbars/titlebar.cpp b/DSView/pv/toolbars/titlebar.cpp
index fa2a6310..42c2fc64 100755
--- a/DSView/pv/toolbars/titlebar.cpp
+++ b/DSView/pv/toolbars/titlebar.cpp
@@ -26,11 +26,11 @@
 #include <QToolButton>
 #include <QHBoxLayout>
 #include <QEvent>
-#include <QMouseEvent>
-#include <QApplication>
+#include <QMouseEvent> 
 #include <QPainter>
 #include <QStyleOption>
 #include <assert.h>
+#include "../config/appconfig.h"
 
 #include "../dsvdef.h"
 
@@ -107,7 +107,7 @@ void TitleBar::changeEvent(QEvent *event)
 
 void TitleBar::reStyle()
 {
-    QString iconPath = ":/icons/" + qApp->property("Style").toString();
+    QString iconPath = GetIconPath();
 
     if (_isTop) {
         _minimizeButton->setIcon(QIcon(iconPath+"/minimize.svg"));
@@ -167,7 +167,7 @@ QString TitleBar::title() const
 
 void TitleBar::showMaxRestore()
 {
-    QString iconPath = ":/icons/" + qApp->property("Style").toString();
+    QString iconPath = GetIconPath();
     if (parentWidget()->isMaximized()) {
         _maximizeButton->setIcon(QIcon(iconPath+"/maximize.svg"));
         normalShow();
@@ -179,7 +179,7 @@ void TitleBar::showMaxRestore()
 
 void TitleBar::setRestoreButton(bool max)
 {
-    QString iconPath = ":/icons/" + qApp->property("Style").toString();
+    QString iconPath = GetIconPath();
     if (!max) {
         _maximizeButton->setIcon(QIcon(iconPath+"/maximize.svg"));
     } else {
diff --git a/DSView/pv/toolbars/trigbar.cpp b/DSView/pv/toolbars/trigbar.cpp
index 95f336f4..dcccb3ea 100755
--- a/DSView/pv/toolbars/trigbar.cpp
+++ b/DSView/pv/toolbars/trigbar.cpp
@@ -27,10 +27,10 @@
 #include "../dialogs/mathoptions.h"
 #include "../view/trace.h"
 
-#include <QApplication>
 #include <QBitmap>
 #include <QPainter>
 #include "../dialogs/applicationpardlg.h"
+#include "../config/appconfig.h"
 
 namespace pv {
 namespace toolbars {
@@ -47,15 +47,15 @@ TrigBar::TrigBar(SigSession &session, QWidget *parent) :
     _measure_button(this),
     _search_button(this),
     _function_button(this),
-    _display_button(this)
+    _setting_button(this)
 {
     setMovable(false);
     setContentsMargins(0,0,0,0);
  
     _trig_button.setCheckable(true);
-#ifdef ENABLE_DECODE
+ 
     _protocol_button.setCheckable(true);
-#endif
+ 
     _measure_button.setCheckable(true);
     _search_button.setCheckable(true);
 
@@ -95,15 +95,15 @@ TrigBar::TrigBar(SigSession &session, QWidget *parent) :
     _display_menu->addAction(_action_lissajous);    
     _display_menu->addMenu(_themes);
 
-    _display_button.setPopupMode(QToolButton::InstantPopup);
-    _display_button.setMenu(_display_menu);
+    _setting_button.setPopupMode(QToolButton::InstantPopup);
+    _setting_button.setMenu(_display_menu);
 
     _trig_button.setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
     _protocol_button.setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
     _measure_button.setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
     _search_button.setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
     _function_button.setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-    _display_button.setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+    _setting_button.setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
 
     _protocol_button.setContentsMargins(0,0,0,0);
 
@@ -112,7 +112,7 @@ TrigBar::TrigBar(SigSession &session, QWidget *parent) :
     _measure_action = addWidget(&_measure_button);
     _search_action = addWidget(&_search_button);
     _function_action = addWidget(&_function_button); 
-    _display_action = addWidget(&_display_button); //must be created
+    _display_action = addWidget(&_setting_button); //must be created
  
     retranslateUi();
 
@@ -145,7 +145,7 @@ void TrigBar::retranslateUi()
     _measure_button.setText(tr("Measure"));
     _search_button.setText(tr("Search"));
     _function_button.setText(tr("Function"));
-    _display_button.setText(tr("Setting"));
+    _setting_button.setText(tr("Setting"));
  
     _action_lissajous->setText(tr("&Lissajous"));
 
@@ -161,14 +161,14 @@ void TrigBar::retranslateUi()
 
 void TrigBar::reStyle()
 {
-    QString iconPath = ":/icons/" + qApp->property("Style").toString();
+    QString iconPath = GetIconPath();
 
     _trig_button.setIcon(QIcon(iconPath+"/trigger.svg"));
     _protocol_button.setIcon(QIcon(iconPath+"/protocol.svg"));
     _measure_button.setIcon(QIcon(iconPath+"/measure.svg"));
     _search_button.setIcon(QIcon(iconPath+"/search-bar.svg"));
     _function_button.setIcon(QIcon(iconPath+"/function.svg"));
-    _display_button.setIcon(QIcon(iconPath+"/display.svg"));
+    _setting_button.setIcon(QIcon(iconPath+"/display.svg"));
 
     _action_fft->setIcon(QIcon(iconPath+"/fft.svg"));
     _action_math->setIcon(QIcon(iconPath+"/math.svg"));
@@ -178,7 +178,9 @@ void TrigBar::reStyle()
 
      _appParam_action->setIcon(QIcon(iconPath+"/params.svg"));
 
-    _themes->setIcon(QIcon(iconPath+"/"+qApp->property("Style").toString()+".svg"));
+     AppConfig &app = AppConfig::Instance();    
+
+    _themes->setIcon(QIcon(iconPath+"/"+ app._frameOptions.language +".svg"));
 }
 
 void TrigBar::protocol_clicked()
@@ -228,7 +230,7 @@ void TrigBar::enable_toggle(bool enable)
     _measure_button.setDisabled(!enable);
     _search_button.setDisabled(!enable);
     _function_button.setDisabled(!enable);
-    _display_button.setDisabled(!enable);
+    _setting_button.setDisabled(!enable);
 }
 
 void TrigBar::enable_protocol(bool enable)
diff --git a/DSView/pv/toolbars/trigbar.h b/DSView/pv/toolbars/trigbar.h
index c98e5366..65764299 100755
--- a/DSView/pv/toolbars/trigbar.h
+++ b/DSView/pv/toolbars/trigbar.h
@@ -93,7 +93,7 @@ private:
     QToolButton _measure_button;
     QToolButton _search_button;
     QToolButton _function_button;
-    QToolButton _display_button;
+    QToolButton _setting_button;
     QAction* _trig_action;
     QAction* _protocol_action;
     QAction* _measure_action;
diff --git a/DSView/pv/view/decodetrace.cpp b/DSView/pv/view/decodetrace.cpp
index 97e99f92..0fa24f1a 100755
--- a/DSView/pv/view/decodetrace.cpp
+++ b/DSView/pv/view/decodetrace.cpp
@@ -26,8 +26,7 @@
 #include <boost/foreach.hpp>
 #include <boost/functional/hash.hpp>
 
-#include <QAction>
-#include <QApplication>
+#include <QAction> 
 #include <QComboBox>
 #include <QFormLayout>
 #include <QLabel>
@@ -36,6 +35,7 @@
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QScrollArea>
+#include <QApplication>
 
 #include "decodetrace.h"
 
diff --git a/DSView/pv/view/devmode.cpp b/DSView/pv/view/devmode.cpp
index 572f9651..2c99e95b 100755
--- a/DSView/pv/view/devmode.cpp
+++ b/DSView/pv/view/devmode.cpp
@@ -29,13 +29,13 @@
 #include <assert.h>
 
 #include <boost/foreach.hpp>
-
-#include <QApplication>
+ 
 #include <QStyleOption>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QRect>
 #include <QDebug>
+#include "../config/appconfig.h"
 
 using boost::shared_ptr;
 using namespace std;
@@ -105,8 +105,11 @@ void DevMode::set_device()
     _close_button->setDisabled(true);
     disconnect(_close_button, SIGNAL(clicked()), this, SLOT(on_close()));
 
-    if (!qApp->property("Style").isNull()) {
-        QString iconPath = ":/icons/" + qApp->property("Style").toString() + "/";
+    AppConfig &app = AppConfig::Instance(); 
+    int lan = app._frameOptions.language;
+
+    if (true) {
+        QString iconPath = GetIconPath() + "/";
         for (const GSList *l = dev_inst->get_dev_mode_list();
              l; l = l->next) {
             const sr_dev_mode *mode = (const sr_dev_mode *)l->data;
@@ -114,7 +117,7 @@ void DevMode::set_device()
 
             QAction *action = new QAction(this);
             action->setIcon(QIcon(iconPath+"square-"+icon_name));
-            if (qApp->property("Language") == QLocale::Chinese)
+            if (lan == QLocale::Chinese)
                 action->setText(mode->name_cn);
             else
                 action->setText(mode->name);
@@ -123,7 +126,7 @@ void DevMode::set_device()
             _mode_list[action] = mode;
             if (dev_inst->dev_inst()->mode == _mode_list[action]->mode) {
                 _mode_btn->setIcon(QIcon(iconPath+icon_name));
-                if (qApp->property("Language") == QLocale::Chinese)
+                if (lan== QLocale::Chinese)
                     _mode_btn->setText(mode->name_cn);
                 else
                     _mode_btn->setText(mode->name);
@@ -159,7 +162,10 @@ void DevMode::on_mode_change()
     if (dev_inst->dev_inst()->mode == _mode_list[action]->mode)
         return;
 
-    QString iconPath = ":/icons/" + qApp->property("Style").toString();
+    QString iconPath = GetIconPath();
+    AppConfig &app = AppConfig::Instance(); 
+    int lan = app._frameOptions.language;
+
     for(std::map<QAction *, const sr_dev_mode *>::const_iterator i = _mode_list.begin();
         i != _mode_list.end(); i++) {
         if ((*i).first == action) {
@@ -175,7 +181,7 @@ void DevMode::on_mode_change()
 
                 QString icon_name = "/" + QString::fromLocal8Bit((*i).second->icon);
                 _mode_btn->setIcon(QIcon(iconPath+icon_name));
-                if (qApp->property("Language") == QLocale::Chinese)
+                if (lan == QLocale::Chinese)
                     _mode_btn->setText((*i).second->name_cn);
                 else
                     _mode_btn->setText((*i).second->name);
diff --git a/DSView/pv/view/header.cpp b/DSView/pv/view/header.cpp
index 9d794020..ec5db76c 100755
--- a/DSView/pv/view/header.cpp
+++ b/DSView/pv/view/header.cpp
@@ -36,8 +36,7 @@
 #include <assert.h>
 
 #include <boost/foreach.hpp>
-
-#include <QApplication>
+ 
 #include <QColorDialog>
 #include <QInputDialog>
 #include <QMenu>
@@ -45,6 +44,7 @@
 #include <QPainter>
 #include <QRect>
 #include <QStyleOption>
+#include <QApplication>
 
 using namespace boost;
 using namespace std;
diff --git a/DSView/pv/view/selectableitem.cpp b/DSView/pv/view/selectableitem.cpp
index 1c4d987e..cc2b42cd 100755
--- a/DSView/pv/view/selectableitem.cpp
+++ b/DSView/pv/view/selectableitem.cpp
@@ -21,10 +21,10 @@
  */
 
 #include "selectableitem.h"
-
-#include <QApplication>
+ 
 #include <QMenu>
 #include <QPalette>
+#include <QApplication>
 
 namespace pv {
 namespace view {
diff --git a/DSView/pv/view/signal.cpp b/DSView/pv/view/signal.cpp
index d694c033..0646cb06 100755
--- a/DSView/pv/view/signal.cpp
+++ b/DSView/pv/view/signal.cpp
@@ -23,8 +23,7 @@
 #include <extdef.h>
 
 #include <math.h>
-
-#include <QApplication>
+ 
 
 #include "signal.h"
 #include "view.h"
diff --git a/DSView/pv/view/trace.cpp b/DSView/pv/view/trace.cpp
index def3fdb0..fca6addf 100755
--- a/DSView/pv/view/trace.cpp
+++ b/DSView/pv/view/trace.cpp
@@ -22,17 +22,17 @@
 
 #include <extdef.h>
 #include <assert.h>
-#include <math.h>
-
-#include <QApplication>
+#include <math.h> 
 #include <QFormLayout>
 #include <QLineEdit>
+#include <QApplication>
 
 #include "trace.h"
 #include "view.h"
 #include "../device/devinst.h"
 #include "../sigsession.h"
 
+
 namespace pv {
 namespace view {
 
diff --git a/DSView/pv/view/view.cpp b/DSView/pv/view/view.cpp
index 4d959f0d..349f0b6b 100755
--- a/DSView/pv/view/view.cpp
+++ b/DSView/pv/view/view.cpp
@@ -25,8 +25,7 @@
 #include <math.h>
 
 #include <boost/foreach.hpp>
-
-#include <QApplication>
+ 
 #include <QEvent>
 #include <QMouseEvent>
 #include <QScrollBar>
@@ -378,10 +377,10 @@ vector< boost::shared_ptr<Trace> > View::get_traces(int type)
 {
     const vector< boost::shared_ptr<Signal> > sigs(_session.get_signals());
     const vector< boost::shared_ptr<GroupSignal> > groups(_session.get_group_signals());
-#ifdef ENABLE_DECODE
+ 
     const vector< boost::shared_ptr<DecodeTrace> > decode_sigs(
         _session.get_decode_signals());
-#endif
+ 
     const vector< boost::shared_ptr<SpectrumTrace> > spectrums(_session.get_spectrum_traces());
 
     vector< boost::shared_ptr<Trace> > traces;
@@ -389,12 +388,12 @@ vector< boost::shared_ptr<Trace> > View::get_traces(int type)
         if (type == ALL_VIEW || _trace_view_map[t->get_type()] == type)
             traces.push_back(t);
     }
-#ifdef ENABLE_DECODE
+ 
     BOOST_FOREACH(boost::shared_ptr<Trace> t, decode_sigs) {
         if (type == ALL_VIEW || _trace_view_map[t->get_type()] == type)
             traces.push_back(t);
     }
-#endif
+ 
     BOOST_FOREACH(boost::shared_ptr<Trace> t, groups) {
         if (type == ALL_VIEW || _trace_view_map[t->get_type()] == type)
             traces.push_back(t);
diff --git a/DSView/pv/widgets/border.cpp b/DSView/pv/widgets/border.cpp
index 9ff70e20..79737213 100755
--- a/DSView/pv/widgets/border.cpp
+++ b/DSView/pv/widgets/border.cpp
@@ -21,11 +21,11 @@
 
 #include "border.h"
 #include "../mainframe.h"
-
-#include <QApplication>
+ 
 #include <QPainter>
 #include <QLinearGradient>
 #include <QRadialGradient>
+#include "../config/appconfig.h"
 
 namespace pv {
 namespace widgets {
@@ -56,7 +56,10 @@ void Border::paintEvent(QPaintEvent *)
     painter.setPen(Qt::NoPen);
     painter.setRenderHint(QPainter::Antialiasing, true);
     QLinearGradient linearGrad(QPointF(width(), height()), QPointF(0, 0));
-    if (qApp->property("Style").toString() == "dark") {
+    AppConfig &app = AppConfig::Instance(); 
+    QString style = app._frameOptions.style;
+
+    if (style == "dark") {
         linearGrad.setColorAt(0, dark_border0);
         linearGrad.setColorAt(0.25, dark_border1);
         linearGrad.setColorAt(0.5, dark_border2);
@@ -71,7 +74,7 @@ void Border::paintEvent(QPaintEvent *)
     }
 
     QRadialGradient radialGrad(QPointF(0, 0), width());
-    if (qApp->property("Style").toString() == "dark") {
+    if (style == "dark") {
         radialGrad.setColorAt(0, dark_border0);
         radialGrad.setColorAt(0.25, dark_border1);
         radialGrad.setColorAt(0.5, dark_border2);
diff --git a/DSView/pv/widgets/decodergroupbox.cpp b/DSView/pv/widgets/decodergroupbox.cpp
index 80c4c446..a529c4df 100755
--- a/DSView/pv/widgets/decodergroupbox.cpp
+++ b/DSView/pv/widgets/decodergroupbox.cpp
@@ -32,8 +32,10 @@
 #include <QVariant>
 #include <QScrollBar>
 #include <QScreen>
+#include <QApplication>
 
 #include <boost/foreach.hpp>
+#include "../config/appconfig.h"
 
 #include <assert.h>
 
@@ -55,7 +57,7 @@ DecoderGroupBox::DecoderGroupBox(boost::shared_ptr<data::DecoderStack> &decoder_
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setWidgetResizable(true);
 
-    QString iconPath = ":/icons/" + qApp->property("Style").toString();
+    QString iconPath = GetIconPath();
     _layout->addWidget(new QLabel(QString("<h3>%1</h3>").arg(_dec->decoder()->name), _widget),
         0, 0);
 	_layout->setColumnStretch(0, 1);
@@ -129,7 +131,7 @@ bool DecoderGroupBox::eventFilter(QObject *o, QEvent *e)
 
 void DecoderGroupBox::tog_icon()
 {
-    QString iconPath = ":/icons/" + qApp->property("Style").toString();
+    QString iconPath = GetIconPath();
     QPushButton *sc = dynamic_cast<QPushButton*>(sender());
     QVariant id = sc->property("index");
     int index = id.toInt();
diff --git a/DSView/pv/widgets/decodergroupbox.h b/DSView/pv/widgets/decodergroupbox.h
index 814e42a6..61f5599b 100755
--- a/DSView/pv/widgets/decodergroupbox.h
+++ b/DSView/pv/widgets/decodergroupbox.h
@@ -22,7 +22,7 @@
 #ifndef DSVIEW_PV_WIDGETS_DECODERGROUPBOX_H
 #define DSVIEW_PV_WIDGETS_DECODERGROUPBOX_H
 
-#include <QApplication>
+ 
 #include <QPushButton>
 #include <QGridLayout>
 #include <QToolBar>

From 26fe2941df9f19bf58141f01d54f62172a3bd8b2 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Thu, 28 Oct 2021 18:49:52 +0800
Subject: [PATCH 14/58] able to export original data

---
 DSView/pv/config/appconfig.cpp      |   7 +-
 DSView/pv/config/appconfig.h        |  18 +-
 DSView/pv/dialogs/storeprogress.cpp | 162 ++++++++++---
 DSView/pv/dialogs/storeprogress.h   |  35 ++-
 DSView/pv/mainframe.cpp             |   4 +-
 DSView/pv/mainwindow.cpp            |   5 +-
 DSView/pv/storesession.cpp          | 342 ++++++++++++++++++----------
 DSView/pv/storesession.h            |  40 ++--
 libsigrok4DSL/libsigrok.h           |   1 +
 libsigrok4DSL/output/csv.c          |  12 +-
 libsigrok4DSL/proto.h               |   8 +
 libsigrok4DSL/session.c             |  12 +
 12 files changed, 432 insertions(+), 214 deletions(-)

diff --git a/DSView/pv/config/appconfig.cpp b/DSView/pv/config/appconfig.cpp
index ae418bfc..ae3fcd24 100644
--- a/DSView/pv/config/appconfig.cpp
+++ b/DSView/pv/config/appconfig.cpp
@@ -90,7 +90,7 @@ void _loadApp(AppOptions &o, QSettings &st){
     st.beginGroup("Application"); 
     getFiled("quickScroll", st, o.quickScroll, true);
     getFiled("warnofMultiTrig", st, o.warnofMultiTrig, true);
-
+    getFiled("originalData", st, o.originalData, false);
 
     QString fmt;
     getFiled("protocalFormats", st, fmt, "");
@@ -105,6 +105,7 @@ void _saveApp(AppOptions &o, QSettings &st){
     st.beginGroup("Application");
     setFiled("quickScroll", st, o.quickScroll);
     setFiled("warnofMultiTrig", st, o.warnofMultiTrig);
+    setFiled("originalData", st, o.originalData);
 
 
     QString fmt =  FormatArrayToString(o.m_protocolFormats);
@@ -149,6 +150,7 @@ void _loadHistory(UserHistory &o, QSettings &st){
     getFiled("sessionDir", st, o.sessionDir, ""); 
     getFiled("openDir", st, o.openDir, ""); 
     getFiled("protocolExportPath", st, o.protocolExportPath, ""); 
+    getFiled("exportFormat", st, o.exportFormat, ""); 
     st.endGroup();
 }
  
@@ -160,7 +162,8 @@ void _saveHistory(UserHistory &o, QSettings &st){
     setFiled("screenShotPath", st, o.screenShotPath); 
     setFiled("sessionDir", st, o.sessionDir); 
     setFiled("openDir", st, o.openDir); 
-    setFiled("protocolExportPath", st, o.protocolExportPath); 
+    setFiled("protocolExportPath", st, o.protocolExportPath);
+    setFiled("exportFormat", st, o.exportFormat); 
     st.endGroup();
 }
 
diff --git a/DSView/pv/config/appconfig.h b/DSView/pv/config/appconfig.h
index 14b1d5d6..ffea3327 100644
--- a/DSView/pv/config/appconfig.h
+++ b/DSView/pv/config/appconfig.h
@@ -45,19 +45,17 @@ public:
    string m_value;
 };
 
-class AppOptions
-{  
-  public:
+struct AppOptions
+{   
     bool  quickScroll;
     bool  warnofMultiTrig;
-
+    bool  originalData;
 
     vector<StringPair> m_protocolFormats;
 };
  
-class FrameOptions
-{
-public:
+struct FrameOptions
+{ 
   QString     style;
   int         language;
   QByteArray  geometry;
@@ -65,9 +63,8 @@ public:
   QByteArray  windowState;
 };
 
-class UserHistory
-{
-public:
+struct UserHistory
+{ 
   QString   exportDir;
   QString   saveDir;
   bool      showDocuments;
@@ -75,6 +72,7 @@ public:
   QString   sessionDir;
   QString   openDir;
   QString   protocolExportPath;
+  QString   exportFormat;
 };
 
 class AppConfig
diff --git a/DSView/pv/dialogs/storeprogress.cpp b/DSView/pv/dialogs/storeprogress.cpp
index b74daaa4..19d0329e 100755
--- a/DSView/pv/dialogs/storeprogress.cpp
+++ b/DSView/pv/dialogs/storeprogress.cpp
@@ -19,36 +19,70 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "storeprogress.h"
-#include "dsmessagebox.h"
+#include "storeprogress.h" 
 #include "pv/sigsession.h"
+#include <QGridLayout>
+#include <QDialogButtonBox>
+#include <QTimer>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QCheckBox> 
 
-#include "QVBoxLayout"
+#include "../ui/msgbox.h"
+#include "../config/appconfig.h"
 
 namespace pv {
 namespace dialogs {
 
 StoreProgress::StoreProgress(SigSession &session, QWidget *parent) :
     DSDialog(parent),
-    _store_session(session),
-    _button_box(QDialogButtonBox::Cancel, Qt::Horizontal, this),
-    _done(false)
+    _store_session(session)
 {
-    this->setModal(true);
+    _fileLab = NULL;
+    _ckOrigin = NULL;
 
-    _info.setText("...");
+    this->setMinimumSize(550, 220);
+    this->setModal(true);
+ 
     _progress.setValue(0);
     _progress.setMaximum(100);
 
-    QVBoxLayout* add_layout = new QVBoxLayout();
-    add_layout->addWidget(&_info, 0, Qt::AlignCenter);
-    add_layout->addWidget(&_progress);
-    add_layout->addWidget(&_button_box);
-    layout()->addLayout(add_layout);
+    _isExport = false;
+    _done = false;
+
+    QGridLayout *grid = new QGridLayout(); 
+    _grid = grid;
+    grid->setContentsMargins(10, 20, 10, 10);
+    grid->setVerticalSpacing(25);
+
+    grid->setColumnStretch(0, 2);
+    grid->setColumnStretch(1, 2);
+    grid->setColumnStretch(2, 1);
+    grid->setColumnStretch(3, 1);
+
+    _fileLab = new QLineEdit();
+    _fileLab->setEnabled(false);    
+
+    QPushButton *openButton = new QPushButton(this);
+    openButton->setText(tr("change"));
+
+    grid->addWidget(&_progress, 0, 0, 1, 4);
+    grid->addWidget(_fileLab, 1, 0, 1, 3);
+    grid->addWidget(openButton, 1, 3, 1, 1);    
+
+    QDialogButtonBox  *_button_box = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, 
+                                        Qt::Horizontal, this);
+    grid->addWidget(_button_box, 2, 2, 1, 2, Qt::AlignRight | Qt::AlignBottom);
+
+    layout()->addLayout(grid);
+
+    connect(_button_box, SIGNAL(rejected()), this, SLOT(reject()));
+    connect(_button_box, SIGNAL(accepted()), this, SLOT(accept()));
 
-    connect(&_button_box, SIGNAL(rejected()), this, SLOT(reject()));
     connect(&_store_session, SIGNAL(progress_updated()),
         this, SLOT(on_progress_updated()), Qt::QueuedConnection);
+
+    connect(openButton, SIGNAL(clicked()),this, SLOT(on_change_file()));
 }
 
 StoreProgress::~StoreProgress()
@@ -56,12 +90,66 @@ StoreProgress::~StoreProgress()
     _store_session.wait();
 }
 
+ void StoreProgress::on_change_file()
+ {
+     if (_isExport){
+        QString file = _store_session.MakeExportFile(true);
+        if (file != "")
+            _fileLab->setText(file);
+     }
+     else{
+      QString file = _store_session.MakeSaveFile(true);
+       if (file != "")
+          _fileLab->setText(file);
+     }
+ }
+
 void StoreProgress::reject()
 {
     using namespace Qt;
     _store_session.cancel();
     save_done();
-    QDialog::reject();
+    DSDialog::reject();
+}
+
+void StoreProgress::accept()
+{
+    if (_store_session.GetFileName() == ""){
+        MsgBox::Show(NULL, "you need to select a file name.");
+        return;
+    }
+
+    if (_isExport && _store_session.IsLogicDataType()){
+        bool ck  = _ckOrigin->isChecked();
+        AppConfig &app = AppConfig::Instance();
+        if (app._appOptions.originalData != ck){
+            app._appOptions.originalData = ck;
+            app.SaveApp();
+        }
+    }
+
+    //start done 
+    if (_isExport){
+        if (_store_session.export_start()){
+              QTimer::singleShot(100, this, SLOT(timeout()));        
+        }
+        else{
+            save_done();
+            close(); 
+            show_error();
+        }
+    }
+    else{
+         if (_store_session.save_start()){
+              QTimer::singleShot(100, this, SLOT(timeout()));        
+        }
+        else{
+            save_done();
+            close(); 
+            show_error();
+        }
+    }
+    //do not to call base class method, otherwise the window will be closed;
 }
 
 void StoreProgress::timeout()
@@ -77,36 +165,40 @@ void StoreProgress::timeout()
 
 void StoreProgress::save_run(QString session_file)
 {
-    _info.setText(tr("Saving..."));
-    if (_store_session.save_start(session_file))
-        show();
-    else
-        show_error();
-
-    QTimer::singleShot(100, this, SLOT(timeout()));
+    _isExport = false;
+    setTitle(tr("Saving..."));
+    QString file = _store_session.MakeSaveFile(false);
+    _fileLab->setText(file);
+    _store_session._sessionFile = session_file;
+    show();  
 }
 
 void StoreProgress::export_run()
 {
-    _info.setText(tr("Exporting..."));
-    if (_store_session.export_start())
-        show();
-    else
-        show_error();
+    if (_store_session.IsLogicDataType())
+    { 
+        QGridLayout *lay = new QGridLayout();
+        lay->setContentsMargins(15, 0, 0, 0);
+        AppConfig &app = AppConfig::Instance();
+        _ckOrigin  = new QCheckBox();
+        _ckOrigin->setChecked(app._appOptions.originalData);
+        _ckOrigin->setText(tr("all original data"));
+        lay->addWidget(_ckOrigin);
+        _grid->addLayout(lay, 2, 0, 1, 2);
+    }
 
-    QTimer::singleShot(100, this, SLOT(timeout()));
+    _isExport = true;
+    setTitle(tr("Exporting..."));
+    QString file = _store_session.MakeExportFile(false);
+    _fileLab->setText(file);
+    show();
 }
 
 void StoreProgress::show_error()
 {
     _done = true;
-    if (!_store_session.error().isEmpty()) {
-        dialogs::DSMessageBox msg(parentWidget());
-        msg.mBox()->setText(tr("Failed to save data."));
-        msg.mBox()->setInformativeText(_store_session.error());
-        msg.mBox()->setStandardButtons(QMessageBox::Ok);
-        msg.mBox()->setIcon(QMessageBox::Warning);
-        msg.exec();
+    if (!_store_session.error().isEmpty()) { 
+        MsgBox::Show(NULL, _store_session.error().toStdString().c_str(), NULL);
     }
 }
 
diff --git a/DSView/pv/dialogs/storeprogress.h b/DSView/pv/dialogs/storeprogress.h
index 93c61ef4..63d7c013 100755
--- a/DSView/pv/dialogs/storeprogress.h
+++ b/DSView/pv/dialogs/storeprogress.h
@@ -22,18 +22,16 @@
 #ifndef DSVIEW_PV_DIALOGS_SAVEPROGRESS_H
 #define DSVIEW_PV_DIALOGS_SAVEPROGRESS_H
 
-#include <set>
+//#include <set>
 
 #include <boost/shared_ptr.hpp>
-
-#include <QLabel>
 #include <QProgressBar>
-#include <QDialogButtonBox>
-#include <QTimer>
-
 #include "../storesession.h"
-#include "../dialogs/dsdialog.h"
-#include "../toolbars/titlebar.h"
+#include "../dialogs/dsdialog.h" 
+
+class QLineEdit;
+class QCheckBox;
+class QGridLayout;
 
 namespace pv {
 
@@ -51,10 +49,10 @@ public:
 
 	virtual ~StoreProgress();
 
-
-
+ 
 protected:
     void reject();
+    void accept();
 
 private:
 	void show_error();
@@ -70,17 +68,16 @@ public slots:
 private slots:
 	void on_progress_updated();
     void timeout();
+    void on_change_file();
 
 private:
-    pv::StoreSession _store_session;
-
-    QLabel _info;
-    QProgressBar _progress;
-    QDialogButtonBox _button_box;
-
-    toolbars::TitleBar *_titlebar;
-
-    bool _done;
+    pv::StoreSession    _store_session;
+    QProgressBar        _progress;
+    bool                _done;
+    bool                _isExport;
+    QLineEdit           *_fileLab;
+    QCheckBox           *_ckOrigin;
+    QGridLayout         *_grid;
 };
 
 } // dialogs
diff --git a/DSView/pv/mainframe.cpp b/DSView/pv/mainframe.cpp
index 9beb1187..7c83b53b 100755
--- a/DSView/pv/mainframe.cpp
+++ b/DSView/pv/mainframe.cpp
@@ -379,7 +379,9 @@ void MainFrame::readSettings()
 {
     AppConfig &app = AppConfig::Instance(); 
    
-    _mainWindow->switchLanguage(app._frameOptions.language);
+    if (app._frameOptions.language > 0){
+         _mainWindow->switchLanguage(app._frameOptions.language);
+    }   
 
     if (app._frameOptions.geometry.isEmpty()) {
         QScreen *screen=QGuiApplication::primaryScreen ();
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index 0e6294fe..ffe8662c 100755
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -887,9 +887,6 @@ void MainWindow::on_export()
 {
     using pv::dialogs::StoreProgress;
 
-//    dialogs::RegionOptions *regionDlg = new dialogs::RegionOptions(_view, _session, this);
-//    regionDlg->exec();
-
     StoreProgress *dlg = new StoreProgress(_session, this);
     dlg->export_run();
 }
@@ -1356,7 +1353,7 @@ void MainWindow::switchLanguage(int language)
     dev->set_config(NULL, NULL, SR_CONF_LANGUAGE, g_variant_new_int16(language));
     AppConfig &app = AppConfig::Instance();
 
-    if (app._frameOptions.language != language)
+    if (app._frameOptions.language != language && language > 0)
     {
         app._frameOptions.language = language;
         app.SaveFrame();
diff --git a/DSView/pv/storesession.cpp b/DSView/pv/storesession.cpp
index 5c9c7eef..88fe59bc 100755
--- a/DSView/pv/storesession.cpp
+++ b/DSView/pv/storesession.cpp
@@ -43,6 +43,7 @@
 #include <boost/foreach.hpp>
  
 #include <QFileDialog>
+#include <QDir>
 
 #include "config/appconfig.h"
 
@@ -137,8 +138,14 @@ QList<QString> StoreSession::getSuportedExportFormats(){
     return list;
 }
 
-bool StoreSession::save_start(QString session_file)
+bool StoreSession::save_start()
 {
+    if (_sessionFile == "")
+    {
+        _error = tr("No set session file name.");
+        return false;
+    }
+
     std::set<int> type_set;
     BOOST_FOREACH(const boost::shared_ptr<view::Signal> sig, _session.get_signals()) {
         assert(sig);
@@ -149,11 +156,17 @@ bool StoreSession::save_start(QString session_file)
         _error = tr("DSView does not currently support"
                     "file saving for multiple data types.");
         return false;
+
     } else if (type_set.size() == 0) {
         _error = tr("No data to save.");
         return false;
     }
 
+    if (_file_name == ""){
+        _error = tr("No set file name.");
+        return false;
+    }
+
     const boost::shared_ptr<data::Snapshot> snapshot(_session.get_snapshot(*type_set.begin()));
 	assert(snapshot);
     // Check we have data
@@ -161,56 +174,12 @@ bool StoreSession::save_start(QString session_file)
         _error = tr("No data to save.");
         return false;
     }
- 
 
-    //root dir 
-    QString default_name;
+    QString meta_file = meta_gen(snapshot);
 
-    AppConfig &app = AppConfig::Instance(); 
-    if (app._userHistory.saveDir != "")
-    {
-        default_name = app._userHistory.saveDir + "/"  + _session.get_device()->name() + "-";
-    } 
-    else{
-        default_name =  _session.get_device()->name() + "-";
-    } 
+    QString decoders_file = decoders_gen();
 
-    for (const GSList *l = _session.get_device()->get_dev_mode_list();
-         l; l = l->next) {
-        const sr_dev_mode *mode = (const sr_dev_mode *)l->data;
-        if (_session.get_device()->dev_inst()->mode == mode->mode) {
-            default_name += mode->acronym;
-            break;
-        }
-    }
-
-    default_name += _session.get_session_time().toString("-yyMMdd-hhmmss");
-
-    // Show the dialog
-    QString svFilePath = QFileDialog::getSaveFileName(
-                    NULL, 
-                    tr("Save File"), 
-                    default_name,
-                    tr("DSView Data (*.dsl)"));
-
-    if (!svFilePath.isEmpty()) {
-        QFileInfo f(svFilePath);
-        if(f.suffix().compare("dsl"))
-            svFilePath.append(tr(".dsl"));
-
-        _file_name =  svFilePath;  
-        svFilePath = GetDirectoryName(svFilePath);
-
-        if (svFilePath != app._userHistory.saveDir){
-           app._userHistory.saveDir = svFilePath; 
-            app.SaveHistory();
-        }     
-
-        QString meta_file = meta_gen(snapshot);
-   
-        QString decoders_file = decoders_gen();
-
-       /*
+    /*
         if (meta_file == NULL) {
             _error = tr("Generate temp file failed.");
         } else {
@@ -227,20 +196,20 @@ bool StoreSession::save_start(QString session_file)
         }
         */
 
-            //make zip file
-        if (meta_file != NULL && m_zipDoc.CreateNew(_file_name.toUtf8().data(), false))
+    //make zip file
+    if (meta_file != NULL && m_zipDoc.CreateNew(_file_name.toUtf8().data(), false))
+    {
+        if (!m_zipDoc.AddFromFile(meta_file.toUtf8().data(), "header") 
+        || !m_zipDoc.AddFromFile(decoders_file.toUtf8().data(), "decoders") 
+        || !m_zipDoc.AddFromFile(_sessionFile.toUtf8().data(), "session"))
         {
-            if (   !m_zipDoc.AddFromFile(meta_file.toUtf8().data(), "header")
-                || !m_zipDoc.AddFromFile(decoders_file.toUtf8().data(), "decoders")
-                || !m_zipDoc.AddFromFile(session_file.toUtf8().data(), "session"))
-                {
-                        _has_error = true;
-                        _error = m_zipDoc.GetError();
-                }
-                else{
-                        _thread = boost::thread(&StoreSession::save_proc, this, snapshot);
-                        return !_has_error;
-                }        
+            _has_error = true;
+            _error = m_zipDoc.GetError();
+        }
+        else
+        {
+            _thread = boost::thread(&StoreSession::save_proc, this, snapshot);
+            return !_has_error;
         }
     }
 
@@ -611,75 +580,37 @@ bool StoreSession::export_start()
         return false;
     }
 
-    AppConfig &app = AppConfig::Instance(); 
- 
-    QString default_name;
-    if (app._userHistory.exportDir != "")
-    {
-       default_name = app._userHistory.exportDir  + "/"  + _session.get_device()->name() + "-";
-    } 
-    else{
-        default_name =  _session.get_device()->name() + "-";
-    }  
+    if (_file_name == ""){
+        _error = tr("No set file name.");
+        return false;
+    }
 
-    for (const GSList *l = _session.get_device()->get_dev_mode_list();
-         l; l = l->next) {
-        const sr_dev_mode *mode = (const sr_dev_mode *)l->data;
-        if (_session.get_device()->dev_inst()->mode == mode->mode) {
-            default_name += mode->acronym;
+    //set export all data flag
+    AppConfig &app = AppConfig::Instance();
+    int flag = app._appOptions.originalData ? 1 : 0;
+    sr_set_export_original_data(flag);
+
+    const struct sr_output_module **supportedModules = sr_output_list();
+    while (*supportedModules)
+    {
+        if (*supportedModules == NULL)
+            break;
+        if (!strcmp((*supportedModules)->id, _suffix.toUtf8().data()))
+        {
+            _outModule = *supportedModules;
             break;
         }
-    }
-    default_name += _session.get_session_time().toString("-yyMMdd-hhmmss");
-
-    // Show the dialog
-    QList<QString> supportedFormats = getSuportedExportFormats();
-    QString filter;
-    for(int i = 0; i < supportedFormats.count();i++){
-        filter.append(supportedFormats[i]);
-        if(i < supportedFormats.count() - 1)
-            filter.append(";;");
+        supportedModules++;
     }
 
-    QString svFilePath = QFileDialog::getSaveFileName(
-                NULL, 
-                tr("Export Data"), 
-                default_name,
-                filter,
-                &filter);
-
-    if (!svFilePath.isEmpty()) {
-        QFileInfo f(_file_name);
-        QStringList list = filter.split('.').last().split(')');
-        _suffix = list.first();
-        if(f.suffix().compare(_suffix))
-            svFilePath += tr(".") + _suffix;
-
-         _file_name =  svFilePath;  
-        svFilePath = GetDirectoryName(svFilePath);
-
-        if (svFilePath != app._userHistory.exportDir ){
-            app._userHistory.exportDir  = svFilePath;
-            app.SaveHistory();
-        }      
-
-        const struct sr_output_module** supportedModules = sr_output_list();
-        while(*supportedModules){
-            if(*supportedModules == NULL)
-                break;
-            if(!strcmp((*supportedModules)->id, _suffix.toUtf8().data())){
-                _outModule = *supportedModules;
-                break;
-            }
-            supportedModules++;
-        }
-
-        if(_outModule == NULL) {
-            _error = tr("Invalid export format.");
-        } else {
-            _thread = boost::thread(&StoreSession::export_proc, this, snapshot);
-            return !_has_error;
-        }
+    if (_outModule == NULL)
+    {
+        _error = tr("Invalid export format.");
+    }
+    else
+    {
+        _thread = boost::thread(&StoreSession::export_proc, this, snapshot);
+        return !_has_error;
     }
 
     _error.clear();
@@ -1192,5 +1123,166 @@ double StoreSession::get_integer(GVariant *var)
     return val;
 }
 
+QString StoreSession::MakeSaveFile(bool bDlg)
+{
+    QString default_name;
+
+    AppConfig &app = AppConfig::Instance(); 
+    if (app._userHistory.saveDir != "")
+    {
+        default_name = app._userHistory.saveDir + "/"  + _session.get_device()->name() + "-";
+    } 
+    else{
+        QDir _dir;
+        QString _root = _dir.home().path();                
+        default_name =  _root + "/" + _session.get_device()->name() + "-";
+    } 
+
+    for (const GSList *l = _session.get_device()->get_dev_mode_list();
+         l; l = l->next) {
+        const sr_dev_mode *mode = (const sr_dev_mode *)l->data;
+        if (_session.get_device()->dev_inst()->mode == mode->mode) {
+            default_name += mode->acronym;
+            break;
+        }
+    }
+
+    default_name += _session.get_session_time().toString("-yyMMdd-hhmmss");
+
+    // Show the dialog
+    if (bDlg)
+    {
+        default_name = QFileDialog::getSaveFileName(
+            NULL,
+            tr("Save File"),
+            default_name,
+            tr("DSView Data (*.dsl)"));
+
+        if (default_name.isEmpty())
+        {
+            return ""; //no select file
+        }
+
+        QString _dir_path = GetDirectoryName(default_name);
+
+        if (_dir_path != app._userHistory.saveDir)
+        {
+            app._userHistory.saveDir = _dir_path;
+            app.SaveHistory();
+        }
+    }
+
+    QFileInfo f(default_name);
+    if (f.suffix().compare("dsl"))
+    {
+        default_name.append(tr(".dsl"));
+    }
+    _file_name = default_name;
+    return default_name;     
+}
+
+QString StoreSession::MakeExportFile(bool bDlg)
+{
+    QString default_name;
+    AppConfig &app = AppConfig::Instance();  
+    
+    if (app._userHistory.exportDir != "")
+    {
+        default_name = app._userHistory.exportDir  + "/"  + _session.get_device()->name() + "-";
+    } 
+    else{
+        QDir _dir;
+        QString _root = _dir.home().path();    
+        default_name =  _root + "/" + _session.get_device()->name() + "-";
+    }  
+
+    for (const GSList *l = _session.get_device()->get_dev_mode_list();
+         l; l = l->next) {
+        const sr_dev_mode *mode = (const sr_dev_mode *)l->data;
+        if (_session.get_device()->dev_inst()->mode == mode->mode) {
+            default_name += mode->acronym;
+            break;
+        }
+    }
+    default_name += _session.get_session_time().toString("-yyMMdd-hhmmss");
+
+    //ext name
+    QList<QString> supportedFormats = getSuportedExportFormats();
+    QString filter;
+    for(int i = 0; i < supportedFormats.count();i++){
+        filter.append(supportedFormats[i]);
+        if(i < supportedFormats.count() - 1)
+            filter.append(";;");
+    }
+
+    QString selfilter;
+    if (app._userHistory.exportFormat != ""){
+        selfilter.append(app._userHistory.exportFormat);
+    }
+
+    if (bDlg)
+    {
+        default_name = QFileDialog::getSaveFileName(
+            NULL,
+            tr("Export Data"),
+            default_name,
+            filter,
+            &selfilter);
+
+        if (default_name == "")
+        {
+            return "";
+        }
+
+        bool bChange = false;
+        QString _dir_path = GetDirectoryName(default_name);
+        if (_dir_path != app._userHistory.exportDir)
+        {
+            app._userHistory.exportDir = _dir_path;
+            bChange = true;
+        }
+        if (selfilter != app._userHistory.exportFormat){
+            app._userHistory.exportFormat = selfilter;
+             bChange = true;            
+        }
+
+        if (bChange){
+            app.SaveHistory();            
+        }
+    }
+
+    QString extName = selfilter;
+    if (extName == ""){
+        extName = filter;
+    }
+
+    QStringList list = extName.split('.').last().split(')');
+    _suffix = list.first();
+
+    QFileInfo f(default_name);
+    if(f.suffix().compare(_suffix)){
+         default_name += tr(".") + _suffix;
+    }           
+
+    _file_name = default_name;
+    return default_name;    
+}
+
+bool StoreSession::IsLogicDataType()
+{
+    std::set<int> type_set;
+    BOOST_FOREACH(const boost::shared_ptr<view::Signal> sig, _session.get_signals()) {
+        assert(sig);
+        type_set.insert(sig->get_type());
+    }
+
+    if (type_set.size()){
+        int type = *(type_set.begin());
+        return type == SR_CHANNEL_LOGIC;
+    }
+
+    return false;
+}
+
 
 } // pv
diff --git a/DSView/pv/storesession.h b/DSView/pv/storesession.h
index 75dcbb2a..d7c201ca 100755
--- a/DSView/pv/storesession.h
+++ b/DSView/pv/storesession.h
@@ -63,7 +63,7 @@ public:
 
 	const QString& error() const;
 
-    bool save_start(QString session_file);
+    bool save_start();
 
     bool export_start();
 
@@ -79,10 +79,16 @@ private:
     QString decoders_gen();
  
 
-public:
-    
+public:    
     QJsonArray json_decoders();
     void load_decoders(dock::ProtocolDock *widget, QJsonArray dec_array);
+    QString MakeSaveFile(bool bDlg);
+    QString MakeExportFile(bool bDlg);
+
+    inline QString GetFileName()
+        { return _file_name;}
+
+    bool IsLogicDataType();
  
 
 private:
@@ -92,22 +98,24 @@ private:
 signals:
 	void progress_updated();
 
-private:
-    QString _file_name;
-    QString _suffix;
-    SigSession &_session;
+public:
+    QString          _sessionFile;
 
-	boost::thread _thread;
+private:
+    QString         _file_name;
+    QString         _suffix;
+    SigSession      &_session;
+
+	boost::thread   _thread;
 
     const struct sr_output_module* _outModule;
-
-    //mutable boost::mutex _mutex;
-	uint64_t _units_stored;
-	uint64_t _unit_count;
-    bool _has_error;
-	QString _error;
-    bool _canceled;
-    ZipMaker m_zipDoc;
+ 
+	uint64_t        _units_stored;
+	uint64_t        _unit_count;
+    bool            _has_error;
+	QString         _error;
+    bool            _canceled;
+    ZipMaker        m_zipDoc;
 };
 
 } // pv
diff --git a/libsigrok4DSL/libsigrok.h b/libsigrok4DSL/libsigrok.h
index 1409514d..d36dffcf 100755
--- a/libsigrok4DSL/libsigrok.h
+++ b/libsigrok4DSL/libsigrok.h
@@ -176,6 +176,7 @@ enum {
 #define SR_PRIV
 #endif
 
+  
 /** Data types used by sr_config_info(). */
 enum {
 	SR_T_UINT64 = 10000,
diff --git a/libsigrok4DSL/output/csv.c b/libsigrok4DSL/output/csv.c
index 47a85dd6..ad95756b 100755
--- a/libsigrok4DSL/output/csv.c
+++ b/libsigrok4DSL/output/csv.c
@@ -26,6 +26,7 @@
 #include "config.h" /* Needed for PACKAGE_STRING and others. */
 
 #define LOG_PREFIX "output/csv"
+ 
 
 struct context {
 	unsigned int num_enabled_channels;
@@ -234,10 +235,16 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 			*out = g_string_sized_new(512);
 		}
 
+        int bflag = sr_get_export_original_flag();
+
 		for (i = 0; i <= logic->length - logic->unitsize; i += logic->unitsize) {
             ctx->index++;
-            if (ctx->index > 1 && (*(uint64_t *)(logic->data + i) & ctx->mask) == ctx->pre_data)
-                continue;
+
+            if (bflag == 0){
+                if (ctx->index > 1 && (*(uint64_t *)(logic->data + i) & ctx->mask) == ctx->pre_data)
+                   continue;
+            } 
+
             g_string_append_printf(*out, "%0.10g", (ctx->index-1)*1.0/ctx->samplerate);
             for (j = 0; j < ctx->num_enabled_channels; j++) {
                 //idx = ctx->channel_index[j];
@@ -331,3 +338,4 @@ SR_PRIV struct sr_output_module output_csv = {
 	.receive = receive,
 	.cleanup = cleanup,
 };
+ 
diff --git a/libsigrok4DSL/proto.h b/libsigrok4DSL/proto.h
index aeac6b81..81452c3a 100755
--- a/libsigrok4DSL/proto.h
+++ b/libsigrok4DSL/proto.h
@@ -179,4 +179,12 @@ SR_PRIV uint16_t ds_trigger_get_edge0(uint16_t stage, uint16_t msc, uint16_t lsc
 SR_PRIV uint16_t ds_trigger_get_mask1(uint16_t stage, uint16_t msc, uint16_t lsc, gboolean qutr_mode, gboolean half_mode);
 SR_PRIV uint16_t ds_trigger_get_value1(uint16_t stage, uint16_t msc, uint16_t lsc, gboolean qutr_mode, gboolean half_mode);
 SR_PRIV uint16_t ds_trigger_get_edge1(uint16_t stage, uint16_t msc, uint16_t lsc, gboolean qutr_mode, gboolean half_mode);
+
+/*--------------------session.c----------------*/
+
+SR_API void sr_set_export_original_data(int flag);
+
+SR_API int sr_get_export_original_flag();
+
+
 #endif
diff --git a/libsigrok4DSL/session.c b/libsigrok4DSL/session.c
index f3f822f1..34923f4c 100755
--- a/libsigrok4DSL/session.c
+++ b/libsigrok4DSL/session.c
@@ -34,6 +34,8 @@
 #define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
 #define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
 
+int bExportOriginalData = 0; //able export all data
+
 /**
  * @file
  *
@@ -813,4 +815,14 @@ SR_API int sr_session_source_remove_channel(GIOChannel *channel)
 	return _sr_session_source_remove((gintptr)channel);
 }
 
+SR_API void sr_set_export_original_data(int flag)
+{
+	bExportOriginalData = flag;
+}
+
+SR_API int sr_get_export_original_flag()
+{
+	return bExportOriginalData;
+}
+
 /** @} */

From 73a5b5fc783b8dba0e9e35d2049de725b65c2d93 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Thu, 28 Oct 2021 18:51:16 +0800
Subject: [PATCH 15/58] none

---
 DSView/pv/config/appconfig.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DSView/pv/config/appconfig.h b/DSView/pv/config/appconfig.h
index ffea3327..d2dbab50 100644
--- a/DSView/pv/config/appconfig.h
+++ b/DSView/pv/config/appconfig.h
@@ -29,7 +29,7 @@
 
 using namespace std;
 
-//--------------------api
+//--------------------api --
 
 QString GetDirectoryName(QString path);
 

From 7e8eb387771ac2fb6122c4ce6ee778b5fd06fd9e Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Fri, 29 Oct 2021 08:55:48 +0800
Subject: [PATCH 16/58] none

---
 DSView/pv/config/appconfig.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DSView/pv/config/appconfig.h b/DSView/pv/config/appconfig.h
index d2dbab50..eb4f884b 100644
--- a/DSView/pv/config/appconfig.h
+++ b/DSView/pv/config/appconfig.h
@@ -29,7 +29,7 @@
 
 using namespace std;
 
-//--------------------api --
+//--------------------api---
 
 QString GetDirectoryName(QString path);
 

From aa3722b24296f269642d723129f37828b6267d8c Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Fri, 29 Oct 2021 11:07:14 +0800
Subject: [PATCH 17/58] rename toolbar signals name

---
 DSView/pv/config/appconfig.h       |  1 +
 DSView/pv/data/logicsnapshot.cpp   |  5 +-
 DSView/pv/mainwindow.cpp           | 98 ++++++++++++++++++------------
 DSView/pv/mainwindow.h             | 42 ++++++++-----
 DSView/pv/toolbars/filebar.cpp     | 14 ++---
 DSView/pv/toolbars/filebar.h       | 12 ++--
 DSView/pv/toolbars/logobar.cpp     |  6 +-
 DSView/pv/toolbars/logobar.h       |  4 +-
 DSView/pv/toolbars/samplingbar.cpp | 53 ++++++++--------
 DSView/pv/toolbars/samplingbar.h   | 14 ++---
 DSView/pv/toolbars/titlebar.cpp    |  2 +-
 DSView/pv/toolbars/trigbar.cpp     | 20 +++---
 DSView/pv/toolbars/trigbar.h       | 12 ++--
 13 files changed, 157 insertions(+), 126 deletions(-)

diff --git a/DSView/pv/config/appconfig.h b/DSView/pv/config/appconfig.h
index eb4f884b..7bae2732 100644
--- a/DSView/pv/config/appconfig.h
+++ b/DSView/pv/config/appconfig.h
@@ -45,6 +45,7 @@ public:
    string m_value;
 };
 
+
 struct AppOptions
 {   
     bool  quickScroll;
diff --git a/DSView/pv/data/logicsnapshot.cpp b/DSView/pv/data/logicsnapshot.cpp
index 05426722..2dd3027e 100755
--- a/DSView/pv/data/logicsnapshot.cpp
+++ b/DSView/pv/data/logicsnapshot.cpp
@@ -473,8 +473,9 @@ const uint8_t *LogicSnapshot::get_samples(uint64_t start_sample, uint64_t &end_s
                                      int sig_index)
 {
     //assert(data);
-    assert(start_sample < get_sample_count());
-    assert(end_sample <= get_sample_count());
+    uint64_t sample_count = get_sample_count();
+    assert(start_sample < sample_count);
+    assert(end_sample <= sample_count);
     assert(start_sample <= end_sample);
 
     int order = get_ch_order(sig_index);
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index ffe8662c..029d1e0c 100755
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -259,47 +259,55 @@ void MainWindow::setup_ui()
     connect(&_session, SIGNAL(capture_state_changed(int)), this, SLOT(capture_state_changed(int)));
     connect(&_session, SIGNAL(device_attach()), this, SLOT(device_attach()), Qt::QueuedConnection);
     connect(&_session, SIGNAL(device_detach()), this, SLOT(device_detach()), Qt::QueuedConnection);
-    connect(&_session, SIGNAL(session_error()), this, SLOT(show_error()), Qt::QueuedConnection);
+    connect(&_session, SIGNAL(session_error()), this, SLOT(on_show_error()), Qt::QueuedConnection);
     connect(&_session, SIGNAL(session_save()), this, SLOT(session_save()));
     connect(&_session, SIGNAL(data_updated()), _measure_widget, SLOT(reCalc()));
     connect(&_session, SIGNAL(repeat_resume()), this, SLOT(repeat_resume()));
     connect(&_session, SIGNAL(update_capture()), _view, SLOT(update_hori_res()), Qt::DirectConnection);
     connect(&_session, SIGNAL(cur_snap_samplerate_changed()), _measure_widget, SLOT(cursor_update()));
+
+    //view
     connect(_view, SIGNAL(cursor_update()), _measure_widget, SLOT(cursor_update()));
     connect(_view, SIGNAL(cursor_moving()), _measure_widget, SLOT(cursor_moving()));
     connect(_view, SIGNAL(cursor_moved()), _measure_widget, SLOT(reCalc()));
     connect(_view, SIGNAL(prgRate(int)), this, SIGNAL(prgRate(int)));
     connect(_view, SIGNAL(device_changed(bool)), this, SLOT(device_changed(bool)), Qt::DirectConnection);
+    connect(_view, SIGNAL(auto_trig(int)), _dso_trigger_widget, SLOT(auto_trig(int)));
 
-    //tool bar event
-    connect(_trig_bar, SIGNAL(on_protocol(bool)), this, SLOT(on_protocol(bool)));
-    connect(_trig_bar, SIGNAL(on_trigger(bool)), this, SLOT(on_trigger(bool)));
-    connect(_trig_bar, SIGNAL(on_measure(bool)), this, SLOT(on_measure(bool)));
-    connect(_trig_bar, SIGNAL(on_search(bool)), this, SLOT(on_search(bool)));
-    connect(_trig_bar, SIGNAL(setTheme(QString)), this, SLOT(switchTheme(QString)));
-    connect(_file_bar, SIGNAL(load_file(QString)), this, SLOT(load_file(QString)));
-    connect(_file_bar, SIGNAL(on_save()), this, SLOT(on_save()));
-    connect(_file_bar, SIGNAL(on_export()), this, SLOT(on_export()));
-    connect(_file_bar, SIGNAL(on_screenShot()), this, SLOT(on_screenShot()), Qt::QueuedConnection);
-    connect(_file_bar, SIGNAL(load_session(QString)), this, SLOT(load_session(QString)));
-    connect(_file_bar, SIGNAL(store_session(QString)), this, SLOT(store_session(QString)));
-    connect(_logo_bar, SIGNAL(setLanguage(int)), this, SLOT(switchLanguage(int)));
-    connect(_logo_bar, SIGNAL(openDoc()), this, SLOT(openDoc()));
+    //trig_bar
+    connect(_trig_bar, SIGNAL(sig_protocol(bool)), this, SLOT(on_protocol(bool)));
+    connect(_trig_bar, SIGNAL(sig_trigger(bool)), this, SLOT(on_trigger(bool)));
+    connect(_trig_bar, SIGNAL(sig_measure(bool)), this, SLOT(on_measure(bool)));
+    connect(_trig_bar, SIGNAL(sig_search(bool)), this, SLOT(on_search(bool)));
+    connect(_trig_bar, SIGNAL(sig_setTheme(QString)), this, SLOT(switchTheme(QString)));
+    connect(_trig_bar, SIGNAL(sig_show_lissajous(bool)), _view, SLOT(show_lissajous(bool)));
+
+    //file toolbar
+    connect(_file_bar, SIGNAL(sig_load_file(QString)), this, SLOT(on_load_file(QString)));
+    connect(_file_bar, SIGNAL(sig_save()), this, SLOT(on_save()));
+    connect(_file_bar, SIGNAL(sig_export()), this, SLOT(on_export()));
+    connect(_file_bar, SIGNAL(sig_screenShot()), this, SLOT(on_screenShot()), Qt::QueuedConnection);
+    connect(_file_bar, SIGNAL(sig_load_session(QString)), this, SLOT(on_load_session(QString)));
+    connect(_file_bar, SIGNAL(sig_store_session(QString)), this, SLOT(on_store_session(QString)));
+
+    //logobar
+    connect(_logo_bar, SIGNAL(sig_setLanguage(int)), this, SLOT(on_setLanguage(int)));
+    connect(_logo_bar, SIGNAL(sig_open_doc()), this, SLOT(on_open_doc()));
 
 
     connect(_protocol_widget, SIGNAL(protocol_updated()), _view, SLOT(signals_changed()));
 
+    //SamplingBar
+    connect(_sampling_bar, SIGNAL(sig_device_selected()), this, SLOT(on_device_selected()));
+    connect(_sampling_bar, SIGNAL(sig_device_updated()), this, SLOT(on_device_updated_reload()));
+    connect(_sampling_bar, SIGNAL(sig_run_stop()), this, SLOT(on_run_stop()));
+    connect(_sampling_bar, SIGNAL(sig_instant_stop()), this, SLOT(on_instant_stop()));
+    connect(_sampling_bar, SIGNAL(sig_duration_changed()), _trigger_widget, SLOT(device_updated()));
+    connect(_sampling_bar, SIGNAL(sig_duration_changed()), _view, SLOT(timebase_changed()));
+    connect(_sampling_bar, SIGNAL(sig_show_calibration()), _view, SLOT(show_calibration()));
 
-    connect(_sampling_bar, SIGNAL(device_selected()), this, SLOT(update_device_list()));
-    connect(_sampling_bar, SIGNAL(device_updated()), this, SLOT(reload()));
-    connect(_sampling_bar, SIGNAL(run_stop()), this, SLOT(run_stop()));
-    connect(_sampling_bar, SIGNAL(instant_stop()), this, SLOT(instant_stop()));
-    connect(_sampling_bar, SIGNAL(duration_changed()), _trigger_widget, SLOT(device_updated()));
-    connect(_sampling_bar, SIGNAL(duration_changed()), _view, SLOT(timebase_changed()));
-    connect(_sampling_bar, SIGNAL(show_calibration()), _view, SLOT(show_calibration()));
-    connect(_trig_bar, SIGNAL(show_lissajous(bool)), _view, SLOT(show_lissajous(bool)));
     connect(_dso_trigger_widget, SIGNAL(set_trig_pos(int)), _view, SLOT(set_trig_pos(int)));
-    connect(_view, SIGNAL(auto_trig(int)), _dso_trigger_widget, SLOT(auto_trig(int)));
+  
 }
 
 
@@ -320,6 +328,11 @@ void MainWindow::session_error(
 		Q_ARG(QString, info_text));
 }
 
+void MainWindow::on_device_selected()
+{
+    update_device_list();
+}
+
 void MainWindow::update_device_list()
 {
     assert(_sampling_bar);
@@ -391,7 +404,7 @@ void MainWindow::update_device_list()
                                selected_device->name() +
                                QString::number(selected_device->dev_inst()->mode) +
                                lang_name + ".dsc";
-            load_session(ses_name);
+            on_load_session(ses_name);
         }
     } else {
         _file_bar->set_settings_en(false);
@@ -409,7 +422,7 @@ void MainWindow::update_device_list()
                                QString::number(selected_device->dev_inst()->mode) +
                                ".dsc";
             if (QFileInfo(ses_name).exists())
-                load_session(ses_name);
+                on_load_session(ses_name);
         }
     }
     _sampling_bar->reload();
@@ -442,14 +455,14 @@ void MainWindow::update_device_list()
 }
 
 
-void MainWindow::reload()
+void MainWindow::on_device_updated_reload()
 {
     _trigger_widget->device_updated();
     _session.reload();
     _measure_widget->reload();
 }
 
-void MainWindow::load_file(QString file_name)
+void MainWindow::on_load_file(QString file_name)
 {
     try {
         if (strncmp(_session.get_device()->name().toUtf8(), "virtual", 7))
@@ -568,7 +581,7 @@ void MainWindow::device_changed(bool close)
     update_device_list();
 }
 
-void MainWindow::run_stop()
+void MainWindow::on_run_stop()
 {
     switch(_session.get_capture_state()) {
     case SigSession::Init:
@@ -586,7 +599,7 @@ void MainWindow::run_stop()
     }
 }
 
-void MainWindow::instant_stop()
+void MainWindow::on_instant_stop()
 {
     switch(_session.get_capture_state()) {
     case SigSession::Init:
@@ -608,10 +621,10 @@ void MainWindow::repeat_resume()
 {
     while(_view->session().get_capture_state() == SigSession::Running)
         QCoreApplication::processEvents();
-    run_stop();
+    on_run_stop();
 }
 
-void MainWindow::show_error()
+void MainWindow::on_show_error()
 {
     QString title;
     QString details;
@@ -725,7 +738,7 @@ void MainWindow::session_save()
                             lang_name + ".dsc";
         if (strncmp(driver_name.toUtf8(), "virtual", 7) &&
             !file_name.isEmpty()) {
-            store_session(file_name);
+            on_store_session(file_name);
         }
     }
  
@@ -875,7 +888,7 @@ void MainWindow::on_save()
         dir.cd(path);
 
         session_file = dir.absolutePath() + "/DSView-session-XXXXXX";
-        store_session(session_file);
+        on_store_session(session_file);
     }
 
     StoreProgress *dlg = new StoreProgress(_session, this);
@@ -891,7 +904,7 @@ void MainWindow::on_export()
     dlg->export_run();
 }
 
-bool MainWindow::load_session(QString name)
+bool MainWindow::on_load_session(QString name)
 {
     QFile sessionFile(name);
     if (!sessionFile.open(QIODevice::ReadOnly)) {
@@ -1101,7 +1114,7 @@ bool MainWindow::load_session_json(QJsonDocument json, bool file_dev)
 }
 
 
-bool MainWindow::store_session(QString name)
+bool MainWindow::on_store_session(QString name)
 {
     QFile sessionFile(name);
     if (!sessionFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
@@ -1249,10 +1262,10 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event)
         QKeyEvent *ke = (QKeyEvent *) event;
         switch(ke->key()) {
         case Qt::Key_S:
-            run_stop();
+            on_run_stop();
             break;
         case Qt::Key_I:
-            instant_stop();
+            on_instant_stop();
             break;
         case Qt::Key_T:
             if (_session.get_device()->dev_inst()->mode == DSO)
@@ -1346,6 +1359,11 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event)
     }
     return false;
 }
+
+ void MainWindow::on_setLanguage(int language)
+ {
+     switchLanguage(language);
+ }
  
 void MainWindow::switchLanguage(int language)
 {
@@ -1393,6 +1411,10 @@ void MainWindow::switchTheme(QString style)
     _session.data_updated();
 }
 
+void MainWindow::on_open_doc(){
+    openDoc();
+}
+
 void MainWindow::openDoc()
 {
     #ifndef Q_OS_LINUX
diff --git a/DSView/pv/mainwindow.h b/DSView/pv/mainwindow.h
index 59fd8d3b..0571aeba 100755
--- a/DSView/pv/mainwindow.h
+++ b/DSView/pv/mainwindow.h
@@ -80,24 +80,32 @@ public:
 protected:
     void closeEvent(QCloseEvent *event);
 
+public:
+    void openDoc();
+
+    void switchLanguage(int language);
+
 private:
 	void setup_ui();
     void retranslateUi();
 	void session_error(const QString text, const QString info_text);
     bool eventFilter(QObject *object, QEvent *event);
 
-public slots:
-    void session_save();
- 
-    void openDoc();
+    bool load_session_json(QJsonDocument json, bool file_dev);
 
-    void switchLanguage(int language);
+    void update_device_list();
+
+public slots:
+    void session_save();  
+    
     void switchTheme(QString style);
 
     void restore_dock();
 
 private slots:
-	void load_file(QString file_name);
+	void on_load_file(QString file_name);
+
+    void on_open_doc();
 
     /**
      * Updates the device list in the sampling bar, and updates the
@@ -105,16 +113,15 @@ private slots:
      * @param selected_device The device to select, or NULL if the
      * first device in the device list should be selected.
      */
-    void update_device_list();
+   
 
-    void reload();
+    void on_device_updated_reload();
 
-    void show_session_error(
-		const QString text, const QString info_text);
+    void show_session_error(const QString text, const QString info_text);
 
-	void run_stop();
+	void on_run_stop();
 
-    void instant_stop();
+    void on_instant_stop();
 
     void capture_state_changed(int state);
 
@@ -134,9 +141,9 @@ private slots:
 
     void on_export();
 
-    bool load_session(QString name);
-    bool load_session_json(QJsonDocument json, bool file_dev);
-    bool store_session(QString name);
+    bool on_load_session(QString name);
+  
+    bool on_store_session(QString name);
 
     /*
      * repeat
@@ -150,12 +157,15 @@ private slots:
     void device_detach();
     void device_detach_post();
     void device_changed(bool close);
+    void on_device_selected();
 
     /*
      * errors
      */
-    void show_error();
+    void on_show_error();
 
+    void on_setLanguage(int language);
+  
 signals:
     void prgRate(int progress);
 
diff --git a/DSView/pv/toolbars/filebar.cpp b/DSView/pv/toolbars/filebar.cpp
index 14a337f7..4a3b8663 100755
--- a/DSView/pv/toolbars/filebar.cpp
+++ b/DSView/pv/toolbars/filebar.cpp
@@ -91,8 +91,8 @@ FileBar::FileBar(SigSession &session, QWidget *parent) :
     connect(_action_store, SIGNAL(triggered()), this, SLOT(on_actionStore_triggered()));
     connect(_action_default, SIGNAL(triggered()), this, SLOT(on_actionDefault_triggered()));
     connect(_action_open, SIGNAL(triggered()), this, SLOT(on_actionOpen_triggered()));
-    connect(_action_save, SIGNAL(triggered()), this, SIGNAL(on_save()));
-    connect(_action_export, SIGNAL(triggered()), this, SIGNAL(on_export()));
+    connect(_action_save, SIGNAL(triggered()), this, SIGNAL(sig_save()));
+    connect(_action_export, SIGNAL(triggered()), this, SIGNAL(sig_export()));
     connect(_action_capture, SIGNAL(triggered()), this, SLOT(on_actionCapture_triggered()));
 }
 
@@ -152,7 +152,7 @@ void FileBar::on_actionOpen_triggered()
             app.SaveHistory();
         }
 
-        load_file(file_name);
+        sig_load_file(file_name);
     }
 }
 
@@ -188,7 +188,7 @@ void FileBar::on_actionLoad_triggered()
             app.SaveHistory();
         }
          
-        load_session(file_name);
+        sig_load_session(file_name);
     }
 }
 
@@ -216,7 +216,7 @@ void FileBar::on_actionDefault_triggered()
     QString file_name = dir.absolutePath() + "/" + driver_name + mode_name +
                         ".def"+QString::number(language)+".dsc";
     if (!file_name.isEmpty())
-        load_session(file_name);
+        sig_load_session(file_name);
 }
 
 void FileBar::on_actionStore_triggered()
@@ -242,7 +242,7 @@ void FileBar::on_actionStore_triggered()
             app.SaveHistory();
         }
          
-        store_session(file_name);
+        sig_store_session(file_name);
     }
 }
 
@@ -250,7 +250,7 @@ void FileBar::on_actionCapture_triggered()
 {
     _file_button.close();
     QCoreApplication::sendPostedEvents();
-    QTimer::singleShot(100, this, SIGNAL(on_screenShot()));
+    QTimer::singleShot(100, this, SIGNAL(sig_screenShot()));
 }
 
 void FileBar::enable_toggle(bool enable)
diff --git a/DSView/pv/toolbars/filebar.h b/DSView/pv/toolbars/filebar.h
index 0f55c3db..261d5c31 100755
--- a/DSView/pv/toolbars/filebar.h
+++ b/DSView/pv/toolbars/filebar.h
@@ -57,12 +57,12 @@ private:
         const QString text, const QString info_text);
 
 signals:
-    void load_file(QString); 
-    void on_save();
-    void on_export();
-    void on_screenShot(); //post screen capture event message
-    void load_session(QString); //post load session event message
-    void store_session(QString); //post store session event message
+    void sig_load_file(QString); 
+    void sig_save();
+    void sig_export();
+    void sig_screenShot(); //post screen capture event message
+    void sig_load_session(QString); //post load session event message
+    void sig_store_session(QString); //post store session event message
 
 private slots:
     void on_actionLoad_triggered();
diff --git a/DSView/pv/toolbars/logobar.cpp b/DSView/pv/toolbars/logobar.cpp
index 8b0f8a05..85296798 100755
--- a/DSView/pv/toolbars/logobar.cpp
+++ b/DSView/pv/toolbars/logobar.cpp
@@ -69,7 +69,7 @@ LogoBar::LogoBar(SigSession &session, QWidget *parent) :
     _manual = new QAction(this);
     _manual->setObjectName(QString::fromUtf8("actionManual"));
     _logo_button.addAction(_manual);
-    connect(_manual, SIGNAL(triggered()), this, SIGNAL(openDoc()));
+    connect(_manual, SIGNAL(triggered()), this, SIGNAL(sig_open_doc()));
 
     _issue = new QAction(this);
     _issue->setObjectName(QString::fromUtf8("actionManual"));
@@ -169,14 +169,14 @@ void LogoBar::on_actionEn_triggered()
 {
     _language->setIcon(QIcon::fromTheme("file",
         QIcon(":/icons/English.svg")));
-    setLanguage(QLocale::English);
+    sig_setLanguage(QLocale::English);
 }
 
 void LogoBar::on_actionCn_triggered()
 {
     _language->setIcon(QIcon::fromTheme("file",
         QIcon(":/icons/Chinese.svg")));
-    setLanguage(QLocale::Chinese);   
+    sig_setLanguage(QLocale::Chinese);   
 }
 
 void LogoBar::on_actionAbout_triggered()
diff --git a/DSView/pv/toolbars/logobar.h b/DSView/pv/toolbars/logobar.h
index 691793a7..278def32 100755
--- a/DSView/pv/toolbars/logobar.h
+++ b/DSView/pv/toolbars/logobar.h
@@ -61,10 +61,10 @@ private:
 
 signals:
     //post event message to set language, MainWindow class receive it
-    void setLanguage(int language);  
+    void sig_setLanguage(int language);  
 
     //post event message to open user help document, MainWindow class receive it
-    void openDoc(); 
+    void sig_open_doc(); 
 
 private slots:
     void on_actionEn_triggered();
diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp
index 2f3bd4fb..46302c9c 100755
--- a/DSView/pv/toolbars/samplingbar.cpp
+++ b/DSView/pv/toolbars/samplingbar.cpp
@@ -74,32 +74,17 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
     setContentsMargins(0,0,0,0);
     layout()->setMargin(0);
     layout()->setSpacing(0);
-
-    connect(&_device_selector, SIGNAL(currentIndexChanged (int)),
-        this, SLOT(on_device_selected()));
-    connect(&_configure_button, SIGNAL(clicked()),
-        this, SLOT(on_configure()));
-	connect(&_run_stop_button, SIGNAL(clicked()),
-        this, SLOT(on_run_stop()), Qt::DirectConnection);
-    connect(&_instant_button, SIGNAL(clicked()),
-        this, SLOT(on_instant_stop()));
-
+ 
     _mode_button.setPopupMode(QToolButton::InstantPopup);
 
     _device_selector.setSizeAdjustPolicy(QComboBox::AdjustToContents);
     _sample_rate.setSizeAdjustPolicy(QComboBox::AdjustToContents);
     _sample_count.setSizeAdjustPolicy(QComboBox::AdjustToContents);
     _device_selector.setMaximumWidth(ComboBoxMaxWidth);
-
-    connect(&_sample_count, SIGNAL(currentIndexChanged(int)),
-        this, SLOT(on_samplecount_sel(int)));
-
+ 
     //_run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     _run_stop_button.setObjectName(tr("run_stop_button"));
-
-    connect(&_sample_rate, SIGNAL(currentIndexChanged(int)),
-        this, SLOT(on_samplerate_sel(int)));
-
+ 
     QWidget *leftMargin = new QWidget(this);
     leftMargin->setFixedWidth(4);
     addWidget(leftMargin);
@@ -115,10 +100,8 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
     addWidget(&_sample_rate);
 
     _action_single = new QAction(this);
-    connect(_action_single, SIGNAL(triggered()), this, SLOT(on_mode()));
 
     _action_repeat = new QAction(this);
-    connect(_action_repeat, SIGNAL(triggered()), this, SLOT(on_mode()));
 
     _mode_menu = new QMenu(this);
     _mode_menu->addAction(_action_single);
@@ -135,6 +118,15 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
 
     set_sampling(false);
     //retranslateUi();
+
+    connect(&_device_selector, SIGNAL(currentIndexChanged (int)), this, SLOT(on_device_selected()));
+    connect(&_configure_button, SIGNAL(clicked()),this, SLOT(on_configure()));
+	connect(&_run_stop_button, SIGNAL(clicked()),this, SLOT(on_run_stop()), Qt::DirectConnection);
+    connect(&_instant_button, SIGNAL(clicked()), this, SLOT(on_instant_stop()));
+    connect(&_sample_count, SIGNAL(currentIndexChanged(int)), this, SLOT(on_samplecount_sel(int)));
+    connect(_action_single, SIGNAL(triggered()), this, SLOT(on_mode()));
+    connect(_action_repeat, SIGNAL(triggered()), this, SLOT(on_mode()));
+    connect(&_sample_rate, SIGNAL(currentIndexChanged(int)), this, SLOT(on_samplerate_sel(int)));
 }
 
 void SamplingBar::changeEvent(QEvent *event)
@@ -286,7 +278,7 @@ boost::shared_ptr<pv::device::DevInst> SamplingBar::get_selected_device() const
 
 void SamplingBar::on_configure()
 {
-    hide_calibration();
+    sig_hide_calibration();
 
     int  ret;
     boost::shared_ptr<pv::device::DevInst> dev_inst = get_selected_device();
@@ -295,7 +287,7 @@ void SamplingBar::on_configure()
     pv::dialogs::DeviceOptions dlg(this, dev_inst);
     ret = dlg.exec();
     if (ret == QDialog::Accepted) {
-        device_updated();
+        sig_device_updated();
         update_sample_rate_selector();
 
         GVariant* gvar;
@@ -315,7 +307,7 @@ void SamplingBar::on_configure()
                 bool cali = g_variant_get_boolean(gvar);
                 g_variant_unref(gvar);
                 if (cali) {
-                    show_calibration();
+                    sig_show_calibration();
                     return;
                 }
             }
@@ -353,7 +345,7 @@ void SamplingBar::zero_adj()
     _sample_count.setCurrentIndex(i);
     commit_hori_res();
 
-    run_stop();
+    sig_run_stop();
 
     pv::dialogs::WaitingDialog wait(this, _session, SR_CONF_ZERO);
     if (wait.start() == QDialog::Rejected) {
@@ -717,7 +709,7 @@ void SamplingBar::on_samplecount_sel(int index)
     const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
     if (dev_inst->dev_inst()->mode == DSO)
         commit_hori_res();
-    duration_changed();
+    sig_duration_changed();
 }
 
 double SamplingBar::get_hori_res()
@@ -857,7 +849,8 @@ void SamplingBar::on_run_stop()
                 }
             }
         }
-        run_stop();
+
+        sig_run_stop();
     }
 }
 
@@ -882,9 +875,12 @@ void SamplingBar::on_instant_stop()
         enable_instant(false);
         commit_settings();
         _instant = true;
+
         const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
+
         if (!dev_inst)
             return;
+
         if (dev_inst->dev_inst()->mode == DSO) {
             GVariant* gvar = dev_inst->get_config(NULL, NULL, SR_CONF_ZERO);
             if (gvar != NULL) {
@@ -909,7 +905,8 @@ void SamplingBar::on_instant_stop()
                 }
             }
         }
-        instant_stop();
+
+        sig_instant_stop();
     }
 }
 
@@ -930,7 +927,7 @@ void SamplingBar::on_device_selected()
     } catch(QString e) {
         show_session_error(tr("Failed to select ") + dev_inst->dev_inst()->model, e);
     }
-    device_selected();
+    sig_device_selected();
 }
 
 void SamplingBar::enable_toggle(bool enable)
diff --git a/DSView/pv/toolbars/samplingbar.h b/DSView/pv/toolbars/samplingbar.h
index a19298b9..ee3ce6d8 100755
--- a/DSView/pv/toolbars/samplingbar.h
+++ b/DSView/pv/toolbars/samplingbar.h
@@ -99,13 +99,13 @@ namespace pv
             void set_sample_rate(uint64_t sample_rate);
 
         signals:
-            void run_stop();
-            void instant_stop();
-            void device_selected();
-            void device_updated();
-            void duration_changed();
-            void show_calibration();
-            void hide_calibration();
+            void sig_run_stop();
+            void sig_instant_stop();
+            void sig_device_selected();
+            void sig_device_updated();
+            void sig_duration_changed();
+            void sig_show_calibration();
+            void sig_hide_calibration();
 
         private:
             void changeEvent(QEvent *event);
diff --git a/DSView/pv/toolbars/titlebar.cpp b/DSView/pv/toolbars/titlebar.cpp
index 42c2fc64..6d7b58bb 100755
--- a/DSView/pv/toolbars/titlebar.cpp
+++ b/DSView/pv/toolbars/titlebar.cpp
@@ -69,7 +69,7 @@ TitleBar::TitleBar(bool top, QWidget *parent, bool hasClose) :
         _lay->addWidget(_minimizeButton);
         _lay->addWidget(_maximizeButton);
 
-        connect(this, SIGNAL( normalShow() ), parent, SLOT(showNormal() ) );
+        connect(this, SIGNAL(normalShow() ), parent, SLOT(showNormal() ) );
         connect(this, SIGNAL( maximizedShow() ), parent, SLOT(showMaximized() ) );
         connect(_minimizeButton, SIGNAL( clicked() ), parent, SLOT(showMinimized() ) );
         connect(_maximizeButton, SIGNAL( clicked() ), this, SLOT(showMaxRestore() ) );
diff --git a/DSView/pv/toolbars/trigbar.cpp b/DSView/pv/toolbars/trigbar.cpp
index dcccb3ea..7fa25e17 100755
--- a/DSView/pv/toolbars/trigbar.cpp
+++ b/DSView/pv/toolbars/trigbar.cpp
@@ -185,12 +185,12 @@ void TrigBar::reStyle()
 
 void TrigBar::protocol_clicked()
 {
-    on_protocol(_protocol_button.isChecked());
+    sig_protocol(_protocol_button.isChecked());
 }
 
 void TrigBar::trigger_clicked()
 {
-    on_trigger(_trig_button.isChecked());
+    sig_trigger(_trig_button.isChecked());
 }
 
 void TrigBar::update_trig_btn(bool checked)
@@ -215,12 +215,12 @@ void TrigBar::update_search_btn(bool checked)
 
 void TrigBar::measure_clicked()
 {
-    on_measure(_measure_button.isChecked());
+    sig_measure(_measure_button.isChecked());
 }
 
 void TrigBar::search_clicked()
 {
-    on_search(_search_button.isChecked());
+    sig_search(_search_button.isChecked());
 }
 
 void TrigBar::enable_toggle(bool enable)
@@ -242,19 +242,19 @@ void TrigBar::close_all()
 {
     if (_trig_button.isChecked()) {
         _trig_button.setChecked(false);
-        on_trigger(false);
+        sig_trigger(false);
     }
     if (_protocol_button.isChecked()) {
         _protocol_button.setChecked(false);
-        on_protocol(false);
+        sig_protocol(false);
     }
     if (_measure_button.isChecked()) {
         _measure_button.setChecked(false);
-        on_measure(false);
+        sig_measure(false);
     }
     if(_search_button.isChecked()) {
         _search_button.setChecked(false);
-        on_search(false);
+        sig_search(false);
     }
 }
 
@@ -301,13 +301,13 @@ void TrigBar::on_actionMath_triggered()
 
 void TrigBar::on_actionDark_triggered()
 {
-    setTheme(DARK_STYLE);
+    sig_setTheme(DARK_STYLE);
     _themes->setIcon(QIcon(":/icons/"+DARK_STYLE+"/"+DARK_STYLE+".svg"));
 }
 
 void TrigBar::on_actionLight_triggered()
 {
-    setTheme(LIGHT_STYLE);
+    sig_setTheme(LIGHT_STYLE);
     _themes->setIcon(QIcon(":/icons/"+LIGHT_STYLE+"/"+LIGHT_STYLE+".svg"));
 }
 
diff --git a/DSView/pv/toolbars/trigbar.h b/DSView/pv/toolbars/trigbar.h
index 65764299..58f07f05 100755
--- a/DSView/pv/toolbars/trigbar.h
+++ b/DSView/pv/toolbars/trigbar.h
@@ -58,12 +58,12 @@ private:
     void reStyle();
 
 signals:
-    void setTheme(QString style);
-    void on_protocol(bool visible); //post decode button click event,to show or hide protocol property panel
-    void on_trigger(bool visible); //post decode button click event,to show or hide trigger property panel
-    void on_measure(bool visible);//post decode button click event,to show or hide measure property panel
-    void on_search(bool visible);
-    void show_lissajous(bool visible);
+    void sig_setTheme(QString style);
+    void sig_protocol(bool visible); //post decode button click event,to show or hide protocol property panel
+    void sig_trigger(bool visible); //post decode button click event,to show or hide trigger property panel
+    void sig_measure(bool visible);//post decode button click event,to show or hide measure property panel
+    void sig_search(bool visible);
+    void sig_show_lissajous(bool visible);
 
 private slots:
     void on_actionDark_triggered();

From 9361684c63669a65d07bf7820c4adb1ae424973d Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Mon, 1 Nov 2021 16:50:27 +0800
Subject: [PATCH 18/58] remove DevInst shared_ptr

---
 DSView/main.cpp                        |  95 ++++----
 DSView/pv/appcontrol.cpp               | 123 ++++++++++
 DSView/pv/appcontrol.h                 |  68 ++++++
 DSView/pv/config/appconfig.cpp         |   5 +
 DSView/pv/config/appconfig.h           |   1 +
 DSView/pv/data/decoderstack.cpp        |  10 +-
 DSView/pv/data/decoderstack.h          |   4 +-
 DSView/pv/data/mathstack.cpp           |   2 +-
 DSView/pv/data/mathstack.h             |   4 +-
 DSView/pv/data/spectrumstack.cpp       |   4 +-
 DSView/pv/data/spectrumstack.h         |   4 +-
 DSView/pv/device/device.cpp            |   7 +
 DSView/pv/device/device.h              |   4 +-
 DSView/pv/device/devinst.cpp           |   6 +-
 DSView/pv/device/devinst.h             |  30 +--
 DSView/pv/device/file.cpp              |   4 +
 DSView/pv/device/file.h                |   3 +
 DSView/pv/devicemanager.cpp            |  93 ++++----
 DSView/pv/devicemanager.h              |  33 +--
 DSView/pv/dialogs/calibration.cpp      |   2 +-
 DSView/pv/dialogs/calibration.h        |   6 +-
 DSView/pv/dialogs/deviceoptions.cpp    |   4 +-
 DSView/pv/dialogs/deviceoptions.h      |   6 +-
 DSView/pv/dialogs/dsomeasure.cpp       |   8 +-
 DSView/pv/dialogs/dsomeasure.h         |   4 +-
 DSView/pv/dialogs/fftoptions.cpp       |  18 +-
 DSView/pv/dialogs/fftoptions.h         |   4 +-
 DSView/pv/dialogs/interval.cpp         |   6 +-
 DSView/pv/dialogs/interval.h           |   4 +-
 DSView/pv/dialogs/lissajousoptions.cpp |  16 +-
 DSView/pv/dialogs/lissajousoptions.h   |   4 +-
 DSView/pv/dialogs/mathoptions.cpp      |  10 +-
 DSView/pv/dialogs/mathoptions.h        |   4 +-
 DSView/pv/dialogs/protocolexp.cpp      |  10 +-
 DSView/pv/dialogs/protocolexp.h        |   4 +-
 DSView/pv/dialogs/protocollist.cpp     |  22 +-
 DSView/pv/dialogs/protocollist.h       |   4 +-
 DSView/pv/dialogs/regionoptions.cpp    |  14 +-
 DSView/pv/dialogs/regionoptions.h      |   4 +-
 DSView/pv/dialogs/search.cpp           |   8 +-
 DSView/pv/dialogs/search.h             |   4 +-
 DSView/pv/dialogs/storeprogress.cpp    |   4 +-
 DSView/pv/dialogs/storeprogress.h      |   2 +-
 DSView/pv/dialogs/waitingdialog.cpp    |   8 +-
 DSView/pv/dialogs/waitingdialog.h      |   8 +-
 DSView/pv/dock/dsotriggerdock.cpp      |  32 +--
 DSView/pv/dock/dsotriggerdock.h        |   4 +-
 DSView/pv/dock/measuredock.cpp         |   8 +-
 DSView/pv/dock/measuredock.h           |   4 +-
 DSView/pv/dock/protocoldock.cpp        |  48 ++--
 DSView/pv/dock/protocoldock.h          |   4 +-
 DSView/pv/dock/searchdock.cpp          |   6 +-
 DSView/pv/dock/searchdock.h            |   4 +-
 DSView/pv/dock/triggerdock.cpp         |  22 +-
 DSView/pv/dock/triggerdock.h           |   4 +-
 DSView/pv/mainframe.cpp                |   5 +-
 DSView/pv/mainframe.h                  |   6 +-
 DSView/pv/mainwindow.cpp               | 262 ++++++++++++----------
 DSView/pv/mainwindow.h                 |  25 ++-
 DSView/pv/sigsession.cpp               | 298 +++++++++++++++----------
 DSView/pv/sigsession.h                 | 180 ++++++++-------
 DSView/pv/storesession.cpp             |  86 +++----
 DSView/pv/storesession.h               |   6 +-
 DSView/pv/toolbars/filebar.cpp         |   8 +-
 DSView/pv/toolbars/filebar.h           |   4 +-
 DSView/pv/toolbars/logobar.cpp         |   2 +-
 DSView/pv/toolbars/logobar.h           |   4 +-
 DSView/pv/toolbars/samplingbar.cpp     | 112 +++++-----
 DSView/pv/toolbars/samplingbar.h       |  14 +-
 DSView/pv/toolbars/trigbar.cpp         |   8 +-
 DSView/pv/toolbars/trigbar.h           |   6 +-
 DSView/pv/view/analogsignal.cpp        |   2 +-
 DSView/pv/view/analogsignal.h          |   2 +-
 DSView/pv/view/decodetrace.cpp         |  18 +-
 DSView/pv/view/decodetrace.h           |   4 +-
 DSView/pv/view/devmode.cpp             |  24 +-
 DSView/pv/view/devmode.h               |   4 +-
 DSView/pv/view/dsosignal.cpp           |   2 +-
 DSView/pv/view/dsosignal.h             |   2 +-
 DSView/pv/view/logicsignal.cpp         |   2 +-
 DSView/pv/view/logicsignal.h           |   4 +-
 DSView/pv/view/signal.cpp              |   5 +-
 DSView/pv/view/signal.h                |   9 +-
 DSView/pv/view/spectrumtrace.cpp       |  10 +-
 DSView/pv/view/spectrumtrace.h         |   4 +-
 DSView/pv/view/view.cpp                | 169 +++++++-------
 DSView/pv/view/view.h                  |   6 +-
 DSView/pv/view/viewstatus.cpp          |  16 +-
 DSView/pv/view/viewstatus.h            |   4 +-
 89 files changed, 1228 insertions(+), 909 deletions(-)
 create mode 100644 DSView/pv/appcontrol.cpp
 create mode 100644 DSView/pv/appcontrol.h

diff --git a/DSView/main.cpp b/DSView/main.cpp
index e1714572..862befdf 100755
--- a/DSView/main.cpp
+++ b/DSView/main.cpp
@@ -19,10 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
-
-#include <libsigrok4DSL/libsigrok.h>
-#include <libsigrokdecode4DSL/libsigrokdecode.h>
-
+ 
 #include <stdint.h>
 #include <getopt.h>
 
@@ -35,11 +32,11 @@
 #include <QStyle>
 
 #include "dsapplication.h"
-#include "mystyle.h"
-#include "pv/devicemanager.h"
+#include "mystyle.h" 
 #include "pv/mainframe.h"
 #include "pv/config/appconfig.h"
 #include "config.h"
+#include "pv/appcontrol.h"
 
 char DS_RES_PATH[256];
 
@@ -58,10 +55,9 @@ void usage()
 
 int main(int argc, char *argv[])
 {  
-	int ret = 0;
-	struct sr_context *sr_ctx = NULL;
+	int ret = 0; 
 	const char *open_file = NULL;
-
+ 
     #if QT_VERSION >= QT_VERSION_CHECK(5,6,0)
         QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
         QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
@@ -107,6 +103,8 @@ int main(int argc, char *argv[])
     QApplication::setOrganizationName("DreamSourceLab");
     QApplication::setOrganizationDomain("www.DreamSourceLab.com");
 
+	AppControl *control = AppControl::Instance();
+
 	// Parse arguments
 	while (1) {
 		static const struct option long_options[] = {
@@ -125,12 +123,7 @@ int main(int argc, char *argv[])
 		case 'l':
 		{
 			const int loglevel = atoi(optarg);
-			sr_log_loglevel_set(loglevel);
-
-
-			srd_log_loglevel_set(loglevel);
-
-
+			control->SetLogLevel(loglevel);
 			break;
 		}
 
@@ -166,53 +159,41 @@ int main(int argc, char *argv[])
         return 1;
     }
 
-	// Initialise libsigrok
-	if (sr_init(&sr_ctx) != SR_OK) {
-		qDebug() << "DSView run ERROR: libsigrok init failed.";
+	//load app config
+	AppConfig::Instance().LoadAll();
+
+	//init core
+	if (!control->Init()){
+        fprintf(stderr, "init error!");
+        qDebug() << control->GetLastError();
 		return 1;
 	}
 
-	do {
+	try
+	{  
+	   control->Start();
+	   
+		// Initialise the main frame
+        pv::MainFrame w;
+		w.show(); 
+		w.readSettings();
+		 
+		//to show the dailog for open help document
+		w.show_doc();
 
-		// Initialise libsigrokdecode
-		if (srd_init(NULL) != SRD_OK) {
-			qDebug() << "ERROR: libsigrokdecode init failed.";
-			break;
-		}
+		//Run the application
+		ret = a.exec();
+	}
+	catch (const std::exception &e)
+	{
+        fprintf(stderr, "main() catch a except!");
+		const char *exstr = e.what();
+		qDebug() << exstr;
+	}
 
-		// Load the protocol decoders
-		srd_decoder_load_all();
-
-		//load app config
-		AppConfig::Instance().LoadAll();
-
-		try {
-			// Create the device manager, initialise the drivers
-			pv::DeviceManager device_manager(sr_ctx);
-
-            // Initialise the main frame
-            pv::MainFrame w(device_manager, open_file);
-			w.show();
-            w.readSettings();
-            w.show_doc();  // to show the dailog for open help document
-
-			// Run the application
-            ret = a.exec();
-
-        } catch(const std::exception &e) {
-			qDebug() << e.what();
-		}
-
-
-		// Destroy libsigrokdecode
-		srd_exit();
-
-
-	} while (0);
-
-	// Destroy libsigrok
-	if (sr_ctx)
-		sr_exit(sr_ctx);
+	//uninit
+	control->UnInit();  
+	control->Destroy();
 
 	return ret;
 }
diff --git a/DSView/pv/appcontrol.cpp b/DSView/pv/appcontrol.cpp
new file mode 100644
index 00000000..9cf40035
--- /dev/null
+++ b/DSView/pv/appcontrol.cpp
@@ -0,0 +1,123 @@
+
+/*
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
+ *
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include "appcontrol.h"
+
+#include <libsigrok4DSL/libsigrok.h>
+#include <libsigrokdecode4DSL/libsigrokdecode.h>
+
+#include "devicemanager.h"
+#include "sigsession.h"
+#include "dsvdef.h"
+
+AppControl::AppControl()
+{
+    sr_ctx = NULL;
+
+    _device_manager = new pv::DeviceManager();
+    _session = new pv::SigSession(_device_manager);
+    _session->_appCntrol = this;
+}
+
+AppControl::AppControl(AppControl &o)
+{
+    (void)o;
+}
+ 
+AppControl::~AppControl()
+{
+    DESTROY_OBJECT(_device_manager);
+    DESTROY_OBJECT(_session);
+}
+
+AppControl* AppControl::Instance()
+{
+    static AppControl *ins = NULL;
+    if (ins == NULL){
+        ins = new AppControl();
+    }
+    return ins;
+}
+
+void AppControl::Destroy(){
+    delete this;
+} 
+
+bool AppControl::Init()
+{
+    // Initialise libsigrok
+    if (sr_init(&sr_ctx) != SR_OK)
+    {
+        m_error = "DSView run ERROR: libsigrok init failed.";
+        return false;
+    }
+
+    // Initialise libsigrokdecode
+    if (srd_init(NULL) != SRD_OK)
+    {
+        m_error = "ERROR: libsigrokdecode init failed.";
+        return false;
+    }
+
+    // Load the protocol decoders
+    if (srd_decoder_load_all() != SRD_OK)
+    {
+        m_error = "ERROR: load the protocol decoders failed.";
+        return false;
+    }
+ 
+    return true;
+}
+
+bool AppControl::Start()
+{  
+    _session->Open();
+    _device_manager->initAll(sr_ctx);
+    return true;
+}
+
+void AppControl::UnInit()
+{
+    _session->Close();
+    _device_manager->UnInitAll();    
+    
+    // Destroy libsigrokdecode
+    srd_exit();
+
+    if (sr_ctx)
+    {
+        sr_exit(sr_ctx);
+        sr_ctx = NULL;
+    }
+}
+
+const char *AppControl::GetLastError()
+{
+    return m_error.c_str();
+}
+
+ void AppControl::SetLogLevel(int level)
+ {
+    sr_log_loglevel_set(level);
+	srd_log_loglevel_set(level);
+ }
diff --git a/DSView/pv/appcontrol.h b/DSView/pv/appcontrol.h
new file mode 100644
index 00000000..ff2742b5
--- /dev/null
+++ b/DSView/pv/appcontrol.h
@@ -0,0 +1,68 @@
+
+/*
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
+ *
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#pragma once
+
+#include <string>
+
+struct sr_context;
+
+namespace pv{
+    class DeviceManager;
+    class SigSession;
+}
+
+class AppControl
+{
+private:
+    explicit AppControl();
+    ~AppControl();
+    AppControl(AppControl &o);
+
+public:
+    static AppControl* Instance();
+
+    void Destroy();
+
+    bool Init();
+
+    bool Start();
+
+    void UnInit();
+
+    const char* GetLastError();
+
+    void SetLogLevel(int level);
+
+    inline pv::SigSession*  GetSession()
+        { return _session;}
+
+    inline pv::DeviceManager& GetDeviceManager()
+        { return *_device_manager;}
+
+private:
+    std::string         m_error;
+    struct sr_context   *sr_ctx;
+    pv::DeviceManager   *_device_manager;
+    pv::SigSession      *_session;
+};
diff --git a/DSView/pv/config/appconfig.cpp b/DSView/pv/config/appconfig.cpp
index ae3fcd24..269b261f 100644
--- a/DSView/pv/config/appconfig.cpp
+++ b/DSView/pv/config/appconfig.cpp
@@ -173,6 +173,11 @@ AppConfig::AppConfig()
 { 
 }
 
+AppConfig::AppConfig(AppConfig &o) 
+{
+    (void)o;
+}
+
 AppConfig::~AppConfig()
 {
 }
diff --git a/DSView/pv/config/appconfig.h b/DSView/pv/config/appconfig.h
index 7bae2732..224baf8d 100644
--- a/DSView/pv/config/appconfig.h
+++ b/DSView/pv/config/appconfig.h
@@ -81,6 +81,7 @@ class AppConfig
 private:
   AppConfig();
   ~AppConfig();
+  AppConfig(AppConfig &o);
 
 public:
   static AppConfig &Instance();
diff --git a/DSView/pv/data/decoderstack.cpp b/DSView/pv/data/decoderstack.cpp
index 7f946dd1..c9bbd504 100755
--- a/DSView/pv/data/decoderstack.cpp
+++ b/DSView/pv/data/decoderstack.cpp
@@ -52,7 +52,7 @@ const unsigned int DecoderStack::DecodeNotifyPeriod = 1024;
 
 boost::mutex DecoderStack::_global_decode_mutex;
 
-DecoderStack::DecoderStack(pv::SigSession &session,
+DecoderStack::DecoderStack(pv::SigSession *session,
 	const srd_decoder *const dec, DecoderStatus *decoder_status) :
 	_session(session),
 	_sample_count(0),
@@ -63,11 +63,11 @@ DecoderStack::DecoderStack(pv::SigSession &session,
     _no_memory(false),
     _mark_index(-1)
 {
-	connect(&_session, SIGNAL(frame_began()),
+	connect(_session, SIGNAL(frame_began()),
 		this, SLOT(on_new_frame()));
-	connect(&_session, SIGNAL(data_received()),
+	connect(_session, SIGNAL(data_received()),
 		this, SLOT(on_data_received()));
-	connect(&_session, SIGNAL(frame_ended()),
+	connect(_session, SIGNAL(frame_ended()),
 		this, SLOT(on_frame_ended()));
 
     _stack.push_back(boost::shared_ptr<decode::Decoder>(
@@ -419,7 +419,7 @@ void DecoderStack::begin_decode()
 	// LogicSignals have the same data/snapshot
     BOOST_FOREACH (const boost::shared_ptr<decode::Decoder> &dec, _stack) {
         if (dec && !dec->channels().empty()) {
-            BOOST_FOREACH(boost::shared_ptr<view::Signal> sig, _session.get_signals()) {
+            BOOST_FOREACH(boost::shared_ptr<view::Signal> sig, _session->get_signals()) {
                 if((sig->get_index() == (*dec->channels().begin()).second) &&
                    (logic_signal = dynamic_pointer_cast<view::LogicSignal>(sig)) &&
                    (data = logic_signal->logic_data()))
diff --git a/DSView/pv/data/decoderstack.h b/DSView/pv/data/decoderstack.h
index 311a819f..bc05fa6b 100755
--- a/DSView/pv/data/decoderstack.h
+++ b/DSView/pv/data/decoderstack.h
@@ -79,7 +79,7 @@ public:
     };
 
 public:
-   	DecoderStack(pv::SigSession &_session,
+   	DecoderStack(pv::SigSession *_session,
 		const srd_decoder *const decoder, DecoderStatus *decoder_status);
 
 public:
@@ -168,7 +168,7 @@ signals:
     void decode_done();
 
 private:
-	pv::SigSession &_session;
+	pv::SigSession *_session;
 
 	/**
 	 * This mutex prevents more than one decode operation occuring
diff --git a/DSView/pv/data/mathstack.cpp b/DSView/pv/data/mathstack.cpp
index 759b53b3..072d0dfe 100755
--- a/DSView/pv/data/mathstack.cpp
+++ b/DSView/pv/data/mathstack.cpp
@@ -75,7 +75,7 @@ const QString MathStack::vDialDivUnit[MathStack::vDialUnitCount] = {
     "V/V",
 };
 
-MathStack::MathStack(pv::SigSession &session,
+MathStack::MathStack(pv::SigSession *session,
                      boost::shared_ptr<view::DsoSignal> dsoSig1,
                      boost::shared_ptr<view::DsoSignal> dsoSig2,
                      MathType type) :
diff --git a/DSView/pv/data/mathstack.h b/DSView/pv/data/mathstack.h
index ffb80db4..7f6f9844 100755
--- a/DSView/pv/data/mathstack.h
+++ b/DSView/pv/data/mathstack.h
@@ -102,7 +102,7 @@ private:
     static const QString vDialDivUnit[vDialUnitCount];
 
 public:
-    MathStack(pv::SigSession &_session,
+    MathStack(pv::SigSession *_session,
               boost::shared_ptr<view::DsoSignal> dsoSig1,
               boost::shared_ptr<view::DsoSignal> dsoSig2, MathType type);
     virtual ~MathStack();
@@ -132,7 +132,7 @@ public:
 signals:
 
 private:
-    pv::SigSession &_session;
+    pv::SigSession *_session;
     boost::shared_ptr<view::DsoSignal> _dsoSig1;
     boost::shared_ptr<view::DsoSignal> _dsoSig2;
 
diff --git a/DSView/pv/data/spectrumstack.cpp b/DSView/pv/data/spectrumstack.cpp
index d040eb9b..b54bddff 100755
--- a/DSView/pv/data/spectrumstack.cpp
+++ b/DSView/pv/data/spectrumstack.cpp
@@ -52,7 +52,7 @@ const uint64_t SpectrumStack::length_support[5] = {
     16384,
 };
 
-SpectrumStack::SpectrumStack(pv::SigSession &session, int index) :
+SpectrumStack::SpectrumStack(pv::SigSession *session, int index) :
     _session(session),
     _index(index),
     _dc_ignore(true),
@@ -173,7 +173,7 @@ void SpectrumStack::calc_fft()
     // Get the dso data
     boost::shared_ptr<pv::data::Dso> data;
     boost::shared_ptr<pv::view::DsoSignal> dsoSig;
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session.get_signals()) {
+    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
         if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
             if (dsoSig->get_index() == _index && dsoSig->enabled()) {
                 data = dsoSig->dso_data();
diff --git a/DSView/pv/data/spectrumstack.h b/DSView/pv/data/spectrumstack.h
index caa4d268..82440595 100755
--- a/DSView/pv/data/spectrumstack.h
+++ b/DSView/pv/data/spectrumstack.h
@@ -63,7 +63,7 @@ public:
     };
 
 public:
-    SpectrumStack(pv::SigSession &_session, int index);
+    SpectrumStack(pv::SigSession *_session, int index);
     virtual ~SpectrumStack();
     void clear();
     void init();
@@ -95,7 +95,7 @@ public:
 signals:
 
 private:
-    pv::SigSession &_session;
+    pv::SigSession *_session;
 
     int _index;
     uint64_t _sample_num;
diff --git a/DSView/pv/device/device.cpp b/DSView/pv/device/device.cpp
index 4eb77b33..ab60d5a8 100755
--- a/DSView/pv/device/device.cpp
+++ b/DSView/pv/device/device.cpp
@@ -33,6 +33,13 @@ Device::Device(sr_dev_inst *sdi) :
     _sdi(sdi)
 {
 	assert(_sdi);
+    void *p = this;
+    (void)p;
+}
+
+Device::~Device()
+{
+
 }
 
 sr_dev_inst* Device::dev_inst() const
diff --git a/DSView/pv/device/device.h b/DSView/pv/device/device.h
index f1ec24f1..77ed9abe 100755
--- a/DSView/pv/device/device.h
+++ b/DSView/pv/device/device.h
@@ -28,10 +28,12 @@ namespace pv {
 namespace device {
 
 class Device : public DevInst
-{
+{ 
 public:
 	Device(sr_dev_inst *dev_inst);
 
+	~Device();
+
 	sr_dev_inst* dev_inst() const;
 
     void use(SigSession *owner);
diff --git a/DSView/pv/device/devinst.cpp b/DSView/pv/device/devinst.cpp
index 6aeeeb87..d06858cb 100755
--- a/DSView/pv/device/devinst.cpp
+++ b/DSView/pv/device/devinst.cpp
@@ -61,7 +61,6 @@ void DevInst::release()
 {
 	if (_owner) {
 		_owner->release_device(this);
-		_owner = NULL;
 	}
 }
 
@@ -210,5 +209,10 @@ bool DevInst::is_usable() const
     return _usable;
 }
 
+void DevInst::destroy(){
+	release();
+    delete this;
+}
+
 } // device
 } // pv
diff --git a/DSView/pv/device/devinst.h b/DSView/pv/device/devinst.h
index b7c7f8c3..8039fddd 100755
--- a/DSView/pv/device/devinst.h
+++ b/DSView/pv/device/devinst.h
@@ -22,8 +22,6 @@
 #ifndef DSVIEW_PV_DEVICE_DEVINST_H
 #define DSVIEW_PV_DEVICE_DEVINST_H
 
-#include <boost/shared_ptr.hpp>
-
 #include <QObject>
 
 #include <string>
@@ -48,19 +46,12 @@ class DevInst : public QObject
 
 protected:
 	DevInst();
-    ~DevInst();
 
-public:
-	virtual sr_dev_inst* dev_inst() const = 0;
-
-    virtual void use(SigSession *owner);
-
-	virtual void release();
+    virtual ~DevInst();
 
+public: 
 	SigSession* owner() const;
-
-    virtual QString format_device_title() const = 0;
-
+ 
     GVariant* get_config(const sr_channel *ch, const sr_channel_group *group, int key);
 
     bool set_config(sr_channel *ch, sr_channel_group *group, int key, GVariant *data);
@@ -115,11 +106,12 @@ public:
      * @return device name
      */
     QString name();
-
-	virtual bool is_trigger_enabled() const;
+ 
 
     bool is_usable() const;
 
+    void destroy();
+
 public:
 	virtual void start();
 
@@ -127,6 +119,16 @@ public:
 
     virtual void* get_id() const;
 
+    virtual sr_dev_inst* dev_inst() const = 0;
+
+    virtual void use(SigSession *owner);
+
+	virtual void release();
+
+    virtual bool is_trigger_enabled() const;
+
+    virtual QString format_device_title() const = 0;
+
 signals:
     void device_updated();
 	void config_changed();
diff --git a/DSView/pv/device/file.cpp b/DSView/pv/device/file.cpp
index 7efee676..eb494b04 100755
--- a/DSView/pv/device/file.cpp
+++ b/DSView/pv/device/file.cpp
@@ -39,6 +39,10 @@ File::File(QString path) :
 {
 }
 
+File::~File(){
+
+}
+
 QString File::format_device_title() const
 {
     QFileInfo fi(_path);
diff --git a/DSView/pv/device/file.h b/DSView/pv/device/file.h
index d4299e7b..a4984170 100755
--- a/DSView/pv/device/file.h
+++ b/DSView/pv/device/file.h
@@ -35,10 +35,13 @@ namespace device {
 
 class File : public DevInst
 {
+
 protected:
     File(QString path);
 
 public:
+    ~File();
+
     static File* create(QString name);
 
     QJsonArray get_decoders();
diff --git a/DSView/pv/devicemanager.cpp b/DSView/pv/devicemanager.cpp
index 08bf0946..488d3e61 100755
--- a/DSView/pv/devicemanager.cpp
+++ b/DSView/pv/devicemanager.cpp
@@ -34,9 +34,6 @@
 #include <QDebug>
 #include <QDir>
 
-#include <boost/foreach.hpp>
-
-using boost::shared_ptr;
 using std::list;
 using std::map;
 using std::ostringstream;
@@ -45,57 +42,64 @@ using std::string;
 
 namespace pv {
 
-DeviceManager::DeviceManager(struct sr_context *sr_ctx) :
-	_sr_ctx(sr_ctx)
+DeviceManager::DeviceManager()
 {
-	init_drivers();
-	scan_all_drivers();
+    _sr_ctx = NULL;	
+}
+
+DeviceManager::DeviceManager(DeviceManager &o)
+{
+    (void)o;
 }
 
 DeviceManager::~DeviceManager()
 {
-	release_devices();
+	 
 }
 
-const std::list<boost::shared_ptr<device::DevInst> > &DeviceManager::devices() const
+void DeviceManager::initAll(struct sr_context *sr_ctx)
+{   
+    _sr_ctx = sr_ctx;
+    init_drivers();
+	scan_all_drivers();
+}
+
+ void DeviceManager::UnInitAll()
+ {
+     release_devices();
+ }
+
+void DeviceManager::add_device(DevInst *device)
 {
-	return _devices;
+    assert(device); 
+  
+    auto it = std::find(_devices.begin(), _devices.end(), device);
+    if (it ==_devices.end()){
+         _devices.push_front(device);
+    }       
 }
 
-void DeviceManager::add_device(boost::shared_ptr<pv::device::DevInst> device)
+void DeviceManager::del_device(DevInst *device)
 {
     assert(device);
 
-    if (std::find(_devices.begin(), _devices.end(), device) ==
-        _devices.end())
-        _devices.push_front(device);
-}
-
-void DeviceManager::del_device(boost::shared_ptr<pv::device::DevInst> device)
-{
-    assert(device);
-    BOOST_FOREACH(shared_ptr<device::DevInst> dev, _devices) {
-        assert(dev);
-        if(dev == device) {
-            dev->release();
-            break;
-        }
+    auto it = std::find(_devices.begin(), _devices.end(), device);
+    if (it !=_devices.end()){
+        _devices.erase(it); //remove from list
+        device->destroy();
     }
-    if (std::find(_devices.begin(), _devices.end(), device) !=
-        _devices.end())
-        _devices.remove(device);
 }
 
-std::list<boost::shared_ptr<device::DevInst> > DeviceManager::driver_scan(
+std::list<DevInst*>& DeviceManager::driver_scan(
 	struct sr_dev_driver *const driver, GSList *const drvopts)
 {
-    list< shared_ptr<device::DevInst> > driver_devices;
+    list<DevInst*> driver_devices;
 
 	assert(driver);
 
 	// Remove any device instances from this driver from the device
 	// list. They will not be valid after the scan.
-    list< shared_ptr<device::DevInst> >::iterator i = _devices.begin();
+    auto i = _devices.begin();
 	while (i != _devices.end()) {
         if ((*i)->dev_inst() &&
             (*i)->dev_inst()->driver == driver) {
@@ -119,16 +123,16 @@ std::list<boost::shared_ptr<device::DevInst> > DeviceManager::driver_scan(
 
 	// Do the scan
 	GSList *const devices = sr_driver_scan(driver, drvopts);
-	for (GSList *l = devices; l; l = l->next)
-        driver_devices.push_front(shared_ptr<device::DevInst>(
-                                     new device::Device((sr_dev_inst*)l->data)));
-	g_slist_free(devices);
-    //driver_devices.sort(compare_devices);
 
-	// Add the scanned devices to the main list
-	_devices.insert(_devices.end(), driver_devices.begin(),
-		driver_devices.end());
-    //_devices.sort(compare_devices);
+	for (GSList *l = devices; l; l = l->next){
+        Device *dev = new device::Device((sr_dev_inst*)l->data);  //create new device
+        driver_devices.push_front(dev);
+    }
+     
+	g_slist_free(devices);
+
+	// append the scanned devices to the main list
+	_devices.insert(_devices.end(), driver_devices.begin(), driver_devices.end());
 
 	return driver_devices;
 }
@@ -149,8 +153,7 @@ void DeviceManager::init_drivers()
 void DeviceManager::release_devices()
 {
     // Release all the used devices
-    BOOST_FOREACH(shared_ptr<device::DevInst> dev, _devices) {
-        assert(dev);
+    for (DevInst *dev : _devices) {
         dev->release();
     }
 
@@ -170,8 +173,7 @@ void DeviceManager::scan_all_drivers()
 
 void DeviceManager::release_driver(struct sr_dev_driver *const driver)
 {
-    BOOST_FOREACH(shared_ptr<device::DevInst> dev, _devices) {
-        assert(dev);
+     for (DevInst *dev : _devices) {
         if(dev->dev_inst()->driver == driver)
             dev->release();
     }
@@ -180,8 +182,7 @@ void DeviceManager::release_driver(struct sr_dev_driver *const driver)
     sr_dev_clear(driver);
 }
 
-bool DeviceManager::compare_devices(boost::shared_ptr<device::DevInst> a,
-    boost::shared_ptr<device::DevInst> b)
+bool DeviceManager::compare_devices(DevInst *a, DevInst *b)
 {
     assert(a);
     assert(b);
diff --git a/DSView/pv/devicemanager.h b/DSView/pv/devicemanager.h
index 426b9aa8..b275b69b 100755
--- a/DSView/pv/devicemanager.h
+++ b/DSView/pv/devicemanager.h
@@ -30,8 +30,7 @@
 #include <map>
 #include <string>
 
-#include <boost/function.hpp>
-#include <boost/shared_ptr.hpp>
+#include <boost/function.hpp> 
 #include <boost/thread.hpp>
 
 #include <QObject>
@@ -51,21 +50,30 @@ namespace device {
 class DevInst;
 }
 
+using namespace pv::device;
+
 class DeviceManager
 {
+private:
+    DeviceManager(DeviceManager &o);
+
 public:
-	DeviceManager(struct sr_context *sr_ctx);
+	DeviceManager();
 
 	~DeviceManager();
 
-    const std::list< boost::shared_ptr<pv::device::DevInst> >& devices() const;
+    inline const std::list<DevInst*>& devices(){
+        return _devices;        
+    }
 
-    void add_device(boost::shared_ptr<pv::device::DevInst> device);
-    void del_device(boost::shared_ptr<pv::device::DevInst> device);
+    void add_device(DevInst *device);
+    void del_device(DevInst *device);
 
-    std::list< boost::shared_ptr<pv::device::DevInst> > driver_scan(
-		struct sr_dev_driver *const driver,
-		GSList *const drvopts = NULL);
+    std::list<DevInst*>& driver_scan(struct sr_dev_driver *const driver, GSList *const drvopts = NULL);
+
+    void initAll(struct sr_context *sr_ctx);
+
+    void UnInitAll();
 
 private:
 	void init_drivers();
@@ -76,12 +84,11 @@ private:
 
 	void release_driver(struct sr_dev_driver *const driver);
 
-    static bool compare_devices(boost::shared_ptr<device::DevInst> a,
-                                boost::shared_ptr<device::DevInst> b);
+    static bool compare_devices(DevInst *a, DevInst *b);
 
 private:
-	struct sr_context *const _sr_ctx;
-    std::list< boost::shared_ptr<pv::device::DevInst> > _devices;
+	struct sr_context*  _sr_ctx;
+    std::list<DevInst*> _devices;
 };
 
 } // namespace pv
diff --git a/DSView/pv/dialogs/calibration.cpp b/DSView/pv/dialogs/calibration.cpp
index e91d1722..2a5b0a8a 100755
--- a/DSView/pv/dialogs/calibration.cpp
+++ b/DSView/pv/dialogs/calibration.cpp
@@ -121,7 +121,7 @@ void Calibration::retranslateUi()
     setTitle(tr("Manual Calibration"));
 }
 
-void Calibration::set_device(boost::shared_ptr<device::DevInst> dev_inst)
+void Calibration::set_device(DevInst *dev_inst)
 {
     assert(dev_inst);
     _dev_inst = dev_inst;
diff --git a/DSView/pv/dialogs/calibration.h b/DSView/pv/dialogs/calibration.h
index 8418606e..5764ce14 100755
--- a/DSView/pv/dialogs/calibration.h
+++ b/DSView/pv/dialogs/calibration.h
@@ -36,6 +36,8 @@
 #include "../toolbars/titlebar.h"
 #include "dsdialog.h"
 
+using namespace pv::device;
+
 namespace pv {
 namespace dialogs {
 
@@ -52,7 +54,7 @@ public:
     Calibration(QWidget *parent);
     ~Calibration();
 
-    void set_device(boost::shared_ptr<pv::device::DevInst> dev_inst);
+    void set_device(DevInst *dev_inst);
 protected:
 	void accept();
     void reject();
@@ -69,7 +71,7 @@ private slots:
     void reload_value();
 
 private:
-    boost::shared_ptr<pv::device::DevInst>  _dev_inst;
+    DevInst *_dev_inst;
  
     QPushButton *_save_btn;
     QPushButton *_abort_btn;
diff --git a/DSView/pv/dialogs/deviceoptions.cpp b/DSView/pv/dialogs/deviceoptions.cpp
index fe8513ed..bfa6fe25 100755
--- a/DSView/pv/dialogs/deviceoptions.cpp
+++ b/DSView/pv/dialogs/deviceoptions.cpp
@@ -38,7 +38,7 @@ using namespace std;
 namespace pv {
 namespace dialogs {
 
-DeviceOptions::DeviceOptions(QWidget *parent, boost::shared_ptr<pv::device::DevInst> dev_inst) :
+DeviceOptions::DeviceOptions(QWidget *parent, DevInst *dev_inst) :
     DSDialog(parent),
     _dev_inst(dev_inst),
     _button_box(QDialogButtonBox::Ok, Qt::Horizontal, this),
@@ -67,7 +67,7 @@ DeviceOptions::DeviceOptions(QWidget *parent, boost::shared_ptr<pv::device::DevI
 
     connect(&_button_box, SIGNAL(accepted()), this, SLOT(accept()));
     //connect(&_button_box, SIGNAL(rejected()), this, SLOT(reject()));
-    connect(_dev_inst.get(), SIGNAL(device_updated()), this, SLOT(reject()));
+    connect(_dev_inst, SIGNAL(device_updated()), this, SLOT(reject()));
 
     GVariant* gvar = _dev_inst->get_config(NULL, NULL, SR_CONF_OPERATION_MODE);
     if (gvar != NULL) {
diff --git a/DSView/pv/dialogs/deviceoptions.h b/DSView/pv/dialogs/deviceoptions.h
index ae803c8a..38ee0798 100755
--- a/DSView/pv/dialogs/deviceoptions.h
+++ b/DSView/pv/dialogs/deviceoptions.h
@@ -47,6 +47,8 @@
 #include "../toolbars/titlebar.h"
 #include "../dialogs/dsdialog.h"
 
+using namespace pv::device;
+
 namespace pv {
 namespace dialogs {
 
@@ -55,7 +57,7 @@ class DeviceOptions : public DSDialog
 	Q_OBJECT
 
 public:
-    DeviceOptions(QWidget *parent, boost::shared_ptr<pv::device::DevInst> dev_inst);
+    DeviceOptions(QWidget *parent, DevInst *dev_inst);
 
     ~DeviceOptions();
 
@@ -85,7 +87,7 @@ private slots:
     void channel_enable();
 
 private:
-    boost::shared_ptr<pv::device::DevInst>  _dev_inst;
+    DevInst *_dev_inst;
 	QVBoxLayout _layout; 
 
     QGroupBox *_dynamic_box;
diff --git a/DSView/pv/dialogs/dsomeasure.cpp b/DSView/pv/dialogs/dsomeasure.cpp
index a454d86c..c5f97510 100755
--- a/DSView/pv/dialogs/dsomeasure.cpp
+++ b/DSView/pv/dialogs/dsomeasure.cpp
@@ -40,7 +40,7 @@ using namespace pv::view;
 namespace pv {
 namespace dialogs {
 
-DsoMeasure::DsoMeasure(SigSession &session, View &parent,
+DsoMeasure::DsoMeasure(SigSession *session, View &parent,
                        unsigned int position, int last_sig_index) :
     DSDialog((QWidget *)&parent),
     _session(session),
@@ -57,7 +57,7 @@ DsoMeasure::DsoMeasure(SigSession &session, View &parent,
     _measure_tab->setTabPosition(QTabWidget::West);
     _measure_tab->setUsesScrollButtons(false);
 
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session.get_signals()) {
+    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
         boost::shared_ptr<view::DsoSignal> dsoSig;
         if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s)) && dsoSig->enabled()) {
             QWidget *measure_widget = new QWidget(this);
@@ -79,7 +79,7 @@ DsoMeasure::DsoMeasure(SigSession &session, View &parent,
 
     connect(_button_box.button(QDialogButtonBox::Cancel), SIGNAL(clicked()), this, SLOT(reject()));
     connect(_button_box.button(QDialogButtonBox::Reset), SIGNAL(clicked()), this, SLOT(reset()));
-    connect(_session.get_device().get(), SIGNAL(device_updated()), this, SLOT(reject()));
+    connect(_session->get_device(), SIGNAL(device_updated()), this, SLOT(reject()));
 }
 
 DsoMeasure::~DsoMeasure(){
@@ -158,7 +158,7 @@ void DsoMeasure::accept()
     if(sc != NULL) {
         QVariant id = sc->property("id");
         enum DSO_MEASURE_TYPE ms_type = DSO_MEASURE_TYPE(id.toInt());
-        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session.get_signals()) {
+        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
             boost::shared_ptr<view::DsoSignal> dsoSig;
             if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
                 if (_measure_tab->currentWidget()->property("index").toInt() == dsoSig->get_index()) {
diff --git a/DSView/pv/dialogs/dsomeasure.h b/DSView/pv/dialogs/dsomeasure.h
index 5016fda7..11efed12 100755
--- a/DSView/pv/dialogs/dsomeasure.h
+++ b/DSView/pv/dialogs/dsomeasure.h
@@ -49,7 +49,7 @@ class DsoMeasure : public DSDialog
 	Q_OBJECT
 
 public:
-    DsoMeasure(SigSession &session, view::View &parent, unsigned int position, int last_sig_index);
+    DsoMeasure(SigSession *session, view::View &parent, unsigned int position, int last_sig_index);
 
     ~DsoMeasure();
 
@@ -68,7 +68,7 @@ protected:
     void reject();
 
 private:
-    SigSession &_session;
+    SigSession *_session;
     view::View &_view;
     unsigned int _position;
  
diff --git a/DSView/pv/dialogs/fftoptions.cpp b/DSView/pv/dialogs/fftoptions.cpp
index 9202500d..5af442e7 100755
--- a/DSView/pv/dialogs/fftoptions.cpp
+++ b/DSView/pv/dialogs/fftoptions.cpp
@@ -38,7 +38,7 @@ using namespace std;
 namespace pv {
 namespace dialogs {
 
-FftOptions::FftOptions(QWidget *parent, SigSession &session) :
+FftOptions::FftOptions(QWidget *parent, SigSession *session) :
     DSDialog(parent),
     _session(session),
     _button_box(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
@@ -67,7 +67,7 @@ FftOptions::FftOptions(QWidget *parent, SigSession &session) :
     _dbv_combobox = new QComboBox(this);
 
     // setup _ch_combobox
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session.get_signals()) {
+    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
         boost::shared_ptr<view::DsoSignal> dsoSig;
         if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
             _ch_combobox->addItem(dsoSig->get_name(), QVariant::fromValue(dsoSig->get_index()));
@@ -76,7 +76,7 @@ FftOptions::FftOptions(QWidget *parent, SigSession &session) :
 
     // setup _window_combobox _len_combobox
     _sample_limit = 0;
-    GVariant* gvar = _session.get_device()->get_config(NULL, NULL, SR_CONF_MAX_DSO_SAMPLELIMITS);
+    GVariant* gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_MAX_DSO_SAMPLELIMITS);
     if (gvar != NULL) {
         _sample_limit = g_variant_get_uint64(gvar) * 0.5;
         g_variant_unref(gvar);
@@ -87,7 +87,7 @@ FftOptions::FftOptions(QWidget *parent, SigSession &session) :
     std::vector<uint64_t> length;
     std::vector<QString> view_modes;
     std::vector<int> dbv_ranges;
-    BOOST_FOREACH(const boost::shared_ptr<view::Trace> t, _session.get_spectrum_traces()) {
+    BOOST_FOREACH(const boost::shared_ptr<view::Trace> t, _session->get_spectrum_traces()) {
         boost::shared_ptr<view::SpectrumTrace> spectrumTraces;
         if ((spectrumTraces = dynamic_pointer_cast<view::SpectrumTrace>(t))) {
             windows = spectrumTraces->get_spectrum_stack()->get_windows_support();
@@ -137,7 +137,7 @@ FftOptions::FftOptions(QWidget *parent, SigSession &session) :
     }
 
     // load current settings
-    BOOST_FOREACH(const boost::shared_ptr<view::Trace> t, _session.get_spectrum_traces()) {
+    BOOST_FOREACH(const boost::shared_ptr<view::Trace> t, _session->get_spectrum_traces()) {
         boost::shared_ptr<view::SpectrumTrace> spectrumTraces;
         if ((spectrumTraces = dynamic_pointer_cast<view::SpectrumTrace>(t))) {
             if (spectrumTraces->enabled()) {
@@ -217,7 +217,7 @@ FftOptions::FftOptions(QWidget *parent, SigSession &session) :
     connect(&_button_box, SIGNAL(rejected()), this, SLOT(reject()));
     connect(_window_combobox, SIGNAL(currentIndexChanged(QString)), this, SLOT(window_changed(QString)));
     connect(_len_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(len_changed(int)));
-    connect(_session.get_device().get(), SIGNAL(device_updated()), this, SLOT(reject()));
+    connect(_session->get_device(), SIGNAL(device_updated()), this, SLOT(reject()));
 }
 
 FftOptions::~FftOptions(){
@@ -230,7 +230,7 @@ void FftOptions::accept()
 
     QDialog::accept();
 
-    BOOST_FOREACH(const boost::shared_ptr<view::Trace> t, _session.get_spectrum_traces()) {
+    BOOST_FOREACH(const boost::shared_ptr<view::Trace> t, _session->get_spectrum_traces()) {
         boost::shared_ptr<view::SpectrumTrace> spectrumTraces;
         if ((spectrumTraces = dynamic_pointer_cast<view::SpectrumTrace>(t))) {
             spectrumTraces->set_enable(false);
@@ -243,13 +243,13 @@ void FftOptions::accept()
                 //spectrumTraces->init_zoom();
                 spectrumTraces->set_dbv_range(_dbv_combobox->currentData().toInt());
                 spectrumTraces->set_enable(_en_checkbox->isChecked());
-                if (_session.get_capture_state() == SigSession::Stopped &&
+                if (_session->get_capture_state() == SigSession::Stopped &&
                     spectrumTraces->enabled())
                     spectrumTraces->get_spectrum_stack()->calc_fft();
             }
         }
     }
-    _session.spectrum_rebuild();
+    _session->spectrum_rebuild();
 }
 
 void FftOptions::reject()
diff --git a/DSView/pv/dialogs/fftoptions.h b/DSView/pv/dialogs/fftoptions.h
index 2486c871..dcca5e11 100755
--- a/DSView/pv/dialogs/fftoptions.h
+++ b/DSView/pv/dialogs/fftoptions.h
@@ -50,7 +50,7 @@ private:
 
 
 public:
-    FftOptions(QWidget *parent, SigSession &session);
+    FftOptions(QWidget *parent, SigSession *session);
 
     ~FftOptions();
 
@@ -63,7 +63,7 @@ private slots:
     void len_changed(int index);
 
 private:
-    SigSession &_session;
+    SigSession *_session;
     uint64_t _sample_limit;
  
     QComboBox *_len_combobox;
diff --git a/DSView/pv/dialogs/interval.cpp b/DSView/pv/dialogs/interval.cpp
index 7ab456b7..dcb13ca5 100755
--- a/DSView/pv/dialogs/interval.cpp
+++ b/DSView/pv/dialogs/interval.cpp
@@ -26,7 +26,7 @@
 namespace pv {
 namespace dialogs {
 
-Interval::Interval(SigSession &session, QWidget *parent) :
+Interval::Interval(SigSession *session, QWidget *parent) :
     DSDialog(parent),
     _session(session),
     _button_box(QDialogButtonBox::Ok,
@@ -47,7 +47,7 @@ Interval::Interval(SigSession &session, QWidget *parent) :
     connect(_interval_slider, SIGNAL(valueChanged(int)), _interval_spinBox, SLOT(setValue(int)));
     connect(_interval_spinBox, SIGNAL(valueChanged(int)), _interval_slider, SLOT(setValue(int)));
 
-    _interval_slider->setValue(_session.get_repeat_intvl());
+    _interval_slider->setValue(_session->get_repeat_intvl());
 
     QGridLayout *glayout = new QGridLayout(this);
     glayout->addWidget(_interval_label, 0, 0);
@@ -64,7 +64,7 @@ Interval::Interval(SigSession &session, QWidget *parent) :
 void Interval::accept()
 {
     using namespace Qt;
-    _session.set_repeat_intvl(_interval_slider->value());
+    _session->set_repeat_intvl(_interval_slider->value());
     QDialog::accept();
 }
 
diff --git a/DSView/pv/dialogs/interval.h b/DSView/pv/dialogs/interval.h
index 86e42ade..9e3c0c40 100755
--- a/DSView/pv/dialogs/interval.h
+++ b/DSView/pv/dialogs/interval.h
@@ -40,14 +40,14 @@ class Interval : public DSDialog
 	Q_OBJECT
 
 public:
-    Interval(SigSession &session, QWidget *parent);
+    Interval(SigSession *session, QWidget *parent);
 
 protected:
 	void accept();
     void reject();
 
 private:
-    SigSession &_session;
+    SigSession *_session;
 
     QLabel *_interval_label;
     QSpinBox *_interval_spinBox;
diff --git a/DSView/pv/dialogs/lissajousoptions.cpp b/DSView/pv/dialogs/lissajousoptions.cpp
index 02c98167..aa5d53f1 100755
--- a/DSView/pv/dialogs/lissajousoptions.cpp
+++ b/DSView/pv/dialogs/lissajousoptions.cpp
@@ -41,7 +41,7 @@ using namespace pv::view;
 namespace pv {
 namespace dialogs {
 
-LissajousOptions::LissajousOptions(SigSession &session, QWidget *parent) :
+LissajousOptions::LissajousOptions(SigSession *session, QWidget *parent) :
     DSDialog(parent),
     _session(session),
     _button_box(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
@@ -63,8 +63,8 @@ LissajousOptions::LissajousOptions(SigSession &session, QWidget *parent) :
     _percent = new QSlider(Qt::Horizontal, this);
     _percent->setRange(100, 100);
     _percent->setEnabled(false);
-    if (_session.cur_samplelimits() > WellLen) {
-        int min = ceil(WellLen*100.0/_session.cur_samplelimits());
+    if (_session->cur_samplelimits() > WellLen) {
+        int min = ceil(WellLen*100.0/_session->cur_samplelimits());
         _percent->setEnabled(true);
         _percent->setRange(min, 100);
         _percent->setValue(min);
@@ -74,7 +74,7 @@ LissajousOptions::LissajousOptions(SigSession &session, QWidget *parent) :
     _y_group = new QGroupBox(this);
     QHBoxLayout *xlayout = new QHBoxLayout();
     QHBoxLayout *ylayout = new QHBoxLayout();
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session.get_signals()) {
+    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
         boost::shared_ptr<view::DsoSignal> dsoSig;
         if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
             QString index_str = QString::number(dsoSig->get_index());
@@ -92,7 +92,7 @@ LissajousOptions::LissajousOptions(SigSession &session, QWidget *parent) :
     _y_group->setLayout(ylayout);
 
 
-    boost::shared_ptr<LissajousTrace> lissajous = _session.get_lissajous_trace();
+    boost::shared_ptr<LissajousTrace> lissajous = _session->get_lissajous_trace();
     if (lissajous) {
         _enable->setChecked(lissajous->enabled());
         _percent->setValue(lissajous->percent());
@@ -180,15 +180,15 @@ void LissajousOptions::accept()
         }
     }
     bool enable = (xindex != -1 && yindex != -1 && _enable->isChecked());
-    _session.lissajous_rebuild(enable, xindex, yindex, _percent->value());
+    _session->lissajous_rebuild(enable, xindex, yindex, _percent->value());
 
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session.get_signals()) {
+    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
         boost::shared_ptr<view::DsoSignal> dsoSig;
         if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
             dsoSig->set_show(!enable);
         }
     }
-    boost::shared_ptr<view::MathTrace> mathTrace = _session.get_math_trace();
+    boost::shared_ptr<view::MathTrace> mathTrace = _session->get_math_trace();
     if (mathTrace && mathTrace->enabled()) {
         mathTrace->set_show(!enable);
     }
diff --git a/DSView/pv/dialogs/lissajousoptions.h b/DSView/pv/dialogs/lissajousoptions.h
index b0653548..9a7e7168 100755
--- a/DSView/pv/dialogs/lissajousoptions.h
+++ b/DSView/pv/dialogs/lissajousoptions.h
@@ -56,7 +56,7 @@ private:
     static const int WellLen = SR_Kn(16);
 
 public:
-    LissajousOptions(SigSession &session, QWidget *parent);
+    LissajousOptions(SigSession *session, QWidget *parent);
 
 private:
     void changeEvent(QEvent *event);
@@ -67,7 +67,7 @@ protected:
     void reject();
 
 private:
-    SigSession &_session;
+    SigSession *_session;
 
     QCheckBox *_enable;
     QGroupBox *_x_group;
diff --git a/DSView/pv/dialogs/mathoptions.cpp b/DSView/pv/dialogs/mathoptions.cpp
index 99169c7a..95111fa5 100755
--- a/DSView/pv/dialogs/mathoptions.cpp
+++ b/DSView/pv/dialogs/mathoptions.cpp
@@ -41,7 +41,7 @@ using namespace pv::view;
 namespace pv {
 namespace dialogs {
 
-MathOptions::MathOptions(SigSession &session, QWidget *parent) :
+MathOptions::MathOptions(SigSession *session, QWidget *parent) :
     DSDialog(parent),
     _session(session),
     _button_box(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
@@ -78,7 +78,7 @@ MathOptions::MathOptions(SigSession &session, QWidget *parent) :
     _src2_group = new QGroupBox(this);
     QHBoxLayout *src1_layout = new QHBoxLayout();
     QHBoxLayout *src2_layout = new QHBoxLayout();
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session.get_signals()) {
+    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
         boost::shared_ptr<view::DsoSignal> dsoSig;
         if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
             QString index_str = QString::number(dsoSig->get_index());
@@ -96,7 +96,7 @@ MathOptions::MathOptions(SigSession &session, QWidget *parent) :
     _src2_group->setLayout(src2_layout);
 
 
-    boost::shared_ptr<MathTrace> math = _session.get_math_trace();
+    boost::shared_ptr<MathTrace> math = _session->get_math_trace();
     if (math) {
         _enable->setChecked(math->enabled());
         for (QVector<QRadioButton *>::const_iterator i = _src1_radio.begin();
@@ -206,7 +206,7 @@ void MathOptions::accept()
     bool enable = (src1 != -1 && src2 != -1 && _enable->isChecked());
     boost::shared_ptr<view::DsoSignal> dsoSig1;
     boost::shared_ptr<view::DsoSignal> dsoSig2;
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session.get_signals()) {
+    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
         boost::shared_ptr<view::DsoSignal> dsoSig;
         if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
             if (dsoSig->get_index() == src1)
@@ -215,7 +215,7 @@ void MathOptions::accept()
                 dsoSig2 = dsoSig;
         }
     }
-    _session.math_rebuild(enable, dsoSig1, dsoSig2, type);
+    _session->math_rebuild(enable, dsoSig1, dsoSig2, type);
 }
 
 void MathOptions::reject()
diff --git a/DSView/pv/dialogs/mathoptions.h b/DSView/pv/dialogs/mathoptions.h
index d11afa36..ae50e7b4 100755
--- a/DSView/pv/dialogs/mathoptions.h
+++ b/DSView/pv/dialogs/mathoptions.h
@@ -56,7 +56,7 @@ private:
     static const int WellLen = SR_Kn(16);
 
 public:
-    MathOptions(SigSession &session, QWidget *parent);
+    MathOptions(SigSession *session, QWidget *parent);
 
 private:
     void changeEvent(QEvent *event);
@@ -67,7 +67,7 @@ protected:
     void reject();
 
 private:
-    SigSession &_session;
+    SigSession *_session;
 
     QCheckBox *_enable;
     QGroupBox *_src1_group;
diff --git a/DSView/pv/dialogs/protocolexp.cpp b/DSView/pv/dialogs/protocolexp.cpp
index 8956e4ad..d526a998 100755
--- a/DSView/pv/dialogs/protocolexp.cpp
+++ b/DSView/pv/dialogs/protocolexp.cpp
@@ -46,7 +46,7 @@ using namespace std;
 namespace pv {
 namespace dialogs {
 
-ProtocolExp::ProtocolExp(QWidget *parent, SigSession &session) :
+ProtocolExp::ProtocolExp(QWidget *parent, SigSession *session) :
     DSDialog(parent),
     _session(session),
     _button_box(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
@@ -64,7 +64,7 @@ ProtocolExp::ProtocolExp(QWidget *parent, SigSession &session) :
     _flayout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
     _flayout->addRow(new QLabel(tr("Export Format: "), this), _format_combobox);
 
-    pv::data::DecoderModel* decoder_model = _session.get_decoder_model();
+    pv::data::DecoderModel* decoder_model = _session->get_decoder_model();
     const boost::shared_ptr<pv::data::DecoderStack>& decoder_stack = decoder_model->getDecoderStack();
     if (decoder_stack) {
         int row_index = 0;
@@ -96,7 +96,7 @@ ProtocolExp::ProtocolExp(QWidget *parent, SigSession &session) :
 
     connect(&_button_box, SIGNAL(accepted()), this, SLOT(accept()));
     connect(&_button_box, SIGNAL(rejected()), this, SLOT(reject()));
-    connect(_session.get_device().get(), SIGNAL(device_updated()), this, SLOT(reject()));
+    connect(_session->get_device(), SIGNAL(device_updated()), this, SLOT(reject()));
 
 }
 
@@ -124,7 +124,7 @@ void ProtocolExp::accept()
         QString default_filter = _format_combobox->currentText();
 
         QString default_name = app._userHistory.protocolExportPath + "/" + "decoder-";
-        default_name += _session.get_session_time().toString("-yyMMdd-hhmmss");
+        default_name += _session->get_session_time().toString("-yyMMdd-hhmmss");
 
         QString file_name = QFileDialog::getSaveFileName(
                     this, 
@@ -170,7 +170,7 @@ void ProtocolExp::accept()
                        .arg("Time[ns]")
                        .arg(title);
 
-                pv::data::DecoderModel* decoder_model = _session.get_decoder_model();
+                pv::data::DecoderModel* decoder_model = _session->get_decoder_model();
                 const boost::shared_ptr<pv::data::DecoderStack>& decoder_stack = decoder_model->getDecoderStack();
                 int row_index = 0;
                 Row row;
diff --git a/DSView/pv/dialogs/protocolexp.h b/DSView/pv/dialogs/protocolexp.h
index b978c604..e888eedf 100755
--- a/DSView/pv/dialogs/protocolexp.h
+++ b/DSView/pv/dialogs/protocolexp.h
@@ -54,7 +54,7 @@ class ProtocolExp : public DSDialog
     Q_OBJECT
 
 public:
-    ProtocolExp(QWidget *parent, SigSession &session);
+    ProtocolExp(QWidget *parent, SigSession *session);
 
 protected:
     void accept();
@@ -67,7 +67,7 @@ private slots:
     void cancel_export();
 
 private:
-    SigSession &_session;
+    SigSession *_session;
 
     toolbars::TitleBar *_titlebar;
     QComboBox *_format_combobox;
diff --git a/DSView/pv/dialogs/protocollist.cpp b/DSView/pv/dialogs/protocollist.cpp
index 170f8eda..3b2599af 100755
--- a/DSView/pv/dialogs/protocollist.cpp
+++ b/DSView/pv/dialogs/protocollist.cpp
@@ -38,27 +38,27 @@ using namespace std;
 namespace pv {
 namespace dialogs {
 
-ProtocolList::ProtocolList(QWidget *parent, SigSession &session) :
+ProtocolList::ProtocolList(QWidget *parent, SigSession *session) :
     DSDialog(parent),
     _session(session),
     _button_box(QDialogButtonBox::Ok,
         Qt::Horizontal, this)
 {
-    pv::data::DecoderModel* decoder_model = _session.get_decoder_model();
+    pv::data::DecoderModel* decoder_model = _session->get_decoder_model();
 
     _map_zoom_combobox = new QComboBox(this);
     _map_zoom_combobox->addItem(tr("Fit to Window"));
     _map_zoom_combobox->addItem(tr("Fixed"));
-    int cur_map_zoom = _session.get_map_zoom();
+    int cur_map_zoom = _session->get_map_zoom();
     if (cur_map_zoom >= _map_zoom_combobox->count())
         _map_zoom_combobox->setCurrentIndex(0);
     else
         _map_zoom_combobox->setCurrentIndex(cur_map_zoom);
-    connect(_map_zoom_combobox, SIGNAL(currentIndexChanged(int)), &_session, SLOT(set_map_zoom(int)));
+    connect(_map_zoom_combobox, SIGNAL(currentIndexChanged(int)), _session, SLOT(set_map_zoom(int)));
 
     _protocol_combobox = new QComboBox(this);
     const std::vector< boost::shared_ptr<pv::view::DecodeTrace> > decode_sigs(
-        _session.get_decode_signals());
+        _session->get_decode_signals());
     int index = 0;
     BOOST_FOREACH(boost::shared_ptr<pv::view::DecodeTrace> d, decode_sigs) {
         _protocol_combobox->addItem(d->get_name());
@@ -89,7 +89,7 @@ ProtocolList::ProtocolList(QWidget *parent, SigSession &session) :
     connect(&_button_box, SIGNAL(accepted()), this, SLOT(accept()));
     connect(_protocol_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(set_protocol(int)));
     set_protocol(_protocol_combobox->currentIndex());
-    connect(_session.get_device().get(), SIGNAL(device_updated()), this, SLOT(reject()));
+    connect(_session->get_device(), SIGNAL(device_updated()), this, SLOT(reject()));
 
 }
 
@@ -128,7 +128,7 @@ void ProtocolList::set_protocol(int index)
 
     boost::shared_ptr<pv::data::DecoderStack> decoder_stack;
     const std::vector< boost::shared_ptr<pv::view::DecodeTrace> > decode_sigs(
-        _session.get_decode_signals());
+        _session->get_decode_signals());
     int cur_index = 0;
     BOOST_FOREACH(boost::shared_ptr<pv::view::DecodeTrace> d, decode_sigs) {
         if (index == cur_index) {
@@ -139,11 +139,11 @@ void ProtocolList::set_protocol(int index)
     }
 
     if (!decoder_stack){
-        _session.get_decoder_model()->setDecoderStack(NULL);
+        _session->get_decoder_model()->setDecoderStack(NULL);
         return;
     }
 
-    _session.get_decoder_model()->setDecoderStack(decoder_stack);
+    _session->get_decoder_model()->setDecoderStack(decoder_stack);
     int row_index = 0;
     const std::map<const pv::data::decode::Row, bool> rows = decoder_stack->get_rows_lshow();
     for (std::map<const pv::data::decode::Row, bool>::const_iterator i = rows.begin();
@@ -170,7 +170,7 @@ void ProtocolList::on_row_check(bool show)
 
     boost::shared_ptr<pv::data::DecoderStack> decoder_stack;
     const std::vector< boost::shared_ptr<pv::view::DecodeTrace> > decode_sigs(
-        _session.get_decode_signals());
+        _session->get_decode_signals());
     int cur_index = 0;
     BOOST_FOREACH(boost::shared_ptr<pv::view::DecodeTrace> d, decode_sigs) {
         if (cur_index == _protocol_combobox->currentIndex()) {
@@ -192,7 +192,7 @@ void ProtocolList::on_row_check(bool show)
         }
     }
 
-    _session.get_decoder_model()->setDecoderStack(decoder_stack);
+    _session->get_decoder_model()->setDecoderStack(decoder_stack);
 }
 } // namespace dialogs
 } // namespace pv
diff --git a/DSView/pv/dialogs/protocollist.h b/DSView/pv/dialogs/protocollist.h
index bc6a9891..1d4c68f2 100755
--- a/DSView/pv/dialogs/protocollist.h
+++ b/DSView/pv/dialogs/protocollist.h
@@ -48,7 +48,7 @@ class ProtocolList : public DSDialog
     Q_OBJECT
 
 public:
-    ProtocolList(QWidget *parent, SigSession &session);
+    ProtocolList(QWidget *parent, SigSession *session);
 
 protected:
     void accept();
@@ -59,7 +59,7 @@ private slots:
     void on_row_check(bool show);
 
 private:
-    SigSession &_session;
+    SigSession *_session;
 
     toolbars::TitleBar *_titlebar;
     QComboBox *_map_zoom_combobox;
diff --git a/DSView/pv/dialogs/regionoptions.cpp b/DSView/pv/dialogs/regionoptions.cpp
index 0a113133..12853c1d 100755
--- a/DSView/pv/dialogs/regionoptions.cpp
+++ b/DSView/pv/dialogs/regionoptions.cpp
@@ -37,7 +37,7 @@ namespace dialogs {
 const QString RegionOptions::RegionStart = QT_TR_NOOP("Start");
 const QString RegionOptions::RegionEnd = QT_TR_NOOP("End");
 
-RegionOptions::RegionOptions(view::View *view, SigSession &session, QWidget *parent) :
+RegionOptions::RegionOptions(view::View *view, SigSession *session, QWidget *parent) :
     DSDialog(parent),
     _session(session),
     _view(view),
@@ -75,19 +75,19 @@ RegionOptions::RegionOptions(view::View *view, SigSession &session, QWidget *par
     setTitle(tr("Region"));
 
     connect(&_button_box, SIGNAL(accepted()), this, SLOT(set_region()));
-    connect(_session.get_device().get(), SIGNAL(device_updated()), this, SLOT(reject()));
+    connect(_session->get_device(), SIGNAL(device_updated()), this, SLOT(reject()));
 
 }
 
 void RegionOptions::set_region()
 {
-    const uint64_t last_samples = _session.cur_samplelimits() - 1;
+    const uint64_t last_samples = _session->cur_samplelimits() - 1;
     const int index1 = _start_comboBox->currentIndex();
     const int index2 = _end_comboBox->currentIndex();
     uint64_t start, end;
 
-    _session.set_save_start(0);
-    _session.set_save_end(last_samples);
+    _session->set_save_start(0);
+    _session->set_save_end(last_samples);
 
     if (index1 == 0) {
         start = 0;
@@ -105,8 +105,8 @@ void RegionOptions::set_region()
     if (end > last_samples)
         end = last_samples;
 
-    _session.set_save_start(min(start, end));
-    _session.set_save_end(max(start, end));
+    _session->set_save_start(min(start, end));
+    _session->set_save_end(max(start, end));
 
     QDialog::accept();
 }
diff --git a/DSView/pv/dialogs/regionoptions.h b/DSView/pv/dialogs/regionoptions.h
index 097baff7..a0ec9554 100755
--- a/DSView/pv/dialogs/regionoptions.h
+++ b/DSView/pv/dialogs/regionoptions.h
@@ -52,13 +52,13 @@ private:
     static const QString RegionEnd;
 
 public:
-    RegionOptions(view::View *view, SigSession &session, QWidget *parent = 0);
+    RegionOptions(view::View *view, SigSession *session, QWidget *parent = 0);
 
 private slots:
     void set_region();
 
 private:
-    SigSession &_session;
+    SigSession *_session;
     view::View *_view;
 
     QComboBox *_start_comboBox;
diff --git a/DSView/pv/dialogs/search.cpp b/DSView/pv/dialogs/search.cpp
index 86e69dda..74568d7f 100755
--- a/DSView/pv/dialogs/search.cpp
+++ b/DSView/pv/dialogs/search.cpp
@@ -30,7 +30,7 @@
 namespace pv {
 namespace dialogs {
 
-Search::Search(QWidget *parent, SigSession &session, std::map<uint16_t, QString> pattern) :
+Search::Search(QWidget *parent, SigSession *session, std::map<uint16_t, QString> pattern) :
     DSDialog(parent),
     _session(session)
 {
@@ -51,7 +51,7 @@ Search::Search(QWidget *parent, SigSession &session, std::map<uint16_t, QString>
 
     int index = 0;
     BOOST_FOREACH(const boost::shared_ptr<view::Signal> sig,
-                  _session.get_signals()) {
+                  _session->get_signals()) {
         assert(sig);
         boost::shared_ptr<view::LogicSignal> logic_sig;
         if ((logic_sig = boost::dynamic_pointer_cast<view::LogicSignal>(sig))) {
@@ -86,7 +86,7 @@ Search::Search(QWidget *parent, SigSession &session, std::map<uint16_t, QString>
 
     connect(&search_buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
     connect(&search_buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
-    connect(_session.get_device().get(), SIGNAL(device_updated()), this, SLOT(reject()));
+    connect(_session->get_device(), SIGNAL(device_updated()), this, SLOT(reject()));
 }
 
 Search::~Search()
@@ -112,7 +112,7 @@ std::map<uint16_t, QString> Search::get_pattern()
 
     int index = 0;
     BOOST_FOREACH(const boost::shared_ptr<view::Signal> sig,
-                  _session.get_signals()) {
+                  _session->get_signals()) {
         assert(sig);
         boost::shared_ptr<view::LogicSignal> logic_sig;
         if ((logic_sig = boost::dynamic_pointer_cast<view::LogicSignal>(sig))) {
diff --git a/DSView/pv/dialogs/search.h b/DSView/pv/dialogs/search.h
index d1f7950a..29c3d5a4 100755
--- a/DSView/pv/dialogs/search.h
+++ b/DSView/pv/dialogs/search.h
@@ -45,7 +45,7 @@ class Search : public DSDialog
 
 public:
 
-    Search(QWidget *parent, SigSession &session, std::map<uint16_t, QString> pattern);
+    Search(QWidget *parent, SigSession *session, std::map<uint16_t, QString> pattern);
     ~Search();
 
     std::map<uint16_t, QString> get_pattern();
@@ -59,7 +59,7 @@ private slots:
     void format();
     
 private:
-    SigSession &_session;
+    SigSession *_session;
 
     toolbars::TitleBar *_titlebar;
     QVector<QLineEdit *> _search_lineEdit_vec;
diff --git a/DSView/pv/dialogs/storeprogress.cpp b/DSView/pv/dialogs/storeprogress.cpp
index 19d0329e..7c0b31de 100755
--- a/DSView/pv/dialogs/storeprogress.cpp
+++ b/DSView/pv/dialogs/storeprogress.cpp
@@ -34,7 +34,7 @@
 namespace pv {
 namespace dialogs {
 
-StoreProgress::StoreProgress(SigSession &session, QWidget *parent) :
+StoreProgress::StoreProgress(SigSession *session, QWidget *parent) :
     DSDialog(parent),
     _store_session(session)
 {
@@ -155,7 +155,7 @@ void StoreProgress::accept()
 void StoreProgress::timeout()
 {
     if (_done) {
-        _store_session.session().set_saving(false);
+        _store_session.session()->set_saving(false);
         save_done();
         close(); 
     } else {
diff --git a/DSView/pv/dialogs/storeprogress.h b/DSView/pv/dialogs/storeprogress.h
index 63d7c013..a7077142 100755
--- a/DSView/pv/dialogs/storeprogress.h
+++ b/DSView/pv/dialogs/storeprogress.h
@@ -44,7 +44,7 @@ class StoreProgress : public DSDialog
 	Q_OBJECT
 
 public:
-    StoreProgress(SigSession &session,
+    StoreProgress(SigSession *session,
         QWidget *parent = 0);
 
 	virtual ~StoreProgress();
diff --git a/DSView/pv/dialogs/waitingdialog.cpp b/DSView/pv/dialogs/waitingdialog.cpp
index c901cbdf..6272227c 100755
--- a/DSView/pv/dialogs/waitingdialog.cpp
+++ b/DSView/pv/dialogs/waitingdialog.cpp
@@ -43,14 +43,14 @@ namespace dialogs {
 const QString WaitingDialog::TIPS_WAIT = "Waiting";
 const QString WaitingDialog::TIPS_FINISHED = "Finished!";
 
-WaitingDialog::WaitingDialog(QWidget *parent, SigSession &session, int key) :
+WaitingDialog::WaitingDialog(QWidget *parent, SigSession *session, int key) :
     DSDialog(parent),
     _key(key),
     _session(session),
     _button_box(QDialogButtonBox::Abort,
         Qt::Horizontal, this)
 {
-    _dev_inst = _session.get_device();
+    _dev_inst = _session->get_device();
     this->setFixedSize((GIF_WIDTH+2*TIP_WIDTH)*1.2, (GIF_HEIGHT+2*TIP_HEIGHT)*4);
     this->setWindowOpacity(0.7);
 
@@ -79,7 +79,7 @@ WaitingDialog::WaitingDialog(QWidget *parent, SigSession &session, int key) :
     connect(timer, SIGNAL(timeout()), this, SLOT(changeText()));
     connect(&_button_box, SIGNAL(accepted()), this, SLOT(accept()));
     connect(&_button_box, SIGNAL(rejected()), this, SLOT(reject()));
-    connect(_dev_inst.get(), SIGNAL(device_updated()), this, SLOT(stop()));
+    connect(_dev_inst, SIGNAL(device_updated()), this, SLOT(stop()));
 
 
     QVBoxLayout *mlayout = new QVBoxLayout();
@@ -186,7 +186,7 @@ void WaitingDialog::changeText()
                     g_variant_unref(gvar);
                     if (zero_fgain) {
                         boost::shared_ptr<view::DsoSignal> dsoSig;
-                        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session.get_signals())
+                        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals())
                         {
                             if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s)))
                                 dsoSig->set_enable(dsoSig->get_index() == 0);
diff --git a/DSView/pv/dialogs/waitingdialog.h b/DSView/pv/dialogs/waitingdialog.h
index fd14615a..e8fb2474 100755
--- a/DSView/pv/dialogs/waitingdialog.h
+++ b/DSView/pv/dialogs/waitingdialog.h
@@ -35,6 +35,8 @@
 #include "../toolbars/titlebar.h"
 #include "dsdialog.h"
 
+using namespace pv::device;
+
 namespace pv {
 namespace dialogs {
 
@@ -53,7 +55,7 @@ private:
     static const QString TIPS_FINISHED;
 
 public:
-    WaitingDialog(QWidget *parent, SigSession &session, int key);
+    WaitingDialog(QWidget *parent, SigSession *session, int key);
     int start();
 
 protected:
@@ -66,8 +68,8 @@ private slots:
 
 private:
     int _key;
-    SigSession &_session;
-    boost::shared_ptr<pv::device::DevInst>  _dev_inst;
+    SigSession *_session;
+    DevInst*  _dev_inst;
     toolbars::TitleBar *_titlebar;
     QDialogButtonBox _button_box;
 
diff --git a/DSView/pv/dock/dsotriggerdock.cpp b/DSView/pv/dock/dsotriggerdock.cpp
index 08bc64b6..d11e961c 100755
--- a/DSView/pv/dock/dsotriggerdock.cpp
+++ b/DSView/pv/dock/dsotriggerdock.cpp
@@ -44,7 +44,7 @@ using namespace std;
 namespace pv {
 namespace dock {
 
-DsoTriggerDock::DsoTriggerDock(QWidget *parent, SigSession &session) :
+DsoTriggerDock::DsoTriggerDock(QWidget *parent, SigSession *session) :
     QScrollArea(parent),
     _session(session)
 {
@@ -222,7 +222,7 @@ void DsoTriggerDock::auto_trig(int index)
 void DsoTriggerDock::pos_changed(int pos)
 {
     int ret;
-    ret = _session.get_device()->set_config(NULL, NULL,
+    ret = _session->get_device()->set_config(NULL, NULL,
                                             SR_CONF_HORIZ_TRIGGERPOS,
                                             g_variant_new_byte((uint8_t)pos));
     if (!ret) {
@@ -247,7 +247,7 @@ void DsoTriggerDock::hold_changed(int hold)
         _holdoff_slider->setRange(0, 999);
     }
     holdoff = _holdoff_slider->value() * _holdoff_comboBox->currentData().toDouble() / 10;
-    ret = _session.get_device()->set_config(NULL, NULL,
+    ret = _session->get_device()->set_config(NULL, NULL,
                                             SR_CONF_TRIGGER_HOLDOFF,
                                             g_variant_new_uint64(holdoff));
 
@@ -264,7 +264,7 @@ void DsoTriggerDock::hold_changed(int hold)
 void DsoTriggerDock::margin_changed(int margin)
 {
     int ret;
-    ret = _session.get_device()->set_config(NULL, NULL,
+    ret = _session->get_device()->set_config(NULL, NULL,
                                             SR_CONF_TRIGGER_MARGIN,
                                             g_variant_new_byte(margin));
     if (!ret) {
@@ -282,7 +282,7 @@ void DsoTriggerDock::source_changed()
     int id = _source_group->checkedId();
     int ret;
 
-    ret = _session.get_device()->set_config(NULL, NULL,
+    ret = _session->get_device()->set_config(NULL, NULL,
                                             SR_CONF_TRIGGER_SOURCE,
                                             g_variant_new_byte(id));
     if (!ret) {
@@ -300,7 +300,7 @@ void DsoTriggerDock::channel_changed(int ch)
     (void)ch;
     int ret;
 
-    ret = _session.get_device()->set_config(NULL, NULL,
+    ret = _session->get_device()->set_config(NULL, NULL,
                                             SR_CONF_TRIGGER_CHANNEL,
                                             g_variant_new_byte(_channel_comboBox->currentData().toInt()));
     if (!ret) {
@@ -318,7 +318,7 @@ void DsoTriggerDock::type_changed()
     int id = _type_group->checkedId();
     int ret;
 
-    ret = _session.get_device()->set_config(NULL, NULL,
+    ret = _session->get_device()->set_config(NULL, NULL,
                                             SR_CONF_TRIGGER_SLOPE,
                                             g_variant_new_byte(id));
     if (!ret) {
@@ -333,7 +333,7 @@ void DsoTriggerDock::type_changed()
 
 void DsoTriggerDock::device_change()
 {
-    if (_session.get_device()->name() != "DSLogic") {
+    if (_session->get_device()->name() != "DSLogic") {
         _position_spinBox->setDisabled(true);
         _position_slider->setDisabled(true);
     } else {
@@ -344,7 +344,7 @@ void DsoTriggerDock::device_change()
 
 void DsoTriggerDock::init()
 {
-    if (_session.get_device()->name().contains("virtual")) {
+    if (_session->get_device()->name().contains("virtual")) {
         foreach(QAbstractButton * btn, _source_group->buttons())
             btn->setDisabled(true);
         foreach(QAbstractButton * btn, _type_group->buttons())
@@ -368,7 +368,7 @@ void DsoTriggerDock::init()
     }
 
     // TRIGGERPOS
-    GVariant* gvar = _session.get_device()->get_config(NULL, NULL,
+    GVariant* gvar = _session->get_device()->get_config(NULL, NULL,
                                             SR_CONF_HORIZ_TRIGGERPOS);
     if (gvar != NULL) {
         uint16_t pos = g_variant_get_byte(gvar);
@@ -376,7 +376,7 @@ void DsoTriggerDock::init()
         _position_slider->setValue(pos);
     }
 
-    gvar = _session.get_device()->get_config(NULL, NULL,
+    gvar = _session->get_device()->get_config(NULL, NULL,
                                                 SR_CONF_TRIGGER_SOURCE);
     if (gvar != NULL) {
         uint8_t src = g_variant_get_byte(gvar);
@@ -387,13 +387,13 @@ void DsoTriggerDock::init()
     // setup _channel_comboBox
     disconnect(_channel_comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(channel_changed(int)));
     _channel_comboBox->clear();
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session.get_signals()) {
+    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
         boost::shared_ptr<view::DsoSignal> dsoSig;
         if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
             _channel_comboBox->addItem(dsoSig->get_name(), QVariant::fromValue(dsoSig->get_index()));
         }
     }
-    gvar = _session.get_device()->get_config(NULL, NULL,
+    gvar = _session->get_device()->get_config(NULL, NULL,
                                                 SR_CONF_TRIGGER_CHANNEL);
     if (gvar != NULL) {
         uint8_t src = g_variant_get_byte(gvar);
@@ -407,7 +407,7 @@ void DsoTriggerDock::init()
     }
     connect(_channel_comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(channel_changed(int)));
 
-    gvar = _session.get_device()->get_config(NULL, NULL,
+    gvar = _session->get_device()->get_config(NULL, NULL,
                                                 SR_CONF_TRIGGER_SLOPE);
     if (gvar != NULL) {
         uint8_t slope = g_variant_get_byte(gvar);
@@ -417,7 +417,7 @@ void DsoTriggerDock::init()
 
     disconnect(_holdoff_slider, SIGNAL(valueChanged(int)), this, SLOT(hold_changed(int)));
     disconnect(_holdoff_comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(hold_changed(int)));
-    gvar = _session.get_device()->get_config(NULL, NULL,
+    gvar = _session->get_device()->get_config(NULL, NULL,
                                                 SR_CONF_TRIGGER_HOLDOFF);
     if (gvar != NULL) {
         uint64_t holdoff = g_variant_get_uint64(gvar);
@@ -439,7 +439,7 @@ void DsoTriggerDock::init()
     connect(_holdoff_comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(hold_changed(int)));
 
     disconnect(_margin_slider, SIGNAL(valueChanged(int)), this, SLOT(margin_changed(int)));
-    gvar = _session.get_device()->get_config(NULL, NULL,
+    gvar = _session->get_device()->get_config(NULL, NULL,
                                                 SR_CONF_TRIGGER_MARGIN);
     if (gvar != NULL) {
         uint8_t margin = g_variant_get_byte(gvar);
diff --git a/DSView/pv/dock/dsotriggerdock.h b/DSView/pv/dock/dsotriggerdock.h
index b0971b72..4688577e 100755
--- a/DSView/pv/dock/dsotriggerdock.h
+++ b/DSView/pv/dock/dsotriggerdock.h
@@ -44,7 +44,7 @@ class DsoTriggerDock : public QScrollArea
     Q_OBJECT
 
 public:
-    DsoTriggerDock(QWidget *parent, SigSession &session);
+    DsoTriggerDock(QWidget *parent, SigSession *session);
     ~DsoTriggerDock();
 
     void paintEvent(QPaintEvent *);
@@ -75,7 +75,7 @@ private slots:
 private:
 
 private:
-    SigSession &_session;
+    SigSession *_session;
 
     QWidget *_widget;
 
diff --git a/DSView/pv/dock/measuredock.cpp b/DSView/pv/dock/measuredock.cpp
index fc7644f6..77166789 100755
--- a/DSView/pv/dock/measuredock.cpp
+++ b/DSView/pv/dock/measuredock.cpp
@@ -50,7 +50,7 @@ namespace dock {
 
 using namespace pv::view;
 
-MeasureDock::MeasureDock(QWidget *parent, View &view, SigSession &session) :
+MeasureDock::MeasureDock(QWidget *parent, View &view, SigSession *session) :
     QScrollArea(parent),
     _session(session),
     _view(view)
@@ -212,7 +212,7 @@ void MeasureDock::refresh()
 
 void MeasureDock::reload()
 {
-    if (_session.get_device()->dev_inst()->mode == LOGIC)
+    if (_session->get_device()->dev_inst()->mode == LOGIC)
         _edge_groupBox->setDisabled(false);
     else
         _edge_groupBox->setDisabled(true);
@@ -598,7 +598,7 @@ void MeasureDock::update_edge()
         if (start_ret && end_ret) {
             uint64_t rising_edges;
             uint64_t falling_edges;
-            const std::vector< boost::shared_ptr<Signal> > sigs(_session.get_signals());
+            const std::vector< boost::shared_ptr<Signal> > sigs(_session->get_signals());
             for(size_t i = 0; i < sigs.size(); i++) {
                 const boost::shared_ptr<view::Signal> s(sigs[i]);
                 boost::shared_ptr<view::LogicSignal> logicSig;
@@ -650,7 +650,7 @@ QComboBox* MeasureDock::create_probe_selector(QWidget *parent)
 void MeasureDock::update_probe_selector(QComboBox *selector)
 {
     selector->clear();
-    const std::vector< boost::shared_ptr<Signal> > sigs(_session.get_signals());
+    const std::vector< boost::shared_ptr<Signal> > sigs(_session->get_signals());
     for(size_t i = 0; i < sigs.size(); i++) {
         const boost::shared_ptr<view::Signal> s(sigs[i]);
         assert(s);
diff --git a/DSView/pv/dock/measuredock.h b/DSView/pv/dock/measuredock.h
index c9f9beeb..379b1d38 100755
--- a/DSView/pv/dock/measuredock.h
+++ b/DSView/pv/dock/measuredock.h
@@ -61,7 +61,7 @@ private:
     static const int Max_Measure_Limits = 16;
 
 public:
-    MeasureDock(QWidget *parent, pv::view::View &view, SigSession &session);
+    MeasureDock(QWidget *parent, pv::view::View &view, SigSession *session);
     ~MeasureDock();
 
     void paintEvent(QPaintEvent *);
@@ -101,7 +101,7 @@ public slots:
     void refresh();
 
 private:
-    SigSession &_session;
+    SigSession *_session;
     view::View &_view;
 
     QWidget *_widget;
diff --git a/DSView/pv/dock/protocoldock.cpp b/DSView/pv/dock/protocoldock.cpp
index c4709222..48e04900 100755
--- a/DSView/pv/dock/protocoldock.cpp
+++ b/DSView/pv/dock/protocoldock.cpp
@@ -56,7 +56,7 @@
 namespace pv {
 namespace dock {
    
-ProtocolDock::ProtocolDock(QWidget *parent, view::View &view, SigSession &session) :
+ProtocolDock::ProtocolDock(QWidget *parent, view::View &view, SigSession *session) :
     QScrollArea(parent),
     _session(session),
     _view(view),
@@ -126,7 +126,7 @@ ProtocolDock::ProtocolDock(QWidget *parent, view::View &view, SigSession &sessio
     //dn_title_layout->addStretch(1);
 
     _table_view = new QTableView(_dn_widget);
-    _table_view->setModel(_session.get_decoder_model());
+    _table_view->setModel(_session->get_decoder_model());
     _table_view->setAlternatingRowColors(true);
     _table_view->setShowGrid(false);
     _table_view->horizontalHeader()->setStretchLastSection(true);
@@ -197,7 +197,7 @@ ProtocolDock::ProtocolDock(QWidget *parent, view::View &view, SigSession &sessio
 
     connect(_del_all_button, SIGNAL(clicked()),this, SLOT(on_del_all_protocol()));
 
-    connect(&_session, SIGNAL(decode_done()), this, SLOT(update_model()));
+    connect(_session, SIGNAL(decode_done()), this, SLOT(update_model()));
     connect(this, SIGNAL(protocol_updated()), this, SLOT(update_model()));
     connect(_table_view, SIGNAL(clicked(QModelIndex)), this, SLOT(item_clicked(QModelIndex)));
     connect(_table_view->horizontalHeader(), SIGNAL(sectionResized(int,int,int)), this, SLOT(column_resize(int, int, int)));
@@ -305,7 +305,7 @@ void ProtocolDock::on_add_protocol()
 
 void ProtocolDock::add_protocol(bool silent)
 {    
-    if (_session.get_device()->dev_inst()->mode != LOGIC) {         
+    if (_session->get_device()->dev_inst()->mode != LOGIC) {         
         MsgBox::Show(NULL, "Protocol Analyzer\nProtocol Analyzer is only valid in Digital Mode!", this);
         return;
     } 
@@ -316,7 +316,7 @@ void ProtocolDock::add_protocol(bool silent)
     DecoderStatus *dstatus = new DecoderStatus();
     dstatus->m_format = (int)DecoderDataFormat::hex;
 
-    if (_session.add_decoder(decoder, silent, dstatus))
+    if (_session->add_decoder(decoder, silent, dstatus))
     {
         //crate item layer
         QString protocolName = _protocol_combobox->currentText();
@@ -333,7 +333,7 @@ void ProtocolDock::add_protocol(bool silent)
         }
 
         //progress connection
-        const std::vector<boost::shared_ptr<pv::view::DecodeTrace>> decode_sigs(_session.get_decode_signals());
+        const std::vector<boost::shared_ptr<pv::view::DecodeTrace>> decode_sigs(_session->get_decode_signals());
 
         connect(decode_sigs.back().get(), SIGNAL(decoded_progress(int)), this, SLOT(decoded_progress(int)));
 
@@ -360,7 +360,7 @@ void ProtocolDock::del_all_protocol()
         for (auto it = _protocol_items.begin(); it != _protocol_items.end(); it++)
         {
              DESTROY_QT_LATER((*it)); //destory control
-            _session.remove_decode_signal(0);
+            _session->remove_decode_signal(0);
         }
         _protocol_items.clear();
         protocol_updated();
@@ -374,7 +374,7 @@ void ProtocolDock::decoded_progress(int progress)
     int pg = 0;
     QString err="";
     const std::vector< boost::shared_ptr<pv::view::DecodeTrace> > decode_sigs(
-        _session.get_decode_signals());
+        _session->get_decode_signals());
     int index = 0;
 
     BOOST_FOREACH(boost::shared_ptr<pv::view::DecodeTrace> d, decode_sigs) {
@@ -409,13 +409,13 @@ void ProtocolDock::set_model()
 {
     pv::dialogs::ProtocolList *protocollist_dlg = new pv::dialogs::ProtocolList(this, _session);
     protocollist_dlg->exec();
-    resize_table_view(_session.get_decoder_model());
-    _model_proxy.setSourceModel(_session.get_decoder_model());
+    resize_table_view(_session->get_decoder_model());
+    _model_proxy.setSourceModel(_session->get_decoder_model());
     search_done();
 
     // clear mark_index of all DecoderStacks
     const std::vector< boost::shared_ptr<pv::view::DecodeTrace> > decode_sigs(
-        _session.get_decode_signals());
+        _session->get_decode_signals());
     BOOST_FOREACH(boost::shared_ptr<pv::view::DecodeTrace> d, decode_sigs) {
         d->decoder()->set_mark_index(-1);
     }
@@ -423,9 +423,9 @@ void ProtocolDock::set_model()
 
 void ProtocolDock::update_model()
 {
-    pv::data::DecoderModel *decoder_model = _session.get_decoder_model();
+    pv::data::DecoderModel *decoder_model = _session->get_decoder_model();
     const std::vector< boost::shared_ptr<pv::view::DecodeTrace> > decode_sigs(
-        _session.get_decode_signals());
+        _session->get_decode_signals());
     if (decode_sigs.size() == 0)
         decoder_model->setDecoderStack(NULL);
     else if (!decoder_model->getDecoderStack())
@@ -466,18 +466,18 @@ void ProtocolDock::resize_table_view(data::DecoderModel* decoder_model)
 
 void ProtocolDock::item_clicked(const QModelIndex &index)
 {
-    pv::data::DecoderModel *decoder_model = _session.get_decoder_model();
+    pv::data::DecoderModel *decoder_model = _session->get_decoder_model();
     boost::shared_ptr<pv::data::DecoderStack> decoder_stack = decoder_model->getDecoderStack();
     if (decoder_stack) {
         pv::data::decode::Annotation ann;
         if (decoder_stack->list_annotation(ann, index.column(), index.row())) {
             const std::vector< boost::shared_ptr<pv::view::DecodeTrace> > decode_sigs(
-                _session.get_decode_signals());
+                _session->get_decode_signals());
             BOOST_FOREACH(boost::shared_ptr<pv::view::DecodeTrace> d, decode_sigs) {
                 d->decoder()->set_mark_index(-1);
             }
             decoder_stack->set_mark_index((ann.start_sample()+ann.end_sample())/2);
-            _session.show_region(ann.start_sample(), ann.end_sample(), false);
+            _session->show_region(ann.start_sample(), ann.end_sample(), false);
         }
     }
     _table_view->resizeRowToContents(index.row());
@@ -524,7 +524,7 @@ void ProtocolDock::column_resize(int index, int old_size, int new_size)
     (void)index;
     (void)old_size;
     (void)new_size;
-    pv::data::DecoderModel *decoder_model = _session.get_decoder_model();
+    pv::data::DecoderModel *decoder_model = _session->get_decoder_model();
     if (decoder_model->getDecoderStack()) {
         int top_row = _table_view->rowAt(0);
         int bom_row = _table_view->rowAt(_table_view->height());
@@ -544,7 +544,7 @@ void ProtocolDock::export_table_view()
 void ProtocolDock::nav_table_view()
 {
     uint64_t row_index = 0;
-    pv::data::DecoderModel *decoder_model = _session.get_decoder_model();
+    pv::data::DecoderModel *decoder_model = _session->get_decoder_model();
     boost::shared_ptr<pv::data::DecoderStack> decoder_stack = decoder_model->getDecoderStack();
     if (decoder_stack) {
         uint64_t offset = _view.offset() * (decoder_stack->samplerate() * _view.scale());
@@ -565,7 +565,7 @@ void ProtocolDock::nav_table_view()
             pv::data::decode::Annotation ann;
             decoder_stack->list_annotation(ann, index.column(), index.row());
             const std::vector< boost::shared_ptr<pv::view::DecodeTrace> > decode_sigs(
-                _session.get_decode_signals());
+                _session->get_decode_signals());
             BOOST_FOREACH(boost::shared_ptr<pv::view::DecodeTrace> d, decode_sigs) {
                 d->decoder()->set_mark_index(-1);
             }
@@ -591,7 +591,7 @@ void ProtocolDock::search_pre()
     int i = 0;
     uint64_t rowCount = _model_proxy.rowCount();
     QModelIndex matchingIndex;
-    pv::data::DecoderModel *decoder_model = _session.get_decoder_model();
+    pv::data::DecoderModel *decoder_model = _session->get_decoder_model();
     boost::shared_ptr<pv::data::DecoderStack> decoder_stack = decoder_model->getDecoderStack();
     do {
         _cur_search_index--;
@@ -647,7 +647,7 @@ void ProtocolDock::search_nxt()
     int i = 0;
     uint64_t rowCount = _model_proxy.rowCount();
     QModelIndex matchingIndex;
-    pv::data::DecoderModel *decoder_model = _session.get_decoder_model();
+    pv::data::DecoderModel *decoder_model = _session->get_decoder_model();
     boost::shared_ptr<pv::data::DecoderStack> decoder_stack = decoder_model->getDecoderStack();
     do {
         _cur_search_index++;
@@ -711,7 +711,7 @@ void ProtocolDock::search_update()
     if (!_search_edited)
         return;
 
-    pv::data::DecoderModel *decoder_model = _session.get_decoder_model();
+    pv::data::DecoderModel *decoder_model = _session->get_decoder_model();
     boost::shared_ptr<pv::data::DecoderStack> decoder_stack = decoder_model->getDecoderStack();
     if (!decoder_stack)
         return;
@@ -746,7 +746,7 @@ void ProtocolDock::OnProtocolSetting(void *handle){
      int dex = 0;
     for (auto it = _protocol_items.begin(); it != _protocol_items.end(); it++){
        if ((*it) == handle){
-           _session.rst_decoder(dex);         
+           _session->rst_decoder(dex);         
             protocol_updated();
            break;
        }
@@ -764,7 +764,7 @@ void ProtocolDock::OnProtocolDelete(void *handle){
        if ((*it) == handle){
            DESTROY_QT_LATER(*it); 
            _protocol_items.remove(dex);
-           _session.remove_decode_signal(dex);
+           _session->remove_decode_signal(dex);
            protocol_updated();
            break;
        }
diff --git a/DSView/pv/dock/protocoldock.h b/DSView/pv/dock/protocoldock.h
index 8b7a1a39..1e7e9ded 100755
--- a/DSView/pv/dock/protocoldock.h
+++ b/DSView/pv/dock/protocoldock.h
@@ -64,7 +64,7 @@ public:
     static const uint64_t ProgressRows = 100000;
 
 public:
-    ProtocolDock(QWidget *parent, view::View &view, SigSession &session);
+    ProtocolDock(QWidget *parent, view::View &view, SigSession *session);
     ~ProtocolDock();
 
     void del_all_protocol();
@@ -109,7 +109,7 @@ private:
     void resize_table_view(data::DecoderModel *decoder_model);
 
 private:
-    SigSession &_session;
+    SigSession *_session;
     view::View &_view;
     QSortFilterProxyModel _model_proxy;
     double _cur_search_index;
diff --git a/DSView/pv/dock/searchdock.cpp b/DSView/pv/dock/searchdock.cpp
index 1372ca78..87b2cee3 100755
--- a/DSView/pv/dock/searchdock.cpp
+++ b/DSView/pv/dock/searchdock.cpp
@@ -50,7 +50,7 @@ namespace dock {
 using namespace pv::view;
 using namespace pv::widgets;
 
-SearchDock::SearchDock(QWidget *parent, View &view, SigSession &session) :
+SearchDock::SearchDock(QWidget *parent, View &view, SigSession *session) :
     QWidget(parent),
     _session(session),
     _view(view)
@@ -130,7 +130,7 @@ void SearchDock::on_previous()
     bool ret;
     int64_t last_pos;
     bool last_hit;
-    const boost::shared_ptr<data::Snapshot> snapshot(_session.get_snapshot(SR_CHANNEL_LOGIC));
+    const boost::shared_ptr<data::Snapshot> snapshot(_session->get_snapshot(SR_CHANNEL_LOGIC));
     assert(snapshot);
     const boost::shared_ptr<data::LogicSnapshot> logic_snapshot = boost::dynamic_pointer_cast<data::LogicSnapshot>(snapshot);
 
@@ -192,7 +192,7 @@ void SearchDock::on_next()
 {
     bool ret;
     int64_t last_pos;
-    const boost::shared_ptr<data::Snapshot> snapshot(_session.get_snapshot(SR_CHANNEL_LOGIC));
+    const boost::shared_ptr<data::Snapshot> snapshot(_session->get_snapshot(SR_CHANNEL_LOGIC));
     assert(snapshot);
     const boost::shared_ptr<data::LogicSnapshot> logic_snapshot = boost::dynamic_pointer_cast<data::LogicSnapshot>(snapshot);
 
diff --git a/DSView/pv/dock/searchdock.h b/DSView/pv/dock/searchdock.h
index 0f68daad..6e940bb3 100755
--- a/DSView/pv/dock/searchdock.h
+++ b/DSView/pv/dock/searchdock.h
@@ -63,7 +63,7 @@ class SearchDock : public QWidget
     Q_OBJECT
 
 public:
-    SearchDock(QWidget *parent, pv::view::View &view, SigSession &session);
+    SearchDock(QWidget *parent, pv::view::View &view, SigSession *session);
     ~SearchDock();
 
     void paintEvent(QPaintEvent *);
@@ -78,7 +78,7 @@ public slots:
     void on_set();
 
 private:
-    SigSession &_session;
+    SigSession *_session;
     view::View &_view;
     std::map<uint16_t, QString> _pattern;
 
diff --git a/DSView/pv/dock/triggerdock.cpp b/DSView/pv/dock/triggerdock.cpp
index e38ea7dc..d69b7828 100755
--- a/DSView/pv/dock/triggerdock.cpp
+++ b/DSView/pv/dock/triggerdock.cpp
@@ -40,13 +40,13 @@ namespace dock {
 
 const int TriggerDock::MinTrigPosition = 1;
 
-TriggerDock::TriggerDock(QWidget *parent, SigSession &session) :
+TriggerDock::TriggerDock(QWidget *parent, SigSession *session) :
     QScrollArea(parent),
     _session(session)
 {
     _cur_ch_num = 16;
-    if (_session.get_device()) {
-        GVariant *gvar = _session.get_device()->get_config(NULL, NULL, SR_CONF_TOTAL_CH_NUM);
+    if (_session->get_device()) {
+        GVariant *gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_TOTAL_CH_NUM);
         if (gvar != NULL) {
             _cur_ch_num = g_variant_get_int16(gvar);
             g_variant_unref(gvar);
@@ -180,9 +180,9 @@ void TriggerDock::simple_trigger()
 
 void TriggerDock::adv_trigger()
 {
-    if (_session.get_device()->name() == "DSLogic") {
+    if (_session->get_device()->name() == "DSLogic") {
         bool stream = false;
-        GVariant *gvar = _session.get_device()->get_config(NULL, NULL, SR_CONF_STREAM);
+        GVariant *gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_STREAM);
         if (gvar != NULL) {
             stream = g_variant_get_boolean(gvar);
             g_variant_unref(gvar);
@@ -248,20 +248,20 @@ void TriggerDock::device_updated()
     bool stream = false;
     uint8_t maxRange;
     uint64_t sample_limits;
-    GVariant *gvar = _session.get_device()->get_config(NULL, NULL, SR_CONF_HW_DEPTH);
+    GVariant *gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_HW_DEPTH);
     if (gvar != NULL) {
         hw_depth = g_variant_get_uint64(gvar);
         g_variant_unref(gvar);
 
-        if (_session.get_device()->dev_inst()->mode == LOGIC) {
+        if (_session->get_device()->dev_inst()->mode == LOGIC) {
 
-            gvar = _session.get_device()->get_config(NULL, NULL, SR_CONF_STREAM);
+            gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_STREAM);
             if (gvar != NULL) {
                 stream = g_variant_get_boolean(gvar);
                 g_variant_unref(gvar);
             }
 
-            sample_limits = _session.get_device()->get_sample_limit();
+            sample_limits = _session->get_device()->get_sample_limit();
             if (stream)
                 maxRange = 1;
             else if (hw_depth >= sample_limits)
@@ -271,7 +271,7 @@ void TriggerDock::device_updated()
             _position_spinBox->setRange(MinTrigPosition, maxRange);
             _position_slider->setRange(MinTrigPosition, maxRange);
 
-            if (_session.get_device()->name().contains("virtual") ||
+            if (_session->get_device()->name().contains("virtual") ||
                 stream) {
                 _simple_radioButton->setChecked(true);
                 simple_trigger();
@@ -279,7 +279,7 @@ void TriggerDock::device_updated()
         }
     }
 
-    gvar = _session.get_device()->get_config(NULL, NULL, SR_CONF_TOTAL_CH_NUM);
+    gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_TOTAL_CH_NUM);
     if (gvar != NULL) {
         int ch_num = g_variant_get_int16(gvar);
         g_variant_unref(gvar);
diff --git a/DSView/pv/dock/triggerdock.h b/DSView/pv/dock/triggerdock.h
index 3dd19e68..336f5dc7 100755
--- a/DSView/pv/dock/triggerdock.h
+++ b/DSView/pv/dock/triggerdock.h
@@ -57,7 +57,7 @@ private:
     static const int MinTrigPosition;
 
 public:
-    TriggerDock(QWidget *parent, SigSession &session);
+    TriggerDock(QWidget *parent, SigSession *session);
     ~TriggerDock();
 
     void paintEvent(QPaintEvent *);
@@ -95,7 +95,7 @@ public slots:
 private:
 
 private:
-    SigSession &_session;
+    SigSession *_session;
 
     int _cur_ch_num;
     QWidget *_widget;
diff --git a/DSView/pv/mainframe.cpp b/DSView/pv/mainframe.cpp
index 7c83b53b..fca633f7 100755
--- a/DSView/pv/mainframe.cpp
+++ b/DSView/pv/mainframe.cpp
@@ -51,8 +51,7 @@
 
 namespace pv {
 
-MainFrame::MainFrame(DeviceManager &device_manager,
-    const char *open_file_name)
+MainFrame::MainFrame()
 {
     setAttribute(Qt::WA_TranslucentBackground);
     // Make this a borderless window which can't
@@ -83,7 +82,7 @@ MainFrame::MainFrame(DeviceManager &device_manager,
     _titleBar = new toolbars::TitleBar(true, this);
      
     // MainWindow
-    _mainWindow = new MainWindow(device_manager, open_file_name, this);
+    _mainWindow = new MainWindow(this);
     _mainWindow->setWindowFlags(Qt::Widget);
     _titleBar->setTitle(_mainWindow->windowTitle());
 
diff --git a/DSView/pv/mainframe.h b/DSView/pv/mainframe.h
index 7e6711ce..e04ac0ee 100755
--- a/DSView/pv/mainframe.h
+++ b/DSView/pv/mainframe.h
@@ -30,8 +30,7 @@
 #include <QTimer>
 
 namespace pv {
-
-class DeviceManager;
+ 
 class MainWindow;
 
 namespace toolbars {
@@ -66,8 +65,7 @@ public:
     }borderTypes;
 
 public:
-    MainFrame(DeviceManager &device_manager,
-        const char *open_file_name = NULL);
+    MainFrame();
 
     void readSettings();
 
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index 029d1e0c..7cadf548 100755
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -92,6 +92,7 @@
 #include <libusb.h>
 #include "../ui/msgbox.h"
 #include "config/appconfig.h"
+#include "appcontrol.h"
 
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
@@ -100,30 +101,32 @@ using std::vector;
 
 namespace pv {
 
-MainWindow::MainWindow(DeviceManager &device_manager,
-	const char *open_file_name,
-	QWidget *parent) :
+MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
-    _device_manager(device_manager),
-    _session(device_manager),
     _hot_detach(false),
     _msg(NULL)
 {
+    _control = AppControl::Instance();
+
 	setup_ui();
 
     setContextMenuPolicy(Qt::NoContextMenu);
 
+    /*
 	if (open_file_name) {
         qDebug("Open file: %s", open_file_name);
         const QString s(QString::fromUtf8(open_file_name));
-		QMetaObject::invokeMethod(this, "load_file",
+		QMetaObject::invokeMethod(this, "on_load_file",
 			Qt::QueuedConnection,
 			Q_ARG(QString, s));
 	}
+    */
 }
 
 void MainWindow::setup_ui()
 { 
+    SigSession *_session = _control->GetSession();
+
 	setObjectName(QString::fromUtf8("MainWindow"));
     setContentsMargins(0,0,0,0);
     layout()->setMargin(0);
@@ -236,7 +239,7 @@ void MainWindow::setup_ui()
     _search_dock->installEventFilter(this);
 
     // Populate the device list and select the initially selected device
-    _session.set_default_device(boost::bind(&MainWindow::session_error, this,
+    _session->set_default_device(boost::bind(&MainWindow::session_error, this,
                                             QString(tr("Set Default Device failed")), _1));
 
     // defaut language
@@ -249,22 +252,22 @@ void MainWindow::setup_ui()
 
     // update device
     update_device_list();
-    _session.start_hotplug_proc(boost::bind(&MainWindow::session_error, this,
+    _session->start_hotplug_proc(boost::bind(&MainWindow::session_error, this,
                                              QString(tr("Hotplug failed")), _1));
 
     retranslateUi();
 
 
 	// Setup _session events
-    connect(&_session, SIGNAL(capture_state_changed(int)), this, SLOT(capture_state_changed(int)));
-    connect(&_session, SIGNAL(device_attach()), this, SLOT(device_attach()), Qt::QueuedConnection);
-    connect(&_session, SIGNAL(device_detach()), this, SLOT(device_detach()), Qt::QueuedConnection);
-    connect(&_session, SIGNAL(session_error()), this, SLOT(on_show_error()), Qt::QueuedConnection);
-    connect(&_session, SIGNAL(session_save()), this, SLOT(session_save()));
-    connect(&_session, SIGNAL(data_updated()), _measure_widget, SLOT(reCalc()));
-    connect(&_session, SIGNAL(repeat_resume()), this, SLOT(repeat_resume()));
-    connect(&_session, SIGNAL(update_capture()), _view, SLOT(update_hori_res()), Qt::DirectConnection);
-    connect(&_session, SIGNAL(cur_snap_samplerate_changed()), _measure_widget, SLOT(cursor_update()));
+    connect(_session, SIGNAL(capture_state_changed(int)), this, SLOT(capture_state_changed(int)));
+    connect(_session, SIGNAL(device_attach()), this, SLOT(device_attach()), Qt::QueuedConnection);
+    connect(_session, SIGNAL(device_detach()), this, SLOT(device_detach()), Qt::QueuedConnection);
+    connect(_session, SIGNAL(session_error()), this, SLOT(on_show_error()), Qt::QueuedConnection);
+    connect(_session, SIGNAL(session_save()), this, SLOT(session_save()));
+    connect(_session, SIGNAL(data_updated()), _measure_widget, SLOT(reCalc()));
+    connect(_session, SIGNAL(repeat_resume()), this, SLOT(repeat_resume()));
+    connect(_session, SIGNAL(update_capture()), _view, SLOT(update_hori_res()), Qt::DirectConnection);
+    connect(_session, SIGNAL(cur_snap_samplerate_changed()), _measure_widget, SLOT(cursor_update()));
 
     //view
     connect(_view, SIGNAL(cursor_update()), _measure_widget, SLOT(cursor_update()));
@@ -342,8 +345,10 @@ void MainWindow::update_device_list()
 
     AppConfig &app = AppConfig::Instance(); 
 
+    SigSession *_session = _control->GetSession();
+
     switchLanguage(app._frameOptions.language);
-    _session.stop_capture();
+    _session->stop_capture();
     _view->reload();
     _trigger_widget->device_updated();
 
@@ -351,13 +356,15 @@ void MainWindow::update_device_list()
 
     _trig_bar->reload();
 
-    boost::shared_ptr<pv::device::DevInst> selected_device = _session.get_device();
+    DeviceManager &_device_manager = _control->GetDeviceManager();
+
+    DevInst *selected_device = _session->get_device();
     _device_manager.add_device(selected_device);
-    _session.init_signals();
+    _session->init_signals();
     _sampling_bar->set_device_list(_device_manager.devices(), selected_device);
 
-    boost::shared_ptr<pv::device::File> file_dev;
-    if((file_dev = dynamic_pointer_cast<pv::device::File>(selected_device))) {
+    File *file_dev = NULL;
+    if((file_dev = dynamic_cast<File*>(selected_device))) {
         // check version
         if (selected_device->dev_inst()->mode == LOGIC) {
             GVariant* gvar = selected_device->get_config(NULL, NULL, SR_CONF_FILE_VERSION);
@@ -385,7 +392,7 @@ void MainWindow::update_device_list()
         // load data
         const QString errorMessage(
             QString(tr("Failed to capture file data!")));
-        _session.start_capture(true, boost::bind(&MainWindow::session_error, this,
+        _session->start_capture(true, boost::bind(&MainWindow::session_error, this,
             errorMessage, _1));
     }
 
@@ -457,20 +464,23 @@ void MainWindow::update_device_list()
 
 void MainWindow::on_device_updated_reload()
 {
+    SigSession *_session = _control->GetSession();
     _trigger_widget->device_updated();
-    _session.reload();
+    _session->reload();
     _measure_widget->reload();
 }
 
 void MainWindow::on_load_file(QString file_name)
 {
+    SigSession *_session = _control->GetSession();
+
     try {
-        if (strncmp(_session.get_device()->name().toUtf8(), "virtual", 7))
+        if (strncmp(_session->get_device()->name().toUtf8(), "virtual", 7))
             session_save();
-        _session.set_file(file_name);
+        _session->set_file(file_name);
     } catch(QString e) {
         show_session_error(tr("Failed to load ") + file_name, e);
-        _session.set_default_device(boost::bind(&MainWindow::session_error, this,
+        _session->set_default_device(boost::bind(&MainWindow::session_error, this,
                                                 QString(tr("Set Default Device failed")), _1));
         update_device_list();
         return;
@@ -494,23 +504,27 @@ void MainWindow::show_session_error(
 
 void MainWindow::device_attach()
 {
-    _session.get_device()->device_updated();
-    //_session.stop_hot_plug_proc();
+    SigSession *_session = _control->GetSession();
 
-    _session.set_repeating(false);
-    _session.stop_capture();
+    _session->get_device()->device_updated();
+    //_session->stop_hot_plug_proc();
+
+    _session->set_repeating(false);
+    _session->stop_capture();
     _sampling_bar->set_sampling(false);
-    _session.capture_state_changed(SigSession::Stopped);
+    _session->capture_state_changed(SigSession::Stopped);
 
     struct sr_dev_driver **const drivers = sr_driver_list();
     struct sr_dev_driver **driver;
  
+    DeviceManager &_device_manager = _control->GetDeviceManager();
+
     for (driver = drivers; *driver; driver++)
          if (*driver)
           _device_manager.driver_scan(*driver);
 
 
-    _session.set_default_device(boost::bind(&MainWindow::session_error, this,
+    _session->set_default_device(boost::bind(&MainWindow::session_error, this,
                                             QString(tr("Set Default Device failed")), _1));
     update_device_list();
 
@@ -518,21 +532,23 @@ void MainWindow::device_attach()
 
 void MainWindow::device_detach()
 {
-    _session.get_device()->device_updated();
-    //_session.stop_hot_plug_proc();
+    SigSession *_session = _control->GetSession();
 
-    _session.set_repeating(false);
-    _session.stop_capture();
+    _session->get_device()->device_updated();
+    //_session->stop_hot_plug_proc();
+
+    _session->set_repeating(false);
+    _session->stop_capture();
     _sampling_bar->set_sampling(false);
-    _session.capture_state_changed(SigSession::Stopped);
+    _session->capture_state_changed(SigSession::Stopped);
 
     session_save();
     _view->hide_calibration();
-    if (_session.get_device()->dev_inst()->mode != DSO &&
-        strncmp(_session.get_device()->name().toUtf8(), "virtual", 7)) {
-        const boost::shared_ptr<data::Snapshot> logic_snapshot(_session.get_snapshot(SR_CHANNEL_LOGIC));
+    if (_session->get_device()->dev_inst()->mode != DSO &&
+        strncmp(_session->get_device()->name().toUtf8(), "virtual", 7)) {
+        const boost::shared_ptr<data::Snapshot> logic_snapshot(_session->get_snapshot(SR_CHANNEL_LOGIC));
         assert(logic_snapshot);
-        const boost::shared_ptr<data::Snapshot> analog_snapshot(_session.get_snapshot(SR_CHANNEL_ANALOG));
+        const boost::shared_ptr<data::Snapshot> analog_snapshot(_session->get_snapshot(SR_CHANNEL_ANALOG));
         assert(analog_snapshot);
 
         if (!logic_snapshot->empty() || !analog_snapshot->empty()) {
@@ -550,15 +566,18 @@ void MainWindow::device_detach()
     }
 
     _hot_detach = true;
-    if (!_session.get_saving())
+    if (!_session->get_saving())
         device_detach_post();
 }
 
 void MainWindow::device_detach_post()
 {
+    SigSession *_session = _control->GetSession();
+
     if (!_hot_detach)
         return;
 
+   DeviceManager &_device_manager = _control->GetDeviceManager();
     _hot_detach = false;
     struct sr_dev_driver **const drivers = sr_driver_list();
     struct sr_dev_driver **driver;
@@ -566,16 +585,18 @@ void MainWindow::device_detach_post()
         if (*driver)
             _device_manager.driver_scan(*driver);
 
-    _session.set_default_device(boost::bind(&MainWindow::session_error, this,
+    _session->set_default_device(boost::bind(&MainWindow::session_error, this,
                                             QString(tr("Set Default Device failed")), _1));
     update_device_list();
 }
 
 void MainWindow::device_changed(bool close)
 {
+    SigSession *_session = _control->GetSession();
+
     if (close) {
         _sampling_bar->set_sampling(false);
-        _session.set_default_device(boost::bind(&MainWindow::session_error, this,
+        _session->set_default_device(boost::bind(&MainWindow::session_error, this,
                                                 QString(tr("Set Default Device failed")), _1));
     }
     update_device_list();
@@ -583,36 +604,40 @@ void MainWindow::device_changed(bool close)
 
 void MainWindow::on_run_stop()
 {
-    switch(_session.get_capture_state()) {
+    SigSession *_session = _control->GetSession();
+
+    switch(_session->get_capture_state()) {
     case SigSession::Init:
     case SigSession::Stopped:
         commit_trigger(false);
-        _session.start_capture(false,
+        _session->start_capture(false,
             boost::bind(&MainWindow::session_error, this,
                 QString(tr("Capture failed")), _1));
         _view->capture_init();
         break;
 
     case SigSession::Running:
-        _session.stop_capture();
+        _session->stop_capture();
         break;
     }
 }
 
 void MainWindow::on_instant_stop()
 {
-    switch(_session.get_capture_state()) {
+    SigSession *_session = _control->GetSession();
+
+    switch(_session->get_capture_state()) {
     case SigSession::Init:
     case SigSession::Stopped:
         commit_trigger(true);
-        _session.start_capture(true,
+        _session->start_capture(true,
             boost::bind(&MainWindow::session_error, this,
                 QString(tr("Capture failed")), _1));
         _view->capture_init();
         break;
 
     case SigSession::Running:
-        _session.stop_capture();
+        _session->stop_capture();
         break;
     }
 }
@@ -631,26 +656,28 @@ void MainWindow::on_show_error()
     QString ch_status = "";
     uint64_t error_pattern;
 
-    switch(_session.get_error()) {
+    SigSession *_session = _control->GetSession();
+
+    switch(_session->get_error()) {
     case SigSession::Hw_err:
-        _session.set_repeating(false);
-        _session.stop_capture();
+        _session->set_repeating(false);
+        _session->stop_capture();
         title = tr("Hardware Operation Failed");
         details = tr("Please replug device to refresh hardware configuration!");
         break;
     case SigSession::Malloc_err:
-        _session.set_repeating(false);
-        _session.stop_capture();
+        _session->set_repeating(false);
+        _session->stop_capture();
         title = tr("Malloc Error");
         details = tr("Memory is not enough for this sample!\nPlease reduce the sample depth!");
         break;
     case SigSession::Test_data_err:
-        _session.set_repeating(false);
-        _session.stop_capture();
+        _session->set_repeating(false);
+        _session->stop_capture();
         _sampling_bar->set_sampling(false);
-        _session.capture_state_changed(SigSession::Stopped);
+        _session->capture_state_changed(SigSession::Stopped);
         title = tr("Data Error");
-        error_pattern = _session.get_error_pattern();
+        error_pattern = _session->get_error_pattern();
         for(int i = 0; i < 16; i++) {
             if (error_pattern & 0x01)
                 ch_status += "X ";
@@ -665,11 +692,11 @@ void MainWindow::on_show_error()
     case SigSession::Pkt_data_err:
         title = tr("Packet Error");
         details = tr("the content of received packet are not expected!");
-        _session.refresh(0);
+        _session->refresh(0);
         break;
     case SigSession::Data_overflow:
-        _session.set_repeating(false);
-        _session.stop_capture();
+        _session->set_repeating(false);
+        _session->stop_capture();
         title = tr("Data Overflow");
         details = tr("USB bandwidth can not support current sample rate! \nPlease reduce the sample rate!");
         break;
@@ -680,7 +707,7 @@ void MainWindow::on_show_error()
     }
 
     dialogs::DSMessageBox msg(this);
-    connect(_session.get_device().get(), SIGNAL(device_updated()), &msg, SLOT(accept()));
+    connect(_session->get_device(), SIGNAL(device_updated()), &msg, SLOT(accept()));
     QFont font("Monaco");
     font.setStyleHint(QFont::Monospace);
     font.setFixedPitch(true);
@@ -692,18 +719,20 @@ void MainWindow::on_show_error()
     msg.mBox()->setIcon(QMessageBox::Warning);
     msg.exec();
 
-    _session.clear_error();
+    _session->clear_error();
 }
 
 void MainWindow::capture_state_changed(int state)
 {
-    if (!_session.repeat_check()) {
+    SigSession *_session = _control->GetSession();
+
+    if (!_session->repeat_check()) {
         _file_bar->enable_toggle(state != SigSession::Running);
         _sampling_bar->set_sampling(state == SigSession::Running);
         _view->on_state_changed(state != SigSession::Running);
 
-        if (_session.get_device()->dev_inst()->mode != DSO ||
-            _session.get_instant()) {
+        if (_session->get_device()->dev_inst()->mode != DSO ||
+            _session->get_instant()) {
             _sampling_bar->enable_toggle(state != SigSession::Running);
             _trig_bar->enable_toggle(state != SigSession::Running);
             //_measure_dock->widget()->setEnabled(state != SigSession::Running);
@@ -727,11 +756,12 @@ void MainWindow::session_save()
     #endif
 
      AppConfig &app = AppConfig::Instance();
+     SigSession *_session = _control->GetSession();
 
     if(dir.mkpath(path)) {
         dir.cd(path);
-        QString driver_name = _session.get_device()->name();
-        QString mode_name = QString::number(_session.get_device()->dev_inst()->mode);
+        QString driver_name = _session->get_device()->name();
+        QString mode_name = QString::number(_session->get_device()->dev_inst()->mode);
         QString lang_name = ".ses" + QString::number(app._frameOptions.language);
         QString file_name = dir.absolutePath() + "/" +
                             driver_name + mode_name +
@@ -762,7 +792,9 @@ void MainWindow::on_protocol(bool visible)
 
 void MainWindow::on_trigger(bool visible)
 {
-    if (_session.get_device()->dev_inst()->mode != DSO) {
+    SigSession *_session = _control->GetSession();
+
+    if (_session->get_device()->dev_inst()->mode != DSO) {
         _trigger_widget->init();
         _trigger_dock->setVisible(visible);
         _dso_trigger_dock->setVisible(false);
@@ -779,16 +811,17 @@ void MainWindow::commit_trigger(bool instant)
     int i = 0;
     
      AppConfig &app = AppConfig::Instance();  
+     SigSession *_session = _control->GetSession();
 
     ds_trigger_init();
 
-    if (_session.get_device()->dev_inst()->mode != LOGIC ||
+    if (_session->get_device()->dev_inst()->mode != LOGIC ||
         instant)
         return;
 
     if (!_trigger_widget->commit_trigger()) {
         /* simple trigger check trigger_enable */
-        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session.get_signals())
+        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals())
         {
             assert(s);
             boost::shared_ptr<view::LogicSignal> logicSig;
@@ -810,7 +843,7 @@ void MainWindow::commit_trigger(bool instant)
 
             msg.exec();
             if (msg.mBox()->clickedButton() == cancelButton) {
-                BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session.get_signals())
+                BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals())
                 {
                     assert(s);
                     boost::shared_ptr<view::LogicSignal> logicSig;
@@ -876,7 +909,9 @@ void MainWindow::on_save()
 //    dialogs::RegionOptions *regionDlg = new dialogs::RegionOptions(_view, _session, this);
 //    regionDlg->exec();
 
-    _session.set_saving(true);
+    SigSession *_session = _control->GetSession();
+
+    _session->set_saving(true);
     QString session_file;
     QDir dir;
     #if QT_VERSION >= 0x050400
@@ -899,6 +934,7 @@ void MainWindow::on_save()
 void MainWindow::on_export()
 {
     using pv::dialogs::StoreProgress;
+    SigSession *_session = _control->GetSession();
 
     StoreProgress *dlg = new StoreProgress(_session, this);
     dlg->export_run();
@@ -927,36 +963,21 @@ bool MainWindow::load_session_json(QJsonDocument json, bool file_dev)
         sessionObj["Version"].toInt() != Session_Version)
         return false;
 
+    SigSession *_session = _control->GetSession();
+
     // check device and mode
-    const sr_dev_inst *const sdi = _session.get_device()->dev_inst();
+    const sr_dev_inst *const sdi = _session->get_device()->dev_inst();
     if ((!file_dev && strcmp(sdi->driver->name, sessionObj["Device"].toString().toUtf8()) != 0) ||
         sdi->mode != sessionObj["DeviceMode"].toDouble()) {
         MsgBox::Show(NULL, "Session File is not compatible with current device or mode!", this);
         return false;
     }
-
-    AppConfig &app = AppConfig::Instance(); 
-
-    // check language
-    if (sessionObj.contains("Language")) {
-        switchLanguage(sessionObj["Language"].toInt());
-    } else if (sessionObj.contains("Operation Mode")) {
-        bool language_matched = _session.get_device()->set_config(NULL, NULL, SR_CONF_OPERATION_MODE,
-                                          g_variant_new_string(sessionObj["Operation Mode"].toString().toUtf8()));
-        if (!language_matched) {
-            if (app._frameOptions.language != QLocale::Chinese)
-                switchLanguage(QLocale::Chinese);
-            else
-                switchLanguage(QLocale::English);
-        }
-    }
-
+ 
     // clear decoders
   
     if (sdi->mode == LOGIC) {
         _protocol_widget->del_all_protocol();
-    }
- 
+    } 
 
     // load device settings
     GVariant *gvar_opts;
@@ -970,21 +991,21 @@ bool MainWindow::load_session_json(QJsonDocument json, bool file_dev)
             if (!sessionObj.contains(info->name))
                 continue;
             if (info->datatype == SR_T_BOOL)
-                _session.get_device()->set_config(NULL, NULL, info->key, g_variant_new_boolean(sessionObj[info->name].toDouble()));
+                _session->get_device()->set_config(NULL, NULL, info->key, g_variant_new_boolean(sessionObj[info->name].toDouble()));
             else if (info->datatype == SR_T_UINT64)
-                _session.get_device()->set_config(NULL, NULL, info->key, g_variant_new_uint64(sessionObj[info->name].toString().toULongLong()));
+                _session->get_device()->set_config(NULL, NULL, info->key, g_variant_new_uint64(sessionObj[info->name].toString().toULongLong()));
             else if (info->datatype == SR_T_UINT8)
-                _session.get_device()->set_config(NULL, NULL, info->key, g_variant_new_byte(sessionObj[info->name].toString().toUInt()));
+                _session->get_device()->set_config(NULL, NULL, info->key, g_variant_new_byte(sessionObj[info->name].toString().toUInt()));
             else if (info->datatype == SR_T_FLOAT)
-                _session.get_device()->set_config(NULL, NULL, info->key, g_variant_new_double(sessionObj[info->name].toDouble()));
+                _session->get_device()->set_config(NULL, NULL, info->key, g_variant_new_double(sessionObj[info->name].toDouble()));
             else if (info->datatype == SR_T_CHAR)
-                _session.get_device()->set_config(NULL, NULL, info->key, g_variant_new_string(sessionObj[info->name].toString().toUtf8()));
+                _session->get_device()->set_config(NULL, NULL, info->key, g_variant_new_string(sessionObj[info->name].toString().toUtf8()));
         }
     }
 
     // load channel settings
     if (file_dev && (sdi->mode == DSO)) {
-        for (const GSList *l = _session.get_device()->dev_inst()->channels; l; l = l->next) {
+        for (const GSList *l = _session->get_device()->dev_inst()->channels; l; l = l->next) {
             sr_channel *const probe = (sr_channel*)l->data;
             assert(probe);
             foreach (const QJsonValue &value, sessionObj["channel"].toArray()) {
@@ -1003,7 +1024,7 @@ bool MainWindow::load_session_json(QJsonDocument json, bool file_dev)
             }
         }
     } else {
-        for (const GSList *l = _session.get_device()->dev_inst()->channels; l; l = l->next) {
+        for (const GSList *l = _session->get_device()->dev_inst()->channels; l; l = l->next) {
             sr_channel *const probe = (sr_channel*)l->data;
             assert(probe);
             bool isEnabled = false;
@@ -1029,12 +1050,12 @@ bool MainWindow::load_session_json(QJsonDocument json, bool file_dev)
         }
     }
 
-    //_session.init_signals();
-    _session.reload();
+    //_session->init_signals();
+    _session->reload();
 
     // load signal setting
     if (file_dev && (sdi->mode == DSO)) {
-        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session.get_signals()) {
+        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
             foreach (const QJsonValue &value, sessionObj["channel"].toArray()) {
                 QJsonObject obj = value.toObject();
                 if ((strcmp(s->get_name().toStdString().c_str(), g_strdup(obj["name"].toString().toStdString().c_str())) == 0) &&
@@ -1053,7 +1074,7 @@ bool MainWindow::load_session_json(QJsonDocument json, bool file_dev)
             }
         }
     } else {
-        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session.get_signals()) {
+        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
             foreach (const QJsonValue &value, sessionObj["channel"].toArray()) {
                 QJsonObject obj = value.toObject();
                 if ((s->get_index() == obj["index"].toDouble()) &&
@@ -1126,11 +1147,12 @@ bool MainWindow::on_store_session(QString name)
     //outStream.setGenerateByteOrderMark(true); // UTF-8 without BOM
 
     AppConfig &app = AppConfig::Instance(); 
+    SigSession *_session = _control->GetSession();
 
     GVariant *gvar_opts;
     GVariant *gvar;
     gsize num_opts;
-    const sr_dev_inst *const sdi = _session.get_device()->dev_inst();
+    const sr_dev_inst *const sdi = _session->get_device()->dev_inst();
     QJsonObject sessionVar;
     QJsonArray channelVar;
     sessionVar["Version"]= QJsonValue::fromVariant(Session_Version);
@@ -1145,7 +1167,7 @@ bool MainWindow::on_store_session(QString name)
     for (unsigned int i = 0; i < num_opts; i++) {
         const struct sr_config_info *const info =
             sr_config_info_get(options[i]);
-        gvar = _session.get_device()->get_config(NULL, NULL, info->key);
+        gvar = _session->get_device()->get_config(NULL, NULL, info->key);
         if (gvar != NULL) {
             if (info->datatype == SR_T_BOOL)
                 sessionVar[info->name] = QJsonValue::fromVariant(g_variant_get_boolean(gvar));
@@ -1161,7 +1183,7 @@ bool MainWindow::on_store_session(QString name)
         }
     }
 
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session.get_signals()) {
+    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
         QJsonObject s_obj;
         s_obj["index"] = s->get_index();
         s_obj["type"] = s->get_type();
@@ -1200,7 +1222,7 @@ bool MainWindow::on_store_session(QString name)
     }
     sessionVar["channel"] = channelVar;
 
-    if (_session.get_device()->dev_inst()->mode == LOGIC) {
+    if (_session->get_device()->dev_inst()->mode == LOGIC) {
         sessionVar["trigger"] = _trigger_widget->get_session();
     }
 
@@ -1209,7 +1231,7 @@ bool MainWindow::on_store_session(QString name)
     sessionVar["decoder"] = ss.json_decoders();
 
 
-    if (_session.get_device()->dev_inst()->mode == DSO) {
+    if (_session->get_device()->dev_inst()->mode == DSO) {
         sessionVar["measure"] = _view->get_viewstatus()->get_session();
     }
 
@@ -1236,14 +1258,16 @@ void MainWindow::restore_dock()
         } 
     } 
 
-    if (_session.get_device()->dev_inst()->mode != DSO) {
+    SigSession *_session = _control->GetSession();
+
+    if (_session->get_device()->dev_inst()->mode != DSO) {
         _dso_trigger_dock->setVisible(false);
         _trig_bar->update_trig_btn(_trigger_dock->isVisible());
     } else {
         _trigger_dock->setVisible(false);
         _trig_bar->update_trig_btn(_dso_trigger_dock->isVisible());
     }
-    if (_session.get_device()->dev_inst()->mode != LOGIC) {
+    if (_session->get_device()->dev_inst()->mode != LOGIC) {
 
         on_protocol(false);
 
@@ -1258,7 +1282,8 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event)
     (void) object;
 
     if ( event->type() == QEvent::KeyPress ) {
-        const vector< boost::shared_ptr<view::Signal> > sigs(_session.get_signals());
+        SigSession *_session = _control->GetSession();
+        const vector< boost::shared_ptr<view::Signal> > sigs(_session->get_signals());
         QKeyEvent *ke = (QKeyEvent *) event;
         switch(ke->key()) {
         case Qt::Key_S:
@@ -1268,7 +1293,7 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event)
             on_instant_stop();
             break;
         case Qt::Key_T:
-            if (_session.get_device()->dev_inst()->mode == DSO)
+            if (_session->get_device()->dev_inst()->mode == DSO)
                 on_trigger(!_dso_trigger_dock->isVisible());
             else
                 on_trigger(!_trigger_dock->isVisible());
@@ -1367,7 +1392,8 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event)
  
 void MainWindow::switchLanguage(int language)
 {
-    boost::shared_ptr<pv::device::DevInst> dev = _session.get_device();
+    SigSession *_session = _control->GetSession();
+    DevInst *dev = _session->get_device();
     dev->set_config(NULL, NULL, SR_CONF_LANGUAGE, g_variant_new_int16(language));
     AppConfig &app = AppConfig::Instance();
 
@@ -1408,7 +1434,9 @@ void MainWindow::switchTheme(QString style)
     qss.open(QFile::ReadOnly | QFile::Text);
     qApp->setStyleSheet(qss.readAll());
     qss.close();
-    _session.data_updated();
+
+    SigSession *_session = _control->GetSession();
+    _session->data_updated();
 }
 
 void MainWindow::on_open_doc(){
diff --git a/DSView/pv/mainwindow.h b/DSView/pv/mainwindow.h
index 0571aeba..7dee5f3a 100755
--- a/DSView/pv/mainwindow.h
+++ b/DSView/pv/mainwindow.h
@@ -27,8 +27,8 @@
 #include <list>
 
 #include <QMainWindow>
-
-#include "sigsession.h"
+#include <QTranslator>
+ 
 #include "dialogs/dsmessagebox.h"
 
 class QAction;
@@ -40,9 +40,10 @@ class QToolBar;
 class QWidget;
 class QDockWidget;
 
-namespace pv {
+class AppControl;
 
-class DeviceManager;
+namespace pv {
+ 
 
 namespace toolbars {
 class SamplingBar;
@@ -63,6 +64,12 @@ namespace view {
 class View;
 }
 
+namespace device{
+    class DevInst;
+}
+
+using namespace pv::device;
+ 
 //The mainwindow,referenced by MainFrame
 //TODO: create graph view,toolbar,and show device list
 class MainWindow : public QMainWindow
@@ -73,9 +80,7 @@ private:
     static constexpr int Session_Version = 2;
 
 public:
-	explicit MainWindow(DeviceManager &device_manager,
-		const char *open_file_name = NULL,
-		QWidget *parent = 0);
+	explicit MainWindow(QWidget *parent = 0);
 
 protected:
     void closeEvent(QCloseEvent *event);
@@ -170,10 +175,8 @@ signals:
     void prgRate(int progress);
 
 private:
-	DeviceManager &_device_manager;
-
-	SigSession _session;
-    bool _hot_detach;
+    AppControl     *_control; 
+    bool           _hot_detach;
 
 	pv::view::View *_view;
     dialogs::DSMessageBox *_msg;
diff --git a/DSView/pv/sigsession.cpp b/DSView/pv/sigsession.cpp
index 7ceed522..0774aca0 100755
--- a/DSView/pv/sigsession.cpp
+++ b/DSView/pv/sigsession.cpp
@@ -89,8 +89,7 @@ namespace pv {
 // TODO: This should not be necessary
 SigSession* SigSession::_session = NULL;
 
-SigSession::SigSession(DeviceManager &device_manager) :
-	_device_manager(device_manager),
+SigSession::SigSession(DeviceManager *device_manager) :
     _capture_state(Init),
     _instant(false),
     _error(No_err),
@@ -100,12 +99,19 @@ SigSession::SigSession(DeviceManager &device_manager) :
     _repeat_hold_prg(0),
     _map_zoom(0)
 {
-	// TODO: This should not be necessary
-	_session = this;
+     void *p = this;
+     _appCntrol = NULL;
+     
+    _hotplug_handle = 0;
+    _dev_inst = NULL;
+    _device_manager = device_manager;
+    // TODO: This should not be necessary
+    _session = this;
     _hot_attach = false;
     _hot_detach = false;
     _group_cnt = 0;
-	register_hotplug_callback();
+ 
+
     _feed_timer.stop();
     _noData_cnt = 0;
     _data_lock = false;
@@ -135,38 +141,39 @@ SigSession::SigSession(DeviceManager &device_manager) :
     connect(&_feed_timer, SIGNAL(timeout()), this, SLOT(feed_timeout()));
 }
 
+//SigSession::SigSession(SigSession &o){(void)o;}
+
 SigSession::~SigSession()
 {
-	stop_capture();
-		       
-    ds_trigger_destroy();
-
-    _dev_inst->release();
-
-	// TODO: This should not be necessary
-	_session = NULL;
-
-    if (_hotplug_handle) {
-        stop_hotplug_proc();
-        deregister_hotplug_callback();
-    }
+   Close();
 }
 
-boost::shared_ptr<device::DevInst> SigSession::get_device() const
+DevInst* SigSession::get_device() const
 {
     return _dev_inst;
 }
 
+void SigSession::deselect_device()
+{
+    _decode_traces.clear();
+    _group_traces.clear();
+    _dev_inst = NULL;
+}
+
 /*
   when be called, it will call 4DSL lib sr_session_new, and create a session struct in the lib
 */
-void SigSession::set_device(boost::shared_ptr<device::DevInst> dev_inst)
+void SigSession::set_device(DevInst *dev_inst)
 {
-    using pv::device::Device;
-
     // Ensure we are not capturing before setting the device
     //stop_capture();
 
+    assert(dev_inst);
+
+     if (_dev_inst){
+        _dev_inst->dev_inst();
+     }
+
     if (_dev_inst) {
         sr_session_datafeed_callback_remove_all();
         _dev_inst->release();
@@ -202,29 +209,27 @@ void SigSession::set_file(QString name)
 {
     // Deslect the old device, because file type detection in File::create
     // destorys the old session inside libsigrok.
+    deselect_device();
+
     try {
-        set_device(boost::shared_ptr<device::DevInst>());
-    } catch(const QString e) {
-        throw(e);
-        return;
-    }
-    try {
-        set_device(boost::shared_ptr<device::DevInst>(device::File::create(name)));
+        set_device(device::File::create(name));
     } catch(const QString e) {
         throw(e);
         return;
     }
 }
 
-void SigSession::close_file(boost::shared_ptr<pv::device::DevInst> dev_inst)
+void SigSession::close_file(DevInst *dev_inst)
 {
     assert(dev_inst);
+    assert(_device_manager);
+
     try {
         dev_inst->device_updated();
         set_repeating(false);
         stop_capture();
         capture_state_changed(SigSession::Stopped);
-        _device_manager.del_device(dev_inst);
+        _device_manager->del_device(dev_inst);
     } catch(const QString e) {
         throw(e);
         return;
@@ -233,22 +238,25 @@ void SigSession::close_file(boost::shared_ptr<pv::device::DevInst> dev_inst)
 
 void SigSession::set_default_device(boost::function<void (const QString)> error_handler)
 {
-    boost::shared_ptr<pv::device::DevInst> default_device;
-    const list<boost::shared_ptr<device::DevInst> > &devices =
-        _device_manager.devices();
+    assert(_device_manager);
 
+    DevInst *default_device = NULL;
+
+    const list<DevInst*> &devices = _device_manager->devices();
     if (!devices.empty()) {
         // Fall back to the first device in the list.
         default_device = devices.front();
 
         // Try and find the DreamSourceLab device and select that by default
-        BOOST_FOREACH (boost::shared_ptr<pv::device::DevInst> dev, devices)
-            if (dev->dev_inst() &&
-                !dev->name().contains("virtual")) {
+        for (DevInst *dev : devices)
+            if (dev->dev_inst() && !dev->name().contains("virtual")) {
                 default_device = dev;
                 break;
             }
-        try {
+    }
+
+    if (default_device != NULL){
+           try {
             set_device(default_device);
         } catch(const QString e) {
             error_handler(e);
@@ -257,20 +265,22 @@ void SigSession::set_default_device(boost::function<void (const QString)> error_
     }
 }
 
-void SigSession::release_device(device::DevInst *dev_inst)
+void SigSession::release_device(DevInst *dev_inst)
 {
-    (void)dev_inst;
-    assert(_dev_inst.get() == dev_inst);
+    if (_dev_inst == NULL)
+        return;
 
+    assert(dev_inst);
+    assert(_dev_inst == dev_inst);
     assert(get_capture_state() != Running);
-    _dev_inst = boost::shared_ptr<device::DevInst>();
-    //_dev_inst.reset();
+
+    _dev_inst =  NULL;
 }
 
 SigSession::capture_state SigSession::get_capture_state() const
 {
     boost::lock_guard<boost::mutex> lock(_sampling_mutex);
-	return _capture_state;
+    return _capture_state;
 }
 
 uint64_t SigSession::cur_samplelimits() const
@@ -447,7 +457,7 @@ void SigSession::start_capture(bool instant,
     }
 
     // stop previous capture
-	stop_capture();
+    stop_capture();
     // reset measure of dso signal
     BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _signals)
     {
@@ -464,24 +474,24 @@ void SigSession::start_capture(bool instant,
         _instant = true;
     capture_init();
 
-	// Check that at least one probe is enabled
-	const GSList *l;
+    // Check that at least one probe is enabled
+    const GSList *l;
     for (l = _dev_inst->dev_inst()->channels; l; l = l->next) {
         sr_channel *const probe = (sr_channel*)l->data;
-		assert(probe);
-		if (probe->enabled)
-			break;
-	}
-	if (!l) {
-		error_handler(tr("No probes enabled."));
+        assert(probe);
+        if (probe->enabled)
+            break;
+    }
+    if (!l) {
+        error_handler(tr("No probes enabled."));
         data_updated();
         set_repeating(false);
         capture_state_changed(SigSession::Stopped);
-		return;
-	}
+        return;
+    }
 
-	// Begin the session
-	_sampling_thread.reset(new boost::thread(
+    // Begin the session
+    _sampling_thread.reset(new boost::thread(
         &SigSession::sample_thread_proc, this, _dev_inst,
         error_handler));
 }
@@ -497,11 +507,11 @@ void SigSession::stop_capture()
         (*i)->decoder()->stop_decode();
 
     if (get_capture_state() != Running)
-		return;
+        return;
 
-	sr_session_stop();
+    sr_session_stop();
 
-	// Check that sampling stopped
+    // Check that sampling stopped
     if (_sampling_thread.get())
         _sampling_thread->join();
     _sampling_thread.reset();
@@ -530,10 +540,10 @@ bool SigSession::get_capture_status(bool &triggered, int &progress)
     return false;
 }
 
-vector< boost::shared_ptr<view::Signal> > SigSession::get_signals()
+vector< boost::shared_ptr<view::Signal> >& SigSession::get_signals()
 {
     //boost::lock_guard<boost::mutex> lock(_signals_mutex);
-	return _signals;
+    return _signals;
 }
 
 vector< boost::shared_ptr<view::GroupSignal> > SigSession::get_group_signals()
@@ -562,12 +572,12 @@ bool SigSession::get_instant()
 void SigSession::set_capture_state(capture_state state)
 {
     boost::lock_guard<boost::mutex> lock(_sampling_mutex);
-	_capture_state = state;
+    _capture_state = state;
     data_updated();
-	capture_state_changed(state);
+    capture_state_changed(state);
 }
 
-void SigSession::sample_thread_proc(boost::shared_ptr<device::DevInst> dev_inst,
+void SigSession::sample_thread_proc(DevInst *dev_inst,
                                     boost::function<void (const QString)> error_handler)
 {
     assert(dev_inst);
@@ -934,20 +944,20 @@ void SigSession::feed_in_header(const sr_dev_inst *sdi)
 void SigSession::feed_in_meta(const sr_dev_inst *sdi,
     const sr_datafeed_meta &meta)
 {
-	(void)sdi;
+    (void)sdi;
 
-	for (const GSList *l = meta.config; l; l = l->next) {
+    for (const GSList *l = meta.config; l; l = l->next) {
         const sr_config *const src = (const sr_config*)l->data;
-		switch (src->key) {
-		case SR_CONF_SAMPLERATE:
-			/// @todo handle samplerate changes
-			/// samplerate = (uint64_t *)src->value;
-			break;
-		default:
-			// Unknown metadata is not an error.
-			break;
-		}
-	}
+        switch (src->key) {
+        case SR_CONF_SAMPLERATE:
+            /// @todo handle samplerate changes
+            /// samplerate = (uint64_t *)src->value;
+            break;
+        default:
+            // Unknown metadata is not an error.
+            break;
+        }
+    }
 }
 
 void SigSession::feed_in_trigger(const ds_trigger_pos &trigger_pos)
@@ -980,9 +990,9 @@ void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
 {
     //boost::lock_guard<boost::mutex> lock(_data_mutex);
     if (!_logic_data || _cur_logic_snapshot->memory_failed()) {
-		qDebug() << "Unexpected logic packet";
-		return;
-	}
+        qDebug() << "Unexpected logic packet";
+        return;
+    }
 
     if (logic.data_error == 1) {
         _error = Test_data_err;
@@ -998,7 +1008,7 @@ void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
         // this after both analog and logic sweeps have begun.
         frame_began();
     } else {
-		// Append to the existing data snapshot
+        // Append to the existing data snapshot
         _cur_logic_snapshot->append_payload(logic);
     }
 
@@ -1098,13 +1108,13 @@ void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
     //boost::lock_guard<boost::mutex> lock(_data_mutex);
 
     if(!_analog_data || _cur_analog_snapshot->memory_failed())
-	{
-		qDebug() << "Unexpected analog packet";
-		return;	// This analog packet was not expected.
-	}
+    {
+        qDebug() << "Unexpected analog packet";
+        return;	// This analog packet was not expected.
+    }
 
     if (_cur_analog_snapshot->last_ended())
-	{
+    {
         // reset scale of analog signal
         BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _signals)
         {
@@ -1118,8 +1128,8 @@ void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
         // first payload
         _cur_analog_snapshot->first_payload(analog, _dev_inst->get_sample_limit(), _dev_inst->dev_inst()->channels);
     } else {
-		// Append to the existing data snapshot
-		_cur_analog_snapshot->append_payload(analog);
+        // Append to the existing data snapshot
+        _cur_analog_snapshot->append_payload(analog);
     }
 
     if (_cur_analog_snapshot->memory_failed()) {
@@ -1136,14 +1146,14 @@ void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
 void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
     const struct sr_datafeed_packet *packet)
 {
-	assert(sdi);
-	assert(packet);
+    assert(sdi);
+    assert(packet);
 
     boost::lock_guard<boost::mutex> lock(_data_mutex);
 
     if (_data_lock && packet->type != SR_DF_END)
         return;
-        
+
     if (packet->type != SR_DF_END &&
         packet->status != SR_PKT_OK) {
         _error = Pkt_data_err;
@@ -1151,36 +1161,36 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
         return;
     }
 
-	switch (packet->type) {
-	case SR_DF_HEADER:
-		feed_in_header(sdi);
-		break;
+    switch (packet->type) {
+    case SR_DF_HEADER:
+        feed_in_header(sdi);
+        break;
 
-	case SR_DF_META:
-		assert(packet->payload);
-		feed_in_meta(sdi,
+    case SR_DF_META:
+        assert(packet->payload);
+        feed_in_meta(sdi,
             *(const sr_datafeed_meta*)packet->payload);
-		break;
+        break;
 
     case SR_DF_TRIGGER:
         assert(packet->payload);
         feed_in_trigger(*(const ds_trigger_pos*)packet->payload);
         break;
 
-	case SR_DF_LOGIC:
-		assert(packet->payload);
+    case SR_DF_LOGIC:
+        assert(packet->payload);
         feed_in_logic(*(const sr_datafeed_logic*)packet->payload);
-		break;
+        break;
 
     case SR_DF_DSO:
         assert(packet->payload);
         feed_in_dso(*(const sr_datafeed_dso*)packet->payload);
         break;
 
-	case SR_DF_ANALOG:
-		assert(packet->payload);
+    case SR_DF_ANALOG:
+        assert(packet->payload);
         feed_in_analog(*(const sr_datafeed_analog*)packet->payload);
-		break;
+        break;
 
     case SR_DF_OVERFLOW:
     {
@@ -1190,9 +1200,9 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
         }
         break;
     }
-	case SR_DF_END:
-	{
-		{
+    case SR_DF_END:
+    {
+        {
             //boost::lock_guard<boost::mutex> lock(_data_mutex);
             if (!_cur_logic_snapshot->empty()) {
                 BOOST_FOREACH(const boost::shared_ptr<view::GroupSignal> g, _group_traces)
@@ -1212,7 +1222,7 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
             BOOST_FOREACH(const boost::shared_ptr<view::DecodeTrace> d, _decode_traces)
                 d->frame_ended();
 
-		}
+        }
 
         if (packet->status != SR_PKT_OK) {
             _error = Pkt_data_err;
@@ -1221,23 +1231,23 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
         frame_ended();
         if (get_device()->dev_inst()->mode != LOGIC)
             set_session_time(QDateTime::currentDateTime());
-		break;
-	}
-	}
+        break;
+    }
+    }
 }
 
 void SigSession::data_feed_in_proc(const struct sr_dev_inst *sdi,
     const struct sr_datafeed_packet *packet, void *cb_data)
 {
-	(void) cb_data;
-	assert(_session);
-	_session->data_feed_in(sdi, packet);
+    (void) cb_data;
+    assert(_session);
+    _session->data_feed_in(sdi, packet);
 }
 
 /*
  * hotplug function
  */
-int SigSession::hotplug_callback(struct libusb_context *ctx, struct libusb_device *dev, 
+int SigSession::hotplug_callback(struct libusb_context *ctx, struct libusb_device *dev,
                                   libusb_hotplug_event event, void *user_data) {
 
     (void)ctx;
@@ -1293,12 +1303,12 @@ void SigSession::register_hotplug_callback()
     int ret;
 
     ret = libusb_hotplug_register_callback(NULL, (libusb_hotplug_event)(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
-                                           LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT), 
+                                           LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT),
                                            (libusb_hotplug_flag)LIBUSB_HOTPLUG_ENUMERATE, 0x2A0E, LIBUSB_HOTPLUG_MATCH_ANY,
                                            LIBUSB_HOTPLUG_MATCH_ANY, hotplug_callback, NULL,
                                            &_hotplug_handle);
     if (LIBUSB_SUCCESS != ret){
-	qDebug() << "Error creating a hotplug callback\n";
+    qDebug() << "Error creating a hotplug callback\n";
     }
 }
 
@@ -1369,7 +1379,7 @@ uint16_t SigSession::get_ch_num(int type)
 
 
 bool SigSession::add_decoder(srd_decoder *const dec, bool silent, DecoderStatus *dstatus)
-{ 
+{
     bool ret = false;
     map<const srd_channel*, int> probes;
     boost::shared_ptr<data::DecoderStack> decoder_stack;
@@ -1379,7 +1389,7 @@ bool SigSession::add_decoder(srd_decoder *const dec, bool silent, DecoderStatus
 
         // Create the decoder
         decoder_stack = boost::shared_ptr<data::DecoderStack>(
-            new data::DecoderStack(*this, dec, dstatus));
+            new data::DecoderStack(this, dec, dstatus));
 
         // Make a list of all the probes
         std::vector<const srd_channel*> all_probes;
@@ -1395,7 +1405,7 @@ bool SigSession::add_decoder(srd_decoder *const dec, bool silent, DecoderStatus
 
         // Create the decode signal
         boost::shared_ptr<view::DecodeTrace> d(
-            new view::DecodeTrace(*this, decoder_stack,
+            new view::DecodeTrace(this, decoder_stack,
                 _decode_traces.size()));
         // set view early for decode start/end region setting
         BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _signals) {
@@ -1524,9 +1534,9 @@ void SigSession::spectrum_rebuild()
             // if not, rebuild
             if (iter == _spectrum_traces.end()) {
                 boost::shared_ptr<data::SpectrumStack> spectrum_stack(
-                    new data::SpectrumStack(*this, dsoSig->get_index()));
+                    new data::SpectrumStack(this, dsoSig->get_index()));
                 boost::shared_ptr<view::SpectrumTrace> spectrum_trace(
-                    new view::SpectrumTrace(*this, spectrum_stack, dsoSig->get_index()));
+                    new view::SpectrumTrace(this, spectrum_stack, dsoSig->get_index()));
                 _spectrum_traces.push_back(spectrum_trace);
             }
         }
@@ -1569,7 +1579,7 @@ void SigSession::math_rebuild(bool enable,
 {
     boost::lock_guard<boost::mutex> lock(_data_mutex);
     boost::shared_ptr<data::MathStack> math_stack(
-        new data::MathStack(*this, dsoSig1, dsoSig2, type));
+        new data::MathStack(this, dsoSig1, dsoSig2, type));
     _math_trace.reset(new view::MathTrace(enable, math_stack, dsoSig1, dsoSig2));
     if (_math_trace && _math_trace->enabled()) {
         _math_trace->get_math_stack()->set_samplerate(_dev_inst->get_sample_rate());
@@ -1815,4 +1825,44 @@ void SigSession::set_stop_scale(float scale)
     _stop_scale = scale;
 }
 
+ sr_dev_inst* SigSession::get_dev_inst_c()
+ {
+     void *p = this;
+     void *p2 = this->_appCntrol;
+     if (_dev_inst != NULL){
+         return _dev_inst->dev_inst();
+     }
+     return NULL;
+ }
+
+ void SigSession::Open()
+ {
+     register_hotplug_callback();
+ }
+
+ void SigSession::Close()
+ {
+     if (_session == NULL)
+        return;
+
+     stop_capture();
+
+     ds_trigger_destroy();
+
+     if (_dev_inst)
+     {
+         _dev_inst->release();
+     }
+
+     // TODO: This should not be necessary
+     _session = NULL;
+
+     if (_hotplug_handle)
+     {
+         stop_hotplug_proc();
+         deregister_hotplug_callback();
+         _hotplug_handle = NULL;
+     }
+ }
+
 } // namespace pv
diff --git a/DSView/pv/sigsession.h b/DSView/pv/sigsession.h
index 6d66c0b5..3e2b8fb3 100755
--- a/DSView/pv/sigsession.h
+++ b/DSView/pv/sigsession.h
@@ -94,6 +94,8 @@ class Decoder;
 class DecoderFactory;
 }
 
+using namespace pv::device;
+
 //created by MainWindow
 class SigSession : public QObject
 {
@@ -130,25 +132,30 @@ public:
         Data_overflow
     };
 
+private:
+   // SigSession(SigSession &o);
+  
 public:
-	SigSession(DeviceManager &device_manager);
+    explicit SigSession(DeviceManager *device_manager);
 
-	~SigSession();
+	~SigSession(); 
 
-    boost::shared_ptr<device::DevInst> get_device() const;
+    DevInst* get_device() const;
 
 	/**
 	 * Sets device instance that will be used in the next capture session.
 	 */
-    void set_device(boost::shared_ptr<device::DevInst> dev_inst);
+    void set_device(DevInst *dev_inst);
+
+    void deselect_device();
 
     void set_file(QString name);
 
-    void close_file(boost::shared_ptr<pv::device::DevInst> dev_inst);
+    void close_file(DevInst *dev_inst);
 
     void set_default_device(boost::function<void (const QString)> error_handler);
 
-    void release_device(device::DevInst *dev_inst);
+    void release_device(DevInst *dev_inst);
 
 	capture_state get_capture_state() const;
 
@@ -173,7 +180,7 @@ public:
 
     std::set< boost::shared_ptr<data::SignalData> > get_data() const;
 
-	std::vector< boost::shared_ptr<view::Signal> >
+	std::vector< boost::shared_ptr<view::Signal> >&
 		get_signals();
 
     std::vector< boost::shared_ptr<view::GroupSignal> >
@@ -213,8 +220,7 @@ public:
 
     void start_hotplug_proc(boost::function<void (const QString)> error_handler);
     void stop_hotplug_proc();
-	void register_hotplug_callback();
-    void deregister_hotplug_callback();
+	
 
     uint16_t get_ch_num(int type);
     
@@ -264,9 +270,18 @@ public:
 
     void exit_capture();
 
+    sr_dev_inst* get_dev_inst_c();
+
+    void Open();
+
+    void Close();
+
 private:
 	void set_capture_state(capture_state state);
 
+    void register_hotplug_callback();
+    void deregister_hotplug_callback();
+
 private:
     /**
      * Attempts to autodetect the format. Failing that
@@ -283,7 +298,7 @@ private:
         boost::function<void (const QString)> error_handler,
         sr_input_format *format = NULL);
 
-    void sample_thread_proc(boost::shared_ptr<device::DevInst> dev_inst,
+    void sample_thread_proc(DevInst *dev_inst,
                             boost::function<void (const QString)> error_handler);
 
     // data feed
@@ -306,77 +321,7 @@ private:
     static int hotplug_callback(struct libusb_context *ctx, struct libusb_device *dev,
                                 libusb_hotplug_event event, void *user_data);
 
-private:
-	DeviceManager &_device_manager;
 
-	/**
-	 * The device instance that will be used in the next capture session.
-	 */
-    boost::shared_ptr<device::DevInst> _dev_inst;
-
-    mutable boost::mutex _sampling_mutex;
-	capture_state _capture_state;
-    bool _instant;
-    uint64_t _cur_snap_samplerate;
-    uint64_t _cur_samplelimits;
-
-    //mutable boost::mutex _signals_mutex;
-	std::vector< boost::shared_ptr<view::Signal> > _signals;
-    std::vector< boost::shared_ptr<view::GroupSignal> > _group_traces;
-
-    std::vector< boost::shared_ptr<view::DecodeTrace> > _decode_traces;
-    pv::data::DecoderModel *_decoder_model;
-
-    std::vector< boost::shared_ptr<view::SpectrumTrace> > _spectrum_traces;
-    boost::shared_ptr<view::LissajousTrace> _lissajous_trace;
-    boost::shared_ptr<view::MathTrace> _math_trace;
-
-    mutable boost::mutex _data_mutex;
-	boost::shared_ptr<data::Logic> _logic_data;
-	boost::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
-    boost::shared_ptr<data::Dso> _dso_data;
-    boost::shared_ptr<data::DsoSnapshot> _cur_dso_snapshot;
-	boost::shared_ptr<data::Analog> _analog_data;
-	boost::shared_ptr<data::AnalogSnapshot> _cur_analog_snapshot;
-    boost::shared_ptr<data::Group> _group_data;
-    boost::shared_ptr<data::GroupSnapshot> _cur_group_snapshot;
-    int _group_cnt;
-
-	std::unique_ptr<boost::thread> _sampling_thread;
-
-	libusb_hotplug_callback_handle _hotplug_handle;
-    std::unique_ptr<boost::thread> _hotplug;
-    bool _hot_attach;
-    bool _hot_detach;
-
-    QTimer _feed_timer;
-    int    _noData_cnt;
-    bool _data_lock;
-    bool _data_updated;
-    int _data_auto_lock;
-
-    QDateTime _session_time;
-    uint64_t _trigger_pos;
-    bool _trigger_flag;
-    uint8_t _trigger_ch;
-    bool _hw_replied;
-
-    error_state _error;
-    uint64_t _error_pattern;
-
-    run_mode _run_mode;
-    int _repeat_intvl;
-    bool _repeating;
-    int _repeat_hold_prg;
-
-    int _map_zoom;
-
-    uint64_t _save_start;
-    uint64_t _save_end;
-    bool _saving;
-
-    bool _dso_feed;
-    float _stop_scale;
 
 signals:
 	void capture_state_changed(int state);
@@ -442,6 +387,81 @@ private slots:
     void feed_timeout();
     void repeat_update();
 
+public: 
+    void *_appCntrol;
+
+private:
+	DeviceManager   *_device_manager;
+
+	/**
+	 * The device instance that will be used in the next capture session.
+	 */
+    DevInst     *_dev_inst;
+
+    mutable boost::mutex _sampling_mutex;
+	capture_state _capture_state;
+    bool _instant;
+    uint64_t _cur_snap_samplerate;
+    uint64_t _cur_samplelimits;
+
+    //mutable boost::mutex _signals_mutex;
+	std::vector< boost::shared_ptr<view::Signal> > _signals;
+    std::vector< boost::shared_ptr<view::GroupSignal> > _group_traces;
+
+    std::vector< boost::shared_ptr<view::DecodeTrace> > _decode_traces;
+    pv::data::DecoderModel *_decoder_model;
+
+    std::vector< boost::shared_ptr<view::SpectrumTrace> > _spectrum_traces;
+    boost::shared_ptr<view::LissajousTrace> _lissajous_trace;
+    boost::shared_ptr<view::MathTrace> _math_trace;
+
+    mutable boost::mutex _data_mutex;
+	boost::shared_ptr<data::Logic> _logic_data;
+	boost::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
+    boost::shared_ptr<data::Dso> _dso_data;
+    boost::shared_ptr<data::DsoSnapshot> _cur_dso_snapshot;
+	boost::shared_ptr<data::Analog> _analog_data;
+	boost::shared_ptr<data::AnalogSnapshot> _cur_analog_snapshot;
+    boost::shared_ptr<data::Group> _group_data;
+    boost::shared_ptr<data::GroupSnapshot> _cur_group_snapshot;
+    int _group_cnt;
+
+	std::unique_ptr<boost::thread> _sampling_thread;
+
+	libusb_hotplug_callback_handle _hotplug_handle;
+    std::unique_ptr<boost::thread> _hotplug;
+    bool _hot_attach;
+    bool _hot_detach;
+
+    QTimer _feed_timer;
+    int    _noData_cnt;
+    bool _data_lock;
+    bool _data_updated;
+    int _data_auto_lock;
+
+    QDateTime _session_time;
+    uint64_t _trigger_pos;
+    bool _trigger_flag;
+    uint8_t _trigger_ch;
+    bool _hw_replied;
+
+    error_state _error;
+    uint64_t _error_pattern;
+
+    run_mode _run_mode;
+    int _repeat_intvl;
+    bool _repeating;
+    int _repeat_hold_prg;
+
+    int _map_zoom;
+
+    uint64_t _save_start;
+    uint64_t _save_end;
+    bool _saving;
+
+    bool _dso_feed;
+    float _stop_scale;
+
 private:
 	// TODO: This should not be necessary. Multiple concurrent
 	// sessions should should be supported and it should be
diff --git a/DSView/pv/storesession.cpp b/DSView/pv/storesession.cpp
index 88fe59bc..aed18575 100755
--- a/DSView/pv/storesession.cpp
+++ b/DSView/pv/storesession.cpp
@@ -75,7 +75,7 @@ namespace pv {
         }
     }
 
-StoreSession::StoreSession(SigSession &session) :
+StoreSession::StoreSession(SigSession *session) :
 	_session(session),
     _outModule(NULL),
 	_units_stored(0),
@@ -90,7 +90,7 @@ StoreSession::~StoreSession()
 	wait();
 }
 
-SigSession& StoreSession::session()
+SigSession* StoreSession::session()
 {
     return _session;
 }
@@ -125,7 +125,7 @@ QList<QString> StoreSession::getSuportedExportFormats(){
     while(*supportedModules){
         if(*supportedModules == NULL)
             break;
-        if (_session.get_device()->dev_inst()->mode != LOGIC &&
+        if (_session->get_device()->dev_inst()->mode != LOGIC &&
             strcmp((*supportedModules)->id, "csv"))
             break;
         QString format((*supportedModules)->desc);
@@ -147,7 +147,7 @@ bool StoreSession::save_start()
     }
 
     std::set<int> type_set;
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> sig, _session.get_signals()) {
+    BOOST_FOREACH(const boost::shared_ptr<view::Signal> sig, _session->get_signals()) {
         assert(sig);
         type_set.insert(sig->get_type());
     }
@@ -167,7 +167,7 @@ bool StoreSession::save_start()
         return false;
     }
 
-    const boost::shared_ptr<data::Snapshot> snapshot(_session.get_snapshot(*type_set.begin()));
+    const boost::shared_ptr<data::Snapshot> snapshot(_session->get_snapshot(*type_set.begin()));
 	assert(snapshot);
     // Check we have data
     if (snapshot->empty()) {
@@ -230,7 +230,7 @@ void StoreSession::save_proc(boost::shared_ptr<data::Snapshot> snapshot)
 
     if ((logic_snapshot = boost::dynamic_pointer_cast<data::LogicSnapshot>(snapshot))) {
         uint16_t to_save_probes = 0;
-        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session.get_signals()) {
+        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
             if (s->enabled() && logic_snapshot->has_data(s->get_index()))
                 to_save_probes++;
         }
@@ -238,7 +238,7 @@ void StoreSession::save_proc(boost::shared_ptr<data::Snapshot> snapshot)
         num = logic_snapshot->get_block_num();
         bool sample;
 
-        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session.get_signals()) {
+        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
             int ch_type = s->get_type();
             if (ch_type == SR_CHANNEL_LOGIC) {
                 int ch_index = s->get_index();
@@ -283,7 +283,7 @@ void StoreSession::save_proc(boost::shared_ptr<data::Snapshot> snapshot)
         }
     } else {
         int ch_type = -1;
-        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session.get_signals()) {
+        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
             ch_type = s->get_type();
             break;
         }
@@ -383,7 +383,7 @@ QString StoreSession::meta_gen(boost::shared_ptr<data::Snapshot> snapshot)
         return NULL;
     }
 
-    const sr_dev_inst *sdi = _session.get_device()->dev_inst();
+    const sr_dev_inst *sdi = _session->get_device()->dev_inst();
     meta = fopen(metafile.toUtf8().data(), "wb");
     if (meta == NULL) {
         qDebug() << "Failed to create temp meta file.";
@@ -421,68 +421,68 @@ QString StoreSession::meta_gen(boost::shared_ptr<data::Snapshot> snapshot)
         fprintf(meta, "total blocks = %d\n", logic_snapshot->get_block_num());
     }
 
-    s = sr_samplerate_string(_session.cur_snap_samplerate());
+    s = sr_samplerate_string(_session->cur_snap_samplerate());
     fprintf(meta, "samplerate = %s\n", s);
 
     if (sdi->mode == DSO) {
-        gvar = _session.get_device()->get_config(NULL, NULL, SR_CONF_TIMEBASE);
+        gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_TIMEBASE);
         if (gvar != NULL) {
             uint64_t tmp_u64 = g_variant_get_uint64(gvar);
             fprintf(meta, "hDiv = %" PRIu64 "\n", tmp_u64);
             g_variant_unref(gvar);
         }
-        gvar = _session.get_device()->get_config(NULL, NULL, SR_CONF_MAX_TIMEBASE);
+        gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_MAX_TIMEBASE);
         if (gvar != NULL) {
             uint64_t tmp_u64 = g_variant_get_uint64(gvar);
             fprintf(meta, "hDiv max = %" PRIu64 "\n", tmp_u64);
             g_variant_unref(gvar);
         }
-        gvar = _session.get_device()->get_config(NULL, NULL, SR_CONF_MIN_TIMEBASE);
+        gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_MIN_TIMEBASE);
         if (gvar != NULL) {
             uint64_t tmp_u64 = g_variant_get_uint64(gvar);
             fprintf(meta, "hDiv min = %" PRIu64 "\n", tmp_u64);
             g_variant_unref(gvar);
         }
-        gvar = _session.get_device()->get_config(NULL, NULL, SR_CONF_UNIT_BITS);
+        gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_UNIT_BITS);
         if (gvar != NULL) {
             uint8_t tmp_u8 = g_variant_get_byte(gvar);
             fprintf(meta, "bits = %d\n", tmp_u8);
             g_variant_unref(gvar);
         }
-        gvar = _session.get_device()->get_config(NULL, NULL, SR_CONF_REF_MIN);
+        gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_REF_MIN);
         if (gvar != NULL) {
             uint32_t tmp_u32 = g_variant_get_uint32(gvar);
             fprintf(meta, "ref min = %d\n", tmp_u32);
             g_variant_unref(gvar);
         }
-        gvar = _session.get_device()->get_config(NULL, NULL, SR_CONF_REF_MAX);
+        gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_REF_MAX);
         if (gvar != NULL) {
             uint32_t tmp_u32 = g_variant_get_uint32(gvar);
             fprintf(meta, "ref max = %d\n", tmp_u32);
             g_variant_unref(gvar);
         }
     } else if (sdi->mode == LOGIC) {
-        fprintf(meta, "trigger time = %lld\n", _session.get_session_time().toMSecsSinceEpoch());
+        fprintf(meta, "trigger time = %lld\n", _session->get_session_time().toMSecsSinceEpoch());
     } else if (sdi->mode == ANALOG) {
         boost::shared_ptr<data::AnalogSnapshot> analog_snapshot;
         if ((analog_snapshot = dynamic_pointer_cast<data::AnalogSnapshot>(snapshot))) {
             uint8_t tmp_u8 = analog_snapshot->get_unit_bytes();
             fprintf(meta, "bits = %d\n", tmp_u8*8);
         }
-        gvar = _session.get_device()->get_config(NULL, NULL, SR_CONF_REF_MIN);
+        gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_REF_MIN);
         if (gvar != NULL) {
             uint32_t tmp_u32 = g_variant_get_uint32(gvar);
             fprintf(meta, "ref min = %d\n", tmp_u32);
             g_variant_unref(gvar);
         }
-        gvar = _session.get_device()->get_config(NULL, NULL, SR_CONF_REF_MAX);
+        gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_REF_MAX);
         if (gvar != NULL) {
             uint32_t tmp_u32 = g_variant_get_uint32(gvar);
             fprintf(meta, "ref max = %d\n", tmp_u32);
             g_variant_unref(gvar);
         }
     }
-    fprintf(meta, "trigger pos = %" PRIu64 "\n", _session.get_trigger_pos());
+    fprintf(meta, "trigger pos = %" PRIu64 "\n", _session->get_trigger_pos());
 
     probecnt = 0;
     for (l = sdi->channels; l; l = l->next) {
@@ -557,7 +557,7 @@ QString StoreSession::meta_gen(boost::shared_ptr<data::Snapshot> snapshot)
 bool StoreSession::export_start()
 {
     std::set<int> type_set;
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> sig, _session.get_signals()) {
+    BOOST_FOREACH(const boost::shared_ptr<view::Signal> sig, _session->get_signals()) {
         assert(sig);
         int _tp = sig->get_type();
         type_set.insert(_tp);
@@ -572,7 +572,7 @@ bool StoreSession::export_start()
         return false;
     }
 
-    const boost::shared_ptr<data::Snapshot> snapshot(_session.get_snapshot(*type_set.begin()));
+    const boost::shared_ptr<data::Snapshot> snapshot(_session->get_snapshot(*type_set.begin()));
     assert(snapshot);
     // Check we have data
     if (snapshot->empty()) {
@@ -646,7 +646,7 @@ void StoreSession::export_proc(boost::shared_ptr<data::Snapshot> snapshot)
 
     struct sr_output output;
     output.module = (sr_output_module*) _outModule;
-    output.sdi = _session.get_device()->dev_inst();
+    output.sdi = _session->get_device()->dev_inst();
     output.param = NULL;
     if(_outModule->init)
         _outModule->init(&output, params);
@@ -664,7 +664,7 @@ void StoreSession::export_proc(boost::shared_ptr<data::Snapshot> snapshot)
     struct sr_config *src;
 
     src = sr_config_new(SR_CONF_SAMPLERATE,
-            g_variant_new_uint64(_session.cur_snap_samplerate()));
+            g_variant_new_uint64(_session->cur_snap_samplerate()));
     meta.config = g_slist_append(NULL, src);
 
     src = sr_config_new(SR_CONF_LIMIT_SAMPLES,
@@ -673,12 +673,12 @@ void StoreSession::export_proc(boost::shared_ptr<data::Snapshot> snapshot)
 
     GVariant *gvar;
     uint8_t bits;
-    gvar = _session.get_device()->get_config(NULL, NULL, SR_CONF_UNIT_BITS);
+    gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_UNIT_BITS);
     if (gvar != NULL) {
         bits = g_variant_get_byte(gvar);
         g_variant_unref(gvar);
     }
-    gvar = _session.get_device()->get_config(NULL, NULL, SR_CONF_REF_MIN);
+    gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_REF_MIN);
     if (gvar != NULL) {
         src = sr_config_new(SR_CONF_REF_MIN, gvar);
         g_variant_unref(gvar);
@@ -686,7 +686,7 @@ void StoreSession::export_proc(boost::shared_ptr<data::Snapshot> snapshot)
         src = sr_config_new(SR_CONF_REF_MIN, g_variant_new_uint32(1));
     }
     meta.config = g_slist_append(meta.config, src);
-    gvar = _session.get_device()->get_config(NULL, NULL, SR_CONF_REF_MAX);
+    gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_REF_MAX);
     if (gvar != NULL) {
         src = sr_config_new(SR_CONF_REF_MAX, gvar);
         g_variant_unref(gvar);
@@ -721,7 +721,7 @@ void StoreSession::export_proc(boost::shared_ptr<data::Snapshot> snapshot)
             uint64_t buf_sample_num = logic_snapshot->get_block_size(blk) * 8;
             buf_vec.clear();
             buf_sample.clear();
-            BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session.get_signals()) {
+            BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
                 int ch_type = s->get_type();
                 if (ch_type == SR_CHANNEL_LOGIC) {
                     int ch_index = s->get_index();
@@ -879,7 +879,7 @@ QString StoreSession::decoders_gen()
 QJsonArray StoreSession::json_decoders()
 {
     QJsonArray dec_array;
-    BOOST_FOREACH(boost::shared_ptr<view::DecodeTrace> t, _session.get_decode_signals()) {
+    BOOST_FOREACH(boost::shared_ptr<view::DecodeTrace> t, _session->get_decode_signals()) {
         QJsonObject dec_obj;
         QJsonArray stack_array;
         QJsonObject show_obj;
@@ -959,18 +959,18 @@ QJsonArray StoreSession::json_decoders()
 
 void StoreSession::load_decoders(dock::ProtocolDock *widget, QJsonArray dec_array)
 {
-    if (_session.get_device()->dev_inst()->mode != LOGIC ||
+    if (_session->get_device()->dev_inst()->mode != LOGIC ||
         dec_array.empty())
         return;
 
     foreach (const QJsonValue &dec_value, dec_array) {
         QJsonObject dec_obj = dec_value.toObject();
         const vector< boost::shared_ptr<view::DecodeTrace> > pre_dsigs(
-            _session.get_decode_signals());
+            _session->get_decode_signals());
         if (widget->sel_protocol(dec_obj["id"].toString()))
             widget->add_protocol(true);
         const vector< boost::shared_ptr<view::DecodeTrace> > aft_dsigs(
-            _session.get_decode_signals());
+            _session->get_decode_signals());
 
         if (aft_dsigs.size() > pre_dsigs.size()) {
             const GSList *l;
@@ -1130,24 +1130,24 @@ QString StoreSession::MakeSaveFile(bool bDlg)
     AppConfig &app = AppConfig::Instance(); 
     if (app._userHistory.saveDir != "")
     {
-        default_name = app._userHistory.saveDir + "/"  + _session.get_device()->name() + "-";
+        default_name = app._userHistory.saveDir + "/"  + _session->get_device()->name() + "-";
     } 
     else{
         QDir _dir;
         QString _root = _dir.home().path();                
-        default_name =  _root + "/" + _session.get_device()->name() + "-";
+        default_name =  _root + "/" + _session->get_device()->name() + "-";
     } 
 
-    for (const GSList *l = _session.get_device()->get_dev_mode_list();
+    for (const GSList *l = _session->get_device()->get_dev_mode_list();
          l; l = l->next) {
         const sr_dev_mode *mode = (const sr_dev_mode *)l->data;
-        if (_session.get_device()->dev_inst()->mode == mode->mode) {
+        if (_session->get_device()->dev_inst()->mode == mode->mode) {
             default_name += mode->acronym;
             break;
         }
     }
 
-    default_name += _session.get_session_time().toString("-yyMMdd-hhmmss");
+    default_name += _session->get_session_time().toString("-yyMMdd-hhmmss");
 
     // Show the dialog
     if (bDlg)
@@ -1188,23 +1188,23 @@ QString StoreSession::MakeExportFile(bool bDlg)
     
     if (app._userHistory.exportDir != "")
     {
-        default_name = app._userHistory.exportDir  + "/"  + _session.get_device()->name() + "-";
+        default_name = app._userHistory.exportDir  + "/"  + _session->get_device()->name() + "-";
     } 
     else{
         QDir _dir;
         QString _root = _dir.home().path();    
-        default_name =  _root + "/" + _session.get_device()->name() + "-";
+        default_name =  _root + "/" + _session->get_device()->name() + "-";
     }  
 
-    for (const GSList *l = _session.get_device()->get_dev_mode_list();
+    for (const GSList *l = _session->get_device()->get_dev_mode_list();
          l; l = l->next) {
         const sr_dev_mode *mode = (const sr_dev_mode *)l->data;
-        if (_session.get_device()->dev_inst()->mode == mode->mode) {
+        if (_session->get_device()->dev_inst()->mode == mode->mode) {
             default_name += mode->acronym;
             break;
         }
     }
-    default_name += _session.get_session_time().toString("-yyMMdd-hhmmss");
+    default_name += _session->get_session_time().toString("-yyMMdd-hhmmss");
 
     //ext name
     QList<QString> supportedFormats = getSuportedExportFormats();
@@ -1271,7 +1271,7 @@ QString StoreSession::MakeExportFile(bool bDlg)
 bool StoreSession::IsLogicDataType()
 {
     std::set<int> type_set;
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> sig, _session.get_signals()) {
+    BOOST_FOREACH(const boost::shared_ptr<view::Signal> sig, _session->get_signals()) {
         assert(sig);
         type_set.insert(sig->get_type());
     }
diff --git a/DSView/pv/storesession.h b/DSView/pv/storesession.h
index d7c201ca..45bd1e9a 100755
--- a/DSView/pv/storesession.h
+++ b/DSView/pv/storesession.h
@@ -53,11 +53,11 @@ private:
     const static int File_Version = 2;
 
 public:
-    StoreSession(SigSession &session);
+    StoreSession(SigSession *session);
 
 	~StoreSession();
 
-    SigSession& session();
+    SigSession* session();
 
 	std::pair<uint64_t, uint64_t> progress() const;
 
@@ -104,7 +104,7 @@ public:
 private:
     QString         _file_name;
     QString         _suffix;
-    SigSession      &_session;
+    SigSession      *_session;
 
 	boost::thread   _thread;
 
diff --git a/DSView/pv/toolbars/filebar.cpp b/DSView/pv/toolbars/filebar.cpp
index 4a3b8663..8db6d486 100755
--- a/DSView/pv/toolbars/filebar.cpp
+++ b/DSView/pv/toolbars/filebar.cpp
@@ -36,7 +36,7 @@
 namespace pv {
 namespace toolbars {
 
-FileBar::FileBar(SigSession &session, QWidget *parent) :
+FileBar::FileBar(SigSession *session, QWidget *parent) :
     QToolBar("File Bar", parent),
     _enable(true),
     _session(session),
@@ -205,10 +205,10 @@ void FileBar::on_actionDefault_triggered()
           return;
     }
 
-    QString driver_name = _session.get_device()->name();
-    QString mode_name = QString::number(_session.get_device()->dev_inst()->mode);
+    QString driver_name = _session->get_device()->name();
+    QString mode_name = QString::number(_session->get_device()->dev_inst()->mode);
     int language = QLocale::English;
-    GVariant *gvar_tmp = _session.get_device()->get_config(NULL, NULL, SR_CONF_LANGUAGE);
+    GVariant *gvar_tmp = _session->get_device()->get_config(NULL, NULL, SR_CONF_LANGUAGE);
     if (gvar_tmp != NULL) {
         language = g_variant_get_int16(gvar_tmp);
         g_variant_unref(gvar_tmp);
diff --git a/DSView/pv/toolbars/filebar.h b/DSView/pv/toolbars/filebar.h
index 261d5c31..32cbbe81 100755
--- a/DSView/pv/toolbars/filebar.h
+++ b/DSView/pv/toolbars/filebar.h
@@ -40,7 +40,7 @@ class FileBar : public QToolBar
     Q_OBJECT
 
 public:
-    explicit FileBar(SigSession &session, QWidget *parent = 0);
+    explicit FileBar(SigSession *session, QWidget *parent = 0);
 
     void enable_toggle(bool enable);
 
@@ -73,7 +73,7 @@ private slots:
 
 private:
     bool _enable;
-    SigSession& _session;
+    SigSession* _session;
 
     QToolButton _file_button;
 
diff --git a/DSView/pv/toolbars/logobar.cpp b/DSView/pv/toolbars/logobar.cpp
index 85296798..6791226a 100755
--- a/DSView/pv/toolbars/logobar.cpp
+++ b/DSView/pv/toolbars/logobar.cpp
@@ -35,7 +35,7 @@
 namespace pv {
 namespace toolbars {
 
-LogoBar::LogoBar(SigSession &session, QWidget *parent) :
+LogoBar::LogoBar(SigSession *session, QWidget *parent) :
     QToolBar("File Bar", parent),
     _enable(true),
     _connected(false),
diff --git a/DSView/pv/toolbars/logobar.h b/DSView/pv/toolbars/logobar.h
index 278def32..19cf5d3c 100755
--- a/DSView/pv/toolbars/logobar.h
+++ b/DSView/pv/toolbars/logobar.h
@@ -42,7 +42,7 @@ class LogoBar : public QToolBar
     Q_OBJECT
 
 public:
-    explicit LogoBar(SigSession &session, QWidget *parent = 0);
+    explicit LogoBar(SigSession *session, QWidget *parent = 0);
 
     void enable_toggle(bool enable);
 
@@ -76,7 +76,7 @@ private slots:
 private:
     bool _enable;
     bool _connected;
-    SigSession& _session;
+    SigSession* _session;
 
     QToolButton _logo_button;
 
diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp
index 46302c9c..2ecd10b0 100755
--- a/DSView/pv/toolbars/samplingbar.cpp
+++ b/DSView/pv/toolbars/samplingbar.cpp
@@ -46,13 +46,15 @@ using std::max;
 using std::min;
 using std::string;
 
+using namespace pv::device;
+
 namespace pv {
 namespace toolbars {
 
 const QString SamplingBar::RLEString = tr("(RLE)");
 const QString SamplingBar::DIVString = tr(" / div");
 
-SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
+SamplingBar::SamplingBar(SigSession *session, QWidget *parent) :
 	QToolBar("Sampling Bar", parent),
     _session(session),
     _enable(true),
@@ -140,7 +142,7 @@ void SamplingBar::changeEvent(QEvent *event)
 
 void SamplingBar::retranslateUi()
 {
-    boost::shared_ptr<pv::device::DevInst> dev_inst = get_selected_device();
+    DevInst *dev_inst = get_selected_device();
     if (dev_inst && dev_inst->dev_inst()) {
         if (dev_inst->name().contains("virtual-demo"))
             _device_type.setText(tr("Demo"));
@@ -163,17 +165,18 @@ void SamplingBar::retranslateUi()
     }
     _configure_button.setText(tr("Options"));
     _mode_button.setText(tr("Mode"));
+
+   sr_dev_inst *dev_c = _session->get_dev_inst_c();
+
     if (_instant) {
-        if (_session.get_device() &&
-            _session.get_device()->dev_inst()->mode == DSO)
+        if (dev_c && dev_c->mode == DSO)
             _instant_button.setText(_sampling ? tr("Stop") : tr("Single"));
         else
             _instant_button.setText(_sampling ? tr("Stop") : tr("Instant"));
         _run_stop_button.setText(tr("Start"));
     } else {
         _run_stop_button.setText(_sampling ? tr("Stop") : tr("Start"));
-        if (_session.get_device() &&
-            _session.get_device()->dev_inst()->mode == DSO)
+        if (dev_c && dev_c->mode == DSO)
             _instant_button.setText(tr("Single"));
         else
             _instant_button.setText(tr("Instant"));
@@ -185,7 +188,7 @@ void SamplingBar::retranslateUi()
 
 void SamplingBar::reStyle()
 {
-    boost::shared_ptr<pv::device::DevInst> dev_inst = get_selected_device();
+    DevInst *dev_inst = get_selected_device();
     if (dev_inst && dev_inst->dev_inst()) {
         if (dev_inst->name().contains("virtual-demo"))
             _device_type.setIcon(QIcon(":/icons/demo.svg"));
@@ -209,7 +212,7 @@ void SamplingBar::reStyle()
     if (true) {
         QString iconPath = GetIconPath();
         _configure_button.setIcon(QIcon(iconPath+"/params.svg"));
-        _mode_button.setIcon(_session.get_run_mode() == pv::SigSession::Single ? QIcon(iconPath+"/modes.svg") :
+        _mode_button.setIcon(_session->get_run_mode() == pv::SigSession::Single ? QIcon(iconPath+"/modes.svg") :
                                                                                  QIcon(iconPath+"/moder.svg"));
         _run_stop_button.setIcon(_sampling ? QIcon(iconPath+"/stop.svg") :
                                              QIcon(iconPath+"/start.svg"));
@@ -219,9 +222,7 @@ void SamplingBar::reStyle()
 	}   
 }
 
-void SamplingBar::set_device_list(
-    const std::list<boost::shared_ptr<pv::device::DevInst> > &devices,
-    boost::shared_ptr<pv::device::DevInst> selected)
+void SamplingBar::set_device_list(const std::list<DevInst*> &devices, DevInst *selected)
 {
     int selected_index = -1;
 
@@ -232,7 +233,7 @@ void SamplingBar::set_device_list(
     _device_selector.clear();
     _device_selector_map.clear();
 
-    BOOST_FOREACH (boost::shared_ptr<pv::device::DevInst> dev_inst, devices) {
+    for (DevInst *dev_inst : devices) {
         assert(dev_inst);
         const QString title = dev_inst->format_device_title();
         const void *id = dev_inst->get_id();
@@ -258,22 +259,21 @@ void SamplingBar::set_device_list(
     _updating_device_selector = false;
 }
 
-boost::shared_ptr<pv::device::DevInst> SamplingBar::get_selected_device() const
+DevInst* SamplingBar::get_selected_device() const
 {
     const int index = _device_selector.currentIndex();
     if (index < 0)
-        return boost::shared_ptr<pv::device::DevInst>();
+        return NULL;
 
     const void *const id =
         _device_selector.itemData(index).value<void*>();
     assert(id);
 
-    map<const void*, boost::weak_ptr<device::DevInst> >::
-        const_iterator iter = _device_selector_map.find(id);
-    if (iter == _device_selector_map.end())
-        return boost::shared_ptr<pv::device::DevInst>();
+    auto it = _device_selector_map.find(id);
+    if (it == _device_selector_map.end())
+        return NULL;
 
-    return boost::shared_ptr<pv::device::DevInst>((*iter).second);
+    return (*it).second;
 }
 
 void SamplingBar::on_configure()
@@ -281,7 +281,7 @@ void SamplingBar::on_configure()
     sig_hide_calibration();
 
     int  ret;
-    boost::shared_ptr<pv::device::DevInst> dev_inst = get_selected_device();
+    DevInst *dev_inst = get_selected_device();
     assert(dev_inst);
 
     pv::dialogs::DeviceOptions dlg(this, dev_inst);
@@ -332,7 +332,7 @@ void SamplingBar::on_configure()
 void SamplingBar::zero_adj()
 {
     boost::shared_ptr<view::DsoSignal> dsoSig;
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session.get_signals())
+    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals())
     {
         if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s)))
             dsoSig->set_enable(true);
@@ -349,14 +349,14 @@ void SamplingBar::zero_adj()
 
     pv::dialogs::WaitingDialog wait(this, _session, SR_CONF_ZERO);
     if (wait.start() == QDialog::Rejected) {
-        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session.get_signals())
+        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals())
         {
             if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s)))
                 dsoSig->commit_settings();
         }
     }
 
-    if (_session.get_capture_state() == pv::SigSession::Running)
+    if (_session->get_capture_state() == pv::SigSession::Running)
         on_run_stop();
 
     _sample_count.setCurrentIndex(index_back);
@@ -399,7 +399,7 @@ void SamplingBar::set_sampling(bool sampling)
         } else {
             _run_stop_button.setIcon(sampling ? QIcon(iconPath+"/stop.svg") : QIcon(iconPath+"/start.svg"));
         }
-        _mode_button.setIcon(_session.get_run_mode() == pv::SigSession::Single ? QIcon(iconPath+"/modes.svg") :
+        _mode_button.setIcon(_session->get_run_mode() == pv::SigSession::Single ? QIcon(iconPath+"/modes.svg") :
                                                                              QIcon(iconPath+"/moder.svg"));
     }
 
@@ -430,7 +430,7 @@ void SamplingBar::update_sample_rate_selector()
 
     disconnect(&_sample_rate, SIGNAL(currentIndexChanged(int)),
         this, SLOT(on_samplerate_sel(int)));
-    const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
+    DevInst *dev_inst = get_selected_device();
     if (!dev_inst)
         return;
 
@@ -504,7 +504,7 @@ void SamplingBar::update_sample_rate_selector_value()
 void SamplingBar::on_samplerate_sel(int index)
 {
     (void)index;
-    const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
+    const DevInst *dev_inst = get_selected_device();
     if (dev_inst->dev_inst()->mode != DSO)
         update_sample_count_selector();
 }
@@ -530,7 +530,7 @@ void SamplingBar::update_sample_count_selector()
     assert(!_updating_sample_count);
     _updating_sample_count = true;
 
-    const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
+    DevInst *dev_inst = get_selected_device();
     GVariant* gvar = dev_inst->get_config(NULL, NULL, SR_CONF_STREAM);
     if (gvar != NULL) {
         stream_mode = g_variant_get_boolean(gvar);
@@ -546,7 +546,7 @@ void SamplingBar::update_sample_count_selector()
         #if defined(__x86_64__) || defined(_M_X64)
             sw_depth = LogicMaxSWDepth64;
         #elif defined(__i386) || defined(_M_IX86)
-            int ch_num = _session.get_ch_num(SR_CHANNEL_LOGIC);
+            int ch_num = _session->get_ch_num(SR_CHANNEL_LOGIC);
             if (ch_num <= 0)
                 sw_depth = LogicMaxSWDepth32;
             else
@@ -663,7 +663,7 @@ void SamplingBar::update_sample_count_selector_value()
 
     GVariant* gvar;
     double duration;
-    const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
+    DevInst *dev_inst = get_selected_device();
     if (dev_inst->dev_inst()->mode == DSO) {
         gvar = dev_inst->get_config(NULL, NULL, SR_CONF_TIMEBASE);
         if (gvar != NULL) {
@@ -706,7 +706,7 @@ void SamplingBar::on_samplecount_sel(int index)
 {
     (void)index;
 
-    const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
+    const DevInst *dev_inst = get_selected_device();
     if (dev_inst->dev_inst()->mode == DSO)
         commit_hori_res();
     sig_duration_changed();
@@ -744,7 +744,7 @@ double SamplingBar::commit_hori_res()
     const double hori_res = _sample_count.itemData(
                            _sample_count.currentIndex()).value<double>();
 
-    const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
+    DevInst *dev_inst = get_selected_device();
     const uint64_t sample_limit = dev_inst->get_sample_limit();
     GVariant* gvar;
     uint64_t max_sample_rate;
@@ -760,7 +760,7 @@ double SamplingBar::commit_hori_res()
     const uint64_t sample_rate = min((uint64_t)(sample_limit * SR_SEC(1) /
                                                 (hori_res * DS_CONF_DSO_HDIVS)),
                                      (uint64_t)(max_sample_rate /
-                                                (_session.get_ch_num(SR_CHANNEL_DSO) ? _session.get_ch_num(SR_CHANNEL_DSO) : 1)));
+                                                (_session->get_ch_num(SR_CHANNEL_DSO) ? _session->get_ch_num(SR_CHANNEL_DSO) : 1)));
     set_sample_rate(sample_rate);
 
     dev_inst->set_config(NULL, NULL, SR_CONF_TIMEBASE,
@@ -772,7 +772,7 @@ double SamplingBar::commit_hori_res()
 void SamplingBar::commit_settings()
 {
     bool test = false;
-    const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
+    DevInst *dev_inst = get_selected_device();
     if (dev_inst && dev_inst->owner()) {
         GVariant *gvar = dev_inst->get_config(NULL, NULL, SR_CONF_TEST);
         if (gvar != NULL) {
@@ -790,7 +790,7 @@ void SamplingBar::commit_settings()
         const uint64_t sample_rate = _sample_rate.itemData(
                 _sample_rate.currentIndex()).value<uint64_t>();
 
-        const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
+        DevInst *dev_inst = get_selected_device();
         if (dev_inst) {
             if (sample_rate != dev_inst->get_sample_rate())
                 dev_inst->set_config(NULL, NULL,
@@ -815,16 +815,18 @@ void SamplingBar::commit_settings()
 
 void SamplingBar::on_run_stop()
 {
-    if (get_sampling() || _session.isRepeating()) {
-        _session.exit_capture();
+    if (get_sampling() || _session->isRepeating()) {
+        _session->exit_capture();
     } else {
         enable_run_stop(false);
         enable_instant(false);
         commit_settings();
         _instant = false;
-        const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
+
+        DevInst *dev_inst = get_selected_device();
         if (!dev_inst)
             return;
+
         if (dev_inst->dev_inst()->mode == DSO) {
             GVariant* gvar = dev_inst->get_config(NULL, NULL, SR_CONF_ZERO);
             if (gvar != NULL) {
@@ -857,9 +859,9 @@ void SamplingBar::on_run_stop()
 void SamplingBar::on_instant_stop()
 {
     if (get_sampling()) {
-        _session.set_repeating(false);
+        _session->set_repeating(false);
         bool wait_upload = false;
-        if (_session.get_run_mode() != SigSession::Repetitive) {
+        if (_session->get_run_mode() != SigSession::Repetitive) {
             GVariant *gvar = get_selected_device()->get_config(NULL, NULL, SR_CONF_WAIT_UPLOAD);
             if (gvar != NULL) {
                 wait_upload = g_variant_get_boolean(gvar);
@@ -867,8 +869,8 @@ void SamplingBar::on_instant_stop()
             }
         }
         if (!wait_upload) {
-            _session.stop_capture();
-            _session.capture_state_changed(SigSession::Stopped);
+            _session->stop_capture();
+            _session->capture_state_changed(SigSession::Stopped);
         }
     } else {
         enable_run_stop(false);
@@ -876,7 +878,7 @@ void SamplingBar::on_instant_stop()
         commit_settings();
         _instant = true;
 
-        const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
+        DevInst *dev_inst = get_selected_device();
 
         if (!dev_inst)
             return;
@@ -915,15 +917,15 @@ void SamplingBar::on_device_selected()
     if (_updating_device_selector)
         return;
 
-    _session.stop_capture();
-    _session.session_save();
+    _session->stop_capture();
+    _session->session_save();
 
-    const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
+    DevInst* dev_inst = get_selected_device();
     if (!dev_inst)
         return;
 
     try {
-        _session.set_device(dev_inst);
+        _session->set_device(dev_inst);
     } catch(QString e) {
         show_session_error(tr("Failed to select ") + dev_inst->dev_inst()->model, e);
     }
@@ -933,7 +935,7 @@ void SamplingBar::on_device_selected()
 void SamplingBar::enable_toggle(bool enable)
 {
     bool test = false;
-    const boost::shared_ptr<device::DevInst> dev_inst = get_selected_device();
+    DevInst *dev_inst = get_selected_device();
     if (dev_inst && dev_inst->owner()) {
         GVariant *gvar = dev_inst->get_config(NULL, NULL, SR_CONF_TEST);
         if (gvar != NULL) {
@@ -952,7 +954,7 @@ void SamplingBar::enable_toggle(bool enable)
         _sample_rate.setDisabled(true);
     }
 
-    if (_session.get_device()->name() == "virtual-session") {
+    if (_session->get_device()->name() == "virtual-session") {
         _sample_count.setDisabled(true);
         _sample_rate.setDisabled(true);
     }
@@ -982,23 +984,23 @@ void SamplingBar::show_session_error(
 void SamplingBar::reload()
 {
     QString iconPath = GetIconPath();
-    if (_session.get_device()->dev_inst()->mode == LOGIC) {
-        if (_session.get_device()->name() == "virtual-session") {
+    if (_session->get_device()->dev_inst()->mode == LOGIC) {
+        if (_session->get_device()->name() == "virtual-session") {
             _mode_action->setVisible(false);
         } else {
-            _mode_button.setIcon(_session.get_run_mode() == pv::SigSession::Single ? QIcon(iconPath+"/modes.svg") :
+            _mode_button.setIcon(_session->get_run_mode() == pv::SigSession::Single ? QIcon(iconPath+"/modes.svg") :
                                                                                      QIcon(iconPath+"/moder.svg"));
             _mode_action->setVisible(true);
         }
         _run_stop_action->setVisible(true);
         _instant_action->setVisible(true);
         enable_toggle(true);
-    } else if (_session.get_device()->dev_inst()->mode == ANALOG) {
+    } else if (_session->get_device()->dev_inst()->mode == ANALOG) {
         _mode_action->setVisible(false);
         _run_stop_action->setVisible(true);
         _instant_action->setVisible(false);
         enable_toggle(true);
-    } else if (_session.get_device()->dev_inst()->mode == DSO) {
+    } else if (_session->get_device()->dev_inst()->mode == DSO) {
         _mode_action->setVisible(false);
         _run_stop_action->setVisible(true);
         _instant_action->setVisible(true);
@@ -1016,12 +1018,12 @@ void SamplingBar::on_mode()
     QAction *act = qobject_cast<QAction *>(sender());
     if (act == _action_single) {
         _mode_button.setIcon(QIcon(iconPath+"/modes.svg"));
-        _session.set_run_mode(pv::SigSession::Single);
+        _session->set_run_mode(pv::SigSession::Single);
     } else if (act == _action_repeat) {
         _mode_button.setIcon(QIcon(iconPath+"/moder.svg"));
         pv::dialogs::Interval interval_dlg(_session, this);
         interval_dlg.exec();
-        _session.set_run_mode(pv::SigSession::Repetitive);
+        _session->set_run_mode(pv::SigSession::Repetitive);
     }
 }
 
diff --git a/DSView/pv/toolbars/samplingbar.h b/DSView/pv/toolbars/samplingbar.h
index ee3ce6d8..f4addaef 100755
--- a/DSView/pv/toolbars/samplingbar.h
+++ b/DSView/pv/toolbars/samplingbar.h
@@ -45,7 +45,7 @@ namespace pv
 
     namespace device
     {
-       // class DevInst;
+        class DevInst;
     } 
 
     namespace dialogs
@@ -72,12 +72,11 @@ namespace pv
             static const uint64_t ZeroTimeBase = SR_US(2);
 
         public:
-            SamplingBar(SigSession &session, QWidget *parent);
+            SamplingBar(SigSession *session, QWidget *parent);
 
-            void set_device_list(const std::list<boost::shared_ptr<pv::device::DevInst>> &devices,
-                                 boost::shared_ptr<pv::device::DevInst> selected);
+            void set_device_list(const std::list<DevInst*> &devices, DevInst* selected);
 
-            boost::shared_ptr<pv::device::DevInst> get_selected_device() const;
+            DevInst *get_selected_device() const;
 
             void update_sample_rate_selector();
 
@@ -135,7 +134,7 @@ namespace pv
             void reload();
 
         private:
-            SigSession &_session;
+            SigSession *_session;
 
             mutable boost::recursive_mutex _sampling_mutex;
             bool _enable;
@@ -144,8 +143,7 @@ namespace pv
             QToolButton _device_type;
 
             QComboBox _device_selector;
-            std::map<const void *, boost::weak_ptr<device::DevInst>>
-                _device_selector_map;
+            std::map<const void *, DevInst*> _device_selector_map;
             bool _updating_device_selector;
 
             QToolButton _configure_button;
diff --git a/DSView/pv/toolbars/trigbar.cpp b/DSView/pv/toolbars/trigbar.cpp
index 7fa25e17..ea5f7c8e 100755
--- a/DSView/pv/toolbars/trigbar.cpp
+++ b/DSView/pv/toolbars/trigbar.cpp
@@ -38,7 +38,7 @@ namespace toolbars {
 const QString TrigBar::DARK_STYLE = "dark";
 const QString TrigBar::LIGHT_STYLE = "light";
 
-TrigBar::TrigBar(SigSession &session, QWidget *parent) :
+TrigBar::TrigBar(SigSession *session, QWidget *parent) :
     QToolBar("Trig Bar", parent),
     _session(session),
     _enable(true),
@@ -261,21 +261,21 @@ void TrigBar::close_all()
 void TrigBar::reload()
 {
     close_all();
-    if (_session.get_device()->dev_inst()->mode == LOGIC) {
+    if (_session->get_device()->dev_inst()->mode == LOGIC) {
         _trig_action->setVisible(true);
         _protocol_action->setVisible(true);
         _measure_action->setVisible(true);
         _search_action->setVisible(true);
         _function_action->setVisible(false);
         _action_lissajous->setVisible(false);
-    } else if (_session.get_device()->dev_inst()->mode == ANALOG) {
+    } else if (_session->get_device()->dev_inst()->mode == ANALOG) {
         _trig_action->setVisible(false);
         _protocol_action->setVisible(false);
         _measure_action->setVisible(true);
         _search_action->setVisible(false);
         _function_action->setVisible(false);
         _action_lissajous->setVisible(false);
-    } else if (_session.get_device()->dev_inst()->mode == DSO) {
+    } else if (_session->get_device()->dev_inst()->mode == DSO) {
         _trig_action->setVisible(true);
         _protocol_action->setVisible(false);
         _measure_action->setVisible(true);
diff --git a/DSView/pv/toolbars/trigbar.h b/DSView/pv/toolbars/trigbar.h
index 58f07f05..f22ce207 100755
--- a/DSView/pv/toolbars/trigbar.h
+++ b/DSView/pv/toolbars/trigbar.h
@@ -45,7 +45,7 @@ protected:
     static const QString LIGHT_STYLE;
 
 public:
-    explicit TrigBar(SigSession &session, QWidget *parent = 0);
+    explicit TrigBar(SigSession *session, QWidget *parent = 0);
 
     void enable_toggle(bool enable);
     void enable_protocol(bool enable);
@@ -86,8 +86,8 @@ public slots:
     void on_application_param();
 
 private:
-    SigSession& _session;
-    bool _enable;
+    SigSession      *_session;
+    bool            _enable;
     QToolButton _trig_button;
     QToolButton _protocol_button;
     QToolButton _measure_button;
diff --git a/DSView/pv/view/analogsignal.cpp b/DSView/pv/view/analogsignal.cpp
index 2460fe5e..605566ac 100755
--- a/DSView/pv/view/analogsignal.cpp
+++ b/DSView/pv/view/analogsignal.cpp
@@ -47,7 +47,7 @@ const QColor AnalogSignal::SignalColours[4] = {
 
 const float AnalogSignal::EnvelopeThreshold = 16.0f;
 
-AnalogSignal::AnalogSignal(boost::shared_ptr<pv::device::DevInst> dev_inst,
+AnalogSignal::AnalogSignal(DevInst *dev_inst,
                            boost::shared_ptr<data::Analog> data,
                            sr_channel *probe) :
     Signal(dev_inst, probe),
diff --git a/DSView/pv/view/analogsignal.h b/DSView/pv/view/analogsignal.h
index 94e29290..401351eb 100755
--- a/DSView/pv/view/analogsignal.h
+++ b/DSView/pv/view/analogsignal.h
@@ -53,7 +53,7 @@ private:
     static const uint8_t DefaultBits = 8;
 
 public:
-    AnalogSignal(boost::shared_ptr<pv::device::DevInst> dev_inst,
+    AnalogSignal(DevInst* dev_inst,
                  boost::shared_ptr<pv::data::Analog> data,
                  sr_channel *probe);
     AnalogSignal(boost::shared_ptr<view::AnalogSignal> s,
diff --git a/DSView/pv/view/decodetrace.cpp b/DSView/pv/view/decodetrace.cpp
index 0fa24f1a..b81be63e 100755
--- a/DSView/pv/view/decodetrace.cpp
+++ b/DSView/pv/view/decodetrace.cpp
@@ -115,7 +115,7 @@ const QColor DecodeTrace::OutlineColours[16] = {
 const QString DecodeTrace::RegionStart = QT_TR_NOOP("Start");
 const QString DecodeTrace::RegionEnd = QT_TR_NOOP("End  ");
 
-DecodeTrace::DecodeTrace(pv::SigSession &session,
+DecodeTrace::DecodeTrace(pv::SigSession *session,
 	boost::shared_ptr<pv::data::DecoderStack> decoder_stack, int index) :
 	Trace(QString::fromUtf8(
         decoder_stack->stack().front()->decoder()->name), index, SR_CHANNEL_DECODER),
@@ -181,7 +181,7 @@ void DecodeTrace::paint_back(QPainter &p, int left, int right, QColor fore, QCol
     p.drawLine(left, sigY, right, sigY);
 
     // --draw decode region control
-    const double samples_per_pixel = _session.cur_snap_samplerate() * _view->scale();
+    const double samples_per_pixel = _session->cur_snap_samplerate() * _view->scale();
     const double startX = _decode_start/samples_per_pixel - _view->offset();
     const double endX = _decode_end/samples_per_pixel - _view->offset();
     const double regionY = get_y() - _totalHeight*0.5 - ControlRectWidth;
@@ -534,7 +534,7 @@ void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
                         ((type%100 != a.type()%100) && (type%100 != 0)))
                         continue;
                     boost::shared_ptr<LogicSignal> logic_sig;
-                    BOOST_FOREACH(boost::shared_ptr<view::Signal> sig, _session.get_signals()) {
+                    BOOST_FOREACH(boost::shared_ptr<view::Signal> sig, _session->get_signals()) {
                         if((sig->get_index() == iter.second) &&
                            (logic_sig = dynamic_pointer_cast<view::LogicSignal>(sig))) {
                             logic_sig->paint_mark(p, start, end, type/100);
@@ -773,7 +773,7 @@ QComboBox* DecodeTrace::create_probe_selector(
 {
 	assert(dec);
 
-    const vector< boost::shared_ptr<Signal> > sigs(_session.get_signals());
+    const vector< boost::shared_ptr<Signal> > sigs(_session->get_signals());
 
 	assert(_decoder_stack);
     const map<const srd_channel*, int>::const_iterator probe_iter =
@@ -809,7 +809,7 @@ void DecodeTrace::commit_decoder_probes(boost::shared_ptr<data::decode::Decoder>
 	assert(dec);
 
     map<const srd_channel*, int> probe_map;
-    const vector< boost::shared_ptr<Signal> > sigs(_session.get_signals());
+    const vector< boost::shared_ptr<Signal> > sigs(_session->get_signals());
 
     _index_list.clear();
 	BOOST_FOREACH(const ProbeSelector &s, _probe_selectors)
@@ -873,12 +873,12 @@ void DecodeTrace::on_decode_done()
 //        _view->signals_changed();
 //    }
     on_new_decode_data();
-    _session.decode_done();
+    _session->decode_done();
 }
 
 void DecodeTrace::on_delete()
 {
-    _session.remove_decode_signal(this);
+    _session->remove_decode_signal(this);
 }
 
 void DecodeTrace::on_probe_selected(int)
@@ -971,7 +971,7 @@ QRectF DecodeTrace::get_rect(DecodeSetRegions type, int y, int right)
 void DecodeTrace::on_region_set(int index)
 {
     (void)index;
-    const uint64_t last_samples = _session.cur_samplelimits() - 1;
+    const uint64_t last_samples = _session->cur_samplelimits() - 1;
     const int index1 = _start_comboBox->currentIndex();
     const int index2 = _end_comboBox->currentIndex();
     uint64_t decode_start, decode_end;
@@ -1008,7 +1008,7 @@ void DecodeTrace::on_region_set(int index)
 
 void DecodeTrace::frame_ended()
 {
-    const uint64_t last_samples = _session.cur_samplelimits() - 1;
+    const uint64_t last_samples = _session->cur_samplelimits() - 1;
     if (_decode_start > last_samples) {
         _decode_start = 0;
         _start_index = 0;
diff --git a/DSView/pv/view/decodetrace.h b/DSView/pv/view/decodetrace.h
index 924cf333..ee2ae804 100755
--- a/DSView/pv/view/decodetrace.h
+++ b/DSView/pv/view/decodetrace.h
@@ -97,7 +97,7 @@ private:
     static const QString RegionEnd;
 
 public:
-	DecodeTrace(pv::SigSession &session,
+	DecodeTrace(pv::SigSession *session,
 		boost::shared_ptr<pv::data::DecoderStack> decoder_stack,
 		int index);
     ~DecodeTrace();
@@ -206,7 +206,7 @@ private slots:
     void on_region_set(int index);
 
 private:
-	pv::SigSession &_session;
+	pv::SigSession *_session;
 	boost::shared_ptr<pv::data::DecoderStack> _decoder_stack;
 
 	uint64_t _decode_start, _decode_end;
diff --git a/DSView/pv/view/devmode.cpp b/DSView/pv/view/devmode.cpp
index 2c99e95b..05659b20 100755
--- a/DSView/pv/view/devmode.cpp
+++ b/DSView/pv/view/devmode.cpp
@@ -43,7 +43,7 @@ using namespace std;
 namespace pv {
 namespace view {
 
-DevMode::DevMode(QWidget *parent, SigSession &session) :
+DevMode::DevMode(QWidget *parent, SigSession *session) :
     QWidget(parent),
     _session(session)
     
@@ -91,7 +91,7 @@ void DevMode::changeEvent(QEvent *event)
 
 void DevMode::set_device()
 { 
-    const boost::shared_ptr<device::DevInst> dev_inst = _session.get_device();
+    DevInst* dev_inst = _session->get_device();
     assert(dev_inst);
    
     for(std::map<QAction *, const sr_dev_mode *>::const_iterator i = _mode_list.begin();
@@ -134,8 +134,8 @@ void DevMode::set_device()
             _pop_menu->addAction(action);
         }
 
-        boost::shared_ptr<pv::device::File> file_dev;
-        if((file_dev = dynamic_pointer_cast<pv::device::File>(dev_inst))) {
+        File *file_dev;
+        if((file_dev = dynamic_cast<File*>(dev_inst))) {
             _close_button->setDisabled(false);
             _close_button->setIcon(QIcon(iconPath+"/close.svg"));
             connect(_close_button, SIGNAL(clicked()), this, SLOT(on_close()));
@@ -156,7 +156,7 @@ void DevMode::paintEvent(QPaintEvent*)
 
 void DevMode::on_mode_change()
 {
-    const boost::shared_ptr<device::DevInst> dev_inst = _session.get_device();
+    DevInst* dev_inst = _session->get_device();
     assert(dev_inst);
     QAction *action = qobject_cast<QAction *>(sender());
     if (dev_inst->dev_inst()->mode == _mode_list[action]->mode)
@@ -170,11 +170,11 @@ void DevMode::on_mode_change()
         i != _mode_list.end(); i++) {
         if ((*i).first == action) {
             if (dev_inst->dev_inst()->mode != (*i).second->mode) {
-                _session.set_run_mode(SigSession::Single);
-                _session.set_repeating(false);
-                _session.stop_capture();
-                _session.capture_state_changed(SigSession::Stopped);
-                _session.session_save();
+                _session->set_run_mode(SigSession::Single);
+                _session->set_repeating(false);
+                _session->stop_capture();
+                _session->capture_state_changed(SigSession::Stopped);
+                _session->session_save();
                 dev_inst->set_config(NULL, NULL,
                                      SR_CONF_DEVICE_MODE,
                                      g_variant_new_int16((*i).second->mode));
@@ -193,10 +193,10 @@ void DevMode::on_mode_change()
 
 void DevMode::on_close()
 {
-    const boost::shared_ptr<device::DevInst> dev_inst = _session.get_device();
+    DevInst *dev_inst = _session->get_device();
     assert(dev_inst);
 
-    _session.close_file(dev_inst);
+    _session->close_file(dev_inst);
     dev_changed(true);
 }
 
diff --git a/DSView/pv/view/devmode.h b/DSView/pv/view/devmode.h
index 6dc2f5d9..ae26e53c 100755
--- a/DSView/pv/view/devmode.h
+++ b/DSView/pv/view/devmode.h
@@ -59,7 +59,7 @@ private:
     static const int GRID_COLS = 3;
 
 public:
-    DevMode(QWidget *parent, SigSession &session);
+    DevMode(QWidget *parent, SigSession *ession);
 
 private:
 	void paintEvent(QPaintEvent *event);
@@ -83,7 +83,7 @@ signals:
     void dev_changed(bool close);
 
 private:
-    SigSession &_session;
+    SigSession *_session;
 
     QHBoxLayout *  _layout;
     std::map <QAction *, const sr_dev_mode *> _mode_list;
diff --git a/DSView/pv/view/dsosignal.cpp b/DSView/pv/view/dsosignal.cpp
index a359acad..615f2d31 100755
--- a/DSView/pv/view/dsosignal.cpp
+++ b/DSView/pv/view/dsosignal.cpp
@@ -56,7 +56,7 @@ const QColor DsoSignal::SignalColours[4] = {
 
 const float DsoSignal::EnvelopeThreshold = 256.0f;
 
-DsoSignal::DsoSignal(boost::shared_ptr<pv::device::DevInst> dev_inst,
+DsoSignal::DsoSignal(DevInst *dev_inst,
                      boost::shared_ptr<data::Dso> data,
                      sr_channel *probe):
     Signal(dev_inst, probe),
diff --git a/DSView/pv/view/dsosignal.h b/DSView/pv/view/dsosignal.h
index a6f28ec2..50d079a9 100755
--- a/DSView/pv/view/dsosignal.h
+++ b/DSView/pv/view/dsosignal.h
@@ -87,7 +87,7 @@ private:
     static const uint16_t MS_RectHeight = 25;
 
 public:
-    DsoSignal(boost::shared_ptr<pv::device::DevInst> dev_inst,
+    DsoSignal(DevInst* dev_inst,
               boost::shared_ptr<pv::data::Dso> data,
               sr_channel *probe);
 
diff --git a/DSView/pv/view/logicsignal.cpp b/DSView/pv/view/logicsignal.cpp
index 95d57b67..e336dc4a 100755
--- a/DSView/pv/view/logicsignal.cpp
+++ b/DSView/pv/view/logicsignal.cpp
@@ -45,7 +45,7 @@ const float LogicSignal::Oversampling = 1.0f;
 const int LogicSignal::StateHeight = 12;
 const int LogicSignal::StateRound = 5;
 
-LogicSignal::LogicSignal(boost::shared_ptr<pv::device::DevInst> dev_inst,
+LogicSignal::LogicSignal(DevInst *dev_inst,
                          boost::shared_ptr<data::Logic> data,
                          sr_channel *probe) :
     Signal(dev_inst, probe),
diff --git a/DSView/pv/view/logicsignal.h b/DSView/pv/view/logicsignal.h
index c9377c8a..d2159eb5 100755
--- a/DSView/pv/view/logicsignal.h
+++ b/DSView/pv/view/logicsignal.h
@@ -37,6 +37,8 @@ class Logic;
 class Analog;
 }
 
+using namespace pv::device;
+
 namespace view {
 
 //when device is logic analyzer mode, to draw logic signal trace
@@ -64,7 +66,7 @@ public:
     };
 
 public:
-    LogicSignal(boost::shared_ptr<pv::device::DevInst> dev_inst,
+    LogicSignal(DevInst *dev_inst,
                 boost::shared_ptr<pv::data::Logic> data,
                 sr_channel *probe);
 
diff --git a/DSView/pv/view/signal.cpp b/DSView/pv/view/signal.cpp
index 0646cb06..3be6142d 100755
--- a/DSView/pv/view/signal.cpp
+++ b/DSView/pv/view/signal.cpp
@@ -32,8 +32,7 @@
 namespace pv {
 namespace view {
 
-Signal::Signal(boost::shared_ptr<pv::device::DevInst> dev_inst,
-               sr_channel *probe) :
+Signal::Signal(DevInst *dev_inst,sr_channel *probe) :
     Trace(probe->name, probe->index, probe->type),
     _dev_inst(dev_inst),
     _probe(probe)
@@ -59,7 +58,7 @@ void Signal::set_name(QString name)
     _probe->name = g_strdup(name.toUtf8().data());
 }
 
-boost::shared_ptr<device::DevInst> Signal::get_device() const
+DevInst* Signal::get_device() const
 {
     return _dev_inst;
 }
diff --git a/DSView/pv/view/signal.h b/DSView/pv/view/signal.h
index ff7eb5b0..1d3ed5ad 100755
--- a/DSView/pv/view/signal.h
+++ b/DSView/pv/view/signal.h
@@ -48,6 +48,8 @@ namespace device {
 class DevInst;
 }
 
+using namespace pv::device;
+
 namespace view {
 
 //draw signal trace base class
@@ -59,8 +61,7 @@ private:
 
 
 protected:
-    Signal(boost::shared_ptr<pv::device::DevInst> dev_inst,
-           sr_channel * const probe);
+    Signal(DevInst* dev_inst,sr_channel * const probe);
 
     /**
      * Copy constructor
@@ -90,10 +91,10 @@ public:
 	 */
     //virtual void paint_label(QPainter &p, int right, bool hover, int action);
 
-    boost::shared_ptr<device::DevInst> get_device() const;
+    DevInst* get_device() const;
 
 protected:
-    boost::shared_ptr<pv::device::DevInst> _dev_inst;
+    DevInst* _dev_inst;
     sr_channel *const _probe;
 };
 
diff --git a/DSView/pv/view/spectrumtrace.cpp b/DSView/pv/view/spectrumtrace.cpp
index 4be12280..64500c52 100755
--- a/DSView/pv/view/spectrumtrace.cpp
+++ b/DSView/pv/view/spectrumtrace.cpp
@@ -67,7 +67,7 @@ const int SpectrumTrace::DbvRanges[4] = {
 const int SpectrumTrace::HoverPointSize = 3;
 const double SpectrumTrace::VerticalRate = 1.0 / 2000.0;
 
-SpectrumTrace::SpectrumTrace(pv::SigSession &session,
+SpectrumTrace::SpectrumTrace(pv::SigSession *session,
     boost::shared_ptr<pv::data::SpectrumStack> spectrum_stack, int index) :
     Trace("FFT("+QString::number(index)+")", index, SR_CHANNEL_FFT),
     _session(session),
@@ -79,7 +79,7 @@ SpectrumTrace::SpectrumTrace(pv::SigSession &session,
     _offset(0)
 {
     _typeWidth = 0;
-    const vector< boost::shared_ptr<Signal> > sigs(_session.get_signals());
+    const vector< boost::shared_ptr<Signal> > sigs(_session->get_signals());
     for(size_t i = 0; i < sigs.size(); i++) {
         const boost::shared_ptr<view::Signal> s(sigs[i]);
         assert(s);
@@ -294,7 +294,7 @@ void SpectrumTrace::paint_mid(QPainter &p, int left, int right, QColor fore, QCo
 
         double vdiv = 0;
         double vfactor = 0;
-        BOOST_FOREACH(const boost::shared_ptr<Signal> s, _session.get_signals()) {
+        BOOST_FOREACH(const boost::shared_ptr<Signal> s, _session->get_signals()) {
             boost::shared_ptr<DsoSignal> dsoSig;
             if ((dsoSig = dynamic_pointer_cast<DsoSignal>(s))) {
                 if(dsoSig->get_index() == _spectrum_stack->get_index()) {
@@ -364,8 +364,8 @@ void SpectrumTrace::paint_fore(QPainter &p, int left, int right, QColor fore, QC
     double blank_right = width;
 
     // horizontal ruler
-    const double NyFreq = _session.cur_snap_samplerate() / (2.0 * _spectrum_stack->get_sample_interval());
-    const double deltaFreq = _session.cur_snap_samplerate() * 1.0 /
+    const double NyFreq = _session->cur_snap_samplerate() / (2.0 * _spectrum_stack->get_sample_interval());
+    const double deltaFreq = _session->cur_snap_samplerate() * 1.0 /
                             (_spectrum_stack->get_sample_num() * _spectrum_stack->get_sample_interval());
     const double FreqRange = NyFreq * _scale;
     const double FreqOffset = NyFreq * _offset;
diff --git a/DSView/pv/view/spectrumtrace.h b/DSView/pv/view/spectrumtrace.h
index 7173188b..293269ef 100755
--- a/DSView/pv/view/spectrumtrace.h
+++ b/DSView/pv/view/spectrumtrace.h
@@ -67,7 +67,7 @@ private:
     static const double VerticalRate;
 
 public:
-    SpectrumTrace(pv::SigSession &session,
+    SpectrumTrace(pv::SigSession *session,
         boost::shared_ptr<pv::data::SpectrumStack> spectrum_stack, int index);
     ~SpectrumTrace();
 
@@ -133,7 +133,7 @@ private:
 private slots:
 
 private:
-    pv::SigSession &_session;
+    pv::SigSession *_session;
     boost::shared_ptr<pv::data::SpectrumStack> _spectrum_stack;
 
     bool _enable;
diff --git a/DSView/pv/view/view.cpp b/DSView/pv/view/view.cpp
index 349f0b6b..d9bb13d1 100755
--- a/DSView/pv/view/view.cpp
+++ b/DSView/pv/view/view.cpp
@@ -79,7 +79,7 @@ const QColor View::LightBlue = QColor(17, 133, 209, 200);
 const QColor View::LightRed = QColor(213, 15, 37, 200);
 
 
-View::View(SigSession &session, pv::toolbars::SamplingBar *sampling_bar, QWidget *parent) :
+View::View(SigSession *session, pv::toolbars::SamplingBar *sampling_bar, QWidget *parent) :
     QScrollArea(parent),
 	_session(session),
     _sampling_bar(sampling_bar),
@@ -98,7 +98,9 @@ View::View(SigSession &session, pv::toolbars::SamplingBar *sampling_bar, QWidget
     _dso_auto(true),
     _show_lissajous(false),
     _back_ready(false)
-{
+{ 
+    assert(session);
+
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
 
 	connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
@@ -165,23 +167,23 @@ View::View(SigSession &session, pv::toolbars::SamplingBar *sampling_bar, QWidget
     connect(_vsplitter, SIGNAL(splitterMoved(int,int)),
         this, SLOT(splitterMoved(int, int)));
 
-    connect(&_session, SIGNAL(device_setted()),
+    connect(_session, SIGNAL(device_setted()),
             _devmode, SLOT(set_device()));
-    connect(&_session, SIGNAL(signals_changed()),
+    connect(_session, SIGNAL(signals_changed()),
         this, SLOT(signals_changed()), Qt::DirectConnection);
-    connect(&_session, SIGNAL(data_updated()),
+    connect(_session, SIGNAL(data_updated()),
         this, SLOT(data_updated()));
-    connect(&_session, SIGNAL(receive_trigger(quint64)),
+    connect(_session, SIGNAL(receive_trigger(quint64)),
             this, SLOT(receive_trigger(quint64)));
-    connect(&_session, SIGNAL(frame_ended()),
+    connect(_session, SIGNAL(frame_ended()),
             this, SLOT(receive_end()));
-    connect(&_session, SIGNAL(frame_began()),
+    connect(_session, SIGNAL(frame_began()),
             this, SLOT(frame_began()));
-    connect(&_session, SIGNAL(show_region(uint64_t, uint64_t, bool)),
+    connect(_session, SIGNAL(show_region(uint64_t, uint64_t, bool)),
             this, SLOT(show_region(uint64_t, uint64_t, bool)));
-    connect(&_session, SIGNAL(show_wait_trigger()),
+    connect(_session, SIGNAL(show_wait_trigger()),
             _time_viewport, SLOT(show_wait_trigger()));
-    connect(&_session, SIGNAL(repeat_hold(int)),
+    connect(_session, SIGNAL(repeat_hold(int)),
             this, SLOT(repeat_show()));
 
     connect(_devmode, SIGNAL(dev_changed(bool)),
@@ -217,7 +219,7 @@ View::View(SigSession &session, pv::toolbars::SamplingBar *sampling_bar, QWidget
 
 SigSession& View::session()
 {
-	return _session;
+	return *_session;
 }
 
 double View::scale() const
@@ -252,13 +254,13 @@ double View::get_maxscale() const
 
 void View::capture_init()
 {
-    if (_session.get_device()->dev_inst()->mode == DSO)
+    if (_session->get_device()->dev_inst()->mode == DSO)
         show_trig_cursor(true);
-    else if (!_session.isRepeating())
+    else if (!_session->isRepeating())
         show_trig_cursor(false);
 
-    _maxscale = _session.cur_sampletime() / (get_view_width() * MaxViewRate);
-    if (_session.get_device()->dev_inst()->mode == ANALOG)
+    _maxscale = _session->cur_sampletime() / (get_view_width() * MaxViewRate);
+    if (_session->get_device()->dev_inst()->mode == ANALOG)
         set_scale_offset(_maxscale, 0);
     status_clear();
     _trig_time_setted = false;
@@ -288,7 +290,7 @@ double View::get_hori_res()
 
 void View::update_hori_res()
 {
-    if (_session.get_device()->dev_inst()->mode == DSO) {
+    if (_session->get_device()->dev_inst()->mode == DSO) {
         _sampling_bar->hori_knob(0);
     }
 }
@@ -299,12 +301,12 @@ bool View::zoom(double steps, int offset)
     _preScale = _scale;
     _preOffset = _offset;
 
-    if (_session.get_device()->dev_inst()->mode != DSO) {
+    if (_session->get_device()->dev_inst()->mode != DSO) {
         _scale *= std::pow(3.0/2.0, -steps);
         _scale = max(min(_scale, _maxscale), _minscale);
     } else {
-        if (_session.get_capture_state() == SigSession::Running &&
-            _session.get_instant())
+        if (_session->get_capture_state() == SigSession::Running &&
+            _session->get_instant())
             return ret;
 
         double hori_res = -1;
@@ -314,7 +316,7 @@ bool View::zoom(double steps, int offset)
             hori_res = _sampling_bar->hori_knob(1);
 
         if (hori_res > 0) {
-            const double scale = _session.cur_view_time() / get_view_width();
+            const double scale = _session->cur_view_time() / get_view_width();
             _scale = max(min(scale, _maxscale), _minscale);
         } else {
             ret = false;
@@ -336,19 +338,19 @@ bool View::zoom(double steps, int offset)
 
 void View::timebase_changed()
 {
-    if (_session.get_device()->dev_inst()->mode != DSO)
+    if (_session->get_device()->dev_inst()->mode != DSO)
         return;
 
     double scale = this->scale();
     double hori_res = _sampling_bar->get_hori_res();
     if (hori_res > 0)
-        scale = _session.cur_view_time() / get_view_width();
+        scale = _session->cur_view_time() / get_view_width();
     set_scale_offset(scale, this->offset());
 }
 
 void View::set_scale_offset(double scale, int64_t offset)
 {
-    //if (_session.get_capture_state() == SigSession::Stopped) {
+    //if (_session->get_capture_state() == SigSession::Stopped) {
         _preScale = _scale;
         _preOffset = _offset;
 
@@ -375,13 +377,16 @@ void View::set_preScale_preOffset()
 
 vector< boost::shared_ptr<Trace> > View::get_traces(int type)
 {
-    const vector< boost::shared_ptr<Signal> > sigs(_session.get_signals());
-    const vector< boost::shared_ptr<GroupSignal> > groups(_session.get_group_signals());
+    assert(_session);
+
+    auto array = _session->get_signals();
+    const vector< boost::shared_ptr<Signal> > sigs(array);
+    const vector< boost::shared_ptr<GroupSignal> > groups(_session->get_group_signals());
  
     const vector< boost::shared_ptr<DecodeTrace> > decode_sigs(
-        _session.get_decode_signals());
+        _session->get_decode_signals());
  
-    const vector< boost::shared_ptr<SpectrumTrace> > spectrums(_session.get_spectrum_traces());
+    const vector< boost::shared_ptr<SpectrumTrace> > spectrums(_session->get_spectrum_traces());
 
     vector< boost::shared_ptr<Trace> > traces;
     BOOST_FOREACH(boost::shared_ptr<Trace> t, sigs) {
@@ -404,12 +409,12 @@ vector< boost::shared_ptr<Trace> > View::get_traces(int type)
             traces.push_back(t);
     }
 
-    boost::shared_ptr<LissajousTrace> lissajous = _session.get_lissajous_trace();
+    boost::shared_ptr<LissajousTrace> lissajous = _session->get_lissajous_trace();
     if (lissajous && lissajous->enabled() &&
         (type == ALL_VIEW || _trace_view_map[lissajous->get_type()] == type))
         traces.push_back(lissajous);
 
-    boost::shared_ptr<MathTrace> math = _session.get_math_trace();
+    boost::shared_ptr<MathTrace> math = _session->get_math_trace();
     if (math && math->enabled() &&
         (type == ALL_VIEW || _trace_view_map[math->get_type()] == type))
         traces.push_back(math);
@@ -481,8 +486,8 @@ void View::repeat_unshow()
 
 void View::frame_began()
 {
-//    if (_session.get_device()->dev_inst()->mode == LOGIC)
-//        _viewbottom->set_trig_time(_session.get_session_time());
+//    if (_session->get_device()->dev_inst()->mode == LOGIC)
+//        _viewbottom->set_trig_time(_session->get_session_time());
     _search_hit = false;
     _search_pos = 0;
     set_search_pos(_search_pos, _search_hit);
@@ -490,9 +495,9 @@ void View::frame_began()
 
 void View::set_trig_time()
 {
-    if (!_trig_time_setted && _session.get_device()->dev_inst()->mode == LOGIC) {
-        _session.set_session_time(QDateTime::currentDateTime());
-        _viewbottom->set_trig_time(_session.get_session_time());
+    if (!_trig_time_setted && _session->get_device()->dev_inst()->mode == LOGIC) {
+        _session->set_session_time(QDateTime::currentDateTime());
+        _viewbottom->set_trig_time(_session->get_session_time());
     }
     _trig_time_setted = true;
 }
@@ -504,17 +509,17 @@ bool View::trig_time_setted()
 
 void View::receive_end()
 {
-    if (_session.get_device()->dev_inst()->mode == LOGIC) {
-        GVariant *gvar = _session.get_device()->get_config(NULL, NULL, SR_CONF_RLE);
+    if (_session->get_device()->dev_inst()->mode == LOGIC) {
+        GVariant *gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_RLE);
         if (gvar != NULL) {
             bool rle = g_variant_get_boolean(gvar);
             g_variant_unref(gvar);
             if (rle) {
-                gvar = _session.get_device()->get_config(NULL, NULL, SR_CONF_ACTUAL_SAMPLES);
+                gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_ACTUAL_SAMPLES);
                 if (gvar != NULL) {
                     uint64_t actual_samples = g_variant_get_uint64(gvar);
                     g_variant_unref(gvar);
-                    if (actual_samples != _session.cur_samplelimits()) {
+                    if (actual_samples != _session->cur_samplelimits()) {
                         _viewbottom->set_rle_depth(actual_samples);
                     }
                 }
@@ -526,11 +531,11 @@ void View::receive_end()
 
 void View::receive_trigger(quint64 trig_pos)
 {
-    const double time = trig_pos * 1.0 / _session.cur_snap_samplerate();
+    const double time = trig_pos * 1.0 / _session->cur_snap_samplerate();
     _trig_cursor->set_index(trig_pos);
     if (ds_trigger_get_en() ||
-        _session.get_device()->name() == "virtual-session" ||
-        _session.get_device()->dev_inst()->mode == DSO) {
+        _session->get_device()->name() == "virtual-session" ||
+        _session->get_device()->dev_inst()->mode == DSO) {
         _show_trig_cursor = true;
         set_scale_offset(_scale,  (time / _scale) - (get_view_width() / 2));
     }
@@ -541,7 +546,7 @@ void View::receive_trigger(quint64 trig_pos)
 
 void View::set_trig_pos(int percent)
 {
-    uint64_t index = _session.cur_samplelimits() * percent / 100;
+    uint64_t index = _session->cur_samplelimits() * percent / 100;
     receive_trigger(index);
 }
 
@@ -551,7 +556,7 @@ void View::set_search_pos(uint64_t search_pos, bool hit)
     QColor fore(QWidget::palette().color(QWidget::foregroundRole()));
     fore.setAlpha(View::BackAlpha);
 
-    const double time = search_pos * 1.0 / _session.cur_snap_samplerate();
+    const double time = search_pos * 1.0 / _session->cur_snap_samplerate();
     _search_pos = search_pos;
     _search_hit = hit;
     _search_cursor->set_index(search_pos);
@@ -608,11 +613,11 @@ int View::get_signalHeight()
 
 void View::get_scroll_layout(int64_t &length, int64_t &offset) const
 {
-    const set< boost::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;
 
-    length = ceil(_session.cur_snap_sampletime() / _scale);
+    length = ceil(_session->cur_snap_sampletime() / _scale);
     offset = _offset;
 }
 
@@ -650,11 +655,11 @@ void View::update_scroll()
 
 void View::update_scale_offset()
 {
-    if (_session.get_device()->dev_inst()->mode != DSO) {
-        _maxscale = _session.cur_sampletime() / (get_view_width() * MaxViewRate);
-        _minscale = (1.0 / _session.cur_snap_samplerate()) / MaxPixelsPerSample;
+    if (_session->get_device()->dev_inst()->mode != DSO) {
+        _maxscale = _session->cur_sampletime() / (get_view_width() * MaxViewRate);
+        _minscale = (1.0 / _session->cur_snap_samplerate()) / MaxPixelsPerSample;
     } else {
-        _scale = _session.cur_view_time() / get_view_width();
+        _scale = _session->cur_view_time() / get_view_width();
         _maxscale = 1e9;
         _minscale = 1e-15;
     }
@@ -665,7 +670,7 @@ void View::update_scale_offset()
     _preScale = _scale;
     _preOffset = _offset;
 
-    //_trig_cursor->set_index(_session.get_trigger_pos());
+    //_trig_cursor->set_index(_session->get_trigger_pos());
 
     _ruler->update();
     viewport_update();
@@ -674,8 +679,8 @@ void View::update_scale_offset()
 void View::dev_changed(bool close)
 {
     if (!close) {
-        if (_session.get_device()->name().contains("virtual"))
-            _scale = WellSamplesPerPixel * 1.0 / _session.cur_snap_samplerate();
+        if (_session->get_device()->name().contains("virtual"))
+            _scale = WellSamplesPerPixel * 1.0 / _session->cur_snap_samplerate();
         _scale = max(min(_scale, _maxscale), _minscale);
     }
 
@@ -739,8 +744,8 @@ void View::signals_changed()
         const double height = (_time_viewport->height()
                                - 2 * actualMargin * label_size) * 1.0 / total_rows;
 
-        if (_session.get_device()->dev_inst()->mode == LOGIC) {
-            GVariant* gvar = _session.get_device()->get_config(NULL, NULL, SR_CONF_MAX_HEIGHT_VALUE);
+        if (_session->get_device()->dev_inst()->mode == LOGIC) {
+            GVariant* gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_MAX_HEIGHT_VALUE);
             if (gvar != NULL) {
                 max_height = (g_variant_get_byte(gvar) + 1) * MaxHeightUnit;
                 g_variant_unref(gvar);
@@ -752,7 +757,7 @@ void View::signals_changed()
             } else {
                 _signalHeight = (height >= max_height) ? max_height : height;
             }
-        } else if (_session.get_device()->dev_inst()->mode == DSO) {
+        } else if (_session->get_device()->dev_inst()->mode == DSO) {
             _signalHeight = (_header->height()
                              - horizontalScrollBar()->height()
                              - 2 * actualMargin * label_size) * 1.0 / total_rows;
@@ -800,7 +805,7 @@ bool View::eventFilter(QObject *object, QEvent *event)
             double cur_periods = (mouse_event->pos().x() + _offset) * _scale / _ruler->get_min_period();
             int integer_x = round(cur_periods) * _ruler->get_min_period() / _scale - _offset;
             double cur_deviate_x = qAbs(mouse_event->pos().x() - integer_x);
-            if (_session.get_device()->dev_inst()->mode == LOGIC &&
+            if (_session->get_device()->dev_inst()->mode == LOGIC &&
                 cur_deviate_x < 10)
                 _hover_point = QPoint(integer_x, mouse_event->pos().y());
             else
@@ -859,11 +864,11 @@ void View::resizeEvent(QResizeEvent*)
     update_margins();
     update_scroll();
     signals_changed();
-    if (_session.get_device()->dev_inst()->mode == DSO)
-        _scale = _session.cur_view_time() / get_view_width();
+    if (_session->get_device()->dev_inst()->mode == DSO)
+        _scale = _session->cur_view_time() / get_view_width();
 
-    if (_session.get_device()->dev_inst()->mode != DSO)
-        _maxscale = _session.cur_sampletime() / (get_view_width() * MaxViewRate);
+    if (_session->get_device()->dev_inst()->mode != DSO)
+        _maxscale = _session->cur_sampletime() / (get_view_width() * MaxViewRate);
     else
         _maxscale = 1e9;
 
@@ -1008,7 +1013,7 @@ void View::set_cursor_middle(int index)
     list<Cursor*>::iterator i = _cursorList.begin();
     while (index-- != 0)
             i++;
-    set_scale_offset(_scale, (*i)->index() / (_session.cur_snap_samplerate() * _scale) - (get_view_width() / 2));
+    set_scale_offset(_scale, (*i)->index() / (_session->cur_snap_samplerate() * _scale) - (get_view_width() / 2));
 }
 
 void View::on_measure_updated()
@@ -1027,7 +1032,7 @@ QString View::get_measure(QString option)
 
 QString View::get_cm_time(int index)
 {
-    return _ruler->format_real_time(get_cursor_samples(index), _session.cur_snap_samplerate());
+    return _ruler->format_real_time(get_cursor_samples(index), _session->cur_snap_samplerate());
 }
 
 QString View::get_cm_delta(int index1, int index2)
@@ -1038,7 +1043,7 @@ QString View::get_cm_delta(int index1, int index2)
     uint64_t samples1 = get_cursor_samples(index1);
     uint64_t samples2 = get_cursor_samples(index2);
     uint64_t delta_sample = (samples1 > samples2) ? samples1 - samples2 : samples2 - samples1;
-    return _ruler->format_real_time(delta_sample, _session.cur_snap_samplerate());
+    return _ruler->format_real_time(delta_sample, _session->cur_snap_samplerate());
 }
 
 QString View::get_index_delta(uint64_t start, uint64_t end)
@@ -1047,7 +1052,7 @@ QString View::get_index_delta(uint64_t start, uint64_t end)
         return "0";
 
     uint64_t delta_sample = (start > end) ? start - end : end - start;
-    return _ruler->format_real_time(delta_sample, _session.cur_snap_samplerate());
+    return _ruler->format_real_time(delta_sample, _session->cur_snap_samplerate());
 }
 
 uint64_t View::get_cursor_samples(int index)
@@ -1083,8 +1088,8 @@ void View::on_state_changed(bool stop)
 
 QRect View::get_view_rect()
 {
-    if (_session.get_device()->dev_inst()->mode == DSO) {
-        const vector< boost::shared_ptr<Signal> > sigs(_session.get_signals());
+    if (_session->get_device()->dev_inst()->mode == DSO) {
+        const vector< boost::shared_ptr<Signal> > sigs(_session->get_signals());
         BOOST_FOREACH(const boost::shared_ptr<Signal> s, sigs) {
             return s->get_view_rect();
         }
@@ -1096,8 +1101,8 @@ QRect View::get_view_rect()
 int View::get_view_width()
 {
     int view_width = 0;
-    if (_session.get_device()->dev_inst()->mode == DSO) {
-        const vector< boost::shared_ptr<Signal> > sigs(_session.get_signals());
+    if (_session->get_device()->dev_inst()->mode == DSO) {
+        const vector< boost::shared_ptr<Signal> > sigs(_session->get_signals());
         BOOST_FOREACH(const boost::shared_ptr<Signal> s, sigs) {
             view_width = max(view_width, s->get_view_rect().width());
         }
@@ -1111,8 +1116,8 @@ int View::get_view_width()
 int View::get_view_height()
 {
     int view_height = 0;
-    if (_session.get_device()->dev_inst()->mode == DSO) {
-        const vector< boost::shared_ptr<Signal> > sigs(_session.get_signals());
+    if (_session->get_device()->dev_inst()->mode == DSO) {
+        const vector< boost::shared_ptr<Signal> > sigs(_session->get_signals());
         BOOST_FOREACH(const boost::shared_ptr<Signal> s, sigs) {
             view_height = max(view_height, s->get_view_rect().height());
         }
@@ -1133,14 +1138,14 @@ int64_t View::get_min_offset()
 
 int64_t View::get_max_offset()
 {
-    return ceil((_session.cur_snap_sampletime() / _scale) -
+    return ceil((_session->cur_snap_sampletime() / _scale) -
                 (get_view_width() * MaxViewRate));
 }
 
 // -- calibration dialog
 void View::show_calibration()
 {
-    _cali->set_device(_session.get_device());
+    _cali->set_device(_session->get_device());
     _cali->show();
 }
 
@@ -1152,9 +1157,9 @@ void View::hide_calibration()
 void View::vDial_updated()
 {
     if (_cali->isVisible()) {
-        _cali->set_device(_session.get_device());
+        _cali->set_device(_session->get_device());
     }
-    boost::shared_ptr<view::MathTrace> math_trace = _session.get_math_trace();
+    boost::shared_ptr<view::MathTrace> math_trace = _session->get_math_trace();
     if (math_trace && math_trace->enabled()) {
         math_trace->update_vDial();
     }
@@ -1173,14 +1178,14 @@ void View::show_region(uint64_t start, uint64_t end, bool keep)
     if (keep) {
         set_all_update(true);
         update();
-    } else if (_session.get_map_zoom() == 0) {
-        const double ideal_scale = (end-start) * 2.0 / _session.cur_snap_samplerate() / get_view_width();
+    } else if (_session->get_map_zoom() == 0) {
+        const double ideal_scale = (end-start) * 2.0 / _session->cur_snap_samplerate() / get_view_width();
         const double new_scale = max(min(ideal_scale, _maxscale), _minscale);
-        const double new_off = (start + end)  * 0.5 / (_session.cur_snap_samplerate() * new_scale) - (get_view_width() / 2);
+        const double new_off = (start + end)  * 0.5 / (_session->cur_snap_samplerate() * new_scale) - (get_view_width() / 2);
         set_scale_offset(new_scale, new_off);
     } else {
         const double new_scale = scale();
-        const double new_off = (start + end)  * 0.5 / (_session.cur_snap_samplerate() * new_scale) - (get_view_width() / 2);
+        const double new_off = (start + end)  * 0.5 / (_session->cur_snap_samplerate() * new_scale) - (get_view_width() / 2);
         set_scale_offset(new_scale, new_off);
     }
 }
@@ -1214,7 +1219,7 @@ void View::clear()
 {
     show_trig_cursor(false);
 
-    if (_session.get_device()->dev_inst()->mode != DSO) {
+    if (_session->get_device()->dev_inst()->mode != DSO) {
         show_xcursors(false);
     } else {
         if (!get_xcursorList().empty())
@@ -1224,7 +1229,7 @@ void View::clear()
 
 void View::reconstruct()
 {
-    if (_session.get_device()->dev_inst()->mode == DSO)
+    if (_session->get_device()->dev_inst()->mode == DSO)
         _viewbottom->setFixedHeight(DsoStatusHeight);
     else
         _viewbottom->setFixedHeight(StatusHeight);
@@ -1240,7 +1245,7 @@ void View::set_capture_status()
 {
     bool triggered;
     int progress;
-    if (_session.get_capture_status(triggered, progress)) {
+    if (_session->get_capture_status(triggered, progress)) {
         _viewbottom->set_capture_status(triggered, progress);
         _viewbottom->update();
     }
diff --git a/DSView/pv/view/view.h b/DSView/pv/view/view.h
index e059d461..306653d2 100755
--- a/DSView/pv/view/view.h
+++ b/DSView/pv/view/view.h
@@ -105,7 +105,7 @@ public:
     static const QColor LightRed;
 
 public:
-    explicit View(SigSession &session, pv::toolbars::SamplingBar *sampling_bar, QWidget *parent = 0);
+    explicit View(SigSession *session, pv::toolbars::SamplingBar *sampling_bar, QWidget *parent = 0);
 
 	SigSession& session();
 
@@ -260,7 +260,7 @@ signals:
 
     void auto_trig(int index);
 
-private:
+private: 
     void get_scroll_layout(int64_t &length, int64_t &offset) const;
 	
 	void update_scroll();
@@ -337,7 +337,7 @@ private slots:
 
 private:
 
-	SigSession &_session;
+	SigSession  *_session;
     pv::toolbars::SamplingBar *_sampling_bar;
 
     QWidget *_viewcenter;
diff --git a/DSView/pv/view/viewstatus.cpp b/DSView/pv/view/viewstatus.cpp
index 83db6d83..739df933 100755
--- a/DSView/pv/view/viewstatus.cpp
+++ b/DSView/pv/view/viewstatus.cpp
@@ -40,7 +40,7 @@ using namespace std;
 namespace pv {
 namespace view {
 
-ViewStatus::ViewStatus(SigSession &session, View &parent) :
+ViewStatus::ViewStatus(SigSession *session, View &parent) :
     QWidget(&parent),
     _session(session),
     _view(parent),
@@ -57,7 +57,7 @@ void ViewStatus::paintEvent(QPaintEvent *)
     style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
 
     QColor fore(QWidget::palette().color(QWidget::foregroundRole()));
-    if (_session.get_device()->dev_inst()->mode == LOGIC) {
+    if (_session->get_device()->dev_inst()->mode == LOGIC) {
         fore.setAlpha(View::ForeAlpha);
         p.setPen(fore);
         p.drawText(this->rect(), Qt::AlignLeft | Qt::AlignVCenter, _rle_depth);
@@ -66,16 +66,16 @@ void ViewStatus::paintEvent(QPaintEvent *)
         p.setPen(Qt::NoPen);
         p.setBrush(View::Blue);
         p.drawRect(this->rect().left(), this->rect().bottom() - 3,
-                   _session.get_repeat_hold() * this->rect().width() / 100, 3);
+                   _session->get_repeat_hold() * this->rect().width() / 100, 3);
 
         p.setPen(View::Blue);
         p.drawText(this->rect(), Qt::AlignCenter | Qt::AlignVCenter, _capture_status);
-    } else if (_session.get_device()->dev_inst()->mode == DSO) {
+    } else if (_session->get_device()->dev_inst()->mode == DSO) {
         fore.setAlpha(View::BackAlpha);
         for(size_t i = 0; i < _mrects.size(); i++) {
             int sig_index = std::get<1>(_mrects[i]);
             boost::shared_ptr<view::DsoSignal> dsoSig = NULL;
-            const vector< boost::shared_ptr<Signal> > sigs(_session.get_signals());
+            const vector< boost::shared_ptr<Signal> > sigs(_session->get_signals());
             BOOST_FOREACH(const boost::shared_ptr<Signal> s, sigs) {
                 assert(s);
                 if (!s->enabled())
@@ -133,7 +133,7 @@ void ViewStatus::reload()
     const int COLUMN = 5;
     const int ROW = 2;
     const int MARGIN = 3;
-    if (_session.get_device()->dev_inst()->mode == DSO)
+    if (_session->get_device()->dev_inst()->mode == DSO)
     {
         const double width = _view.get_view_width() * 1.0 / COLUMN;
         const int height = (this->height() - 2*MARGIN) / ROW;
@@ -184,7 +184,7 @@ void ViewStatus::mousePressEvent(QMouseEvent *event)
 {
     assert(event);
 
-    if (_session.get_device()->dev_inst()->mode != DSO)
+    if (_session->get_device()->dev_inst()->mode != DSO)
         return;
 
     if (event->button() == Qt::LeftButton) {
@@ -233,7 +233,7 @@ QJsonArray ViewStatus::get_session()
 
 void ViewStatus::load_session(QJsonArray measure_array)
 {
-    if (_session.get_device()->dev_inst()->mode != DSO ||
+    if (_session->get_device()->dev_inst()->mode != DSO ||
         measure_array.empty())
         return;
 
diff --git a/DSView/pv/view/viewstatus.h b/DSView/pv/view/viewstatus.h
index c4a006eb..56cfaa43 100755
--- a/DSView/pv/view/viewstatus.h
+++ b/DSView/pv/view/viewstatus.h
@@ -47,7 +47,7 @@ class ViewStatus : public QWidget
     Q_OBJECT
 
 public:
-   ViewStatus(SigSession &session, View &parent);
+   ViewStatus(SigSession *session, View &parent);
 
 public: 
 
@@ -71,7 +71,7 @@ public slots:
     void set_capture_status(bool triggered, int progess);
 
 private:
-    SigSession &_session;
+    SigSession *_session;
     View &_view;
     int _hit_rect;
 

From c392bf72c1daeb8d7aa707e102604421b7afef50 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Tue, 2 Nov 2021 18:40:01 +0800
Subject: [PATCH 19/58] change boost thread as std lib, and boost mutex

---
 DSView/pv/appcontrol.cpp                  |   1 -
 DSView/pv/data/analog.cpp                 |   7 +-
 DSView/pv/data/analogsnapshot.cpp         |  20 +-
 DSView/pv/data/analogsnapshot.h           |   3 +
 DSView/pv/data/decode/annotation.h        |   2 +
 DSView/pv/data/decode/row.cpp             |  17 +-
 DSView/pv/data/decode/row.h               |  14 +-
 DSView/pv/data/decode/rowdata.cpp         |  78 +++---
 DSView/pv/data/decode/rowdata.h           |  35 +--
 DSView/pv/data/decodermodel.cpp           |  10 +-
 DSView/pv/data/decoderstack.cpp           | 274 ++++++++++------------
 DSView/pv/data/decoderstack.h             |  78 +++---
 DSView/pv/data/dso.cpp                    |   7 +-
 DSView/pv/data/dsosnapshot.cpp            |  32 +--
 DSView/pv/data/dsosnapshot.h              |   6 +-
 DSView/pv/data/group.cpp                  |   7 +-
 DSView/pv/data/groupsnapshot.cpp          |  27 +--
 DSView/pv/data/groupsnapshot.h            |   4 +-
 DSView/pv/data/logic.cpp                  |   8 +-
 DSView/pv/data/logicsnapshot.cpp          |  20 +-
 DSView/pv/data/logicsnapshot.h            |   9 +-
 DSView/pv/data/mathstack.cpp              |  13 +-
 DSView/pv/data/mathstack.h                |   2 +-
 DSView/pv/data/signaldata.h               |   4 +-
 DSView/pv/data/snapshot.cpp               |  10 +-
 DSView/pv/data/snapshot.h                 |   7 +-
 DSView/pv/data/spectrumstack.cpp          |   8 +-
 DSView/pv/data/spectrumstack.h            |   3 +-
 DSView/pv/device/sessionfile.cpp          |   3 +-
 DSView/pv/devicemanager.cpp               |  20 +-
 DSView/pv/devicemanager.h                 |   8 +-
 DSView/pv/dialogs/calibration.cpp         |   4 +-
 DSView/pv/dialogs/deviceoptions.cpp       |  13 +-
 DSView/pv/dialogs/dsomeasure.cpp          |   8 +-
 DSView/pv/dialogs/fftoptions.cpp          |  12 +-
 DSView/pv/dialogs/lissajousoptions.cpp    |   9 +-
 DSView/pv/dialogs/mathoptions.cpp         |   9 +-
 DSView/pv/dialogs/protocolexp.cpp         |   6 +-
 DSView/pv/dialogs/protocollist.cpp        |  12 +-
 DSView/pv/dialogs/regionoptions.cpp       |   4 +-
 DSView/pv/dialogs/search.cpp              |  10 +-
 DSView/pv/dialogs/waitingdialog.cpp       |   8 +-
 DSView/pv/dock/dsotriggerdock.cpp         |   5 +-
 DSView/pv/dock/protocoldock.cpp           |  16 +-
 DSView/pv/dock/protocoldock.h             |   6 +-
 DSView/pv/mainwindow.cpp                  |  36 +--
 DSView/pv/prop/binding/binding.cpp        |  10 +-
 DSView/pv/prop/binding/decoderoptions.cpp |   2 +-
 DSView/pv/sigsession.cpp                  | 135 +++++------
 DSView/pv/sigsession.h                    |  22 +-
 DSView/pv/storesession.cpp                |  70 +++---
 DSView/pv/storesession.h                  |  10 +-
 DSView/pv/toolbars/filebar.cpp            |   3 +-
 DSView/pv/toolbars/logobar.cpp            |   2 +-
 DSView/pv/toolbars/samplingbar.cpp        |   9 +-
 DSView/pv/toolbars/samplingbar.h          |   2 +-
 DSView/pv/view/decodetrace.cpp            |  75 +++---
 DSView/pv/view/decodetrace.h              |   3 +-
 DSView/pv/view/devmode.cpp                |   3 +-
 DSView/pv/view/dsosignal.cpp              |   2 +-
 DSView/pv/view/header.cpp                 |  21 +-
 DSView/pv/view/lissajoustrace.cpp         |   2 +-
 DSView/pv/view/mathtrace.cpp              |   3 +-
 DSView/pv/view/spectrumtrace.cpp          |   5 +-
 DSView/pv/view/view.cpp                   |  41 ++--
 DSView/pv/view/viewport.cpp               |  50 ++--
 DSView/pv/view/viewstatus.cpp             |   6 +-
 DSView/pv/view/viewstatus.h               |   2 +-
 DSView/pv/view/xcursor.cpp                |   6 +-
 DSView/pv/widgets/decodergroupbox.cpp     |  13 +-
 70 files changed, 689 insertions(+), 703 deletions(-)

diff --git a/DSView/pv/appcontrol.cpp b/DSView/pv/appcontrol.cpp
index 9cf40035..6fa5f704 100644
--- a/DSView/pv/appcontrol.cpp
+++ b/DSView/pv/appcontrol.cpp
@@ -36,7 +36,6 @@ AppControl::AppControl()
 
     _device_manager = new pv::DeviceManager();
     _session = new pv::SigSession(_device_manager);
-    _session->_appCntrol = this;
 }
 
 AppControl::AppControl(AppControl &o)
diff --git a/DSView/pv/data/analog.cpp b/DSView/pv/data/analog.cpp
index 6685e453..85046322 100755
--- a/DSView/pv/data/analog.cpp
+++ b/DSView/pv/data/analog.cpp
@@ -22,8 +22,7 @@
 
 #include "analog.h"
 #include "analogsnapshot.h"
-
-#include <boost/foreach.hpp>
+ 
 
 using namespace boost;
 using namespace std;
@@ -49,13 +48,13 @@ deque< boost::shared_ptr<AnalogSnapshot> >& Analog::get_snapshots()
 void Analog::clear()
 {
     //_snapshots.clear();
-    BOOST_FOREACH(const boost::shared_ptr<AnalogSnapshot> s, _snapshots)
+    for(auto &s : _snapshots)
         s->clear();
 }
 void Analog::init()
 {
     //_snapshots.clear();
-    BOOST_FOREACH(const boost::shared_ptr<AnalogSnapshot> s, _snapshots)
+    for(auto &s : _snapshots)
         s->init();
 }
 
diff --git a/DSView/pv/data/analogsnapshot.cpp b/DSView/pv/data/analogsnapshot.cpp
index 77b2e4bf..7da95a1a 100755
--- a/DSView/pv/data/analogsnapshot.cpp
+++ b/DSView/pv/data/analogsnapshot.cpp
@@ -28,12 +28,9 @@
 #include <math.h>
 
 #include <algorithm>
-
-#include <boost/foreach.hpp>
-
+ 
 #include "analogsnapshot.h"
 
-using namespace boost;
 using namespace std;
 
 namespace pv {
@@ -60,7 +57,7 @@ AnalogSnapshot::~AnalogSnapshot()
 void AnalogSnapshot::free_envelop()
 {
     for (unsigned int i = 0; i < _channel_num; i++) {
-        BOOST_FOREACH(Envelope &e, _envelope_levels[i]) {
+        for(auto &e : _envelope_levels[i]) {
             if (e.samples)
                 free(e.samples);
         }
@@ -70,7 +67,12 @@ void AnalogSnapshot::free_envelop()
 
 void AnalogSnapshot::init()
 {
-    boost::lock_guard<boost::recursive_mutex> lock(_mutex);
+    std::lock_guard<std::mutex> lock(_mutex);
+    init_all();
+}
+
+void AnalogSnapshot::init_all()
+{
     _sample_count = 0;
     _ring_sample_count = 0;
     _memory_failed = false;
@@ -88,10 +90,10 @@ void AnalogSnapshot::init()
 
 void AnalogSnapshot::clear()
 {
-    boost::lock_guard<boost::recursive_mutex> lock(_mutex);
+    std::lock_guard<std::mutex> lock(_mutex);
     free_data();
     free_envelop();
-    init();
+    init_all();
 }
 
 void AnalogSnapshot::first_payload(const sr_datafeed_analog &analog, uint64_t total_sample_count, GSList *channels)
@@ -167,7 +169,7 @@ void AnalogSnapshot::first_payload(const sr_datafeed_analog &analog, uint64_t to
 void AnalogSnapshot::append_payload(
 	const sr_datafeed_analog &analog)
 {
-    boost::lock_guard<boost::recursive_mutex> lock(_mutex);
+    std::lock_guard<std::mutex> lock(_mutex);
     append_data(analog.data, analog.num_samples, analog.unit_pitch);
 
 	// Generate the first mip-map from the data
diff --git a/DSView/pv/data/analogsnapshot.h b/DSView/pv/data/analogsnapshot.h
index 644dbfaa..0d6c1473 100755
--- a/DSView/pv/data/analogsnapshot.h
+++ b/DSView/pv/data/analogsnapshot.h
@@ -79,6 +79,9 @@ private:
     static const uint64_t LeafBlockSamples = 1 << LeafBlockPower;
     static const uint64_t LeafMask = ~(~0ULL << LeafBlockPower);
 
+private:
+    void init_all();
+
 public:
     AnalogSnapshot();
 
diff --git a/DSView/pv/data/decode/annotation.h b/DSView/pv/data/decode/annotation.h
index d45d0e5b..46d3e2eb 100755
--- a/DSView/pv/data/decode/annotation.h
+++ b/DSView/pv/data/decode/annotation.h
@@ -25,6 +25,7 @@
 #include <stdint.h>
 
 #include <QString>
+#include <vector>
 
 class AnnotationResTable;
 class DecoderStatus;
@@ -35,6 +36,7 @@ namespace pv {
 namespace data {
 namespace decode {
 
+//create at DecoderStack.annotation_callback
 class Annotation
 {
 public:
diff --git a/DSView/pv/data/decode/row.cpp b/DSView/pv/data/decode/row.cpp
index 99958900..63fef7c3 100755
--- a/DSView/pv/data/decode/row.cpp
+++ b/DSView/pv/data/decode/row.cpp
@@ -38,22 +38,7 @@ Row::Row(const srd_decoder *decoder, const srd_decoder_annotation_row *row, cons
     _row(row),
     _order(order)
 {
-}
-
-Row::~Row()
-{
-    
-}
-
-const srd_decoder* Row::decoder() const
-{
-	return _decoder;
-}
-
-const srd_decoder_annotation_row* Row::row() const
-{
-	return _row;
-}
+} 
 
 const QString Row::title() const
 {
diff --git a/DSView/pv/data/decode/row.h b/DSView/pv/data/decode/row.h
index d6fa4ac6..b21f8093 100755
--- a/DSView/pv/data/decode/row.h
+++ b/DSView/pv/data/decode/row.h
@@ -32,6 +32,7 @@ namespace pv {
 namespace data {
 namespace decode {
 
+//map find key data
 class Row
 {
 public:
@@ -41,12 +42,15 @@ public:
         const srd_decoder_annotation_row *row = NULL,
         const int order = -1);
 
-public:
-	
-    ~Row(); 
+public: 
 
-	const srd_decoder* decoder() const;
-	const srd_decoder_annotation_row* row() const;
+	inline const srd_decoder* decoder() const{
+		return _decoder;
+	}
+
+	inline const srd_decoder_annotation_row* row() const{
+		return _row;
+	}
 
 	const QString title() const;
 
diff --git a/DSView/pv/data/decode/rowdata.cpp b/DSView/pv/data/decode/rowdata.cpp
index c80cbfbd..9ac049e9 100755
--- a/DSView/pv/data/decode/rowdata.cpp
+++ b/DSView/pv/data/decode/rowdata.cpp
@@ -31,10 +31,13 @@ namespace pv {
 namespace data {
 namespace decode {
 
+std::mutex RowData::_global_visitor_mutex;
+
 RowData::RowData() :
     _max_annotation(0),
     _min_annotation(UINT64_MAX)
 {
+    _item_count = 0;
 }
 
 RowData::~RowData()
@@ -44,14 +47,23 @@ RowData::~RowData()
 
 void RowData::clear()
 {
+    std::lock_guard<std::mutex> lock(_global_visitor_mutex);
+
+    //destroy objercts
+    for (Annotation *p : _annotations){
+        delete p;
+    }
     _annotations.clear();
+    _item_count = 0;
 }
 
 uint64_t RowData::get_max_sample() const
 {
+    std::lock_guard<std::mutex> lock(_global_visitor_mutex); 
+
 	if (_annotations.empty())
 		return 0;
-	return _annotations.back().end_sample();
+	return _annotations.back()->end_sample();
 }
 
 uint64_t RowData::get_max_annotation() const
@@ -67,52 +79,64 @@ uint64_t RowData::get_min_annotation() const
         return _min_annotation;
 }
 
-void RowData::get_annotation_subset(
-	vector<pv::data::decode::Annotation> &dest,
-	uint64_t start_sample, uint64_t end_sample) const
-{
-	for (vector<Annotation>::const_iterator i = _annotations.begin();
-		i != _annotations.end(); i++)
-		if ((*i).end_sample() > start_sample &&
-			(*i).start_sample() <= end_sample)
-			dest.push_back(*i);
+void RowData::get_annotation_subset(std::vector<pv::data::decode::Annotation> &dest,
+		                        uint64_t start_sample, uint64_t end_sample) const
+{  
+    std::lock_guard<std::mutex> lock(_global_visitor_mutex);
+
+    for (Annotation *p : _annotations){
+        if (p->end_sample() > start_sample &&
+            p->start_sample() <= end_sample){
+            Annotation a = *p;
+            dest.push_back(a);
+        }			               
+    }
 }
 
 uint64_t RowData::get_annotation_index(uint64_t start_sample) const
 {
+    std::lock_guard<std::mutex> lock(_global_visitor_mutex);
     uint64_t index = 0;
-    for (vector<Annotation>::const_iterator i = _annotations.begin();
-        i != _annotations.end(); i++) {
-        if ((*i).start_sample() > start_sample)
-            break;
-        index++;
-    }
+
+     for (Annotation *p : _annotations){
+         if (p->start_sample() > start_sample)
+             break;
+         index++;
+     }
+
     return index;
 }
 
-bool RowData::push_annotation(const Annotation &a)
+bool RowData::push_annotation(Annotation *a)
 {
+    if (a == NULL){
+        return false;
+    }
+
+    std::lock_guard<std::mutex> lock(_global_visitor_mutex);
+
     try {
       _annotations.push_back(a);
-      _max_annotation = max(_max_annotation, a.end_sample() - a.start_sample());
-      if (a.end_sample() != a.start_sample())
-          _min_annotation = min(_min_annotation, a.end_sample() - a.start_sample());
+      _item_count = _annotations.size();
+      _max_annotation = max(_max_annotation, a->end_sample() - a->start_sample());
+
+      if (a->end_sample() != a->start_sample())
+          _min_annotation = min(_min_annotation, a->end_sample() - a->start_sample());
+          
       return true;
+      
     } catch (const std::bad_alloc&) {
       return false;
     }
 }
+ 
 
-uint64_t RowData::get_annotation_size() const
+bool RowData::get_annotation(Annotation &ann, uint64_t index) const
 {
-    return _annotations.size();
-}
+    std::lock_guard<std::mutex> lock(_global_visitor_mutex);
 
-bool RowData::get_annotation(Annotation &ann,
-                             uint64_t index) const
-{
     if (index < _annotations.size()) {
-        ann = _annotations[index];
+        ann = *_annotations[index];
         return true;
     } else {
         return false;
diff --git a/DSView/pv/data/decode/rowdata.h b/DSView/pv/data/decode/rowdata.h
index 72d33456..0059567f 100755
--- a/DSView/pv/data/decode/rowdata.h
+++ b/DSView/pv/data/decode/rowdata.h
@@ -22,7 +22,8 @@
 #ifndef DSVIEW_PV_DATA_DECODE_ROWDATA_H
 #define DSVIEW_PV_DATA_DECODE_ROWDATA_H
 
-#include <vector>
+#include <vector> 
+#include <mutex>
 
 #include "annotation.h"
 
@@ -35,33 +36,37 @@ class RowData
 public:
 	RowData();
     ~RowData();
+
 public:
 	uint64_t get_max_sample() const;
 
     uint64_t get_max_annotation() const;
-    uint64_t get_min_annotation() const;
-	/**
-	 * Extracts sorted annotations between two period into a vector.
-	 */
-	void get_annotation_subset(
-		std::vector<pv::data::decode::Annotation> &dest,
-		uint64_t start_sample, uint64_t end_sample) const;
+    uint64_t get_min_annotation() const;	
 
     uint64_t get_annotation_index(uint64_t start_sample) const;
 
-    bool push_annotation(const Annotation &a);
+    bool push_annotation(Annotation *a);
 
-    uint64_t get_annotation_size() const;
+    inline uint64_t get_annotation_size() const{
+        return _item_count;
+    }
 
-    bool get_annotation(pv::data::decode::Annotation &ann,
-                        uint64_t index) const;
+    bool get_annotation(pv::data::decode::Annotation &ann, uint64_t index) const;
+
+     /**
+	 * Extracts sorted annotations between two period into a vector.
+	 */
+	void get_annotation_subset(std::vector<pv::data::decode::Annotation> &dest,
+		                        uint64_t start_sample, uint64_t end_sample) const;
 
     void clear();
 
 private:
-    uint64_t _max_annotation;
-    uint64_t _min_annotation;
-	std::vector<Annotation> _annotations;
+    uint64_t        _max_annotation;
+    uint64_t        _min_annotation;
+    uint64_t        _item_count;
+	std::vector<Annotation*> _annotations;
+    static std::mutex _global_visitor_mutex;
 };
 
 }
diff --git a/DSView/pv/data/decodermodel.cpp b/DSView/pv/data/decodermodel.cpp
index 614f67ff..c42bab6a 100755
--- a/DSView/pv/data/decodermodel.cpp
+++ b/DSView/pv/data/decodermodel.cpp
@@ -19,13 +19,9 @@
  */
 
 #include <libsigrokdecode4DSL/libsigrokdecode.h>
-
-#include <boost/foreach.hpp>
-#include <boost/thread/thread.hpp>
-
-#include <pv/data/decode/annotation.h>
-#include <pv/data/decode/rowdata.h>
-
+  
+#include "decode/annotation.h"
+#include "decode/rowdata.h"
 #include "decoderstack.h"
 #include "decodermodel.h"
 
diff --git a/DSView/pv/data/decoderstack.cpp b/DSView/pv/data/decoderstack.cpp
index c9bbd504..72d094ce 100755
--- a/DSView/pv/data/decoderstack.cpp
+++ b/DSView/pv/data/decoderstack.cpp
@@ -18,9 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
-
-#include <boost/foreach.hpp>
-#include <boost/thread/thread.hpp>
+  
 
 #include <stdexcept>
 #include <algorithm>
@@ -29,12 +27,15 @@
 
 #include "decoderstack.h"
 
-#include <pv/data/logic.h>
-#include <pv/data/logicsnapshot.h>
-#include <pv/data/decode/decoder.h>
-#include <pv/data/decode/annotation.h>
-#include <pv/sigsession.h>
-#include <pv/view/logicsignal.h>
+#include "logic.h"
+#include "logicsnapshot.h"
+#include "decode/decoder.h"
+#include "decode/annotation.h"
+#include "decode/rowdata.h"
+#include "../sigsession.h"
+#include "../view/logicsignal.h"
+#include "../dsvdef.h"
+
 
 using namespace boost;
 using namespace std;
@@ -50,19 +51,23 @@ const int64_t DecoderStack::DecodeChunkLength = 4 * 1024;
 //const int64_t DecoderStack::DecodeChunkLength = 1024 * 1024;
 const unsigned int DecoderStack::DecodeNotifyPeriod = 1024;
 
-boost::mutex DecoderStack::_global_decode_mutex;
+std::mutex DecoderStack::_global_decode_mutex;
 
 DecoderStack::DecoderStack(pv::SigSession *session,
 	const srd_decoder *const dec, DecoderStatus *decoder_status) :
-	_session(session),
-	_sample_count(0),
-	_frame_complete(false),
-    _samples_decoded(0),
-    _decode_state(Stopped),
-    _options_changed(false),
-    _no_memory(false),
-    _mark_index(-1)
+	_session(session)
 {
+    _samples_decoded = 0;
+    _sample_count = 0;
+    _frame_complete = false;
+    _decode_state = Stopped;
+    _options_changed = false;
+    _no_memory = false;
+    _mark_index = -1;
+    _decoder_status = decoder_status;
+    _bThreadStop = false;
+    _decode_thread = NULL;
+
 	connect(_session, SIGNAL(frame_began()),
 		this, SLOT(on_new_frame()));
 	connect(_session, SIGNAL(data_received()),
@@ -72,32 +77,26 @@ DecoderStack::DecoderStack(pv::SigSession *session,
 
     _stack.push_back(boost::shared_ptr<decode::Decoder>(
 		new decode::Decoder(dec)));
-
-        _decoder_status = decoder_status;
-
+ 
     build_row();
 }
 
 DecoderStack::~DecoderStack()
-{
-//	if (_decode_thread.joinable()) {
-//		_decode_thread.interrupt();
-//		_decode_thread.join();
-//	}
+{ 
     stop_decode();
-    _stack.clear();
+
+    for (auto &kv : _rows)
+    {
+        delete kv.second;
+    }
     _rows.clear();
+
+    _stack.clear();
     _rows_gshow.clear();
     _rows_lshow.clear();
     _class_rows.clear();
 }
-
-const std::list< boost::shared_ptr<decode::Decoder> >&
-DecoderStack::stack() const
-{
-	return _stack;
-}
-
+ 
 void DecoderStack::push(boost::shared_ptr<decode::Decoder> decoder)
 {
 	assert(decoder);
@@ -124,9 +123,15 @@ void DecoderStack::remove(boost::shared_ptr<Decoder> &decoder)
 
 void DecoderStack::build_row()
 {
+    //destory data
+    for (auto &kv : _rows)
+    {
+        delete kv.second;
+    }
     _rows.clear();
+
     // Add classes
-    BOOST_FOREACH (const boost::shared_ptr<decode::Decoder> &dec, _stack)
+    for (auto &dec : _stack)
     {
         assert(dec);
         const srd_decoder *const decc = dec->decoder();
@@ -135,7 +140,7 @@ void DecoderStack::build_row()
         // Add a row for the decoder if it doesn't have a row list
         if (!decc->annotation_rows) {
             const Row row(decc);
-            _rows[row] = decode::RowData();
+            _rows[row] = new decode::RowData();
             std::map<const decode::Row, bool>::const_iterator iter = _rows_gshow.find(row);
             if (iter == _rows_gshow.end()) {
                 _rows_gshow[row] = true;
@@ -159,7 +164,7 @@ void DecoderStack::build_row()
             const Row row(decc, ann_row, order);
 
             // Add a new empty row data object
-            _rows[row] = decode::RowData();
+            _rows[row] = new decode::RowData();
             std::map<const decode::Row, bool>::const_iterator iter = _rows_gshow.find(row);
             if (iter == _rows_gshow.end()) {
                 _rows_gshow[row] = true;
@@ -184,7 +189,7 @@ void DecoderStack::build_row()
 
 int64_t DecoderStack::samples_decoded() const
 {
-    boost::lock_guard<boost::recursive_mutex> decode_lock(_output_mutex);
+    std::lock_guard<std::mutex> decode_lock(_output_mutex);
 	return _samples_decoded;
 }
 
@@ -192,51 +197,39 @@ void DecoderStack::get_annotation_subset(
 	std::vector<pv::data::decode::Annotation> &dest,
 	const Row &row, uint64_t start_sample,
 	uint64_t end_sample) const
-{
-    //lock_guard<mutex> lock(_output_mutex);
-
-    std::map<const Row, decode::RowData>::const_iterator iter =
-        _rows.find(row);
+{  
+    auto iter = _rows.find(row);
     if (iter != _rows.end())
-		(*iter).second.get_annotation_subset(dest,
+        (*iter).second->get_annotation_subset(dest,
 			start_sample, end_sample);
 }
 
 
 uint64_t DecoderStack::get_annotation_index(
     const Row &row, uint64_t start_sample) const
-{
-    //lock_guard<mutex> lock(_output_mutex);
-
+{  
     uint64_t index = 0;
-    std::map<const Row, decode::RowData>::const_iterator iter =
-        _rows.find(row);
+    auto iter = _rows.find(row);
     if (iter != _rows.end())
-        index = (*iter).second.get_annotation_index(start_sample);
+        index = (*iter).second->get_annotation_index(start_sample);
 
     return index;
 }
 
 uint64_t DecoderStack::get_max_annotation(const Row &row)
-{
-    //lock_guard<mutex> lock(_output_mutex);
-
-    std::map<const Row, decode::RowData>::const_iterator iter =
-        _rows.find(row);
+{ 
+    auto iter =  _rows.find(row);
     if (iter != _rows.end())
-        return (*iter).second.get_max_annotation();
+        return (*iter).second->get_max_annotation();
 
     return 0;
 }
 
 uint64_t DecoderStack::get_min_annotation(const Row &row)
-{
-    //lock_guard<mutex> lock(_output_mutex);
-
-    std::map<const Row, decode::RowData>::const_iterator iter =
-        _rows.find(row);
+{  
+    auto iter = _rows.find(row);
     if (iter != _rows.end())
-        return (*iter).second.get_min_annotation();
+        return (*iter).second->get_min_annotation();
 
     return 0;
 }
@@ -278,13 +271,11 @@ void DecoderStack::set_rows_lshow(const decode::Row row, bool show)
 }
 
 bool DecoderStack::has_annotations(const Row &row) const
-{
-    //lock_guard<mutex> lock(_output_mutex);
-
-    std::map<const Row, decode::RowData>::const_iterator iter =
+{  
+    auto iter =
         _rows.find(row);
     if (iter != _rows.end())
-        if(0 == (*iter).second.get_max_sample())
+        if(0 == (*iter).second->get_max_sample())
             return false;
         else
             return true;
@@ -294,29 +285,27 @@ bool DecoderStack::has_annotations(const Row &row) const
 
 uint64_t DecoderStack::list_annotation_size() const
 {
-    boost::lock_guard<boost::recursive_mutex> lock(_output_mutex);
+    std::lock_guard<std::mutex> lock(_output_mutex);
     uint64_t max_annotation_size = 0;
-    for (map<const Row, RowData>::const_iterator i = _rows.begin();
+    for (auto i = _rows.begin();
         i != _rows.end(); i++) {
         map<const Row, bool>::const_iterator iter = _rows_lshow.find((*i).first);
         if (iter != _rows_lshow.end() && (*iter).second)
             max_annotation_size = max(max_annotation_size,
-                (*i).second.get_annotation_size());
+                (*i).second->get_annotation_size());
     }
 
     return max_annotation_size;
 }
 
 uint64_t DecoderStack::list_annotation_size(uint16_t row_index) const
-{
-    //lock_guard<boost::recursive_mutex> lock(_output_mutex);
-    //int row = 0;
-    for (map<const Row, RowData>::const_iterator i = _rows.begin();
+{ 
+    for (auto i = _rows.begin();
         i != _rows.end(); i++) {
         map<const Row, bool>::const_iterator iter = _rows_lshow.find((*i).first);
         if (iter != _rows_lshow.end() && (*iter).second)
             if (row_index-- == 0) {
-                return (*i).second.get_annotation_size();
+                return (*i).second->get_annotation_size();
             }
     }
     return 0;
@@ -324,14 +313,13 @@ uint64_t DecoderStack::list_annotation_size(uint16_t row_index) const
 
 bool DecoderStack::list_annotation(pv::data::decode::Annotation &ann,
                                   uint16_t row_index, uint64_t col_index) const
-{
-    //lock_guard<mutex> lock(_output_mutex);
-    for (map<const Row, RowData>::const_iterator i = _rows.begin();
+{ 
+    for (auto i = _rows.begin();
         i != _rows.end(); i++) {
         map<const Row, bool>::const_iterator iter = _rows_lshow.find((*i).first);
         if (iter != _rows_lshow.end() && (*iter).second) {
             if (row_index-- == 0) {
-                return (*i).second.get_annotation(ann, col_index);
+                return (*i).second->get_annotation(ann, col_index);
             }
         }
     }
@@ -341,9 +329,8 @@ bool DecoderStack::list_annotation(pv::data::decode::Annotation &ann,
 
 
 bool DecoderStack::list_row_title(int row, QString &title) const
-{
-    //lock_guard<mutex> lock(_output_mutex);
-    for (map<const Row, RowData>::const_iterator i = _rows.begin();
+{ 
+    for (auto i = _rows.begin();
         i != _rows.end(); i++) {
         map<const Row, bool>::const_iterator iter = _rows_lshow.find((*i).first);
         if (iter != _rows_lshow.end() && (*iter).second) {
@@ -357,8 +344,7 @@ bool DecoderStack::list_row_title(int row, QString &title) const
 }
 
 QString DecoderStack::error_message()
-{
-    //lock_guard<mutex> lock(_output_mutex);
+{ 
 	return _error_message;
 }
 
@@ -374,24 +360,26 @@ void DecoderStack::init()
     _samples_decoded = 0;
     _error_message = QString();
     _no_memory = false;
-    for (map<const Row, RowData>::iterator i = _rows.begin();
-        i != _rows.end(); i++) {
-        //_rows[(*i).first] = decode::RowData();
-        (*i).second.clear();
+
+    for (auto i = _rows.begin();
+        i != _rows.end(); i++) { 
+        (*i).second->clear();
     }
+
     set_mark_index(-1);
 }
 
 void DecoderStack::stop_decode()
-{
-    //_snapshot.reset();
-    if(_decode_state != Stopped) {
-        if (_decode_thread.get()) {
-            _decode_thread->interrupt();
-            _decode_thread->join();
-            _decode_state = Stopped;
-        }
-        _decode_thread.reset();
+{ 
+    _bThreadStop = true;
+
+     if (_decode_thread && _decode_thread->joinable()) { 
+        _decode_thread->join(); 
+     }
+     DESTROY_OBJECT(_decode_thread);
+
+    if(_decode_state != Stopped) {       
+       _decode_state = Stopped;
     }
 }
 
@@ -407,7 +395,7 @@ void DecoderStack::begin_decode()
     init();
 
 	// Check that all decoders have the required channels
-    BOOST_FOREACH(const boost::shared_ptr<decode::Decoder> &dec, _stack)
+    for(auto &dec : _stack)
 		if (!dec->have_required_probes()) {
 			_error_message = tr("One or more required channels "
 				"have not been specified");
@@ -417,9 +405,9 @@ void DecoderStack::begin_decode()
 	// We get the logic data of the first channel in the list.
 	// This works because we are currently assuming all
 	// LogicSignals have the same data/snapshot
-    BOOST_FOREACH (const boost::shared_ptr<decode::Decoder> &dec, _stack) {
+    for (auto &dec : _stack) {
         if (dec && !dec->channels().empty()) {
-            BOOST_FOREACH(boost::shared_ptr<view::Signal> sig, _session->get_signals()) {
+            for(auto &sig :  _session->get_signals()) {
                 if((sig->get_index() == (*dec->channels().begin()).second) &&
                    (logic_signal = dynamic_pointer_cast<view::LogicSignal>(sig)) &&
                    (data = logic_signal->logic_data()))
@@ -447,18 +435,23 @@ void DecoderStack::begin_decode()
     if (_samplerate == 0.0)
         return;
 
-    //_decode_thread = boost::thread(&DecoderStack::decode_proc, this);
-    _decode_thread.reset(new boost::thread(&DecoderStack::decode_proc, this));
+    if (_decode_thread && _decode_thread->joinable()) { 
+            _bThreadStop = true;
+            _decode_thread->join(); 
+    }
+    DESTROY_OBJECT(_decode_thread);
+
+    _bThreadStop = false; //reset stop flag
+    _decode_thread =  new std::thread(&DecoderStack::decode_proc, this);
 }
 
 uint64_t DecoderStack::get_max_sample_count() const
 {
 	uint64_t max_sample_count = 0;
 
-    for (map<const Row, RowData>::const_iterator i = _rows.begin();
-        i != _rows.end(); i++)
-		max_sample_count = max(max_sample_count,
-			(*i).second.get_max_sample());
+    for (auto i = _rows.begin(); i != _rows.end(); i++){
+        max_sample_count = max(max_sample_count, (*i).second->get_max_sample());
+    } 	
 
 	return max_sample_count;
 }
@@ -485,13 +478,13 @@ void DecoderStack::decode_data(
     uint64_t entry_cnt = 0;
     uint64_t i = decode_start;
     char *error = NULL;
-    while(!boost::this_thread::interruption_requested() &&
-          i < decode_end && !_no_memory)
-    {
-        //lock_guard<mutex> decode_lock(_global_decode_mutex);
+
+    while(!_bThreadStop && i < decode_end && !_no_memory)
+    { 
         std::vector<const uint8_t *> chunk;
         std::vector<uint8_t> chunk_const;
         uint64_t chunk_end = decode_end;
+
         for (int j =0 ; j < logic_di->dec_num_channels; j++) {
             int sig_index = logic_di->dec_channelmap[j];
             if (sig_index == -1) {
@@ -520,7 +513,7 @@ void DecoderStack::decode_data(
         i = chunk_end;
 
         {
-            boost::lock_guard<boost::recursive_mutex> lock(_output_mutex);
+            std::lock_guard<std::mutex> lock(_output_mutex);
             _samples_decoded = i - decode_start + 1;
         }
 
@@ -536,8 +529,12 @@ void DecoderStack::decode_data(
 }
 
 void DecoderStack::decode_proc()
-{
-    boost::lock_guard<boost::mutex> decode_lock(_global_decode_mutex);
+{ 
+    std::lock_guard<std::mutex> decode_lock(_global_decode_mutex);
+    
+    if (_bThreadStop){
+        return;
+    }
 
     optional<uint64_t> sample_count;
 	srd_session *session;
@@ -554,13 +551,10 @@ void DecoderStack::decode_proc()
     _decode_state = Running;
 
     // Get the intial sample count
-    {
-        //unique_lock<mutex> input_lock(_input_mutex);
-        sample_count = _sample_count = _snapshot->get_sample_count();
-    }
+    sample_count = _sample_count = _snapshot->get_sample_count();
 
     // Create the decoders
-    BOOST_FOREACH(const boost::shared_ptr<decode::Decoder> &dec, _stack)
+    for(auto &dec : _stack)
 	{
         srd_decoder_inst *const di = dec->create_decoder_inst(session);
 
@@ -588,6 +582,7 @@ void DecoderStack::decode_proc()
 
     char *error = NULL;
     if (srd_session_start(session, &error) == SRD_OK)
+       //need a lot time
         decode_data(decode_start, decode_end, session);
     else
         _error_message = QString::fromLocal8Bit(error);
@@ -622,14 +617,16 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
 
 	DecoderStack *const d = (DecoderStack*)decoder;
 	assert(d);
-
-    //lock_guard<mutex> lock(d->_output_mutex);
-
+  
     if (d->_no_memory) {
         return;
     }
 
-    const Annotation a(pdata, d->_decoder_status);
+    Annotation *a = new Annotation(pdata, d->_decoder_status);
+    if (a == NULL){
+        d->_no_memory = true;
+        return;     
+    }
 
 	// Find the row
 	assert(pdata->pdo);
@@ -637,11 +634,11 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
 	const srd_decoder *const decc = pdata->pdo->di->decoder;
 	assert(decc);
 
-    map<const Row, decode::RowData>::iterator row_iter = d->_rows.end();
+    auto row_iter = d->_rows.end();
 	
 	// Try looking up the sub-row of this class
 	const map<pair<const srd_decoder*, int>, Row>::const_iterator r =
-		d->_class_rows.find(make_pair(decc, a.format()));
+        d->_class_rows.find(make_pair(decc, a->format()));
 	if (r != d->_class_rows.end())
         row_iter = d->_rows.find((*r).second);
 	else
@@ -653,14 +650,13 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
     assert(row_iter != d->_rows.end());
     if (row_iter == d->_rows.end()) {
         qDebug() << "Unexpected annotation: decoder = " << decc <<
-            ", format = " << a.format();
+            ", format = " << a->format();
         assert(0);
         return;
     }
 
-	// Add the annotation
-    boost::lock_guard<boost::recursive_mutex> lock(d->_output_mutex);
-    if (!(*row_iter).second.push_annotation(a))
+	// Add the annotation 
+    if (!(*row_iter).second->push_annotation(a))
         d->_no_memory = true; 
 }
 
@@ -670,33 +666,19 @@ void DecoderStack::on_new_frame()
 }
 
 void DecoderStack::on_data_received()
-{
-//	{
-//		unique_lock<mutex> lock(_input_mutex);
-//		if (_snapshot)
-//			_sample_count = _snapshot->get_sample_count();
-//	}
-//	_input_cond.notify_one();
+{  
 }
 
 void DecoderStack::on_frame_ended()
-{
-//	{
-//		unique_lock<mutex> lock(_input_mutex);
-//		if (_snapshot)
-//			_frame_complete = true;
-//	}
-//	_input_cond.notify_one();
+{ 
     _options_changed = true;
     begin_decode();
 }
 
 int DecoderStack::list_rows_size()
-{
-    //lock_guard<mutex> lock(_output_mutex);
+{ 
     int rows_size = 0;
-    for (map<const Row, RowData>::const_iterator i = _rows.begin();
-        i != _rows.end(); i++) {
+    for (auto i = _rows.begin(); i != _rows.end(); i++) {
         map<const Row, bool>::const_iterator iter = _rows_lshow.find((*i).first);
         if (iter != _rows_lshow.end() && (*iter).second)
             rows_size++;
diff --git a/DSView/pv/data/decoderstack.h b/DSView/pv/data/decoderstack.h
index bc05fa6b..d7f89bf1 100755
--- a/DSView/pv/data/decoderstack.h
+++ b/DSView/pv/data/decoderstack.h
@@ -27,13 +27,14 @@
 
 #include <boost/optional.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/thread.hpp>
+ 
 
 #include <QObject>
 #include <QString>
+#include <mutex>
+#include <thread>
 
-#include "../data/decode/row.h"
-#include "../data/decode/rowdata.h"
+#include "decode/row.h" 
 #include "../data/signaldata.h"
 
 class DecoderStatus;
@@ -57,6 +58,7 @@ class LogicSnapshot;
 namespace decode {
 class Annotation;
 class Decoder;
+class RowData;
 }
 
 class Logic;
@@ -86,9 +88,14 @@ public:
 
 	virtual ~DecoderStack();
 
-    const std::list< boost::shared_ptr<decode::Decoder> >& stack() const;
+    inline std::list< boost::shared_ptr<decode::Decoder> >& stack(){
+        return _stack;
+    }
+
 	void push(boost::shared_ptr<decode::Decoder> decoder);
+
     void remove(boost::shared_ptr<decode::Decoder>& decoder);
+
     void build_row();
 
 	int64_t samples_decoded() const;
@@ -153,8 +160,7 @@ private:
 
 	void decode_proc();
 
-	static void annotation_callback(srd_proto_data *pdata,
-		void *decoder);
+	static void annotation_callback(srd_proto_data *pdata, void *decoder);
 
 private slots:
 	void on_new_frame();
@@ -167,45 +173,39 @@ signals:
 	void new_decode_data();
     void decode_done();
 
-private:
-	pv::SigSession *_session;
+private: 
+	std::list< boost::shared_ptr<decode::Decoder> > _stack;
+
+	boost::shared_ptr<pv::data::LogicSnapshot> _snapshot;
+  
+    std::map<const decode::Row, decode::RowData*>   _rows;
+    std::map<const decode::Row, bool>       _rows_gshow;
+    std::map<const decode::Row, bool>       _rows_lshow;
+    std::map<std::pair<const srd_decoder*, int>, decode::Row> _class_rows;
+  
+    SigSession      *_session;
+    decode_state    _decode_state;
+    bool            _options_changed;
+    bool            _no_memory;
+    int64_t         _mark_index;
+    DecoderStatus   *_decoder_status;
+    QString         _error_message;
+    int64_t	        _samples_decoded;
+    uint64_t        _sample_count;
+	bool            _frame_complete;
+    volatile bool   _bThreadStop;
+    
+
+    std::thread     *_decode_thread;
+    mutable std::mutex _output_mutex;
 
 	/**
 	 * This mutex prevents more than one decode operation occuring
 	 * concurrently.
 	 * @todo A proper solution should be implemented to allow multiple
 	 * decode operations.
-	 */
-    static boost::mutex _global_decode_mutex;
-
-	std::list< boost::shared_ptr<decode::Decoder> > _stack;
-
-	boost::shared_ptr<pv::data::LogicSnapshot> _snapshot;
-
-    //mutable boost::mutex _input_mutex;
-    //mutable boost::condition_variable _input_cond;
-    uint64_t _sample_count;
-	bool _frame_complete;
-
-    mutable boost::recursive_mutex _output_mutex;
-    //mutable boost::mutex _output_mutex;
-	int64_t	_samples_decoded;
-
-    std::map<const decode::Row, decode::RowData> _rows;
-    std::map<const decode::Row, bool> _rows_gshow;
-    std::map<const decode::Row, bool> _rows_lshow;
-    std::map<std::pair<const srd_decoder*, int>, decode::Row> _class_rows;
-
-	QString _error_message;
-
-    std::unique_ptr<boost::thread> _decode_thread;
-    decode_state _decode_state;
-
-    bool _options_changed;
-    bool _no_memory;
-
-    int64_t _mark_index;
-    DecoderStatus *_decoder_status;
+	 */ 
+    static std::mutex _global_decode_mutex;
 
 	friend class DecoderStackTest::TwoDecoderStack;
 };
diff --git a/DSView/pv/data/dso.cpp b/DSView/pv/data/dso.cpp
index 7362010f..b88e77d7 100755
--- a/DSView/pv/data/dso.cpp
+++ b/DSView/pv/data/dso.cpp
@@ -21,8 +21,7 @@
 
 #include "dso.h"
 #include "dsosnapshot.h"
-
-#include <boost/foreach.hpp>
+ 
 
 using namespace boost;
 using namespace std;
@@ -48,14 +47,14 @@ deque< boost::shared_ptr<DsoSnapshot> >& Dso::get_snapshots()
 void Dso::clear()
 {
     //_snapshots.clear();
-    BOOST_FOREACH(const boost::shared_ptr<DsoSnapshot> s, _snapshots)
+    for(auto &s : _snapshots)
         s->clear();
 }
 
 void Dso::init()
 {
     //_snapshots.clear();
-    BOOST_FOREACH(const boost::shared_ptr<DsoSnapshot> s, _snapshots)
+    for(auto &s : _snapshots)
         s->init();
 }
 
diff --git a/DSView/pv/data/dsosnapshot.cpp b/DSView/pv/data/dsosnapshot.cpp
index 89da7800..60a98a8c 100755
--- a/DSView/pv/data/dsosnapshot.cpp
+++ b/DSView/pv/data/dsosnapshot.cpp
@@ -27,12 +27,9 @@
 #include <math.h>
 
 #include <algorithm>
-
-#include <boost/foreach.hpp>
-
+ 
 #include "dsosnapshot.h"
 
-using namespace boost;
 using namespace std;
 
 namespace pv {
@@ -63,7 +60,7 @@ DsoSnapshot::~DsoSnapshot()
 void DsoSnapshot::free_envelop()
 {
     for (unsigned int i = 0; i < _channel_num; i++) {
-        BOOST_FOREACH(Envelope &e, _envelope_levels[i]) {
+        for(auto &e : _envelope_levels[i]) {
             if (e.samples)
                 free(e.samples);
         }
@@ -73,13 +70,19 @@ void DsoSnapshot::free_envelop()
 
 void DsoSnapshot::init()
 {
-    boost::lock_guard<boost::recursive_mutex> lock(_mutex);
+    std::lock_guard<std::mutex> lock(_mutex);
+    init_all();    
+}
+
+void DsoSnapshot::init_all()
+{
     _sample_count = 0;
     _ring_sample_count = 0;
     _memory_failed = false;
     _last_ended = true;
     _envelope_done = false;
     _ch_enable.clear();
+
     for (unsigned int i = 0; i < _channel_num; i++) {
         for (unsigned int level = 0; level < ScaleStepCount; level++) {
             _envelope_levels[i][level].length = 0;
@@ -90,10 +93,10 @@ void DsoSnapshot::init()
 
 void DsoSnapshot::clear()
 {
-    boost::lock_guard<boost::recursive_mutex> lock(_mutex);
+    std::lock_guard<std::mutex> lock(_mutex);
     free_data();
     free_envelop();
-    init();
+    init_all();
 }
 
 void DsoSnapshot::first_payload(const sr_datafeed_dso &dso, uint64_t total_sample_count,
@@ -157,7 +160,7 @@ void DsoSnapshot::first_payload(const sr_datafeed_dso &dso, uint64_t total_sampl
 
 void DsoSnapshot::append_payload(const sr_datafeed_dso &dso)
 {
-    boost::lock_guard<boost::recursive_mutex> lock(_mutex);
+    std::lock_guard<std::mutex> lock(_mutex);
 
     if (_channel_num > 0 && dso.num_samples != 0) {
         append_data(dso.data, dso.num_samples, _instant);
@@ -184,16 +187,16 @@ void DsoSnapshot::append_data(void *data, uint64_t samples, bool instant)
 
 void DsoSnapshot::enable_envelope(bool enable)
 {
-    boost::lock_guard<boost::recursive_mutex> lock(_mutex);
+    std::lock_guard<std::mutex> lock(_mutex);
     if (!_envelope_done && enable)
         append_payload_to_envelope_levels(true);
     _envelope_en = enable;
 }
 
 const uint8_t *DsoSnapshot::get_samples(
-    int64_t start_sample, int64_t end_sample, uint16_t index) const
+    int64_t start_sample, int64_t end_sample, uint16_t index)
 {
-    boost::lock_guard<boost::recursive_mutex> lock(_mutex);
+   std::lock_guard<std::mutex> lock(_mutex);
     (void)end_sample;
 
 	assert(start_sample >= 0);
@@ -202,10 +205,7 @@ const uint8_t *DsoSnapshot::get_samples(
     assert(end_sample < (int64_t)get_sample_count());
 	assert(start_sample <= end_sample);
 
-//    uint16_t *const data = new uint16_t[end_sample - start_sample];
-//    memcpy(data, (uint16_t*)_data + start_sample, sizeof(uint16_t) *
-//		(end_sample - start_sample));
-//	return data;
+
     return (uint8_t*)_data + start_sample * _channel_num + index * (_channel_num != 1);
 }
 
diff --git a/DSView/pv/data/dsosnapshot.h b/DSView/pv/data/dsosnapshot.h
index aa19cca5..f9586efe 100755
--- a/DSView/pv/data/dsosnapshot.h
+++ b/DSView/pv/data/dsosnapshot.h
@@ -25,6 +25,7 @@
 
 #include <utility>
 #include <vector>
+#include <map>
 
 #include <libsigrok4DSL/libsigrok.h>
 #include "snapshot.h"
@@ -74,6 +75,9 @@ private:
 
     static const int VrmsScaleFactor;
 
+private:
+    void init_all();
+
 public:
     DsoSnapshot();
 
@@ -88,7 +92,7 @@ public:
     void append_payload(const sr_datafeed_dso &dso);
 
     const uint8_t* get_samples(int64_t start_sample,
-        int64_t end_sample, uint16_t index) const;
+        int64_t end_sample, uint16_t index);
 
 	void get_envelope_section(EnvelopeSection &s,
         uint64_t start, uint64_t end, float min_length, int probe_index) const;
diff --git a/DSView/pv/data/group.cpp b/DSView/pv/data/group.cpp
index a9ee2cbe..41329f82 100755
--- a/DSView/pv/data/group.cpp
+++ b/DSView/pv/data/group.cpp
@@ -21,8 +21,7 @@
 
 #include "group.h"
 #include "groupsnapshot.h"
-
-#include <boost/foreach.hpp>
+ 
 
 using namespace boost;
 using namespace std;
@@ -47,13 +46,13 @@ deque< boost::shared_ptr<GroupSnapshot> >& Group::get_snapshots()
 
 void Group::clear()
 {
-    BOOST_FOREACH(const boost::shared_ptr<GroupSnapshot> s, _snapshots)
+    for(auto &s : _snapshots)
         s->clear();
 }
 
 void Group::init()
 {
-    BOOST_FOREACH(const boost::shared_ptr<GroupSnapshot> s, _snapshots)
+    for(auto &s : _snapshots)
         s->init();
 }
 
diff --git a/DSView/pv/data/groupsnapshot.cpp b/DSView/pv/data/groupsnapshot.cpp
index ae6b6cb3..3c5f25ee 100755
--- a/DSView/pv/data/groupsnapshot.cpp
+++ b/DSView/pv/data/groupsnapshot.cpp
@@ -27,8 +27,7 @@
 #include <math.h>
 
 #include <algorithm>
-
-#include <boost/foreach.hpp>
+ 
 
 #include "logicsnapshot.h"
 #include "groupsnapshot.h"
@@ -53,7 +52,7 @@ GroupSnapshot::GroupSnapshot(const boost::shared_ptr<LogicSnapshot> &_logic_snap
 {
     assert(_logic_snapshot);
 
-    //boost::lock_guard<boost::recursive_mutex> lock(_mutex);
+   
 	memset(_envelope_levels, 0, sizeof(_envelope_levels));
     _data = _logic_snapshot->get_data();
     _sample_count = _logic_snapshot->get_sample_count();
@@ -94,9 +93,8 @@ GroupSnapshot::GroupSnapshot(const boost::shared_ptr<LogicSnapshot> &_logic_snap
 }
 
 GroupSnapshot::~GroupSnapshot()
-{
-    //boost::lock_guard<boost::recursive_mutex> lock(_mutex);
-	BOOST_FOREACH(Envelope &e, _envelope_levels)
+{ 
+	for(auto &e : _envelope_levels)
 		free(e.samples);
 }
 
@@ -111,16 +109,13 @@ void GroupSnapshot::clear()
 }
 
 uint64_t GroupSnapshot::get_sample_count() const
-{
-    //boost::lock_guard<boost::recursive_mutex> lock(_mutex);
+{ 
     return _sample_count;
 }
 
 void GroupSnapshot::append_payload()
 {
-    //boost::lock_guard<boost::recursive_mutex> lock(_mutex);
-
-	// Generate the first mip-map from the data
+    
 	append_payload_to_envelope_levels();
 }
 
@@ -134,13 +129,10 @@ const uint16_t* GroupSnapshot::get_samples(
 	assert(start_sample <= end_sample);
 
     int64_t i;
-    uint16_t tmpl, tmpr;
-    //boost::lock_guard<boost::recursive_mutex> lock(_mutex);
+    uint16_t tmpl, tmpr; 
 
     uint16_t *const data = new uint16_t[end_sample - start_sample];
-//    memcpy(data, (uint16_t*)_data + start_sample, sizeof(uint16_t) *
-//		(end_sample - start_sample));
-//    memset(data, 0, sizeof(uint16_t) * (end_sample - start_sample));
+ 
     for(i = start_sample; i < end_sample; i++) {
         if (_unit_size == 2)
             tmpl = *((uint16_t*)_data + i) & _mask;
@@ -163,8 +155,7 @@ void GroupSnapshot::get_envelope_section(EnvelopeSection &s,
     assert(end <= _sample_count);
 	assert(start <= end);
 	assert(min_length > 0);
-
-    //boost::lock_guard<boost::recursive_mutex> lock(_mutex);
+ 
 
 	const unsigned int min_level = max((int)floorf(logf(min_length) /
 		LogEnvelopeScaleFactor) - 1, 0);
diff --git a/DSView/pv/data/groupsnapshot.h b/DSView/pv/data/groupsnapshot.h
index 4d87b001..fbd7095e 100755
--- a/DSView/pv/data/groupsnapshot.h
+++ b/DSView/pv/data/groupsnapshot.h
@@ -23,7 +23,7 @@
 #ifndef DSVIEW_PV_DATA_GROUPSNAPSHOT_H
 #define DSVIEW_PV_DATA_GROUPSNAPSHOT_H
 
-#include <boost/thread.hpp>
+ 
 #include <boost/shared_ptr.hpp>
 
 #include "../view/signal.h"
@@ -99,7 +99,7 @@ private:
 
 private:
 	struct Envelope _envelope_levels[ScaleStepCount];
-    //mutable boost::recursive_mutex _mutex;
+  
     const void *_data;
     uint64_t _sample_count;
     int _unit_size;
diff --git a/DSView/pv/data/logic.cpp b/DSView/pv/data/logic.cpp
index 9797b214..d2597125 100755
--- a/DSView/pv/data/logic.cpp
+++ b/DSView/pv/data/logic.cpp
@@ -22,9 +22,7 @@
 
 #include "logic.h"
 #include "logicsnapshot.h"
-
-#include <boost/foreach.hpp>
-
+ 
 using namespace boost;
 using namespace std;
 
@@ -50,14 +48,14 @@ deque< boost::shared_ptr<LogicSnapshot> >& Logic::get_snapshots()
 void Logic::clear()
 {
     //_snapshots.clear();
-    BOOST_FOREACH(const boost::shared_ptr<LogicSnapshot> s, _snapshots)
+    for(auto &s : _snapshots)
         s->clear();
 }
 
 void Logic::init()
 {
     //_snapshots.clear();
-    BOOST_FOREACH(const boost::shared_ptr<LogicSnapshot> s, _snapshots)
+    for(auto &s : _snapshots)
         s->init();
 }
 
diff --git a/DSView/pv/data/logicsnapshot.cpp b/DSView/pv/data/logicsnapshot.cpp
index 2dd3027e..025422ba 100755
--- a/DSView/pv/data/logicsnapshot.cpp
+++ b/DSView/pv/data/logicsnapshot.cpp
@@ -28,12 +28,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
-
-#include <boost/foreach.hpp>
-
+ 
 #include "logicsnapshot.h"
 
-using namespace boost;
 using namespace std;
 
 namespace pv {
@@ -80,8 +77,13 @@ void LogicSnapshot::free_data()
 
 void LogicSnapshot::init()
 {
-    boost::lock_guard<boost::recursive_mutex> lock(_mutex);
-    _sample_count = 0;
+    std::lock_guard<std::mutex> lock(_mutex);
+    init_all(); 
+}
+
+void LogicSnapshot::init_all()
+{
+   _sample_count = 0;
     _ring_sample_count = 0;
     _block_num = 0;
     _byte_fraction = 0;
@@ -95,9 +97,9 @@ void LogicSnapshot::init()
 
 void LogicSnapshot::clear()
 {
-    boost::lock_guard<boost::recursive_mutex> lock(_mutex);
+    std::lock_guard<std::mutex> lock(_mutex);
     free_data();
-    init();
+    init_all();
 }
 
 void LogicSnapshot::capture_ended()
@@ -203,7 +205,7 @@ void LogicSnapshot::first_payload(const sr_datafeed_logic &logic, uint64_t total
 void LogicSnapshot::append_payload(
 	const sr_datafeed_logic &logic)
 {
-    boost::lock_guard<boost::recursive_mutex> lock(_mutex);
+   std::lock_guard<std::mutex> lock(_mutex);
 
     if (logic.format == LA_CROSS_DATA)
         append_cross_payload(logic);
diff --git a/DSView/pv/data/logicsnapshot.h b/DSView/pv/data/logicsnapshot.h
index bfbf0b78..34bcc13c 100755
--- a/DSView/pv/data/logicsnapshot.h
+++ b/DSView/pv/data/logicsnapshot.h
@@ -32,6 +32,7 @@
 
 #include <utility>
 #include <vector>
+#include <map>
 
 namespace LogicSnapshotTest {
 class Pow2;
@@ -76,13 +77,19 @@ private:
 public:
     typedef std::pair<uint64_t, bool> EdgePair;
 
+private:
+    void init_all();
+
 public:
     LogicSnapshot();
 
 	virtual ~LogicSnapshot();
+
     void free_data();
+
     void clear();
-    void init();
+
+    void init();   
 
     void first_payload(const sr_datafeed_logic &logic, uint64_t total_sample_count, GSList *channels);
 
diff --git a/DSView/pv/data/mathstack.cpp b/DSView/pv/data/mathstack.cpp
index 072d0dfe..e584d392 100755
--- a/DSView/pv/data/mathstack.cpp
+++ b/DSView/pv/data/mathstack.cpp
@@ -19,10 +19,7 @@
  */
 
 #include "mathstack.h"
-
-#include <boost/foreach.hpp>
-#include <boost/thread/thread.hpp>
-
+ 
 #include <pv/data/dso.h>
 #include <pv/data/dsosnapshot.h>
 #include <pv/sigsession.h>
@@ -100,7 +97,7 @@ MathStack::~MathStack()
 
 void MathStack::free_envelop()
 {
-    BOOST_FOREACH(Envelope &e, _envelope_level) {
+    for(auto &e : _envelope_level) {
         if (e.samples)
             free(e.samples);
     }
@@ -109,12 +106,12 @@ void MathStack::free_envelop()
 
 void MathStack::clear()
 {
-    boost::lock_guard<boost::recursive_mutex> lock(_mutex);
+    std::lock_guard<std::mutex> lock(_mutex);
 }
 
 void MathStack::init()
 {
-    boost::lock_guard<boost::recursive_mutex> lock(_mutex);
+    std::lock_guard<std::mutex> lock(_mutex);
 
     _sample_num = 0;
     _envelope_done = false;
@@ -315,7 +312,7 @@ void MathStack::get_math_envelope_section(EnvelopeSection &s,
 
 void MathStack::calc_math()
 {
-    boost::lock_guard<boost::recursive_mutex> lock(_mutex);
+    std::lock_guard<std::mutex> lock(_mutex);
 
     _math_state = Running;
 
diff --git a/DSView/pv/data/mathstack.h b/DSView/pv/data/mathstack.h
index 7f6f9844..e0c1a97c 100755
--- a/DSView/pv/data/mathstack.h
+++ b/DSView/pv/data/mathstack.h
@@ -27,7 +27,7 @@
 
 #include <boost/optional.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/thread.hpp>
+ 
 
 #include <QObject>
 #include <QString>
diff --git a/DSView/pv/data/signaldata.h b/DSView/pv/data/signaldata.h
index 76f9588a..f3269421 100755
--- a/DSView/pv/data/signaldata.h
+++ b/DSView/pv/data/signaldata.h
@@ -25,7 +25,7 @@
 #define DSVIEW_PV_DATA_SIGNALDATA_H
 
 #include <stdint.h>
-#include <boost/thread.hpp>
+#include <mutex>
 
 namespace pv {
 namespace data {
@@ -45,7 +45,7 @@ public:
     virtual void init() = 0;
 
 protected:
-    mutable boost::recursive_mutex _mutex;
+    mutable std::mutex _mutex;
     double _samplerate;
 };
 
diff --git a/DSView/pv/data/snapshot.cpp b/DSView/pv/data/snapshot.cpp
index 50a094d0..2e50fc2c 100755
--- a/DSView/pv/data/snapshot.cpp
+++ b/DSView/pv/data/snapshot.cpp
@@ -28,9 +28,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-
-using namespace boost;
-
+ 
 namespace pv {
 namespace data {
 
@@ -91,13 +89,13 @@ void Snapshot::set_last_ended(bool ended)
 
 uint64_t Snapshot::get_sample_count() const
 {
-    boost::lock_guard<boost::recursive_mutex> lock(_mutex);
+    std::lock_guard<std::mutex> lock(_mutex);
     return _sample_count;
 }
 
 uint64_t Snapshot::get_ring_start() const
 {
-    boost::lock_guard<boost::recursive_mutex> lock(_mutex);
+    std::lock_guard<std::mutex> lock(_mutex);
     if (_sample_count < _total_sample_count)
         return 0;
     else
@@ -106,7 +104,7 @@ uint64_t Snapshot::get_ring_start() const
 
 uint64_t Snapshot::get_ring_end() const
 {
-    boost::lock_guard<boost::recursive_mutex> lock(_mutex);
+    std::lock_guard<std::mutex> lock(_mutex);
     if (_sample_count == 0)
         return 0;
     else if (_ring_sample_count == 0)
diff --git a/DSView/pv/data/snapshot.h b/DSView/pv/data/snapshot.h
index 5ea70a9a..e8a43588 100755
--- a/DSView/pv/data/snapshot.h
+++ b/DSView/pv/data/snapshot.h
@@ -23,7 +23,8 @@
 #ifndef DSVIEW_PV_DATA_SNAPSHOT_H
 #define DSVIEW_PV_DATA_SNAPSHOT_H
 
-#include <boost/thread.hpp>
+#include <mutex>
+#include <vector>
 
 namespace pv {
 namespace data {
@@ -64,11 +65,11 @@ protected:
     virtual void free_data();
 
 protected:
-    mutable boost::recursive_mutex _mutex;
+     mutable std::mutex  _mutex;
 
     //std::vector<uint8_t> _data;
     void* _data;
-    std::vector<uint16_t> _ch_index;
+    mutable std::vector<uint16_t> _ch_index;
 
     uint64_t _capacity;
     unsigned int _channel_num;
diff --git a/DSView/pv/data/spectrumstack.cpp b/DSView/pv/data/spectrumstack.cpp
index b54bddff..7a96f308 100755
--- a/DSView/pv/data/spectrumstack.cpp
+++ b/DSView/pv/data/spectrumstack.cpp
@@ -19,10 +19,7 @@
  */
 
 #include "spectrumstack.h"
-
-#include <boost/foreach.hpp>
-#include <boost/thread/thread.hpp>
-
+ 
 #include <pv/data/dso.h>
 #include <pv/data/dsosnapshot.h>
 #include <pv/sigsession.h>
@@ -173,7 +170,8 @@ void SpectrumStack::calc_fft()
     // Get the dso data
     boost::shared_ptr<pv::data::Dso> data;
     boost::shared_ptr<pv::view::DsoSignal> dsoSig;
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
+
+    for(auto &s : _session->get_signals()) {
         if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
             if (dsoSig->get_index() == _index && dsoSig->enabled()) {
                 data = dsoSig->dso_data();
diff --git a/DSView/pv/data/spectrumstack.h b/DSView/pv/data/spectrumstack.h
index 82440595..aff91060 100755
--- a/DSView/pv/data/spectrumstack.h
+++ b/DSView/pv/data/spectrumstack.h
@@ -27,8 +27,7 @@
 
 #include <boost/optional.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/thread.hpp>
-
+  
 #include <fftw3.h>
 
 #include <QObject>
diff --git a/DSView/pv/device/sessionfile.cpp b/DSView/pv/device/sessionfile.cpp
index 2ce80e7e..7f879565 100755
--- a/DSView/pv/device/sessionfile.cpp
+++ b/DSView/pv/device/sessionfile.cpp
@@ -59,10 +59,9 @@ void SessionFile::use(SigSession *owner)
 
 void SessionFile::release()
 {
-	if (!_owner)
+    if (!_owner || !_sdi)
 		return;
 
-	assert(_sdi);
 	File::release();
 	sr_dev_close(_sdi);
 	sr_dev_clear(_sdi->driver);
diff --git a/DSView/pv/devicemanager.cpp b/DSView/pv/devicemanager.cpp
index 488d3e61..51a4a128 100755
--- a/DSView/pv/devicemanager.cpp
+++ b/DSView/pv/devicemanager.cpp
@@ -90,11 +90,11 @@ void DeviceManager::del_device(DevInst *device)
     }
 }
 
-std::list<DevInst*>& DeviceManager::driver_scan(
-	struct sr_dev_driver *const driver, GSList *const drvopts)
-{
-    list<DevInst*> driver_devices;
-
+void DeviceManager::driver_scan(
+    std::list<DevInst*> &driver_devices,
+	struct sr_dev_driver *const driver, 
+    GSList *const drvopts)
+{  
 	assert(driver);
 
 	// Remove any device instances from this driver from the device
@@ -118,7 +118,7 @@ std::list<DevInst*>& DeviceManager::driver_scan(
     if (strncmp(driver->name, "virtual", 7)) {
         QDir dir(DS_RES_PATH);
         if (!dir.exists())
-            return driver_devices;
+            return;
     }
 
 	// Do the scan
@@ -133,8 +133,6 @@ std::list<DevInst*>& DeviceManager::driver_scan(
 
 	// append the scanned devices to the main list
 	_devices.insert(_devices.end(), driver_devices.begin(), driver_devices.end());
-
-	return driver_devices;
 }
 
 void DeviceManager::init_drivers()
@@ -167,8 +165,10 @@ void DeviceManager::scan_all_drivers()
 {
 	// Scan all drivers for all devices.
 	struct sr_dev_driver **const drivers = sr_driver_list();
-	for (struct sr_dev_driver **driver = drivers; *driver; driver++)
-		driver_scan(*driver);
+    for (struct sr_dev_driver **driver = drivers; *driver; driver++){
+        std::list<DevInst*> driver_devices;
+        driver_scan(driver_devices, *driver);
+    }
 }
 
 void DeviceManager::release_driver(struct sr_dev_driver *const driver)
diff --git a/DSView/pv/devicemanager.h b/DSView/pv/devicemanager.h
index b275b69b..4862a455 100755
--- a/DSView/pv/devicemanager.h
+++ b/DSView/pv/devicemanager.h
@@ -30,8 +30,7 @@
 #include <map>
 #include <string>
 
-#include <boost/function.hpp> 
-#include <boost/thread.hpp>
+#include <boost/function.hpp>  
 
 #include <QObject>
 #include <QString>
@@ -69,7 +68,10 @@ public:
     void add_device(DevInst *device);
     void del_device(DevInst *device);
 
-    std::list<DevInst*>& driver_scan(struct sr_dev_driver *const driver, GSList *const drvopts = NULL);
+    void driver_scan(
+                std::list<DevInst*> &driver_devices,
+	            struct sr_dev_driver *const driver=NULL, 
+                GSList *const drvopts=NULL);
 
     void initAll(struct sr_context *sr_ctx);
 
diff --git a/DSView/pv/dialogs/calibration.cpp b/DSView/pv/dialogs/calibration.cpp
index 2a5b0a8a..7bc0771a 100755
--- a/DSView/pv/dialogs/calibration.cpp
+++ b/DSView/pv/dialogs/calibration.cpp
@@ -20,9 +20,7 @@
  */
 
 #include "calibration.h"
-
-#include <boost/foreach.hpp>
-
+  
 #include <QGridLayout>
 #include <QFuture>
 #include <QProgressDialog>
diff --git a/DSView/pv/dialogs/deviceoptions.cpp b/DSView/pv/dialogs/deviceoptions.cpp
index bfa6fe25..d8a4b392 100755
--- a/DSView/pv/dialogs/deviceoptions.cpp
+++ b/DSView/pv/dialogs/deviceoptions.cpp
@@ -21,9 +21,7 @@
  */
 
 #include "deviceoptions.h"
-
-#include <boost/foreach.hpp>
-
+ 
 #include <QListWidget>
 #include <QSpinBox>
 #include <QDoubleSpinBox>
@@ -94,7 +92,7 @@ void DeviceOptions::accept()
 	// Commit the properties
     const vector< boost::shared_ptr<pv::prop::Property> > &dev_props =
 		_device_options_binding.properties();
-    BOOST_FOREACH(boost::shared_ptr<pv::prop::Property> p, dev_props) {
+    for(auto &p : dev_props) {
 		assert(p);
 		p->commit();
 	}
@@ -120,7 +118,7 @@ void DeviceOptions::accept()
         while(i != _probe_options_binding_list.end()) {
             const vector< boost::shared_ptr<pv::prop::Property> > &probe_props =
                     (*i)->properties();
-            BOOST_FOREACH(boost::shared_ptr<pv::prop::Property> p, probe_props) {
+            for(auto &p :probe_props) {
                 assert(p);
                 p->commit();
             }
@@ -153,7 +151,7 @@ QGridLayout * DeviceOptions::get_property_form(QWidget * parent)
 	const vector< boost::shared_ptr<pv::prop::Property> > &properties =
 		_device_options_binding.properties();
     int i = 0;
-    BOOST_FOREACH(boost::shared_ptr<pv::prop::Property> p, properties)
+    for(auto &p : properties)
 	{
 		assert(p);
         const QString label = p->labeled_widget() ? QString() : p->label();
@@ -527,7 +525,8 @@ void DeviceOptions::analog_probes(QGridLayout &layout)
         const vector< boost::shared_ptr<pv::prop::Property> > &properties =
             probe_options_binding->properties();
         int i = 1;
-        BOOST_FOREACH(boost::shared_ptr<pv::prop::Property> p, properties)
+        
+        for(auto &p : properties)
         {
             assert(p);
             const QString label = p->labeled_widget() ? QString() : p->label();
diff --git a/DSView/pv/dialogs/dsomeasure.cpp b/DSView/pv/dialogs/dsomeasure.cpp
index c5f97510..46ef2896 100755
--- a/DSView/pv/dialogs/dsomeasure.cpp
+++ b/DSView/pv/dialogs/dsomeasure.cpp
@@ -29,8 +29,7 @@
 #include <QLabel>
 #include <QTabBar>
 #include <QBitmap>
-
-#include <boost/foreach.hpp>
+ 
 #include "../dsvdef.h"
 
 using namespace boost;
@@ -57,7 +56,7 @@ DsoMeasure::DsoMeasure(SigSession *session, View &parent,
     _measure_tab->setTabPosition(QTabWidget::West);
     _measure_tab->setUsesScrollButtons(false);
 
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
+    for(auto &s : _session->get_signals()) {
         boost::shared_ptr<view::DsoSignal> dsoSig;
         if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s)) && dsoSig->enabled()) {
             QWidget *measure_widget = new QWidget(this);
@@ -158,7 +157,8 @@ void DsoMeasure::accept()
     if(sc != NULL) {
         QVariant id = sc->property("id");
         enum DSO_MEASURE_TYPE ms_type = DSO_MEASURE_TYPE(id.toInt());
-        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
+        
+        for(auto &s : _session->get_signals()) {
             boost::shared_ptr<view::DsoSignal> dsoSig;
             if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
                 if (_measure_tab->currentWidget()->property("index").toInt() == dsoSig->get_index()) {
diff --git a/DSView/pv/dialogs/fftoptions.cpp b/DSView/pv/dialogs/fftoptions.cpp
index 5af442e7..fe53c54f 100755
--- a/DSView/pv/dialogs/fftoptions.cpp
+++ b/DSView/pv/dialogs/fftoptions.cpp
@@ -21,8 +21,7 @@
 
 #include "fftoptions.h"
 
-#include <boost/foreach.hpp>
-
+  
 #include <QFormLayout>
 #include <QListWidget>
 
@@ -67,7 +66,7 @@ FftOptions::FftOptions(QWidget *parent, SigSession *session) :
     _dbv_combobox = new QComboBox(this);
 
     // setup _ch_combobox
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
+    for(auto &s : _session->get_signals()) {
         boost::shared_ptr<view::DsoSignal> dsoSig;
         if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
             _ch_combobox->addItem(dsoSig->get_name(), QVariant::fromValue(dsoSig->get_index()));
@@ -87,7 +86,8 @@ FftOptions::FftOptions(QWidget *parent, SigSession *session) :
     std::vector<uint64_t> length;
     std::vector<QString> view_modes;
     std::vector<int> dbv_ranges;
-    BOOST_FOREACH(const boost::shared_ptr<view::Trace> t, _session->get_spectrum_traces()) {
+
+    for(auto &t : _session->get_spectrum_traces()) {
         boost::shared_ptr<view::SpectrumTrace> spectrumTraces;
         if ((spectrumTraces = dynamic_pointer_cast<view::SpectrumTrace>(t))) {
             windows = spectrumTraces->get_spectrum_stack()->get_windows_support();
@@ -137,7 +137,7 @@ FftOptions::FftOptions(QWidget *parent, SigSession *session) :
     }
 
     // load current settings
-    BOOST_FOREACH(const boost::shared_ptr<view::Trace> t, _session->get_spectrum_traces()) {
+    for(auto &t : _session->get_spectrum_traces()) {
         boost::shared_ptr<view::SpectrumTrace> spectrumTraces;
         if ((spectrumTraces = dynamic_pointer_cast<view::SpectrumTrace>(t))) {
             if (spectrumTraces->enabled()) {
@@ -230,7 +230,7 @@ void FftOptions::accept()
 
     QDialog::accept();
 
-    BOOST_FOREACH(const boost::shared_ptr<view::Trace> t, _session->get_spectrum_traces()) {
+   for(auto &t : _session->get_spectrum_traces()) {
         boost::shared_ptr<view::SpectrumTrace> spectrumTraces;
         if ((spectrumTraces = dynamic_pointer_cast<view::SpectrumTrace>(t))) {
             spectrumTraces->set_enable(false);
diff --git a/DSView/pv/dialogs/lissajousoptions.cpp b/DSView/pv/dialogs/lissajousoptions.cpp
index aa5d53f1..589ec4d4 100755
--- a/DSView/pv/dialogs/lissajousoptions.cpp
+++ b/DSView/pv/dialogs/lissajousoptions.cpp
@@ -31,9 +31,7 @@
 #include <QTabBar>
 #include <QBitmap>
 
-#include <boost/foreach.hpp>
-
-
+  
 using namespace boost;
 using namespace std;
 using namespace pv::view;
@@ -74,7 +72,8 @@ LissajousOptions::LissajousOptions(SigSession *session, QWidget *parent) :
     _y_group = new QGroupBox(this);
     QHBoxLayout *xlayout = new QHBoxLayout();
     QHBoxLayout *ylayout = new QHBoxLayout();
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
+
+    for(auto &s : _session->get_signals()) {
         boost::shared_ptr<view::DsoSignal> dsoSig;
         if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
             QString index_str = QString::number(dsoSig->get_index());
@@ -182,7 +181,7 @@ void LissajousOptions::accept()
     bool enable = (xindex != -1 && yindex != -1 && _enable->isChecked());
     _session->lissajous_rebuild(enable, xindex, yindex, _percent->value());
 
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
+    for(auto &s : _session->get_signals()) {
         boost::shared_ptr<view::DsoSignal> dsoSig;
         if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
             dsoSig->set_show(!enable);
diff --git a/DSView/pv/dialogs/mathoptions.cpp b/DSView/pv/dialogs/mathoptions.cpp
index 95111fa5..d7c9e4bb 100755
--- a/DSView/pv/dialogs/mathoptions.cpp
+++ b/DSView/pv/dialogs/mathoptions.cpp
@@ -31,8 +31,7 @@
 #include <QLabel>
 #include <QTabBar>
 #include <QBitmap>
-
-#include <boost/foreach.hpp>
+  
 
 using namespace boost;
 using namespace std;
@@ -78,7 +77,8 @@ MathOptions::MathOptions(SigSession *session, QWidget *parent) :
     _src2_group = new QGroupBox(this);
     QHBoxLayout *src1_layout = new QHBoxLayout();
     QHBoxLayout *src2_layout = new QHBoxLayout();
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
+
+    for(auto &s : _session->get_signals()) {
         boost::shared_ptr<view::DsoSignal> dsoSig;
         if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
             QString index_str = QString::number(dsoSig->get_index());
@@ -206,7 +206,8 @@ void MathOptions::accept()
     bool enable = (src1 != -1 && src2 != -1 && _enable->isChecked());
     boost::shared_ptr<view::DsoSignal> dsoSig1;
     boost::shared_ptr<view::DsoSignal> dsoSig2;
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
+
+    for(auto &s : _session->get_signals()) {
         boost::shared_ptr<view::DsoSignal> dsoSig;
         if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
             if (dsoSig->get_index() == src1)
diff --git a/DSView/pv/dialogs/protocolexp.cpp b/DSView/pv/dialogs/protocolexp.cpp
index d526a998..f594c6a9 100755
--- a/DSView/pv/dialogs/protocolexp.cpp
+++ b/DSView/pv/dialogs/protocolexp.cpp
@@ -20,9 +20,7 @@
  */
 
 #include "protocolexp.h"
-
-#include <boost/foreach.hpp>
- 
+  
 #include <QFormLayout>
 #include <QListWidget>
 #include <QFile>
@@ -192,7 +190,7 @@ void ProtocolExp::accept()
                 decoder_stack->get_annotation_subset(annotations, row,
                     0, decoder_stack->sample_count()-1);
                 if (!annotations.empty()) {
-                    BOOST_FOREACH(const Annotation &a, annotations) {
+                    for(auto &a : annotations) {
                         out << QString("%1,%2,%3\n")
                                .arg(QString::number(exported))
                                .arg(QString::number(a.start_sample()*ns_per_sample, 'f', 20))
diff --git a/DSView/pv/dialogs/protocollist.cpp b/DSView/pv/dialogs/protocollist.cpp
index 3b2599af..53b46b30 100755
--- a/DSView/pv/dialogs/protocollist.cpp
+++ b/DSView/pv/dialogs/protocollist.cpp
@@ -20,8 +20,7 @@
  */
 
 #include "protocollist.h"
-
-#include <boost/foreach.hpp>
+ 
 
 #include <QFormLayout>
 #include <QListWidget>
@@ -60,7 +59,8 @@ ProtocolList::ProtocolList(QWidget *parent, SigSession *session) :
     const std::vector< boost::shared_ptr<pv::view::DecodeTrace> > decode_sigs(
         _session->get_decode_signals());
     int index = 0;
-    BOOST_FOREACH(boost::shared_ptr<pv::view::DecodeTrace> d, decode_sigs) {
+
+    for(auto &d : decode_sigs) {
         _protocol_combobox->addItem(d->get_name());
         if (decoder_model->getDecoderStack() == d->decoder())
             _protocol_combobox->setCurrentIndex(index);
@@ -130,7 +130,8 @@ void ProtocolList::set_protocol(int index)
     const std::vector< boost::shared_ptr<pv::view::DecodeTrace> > decode_sigs(
         _session->get_decode_signals());
     int cur_index = 0;
-    BOOST_FOREACH(boost::shared_ptr<pv::view::DecodeTrace> d, decode_sigs) {
+
+    for(auto &d : decode_sigs) {
         if (index == cur_index) {
             decoder_stack = d->decoder();
             break;
@@ -172,7 +173,8 @@ void ProtocolList::on_row_check(bool show)
     const std::vector< boost::shared_ptr<pv::view::DecodeTrace> > decode_sigs(
         _session->get_decode_signals());
     int cur_index = 0;
-    BOOST_FOREACH(boost::shared_ptr<pv::view::DecodeTrace> d, decode_sigs) {
+
+    for(auto &d : decode_sigs) {
         if (cur_index == _protocol_combobox->currentIndex()) {
             decoder_stack = d->decoder();
             break;
diff --git a/DSView/pv/dialogs/regionoptions.cpp b/DSView/pv/dialogs/regionoptions.cpp
index 12853c1d..62ff127a 100755
--- a/DSView/pv/dialogs/regionoptions.cpp
+++ b/DSView/pv/dialogs/regionoptions.cpp
@@ -20,9 +20,7 @@
  */
 
 #include "regionoptions.h"
-
-#include <boost/foreach.hpp>
-
+ 
 #include "../sigsession.h"
 #include "../view/cursor.h"
 #include "../view/view.h"
diff --git a/DSView/pv/dialogs/search.cpp b/DSView/pv/dialogs/search.cpp
index 74568d7f..26744536 100755
--- a/DSView/pv/dialogs/search.cpp
+++ b/DSView/pv/dialogs/search.cpp
@@ -24,8 +24,7 @@
 
 #include <assert.h>
 #include <QRegExpValidator>
-
-#include <boost/foreach.hpp>
+ 
 
 namespace pv {
 namespace dialogs {
@@ -50,8 +49,8 @@ Search::Search(QWidget *parent, SigSession *session, std::map<uint16_t, QString>
     search_layout->setVerticalSpacing(0);
 
     int index = 0;
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> sig,
-                  _session->get_signals()) {
+
+    for(auto &sig :  _session->get_signals()) {
         assert(sig);
         boost::shared_ptr<view::LogicSignal> logic_sig;
         if ((logic_sig = boost::dynamic_pointer_cast<view::LogicSignal>(sig))) {
@@ -111,8 +110,7 @@ std::map<uint16_t, QString> Search::get_pattern()
     std::map<uint16_t, QString> pattern;
 
     int index = 0;
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> sig,
-                  _session->get_signals()) {
+    for(auto &sig :_session->get_signals()) {
         assert(sig);
         boost::shared_ptr<view::LogicSignal> logic_sig;
         if ((logic_sig = boost::dynamic_pointer_cast<view::LogicSignal>(sig))) {
diff --git a/DSView/pv/dialogs/waitingdialog.cpp b/DSView/pv/dialogs/waitingdialog.cpp
index 6272227c..b206912b 100755
--- a/DSView/pv/dialogs/waitingdialog.cpp
+++ b/DSView/pv/dialogs/waitingdialog.cpp
@@ -20,8 +20,7 @@
  */
 
 #include "waitingdialog.h"
-
-#include <boost/foreach.hpp>
+ 
 
 #include <QMovie>
 #include <QAbstractButton>
@@ -186,12 +185,13 @@ void WaitingDialog::changeText()
                     g_variant_unref(gvar);
                     if (zero_fgain) {
                         boost::shared_ptr<view::DsoSignal> dsoSig;
-                        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals())
+                        
+                        for(auto &s : _session->get_signals())
                         {
                             if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s)))
                                 dsoSig->set_enable(dsoSig->get_index() == 0);
                         }
-                        boost::this_thread::sleep(boost::posix_time::millisec(100));
+                        std::this_thread::sleep_for(std::chrono::milliseconds(100));
                         _dev_inst->set_config(NULL, NULL, SR_CONF_ZERO_COMB, g_variant_new_boolean(true));
                     }
                 }
diff --git a/DSView/pv/dock/dsotriggerdock.cpp b/DSView/pv/dock/dsotriggerdock.cpp
index d11e961c..c859f824 100755
--- a/DSView/pv/dock/dsotriggerdock.cpp
+++ b/DSView/pv/dock/dsotriggerdock.cpp
@@ -26,7 +26,7 @@
 #include "../view/dsosignal.h"
 
 #include <boost/shared_ptr.hpp>
-#include <boost/foreach.hpp>
+ 
 
 #include <QObject>
 #include <QLabel>
@@ -387,7 +387,8 @@ void DsoTriggerDock::init()
     // setup _channel_comboBox
     disconnect(_channel_comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(channel_changed(int)));
     _channel_comboBox->clear();
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
+    
+    for(auto &s : _session->get_signals()) {
         boost::shared_ptr<view::DsoSignal> dsoSig;
         if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
             _channel_comboBox->addItem(dsoSig->get_name(), QVariant::fromValue(dsoSig->get_index()));
diff --git a/DSView/pv/dock/protocoldock.cpp b/DSView/pv/dock/protocoldock.cpp
index 48e04900..a35374ab 100755
--- a/DSView/pv/dock/protocoldock.cpp
+++ b/DSView/pv/dock/protocoldock.cpp
@@ -45,7 +45,7 @@
 #include <QSizePolicy>
 #include <assert.h>
 
-#include <boost/foreach.hpp>
+ 
 #include <boost/shared_ptr.hpp>
 #include <algorithm>
 #include "../ui/msgbox.h"
@@ -377,7 +377,7 @@ void ProtocolDock::decoded_progress(int progress)
         _session->get_decode_signals());
     int index = 0;
 
-    BOOST_FOREACH(boost::shared_ptr<pv::view::DecodeTrace> d, decode_sigs) {
+    for(auto &d : decode_sigs) {
         pg = d->get_progress();
         if (d->decoder()->out_of_memory())
             err = tr("(Out of Memory)");
@@ -416,7 +416,8 @@ void ProtocolDock::set_model()
     // clear mark_index of all DecoderStacks
     const std::vector< boost::shared_ptr<pv::view::DecodeTrace> > decode_sigs(
         _session->get_decode_signals());
-    BOOST_FOREACH(boost::shared_ptr<pv::view::DecodeTrace> d, decode_sigs) {
+        
+    for(auto &d : decode_sigs) {
         d->decoder()->set_mark_index(-1);
     }
 }
@@ -432,7 +433,7 @@ void ProtocolDock::update_model()
         decoder_model->setDecoderStack(decode_sigs.at(0)->decoder());
     else {
         unsigned int index = 0;
-        BOOST_FOREACH(const boost::shared_ptr<pv::view::DecodeTrace> d, decode_sigs) {
+        for(auto &d : decode_sigs) {
             if (d->decoder() == decoder_model->getDecoderStack()) {
                 decoder_model->setDecoderStack(d->decoder());
                 break;
@@ -473,9 +474,11 @@ void ProtocolDock::item_clicked(const QModelIndex &index)
         if (decoder_stack->list_annotation(ann, index.column(), index.row())) {
             const std::vector< boost::shared_ptr<pv::view::DecodeTrace> > decode_sigs(
                 _session->get_decode_signals());
-            BOOST_FOREACH(boost::shared_ptr<pv::view::DecodeTrace> d, decode_sigs) {
+
+            for(auto &d : decode_sigs) {
                 d->decoder()->set_mark_index(-1);
             }
+
             decoder_stack->set_mark_index((ann.start_sample()+ann.end_sample())/2);
             _session->show_region(ann.start_sample(), ann.end_sample(), false);
         }
@@ -566,7 +569,8 @@ void ProtocolDock::nav_table_view()
             decoder_stack->list_annotation(ann, index.column(), index.row());
             const std::vector< boost::shared_ptr<pv::view::DecodeTrace> > decode_sigs(
                 _session->get_decode_signals());
-            BOOST_FOREACH(boost::shared_ptr<pv::view::DecodeTrace> d, decode_sigs) {
+
+            for(auto &d : decode_sigs) {
                 d->decoder()->set_mark_index(-1);
             }
             decoder_stack->set_mark_index((ann.start_sample()+ann.end_sample())/2);
diff --git a/DSView/pv/dock/protocoldock.h b/DSView/pv/dock/protocoldock.h
index 1e7e9ded..b300846a 100755
--- a/DSView/pv/dock/protocoldock.h
+++ b/DSView/pv/dock/protocoldock.h
@@ -38,10 +38,12 @@
 #include <QSortFilterProxyModel>
 
 #include <vector>
-#include <boost/thread.hpp>
+#include <mutex>
 
 #include "../data/decodermodel.h"
 #include "protocolitemlayer.h"
+
+
 namespace pv {
 
 class SigSession;
@@ -140,7 +142,7 @@ private:
     QPushButton *_dn_nav_button;
     QPushButton *_search_button;
 
-    mutable boost::mutex _search_mutex;
+    mutable std::mutex _search_mutex;
     bool _search_edited;
     bool _searching;
 
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index 7cadf548..dd0372af 100755
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -27,7 +27,6 @@
 
 
 #include <boost/bind.hpp>
-#include <boost/foreach.hpp>
 #include <boost/shared_ptr.hpp>
 
 #include <QAction>
@@ -520,8 +519,12 @@ void MainWindow::device_attach()
     DeviceManager &_device_manager = _control->GetDeviceManager();
 
     for (driver = drivers; *driver; driver++)
-         if (*driver)
-          _device_manager.driver_scan(*driver);
+    {
+         if (*driver){
+            std::list<DevInst*> driver_devices;
+          _device_manager.driver_scan(driver_devices, *driver);
+        }
+    }
 
 
     _session->set_default_device(boost::bind(&MainWindow::session_error, this,
@@ -581,9 +584,12 @@ void MainWindow::device_detach_post()
     _hot_detach = false;
     struct sr_dev_driver **const drivers = sr_driver_list();
     struct sr_dev_driver **driver;
-    for (driver = drivers; *driver; driver++)
-        if (*driver)
-            _device_manager.driver_scan(*driver);
+    for (driver = drivers; *driver; driver++){
+        if (*driver){
+            std::list<DevInst*> driver_devices;
+            _device_manager.driver_scan(driver_devices, *driver);
+        }
+    }
 
     _session->set_default_device(boost::bind(&MainWindow::session_error, this,
                                             QString(tr("Set Default Device failed")), _1));
@@ -821,7 +827,7 @@ void MainWindow::commit_trigger(bool instant)
 
     if (!_trigger_widget->commit_trigger()) {
         /* simple trigger check trigger_enable */
-        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals())
+        for(auto &s : _session->get_signals())
         {
             assert(s);
             boost::shared_ptr<view::LogicSignal> logicSig;
@@ -843,7 +849,7 @@ void MainWindow::commit_trigger(bool instant)
 
             msg.exec();
             if (msg.mBox()->clickedButton() == cancelButton) {
-                BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals())
+                for(auto &s : _session->get_signals())
                 {
                     assert(s);
                     boost::shared_ptr<view::LogicSignal> logicSig;
@@ -1055,7 +1061,7 @@ bool MainWindow::load_session_json(QJsonDocument json, bool file_dev)
 
     // load signal setting
     if (file_dev && (sdi->mode == DSO)) {
-        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
+         for(auto &s :  _session->get_signals()) {
             foreach (const QJsonValue &value, sessionObj["channel"].toArray()) {
                 QJsonObject obj = value.toObject();
                 if ((strcmp(s->get_name().toStdString().c_str(), g_strdup(obj["name"].toString().toStdString().c_str())) == 0) &&
@@ -1074,7 +1080,7 @@ bool MainWindow::load_session_json(QJsonDocument json, bool file_dev)
             }
         }
     } else {
-        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
+         for(auto &s : _session->get_signals()) {
             foreach (const QJsonValue &value, sessionObj["channel"].toArray()) {
                 QJsonObject obj = value.toObject();
                 if ((s->get_index() == obj["index"].toDouble()) &&
@@ -1183,7 +1189,7 @@ bool MainWindow::on_store_session(QString name)
         }
     }
 
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
+     for(auto &s :  _session->get_signals()) {
         QJsonObject s_obj;
         s_obj["index"] = s->get_index();
         s_obj["type"] = s->get_type();
@@ -1328,7 +1334,7 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event)
             _view->zoom(-1);
             break;
         case Qt::Key_0:
-            BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, sigs) {
+             for(auto & s : sigs) {
                 boost::shared_ptr<view::DsoSignal> dsoSig;
                 if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
                     if (dsoSig->get_index() == 0)
@@ -1341,7 +1347,7 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event)
             update();
             break;
         case Qt::Key_1:
-            BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, sigs) {
+             for(auto & s : sigs) {
                 boost::shared_ptr<view::DsoSignal> dsoSig;
                 if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
                     if (dsoSig->get_index() == 1)
@@ -1354,7 +1360,7 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event)
             update();
             break;
         case Qt::Key_Up:
-            BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, sigs) {
+             for(auto &s : sigs) {
                 boost::shared_ptr<view::DsoSignal> dsoSig;
                 if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
                     if (dsoSig->get_vDialActive()) {
@@ -1366,7 +1372,7 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event)
             }
             break;
         case Qt::Key_Down:
-            BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, sigs) {
+             for(auto &s : sigs) {
                 boost::shared_ptr<view::DsoSignal> dsoSig;
                 if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
                     if (dsoSig->get_vDialActive()) {
diff --git a/DSView/pv/prop/binding/binding.cpp b/DSView/pv/prop/binding/binding.cpp
index db9a0453..78e231ba 100755
--- a/DSView/pv/prop/binding/binding.cpp
+++ b/DSView/pv/prop/binding/binding.cpp
@@ -19,8 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
-
-#include <boost/foreach.hpp>
+ 
 
 #include <QFormLayout>
 
@@ -41,7 +40,7 @@ const std::vector< boost::shared_ptr<Property> >& Binding::properties()
 
 void Binding::commit()
 {
-    BOOST_FOREACH(shared_ptr<pv::prop::Property> p, _properties) {
+    for(auto &p : _properties) {
         assert(p);
         p->commit();
     }
@@ -52,7 +51,7 @@ void Binding::add_properties_to_form(QFormLayout *layout,
 {
     assert(layout);
 
-    BOOST_FOREACH(shared_ptr<pv::prop::Property> p, _properties)
+    for(auto &p : _properties)
     {
         assert(p);
 
@@ -90,7 +89,8 @@ std::map< boost::shared_ptr<Property>,
 {
     std::map < boost::shared_ptr<Property>,
             GVariant* > pvalue;
-    BOOST_FOREACH(shared_ptr<pv::prop::Property> p, _properties)
+            
+    for(auto &p : _properties)
     {
         assert(p);
         pvalue[p] = p->get_value();
diff --git a/DSView/pv/prop/binding/decoderoptions.cpp b/DSView/pv/prop/binding/decoderoptions.cpp
index 644db938..df017534 100755
--- a/DSView/pv/prop/binding/decoderoptions.cpp
+++ b/DSView/pv/prop/binding/decoderoptions.cpp
@@ -23,7 +23,7 @@
 #include "decoderoptions.h"
 
 #include <boost/bind.hpp>
-#include <boost/foreach.hpp>
+ 
 #include <boost/none_t.hpp>
 
 #include <pv/data/decoderstack.h>
diff --git a/DSView/pv/sigsession.cpp b/DSView/pv/sigsession.cpp
index 0774aca0..c5552d6f 100755
--- a/DSView/pv/sigsession.cpp
+++ b/DSView/pv/sigsession.cpp
@@ -65,21 +65,10 @@
 #include <QFuture>
 #include <QtConcurrent/QtConcurrent>
 
-#include <boost/foreach.hpp>
+ 
 #include "data/decode/decoderstatus.h"
+#include "dsvdef.h"
 
-//using boost::dynamic_pointer_cast;
-//using boost::function;
-//using boost::lock_guard;
-//using boost::mutex;
-//using boost::shared_ptr;
-//using std::list;
-//using std::map;
-//using std::set;
-//using std::string;
-//using std::vector;
-//using std::deque;
-//using std::min;
 
 using namespace boost;
 using namespace std;
@@ -99,9 +88,6 @@ SigSession::SigSession(DeviceManager *device_manager) :
     _repeat_hold_prg(0),
     _map_zoom(0)
 {
-     void *p = this;
-     _appCntrol = NULL;
-     
     _hotplug_handle = 0;
     _dev_inst = NULL;
     _device_manager = device_manager;
@@ -110,6 +96,9 @@ SigSession::SigSession(DeviceManager *device_manager) :
     _hot_attach = false;
     _hot_detach = false;
     _group_cnt = 0;
+    _bHotplugStop = false;
+    _hotplug = NULL;
+    _sampling_thread = NULL;
  
 
     _feed_timer.stop();
@@ -145,7 +134,6 @@ SigSession::SigSession(DeviceManager *device_manager) :
 
 SigSession::~SigSession()
 {
-   Close();
 }
 
 DevInst* SigSession::get_device() const
@@ -279,7 +267,7 @@ void SigSession::release_device(DevInst *dev_inst)
 
 SigSession::capture_state SigSession::get_capture_state() const
 {
-    boost::lock_guard<boost::mutex> lock(_sampling_mutex);
+    std::lock_guard<std::mutex> lock(_sampling_mutex);
     return _capture_state;
 }
 
@@ -336,14 +324,14 @@ void SigSession::set_cur_snap_samplerate(uint64_t samplerate)
 
 
     // DecoderStack
-    BOOST_FOREACH(const boost::shared_ptr<view::DecodeTrace> d, _decode_traces)
+    for(auto &d : _decode_traces)
         d->decoder()->set_samplerate(_cur_snap_samplerate);
 
     // Math
     if (_math_trace && _math_trace->enabled())
         _math_trace->get_math_stack()->set_samplerate(_dev_inst->get_sample_rate());
     // SpectrumStack
-    BOOST_FOREACH(const boost::shared_ptr<view::SpectrumTrace> m, _spectrum_traces)
+    for(auto & m : _spectrum_traces)
         m->get_spectrum_stack()->set_samplerate(_cur_snap_samplerate);
 
     cur_snap_samplerate_changed();
@@ -383,7 +371,7 @@ void SigSession::capture_init()
     container_init();
 
     // update current hw offset
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _signals)
+    for(auto &s : _signals)
     {
         assert(s);
         boost::shared_ptr<view::DsoSignal> dsoSig;
@@ -416,7 +404,7 @@ void SigSession::container_init()
         _dso_data->init();
 
     // SpectrumStack
-    BOOST_FOREACH(const boost::shared_ptr<view::SpectrumTrace> m, _spectrum_traces)
+    for(auto &m : _spectrum_traces)
     {
         assert(m);
         m->get_spectrum_stack()->init();
@@ -430,7 +418,7 @@ void SigSession::container_init()
     //pv::data::DecoderModel *decoder_model = get_decoder_model();
     //decoder_model->setDecoderStack(NULL);
     // DecoderStack
-    BOOST_FOREACH(const boost::shared_ptr<view::DecodeTrace> d, _decode_traces)
+    for(auto &d : _decode_traces)
     {
         assert(d);
         d->decoder()->init();
@@ -459,7 +447,7 @@ void SigSession::start_capture(bool instant,
     // stop previous capture
     stop_capture();
     // reset measure of dso signal
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _signals)
+    for(auto &s : _signals)
     {
         assert(s);
         boost::shared_ptr<view::DsoSignal> dsoSig;
@@ -490,10 +478,11 @@ void SigSession::start_capture(bool instant,
         return;
     }
 
-    // Begin the session
-    _sampling_thread.reset(new boost::thread(
-        &SigSession::sample_thread_proc, this, _dev_inst,
-        error_handler));
+    if (_sampling_thread && _sampling_thread->joinable()){
+        _sampling_thread->join();
+    }
+    DESTROY_OBJECT(_sampling_thread);
+    _sampling_thread  = new std::thread(&SigSession::sample_thread_proc, this, _dev_inst, error_handler);
 }
 
 void SigSession::stop_capture()
@@ -512,9 +501,10 @@ void SigSession::stop_capture()
     sr_session_stop();
 
     // Check that sampling stopped
-    if (_sampling_thread.get())
+     if (_sampling_thread && _sampling_thread->joinable()){
         _sampling_thread->join();
-    _sampling_thread.reset();
+    }
+    DESTROY_OBJECT(_sampling_thread);
 }
 
 bool SigSession::get_capture_status(bool &triggered, int &progress)
@@ -542,13 +532,13 @@ bool SigSession::get_capture_status(bool &triggered, int &progress)
 
 vector< boost::shared_ptr<view::Signal> >& SigSession::get_signals()
 {
-    //boost::lock_guard<boost::mutex> lock(_signals_mutex);
+    //boost::lock_guard<std::mutex> lock(_signals_mutex);
     return _signals;
 }
 
 vector< boost::shared_ptr<view::GroupSignal> > SigSession::get_group_signals()
 {
-    //boost::lock_guard<boost::mutex> lock(_signals_mutex);
+    //boost::lock_guard<std::mutex> lock(_signals_mutex);
     return _group_traces;
 }
 
@@ -556,7 +546,8 @@ set< boost::shared_ptr<data::SignalData> > SigSession::get_data() const
 {
     //lock_guard<mutex> lock(_signals_mutex);
     set< boost::shared_ptr<data::SignalData> > data;
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> sig, _signals) {
+
+    for(auto &sig : _signals) {
         assert(sig);
         data.insert(sig->data());
     }
@@ -571,7 +562,7 @@ bool SigSession::get_instant()
 
 void SigSession::set_capture_state(capture_state state)
 {
-    boost::lock_guard<boost::mutex> lock(_sampling_mutex);
+    std::lock_guard<std::mutex> lock(_sampling_mutex);
     _capture_state = state;
     data_updated();
     capture_state_changed(state);
@@ -606,7 +597,7 @@ void SigSession::sample_thread_proc(DevInst *dev_inst,
 
 void SigSession::check_update()
 {
-    boost::lock_guard<boost::mutex> lock(_data_mutex);
+    std::lock_guard<std::mutex> lock(_data_mutex);
 
     if (_capture_state != Running)
         return;
@@ -868,7 +859,7 @@ void SigSession::reload()
 
 void SigSession::refresh(int holdtime)
 {
-    boost::lock_guard<boost::mutex> lock(_data_mutex);
+    std::lock_guard<std::mutex> lock(_data_mutex);
 
     data_lock();
 
@@ -876,7 +867,7 @@ void SigSession::refresh(int holdtime)
         _logic_data->init();
         //_cur_logic_snapshot.reset();
 
-        BOOST_FOREACH(const boost::shared_ptr<view::DecodeTrace> d, _decode_traces)
+        for(auto &d : _decode_traces)
         {
             assert(d);
             d->decoder()->init();
@@ -886,7 +877,7 @@ void SigSession::refresh(int holdtime)
     if (_dso_data) {
         _dso_data->init();
         // SpectrumStack
-        BOOST_FOREACH(const boost::shared_ptr<view::SpectrumTrace> m, _spectrum_traces)
+        for(auto &m : _spectrum_traces)
         {
             assert(m);
             m->get_spectrum_stack()->init();
@@ -988,7 +979,7 @@ void SigSession::feed_in_trigger(const ds_trigger_pos &trigger_pos)
 
 void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
 {
-    //boost::lock_guard<boost::mutex> lock(_data_mutex);
+    //boost::lock_guard<std::mutex> lock(_data_mutex);
     if (!_logic_data || _cur_logic_snapshot->memory_failed()) {
         qDebug() << "Unexpected logic packet";
         return;
@@ -1026,7 +1017,7 @@ void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
 
 void SigSession::feed_in_dso(const sr_datafeed_dso &dso)
 {
-    //boost::lock_guard<boost::mutex> lock(_data_mutex);
+    //boost::lock_guard<std::mutex> lock(_data_mutex);
 
     if(!_dso_data || _cur_dso_snapshot->memory_failed())
     {
@@ -1038,7 +1029,7 @@ void SigSession::feed_in_dso(const sr_datafeed_dso &dso)
     {
         std::map<int, bool> sig_enable;
         // reset scale of dso signal
-        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _signals)
+        for(auto &s : _signals)
         {
             assert(s);
             boost::shared_ptr<view::DsoSignal> dsoSig;
@@ -1055,7 +1046,7 @@ void SigSession::feed_in_dso(const sr_datafeed_dso &dso)
         _cur_dso_snapshot->append_payload(dso);
     }
 
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _signals) {
+    for(auto &s : _signals) {
         boost::shared_ptr<view::DsoSignal> dsoSig;
         if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s)) && (dsoSig->enabled()))
             dsoSig->paint_prepare();
@@ -1064,14 +1055,7 @@ void SigSession::feed_in_dso(const sr_datafeed_dso &dso)
     if (dso.num_samples != 0) {
         // update current sample rate
         set_cur_snap_samplerate(_dev_inst->get_sample_rate());
-//        // reset measure of dso signal
-//        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _signals)
-//        {
-//            assert(s);
-//            boost::shared_ptr<view::DsoSignal> dsoSig;
-//            if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s)))
-//                dsoSig->set_mValid(false);
-//        }
+ 
     }
 
     if (_cur_dso_snapshot->memory_failed()) {
@@ -1081,7 +1065,7 @@ void SigSession::feed_in_dso(const sr_datafeed_dso &dso)
     }
 
     // calculate related spectrum results
-    BOOST_FOREACH(const boost::shared_ptr<view::SpectrumTrace> m, _spectrum_traces)
+    for(auto &m : _spectrum_traces)
     {
         assert(m);
         if (m->enabled())
@@ -1105,7 +1089,7 @@ void SigSession::feed_in_dso(const sr_datafeed_dso &dso)
 
 void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
 {
-    //boost::lock_guard<boost::mutex> lock(_data_mutex);
+    //boost::lock_guard<std::mutex> lock(_data_mutex);
 
     if(!_analog_data || _cur_analog_snapshot->memory_failed())
     {
@@ -1116,7 +1100,7 @@ void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
     if (_cur_analog_snapshot->last_ended())
     {
         // reset scale of analog signal
-        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _signals)
+        for(auto &s : _signals)
         {
             assert(s);
             boost::shared_ptr<view::AnalogSignal> analogSig;
@@ -1149,7 +1133,7 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
     assert(sdi);
     assert(packet);
 
-    boost::lock_guard<boost::mutex> lock(_data_mutex);
+    std::lock_guard<std::mutex> lock(_data_mutex);
 
     if (_data_lock && packet->type != SR_DF_END)
         return;
@@ -1203,9 +1187,9 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
     case SR_DF_END:
     {
         {
-            //boost::lock_guard<boost::mutex> lock(_data_mutex);
+            //boost::lock_guard<std::mutex> lock(_data_mutex);
             if (!_cur_logic_snapshot->empty()) {
-                BOOST_FOREACH(const boost::shared_ptr<view::GroupSignal> g, _group_traces)
+                for(auto &g : _group_traces)
                 {
                     assert(g);
 
@@ -1219,7 +1203,7 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
             _cur_dso_snapshot->capture_ended();
             _cur_analog_snapshot->capture_ended();
 
-            BOOST_FOREACH(const boost::shared_ptr<view::DecodeTrace> d, _decode_traces)
+            for(auto &d : _decode_traces)
                 d->frame_ended();
 
         }
@@ -1278,7 +1262,7 @@ void SigSession::hotplug_proc(boost::function<void (const QString)> error_handle
 
     tv.tv_sec = tv.tv_usec = 0;
     try {
-        while(_session) {
+        while(_session && !_bHotplugStop) {
             libusb_handle_events_timeout(NULL, &tv);
             if (_hot_attach) {
                 qDebug("DreamSourceLab hardware attached!");
@@ -1290,7 +1274,7 @@ void SigSession::hotplug_proc(boost::function<void (const QString)> error_handle
                 device_detach();
                 _hot_detach = false;
             }
-            boost::this_thread::sleep(boost::posix_time::millisec(100));
+            std::this_thread::sleep_for(std::chrono::milliseconds(100));
         }
     } catch(...) {
         qDebug("Interrupt exception for hotplug thread was thrown.");
@@ -1324,18 +1308,21 @@ void SigSession::start_hotplug_proc(boost::function<void (const QString)> error_
     qDebug() << "Starting a hotplug thread...\n";
     _hot_attach = false;
     _hot_detach = false;
-    _hotplug.reset(new boost::thread(
-        &SigSession::hotplug_proc, this, error_handler));
 
+    if (_hotplug && _hotplug->joinable()){
+        _hotplug->join();
+    }
+    DESTROY_OBJECT(_hotplug);
+    _hotplug = new std::thread(&SigSession::hotplug_proc, this, error_handler);
 }
 
 void SigSession::stop_hotplug_proc()
-{
-    if (_hotplug.get()) {
-        _hotplug->interrupt();
+{  
+    _bHotplugStop = true;
+     if (_hotplug && _hotplug->joinable()){
         _hotplug->join();
     }
-    _hotplug.reset();
+     DESTROY_OBJECT(_hotplug);
 }
 
 uint16_t SigSession::get_ch_num(int type)
@@ -1345,7 +1332,7 @@ uint16_t SigSession::get_ch_num(int type)
     uint16_t dso_ch_num = 0;
     uint16_t analog_ch_num = 0;
     if (_dev_inst->dev_inst()) {
-        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _signals)
+        for(auto &s : _signals)
         {
             assert(s);
             if (dynamic_pointer_cast<view::LogicSignal>(s) && s->enabled()) {
@@ -1408,7 +1395,7 @@ bool SigSession::add_decoder(srd_decoder *const dec, bool silent, DecoderStatus
             new view::DecodeTrace(this, decoder_stack,
                 _decode_traces.size()));
         // set view early for decode start/end region setting
-        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _signals) {
+        for(auto &s : _signals) {
             if (s->get_view()) {
                 d->set_view(s->get_view());
                 break;
@@ -1465,6 +1452,8 @@ void SigSession::remove_decode_signal(int index)
     {
         if (cur_index == index)
         {
+            auto d = (*i)->decoder().get();
+            d->stop_decode(); //stop decoder thread
             _decode_traces.erase(i);
             signals_changed();
             return;
@@ -1522,7 +1511,7 @@ pv::data::DecoderModel* SigSession::get_decoder_model() const
 void SigSession::spectrum_rebuild()
 {
     bool has_dso_signal = false;
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _signals) {
+    for(auto &s : _signals) {
         boost::shared_ptr<view::DsoSignal> dsoSig;
         if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
             has_dso_signal = true;
@@ -1577,7 +1566,7 @@ void SigSession::math_rebuild(bool enable,
                               boost::shared_ptr<view::DsoSignal> dsoSig2,
                               data::MathStack::MathType type)
 {
-    boost::lock_guard<boost::mutex> lock(_data_mutex);
+    std::lock_guard<std::mutex> lock(_data_mutex);
     boost::shared_ptr<data::MathStack> math_stack(
         new data::MathStack(this, dsoSig1, dsoSig2, type));
     _math_trace.reset(new view::MathTrace(enable, math_stack, dsoSig1, dsoSig2));
@@ -1760,7 +1749,7 @@ int SigSession::get_map_zoom() const
 
 void SigSession::auto_end()
 {
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _signals) {
+    for(auto &s : _signals) {
         boost::shared_ptr<view::DsoSignal> dsoSig;
         if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
             dsoSig->auto_end();
@@ -1827,8 +1816,6 @@ void SigSession::set_stop_scale(float scale)
 
  sr_dev_inst* SigSession::get_dev_inst_c()
  {
-     void *p = this;
-     void *p2 = this->_appCntrol;
      if (_dev_inst != NULL){
          return _dev_inst->dev_inst();
      }
@@ -1844,7 +1831,7 @@ void SigSession::set_stop_scale(float scale)
  {
      if (_session == NULL)
         return;
-
+ 
      stop_capture();
 
      ds_trigger_destroy();
@@ -1861,7 +1848,7 @@ void SigSession::set_stop_scale(float scale)
      {
          stop_hotplug_proc();
          deregister_hotplug_callback();
-         _hotplug_handle = NULL;
+         _hotplug_handle = 0;
      }
  }
 
diff --git a/DSView/pv/sigsession.h b/DSView/pv/sigsession.h
index 3e2b8fb3..9cd6324e 100755
--- a/DSView/pv/sigsession.h
+++ b/DSView/pv/sigsession.h
@@ -26,8 +26,7 @@
 #include <libsigrok4DSL/libsigrok.h>
 #include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-#include <boost/thread.hpp>
+#include <boost/weak_ptr.hpp> 
 
 #include <string>
 #include <utility>
@@ -386,10 +385,8 @@ private slots:
     void nodata_timeout();
     void feed_timeout();
     void repeat_update();
-
-public: 
-    void *_appCntrol;
-
+ 
+ 
 private:
 	DeviceManager   *_device_manager;
 
@@ -398,13 +395,13 @@ private:
 	 */
     DevInst     *_dev_inst;
 
-    mutable boost::mutex _sampling_mutex;
+    mutable std::mutex _sampling_mutex;
 	capture_state _capture_state;
     bool _instant;
     uint64_t _cur_snap_samplerate;
     uint64_t _cur_samplelimits;
 
-    //mutable boost::mutex _signals_mutex;
+    //mutable std::mutex _signals_mutex;
 	std::vector< boost::shared_ptr<view::Signal> > _signals;
     std::vector< boost::shared_ptr<view::GroupSignal> > _group_traces;
 
@@ -415,7 +412,7 @@ private:
     boost::shared_ptr<view::LissajousTrace> _lissajous_trace;
     boost::shared_ptr<view::MathTrace> _math_trace;
 
-    mutable boost::mutex _data_mutex;
+    mutable std::mutex _data_mutex;
 	boost::shared_ptr<data::Logic> _logic_data;
 	boost::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
     boost::shared_ptr<data::Dso> _dso_data;
@@ -426,10 +423,12 @@ private:
     boost::shared_ptr<data::GroupSnapshot> _cur_group_snapshot;
     int _group_cnt;
 
-	std::unique_ptr<boost::thread> _sampling_thread;
+	std::thread     *_sampling_thread;
+    std::thread     *_hotplug;
+    volatile bool    _bHotplugStop;
 
 	libusb_hotplug_callback_handle _hotplug_handle;
-    std::unique_ptr<boost::thread> _hotplug;
+    
     bool _hot_attach;
     bool _hot_detach;
 
@@ -461,6 +460,7 @@ private:
 
     bool _dso_feed;
     float _stop_scale;
+   
 
 private:
 	// TODO: This should not be necessary. Multiple concurrent
diff --git a/DSView/pv/storesession.cpp b/DSView/pv/storesession.cpp
index aed18575..230fd51a 100755
--- a/DSView/pv/storesession.cpp
+++ b/DSView/pv/storesession.cpp
@@ -39,26 +39,13 @@
 #include <pv/view/decodetrace.h>
 #include <pv/device/devinst.h>
 #include <pv/dock/protocoldock.h>
-
-#include <boost/foreach.hpp>
+ 
  
 #include <QFileDialog>
 #include <QDir>
 
 #include "config/appconfig.h"
-
-using boost::dynamic_pointer_cast;
-using boost::mutex;
-using boost::thread;
-using boost::lock_guard;
-using std::deque;
-using std::make_pair;
-using std::min;
-using std::pair;
-using std::set;
-using std::string;
-using std::vector;
-
+ 
 namespace pv {
 
       char chunk_name[30] = {0};
@@ -82,7 +69,7 @@ StoreSession::StoreSession(SigSession *session) :
     _unit_count(0),
     _has_error(false),
     _canceled(false)
-{
+{ 
 }
 
 StoreSession::~StoreSession()
@@ -114,9 +101,8 @@ void StoreSession::wait()
 }
 
 void StoreSession::cancel()
-{
-    _canceled = true;
-    _thread.interrupt();
+{ 
+    _canceled = true; 
 }
 
 QList<QString> StoreSession::getSuportedExportFormats(){
@@ -147,7 +133,7 @@ bool StoreSession::save_start()
     }
 
     std::set<int> type_set;
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> sig, _session->get_signals()) {
+    for(auto &sig : _session->get_signals()) {
         assert(sig);
         type_set.insert(sig->get_type());
     }
@@ -190,7 +176,7 @@ bool StoreSession::save_start()
             if (ret != SR_OK) {
                 _error = tr("Failed to create zip file. Initialization error.");
             } else {
-                _thread = boost::thread(&StoreSession::save_proc, this, snapshot);
+                _thread = std::thread(&StoreSession::save_proc, this, snapshot);
                 return !_has_error;
             }
         }
@@ -208,7 +194,8 @@ bool StoreSession::save_start()
         }
         else
         {
-            _thread = boost::thread(&StoreSession::save_proc, this, snapshot);
+            if (_thread.joinable()) _thread.join();
+            _thread = std::thread(&StoreSession::save_proc, this, snapshot);
             return !_has_error;
         }
     }
@@ -230,7 +217,7 @@ void StoreSession::save_proc(boost::shared_ptr<data::Snapshot> snapshot)
 
     if ((logic_snapshot = boost::dynamic_pointer_cast<data::LogicSnapshot>(snapshot))) {
         uint16_t to_save_probes = 0;
-        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
+        for(auto &s : _session->get_signals()) {
             if (s->enabled() && logic_snapshot->has_data(s->get_index()))
                 to_save_probes++;
         }
@@ -238,13 +225,13 @@ void StoreSession::save_proc(boost::shared_ptr<data::Snapshot> snapshot)
         num = logic_snapshot->get_block_num();
         bool sample;
 
-        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
+        for(auto &s : _session->get_signals()) {
             int ch_type = s->get_type();
             if (ch_type == SR_CHANNEL_LOGIC) {
                 int ch_index = s->get_index();
                 if (!s->enabled() || !logic_snapshot->has_data(ch_index))
                     continue;
-                for (int i = 0; !boost::this_thread::interruption_requested() && i < num; i++) {
+                for (int i = 0; !_canceled && i < num; i++) {
                     uint8_t *buf = logic_snapshot->get_block_buf(i, ch_index, sample);
                     uint64_t size = logic_snapshot->get_block_size(i);
                     bool need_malloc = (buf == NULL);
@@ -283,7 +270,7 @@ void StoreSession::save_proc(boost::shared_ptr<data::Snapshot> snapshot)
         }
     } else {
         int ch_type = -1;
-        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
+        for(auto &s : _session->get_signals()) {
             ch_type = s->get_type();
             break;
         }
@@ -297,7 +284,7 @@ void StoreSession::save_proc(boost::shared_ptr<data::Snapshot> snapshot)
             const uint8_t *buf_start = (uint8_t *)snapshot->get_data();
             const uint8_t *buf_end = buf_start + _unit_count;
 
-            for (int i = 0; !boost::this_thread::interruption_requested() && i < num; i++) {
+            for (int i = 0; !_canceled && i < num; i++) {
                 const uint64_t size = snapshot->get_block_size(i);
                 if ((buf + size) > buf_end) {
                     uint8_t *tmp = (uint8_t *)malloc(size);
@@ -557,7 +544,7 @@ QString StoreSession::meta_gen(boost::shared_ptr<data::Snapshot> snapshot)
 bool StoreSession::export_start()
 {
     std::set<int> type_set;
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> sig, _session->get_signals()) {
+    for(auto &sig : _session->get_signals()) {
         assert(sig);
         int _tp = sig->get_type();
         type_set.insert(_tp);
@@ -609,7 +596,8 @@ bool StoreSession::export_start()
     }
     else
     {
-        _thread = boost::thread(&StoreSession::export_proc, this, snapshot);
+        if (_thread.joinable()) _thread.join();
+        _thread = std::thread(&StoreSession::export_proc, this, snapshot);
         return !_has_error;
     }
 
@@ -716,12 +704,12 @@ void StoreSession::export_proc(boost::shared_ptr<data::Snapshot> snapshot)
         std::vector<uint8_t *> buf_vec;
         std::vector<bool> buf_sample;
 
-        for (int blk = 0; !boost::this_thread::interruption_requested()  &&
-                          blk < blk_num; blk++) {
+        for (int blk = 0; !_canceled  &&  blk < blk_num; blk++) {
             uint64_t buf_sample_num = logic_snapshot->get_block_size(blk) * 8;
             buf_vec.clear();
             buf_sample.clear();
-            BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals()) {
+
+            for(auto &s : _session->get_signals()) {
                 int ch_type = s->get_type();
                 if (ch_type == SR_CHANNEL_LOGIC) {
                     int ch_index = s->get_index();
@@ -738,8 +726,7 @@ void StoreSession::export_proc(boost::shared_ptr<data::Snapshot> snapshot)
             unsigned int size = usize;
             struct sr_datafeed_logic lp;
 
-            for(uint64_t i = 0; !boost::this_thread::interruption_requested() &&
-                                i < buf_sample_num; i+=usize){
+            for(uint64_t i = 0; !_canceled && i < buf_sample_num; i+=usize){
                 if(buf_sample_num - i < usize)
                     size = buf_sample_num - i;
                 uint8_t *xbuf = (uint8_t *)malloc(size * unitsize);
@@ -786,7 +773,7 @@ void StoreSession::export_proc(boost::shared_ptr<data::Snapshot> snapshot)
         unsigned int size = usize;
         struct sr_datafeed_dso dp; 
 
-        for(uint64_t i = 0; !boost::this_thread::interruption_requested() && i < _unit_count; i+=usize){
+        for(uint64_t i = 0; !_canceled && i < _unit_count; i+=usize){
             if(_unit_count - i < usize)
                 size = _unit_count - i;
 
@@ -813,7 +800,7 @@ void StoreSession::export_proc(boost::shared_ptr<data::Snapshot> snapshot)
         unsigned int size = usize;
         struct sr_datafeed_analog ap;
 
-        for(uint64_t i = 0; !boost::this_thread::interruption_requested() && i < _unit_count; i+=usize){
+        for(uint64_t i = 0; !_canceled && i < _unit_count; i+=usize){
             if(_unit_count - i < usize)
                 size = _unit_count - i;
             ap.data = &datat[i*snapshot->get_channel_num()];
@@ -879,13 +866,15 @@ QString StoreSession::decoders_gen()
 QJsonArray StoreSession::json_decoders()
 {
     QJsonArray dec_array;
-    BOOST_FOREACH(boost::shared_ptr<view::DecodeTrace> t, _session->get_decode_signals()) {
+
+    for(auto &t : _session->get_decode_signals()) {
         QJsonObject dec_obj;
         QJsonArray stack_array;
         QJsonObject show_obj;
         const boost::shared_ptr<data::DecoderStack>& stack = t->decoder();
         const std::list< boost::shared_ptr<data::decode::Decoder> >& decoder = stack->stack();
-        BOOST_FOREACH(boost::shared_ptr<data::decode::Decoder> dec, decoder) {
+
+        for(auto &dec : decoder) {
             QJsonArray ch_array;
             const srd_decoder *const d = dec->decoder();;
             const bool have_probes = (d->channels || d->opt_channels) != 0;
@@ -997,7 +986,8 @@ void StoreSession::load_decoders(dock::ProtocolDock *widget, QJsonArray dec_arra
             }
 
             const std::list< boost::shared_ptr<data::decode::Decoder> >& decoder = stack->stack();
-            BOOST_FOREACH(boost::shared_ptr<data::decode::Decoder> dec, decoder) {
+
+            for(auto &dec : decoder) {
                 const srd_decoder *const d = dec->decoder();
                 QJsonObject options_obj;
 
@@ -1271,7 +1261,7 @@ QString StoreSession::MakeExportFile(bool bDlg)
 bool StoreSession::IsLogicDataType()
 {
     std::set<int> type_set;
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> sig, _session->get_signals()) {
+    for(auto &sig : _session->get_signals()) {
         assert(sig);
         type_set.insert(sig->get_type());
     }
diff --git a/DSView/pv/storesession.h b/DSView/pv/storesession.h
index 45bd1e9a..2a671365 100755
--- a/DSView/pv/storesession.h
+++ b/DSView/pv/storesession.h
@@ -24,8 +24,8 @@
 
 #include <stdint.h>
 #include <string>
-
-#include <boost/thread.hpp>
+#include <thread>
+ 
 #include <boost/shared_ptr.hpp>
 #include <QObject>
 
@@ -106,7 +106,7 @@ private:
     QString         _suffix;
     SigSession      *_session;
 
-	boost::thread   _thread;
+	std::thread   _thread;
 
     const struct sr_output_module* _outModule;
  
@@ -114,8 +114,8 @@ private:
 	uint64_t        _unit_count;
     bool            _has_error;
 	QString         _error;
-    bool            _canceled;
-    ZipMaker        m_zipDoc;
+    volatile bool   _canceled;
+    ZipMaker        m_zipDoc;  
 };
 
 } // pv
diff --git a/DSView/pv/toolbars/filebar.cpp b/DSView/pv/toolbars/filebar.cpp
index 8db6d486..7c6e7880 100755
--- a/DSView/pv/toolbars/filebar.cpp
+++ b/DSView/pv/toolbars/filebar.cpp
@@ -20,7 +20,7 @@
  */
 
 #include <boost/bind.hpp>
-#include <boost/foreach.hpp>
+ 
 #include <boost/shared_ptr.hpp>
 
 #include <QMetaObject>
@@ -167,6 +167,7 @@ void FileBar::session_error(
 void FileBar::show_session_error(
     const QString text, const QString info_text)
 {  
+    (void)text;
     MsgBox::Show(NULL, info_text.toStdString().c_str(), this);
 }
 
diff --git a/DSView/pv/toolbars/logobar.cpp b/DSView/pv/toolbars/logobar.cpp
index 6791226a..4c65cf41 100755
--- a/DSView/pv/toolbars/logobar.cpp
+++ b/DSView/pv/toolbars/logobar.cpp
@@ -20,7 +20,7 @@
  */
 
 #include <boost/bind.hpp>
-#include <boost/foreach.hpp>
+ 
 
 #include <QMetaObject>
 #include <QFileDialog> 
diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp
index 2ecd10b0..5efe3265 100755
--- a/DSView/pv/toolbars/samplingbar.cpp
+++ b/DSView/pv/toolbars/samplingbar.cpp
@@ -23,7 +23,7 @@
 
 #include <extdef.h>
 #include <assert.h>
-#include <boost/foreach.hpp>
+ 
 #include <libusb.h>
 
 #include <QAction>
@@ -332,7 +332,8 @@ void SamplingBar::on_configure()
 void SamplingBar::zero_adj()
 {
     boost::shared_ptr<view::DsoSignal> dsoSig;
-    BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals())
+
+    for(auto &s : _session->get_signals())
     {
         if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s)))
             dsoSig->set_enable(true);
@@ -349,7 +350,7 @@ void SamplingBar::zero_adj()
 
     pv::dialogs::WaitingDialog wait(this, _session, SR_CONF_ZERO);
     if (wait.start() == QDialog::Rejected) {
-        BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session->get_signals())
+        for(auto &s : _session->get_signals())
         {
             if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s)))
                 dsoSig->commit_settings();
@@ -375,7 +376,7 @@ bool SamplingBar::get_instant() const
 
 void SamplingBar::set_sampling(bool sampling)
 {
-    lock_guard<boost::recursive_mutex> lock(_sampling_mutex);
+    lock_guard<std::mutex> lock(_sampling_mutex);
     _sampling = sampling;
 
     if (!sampling) {
diff --git a/DSView/pv/toolbars/samplingbar.h b/DSView/pv/toolbars/samplingbar.h
index f4addaef..833795d0 100755
--- a/DSView/pv/toolbars/samplingbar.h
+++ b/DSView/pv/toolbars/samplingbar.h
@@ -136,7 +136,7 @@ namespace pv
         private:
             SigSession *_session;
 
-            mutable boost::recursive_mutex _sampling_mutex;
+            mutable std::mutex _sampling_mutex;
             bool _enable;
             bool _sampling;
 
diff --git a/DSView/pv/view/decodetrace.cpp b/DSView/pv/view/decodetrace.cpp
index b81be63e..07816c28 100755
--- a/DSView/pv/view/decodetrace.cpp
+++ b/DSView/pv/view/decodetrace.cpp
@@ -23,7 +23,7 @@
 
 #include <extdef.h>
 
-#include <boost/foreach.hpp>
+ 
 #include <boost/functional/hash.hpp>
 
 #include <QAction> 
@@ -127,9 +127,8 @@ DecodeTrace::DecodeTrace(pv::SigSession *session,
     _end_index(0),
     _start_count(0),
     _end_count(0),
-    _progress(0),
-    _popup_form(NULL),
-    _popup()
+    _progress(0), 
+    _popup(NULL)
 {
 	assert(_decoder_stack);
 
@@ -150,6 +149,11 @@ DecodeTrace::~DecodeTrace()
     _decoder_forms.clear();
     _probe_selectors.clear();
     _bindings.clear();
+
+    if (_popup){
+        delete _popup;
+        _popup = NULL;
+    }
 }
 
 bool DecodeTrace::enabled() const
@@ -268,11 +272,13 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right, QColor fore, QColo
         samples_per_pixel, 0.0);
     uint64_t end_sample = (uint64_t)max((right + pixels_offset) *
         samples_per_pixel, 0.0);
-    BOOST_FOREACH(const boost::shared_ptr<data::decode::Decoder> &dec, _decoder_stack->stack()) {
+
+    for(auto &dec : _decoder_stack->stack()) {
         start_sample = max(dec->decode_start(), start_sample);
         end_sample = min(dec->decode_end(), end_sample);
         break;
     }
+
     if (end_sample < start_sample)
         return;
 
@@ -284,8 +290,7 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right, QColor fore, QColo
 
     assert(_decoder_stack);
 
-    BOOST_FOREACH(boost::shared_ptr<data::decode::Decoder> dec,
-        _decoder_stack->stack()) {
+    for(auto &dec :_decoder_stack->stack()) {
         if (dec->shown()) {
             const std::map<const pv::data::decode::Row, bool> rows = _decoder_stack->get_rows_gshow();
             for (std::map<const pv::data::decode::Row, bool>::const_iterator i = rows.begin();
@@ -302,14 +307,16 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right, QColor fore, QColo
                         const uint64_t max_annotation =
                                 _decoder_stack->get_max_annotation(row);
                         const double max_annWidth = max_annotation / samples_per_pixel;
+                        
                         if ((max_annWidth > 100) ||
                             (max_annWidth > 10 && min_annWidth > 1) ||
                             (max_annWidth == 0 && samples_per_pixel < 10)) {
                             vector<Annotation> annotations;
                             _decoder_stack->get_annotation_subset(annotations, row,
                                 start_sample, end_sample);
+
                             if (!annotations.empty()) {
-                                BOOST_FOREACH(const Annotation &a, annotations)
+                                for(Annotation &a : annotations)
                                     draw_annotation(a, p, get_text_colour(),
                                         annotation_height, left, right,
                                         samples_per_pixel, pixels_offset, y,
@@ -345,6 +352,11 @@ void DecodeTrace::paint_fore(QPainter &p, int left, int right, QColor fore, QCol
 //to show decoder's property setting dialog
 bool DecodeTrace::create_popup()
 {
+    if (_popup != NULL){
+         _popup->reload();          
+        return true;
+    } 
+
     int ret = false;
     _popup = new dialogs::DSDialog();
 
@@ -352,8 +364,7 @@ bool DecodeTrace::create_popup()
 
     if (QDialog::Accepted == _popup->exec())
     {
-        BOOST_FOREACH(boost::shared_ptr<data::decode::Decoder> dec,
-            _decoder_stack->stack())
+        for(auto &dec : _decoder_stack->stack())
         {
             if (dec->commit() || _decoder_stack->options_changed()) {
                 _decoder_stack->set_options_changed(true);
@@ -374,11 +385,8 @@ void DecodeTrace::create_popup_form()
 
     // Transfer the layout and the child widgets to a temporary widget
     // which then goes out of scope destroying the layout and all the child
-    // widgets.
-    if (_popup_form)
-        _popup->reload();
-
-    _popup_form = new QFormLayout();
+    // widgets. 
+   QFormLayout *_popup_form = new QFormLayout();
     _popup_form->setVerticalSpacing(5);
     _popup_form->setFormAlignment(Qt::AlignLeft);
     _popup_form->setLabelAlignment(Qt::AlignLeft);
@@ -402,7 +410,7 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
 	_probe_selectors.clear();
 	_decoder_forms.clear();
 
-    const list< boost::shared_ptr<Decoder> >& stack = _decoder_stack->stack();
+    list< boost::shared_ptr<Decoder> >& stack = _decoder_stack->stack();
 
     if (stack.empty()) {
 		QLabel *const l = new QLabel(
@@ -410,8 +418,7 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
 		l->setAlignment(Qt::AlignCenter);
 		form->addRow(l);
     } else {
-        BOOST_FOREACH(boost::shared_ptr<Decoder> dec,stack) {
-            //boost::shared_ptr<Decoder> dec(*iter);
+        for(auto &dec : stack) { 
             create_decoder_form(_decoder_stack, dec, parent, form);
 		}
 
@@ -419,9 +426,7 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
 			tr("<i>* Required channels</i>"), parent));
 	}
 
-    //public input layer
-   // QFormLayout *publay =  new QFormLayout();
-   // form->addRow(publay); 
+ 
 
     //Add region combobox
     _start_comboBox = new QComboBox(parent);
@@ -526,15 +531,15 @@ void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
 		draw_range(a, p, fill, outline, text_color, h,
             start, end, y, fore, back);
         if ((a.type()/100 == 2) && (end - start > 20)) {
-            BOOST_FOREACH(boost::shared_ptr<data::decode::Decoder> dec,
-                _decoder_stack->stack()) {
+            for(auto &dec : _decoder_stack->stack()) {
                 for (auto& iter: dec->channels()) {
                     int type = dec->get_channel_type(iter.first);
                     if ((type == SRD_CHANNEL_COMMON) ||
                         ((type%100 != a.type()%100) && (type%100 != 0)))
                         continue;
                     boost::shared_ptr<LogicSignal> logic_sig;
-                    BOOST_FOREACH(boost::shared_ptr<view::Signal> sig, _session->get_signals()) {
+
+                    for(auto &sig : _session->get_signals()) {
                         if((sig->get_index() == iter.second) &&
                            (logic_sig = dynamic_pointer_cast<view::LogicSignal>(sig))) {
                             logic_sig->paint_mark(p, start, end, type/100);
@@ -644,7 +649,7 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p,
 	QString best_annotation;
 	int best_width = 0;
 
-	BOOST_FOREACH(const QString &a, annotations) {
+	for(auto &&a : annotations) {
 		const int w = p.boundingRect(QRectF(), 0, a).width();
 		if (w <= rect.width() && w > best_width)
 			best_annotation = a, best_width = w;
@@ -812,7 +817,7 @@ void DecodeTrace::commit_decoder_probes(boost::shared_ptr<data::decode::Decoder>
     const vector< boost::shared_ptr<Signal> > sigs(_session->get_signals());
 
     _index_list.clear();
-	BOOST_FOREACH(const ProbeSelector &s, _probe_selectors)
+	for(auto &s : _probe_selectors)
 	{
 		if(s._decoder != dec)
 			break;
@@ -820,7 +825,7 @@ void DecodeTrace::commit_decoder_probes(boost::shared_ptr<data::decode::Decoder>
         const int selection = s._combo->itemData(
                 s._combo->currentIndex()).value<int>();
 
-        BOOST_FOREACH(boost::shared_ptr<Signal> sig, sigs)
+        for(auto &sig : sigs)
             if(sig->get_index() == selection) {
                 probe_map[s._pdch] = selection;
                 _index_list.push_back(selection);
@@ -834,11 +839,8 @@ void DecodeTrace::commit_decoder_probes(boost::shared_ptr<data::decode::Decoder>
 void DecodeTrace::commit_probes()
 {
 	assert(_decoder_stack);
-    BOOST_FOREACH(boost::shared_ptr<data::decode::Decoder> dec,
-		_decoder_stack->stack())
-		commit_decoder_probes(dec);
-
-    //_decoder_stack->begin_decode();
+    for(auto &dec : _decoder_stack->stack())
+		commit_decoder_probes(dec); 
 }
 
 void DecodeTrace::on_new_decode_data()
@@ -911,8 +913,7 @@ int DecodeTrace::rows_size()
     using pv::data::decode::Decoder;
 
     int size = 0;
-    BOOST_FOREACH(boost::shared_ptr<data::decode::Decoder> dec,
-        _decoder_stack->stack()) {
+    for(auto &dec : _decoder_stack->stack()) {
         if (dec->shown()) {
             const std::map<const pv::data::decode::Row, bool> rows = _decoder_stack->get_rows_gshow();
             for (std::map<const pv::data::decode::Row, bool>::const_iterator i = rows.begin();
@@ -1000,8 +1001,7 @@ void DecodeTrace::on_region_set(int index)
     _start_index = index1;
     _end_index = index2;
 
-    BOOST_FOREACH(boost::shared_ptr<data::decode::Decoder> dec,
-        _decoder_stack->stack()) {
+    for(auto &dec : _decoder_stack->stack()) {
         dec->set_decode_region(decode_start, decode_end);
     }
 }
@@ -1018,8 +1018,7 @@ void DecodeTrace::frame_ended()
         _decode_end = last_samples;
         _end_index = 0;
     }
-    BOOST_FOREACH(boost::shared_ptr<data::decode::Decoder> dec,
-        _decoder_stack->stack()) {
+    for(auto &dec : _decoder_stack->stack()) {
         dec->set_decode_region(_decode_start, _decode_end);
         dec->commit();
     }
diff --git a/DSView/pv/view/decodetrace.h b/DSView/pv/view/decodetrace.h
index ee2ae804..19e8015f 100755
--- a/DSView/pv/view/decodetrace.h
+++ b/DSView/pv/view/decodetrace.h
@@ -223,8 +223,7 @@ private:
 	std::vector<pv::widgets::DecoderGroupBox*> _decoder_forms;
 
 	std::vector<QString> _cur_row_headings;
-
-    QFormLayout *_popup_form;
+ 
     dialogs::DSDialog *_popup;
 };
 
diff --git a/DSView/pv/view/devmode.cpp b/DSView/pv/view/devmode.cpp
index 05659b20..e34408b6 100755
--- a/DSView/pv/view/devmode.cpp
+++ b/DSView/pv/view/devmode.cpp
@@ -27,8 +27,7 @@
 #include "../device/file.h"
 
 #include <assert.h>
-
-#include <boost/foreach.hpp>
+ 
  
 #include <QStyleOption>
 #include <QMouseEvent>
diff --git a/DSView/pv/view/dsosignal.cpp b/DSView/pv/view/dsosignal.cpp
index 615f2d31..7a295c5c 100755
--- a/DSView/pv/view/dsosignal.cpp
+++ b/DSView/pv/view/dsosignal.cpp
@@ -30,7 +30,7 @@
 #include "../sigsession.h"
 #include "../device/devinst.h"
 
-#include <boost/foreach.hpp>
+ 
 
 #include <QDebug>
 #include <QTimer>
diff --git a/DSView/pv/view/header.cpp b/DSView/pv/view/header.cpp
index ec5db76c..c5c44314 100755
--- a/DSView/pv/view/header.cpp
+++ b/DSView/pv/view/header.cpp
@@ -35,7 +35,7 @@
 
 #include <assert.h>
 
-#include <boost/foreach.hpp>
+ 
  
 #include <QColorDialog>
 #include <QInputDialog>
@@ -107,7 +107,7 @@ boost::shared_ptr<pv::view::Trace> Header::get_mTrace(
     const vector< boost::shared_ptr<Trace> > traces(
         _view.get_traces(ALL_VIEW));
 
-    BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces)
+    for(auto &t : traces)
     {
         assert(t);
 
@@ -136,7 +136,8 @@ void Header::paintEvent(QPaintEvent*)
     const bool dragging = !_drag_traces.empty();
     QColor fore(QWidget::palette().color(QWidget::foregroundRole()));
     fore.setAlpha(View::ForeAlpha);
-    BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces)
+
+    for(auto &t : traces)
 	{
         assert(t);
        // auto ptr = t.get();
@@ -157,13 +158,13 @@ void Header::mouseDoubleClickEvent(QMouseEvent *event)
         _mouse_down_point = event->pos();
 
         // Save the offsets of any Traces which will be dragged
-        BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces)
+        for(auto &t : traces)
             if (t->selected())
                 _drag_traces.push_back(
                     make_pair(t, t->get_v_offset()));
 
         // Select the Trace if it has been clicked
-        BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces)
+        for(auto &t : traces)
             if (t->mouse_double_click(width(), event->pos()))
                 break;
     }
@@ -186,7 +187,7 @@ void Header::mousePressEvent(QMouseEvent *event)
 		_mouse_down_point = event->pos();
 
         // Save the offsets of any Traces which will be dragged
-        BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces)
+        for(auto &t : traces)
             if (t->selected())
                 _drag_traces.push_back(
                     make_pair(t, t->get_v_offset()));
@@ -207,14 +208,14 @@ void Header::mousePressEvent(QMouseEvent *event)
             mTrace->set_old_v_offset(mTrace->get_v_offset());
         }
 
-        BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces)
+        for(auto &t : traces)
             if (t->mouse_press(width(), event->pos()))
                 break;
 
         if (~QApplication::keyboardModifiers() & Qt::ControlModifier) {
             // Unselect all other Traces because the Ctrl is not
             // pressed
-            BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces)
+            for(auto &t : traces)
                 if (t != mTrace)
                     t->select(false);
         }
@@ -248,7 +249,7 @@ void Header::mouseReleaseEvent(QMouseEvent *event)
 
         const vector< boost::shared_ptr<Trace> > traces(
             _view.get_traces(ALL_VIEW));
-        BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces)
+        for(auto &t : traces)
             t->select(false);
     }
 
@@ -288,7 +289,7 @@ void Header::wheelEvent(QWheelEvent *event)
         #else
             shift = event->delta() / 80.0;
         #endif
-        BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces)
+        for(auto &t : traces)
             if (t->mouse_wheel(width(), event->pos(), shift))
                 break;
         update();
diff --git a/DSView/pv/view/lissajoustrace.cpp b/DSView/pv/view/lissajoustrace.cpp
index f2c5959c..f1d307cc 100755
--- a/DSView/pv/view/lissajoustrace.cpp
+++ b/DSView/pv/view/lissajoustrace.cpp
@@ -30,7 +30,7 @@
 #include "../sigsession.h"
 #include "../device/devinst.h"
 
-#include <boost/foreach.hpp>
+ 
 
 #include <QDebug>
 #include <QTimer>
diff --git a/DSView/pv/view/mathtrace.cpp b/DSView/pv/view/mathtrace.cpp
index fe838d9b..a61db919 100755
--- a/DSView/pv/view/mathtrace.cpp
+++ b/DSView/pv/view/mathtrace.cpp
@@ -31,8 +31,7 @@
 #include "../sigsession.h"
 #include "../device/devinst.h"
 #include "../view/dsosignal.h"
-
-#include <boost/foreach.hpp>
+ 
 
 #include <QDebug>
 #include <QTimer>
diff --git a/DSView/pv/view/spectrumtrace.cpp b/DSView/pv/view/spectrumtrace.cpp
index 64500c52..bb0ffcb9 100755
--- a/DSView/pv/view/spectrumtrace.cpp
+++ b/DSView/pv/view/spectrumtrace.cpp
@@ -22,7 +22,7 @@
 #include <algorithm>
 #include <math.h>
 
-#include <boost/foreach.hpp>
+ 
 #include <boost/functional/hash.hpp>
 
 #include "spectrumtrace.h"
@@ -294,7 +294,8 @@ void SpectrumTrace::paint_mid(QPainter &p, int left, int right, QColor fore, QCo
 
         double vdiv = 0;
         double vfactor = 0;
-        BOOST_FOREACH(const boost::shared_ptr<Signal> s, _session->get_signals()) {
+        
+        for(auto &s : _session->get_signals()) {
             boost::shared_ptr<DsoSignal> dsoSig;
             if ((dsoSig = dynamic_pointer_cast<DsoSignal>(s))) {
                 if(dsoSig->get_index() == _spectrum_stack->get_index()) {
diff --git a/DSView/pv/view/view.cpp b/DSView/pv/view/view.cpp
index d9bb13d1..64220412 100755
--- a/DSView/pv/view/view.cpp
+++ b/DSView/pv/view/view.cpp
@@ -23,8 +23,7 @@
 #include <assert.h>
 #include <limits.h>
 #include <math.h>
-
-#include <boost/foreach.hpp>
+ 
  
 #include <QEvent>
 #include <QMouseEvent>
@@ -389,22 +388,22 @@ vector< boost::shared_ptr<Trace> > View::get_traces(int type)
     const vector< boost::shared_ptr<SpectrumTrace> > spectrums(_session->get_spectrum_traces());
 
     vector< boost::shared_ptr<Trace> > traces;
-    BOOST_FOREACH(boost::shared_ptr<Trace> t, sigs) {
+    for(auto &t : sigs) {
         if (type == ALL_VIEW || _trace_view_map[t->get_type()] == type)
             traces.push_back(t);
     }
  
-    BOOST_FOREACH(boost::shared_ptr<Trace> t, decode_sigs) {
+    for(auto &t : decode_sigs) {
         if (type == ALL_VIEW || _trace_view_map[t->get_type()] == type)
             traces.push_back(t);
     }
  
-    BOOST_FOREACH(boost::shared_ptr<Trace> t, groups) {
+    for(auto &t : groups) {
         if (type == ALL_VIEW || _trace_view_map[t->get_type()] == type)
             traces.push_back(t);
     }
 
-    BOOST_FOREACH(boost::shared_ptr<Trace> t, spectrums) {
+    for(auto &t : spectrums) {
         if (type == ALL_VIEW || _trace_view_map[t->get_type()] == type)
             traces.push_back(t);
     }
@@ -586,15 +585,18 @@ const QPoint& View::hover_point() const
 
 void View::normalize_layout()
 {
-    const vector< boost::shared_ptr<Trace> > traces(get_traces(ALL_VIEW));
+    vector< boost::shared_ptr<Trace> > traces(get_traces(ALL_VIEW));
 
 	int v_min = INT_MAX;
-    BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces)
-        v_min = min(t->get_v_offset(), v_min);
+    for(auto &t : traces){
+          v_min = min(t->get_v_offset(), v_min);
+    }
 
 	const int delta = -min(v_min, 0);
-    BOOST_FOREACH(boost::shared_ptr<Trace> t, traces)
+
+    for(auto &t : traces){
         t->set_v_offset(t->get_v_offset() + delta);
+    }        
 
     verticalScrollBar()->setSliderPosition(delta);
 	v_scroll_value_changed(verticalScrollBar()->sliderPosition());
@@ -696,7 +698,7 @@ void View::signals_changed()
     vector< boost::shared_ptr<Trace> > time_traces;
     vector< boost::shared_ptr<Trace> > fft_traces;
 
-    BOOST_FOREACH(const boost::shared_ptr<Trace> t, get_traces(ALL_VIEW)) {
+    for(auto &t : get_traces(ALL_VIEW)) {
         if (_trace_view_map[t->get_type()] == TIME_VIEW)
             time_traces.push_back(t);
         else if (_trace_view_map[t->get_type()] == FFT_VIEW)
@@ -711,7 +713,7 @@ void View::signals_changed()
             _viewport_list.push_back(_fft_viewport);
             _vsplitter->refresh();
         }
-        BOOST_FOREACH(boost::shared_ptr<Trace> t, fft_traces) {
+        for(auto &t : fft_traces) {
             t->set_view(this);
             t->set_viewport(_fft_viewport);
             t->set_totalHeight(_fft_viewport->height());
@@ -732,7 +734,7 @@ void View::signals_changed()
     }
 
     if (!time_traces.empty() && _time_viewport) {
-        BOOST_FOREACH(const boost::shared_ptr<Trace> t, time_traces) {
+        for(auto &t : time_traces) {
             assert(t);
             if (dynamic_pointer_cast<DsoSignal>(t) ||
                 t->enabled())
@@ -766,7 +768,8 @@ void View::signals_changed()
         }
         _spanY = _signalHeight + 2 * actualMargin;
         int next_v_offset = actualMargin;
-        BOOST_FOREACH(boost::shared_ptr<Trace> t, time_traces) {
+
+        for(auto &t : time_traces) {
             t->set_view(this);
             t->set_viewport(_time_viewport);
             if (t->rows_size() == 0)
@@ -847,7 +850,7 @@ int View::headerWidth()
 
     const vector< boost::shared_ptr<Trace> > traces(get_traces(ALL_VIEW));
     if (!traces.empty()) {
-        BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces)
+        for(auto &t : traces)
             headerWidth = max(t->get_name_width() + t->get_leftWidth() + t->get_rightWidth(),
                               headerWidth);
     }
@@ -1090,7 +1093,7 @@ QRect View::get_view_rect()
 {
     if (_session->get_device()->dev_inst()->mode == DSO) {
         const vector< boost::shared_ptr<Signal> > sigs(_session->get_signals());
-        BOOST_FOREACH(const boost::shared_ptr<Signal> s, sigs) {
+        for(auto &s : sigs) {
             return s->get_view_rect();
         }
     }
@@ -1103,7 +1106,7 @@ int View::get_view_width()
     int view_width = 0;
     if (_session->get_device()->dev_inst()->mode == DSO) {
         const vector< boost::shared_ptr<Signal> > sigs(_session->get_signals());
-        BOOST_FOREACH(const boost::shared_ptr<Signal> s, sigs) {
+        for(auto &s : sigs) {
             view_width = max(view_width, s->get_view_rect().width());
         }
     } else {
@@ -1118,7 +1121,7 @@ int View::get_view_height()
     int view_height = 0;
     if (_session->get_device()->dev_inst()->mode == DSO) {
         const vector< boost::shared_ptr<Signal> > sigs(_session->get_signals());
-        BOOST_FOREACH(const boost::shared_ptr<Signal> s, sigs) {
+        for(auto &s : sigs) {
             view_height = max(view_height, s->get_view_rect().height());
         }
     } else {
@@ -1193,7 +1196,7 @@ void View::show_region(uint64_t start, uint64_t end, bool keep)
 void View::viewport_update()
 {
     _viewcenter->update();
-    BOOST_FOREACH(QWidget *viewport, _viewport_list)
+    for(QWidget *viewport : _viewport_list)
         viewport->update();
 }
 
diff --git a/DSView/pv/view/viewport.cpp b/DSView/pv/view/viewport.cpp
index f4c475f6..5c548e63 100755
--- a/DSView/pv/view/viewport.cpp
+++ b/DSView/pv/view/viewport.cpp
@@ -39,7 +39,7 @@
 #include <QStyleOption>
 #include <QPainterPath> 
 #include <math.h> 
-#include <boost/foreach.hpp>
+ 
 
 #include "../config/appconfig.h"
 
@@ -112,7 +112,7 @@ int Viewport::get_total_height() const
 	int h = 0;
 
     const vector< boost::shared_ptr<Trace> > traces(_view.get_traces(_type));
-    BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces) {
+    for(auto &t : traces) {
         assert(t);
         h += (int)(t->get_totalHeight());
     }
@@ -150,7 +150,8 @@ void Viewport::paintEvent(QPaintEvent *event)
     fore.setAlpha(View::ForeAlpha);
     _view.set_back(false);
     const vector< boost::shared_ptr<Trace> > traces(_view.get_traces(_type));
-    BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces)
+
+    for(auto &t : traces)
     {
         assert(t); 
   
@@ -186,7 +187,7 @@ void Viewport::paintEvent(QPaintEvent *event)
         paintSignals(p, fore, back);
     }
 
-    BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces)
+    for(auto &t : traces)
     {
         assert(t);
         if (t->enabled())
@@ -203,7 +204,8 @@ void Viewport::paintSignals(QPainter &p, QColor fore, QColor back)
 {
     const vector< boost::shared_ptr<Trace> > traces(_view.get_traces(_type));
     if (_view.session().get_device()->dev_inst()->mode == LOGIC) {
-        BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces)
+
+        for(auto &t : traces)
         {
             assert(t);
            // auto ptr = t.get();
@@ -227,7 +229,7 @@ void Viewport::paintSignals(QPainter &p, QColor fore, QColor back)
 
             QPainter dbp(&pixmap);
             //dbp.begin(this);
-            BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces)
+            for(auto &t : traces)
             {
                 assert(t);
 
@@ -520,7 +522,8 @@ void Viewport::mousePressEvent(QMouseEvent *event)
         event->button() == Qt::LeftButton &&
         _view.session().get_device()->dev_inst()->mode == DSO) {
         const vector< boost::shared_ptr<Signal> > sigs(_view.session().get_signals());
-        BOOST_FOREACH(const boost::shared_ptr<Signal> s, sigs) {
+
+       for(auto &s : sigs) {
             assert(s);
             if (!s->enabled())
                 continue;
@@ -637,7 +640,7 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
             }
             _drag_strength = (_mouse_down_point - event->pos()).x();
         } else if (_type == FFT_VIEW) {
-            BOOST_FOREACH(const boost::shared_ptr<view::SpectrumTrace> t, _view.session().get_spectrum_traces()) {
+            for(auto &t: _view.session().get_spectrum_traces()) {
                 assert(t);
                 if(t->enabled()) {
                     double delta = (_mouse_point - event->pos()).x();
@@ -667,7 +670,8 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
                     uint64_t index0 = 0, index1 = 0, index2 = 0;
                     bool logic = false;
                     const vector< boost::shared_ptr<Signal> > sigs(_view.session().get_signals());
-                    BOOST_FOREACH(const boost::shared_ptr<Signal> s, sigs) {
+
+                   for(auto &s: sigs) {
                         assert(s);
                         boost::shared_ptr<view::LogicSignal> logicSig;
                         boost::shared_ptr<view::DsoSignal> dsoSig;
@@ -730,7 +734,7 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
         }
         if (!(event->buttons() | Qt::NoButton)) {
             if (_action_type == DSO_XM_STEP1 || _action_type == DSO_XM_STEP2) {
-                BOOST_FOREACH(const boost::shared_ptr<Signal> s, _view.session().get_signals()) {
+                for(auto &s : _view.session().get_signals()) {
                     assert(s);
                     if (!s->get_view_rect().contains(event->pos())) {
                         clear_dso_xm();
@@ -784,7 +788,8 @@ void Viewport::mouseReleaseEvent(QMouseEvent *event)
                 if (_action_type == NO_ACTION) {
                     if (_mouse_down_point.x() == event->pos().x()) {
                         const vector< boost::shared_ptr<Signal> > sigs(_view.session().get_signals());
-                        BOOST_FOREACH(const boost::shared_ptr<Signal> s, sigs) {
+
+                        for(auto &s : sigs) {
                             assert(s);
                             boost::shared_ptr<view::LogicSignal> logicSig;
                             if ((logicSig = dynamic_pointer_cast<view::LogicSignal>(s))) {
@@ -807,7 +812,8 @@ void Viewport::mouseReleaseEvent(QMouseEvent *event)
                 if (_action_type == NO_ACTION) {
                     if (_mouse_down_point.x() == event->pos().x()) {
                         const vector< boost::shared_ptr<Signal> > sigs(_view.session().get_signals());
-                        BOOST_FOREACH(const boost::shared_ptr<Signal> s, sigs) {
+
+                        for(auto &s : sigs) {
                             assert(s);
                             if (abs(event->pos().y() - s->get_y()) < _view.get_signalHeight()) {
                                 _action_type = LOGIC_EDGE;
@@ -844,7 +850,7 @@ void Viewport::mouseReleaseEvent(QMouseEvent *event)
 
                 const vector< boost::shared_ptr<Trace> > traces(
                     _view.get_traces(ALL_VIEW));
-                BOOST_FOREACH(const boost::shared_ptr<Trace> t, traces)
+                for(auto &t : traces)
                     t->select(false);
             }
         } else if (_action_type == DSO_XM_STEP0) {
@@ -961,7 +967,7 @@ void Viewport::mouseDoubleClickEvent(QMouseEvent *event)
             uint64_t index0 = 0, index1 = 0, index2 = 0;
             if (_view.session().get_device()->dev_inst()->mode == LOGIC) {
                 const vector< boost::shared_ptr<Signal> > sigs(_view.session().get_signals());
-                BOOST_FOREACH(const boost::shared_ptr<Signal> s, sigs) {
+                for(auto &s : sigs) {
                     assert(s);
                     boost::shared_ptr<view::LogicSignal> logicSig;
                     if ((logicSig = dynamic_pointer_cast<view::LogicSignal>(s))) {
@@ -994,7 +1000,7 @@ void Viewport::mouseDoubleClickEvent(QMouseEvent *event)
             clear_dso_xm();
             measure_updated();
         } else if (_action_type == NO_ACTION) {
-            BOOST_FOREACH(const boost::shared_ptr<Signal> s, _view.session().get_signals()) {
+            for(auto &s : _view.session().get_signals()) {
                 assert(s);
                 if (s->get_view_rect().contains(event->pos())) {
                     _dso_xm_index[0] = _view.pixel2index(event->pos().x());
@@ -1020,7 +1026,7 @@ void Viewport::wheelEvent(QWheelEvent *event)
 	assert(event);
 
     if (_type == FFT_VIEW) {
-        BOOST_FOREACH(const boost::shared_ptr<view::SpectrumTrace> t, _view.session().get_spectrum_traces()) {
+        for(auto &t : _view.session().get_spectrum_traces()) {
             assert(t);
             if(t->enabled()) {
                 t->zoom(event->delta() / 80, event->x());
@@ -1061,7 +1067,7 @@ void Viewport::wheelEvent(QWheelEvent *event)
     }
 
     const vector< boost::shared_ptr<Signal> > sigs(_view.session().get_signals());
-    BOOST_FOREACH(const boost::shared_ptr<Signal> s, sigs) {
+    for(auto &s : sigs) {
         assert(s);
         boost::shared_ptr<view::DsoSignal> dsoSig;
         if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
@@ -1169,7 +1175,8 @@ void Viewport::measure()
     if (_type == TIME_VIEW) {
         const uint64_t sample_rate = _view.session().cur_snap_samplerate();
         const vector< boost::shared_ptr<Signal> > sigs(_view.session().get_signals());
-        BOOST_FOREACH(const boost::shared_ptr<Signal> s, sigs) {
+
+        for(auto &s : sigs) {
             assert(s);
             boost::shared_ptr<view::LogicSignal> logicSig;
             boost::shared_ptr<view::DsoSignal> dsoSig;
@@ -1251,7 +1258,7 @@ void Viewport::measure()
             }
         }
     } else if (_type == FFT_VIEW) {
-        BOOST_FOREACH(const boost::shared_ptr<view::SpectrumTrace> t, _view.session().get_spectrum_traces()) {
+        for(auto &t : _view.session().get_spectrum_traces()) {
             assert(t);
             if(t->enabled()) {
                 t->measure(_mouse_point);
@@ -1325,7 +1332,8 @@ void Viewport::paintMeasure(QPainter &p, QColor fore, QColor back)
     const vector< boost::shared_ptr<Signal> > sigs(_view.session().get_signals());
     if (_action_type == NO_ACTION &&
         _measure_type == DSO_VALUE) {
-        BOOST_FOREACH(const boost::shared_ptr<Signal> s, sigs) {
+
+        for(auto &s : sigs) {
             boost::shared_ptr<view::DsoSignal> dsoSig;
             boost::shared_ptr<view::AnalogSignal> analogSig;
             if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
@@ -1353,7 +1361,7 @@ void Viewport::paintMeasure(QPainter &p, QColor fore, QColor back)
     }
 
     if (_dso_ym_valid) {
-        BOOST_FOREACH(const boost::shared_ptr<Signal> s, sigs) {
+        for(auto &s : sigs) {
             boost::shared_ptr<view::DsoSignal> dsoSig;
             if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
                 if (dsoSig->get_index() == _dso_ym_sig_index) {
diff --git a/DSView/pv/view/viewstatus.cpp b/DSView/pv/view/viewstatus.cpp
index 739df933..27345f84 100755
--- a/DSView/pv/view/viewstatus.cpp
+++ b/DSView/pv/view/viewstatus.cpp
@@ -76,7 +76,8 @@ void ViewStatus::paintEvent(QPaintEvent *)
             int sig_index = std::get<1>(_mrects[i]);
             boost::shared_ptr<view::DsoSignal> dsoSig = NULL;
             const vector< boost::shared_ptr<Signal> > sigs(_session->get_signals());
-            BOOST_FOREACH(const boost::shared_ptr<Signal> s, sigs) {
+
+            for(auto &s : sigs) {
                 assert(s);
                 if (!s->enabled())
                     continue;
@@ -187,8 +188,7 @@ void ViewStatus::mousePressEvent(QMouseEvent *event)
     if (_session->get_device()->dev_inst()->mode != DSO)
         return;
 
-    if (event->button() == Qt::LeftButton) {
-        //BOOST_FOREACH(QRect rect, std::get<0>(_mrects)) {
+    if (event->button() == Qt::LeftButton) { 
         for(size_t i = 0; i < _mrects.size(); i++) {
             const QRect rect = std::get<0>(_mrects[i]);
             if (rect.contains(event->pos())) {
diff --git a/DSView/pv/view/viewstatus.h b/DSView/pv/view/viewstatus.h
index 56cfaa43..29bd473e 100755
--- a/DSView/pv/view/viewstatus.h
+++ b/DSView/pv/view/viewstatus.h
@@ -28,7 +28,7 @@
 #include <QPushButton>
 #include <QToolButton>
 
-#include <boost/foreach.hpp>
+ 
 #include <boost/shared_ptr.hpp>
 
 #include <libsigrok4DSL/libsigrok.h>
diff --git a/DSView/pv/view/xcursor.cpp b/DSView/pv/view/xcursor.cpp
index a96daf20..eeecf6aa 100755
--- a/DSView/pv/view/xcursor.cpp
+++ b/DSView/pv/view/xcursor.cpp
@@ -28,8 +28,7 @@
 #include "dsosignal.h"
 
 #include <QPainter>
-
-#include <boost/foreach.hpp>
+ 
 
 using namespace boost;
 using namespace std;
@@ -48,7 +47,8 @@ XCursor::XCursor(View &view, QColor &colour,
 {
     _dsoSig = NULL;
     const std::vector< boost::shared_ptr<Signal> > sigs(_view.session().get_signals());
-    BOOST_FOREACH(const boost::shared_ptr<Signal> s, sigs) {
+    
+    for(auto &s : sigs) {
         boost::shared_ptr<DsoSignal> dsoSig;
         if ((dsoSig = dynamic_pointer_cast<DsoSignal>(s)))
             if (dsoSig->enabled()) {
diff --git a/DSView/pv/widgets/decodergroupbox.cpp b/DSView/pv/widgets/decodergroupbox.cpp
index a529c4df..2da50f7b 100755
--- a/DSView/pv/widgets/decodergroupbox.cpp
+++ b/DSView/pv/widgets/decodergroupbox.cpp
@@ -33,8 +33,7 @@
 #include <QScrollBar>
 #include <QScreen>
 #include <QApplication>
-
-#include <boost/foreach.hpp>
+ 
 #include "../config/appconfig.h"
 
 #include <assert.h>
@@ -72,8 +71,7 @@ DecoderGroupBox::DecoderGroupBox(boost::shared_ptr<data::DecoderStack> &decoder_
     }
 
     _index = 0;
-    BOOST_FOREACH(boost::shared_ptr<data::decode::Decoder> dec,
-        _decoder_stack->stack()) {
+    for(auto &dec : _decoder_stack->stack()) {
         if (dec == _dec)
             break;
         _index++;
@@ -137,8 +135,8 @@ void DecoderGroupBox::tog_icon()
     int index = id.toInt();
     if (index == -1) {
         int i = _index;
-        BOOST_FOREACH(boost::shared_ptr<data::decode::Decoder> dec,
-            _decoder_stack->stack()) {
+
+       for(auto &dec : _decoder_stack->stack()) {
             if (i-- == 0) {
                 dec->show(!dec->shown());
                 sc->setIcon(QIcon(dec->shown() ? iconPath+"/shown.svg" :
@@ -164,8 +162,7 @@ void DecoderGroupBox::tog_icon()
 void DecoderGroupBox::on_del_stack()
 {
     int i = _index;
-    BOOST_FOREACH(boost::shared_ptr<data::decode::Decoder> dec,
-        _decoder_stack->stack()) {
+    for(auto &dec : _decoder_stack->stack()) {
         if (i-- == 0) {
             del_stack(dec);
             break;

From 1d3b8accfd1a95d8b6c982d8f03818a05b42334b Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Thu, 4 Nov 2021 15:38:42 +0800
Subject: [PATCH 20/58] remove all shared_ptr, remove all boost foreach

---
 DSView/mystyle.h                          |   2 +-
 DSView/pv/ZipMaker.cpp                    |   2 +-
 DSView/pv/config/appconfig.cpp            |  10 +-
 DSView/pv/config/appconfig.h              |  15 +-
 DSView/pv/data/analog.cpp                 |   5 +-
 DSView/pv/data/analog.h                   |  12 +-
 DSView/pv/data/analogsnapshot.cpp         |   6 +-
 DSView/pv/data/analogsnapshot.h           |   6 +-
 DSView/pv/data/decode/annotation.cpp      |  22 +-
 DSView/pv/data/decode/annotation.h        |  19 +-
 DSView/pv/data/decode/decoder.cpp         |  67 +---
 DSView/pv/data/decode/decoder.h           |  44 ++-
 DSView/pv/data/decode/row.cpp             |   9 +-
 DSView/pv/data/decode/row.h               |   6 +-
 DSView/pv/data/decode/rowdata.cpp         |  12 +-
 DSView/pv/data/decode/rowdata.h           |  14 +-
 DSView/pv/data/decodermodel.cpp           |   9 +-
 DSView/pv/data/decodermodel.h             |  16 +-
 DSView/pv/data/decoderstack.cpp           |  67 ++--
 DSView/pv/data/decoderstack.h             |  41 +-
 DSView/pv/data/dso.cpp                    |   5 +-
 DSView/pv/data/dso.h                      |  11 +-
 DSView/pv/data/dsosnapshot.cpp            |   6 +-
 DSView/pv/data/dsosnapshot.h              |   6 +-
 DSView/pv/data/group.cpp                  |   5 +-
 DSView/pv/data/group.h                    |  11 +-
 DSView/pv/data/groupsnapshot.cpp          |  16 +-
 DSView/pv/data/groupsnapshot.h            |  11 +-
 DSView/pv/data/logic.cpp                  |   8 +-
 DSView/pv/data/logic.h                    |  11 +-
 DSView/pv/data/mathstack.cpp              |  20 +-
 DSView/pv/data/mathstack.h                |  23 +-
 DSView/pv/data/snapshot.cpp               |  20 +-
 DSView/pv/data/snapshot.h                 |  22 +-
 DSView/pv/data/spectrumstack.cpp          |  26 +-
 DSView/pv/data/spectrumstack.h            |  21 +-
 DSView/pv/device/device.cpp               |   6 +-
 DSView/pv/device/device.h                 |   6 +-
 DSView/pv/device/devinst.cpp              |   8 +-
 DSView/pv/device/devinst.h                |  12 +-
 DSView/pv/device/file.cpp                 |   2 +-
 DSView/pv/device/file.h                   |   2 +-
 DSView/pv/device/inputfile.cpp            |   2 +-
 DSView/pv/device/inputfile.h              |   2 +-
 DSView/pv/device/sessionfile.cpp          |   2 +-
 DSView/pv/device/sessionfile.h            |   2 +-
 DSView/pv/dialogs/calibration.cpp         |   2 +-
 DSView/pv/dialogs/calibration.h           |   3 +-
 DSView/pv/dialogs/deviceoptions.cpp       |  14 +-
 DSView/pv/dialogs/deviceoptions.h         |   4 +-
 DSView/pv/dialogs/dsomeasure.cpp          |  14 +-
 DSView/pv/dialogs/dsomeasure.h            |   5 +-
 DSView/pv/dialogs/fftoptions.cpp          |  16 +-
 DSView/pv/dialogs/fftoptions.h            |   3 +-
 DSView/pv/dialogs/lissajousoptions.cpp    |  12 +-
 DSView/pv/dialogs/lissajousoptions.h      |   3 +-
 DSView/pv/dialogs/mathoptions.cpp         |  14 +-
 DSView/pv/dialogs/mathoptions.h           |   3 +-
 DSView/pv/dialogs/protocolexp.cpp         |  13 +-
 DSView/pv/dialogs/protocolexp.h           |   4 +-
 DSView/pv/dialogs/protocollist.cpp        |  19 +-
 DSView/pv/dialogs/protocollist.h          |   3 +-
 DSView/pv/dialogs/regionoptions.h         |   4 +-
 DSView/pv/dialogs/search.cpp              |   8 +-
 DSView/pv/dialogs/search.h                |   4 +-
 DSView/pv/dialogs/shadow.cpp              |   2 +-
 DSView/pv/dialogs/shadow.h                |   8 +-
 DSView/pv/dialogs/storeprogress.h         |   5 +-
 DSView/pv/dialogs/waitingdialog.cpp       |   4 +-
 DSView/pv/dialogs/waitingdialog.h         |   4 +-
 DSView/pv/dock/dsotriggerdock.cpp         |   6 +-
 DSView/pv/dock/measuredock.cpp            |  18 +-
 DSView/pv/dock/protocoldock.cpp           |  40 +-
 DSView/pv/dock/searchdock.cpp             |  11 +-
 DSView/pv/dsvdef.cpp                      |   7 +
 DSView/pv/dsvdef.h                        |  12 +
 DSView/pv/mainwindow.cpp                  |  69 ++--
 DSView/pv/minizip/mztools.c               |   4 +-
 DSView/pv/prop/binding/binding.cpp        |  15 +-
 DSView/pv/prop/binding/binding.h          |  14 +-
 DSView/pv/prop/binding/decoderoptions.cpp |  35 +-
 DSView/pv/prop/binding/decoderoptions.h   |  12 +-
 DSView/pv/prop/binding/deviceoptions.cpp  |  28 +-
 DSView/pv/prop/binding/probeoptions.cpp   |  18 +-
 DSView/pv/prop/bool.cpp                   |   4 +-
 DSView/pv/prop/bool.h                     |   4 +-
 DSView/pv/prop/enum.cpp                   |   4 +-
 DSView/pv/prop/property.cpp               |  12 +-
 DSView/pv/prop/property.h                 |  10 +-
 DSView/pv/sigsession.cpp                  | 439 ++++++++++------------
 DSView/pv/sigsession.h                    | 110 +++---
 DSView/pv/storesession.cpp                |  91 ++---
 DSView/pv/storesession.h                  |  13 +-
 DSView/pv/toolbars/filebar.cpp            |   4 +-
 DSView/pv/toolbars/samplingbar.cpp        |  18 +-
 DSView/pv/toolbars/samplingbar.h          |  10 +-
 DSView/pv/toolbars/titlebar.cpp           |  12 +-
 DSView/pv/toolbars/titlebar.h             |   2 +-
 DSView/pv/view/analogsignal.cpp           |  91 +++--
 DSView/pv/view/analogsignal.h             |  57 ++-
 DSView/pv/view/cursor.cpp                 |   4 +-
 DSView/pv/view/cursor.h                   |   4 +-
 DSView/pv/view/decodetrace.cpp            |  87 +++--
 DSView/pv/view/decodetrace.h              |  60 +--
 DSView/pv/view/devmode.cpp                |   4 +-
 DSView/pv/view/devmode.h                  |   5 +-
 DSView/pv/view/dsldial.cpp                |  14 +-
 DSView/pv/view/dsldial.h                  |  14 +-
 DSView/pv/view/dsosignal.cpp              |  90 +++--
 DSView/pv/view/dsosignal.h                |  56 ++-
 DSView/pv/view/groupsignal.cpp            |  24 +-
 DSView/pv/view/groupsignal.h              |  15 +-
 DSView/pv/view/header.cpp                 |  61 ++-
 DSView/pv/view/header.h                   |  12 +-
 DSView/pv/view/lissajoustrace.cpp         |  21 +-
 DSView/pv/view/lissajoustrace.h           |  21 +-
 DSView/pv/view/logicsignal.cpp            |  54 ++-
 DSView/pv/view/logicsignal.h              |  30 +-
 DSView/pv/view/mathtrace.cpp              |  28 +-
 DSView/pv/view/mathtrace.h                |  34 +-
 DSView/pv/view/ruler.cpp                  |  17 +-
 DSView/pv/view/ruler.h                    |   2 +-
 DSView/pv/view/selectableitem.cpp         |   2 +-
 DSView/pv/view/selectableitem.h           |   4 +-
 DSView/pv/view/signal.cpp                 |   4 +-
 DSView/pv/view/signal.h                   |   9 +-
 DSView/pv/view/spectrumtrace.cpp          |  26 +-
 DSView/pv/view/spectrumtrace.h            |  24 +-
 DSView/pv/view/timemarker.cpp             |   6 +-
 DSView/pv/view/timemarker.h               |  10 +-
 DSView/pv/view/trace.cpp                  |  38 +-
 DSView/pv/view/trace.h                    |  41 +-
 DSView/pv/view/view.cpp                   |  99 ++---
 DSView/pv/view/view.h                     |  37 +-
 DSView/pv/view/viewport.cpp               | 126 ++++---
 DSView/pv/view/viewport.h                 |  13 +-
 DSView/pv/view/viewstatus.cpp             |   6 +-
 DSView/pv/view/viewstatus.h               |   2 -
 DSView/pv/view/xcursor.cpp                |  20 +-
 DSView/pv/view/xcursor.h                  |  23 +-
 DSView/pv/widgets/decodergroupbox.cpp     |   4 +-
 DSView/pv/widgets/decodergroupbox.h       |  13 +-
 142 files changed, 1484 insertions(+), 1671 deletions(-)

diff --git a/DSView/mystyle.h b/DSView/mystyle.h
index c53bda52..e2cc768f 100644
--- a/DSView/mystyle.h
+++ b/DSView/mystyle.h
@@ -7,7 +7,7 @@ class MyStyle : public QProxyStyle
 {
     Q_OBJECT
     public:
-    int pixelMetric(PixelMetric metric, const QStyleOption * option = 0, const QWidget * widget = 0 ) const {
+    int pixelMetric(PixelMetric metric, const QStyleOption * option = 0, const QWidget * widget = 0 ) {
         int s = QProxyStyle::pixelMetric(metric, option, widget);
         if (metric == QStyle::PM_SmallIconSize) {
             s = 24;
diff --git a/DSView/pv/ZipMaker.cpp b/DSView/pv/ZipMaker.cpp
index add6a080..bf57dd14 100644
--- a/DSView/pv/ZipMaker.cpp
+++ b/DSView/pv/ZipMaker.cpp
@@ -262,7 +262,7 @@ const char *ZipMaker::GetError()
             break;
         }
         rdlen += dlen;
-        buf = buf + dlen; //move pointer
+        buf   += dlen; //move pointer
         buflen = inf.dataLen - rdlen;
     } 
  
diff --git a/DSView/pv/config/appconfig.cpp b/DSView/pv/config/appconfig.cpp
index 269b261f..3901c7bf 100644
--- a/DSView/pv/config/appconfig.cpp
+++ b/DSView/pv/config/appconfig.cpp
@@ -27,14 +27,14 @@
   
 #define MAX_PROTOCOL_FORMAT_LIST 15
 
-StringPair::StringPair(const string &key, const string &value)
+StringPair::StringPair(const std::string &key, const std::string &value)
 {
     m_key = key;
     m_value = value;
 }
 
 //------------function
-QString FormatArrayToString(vector<StringPair> &protocolFormats){
+QString FormatArrayToString(std::vector<StringPair> &protocolFormats){
     QString str;
 
     for (StringPair &o : protocolFormats){
@@ -49,7 +49,7 @@ QString FormatArrayToString(vector<StringPair> &protocolFormats){
     return str;
 }
 
-void StringToFormatArray(const QString &str, vector<StringPair> &protocolFormats){
+void StringToFormatArray(const QString &str, std::vector<StringPair> &protocolFormats){
     QStringList arr = str.split(";");
     for (int i=0; i<arr.size(); i++){
         QString line = arr[i];
@@ -218,7 +218,7 @@ void AppConfig::LoadAll()
   }
  
 
-void AppConfig::SetProtocolFormat(const string &protocolName, const string &value)
+void AppConfig::SetProtocolFormat(const std::string &protocolName, const std::string &value)
 {
     bool bChange = false;
     for (StringPair &o : _appOptions.m_protocolFormats){
@@ -247,7 +247,7 @@ void AppConfig::SetProtocolFormat(const string &protocolName, const string &valu
     }
 }
 
-string AppConfig::GetProtocolFormat(const string &protocolName)
+std::string AppConfig::GetProtocolFormat(const std::string &protocolName)
 {
      for (StringPair &o : _appOptions.m_protocolFormats){
         if (o.m_key == protocolName){ 
diff --git a/DSView/pv/config/appconfig.h b/DSView/pv/config/appconfig.h
index 224baf8d..7cddff2a 100644
--- a/DSView/pv/config/appconfig.h
+++ b/DSView/pv/config/appconfig.h
@@ -27,8 +27,7 @@
 #include <QString>
 #include <QByteArray>
 
-using namespace std;
-
+  
 //--------------------api---
 
 QString GetDirectoryName(QString path);
@@ -40,9 +39,9 @@ QString GetIconPath();
 class StringPair
 {
 public:
-   StringPair(const string &key, const string &value);
-   string m_key;
-   string m_value;
+   StringPair(const std::string &key, const std::string &value);
+   std::string m_key;
+   std::string m_value;
 };
 
 
@@ -52,7 +51,7 @@ struct AppOptions
     bool  warnofMultiTrig;
     bool  originalData;
 
-    vector<StringPair> m_protocolFormats;
+    std::vector<StringPair> m_protocolFormats;
 };
  
 struct FrameOptions
@@ -91,8 +90,8 @@ public:
   void SaveHistory();
   void SaveFrame();
   
-  void SetProtocolFormat(const string &protocolName, const string &value);
-  string GetProtocolFormat(const string &protocolName); 
+  void SetProtocolFormat(const std::string &protocolName, const std::string &value);
+  std::string GetProtocolFormat(const std::string &protocolName); 
 
 public:
   AppOptions    _appOptions;
diff --git a/DSView/pv/data/analog.cpp b/DSView/pv/data/analog.cpp
index 85046322..4dfcc8c4 100755
--- a/DSView/pv/data/analog.cpp
+++ b/DSView/pv/data/analog.cpp
@@ -24,7 +24,6 @@
 #include "analogsnapshot.h"
  
 
-using namespace boost;
 using namespace std;
 
 namespace pv {
@@ -35,12 +34,12 @@ Analog::Analog() :
 {
 }
 
-void Analog::push_snapshot(boost::shared_ptr<AnalogSnapshot> &snapshot)
+void Analog::push_snapshot(AnalogSnapshot *snapshot)
 {
 	_snapshots.push_front(snapshot);
 }
 
-deque< boost::shared_ptr<AnalogSnapshot> >& Analog::get_snapshots()
+std::deque<AnalogSnapshot*>& Analog::get_snapshots()
 {
 	return _snapshots;
 }
diff --git a/DSView/pv/data/analog.h b/DSView/pv/data/analog.h
index c28b649f..dbba04df 100755
--- a/DSView/pv/data/analog.h
+++ b/DSView/pv/data/analog.h
@@ -26,7 +26,7 @@
 
 #include "signaldata.h"
 
-#include <boost/shared_ptr.hpp>
+ 
 #include <deque>
 
 namespace pv {
@@ -39,17 +39,13 @@ class Analog : public SignalData
 public:
     Analog();
 
-	void push_snapshot(
-		boost::shared_ptr<AnalogSnapshot> &snapshot);
-
-	std::deque< boost::shared_ptr<AnalogSnapshot> >&
-		get_snapshots();
-
+	void push_snapshot(AnalogSnapshot *snapshot);
+	std::deque<AnalogSnapshot*>& get_snapshots();
     void clear();
     void init();
 
 private:
-	std::deque< boost::shared_ptr<AnalogSnapshot> > _snapshots;
+	std::deque<AnalogSnapshot*> _snapshots;
 };
 
 } // namespace data
diff --git a/DSView/pv/data/analogsnapshot.cpp b/DSView/pv/data/analogsnapshot.cpp
index 7da95a1a..0fb067f3 100755
--- a/DSView/pv/data/analogsnapshot.cpp
+++ b/DSView/pv/data/analogsnapshot.cpp
@@ -214,7 +214,7 @@ void AnalogSnapshot::append_data(void *data, uint64_t samples, uint16_t pitch)
     }
 }
 
-const uint8_t* AnalogSnapshot::get_samples(int64_t start_sample) const
+const uint8_t* AnalogSnapshot::get_samples(int64_t start_sample)
 {
 	assert(start_sample >= 0);
     assert(start_sample < (int64_t)get_sample_count());
@@ -227,7 +227,7 @@ const uint8_t* AnalogSnapshot::get_samples(int64_t start_sample) const
 }
 
 void AnalogSnapshot::get_envelope_section(EnvelopeSection &s,
-    uint64_t start, int64_t count, float min_length, int probe_index) const
+    uint64_t start, int64_t count, float min_length, int probe_index)
 {
     assert(count >= 0);
 	assert(min_length > 0);
@@ -371,7 +371,7 @@ int AnalogSnapshot::get_ch_order(int sig_index)
         return order;
 }
 
-int AnalogSnapshot::get_scale_factor() const
+int AnalogSnapshot::get_scale_factor()
 {
     return EnvelopeScaleFactor;
 }
diff --git a/DSView/pv/data/analogsnapshot.h b/DSView/pv/data/analogsnapshot.h
index 0d6c1473..e9716a45 100755
--- a/DSView/pv/data/analogsnapshot.h
+++ b/DSView/pv/data/analogsnapshot.h
@@ -95,14 +95,14 @@ public:
 
 	void append_payload(const sr_datafeed_analog &analog);
 
-    const uint8_t *get_samples(int64_t start_sample) const;
+    const uint8_t *get_samples(int64_t start_sample);
 
     void get_envelope_section(EnvelopeSection &s,
-        uint64_t start, int64_t count, float min_length, int probe_index) const;
+        uint64_t start, int64_t count, float min_length, int probe_index);
 
     int get_ch_order(int sig_index);
 
-    int get_scale_factor() const;
+    int get_scale_factor();
 
     bool has_data(int index);
     int get_block_num();
diff --git a/DSView/pv/data/decode/annotation.cpp b/DSView/pv/data/decode/annotation.cpp
index c0838d04..1949e0ec 100755
--- a/DSView/pv/data/decode/annotation.cpp
+++ b/DSView/pv/data/decode/annotation.cpp
@@ -172,26 +172,8 @@ Annotation::~Annotation()
 {
      
 }
-
-uint64_t Annotation::start_sample() const
-{
-	return _start_sample;
-}
-
-uint64_t Annotation::end_sample() const
-{
-	return _end_sample;
-}
-
-int Annotation::format() const
-{
-	return _format;
-}
-
-int Annotation::type() const
-{
-    return _type;
-}
+ 
+ 
 
 const std::vector<QString>& Annotation::annotations() const
 {
diff --git a/DSView/pv/data/decode/annotation.h b/DSView/pv/data/decode/annotation.h
index 46d3e2eb..2e8d359e 100755
--- a/DSView/pv/data/decode/annotation.h
+++ b/DSView/pv/data/decode/annotation.h
@@ -46,10 +46,21 @@ public:
 
     ~Annotation();
 
-	uint64_t start_sample() const;
-	uint64_t end_sample() const;
-	int format() const;
-    int type() const;  
+	inline uint64_t start_sample() const{
+		return _start_sample;
+	}
+
+	inline uint64_t end_sample() const{
+		return _end_sample;
+	}
+
+	inline int format() const{
+		return _format;
+	}
+
+    inline int type() const{
+		return _type;
+	}  
 
 public:
 	const std::vector<QString>& annotations() const;
diff --git a/DSView/pv/data/decode/decoder.cpp b/DSView/pv/data/decode/decoder.cpp
index 94d1efe3..a9e4c66e 100755
--- a/DSView/pv/data/decode/decoder.cpp
+++ b/DSView/pv/data/decode/decoder.cpp
@@ -22,12 +22,9 @@
 #include <libsigrokdecode4DSL/libsigrokdecode.h>
 
 #include "decoder.h"
+#include <assert.h>
 
-using boost::shared_ptr;
-using std::set;
-using std::map;
-using std::string;
-
+  
 namespace pv {
 namespace data {
 namespace decode {
@@ -41,44 +38,18 @@ Decoder::Decoder(const srd_decoder *const dec) :
 
 Decoder::~Decoder()
 {
-    for (map<string, GVariant*>::const_iterator i = _options_back.begin();
+    for (auto i = _options_back.begin();
         i != _options_back.end(); i++)
         if ((*i).second)
             g_variant_unref((*i).second);
 }
-
-const srd_decoder* Decoder::decoder() const
-{
-	return _decoder;
-}
-
-bool Decoder::shown() const
-{
-	return _shown;
-}
-
-void Decoder::show(bool show)
-{
-    _shown = show;
-}
-
-const map<const srd_channel*, int>&
-Decoder::channels() const
-{
-	return _probes;
-}
-
-void Decoder::set_probes(std::map<const srd_channel *, int> probes)
+  
+void Decoder::set_probes(std::map<const srd_channel*, int> probes)
 {
     _probes_back = probes;
     _setted = true;
 }
-
-const std::map<std::string, GVariant*>& Decoder::options() const
-{
-	return _options;
-}
-
+  
 void Decoder::set_option(const char *id, GVariant *value)
 {
 	assert(value);
@@ -98,17 +69,7 @@ void Decoder::set_decode_region(uint64_t start, uint64_t end)
         _decode_end != end)
         _setted = true;
 }
-
-uint64_t Decoder::decode_start() const
-{
-    return _decode_start;
-}
-
-uint64_t Decoder::decode_end() const
-{
-    return _decode_end;
-}
-
+  
 //apply setting
 bool Decoder::commit()
 {
@@ -124,7 +85,7 @@ bool Decoder::commit()
     }
 }
 
-bool Decoder::have_required_probes() const
+bool Decoder::have_required_probes()
 {
 	for (GSList *l = _decoder->channels; l; l = l->next) {
 		const srd_channel *const pdch = (const srd_channel*)l->data;
@@ -136,12 +97,12 @@ bool Decoder::have_required_probes() const
 	return true;
 }
 
-srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
+srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session)
 {
 	GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
 		g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
 
-	for (map<string, GVariant*>::const_iterator i = _options.begin();
+	for (auto i = _options.begin();
 		i != _options.end(); i++)
 	{
 		GVariant *const value = (*i).second;
@@ -161,7 +122,7 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
 	GHashTable *const probes = g_hash_table_new_full(g_str_hash,
 		g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
 
-    for(map<const srd_channel*, int>::
+    for(std::map<const srd_channel*, int>::
 		const_iterator i = _probes.begin();
 		i != _probes.end(); i++)
 	{
@@ -174,11 +135,7 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
 
 	return decoder_inst;
 }
-
-int Decoder::get_channel_type(const srd_channel *ch)
-{
-    return ch->type;
-}
+ 
 
 } // decode
 } // data
diff --git a/DSView/pv/data/decode/decoder.h b/DSView/pv/data/decode/decoder.h
index 0309ae47..3d723bdb 100755
--- a/DSView/pv/data/decode/decoder.h
+++ b/DSView/pv/data/decode/decoder.h
@@ -27,9 +27,7 @@
 #include <string>
 #include <sstream>
 #include <iostream>
-
-#include <boost/shared_ptr.hpp>
-
+  
 #include <glib.h>
 
 struct srd_decoder;
@@ -48,29 +46,49 @@ public:
 
 	virtual ~Decoder();
 
-	const srd_decoder* decoder() const;
+	inline const srd_decoder* decoder(){
+        return _decoder;
+    }
 
-	bool shown() const;
-	void show(bool show = true);
+	inline bool shown(){
+        return _shown;
+    }
+
+	inline void show(bool show = true){
+         _shown = show;
+    }
+
+    inline std::map<const srd_channel*, int>& channels(){
+        return _probes;
+    }
 
-    const std::map<const srd_channel*, int>& channels() const;
     void set_probes(std::map<const srd_channel*, int> probes);
 
-	const std::map<std::string, GVariant*>& options() const;
+	inline std::map<std::string, GVariant*>& options(){
+        return _options;
+    }
 
 	void set_option(const char *id, GVariant *value);
 
-	bool have_required_probes() const;
+	bool have_required_probes();
 
-    srd_decoder_inst* create_decoder_inst(srd_session *session) const;
+    srd_decoder_inst* create_decoder_inst(srd_session *session);
 
     void set_decode_region(uint64_t start, uint64_t end);
-    uint64_t decode_start() const;
-    uint64_t decode_end() const;
+
+    inline uint64_t decode_start(){
+        return _decode_start;
+    }
+
+    inline uint64_t decode_end(){
+        return _decode_end;
+    }
 
     bool commit();
 
-    int get_channel_type(const srd_channel* ch);
+    inline int get_channel_type(const srd_channel* ch){
+        return ch->type;
+    }
 
 private:
 	const srd_decoder *const _decoder;
diff --git a/DSView/pv/data/decode/row.cpp b/DSView/pv/data/decode/row.cpp
index 63fef7c3..abe1633b 100755
--- a/DSView/pv/data/decode/row.cpp
+++ b/DSView/pv/data/decode/row.cpp
@@ -40,7 +40,14 @@ Row::Row(const srd_decoder *decoder, const srd_decoder_annotation_row *row, cons
 {
 } 
 
-const QString Row::title() const
+Row::Row(const Row &o)
+{
+	_decoder = o._decoder;
+	_row = o._row;
+	_order = o._order;
+}
+
+QString Row::title() const
 {
 	if (_decoder && _decoder->name && _row && _row->desc)
 		return QString("%1: %2")
diff --git a/DSView/pv/data/decode/row.h b/DSView/pv/data/decode/row.h
index b21f8093..b5c6cdd9 100755
--- a/DSView/pv/data/decode/row.h
+++ b/DSView/pv/data/decode/row.h
@@ -42,6 +42,8 @@ public:
         const srd_decoder_annotation_row *row = NULL,
         const int order = -1);
 
+	Row(const Row &o);
+
 public: 
 
 	inline const srd_decoder* decoder() const{
@@ -52,9 +54,9 @@ public:
 		return _row;
 	}
 
-	const QString title() const;
+    QString title() const;
 
-    bool operator<(const Row &other) const;
+    bool operator<(const Row &other)const;
 
 private:
 	const srd_decoder *_decoder;
diff --git a/DSView/pv/data/decode/rowdata.cpp b/DSView/pv/data/decode/rowdata.cpp
index 9ac049e9..e8ac9278 100755
--- a/DSView/pv/data/decode/rowdata.cpp
+++ b/DSView/pv/data/decode/rowdata.cpp
@@ -57,7 +57,7 @@ void RowData::clear()
     _item_count = 0;
 }
 
-uint64_t RowData::get_max_sample() const
+uint64_t RowData::get_max_sample()
 {
     std::lock_guard<std::mutex> lock(_global_visitor_mutex); 
 
@@ -66,12 +66,12 @@ uint64_t RowData::get_max_sample() const
 	return _annotations.back()->end_sample();
 }
 
-uint64_t RowData::get_max_annotation() const
+uint64_t RowData::get_max_annotation()
 {
     return _max_annotation;
 }
 
-uint64_t RowData::get_min_annotation() const
+uint64_t RowData::get_min_annotation()
 {
     if (_min_annotation == UINT64_MAX)
         return 10;
@@ -80,7 +80,7 @@ uint64_t RowData::get_min_annotation() const
 }
 
 void RowData::get_annotation_subset(std::vector<pv::data::decode::Annotation> &dest,
-		                        uint64_t start_sample, uint64_t end_sample) const
+		                        uint64_t start_sample, uint64_t end_sample)
 {  
     std::lock_guard<std::mutex> lock(_global_visitor_mutex);
 
@@ -93,7 +93,7 @@ void RowData::get_annotation_subset(std::vector<pv::data::decode::Annotation> &d
     }
 }
 
-uint64_t RowData::get_annotation_index(uint64_t start_sample) const
+uint64_t RowData::get_annotation_index(uint64_t start_sample)
 {
     std::lock_guard<std::mutex> lock(_global_visitor_mutex);
     uint64_t index = 0;
@@ -131,7 +131,7 @@ bool RowData::push_annotation(Annotation *a)
 }
  
 
-bool RowData::get_annotation(Annotation &ann, uint64_t index) const
+bool RowData::get_annotation(Annotation &ann, uint64_t index)
 {
     std::lock_guard<std::mutex> lock(_global_visitor_mutex);
 
diff --git a/DSView/pv/data/decode/rowdata.h b/DSView/pv/data/decode/rowdata.h
index 0059567f..e04af7a6 100755
--- a/DSView/pv/data/decode/rowdata.h
+++ b/DSView/pv/data/decode/rowdata.h
@@ -38,26 +38,26 @@ public:
     ~RowData();
 
 public:
-	uint64_t get_max_sample() const;
+	uint64_t get_max_sample();
 
-    uint64_t get_max_annotation() const;
-    uint64_t get_min_annotation() const;	
+    uint64_t get_max_annotation();
+    uint64_t get_min_annotation();	
 
-    uint64_t get_annotation_index(uint64_t start_sample) const;
+    uint64_t get_annotation_index(uint64_t start_sample);
 
     bool push_annotation(Annotation *a);
 
-    inline uint64_t get_annotation_size() const{
+    inline uint64_t get_annotation_size(){
         return _item_count;
     }
 
-    bool get_annotation(pv::data::decode::Annotation &ann, uint64_t index) const;
+    bool get_annotation(pv::data::decode::Annotation &ann, uint64_t index);
 
      /**
 	 * Extracts sorted annotations between two period into a vector.
 	 */
 	void get_annotation_subset(std::vector<pv::data::decode::Annotation> &dest,
-		                        uint64_t start_sample, uint64_t end_sample) const;
+		                        uint64_t start_sample, uint64_t end_sample);
 
     void clear();
 
diff --git a/DSView/pv/data/decodermodel.cpp b/DSView/pv/data/decodermodel.cpp
index c42bab6a..dbf7f121 100755
--- a/DSView/pv/data/decodermodel.cpp
+++ b/DSView/pv/data/decodermodel.cpp
@@ -37,18 +37,13 @@ DecoderModel::DecoderModel(QObject *parent)
 {
 }
 
-void DecoderModel::setDecoderStack(boost::shared_ptr<pv::data::DecoderStack> decoder_stack)
+void DecoderModel::setDecoderStack(DecoderStack *decoder_stack)
 {
     beginResetModel();
     _decoder_stack = decoder_stack;
     endResetModel();
 }
-
-const boost::shared_ptr<pv::data::DecoderStack>& DecoderModel::getDecoderStack() const
-{
-    return _decoder_stack;
-}
-
+ 
 int DecoderModel::rowCount(const QModelIndex & /* parent */) const
 {
     if (_decoder_stack)
diff --git a/DSView/pv/data/decodermodel.h b/DSView/pv/data/decodermodel.h
index 09032729..3a9d1760 100755
--- a/DSView/pv/data/decodermodel.h
+++ b/DSView/pv/data/decodermodel.h
@@ -22,9 +22,7 @@
 #define DSVIEW_PV_DATA_DECODERMODEL_H
 
 #include <QAbstractTableModel>
-
-#include <boost/shared_ptr.hpp>
-
+  
 #include <pv/data/decode/rowdata.h>
 
 namespace pv {
@@ -46,14 +44,16 @@ public:
     int rowCount(const QModelIndex & /*parent*/) const;
     int columnCount(const QModelIndex & /*parent*/) const;
     QVariant data(const QModelIndex &index, int role) const;
-    QVariant headerData(int section, Qt::Orientation orientation,
-                        int role) const;
+    QVariant headerData(int section, Qt::Orientation orientation,int role) const;
 
-    void setDecoderStack(boost::shared_ptr<pv::data::DecoderStack> decoder_stack);
-    const boost::shared_ptr<pv::data::DecoderStack>& getDecoderStack() const;
+    void setDecoderStack(DecoderStack *decoder_stack);
+
+    inline  DecoderStack* getDecoderStack(){
+        return _decoder_stack;
+    }
 
 private:
-    boost::shared_ptr<pv::data::DecoderStack> _decoder_stack;
+    DecoderStack   *_decoder_stack;
 };
 
 } // namespace data
diff --git a/DSView/pv/data/decoderstack.cpp b/DSView/pv/data/decoderstack.cpp
index 72d094ce..09d3dcf4 100755
--- a/DSView/pv/data/decoderstack.cpp
+++ b/DSView/pv/data/decoderstack.cpp
@@ -35,12 +35,11 @@
 #include "../sigsession.h"
 #include "../view/logicsignal.h"
 #include "../dsvdef.h"
-
-
-using namespace boost;
-using namespace std;
+#include <assert.h>
 
 using namespace pv::data::decode;
+using namespace std;
+using namespace boost;
 
 namespace pv {
 namespace data {
@@ -57,6 +56,10 @@ DecoderStack::DecoderStack(pv::SigSession *session,
 	const srd_decoder *const dec, DecoderStatus *decoder_status) :
 	_session(session)
 {
+    assert(session);
+    assert(dec);
+    assert(decoder_status);
+    
     _samples_decoded = 0;
     _sample_count = 0;
     _frame_complete = false;
@@ -75,8 +78,7 @@ DecoderStack::DecoderStack(pv::SigSession *session,
 	connect(_session, SIGNAL(frame_ended()),
 		this, SLOT(on_frame_ended()));
 
-    _stack.push_back(boost::shared_ptr<decode::Decoder>(
-		new decode::Decoder(dec)));
+    _stack.push_back(new decode::Decoder(dec));
  
     build_row();
 }
@@ -97,7 +99,7 @@ DecoderStack::~DecoderStack()
     _class_rows.clear();
 }
  
-void DecoderStack::push(boost::shared_ptr<decode::Decoder> decoder)
+void DecoderStack::push(decode::Decoder *decoder)
 {
 	assert(decoder);
 	_stack.push_back(decoder);
@@ -105,10 +107,10 @@ void DecoderStack::push(boost::shared_ptr<decode::Decoder> decoder)
     _options_changed = true;
 }
 
-void DecoderStack::remove(boost::shared_ptr<Decoder> &decoder)
+void DecoderStack::remove(Decoder *decoder)
 {
 	// Find the decoder in the stack
-    list< boost::shared_ptr<Decoder> >::iterator iter = _stack.begin();
+    auto  iter = _stack.begin();
     for(unsigned int i = 0; i < _stack.size(); i++, iter++)
         if ((*iter) == decoder)
             break;
@@ -187,7 +189,7 @@ void DecoderStack::build_row()
     }
 }
 
-int64_t DecoderStack::samples_decoded() const
+int64_t DecoderStack::samples_decoded()
 {
     std::lock_guard<std::mutex> decode_lock(_output_mutex);
 	return _samples_decoded;
@@ -196,7 +198,7 @@ int64_t DecoderStack::samples_decoded() const
 void DecoderStack::get_annotation_subset(
 	std::vector<pv::data::decode::Annotation> &dest,
 	const Row &row, uint64_t start_sample,
-	uint64_t end_sample) const
+	uint64_t end_sample)
 {  
     auto iter = _rows.find(row);
     if (iter != _rows.end())
@@ -206,7 +208,7 @@ void DecoderStack::get_annotation_subset(
 
 
 uint64_t DecoderStack::get_annotation_index(
-    const Row &row, uint64_t start_sample) const
+    const Row &row, uint64_t start_sample)
 {  
     uint64_t index = 0;
     auto iter = _rows.find(row);
@@ -270,7 +272,7 @@ void DecoderStack::set_rows_lshow(const decode::Row row, bool show)
     }
 }
 
-bool DecoderStack::has_annotations(const Row &row) const
+bool DecoderStack::has_annotations(const Row &row)
 {  
     auto iter =
         _rows.find(row);
@@ -283,13 +285,13 @@ bool DecoderStack::has_annotations(const Row &row) const
         return false;
 }
 
-uint64_t DecoderStack::list_annotation_size() const
+uint64_t DecoderStack::list_annotation_size()
 {
     std::lock_guard<std::mutex> lock(_output_mutex);
     uint64_t max_annotation_size = 0;
     for (auto i = _rows.begin();
         i != _rows.end(); i++) {
-        map<const Row, bool>::const_iterator iter = _rows_lshow.find((*i).first);
+        auto iter = _rows_lshow.find((*i).first);
         if (iter != _rows_lshow.end() && (*iter).second)
             max_annotation_size = max(max_annotation_size,
                 (*i).second->get_annotation_size());
@@ -298,11 +300,11 @@ uint64_t DecoderStack::list_annotation_size() const
     return max_annotation_size;
 }
 
-uint64_t DecoderStack::list_annotation_size(uint16_t row_index) const
+uint64_t DecoderStack::list_annotation_size(uint16_t row_index)
 { 
     for (auto i = _rows.begin();
         i != _rows.end(); i++) {
-        map<const Row, bool>::const_iterator iter = _rows_lshow.find((*i).first);
+        auto iter = _rows_lshow.find((*i).first);
         if (iter != _rows_lshow.end() && (*iter).second)
             if (row_index-- == 0) {
                 return (*i).second->get_annotation_size();
@@ -312,11 +314,11 @@ uint64_t DecoderStack::list_annotation_size(uint16_t row_index) const
 }
 
 bool DecoderStack::list_annotation(pv::data::decode::Annotation &ann,
-                                  uint16_t row_index, uint64_t col_index) const
+                                  uint16_t row_index, uint64_t col_index)
 { 
     for (auto i = _rows.begin();
         i != _rows.end(); i++) {
-        map<const Row, bool>::const_iterator iter = _rows_lshow.find((*i).first);
+        auto iter = _rows_lshow.find((*i).first);
         if (iter != _rows_lshow.end() && (*iter).second) {
             if (row_index-- == 0) {
                 return (*i).second->get_annotation(ann, col_index);
@@ -328,11 +330,11 @@ bool DecoderStack::list_annotation(pv::data::decode::Annotation &ann,
 }
 
 
-bool DecoderStack::list_row_title(int row, QString &title) const
+bool DecoderStack::list_row_title(int row, QString &title)
 { 
     for (auto i = _rows.begin();
         i != _rows.end(); i++) {
-        map<const Row, bool>::const_iterator iter = _rows_lshow.find((*i).first);
+        auto iter = _rows_lshow.find((*i).first);
         if (iter != _rows_lshow.end() && (*iter).second) {
             if (row-- == 0) {
                 title = (*i).first.title();
@@ -385,8 +387,8 @@ void DecoderStack::stop_decode()
 
 void DecoderStack::begin_decode()
 {
-    boost::shared_ptr<pv::view::LogicSignal> logic_signal;
-    boost::shared_ptr<pv::data::Logic> data;
+    pv::view::LogicSignal *logic_signal = NULL;
+    pv::data::Logic *data = NULL;
 
     if (!_options_changed)
         return;
@@ -409,7 +411,7 @@ void DecoderStack::begin_decode()
         if (dec && !dec->channels().empty()) {
             for(auto &sig :  _session->get_signals()) {
                 if((sig->get_index() == (*dec->channels().begin()).second) &&
-                   (logic_signal = dynamic_pointer_cast<view::LogicSignal>(sig)) &&
+                   (logic_signal = dynamic_cast<view::LogicSignal*>(sig)) &&
                    (data = logic_signal->logic_data()))
                     break;
             }
@@ -422,8 +424,7 @@ void DecoderStack::begin_decode()
 		return;
 
 	// Check we have a snapshot of data
-    const deque< boost::shared_ptr<pv::data::LogicSnapshot> > &snapshots =
-		data->get_snapshots();
+    const auto &snapshots = data->get_snapshots();
 	if (snapshots.empty())
 		return;
 	_snapshot = snapshots.front();
@@ -445,7 +446,7 @@ void DecoderStack::begin_decode()
     _decode_thread =  new std::thread(&DecoderStack::decode_proc, this);
 }
 
-uint64_t DecoderStack::get_max_sample_count() const
+uint64_t DecoderStack::get_max_sample_count()
 {
 	uint64_t max_sample_count = 0;
 
@@ -596,7 +597,7 @@ void DecoderStack::decode_proc()
     _decode_state = Stopped;
 }
 
-uint64_t DecoderStack::sample_count() const
+uint64_t DecoderStack::sample_count()
 {
     if (_snapshot)
         return _snapshot->get_sample_count();
@@ -604,7 +605,7 @@ uint64_t DecoderStack::sample_count() const
         return 0;
 }
 
-uint64_t DecoderStack::sample_rate() const
+uint64_t DecoderStack::sample_rate()
 {
     return _samplerate;
 }
@@ -679,14 +680,14 @@ int DecoderStack::list_rows_size()
 { 
     int rows_size = 0;
     for (auto i = _rows.begin(); i != _rows.end(); i++) {
-        map<const Row, bool>::const_iterator iter = _rows_lshow.find((*i).first);
+        auto iter = _rows_lshow.find((*i).first);
         if (iter != _rows_lshow.end() && (*iter).second)
             rows_size++;
     }
     return rows_size;
 }
 
-bool DecoderStack::options_changed() const
+bool DecoderStack::options_changed()
 {
     return _options_changed;
 }
@@ -696,7 +697,7 @@ void DecoderStack::set_options_changed(bool changed)
     _options_changed = changed;
 }
 
-bool DecoderStack::out_of_memory() const
+bool DecoderStack::out_of_memory()
 {
     return _no_memory;
 }
@@ -706,7 +707,7 @@ void DecoderStack::set_mark_index(int64_t index)
     _mark_index = index;
 }
 
-int64_t DecoderStack::get_mark_index() const
+int64_t DecoderStack::get_mark_index()
 {
     return _mark_index;
 }
diff --git a/DSView/pv/data/decoderstack.h b/DSView/pv/data/decoderstack.h
index d7f89bf1..c30455b7 100755
--- a/DSView/pv/data/decoderstack.h
+++ b/DSView/pv/data/decoderstack.h
@@ -25,8 +25,7 @@
 
 #include <list>
 
-#include <boost/optional.hpp>
-#include <boost/shared_ptr.hpp>
+#include <boost/optional.hpp> 
  
 
 #include <QObject>
@@ -88,17 +87,17 @@ public:
 
 	virtual ~DecoderStack();
 
-    inline std::list< boost::shared_ptr<decode::Decoder> >& stack(){
+    inline std::list<decode::Decoder*>& stack(){
         return _stack;
     }
 
-	void push(boost::shared_ptr<decode::Decoder> decoder);
+	void push(decode::Decoder *decoder);
 
-    void remove(boost::shared_ptr<decode::Decoder>& decoder);
+    void remove(decode::Decoder *decoder);
 
     void build_row();
 
-	int64_t samples_decoded() const;
+	int64_t samples_decoded();
 
 	/**
 	 * Extracts sorted annotations between two period into a vector.
@@ -106,10 +105,10 @@ public:
 	void get_annotation_subset(
 		std::vector<pv::data::decode::Annotation> &dest,
 		const decode::Row &row, uint64_t start_sample,
-		uint64_t end_sample) const;
+		uint64_t end_sample);
 
     uint64_t get_annotation_index(
-        const decode::Row &row, uint64_t start_sample) const;
+        const decode::Row &row, uint64_t start_sample);
 
     uint64_t get_max_annotation(const decode::Row &row);
     uint64_t get_min_annotation(const decode::Row &row); // except instant(end=start) annotation
@@ -119,24 +118,24 @@ public:
     void set_rows_gshow(const decode::Row row, bool show);
     void set_rows_lshow(const decode::Row row, bool show);
 
-    bool has_annotations(const decode::Row &row) const;
+    bool has_annotations(const decode::Row &row);
 
-    uint64_t list_annotation_size() const;
-    uint64_t list_annotation_size(uint16_t row_index) const;
+    uint64_t list_annotation_size();
+    uint64_t list_annotation_size(uint16_t row_index);
 
 
     bool list_annotation(decode::Annotation &ann,
-                        uint16_t row_index, uint64_t col_index) const;
+                        uint16_t row_index, uint64_t col_index);
 
 
-    bool list_row_title(int row, QString &title) const;
+    bool list_row_title(int row, QString &title);
 
 	QString error_message();
 
 	void clear();
     void init();
 
-	uint64_t get_max_sample_count() const;
+	uint64_t get_max_sample_count();
 
 	void begin_decode();
 
@@ -144,16 +143,16 @@ public:
 
     int list_rows_size();
 
-    bool options_changed() const;
+    bool options_changed();
     void set_options_changed(bool changed);
 
-    uint64_t sample_count() const;
-    uint64_t sample_rate() const;
+    uint64_t sample_count();
+    uint64_t sample_rate();
 
-    bool out_of_memory() const;
+    bool out_of_memory();
 
     void set_mark_index(int64_t index);
-    int64_t get_mark_index() const;
+    int64_t get_mark_index();
 
 private:
     void decode_data(const uint64_t decode_start, const uint64_t decode_end, srd_session *const session);
@@ -174,9 +173,9 @@ signals:
     void decode_done();
 
 private: 
-	std::list< boost::shared_ptr<decode::Decoder> > _stack;
+	std::list<decode::Decoder*> _stack;
 
-	boost::shared_ptr<pv::data::LogicSnapshot> _snapshot;
+	pv::data::LogicSnapshot *_snapshot;
   
     std::map<const decode::Row, decode::RowData*>   _rows;
     std::map<const decode::Row, bool>       _rows_gshow;
diff --git a/DSView/pv/data/dso.cpp b/DSView/pv/data/dso.cpp
index b88e77d7..acbd6c62 100755
--- a/DSView/pv/data/dso.cpp
+++ b/DSView/pv/data/dso.cpp
@@ -23,7 +23,6 @@
 #include "dsosnapshot.h"
  
 
-using namespace boost;
 using namespace std;
 
 namespace pv {
@@ -34,12 +33,12 @@ Dso::Dso() :
 {
 }
 
-void Dso::push_snapshot(boost::shared_ptr<DsoSnapshot> &snapshot)
+void Dso::push_snapshot(DsoSnapshot *snapshot)
 {
 	_snapshots.push_front(snapshot);
 }
 
-deque< boost::shared_ptr<DsoSnapshot> >& Dso::get_snapshots()
+std::deque<DsoSnapshot*>& Dso::get_snapshots()
 {
 	return _snapshots;
 }
diff --git a/DSView/pv/data/dso.h b/DSView/pv/data/dso.h
index 0902972a..1ef87645 100755
--- a/DSView/pv/data/dso.h
+++ b/DSView/pv/data/dso.h
@@ -24,8 +24,7 @@
 #define DSVIEW_PV_DATA_DSO_H
 
 #include "signaldata.h"
-
-#include <boost/shared_ptr.hpp>
+ 
 #include <deque>
 
 namespace pv {
@@ -38,17 +37,15 @@ class Dso : public SignalData
 public:
     Dso();
 
-	void push_snapshot(
-        boost::shared_ptr<DsoSnapshot> &snapshot);
+	void push_snapshot(DsoSnapshot *snapshot);
 
-    std::deque< boost::shared_ptr<DsoSnapshot> >&
-		get_snapshots();
+    std::deque<DsoSnapshot*>& get_snapshots();
 
     void clear();
     void init();
 
 private:
-    std::deque< boost::shared_ptr<DsoSnapshot> > _snapshots;
+    std::deque<DsoSnapshot*> _snapshots;
 };
 
 } // namespace data
diff --git a/DSView/pv/data/dsosnapshot.cpp b/DSView/pv/data/dsosnapshot.cpp
index 60a98a8c..db56da10 100755
--- a/DSView/pv/data/dsosnapshot.cpp
+++ b/DSView/pv/data/dsosnapshot.cpp
@@ -210,7 +210,7 @@ const uint8_t *DsoSnapshot::get_samples(
 }
 
 void DsoSnapshot::get_envelope_section(EnvelopeSection &s,
-    uint64_t start, uint64_t end, float min_length, int probe_index) const
+    uint64_t start, uint64_t end, float min_length, int probe_index)
 {
 	assert(end <= get_sample_count());
 	assert(start <= end);
@@ -348,7 +348,7 @@ void DsoSnapshot::append_payload_to_envelope_levels(bool header)
     _envelope_done = true;
 }
 
-double DsoSnapshot::cal_vrms(double zero_off, int index) const
+double DsoSnapshot::cal_vrms(double zero_off, int index)
 {
     assert(index >= 0);
     //assert(index < _channel_num);
@@ -383,7 +383,7 @@ double DsoSnapshot::cal_vrms(double zero_off, int index) const
     return vrms;
 }
 
-double DsoSnapshot::cal_vmean(int index) const
+double DsoSnapshot::cal_vmean(int index)
 {
     assert(index >= 0);
     //assert(index < _channel_num);
diff --git a/DSView/pv/data/dsosnapshot.h b/DSView/pv/data/dsosnapshot.h
index f9586efe..b32eb78f 100755
--- a/DSView/pv/data/dsosnapshot.h
+++ b/DSView/pv/data/dsosnapshot.h
@@ -95,12 +95,12 @@ public:
         int64_t end_sample, uint16_t index);
 
 	void get_envelope_section(EnvelopeSection &s,
-        uint64_t start, uint64_t end, float min_length, int probe_index) const;
+        uint64_t start, uint64_t end, float min_length, int probe_index);
 
     void enable_envelope(bool enable);
 
-    double cal_vrms(double zero_off, int index) const;
-    double cal_vmean(int index) const;
+    double cal_vrms(double zero_off, int index);
+    double cal_vmean(int index);
 
     bool has_data(int index);
     int get_block_num();
diff --git a/DSView/pv/data/group.cpp b/DSView/pv/data/group.cpp
index 41329f82..04f699a1 100755
--- a/DSView/pv/data/group.cpp
+++ b/DSView/pv/data/group.cpp
@@ -23,7 +23,6 @@
 #include "groupsnapshot.h"
  
 
-using namespace boost;
 using namespace std;
 
 namespace pv {
@@ -34,12 +33,12 @@ Group::Group() :
 {
 }
 
-void Group::push_snapshot(boost::shared_ptr<GroupSnapshot> &snapshot)
+void Group::push_snapshot(GroupSnapshot *snapshot)
 {
     _snapshots.push_back(snapshot);
 }
 
-deque< boost::shared_ptr<GroupSnapshot> >& Group::get_snapshots()
+std::deque<GroupSnapshot*>& Group::get_snapshots()
 {
 	return _snapshots;
 }
diff --git a/DSView/pv/data/group.h b/DSView/pv/data/group.h
index 1312c6ee..bc6e4e53 100755
--- a/DSView/pv/data/group.h
+++ b/DSView/pv/data/group.h
@@ -24,8 +24,7 @@
 #define DSVIEW_PV_DATA_GROUP_H
 
 #include "signaldata.h"
-
-#include <boost/shared_ptr.hpp>
+ 
 #include <deque>
 
 namespace pv {
@@ -38,17 +37,15 @@ class Group : public SignalData
 public:
     Group();
 
-	void push_snapshot(
-        boost::shared_ptr<GroupSnapshot> &snapshot);
+	void push_snapshot(GroupSnapshot *snapshot);
 
-    std::deque< boost::shared_ptr<GroupSnapshot> >&
-		get_snapshots();
+    std::deque<GroupSnapshot*>& get_snapshots();
 
     void clear();
     void init();
 
 private:
-    std::deque< boost::shared_ptr<GroupSnapshot> > _snapshots;
+    std::deque<GroupSnapshot*> _snapshots;
 };
 
 } // namespace data
diff --git a/DSView/pv/data/groupsnapshot.cpp b/DSView/pv/data/groupsnapshot.cpp
index 3c5f25ee..3eae0efb 100755
--- a/DSView/pv/data/groupsnapshot.cpp
+++ b/DSView/pv/data/groupsnapshot.cpp
@@ -27,12 +27,10 @@
 #include <math.h>
 
 #include <algorithm>
- 
 
 #include "logicsnapshot.h"
 #include "groupsnapshot.h"
 
-using namespace boost;
 using namespace std;
 
 namespace pv {
@@ -48,15 +46,17 @@ const uint16_t GroupSnapshot::value_mask[16] = {0x1, 0x2, 0x4, 0x8,
                                                 0x100, 0x200, 0x400, 0x800,
                                                 0x1000, 0x2000, 0x4000, 0x8000};
 
-GroupSnapshot::GroupSnapshot(const boost::shared_ptr<LogicSnapshot> &_logic_snapshot, std::list<int> index_list)
+GroupSnapshot::GroupSnapshot(const LogicSnapshot *_logic_snapshot, std::list<int> index_list)
 {
     assert(_logic_snapshot);
 
+	LogicSnapshot *logic_snapshot = const_cast<LogicSnapshot*>(_logic_snapshot);
+
    
 	memset(_envelope_levels, 0, sizeof(_envelope_levels));
-    _data = _logic_snapshot->get_data();
-    _sample_count = _logic_snapshot->get_sample_count();
-    _unit_size = _logic_snapshot->unit_size();
+    _data = logic_snapshot->get_data();
+    _sample_count = logic_snapshot->get_sample_count();
+    _unit_size = logic_snapshot->unit_size();
     _index_list = index_list;
 
     _mask = 0;
@@ -108,7 +108,7 @@ void GroupSnapshot::clear()
 
 }
 
-uint64_t GroupSnapshot::get_sample_count() const
+uint64_t GroupSnapshot::get_sample_count()
 { 
     return _sample_count;
 }
@@ -150,7 +150,7 @@ const uint16_t* GroupSnapshot::get_samples(
 }
 
 void GroupSnapshot::get_envelope_section(EnvelopeSection &s,
-	uint64_t start, uint64_t end, float min_length) const
+	uint64_t start, uint64_t end, float min_length)
 {
     assert(end <= _sample_count);
 	assert(start <= end);
diff --git a/DSView/pv/data/groupsnapshot.h b/DSView/pv/data/groupsnapshot.h
index fbd7095e..683e4f96 100755
--- a/DSView/pv/data/groupsnapshot.h
+++ b/DSView/pv/data/groupsnapshot.h
@@ -22,10 +22,7 @@
 
 #ifndef DSVIEW_PV_DATA_GROUPSNAPSHOT_H
 #define DSVIEW_PV_DATA_GROUPSNAPSHOT_H
-
  
-#include <boost/shared_ptr.hpp>
-
 #include "../view/signal.h"
 
 #include <utility>
@@ -75,7 +72,7 @@ private:
     static const uint16_t value_mask[16];
 
 public:
-    GroupSnapshot(const boost::shared_ptr<LogicSnapshot> &_logic_snapshot, std::list<int> index_list);
+    GroupSnapshot(const LogicSnapshot *_logic_snapshot, std::list<int> index_list);
 
     virtual ~GroupSnapshot();
 
@@ -84,13 +81,13 @@ public:
 
     void append_payload();
 
-    uint64_t get_sample_count() const;
+    uint64_t get_sample_count();
 
     const uint16_t* get_samples(int64_t start_sample,
         int64_t end_sample);
 
 	void get_envelope_section(EnvelopeSection &s,
-		uint64_t start, uint64_t end, float min_length) const;
+		uint64_t start, uint64_t end, float min_length);
 
 private:
 	void reallocate_envelope(Envelope &l);
@@ -103,7 +100,7 @@ private:
     const void *_data;
     uint64_t _sample_count;
     int _unit_size;
-    boost::shared_ptr<view::Signal> _signal;
+    view::Signal *_signal;
     std::list<int> _index_list;
     uint16_t _mask;
     int _bubble_start[32];
diff --git a/DSView/pv/data/logic.cpp b/DSView/pv/data/logic.cpp
index d2597125..71055656 100755
--- a/DSView/pv/data/logic.cpp
+++ b/DSView/pv/data/logic.cpp
@@ -22,8 +22,7 @@
 
 #include "logic.h"
 #include "logicsnapshot.h"
- 
-using namespace boost;
+
 using namespace std;
 
 namespace pv {
@@ -34,13 +33,12 @@ Logic::Logic() :
 {
 }
 
-void Logic::push_snapshot(
-	boost::shared_ptr<LogicSnapshot> &snapshot)
+void Logic::push_snapshot(LogicSnapshot *snapshot)
 {
 	_snapshots.push_front(snapshot);
 }
 
-deque< boost::shared_ptr<LogicSnapshot> >& Logic::get_snapshots()
+std::deque<LogicSnapshot*>& Logic::get_snapshots()
 {
 	return _snapshots;
 }
diff --git a/DSView/pv/data/logic.h b/DSView/pv/data/logic.h
index f163b35c..2eb76aed 100755
--- a/DSView/pv/data/logic.h
+++ b/DSView/pv/data/logic.h
@@ -25,8 +25,7 @@
 #define DSVIEW_PV_DATA_LOGIC_H
 
 #include "signaldata.h"
-
-#include <boost/shared_ptr.hpp>
+ 
 #include <deque>
 
 namespace pv {
@@ -39,18 +38,16 @@ class Logic : public SignalData
 public:
     Logic();
 
-	void push_snapshot(
-		boost::shared_ptr<LogicSnapshot> &snapshot);
+	void push_snapshot(LogicSnapshot *snapshot);
 
-	std::deque< boost::shared_ptr<LogicSnapshot> >&
-		get_snapshots();
+	std::deque<LogicSnapshot*>& get_snapshots();
 
     void clear();
 
     void init();
 
 private:
-	std::deque< boost::shared_ptr<LogicSnapshot> > _snapshots;
+	std::deque<LogicSnapshot*> _snapshots;
 };
 
 } // namespace data
diff --git a/DSView/pv/data/mathstack.cpp b/DSView/pv/data/mathstack.cpp
index e584d392..87dd08cd 100755
--- a/DSView/pv/data/mathstack.cpp
+++ b/DSView/pv/data/mathstack.cpp
@@ -73,8 +73,8 @@ const QString MathStack::vDialDivUnit[MathStack::vDialUnitCount] = {
 };
 
 MathStack::MathStack(pv::SigSession *session,
-                     boost::shared_ptr<view::DsoSignal> dsoSig1,
-                     boost::shared_ptr<view::DsoSignal> dsoSig2,
+                     view::DsoSignal* dsoSig1,
+                     view::DsoSignal* dsoSig2,
                      MathType type) :
     _session(session),
     _dsoSig1(dsoSig1),
@@ -117,12 +117,12 @@ void MathStack::init()
     _envelope_done = false;
 }
 
-MathStack::MathType MathStack::get_type() const
+MathStack::MathType MathStack::get_type()
 {
     return _type;
 }
 
-uint64_t MathStack::get_sample_num() const
+uint64_t MathStack::get_sample_num()
 {
     return _sample_num;
 }
@@ -276,13 +276,13 @@ double MathStack::get_math_scale()
     return scale;
 }
 
-const double* MathStack::get_math(uint64_t start) const
+const double* MathStack::get_math(uint64_t start)
 {
     return _math.data() + start;
 }
 
 void MathStack::get_math_envelope_section(EnvelopeSection &s,
-    uint64_t start, uint64_t end, float min_length) const
+    uint64_t start, uint64_t end, float min_length)
 {
     assert(end <= get_sample_num());
     assert(start <= end);
@@ -316,14 +316,12 @@ void MathStack::calc_math()
 
     _math_state = Running;
 
-    const boost::shared_ptr<pv::data::Dso> data = _dsoSig1->dso_data();
-    const deque< boost::shared_ptr<pv::data::DsoSnapshot> > &snapshots =
-        data->get_snapshots();
+    const auto data = _dsoSig1->dso_data();
+    const auto &snapshots = data->get_snapshots();
     if (snapshots.empty())
         return;
 
-    const boost::shared_ptr<pv::data::DsoSnapshot> &snapshot =
-        snapshots.front();
+    const auto snapshot = snapshots.front();
     if (snapshot->empty())
         return;
 
diff --git a/DSView/pv/data/mathstack.h b/DSView/pv/data/mathstack.h
index e0c1a97c..2fb72fbc 100755
--- a/DSView/pv/data/mathstack.h
+++ b/DSView/pv/data/mathstack.h
@@ -25,9 +25,8 @@
 
 #include <list>
 
-#include <boost/optional.hpp>
-#include <boost/shared_ptr.hpp>
- 
+#include <boost/optional.hpp> 
+  
 
 #include <QObject>
 #include <QString>
@@ -103,16 +102,16 @@ private:
 
 public:
     MathStack(pv::SigSession *_session,
-              boost::shared_ptr<view::DsoSignal> dsoSig1,
-              boost::shared_ptr<view::DsoSignal> dsoSig2, MathType type);
+              view::DsoSignal *dsoSig1,
+              view::DsoSignal *dsoSig2, MathType type);
     virtual ~MathStack();
     void clear();
     void init();
     void free_envelop();
     void realloc(uint64_t num);
 
-    MathType get_type() const;
-    uint64_t get_sample_num() const;
+    MathType get_type();
+    uint64_t get_sample_num();
 
     void enable_envelope(bool enable);
 
@@ -121,9 +120,9 @@ public:
     QString get_unit(int level);
     double get_math_scale();
 
-    const double *get_math(uint64_t start) const;
+    const double *get_math(uint64_t start);
     void get_math_envelope_section(EnvelopeSection &s,
-        uint64_t start, uint64_t end, float min_length) const;
+        uint64_t start, uint64_t end, float min_length);
 
     void calc_math();
     void reallocate_envelope(Envelope &e);
@@ -132,9 +131,9 @@ public:
 signals:
 
 private:
-    pv::SigSession *_session;
-    boost::shared_ptr<view::DsoSignal> _dsoSig1;
-    boost::shared_ptr<view::DsoSignal> _dsoSig2;
+    pv::SigSession  *_session;
+    view::DsoSignal *_dsoSig1;
+    view::DsoSignal *_dsoSig2;
 
     MathType _type;
     uint64_t _sample_num;
diff --git a/DSView/pv/data/snapshot.cpp b/DSView/pv/data/snapshot.cpp
index 2e50fc2c..773ea130 100755
--- a/DSView/pv/data/snapshot.cpp
+++ b/DSView/pv/data/snapshot.cpp
@@ -64,12 +64,12 @@ void Snapshot::free_data()
     _ch_index.clear();
 }
 
-bool Snapshot::memory_failed() const
+bool Snapshot::memory_failed()
 {
     return _memory_failed;
 }
 
-bool Snapshot::empty() const
+bool Snapshot::empty()
 {
     if (get_sample_count() == 0)
         return true;
@@ -77,7 +77,7 @@ bool Snapshot::empty() const
         return false;
 }
 
-bool Snapshot::last_ended() const
+bool Snapshot::last_ended()
 {
     return _last_ended;
 }
@@ -87,13 +87,13 @@ void Snapshot::set_last_ended(bool ended)
     _last_ended = ended;
 }
 
-uint64_t Snapshot::get_sample_count() const
+uint64_t Snapshot::get_sample_count()
 {
     std::lock_guard<std::mutex> lock(_mutex);
     return _sample_count;
 }
 
-uint64_t Snapshot::get_ring_start() const
+uint64_t Snapshot::get_ring_start()
 {
     std::lock_guard<std::mutex> lock(_mutex);
     if (_sample_count < _total_sample_count)
@@ -102,7 +102,7 @@ uint64_t Snapshot::get_ring_start() const
         return _ring_sample_count;
 }
 
-uint64_t Snapshot::get_ring_end() const
+uint64_t Snapshot::get_ring_end()
 {
     std::lock_guard<std::mutex> lock(_mutex);
     if (_sample_count == 0)
@@ -113,22 +113,22 @@ uint64_t Snapshot::get_ring_end() const
         return _ring_sample_count - 1;
 }
 
-const void* Snapshot::get_data() const
+const void* Snapshot::get_data()
 {
     return _data;
 }
 
-int Snapshot::unit_size() const
+int Snapshot::unit_size()
 {
     return _unit_size;
 }
 
-uint8_t Snapshot::get_unit_bytes() const
+uint8_t Snapshot::get_unit_bytes()
 {
     return _unit_bytes;
 }
 
-unsigned int Snapshot::get_channel_num() const
+unsigned int Snapshot::get_channel_num()
 {
     return _channel_num;
 }
diff --git a/DSView/pv/data/snapshot.h b/DSView/pv/data/snapshot.h
index e8a43588..79de9589 100755
--- a/DSView/pv/data/snapshot.h
+++ b/DSView/pv/data/snapshot.h
@@ -39,22 +39,22 @@ public:
     virtual void clear() = 0;
     virtual void init() = 0;
 
-	uint64_t get_sample_count() const;
-    uint64_t get_ring_start() const;
-    uint64_t get_ring_end() const;
+	uint64_t get_sample_count();
+    uint64_t get_ring_start();
+    uint64_t get_ring_end();
 
-    const void * get_data() const;
+    const void * get_data();
 
-    int unit_size() const;
-    uint8_t get_unit_bytes() const;
+    int unit_size();
+    uint8_t get_unit_bytes();
 
-    bool memory_failed() const;
-    bool empty() const;
+    bool memory_failed();
+    bool empty();
 
-    bool last_ended() const;
+    bool last_ended();
     void set_last_ended(bool ended);
 
-    unsigned int get_channel_num() const;
+    unsigned int get_channel_num();
 
     virtual void capture_ended();
     virtual bool has_data(int index) = 0;
@@ -67,7 +67,7 @@ protected:
 protected:
      mutable std::mutex  _mutex;
 
-    //std::vector<uint8_t> _data;
+  
     void* _data;
     mutable std::vector<uint16_t> _ch_index;
 
diff --git a/DSView/pv/data/spectrumstack.cpp b/DSView/pv/data/spectrumstack.cpp
index 7a96f308..c5c48301 100755
--- a/DSView/pv/data/spectrumstack.cpp
+++ b/DSView/pv/data/spectrumstack.cpp
@@ -76,12 +76,12 @@ void SpectrumStack::init()
 {
 }
 
-int SpectrumStack::get_index() const
+int SpectrumStack::get_index()
 {
     return _index;
 }
 
-uint64_t SpectrumStack::get_sample_num() const
+uint64_t SpectrumStack::get_sample_num()
 {
     return _sample_num;
 }
@@ -96,7 +96,7 @@ void SpectrumStack::set_sample_num(uint64_t num)
                                  FFTW_R2HC, FFTW_ESTIMATE);
 }
 
-int SpectrumStack::get_windows_index() const
+int SpectrumStack::get_windows_index()
 {
     return _windows_index;
 }
@@ -106,7 +106,7 @@ void SpectrumStack::set_windows_index(int index)
     _windows_index = index;
 }
 
-bool SpectrumStack::dc_ignored() const
+bool SpectrumStack::dc_ignored()
 {
     return _dc_ignore;
 }
@@ -116,7 +116,7 @@ void SpectrumStack::set_dc_ignore(bool ignore)
     _dc_ignore = ignore;
 }
 
-int SpectrumStack::get_sample_interval() const
+int SpectrumStack::get_sample_interval()
 {
     return _sample_interval;
 }
@@ -126,7 +126,7 @@ void SpectrumStack::set_sample_interval(int interval)
     _sample_interval = interval;
 }
 
-const std::vector<QString> SpectrumStack::get_windows_support() const
+const std::vector<QString> SpectrumStack::get_windows_support()
 {
     std::vector<QString> windows;
     for (size_t i = 0; i < sizeof(windows_support)/sizeof(windows_support[0]); i++)
@@ -136,7 +136,7 @@ const std::vector<QString> SpectrumStack::get_windows_support() const
     return windows;
 }
 
-const std::vector<uint64_t> SpectrumStack::get_length_support() const
+const std::vector<uint64_t> SpectrumStack::get_length_support()
 {
     std::vector<uint64_t> length;
     for (size_t i = 0; i < sizeof(length_support)/sizeof(length_support[0]); i++)
@@ -146,7 +146,7 @@ const std::vector<uint64_t> SpectrumStack::get_length_support() const
     return length;
 }
 
-const std::vector<double> SpectrumStack::get_fft_spectrum() const
+const std::vector<double> SpectrumStack::get_fft_spectrum()
 {
     std::vector<double> empty;
     if (_spectrum_state == Stopped)
@@ -168,11 +168,11 @@ void SpectrumStack::calc_fft()
 {
     _spectrum_state = Running;
     // Get the dso data
-    boost::shared_ptr<pv::data::Dso> data;
-    boost::shared_ptr<pv::view::DsoSignal> dsoSig;
+    pv::data::Dso *data = NULL;
+    pv::view::DsoSignal *dsoSig = NULL;
 
     for(auto &s : _session->get_signals()) {
-        if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
+        if ((dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
             if (dsoSig->get_index() == _index && dsoSig->enabled()) {
                 data = dsoSig->dso_data();
                 break;
@@ -184,10 +184,10 @@ void SpectrumStack::calc_fft()
         return;
 
     // Check we have a snapshot of data
-    const deque< boost::shared_ptr<pv::data::DsoSnapshot> > &snapshots =
-        data->get_snapshots();
+    const auto &snapshots = data->get_snapshots();
     if (snapshots.empty())
         return;
+        
     _snapshot = snapshots.front();
 
     if (_snapshot->get_sample_count() < _sample_num*_sample_interval)
diff --git a/DSView/pv/data/spectrumstack.h b/DSView/pv/data/spectrumstack.h
index aff91060..146742ed 100755
--- a/DSView/pv/data/spectrumstack.h
+++ b/DSView/pv/data/spectrumstack.h
@@ -25,8 +25,7 @@
 
 #include <list>
 
-#include <boost/optional.hpp>
-#include <boost/shared_ptr.hpp>
+#include <boost/optional.hpp> 
   
 #include <fftw3.h>
 
@@ -67,24 +66,24 @@ public:
     void clear();
     void init();
 
-    int get_index() const;
+    int get_index();
 
-    uint64_t get_sample_num() const;
+    uint64_t get_sample_num();
     void set_sample_num(uint64_t num);
 
-    int get_windows_index() const;
+    int get_windows_index();
     void set_windows_index(int index);
 
-    const std::vector<QString> get_windows_support() const;
-    const std::vector<uint64_t> get_length_support() const;
+    const std::vector<QString> get_windows_support();
+    const std::vector<uint64_t> get_length_support();
 
-    bool dc_ignored() const;
+    bool dc_ignored();
     void set_dc_ignore(bool ignore);
 
-    int get_sample_interval() const;
+    int get_sample_interval();
     void set_sample_interval(int interval);
 
-    const std::vector<double> get_fft_spectrum() const;
+    const std::vector<double> get_fft_spectrum();
     double get_fft_spectrum(uint64_t index);
 
     void calc_fft();
@@ -102,7 +101,7 @@ private:
     bool _dc_ignore;
     int _sample_interval;
 
-    boost::shared_ptr<pv::data::DsoSnapshot> _snapshot;
+    pv::data::DsoSnapshot *_snapshot;
     spectrum_state _spectrum_state;
 
     fftw_plan _fft_plan;
diff --git a/DSView/pv/device/device.cpp b/DSView/pv/device/device.cpp
index ab60d5a8..1f6c0bdb 100755
--- a/DSView/pv/device/device.cpp
+++ b/DSView/pv/device/device.cpp
@@ -42,7 +42,7 @@ Device::~Device()
 
 }
 
-sr_dev_inst* Device::dev_inst() const
+sr_dev_inst* Device::dev_inst()
 {
 	return _sdi;
 }
@@ -70,7 +70,7 @@ void Device::release()
 	sr_dev_close(_sdi);
 }
 
-QString Device::format_device_title() const
+QString Device::format_device_title()
 {
 	ostringstream s;
 
@@ -95,7 +95,7 @@ QString Device::format_device_title() const
     return QString::fromStdString(s.str());
 }
 
-bool Device::is_trigger_enabled() const
+bool Device::is_trigger_enabled()
 {
 	assert(_sdi);
 	for (const GSList *l = _sdi->channels; l; l = l->next) {
diff --git a/DSView/pv/device/device.h b/DSView/pv/device/device.h
index 77ed9abe..0290f5a2 100755
--- a/DSView/pv/device/device.h
+++ b/DSView/pv/device/device.h
@@ -34,15 +34,15 @@ public:
 
 	~Device();
 
-	sr_dev_inst* dev_inst() const;
+	sr_dev_inst* dev_inst();
 
     void use(SigSession *owner);
 
 	void release();
 
-    QString format_device_title() const;
+    QString format_device_title();
 
-	bool is_trigger_enabled() const;
+	bool is_trigger_enabled();
 
 private:
 	sr_dev_inst *const _sdi;
diff --git a/DSView/pv/device/devinst.cpp b/DSView/pv/device/devinst.cpp
index d06858cb..124ab2ef 100755
--- a/DSView/pv/device/devinst.cpp
+++ b/DSView/pv/device/devinst.cpp
@@ -43,7 +43,7 @@ DevInst::~DevInst()
     free(_id);
 }
 
-void* DevInst::get_id() const
+void* DevInst::get_id()
 {
     assert(_id);
 
@@ -64,7 +64,7 @@ void DevInst::release()
 	}
 }
 
-SigSession* DevInst::owner() const
+SigSession* DevInst::owner()
 {
 	return _owner;
 }
@@ -188,7 +188,7 @@ QString DevInst::name()
     return QString::fromLocal8Bit(sdi->driver->name);
 }
 
-bool DevInst::is_trigger_enabled() const
+bool DevInst::is_trigger_enabled()
 {
 	return false;
 }
@@ -204,7 +204,7 @@ void DevInst::run()
 	sr_session_run();
 }
 
-bool DevInst::is_usable() const
+bool DevInst::is_usable()
 {
     return _usable;
 }
diff --git a/DSView/pv/device/devinst.h b/DSView/pv/device/devinst.h
index 8039fddd..5ad51bf0 100755
--- a/DSView/pv/device/devinst.h
+++ b/DSView/pv/device/devinst.h
@@ -50,7 +50,7 @@ protected:
     virtual ~DevInst();
 
 public: 
-	SigSession* owner() const;
+	SigSession* owner();
  
     GVariant* get_config(const sr_channel *ch, const sr_channel_group *group, int key);
 
@@ -108,7 +108,7 @@ public:
     QString name();
  
 
-    bool is_usable() const;
+    bool is_usable();
 
     void destroy();
 
@@ -117,17 +117,17 @@ public:
 
 	virtual void run();
 
-    virtual void* get_id() const;
+    virtual void* get_id();
 
-    virtual sr_dev_inst* dev_inst() const = 0;
+    virtual sr_dev_inst* dev_inst() = 0;
 
     virtual void use(SigSession *owner);
 
 	virtual void release();
 
-    virtual bool is_trigger_enabled() const;
+    virtual bool is_trigger_enabled();
 
-    virtual QString format_device_title() const = 0;
+    virtual QString format_device_title() = 0;
 
 signals:
     void device_updated();
diff --git a/DSView/pv/device/file.cpp b/DSView/pv/device/file.cpp
index eb494b04..88dd0cb5 100755
--- a/DSView/pv/device/file.cpp
+++ b/DSView/pv/device/file.cpp
@@ -43,7 +43,7 @@ File::~File(){
 
 }
 
-QString File::format_device_title() const
+QString File::format_device_title()
 {
     QFileInfo fi(_path);
     return fi.fileName();
diff --git a/DSView/pv/device/file.h b/DSView/pv/device/file.h
index a4984170..569d2ef9 100755
--- a/DSView/pv/device/file.h
+++ b/DSView/pv/device/file.h
@@ -49,7 +49,7 @@ public:
     QJsonDocument get_session();
 
 public:
-    QString format_device_title() const;
+    QString format_device_title();
 
 protected:
     const QString _path;
diff --git a/DSView/pv/device/inputfile.cpp b/DSView/pv/device/inputfile.cpp
index bd2feef7..33b346bf 100755
--- a/DSView/pv/device/inputfile.cpp
+++ b/DSView/pv/device/inputfile.cpp
@@ -37,7 +37,7 @@ InputFile::InputFile(QString path) :
 {
 }
 
-sr_dev_inst* InputFile::dev_inst() const
+sr_dev_inst* InputFile::dev_inst()
 {
 	assert(_input);
 	return _input->sdi;
diff --git a/DSView/pv/device/inputfile.h b/DSView/pv/device/inputfile.h
index e1c1e179..c7e6a50d 100755
--- a/DSView/pv/device/inputfile.h
+++ b/DSView/pv/device/inputfile.h
@@ -37,7 +37,7 @@ class InputFile : public File
 public:
     InputFile(QString path);
 
-	sr_dev_inst* dev_inst() const;
+	sr_dev_inst* dev_inst();
 
     virtual void use(SigSession *owner);
 
diff --git a/DSView/pv/device/sessionfile.cpp b/DSView/pv/device/sessionfile.cpp
index 7f879565..6d3f53d2 100755
--- a/DSView/pv/device/sessionfile.cpp
+++ b/DSView/pv/device/sessionfile.cpp
@@ -30,7 +30,7 @@ SessionFile::SessionFile(QString path) :
 {
 }
 
-sr_dev_inst* SessionFile::dev_inst() const
+sr_dev_inst* SessionFile::dev_inst()
 {
 	return _sdi;
 }
diff --git a/DSView/pv/device/sessionfile.h b/DSView/pv/device/sessionfile.h
index 08783bdd..cf50ddaa 100755
--- a/DSView/pv/device/sessionfile.h
+++ b/DSView/pv/device/sessionfile.h
@@ -32,7 +32,7 @@ class SessionFile : public File
 public:
     SessionFile(QString path);
 
-	sr_dev_inst* dev_inst() const;
+	sr_dev_inst* dev_inst();
 
     virtual void use(SigSession *owner);
 
diff --git a/DSView/pv/dialogs/calibration.cpp b/DSView/pv/dialogs/calibration.cpp
index 7bc0771a..76648789 100755
--- a/DSView/pv/dialogs/calibration.cpp
+++ b/DSView/pv/dialogs/calibration.cpp
@@ -31,7 +31,7 @@
 #include "../dialogs/dsmessagebox.h"
 #include "../dsvdef.h"
 
-using namespace boost;
+
 using namespace std;
 
 namespace pv {
diff --git a/DSView/pv/dialogs/calibration.h b/DSView/pv/dialogs/calibration.h
index 5764ce14..b5c71e27 100755
--- a/DSView/pv/dialogs/calibration.h
+++ b/DSView/pv/dialogs/calibration.h
@@ -29,8 +29,7 @@
 #include <QFormLayout>
 #include <QSlider>
 
-#include <list>
-#include <boost/shared_ptr.hpp>
+#include <list> 
 
 #include <pv/device/devinst.h>
 #include "../toolbars/titlebar.h"
diff --git a/DSView/pv/dialogs/deviceoptions.cpp b/DSView/pv/dialogs/deviceoptions.cpp
index d8a4b392..96436f78 100755
--- a/DSView/pv/dialogs/deviceoptions.cpp
+++ b/DSView/pv/dialogs/deviceoptions.cpp
@@ -90,8 +90,7 @@ void DeviceOptions::accept()
     bool hasEnabled = false;
 
 	// Commit the properties
-    const vector< boost::shared_ptr<pv::prop::Property> > &dev_props =
-		_device_options_binding.properties();
+    const auto &dev_props = _device_options_binding.properties();
     for(auto &p : dev_props) {
 		assert(p);
 		p->commit();
@@ -116,8 +115,8 @@ void DeviceOptions::accept()
     if (hasEnabled) {
         QVector<pv::prop::binding::ProbeOptions *>::iterator i = _probe_options_binding_list.begin();
         while(i != _probe_options_binding_list.end()) {
-            const vector< boost::shared_ptr<pv::prop::Property> > &probe_props =
-                    (*i)->properties();
+            const auto &probe_props = (*i)->properties();
+
             for(auto &p :probe_props) {
                 assert(p);
                 p->commit();
@@ -148,8 +147,8 @@ QGridLayout * DeviceOptions::get_property_form(QWidget * parent)
     QGridLayout *const layout = new QGridLayout(parent);
     layout->setVerticalSpacing(5);
 
-	const vector< boost::shared_ptr<pv::prop::Property> > &properties =
-		_device_options_binding.properties();
+	const auto &properties =_device_options_binding.properties();
+
     int i = 0;
     for(auto &p : properties)
 	{
@@ -522,8 +521,7 @@ void DeviceOptions::analog_probes(QGridLayout &layout)
 
         pv::prop::binding::ProbeOptions *probe_options_binding =
                 new pv::prop::binding::ProbeOptions(_dev_inst->dev_inst(), probe);
-        const vector< boost::shared_ptr<pv::prop::Property> > &properties =
-            probe_options_binding->properties();
+        const auto &properties = probe_options_binding->properties();
         int i = 1;
         
         for(auto &p : properties)
diff --git a/DSView/pv/dialogs/deviceoptions.h b/DSView/pv/dialogs/deviceoptions.h
index 38ee0798..c09f83aa 100755
--- a/DSView/pv/dialogs/deviceoptions.h
+++ b/DSView/pv/dialogs/deviceoptions.h
@@ -36,9 +36,7 @@
 #include <QCheckBox>
 #include <QComboBox>
 #include <QRadioButton>
-#include <QTimer>
-
-#include <boost/shared_ptr.hpp>
+#include <QTimer> 
 
 #include <libsigrok4DSL/libsigrok.h>
 #include "../device/devinst.h"
diff --git a/DSView/pv/dialogs/dsomeasure.cpp b/DSView/pv/dialogs/dsomeasure.cpp
index 46ef2896..a25e7307 100755
--- a/DSView/pv/dialogs/dsomeasure.cpp
+++ b/DSView/pv/dialogs/dsomeasure.cpp
@@ -57,8 +57,8 @@ DsoMeasure::DsoMeasure(SigSession *session, View &parent,
     _measure_tab->setUsesScrollButtons(false);
 
     for(auto &s : _session->get_signals()) {
-        boost::shared_ptr<view::DsoSignal> dsoSig;
-        if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s)) && dsoSig->enabled()) {
+        view::DsoSignal *dsoSig;
+        if ((dsoSig = dynamic_cast<view::DsoSignal*>(s)) && dsoSig->enabled()) {
             QWidget *measure_widget = new QWidget(this);
             this->add_measure(measure_widget, dsoSig);
             _measure_tab->addTab(measure_widget, QString::number(dsoSig->get_index()));
@@ -85,13 +85,15 @@ DsoMeasure::~DsoMeasure(){
     DESTROY_QT_OBJECT(_measure_tab);
 }
 
-void DsoMeasure::add_measure(QWidget *widget, const boost::shared_ptr<view::DsoSignal> dsoSig)
+void DsoMeasure::add_measure(QWidget *widget, const view::DsoSignal *dsoSig)
 {
     const int Column = 5;
     const int IconSizeForText = 5;
     QGridLayout *layout = new QGridLayout(widget);
     layout->setMargin(0);
     layout->setSpacing(0);
+
+    pv::view::DsoSignal *psig = const_cast<pv::view::DsoSignal*>(dsoSig);
     
     for (int i=DSO_MS_BEGIN+1; i<DSO_MS_END; i++) {
         QToolButton *button = new QToolButton(this);
@@ -99,7 +101,7 @@ void DsoMeasure::add_measure(QWidget *widget, const boost::shared_ptr<view::DsoS
         button->setIconSize(QSize(48, 48));
         QPixmap msPix(get_ms_icon(i));
         QBitmap msMask = msPix.createMaskFromColor(QColor("black"), Qt::MaskOutColor);
-        msPix.fill(dsoSig->get_colour());
+        msPix.fill(psig->get_colour());
         msPix.setMask(msMask);
         button->setIcon(QIcon(msPix));
         layout->addWidget(button,
@@ -159,8 +161,8 @@ void DsoMeasure::accept()
         enum DSO_MEASURE_TYPE ms_type = DSO_MEASURE_TYPE(id.toInt());
         
         for(auto &s : _session->get_signals()) {
-            boost::shared_ptr<view::DsoSignal> dsoSig;
-            if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
+            view::DsoSignal *dsoSig = NULL;
+            if ((dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
                 if (_measure_tab->currentWidget()->property("index").toInt() == dsoSig->get_index()) {
                     _view.get_viewstatus()->set_measure(_position, false, dsoSig->get_index(), ms_type);
                     break;
diff --git a/DSView/pv/dialogs/dsomeasure.h b/DSView/pv/dialogs/dsomeasure.h
index 11efed12..ca541ef1 100755
--- a/DSView/pv/dialogs/dsomeasure.h
+++ b/DSView/pv/dialogs/dsomeasure.h
@@ -27,8 +27,7 @@
 #include <QToolButton>
 #include <QDialogButtonBox>
 #include <QTabWidget>
-
-#include <boost/shared_ptr.hpp>
+ 
 
 #include "../view/dsosignal.h"
 #include "../toolbars/titlebar.h"
@@ -57,7 +56,7 @@ public:
     static QString get_ms_text(int ms_type);
 
 private:
-    void add_measure(QWidget *widget, const boost::shared_ptr<view::DsoSignal> dsoSig);
+    void add_measure(QWidget *widget, const view::DsoSignal *dsoSig);
 
 private slots:
     void set_measure(bool en);
diff --git a/DSView/pv/dialogs/fftoptions.cpp b/DSView/pv/dialogs/fftoptions.cpp
index fe53c54f..425854c0 100755
--- a/DSView/pv/dialogs/fftoptions.cpp
+++ b/DSView/pv/dialogs/fftoptions.cpp
@@ -67,8 +67,8 @@ FftOptions::FftOptions(QWidget *parent, SigSession *session) :
 
     // setup _ch_combobox
     for(auto &s : _session->get_signals()) {
-        boost::shared_ptr<view::DsoSignal> dsoSig;
-        if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
+        view::DsoSignal *dsoSig = NULL;
+        if ((dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
             _ch_combobox->addItem(dsoSig->get_name(), QVariant::fromValue(dsoSig->get_index()));
         }
     }
@@ -88,8 +88,8 @@ FftOptions::FftOptions(QWidget *parent, SigSession *session) :
     std::vector<int> dbv_ranges;
 
     for(auto &t : _session->get_spectrum_traces()) {
-        boost::shared_ptr<view::SpectrumTrace> spectrumTraces;
-        if ((spectrumTraces = dynamic_pointer_cast<view::SpectrumTrace>(t))) {
+        view::SpectrumTrace *spectrumTraces = NULL;
+        if ((spectrumTraces = dynamic_cast<view::SpectrumTrace*>(t))) {
             windows = spectrumTraces->get_spectrum_stack()->get_windows_support();
             length = spectrumTraces->get_spectrum_stack()->get_length_support();
             view_modes = spectrumTraces->get_view_modes_support();
@@ -138,8 +138,8 @@ FftOptions::FftOptions(QWidget *parent, SigSession *session) :
 
     // load current settings
     for(auto &t : _session->get_spectrum_traces()) {
-        boost::shared_ptr<view::SpectrumTrace> spectrumTraces;
-        if ((spectrumTraces = dynamic_pointer_cast<view::SpectrumTrace>(t))) {
+         view::SpectrumTrace *spectrumTraces = NULL;
+        if ((spectrumTraces = dynamic_cast<view::SpectrumTrace*>(t))) {
             if (spectrumTraces->enabled()) {
                 _en_checkbox->setChecked(true);
                 for (int i = 0; i < _ch_combobox->count(); i++) {
@@ -231,8 +231,8 @@ void FftOptions::accept()
     QDialog::accept();
 
    for(auto &t : _session->get_spectrum_traces()) {
-        boost::shared_ptr<view::SpectrumTrace> spectrumTraces;
-        if ((spectrumTraces = dynamic_pointer_cast<view::SpectrumTrace>(t))) {
+        view::SpectrumTrace *spectrumTraces = NULL;
+        if ((spectrumTraces = dynamic_cast<view::SpectrumTrace*>(t))) {
             spectrumTraces->set_enable(false);
             if (spectrumTraces->get_index() == _ch_combobox->currentData().toInt()) {
                 spectrumTraces->get_spectrum_stack()->set_dc_ignore(_dc_checkbox->isChecked());
diff --git a/DSView/pv/dialogs/fftoptions.h b/DSView/pv/dialogs/fftoptions.h
index dcca5e11..b863d6d5 100755
--- a/DSView/pv/dialogs/fftoptions.h
+++ b/DSView/pv/dialogs/fftoptions.h
@@ -29,8 +29,7 @@
 #include <QLabel>
 #include <QCheckBox>
 #include <QComboBox>
-
-#include <boost/shared_ptr.hpp>
+ 
 
 #include "../device/devinst.h"
 #include "../toolbars/titlebar.h"
diff --git a/DSView/pv/dialogs/lissajousoptions.cpp b/DSView/pv/dialogs/lissajousoptions.cpp
index 589ec4d4..4ab1d3c2 100755
--- a/DSView/pv/dialogs/lissajousoptions.cpp
+++ b/DSView/pv/dialogs/lissajousoptions.cpp
@@ -74,8 +74,8 @@ LissajousOptions::LissajousOptions(SigSession *session, QWidget *parent) :
     QHBoxLayout *ylayout = new QHBoxLayout();
 
     for(auto &s : _session->get_signals()) {
-        boost::shared_ptr<view::DsoSignal> dsoSig;
-        if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
+        view::DsoSignal *dsoSig = NULL;
+        if ((dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
             QString index_str = QString::number(dsoSig->get_index());
             QRadioButton *xradio = new QRadioButton(index_str, _x_group);
             xradio->setProperty("index", dsoSig->get_index());
@@ -91,7 +91,7 @@ LissajousOptions::LissajousOptions(SigSession *session, QWidget *parent) :
     _y_group->setLayout(ylayout);
 
 
-    boost::shared_ptr<LissajousTrace> lissajous = _session->get_lissajous_trace();
+    auto lissajous = _session->get_lissajous_trace();
     if (lissajous) {
         _enable->setChecked(lissajous->enabled());
         _percent->setValue(lissajous->percent());
@@ -182,12 +182,12 @@ void LissajousOptions::accept()
     _session->lissajous_rebuild(enable, xindex, yindex, _percent->value());
 
     for(auto &s : _session->get_signals()) {
-        boost::shared_ptr<view::DsoSignal> dsoSig;
-        if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
+        view::DsoSignal *dsoSig = NULL;
+        if ((dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
             dsoSig->set_show(!enable);
         }
     }
-    boost::shared_ptr<view::MathTrace> mathTrace = _session->get_math_trace();
+    auto mathTrace = _session->get_math_trace();
     if (mathTrace && mathTrace->enabled()) {
         mathTrace->set_show(!enable);
     }
diff --git a/DSView/pv/dialogs/lissajousoptions.h b/DSView/pv/dialogs/lissajousoptions.h
index 9a7e7168..edb6ce68 100755
--- a/DSView/pv/dialogs/lissajousoptions.h
+++ b/DSView/pv/dialogs/lissajousoptions.h
@@ -31,8 +31,7 @@
 #include <QCheckBox>
 #include <QRadioButton>
 #include <QSlider>
-
-#include <boost/shared_ptr.hpp>
+ 
 
 #include "../view/dsosignal.h"
 #include "../toolbars/titlebar.h"
diff --git a/DSView/pv/dialogs/mathoptions.cpp b/DSView/pv/dialogs/mathoptions.cpp
index d7c9e4bb..21e2d6ab 100755
--- a/DSView/pv/dialogs/mathoptions.cpp
+++ b/DSView/pv/dialogs/mathoptions.cpp
@@ -79,8 +79,8 @@ MathOptions::MathOptions(SigSession *session, QWidget *parent) :
     QHBoxLayout *src2_layout = new QHBoxLayout();
 
     for(auto &s : _session->get_signals()) {
-        boost::shared_ptr<view::DsoSignal> dsoSig;
-        if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
+        view::DsoSignal *dsoSig = NULL;;
+        if ((dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
             QString index_str = QString::number(dsoSig->get_index());
             QRadioButton *xradio = new QRadioButton(index_str, _src1_group);
             xradio->setProperty("index", dsoSig->get_index());
@@ -96,7 +96,7 @@ MathOptions::MathOptions(SigSession *session, QWidget *parent) :
     _src2_group->setLayout(src2_layout);
 
 
-    boost::shared_ptr<MathTrace> math = _session->get_math_trace();
+    auto math = _session->get_math_trace();
     if (math) {
         _enable->setChecked(math->enabled());
         for (QVector<QRadioButton *>::const_iterator i = _src1_radio.begin();
@@ -204,12 +204,12 @@ void MathOptions::accept()
         }
     }
     bool enable = (src1 != -1 && src2 != -1 && _enable->isChecked());
-    boost::shared_ptr<view::DsoSignal> dsoSig1;
-    boost::shared_ptr<view::DsoSignal> dsoSig2;
+    view::DsoSignal *dsoSig1 = NULL;
+    view::DsoSignal *dsoSig2 = NULL;
 
     for(auto &s : _session->get_signals()) {
-        boost::shared_ptr<view::DsoSignal> dsoSig;
-        if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
+        view::DsoSignal *dsoSig = NULL;;
+        if ((dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
             if (dsoSig->get_index() == src1)
                 dsoSig1 = dsoSig;
             if (dsoSig->get_index() == src2)
diff --git a/DSView/pv/dialogs/mathoptions.h b/DSView/pv/dialogs/mathoptions.h
index ae50e7b4..ed6aa2fb 100755
--- a/DSView/pv/dialogs/mathoptions.h
+++ b/DSView/pv/dialogs/mathoptions.h
@@ -31,8 +31,7 @@
 #include <QCheckBox>
 #include <QRadioButton>
 #include <QSlider>
-
-#include <boost/shared_ptr.hpp>
+ 
 
 #include "../view/dsosignal.h"
 #include "../toolbars/titlebar.h"
diff --git a/DSView/pv/dialogs/protocolexp.cpp b/DSView/pv/dialogs/protocolexp.cpp
index f594c6a9..b9445c60 100755
--- a/DSView/pv/dialogs/protocolexp.cpp
+++ b/DSView/pv/dialogs/protocolexp.cpp
@@ -63,12 +63,13 @@ ProtocolExp::ProtocolExp(QWidget *parent, SigSession *session) :
     _flayout->addRow(new QLabel(tr("Export Format: "), this), _format_combobox);
 
     pv::data::DecoderModel* decoder_model = _session->get_decoder_model();
-    const boost::shared_ptr<pv::data::DecoderStack>& decoder_stack = decoder_model->getDecoderStack();
+
+    const auto decoder_stack = decoder_model->getDecoderStack();
     if (decoder_stack) {
         int row_index = 0;
-        const std::map<const pv::data::decode::Row, bool> rows = decoder_stack->get_rows_lshow();
-        for (std::map<const pv::data::decode::Row, bool>::const_iterator i = rows.begin();
-            i != rows.end(); i++) {
+        auto rows = decoder_stack->get_rows_lshow();
+
+        for (auto i = rows.begin();i != rows.end(); i++) {
             if ((*i).second) {
                 QLabel *row_label = new QLabel((*i).first.title(), this);
                 QRadioButton *row_sel = new QRadioButton(this);
@@ -169,7 +170,7 @@ void ProtocolExp::accept()
                        .arg(title);
 
                 pv::data::DecoderModel* decoder_model = _session->get_decoder_model();
-                const boost::shared_ptr<pv::data::DecoderStack>& decoder_stack = decoder_model->getDecoderStack();
+                const auto decoder_stack = decoder_model->getDecoderStack();
                 int row_index = 0;
                 Row row;
                 const std::map<const Row, bool> rows_lshow = decoder_stack->get_rows_lshow();
@@ -186,7 +187,7 @@ void ProtocolExp::accept()
 
                 uint64_t exported = 0;
                 double ns_per_sample = SR_SEC(1) * 1.0 / decoder_stack->samplerate();
-                vector<Annotation> annotations;
+                std::vector<Annotation> annotations;
                 decoder_stack->get_annotation_subset(annotations, row,
                     0, decoder_stack->sample_count()-1);
                 if (!annotations.empty()) {
diff --git a/DSView/pv/dialogs/protocolexp.h b/DSView/pv/dialogs/protocolexp.h
index e888eedf..8688fd96 100755
--- a/DSView/pv/dialogs/protocolexp.h
+++ b/DSView/pv/dialogs/protocolexp.h
@@ -29,9 +29,7 @@
 #include <QLabel>
 #include <QRadioButton>
 #include <QComboBox>
-
-#include <boost/shared_ptr.hpp>
-
+ 
 #include "../device/devinst.h"
 #include "../prop/binding/deviceoptions.h"
 #include "../toolbars/titlebar.h"
diff --git a/DSView/pv/dialogs/protocollist.cpp b/DSView/pv/dialogs/protocollist.cpp
index 53b46b30..9f474fa8 100755
--- a/DSView/pv/dialogs/protocollist.cpp
+++ b/DSView/pv/dialogs/protocollist.cpp
@@ -56,8 +56,7 @@ ProtocolList::ProtocolList(QWidget *parent, SigSession *session) :
     connect(_map_zoom_combobox, SIGNAL(currentIndexChanged(int)), _session, SLOT(set_map_zoom(int)));
 
     _protocol_combobox = new QComboBox(this);
-    const std::vector< boost::shared_ptr<pv::view::DecodeTrace> > decode_sigs(
-        _session->get_decode_signals());
+    auto &decode_sigs = _session->get_decode_signals();
     int index = 0;
 
     for(auto &d : decode_sigs) {
@@ -126,9 +125,8 @@ void ProtocolList::set_protocol(int index)
     }
     _show_label_list.clear();
 
-    boost::shared_ptr<pv::data::DecoderStack> decoder_stack;
-    const std::vector< boost::shared_ptr<pv::view::DecodeTrace> > decode_sigs(
-        _session->get_decode_signals());
+    pv::data::DecoderStack *decoder_stack = NULL;
+    const auto &decode_sigs = _session->get_decode_signals();
     int cur_index = 0;
 
     for(auto &d : decode_sigs) {
@@ -146,9 +144,9 @@ void ProtocolList::set_protocol(int index)
 
     _session->get_decoder_model()->setDecoderStack(decoder_stack);
     int row_index = 0;
-    const std::map<const pv::data::decode::Row, bool> rows = decoder_stack->get_rows_lshow();
-    for (std::map<const pv::data::decode::Row, bool>::const_iterator i = rows.begin();
-        i != rows.end(); i++) {
+    const auto rows = decoder_stack->get_rows_lshow();
+
+    for (auto i = rows.begin();i != rows.end(); i++) {
         QLabel *row_label = new QLabel((*i).first.title(), this);
         QCheckBox *row_checkbox = new QCheckBox(this);
         //row_checkbox->setChecked(false);
@@ -169,9 +167,8 @@ void ProtocolList::on_row_check(bool show)
     QVariant id = sc->property("index");
     int index = id.toInt();
 
-    boost::shared_ptr<pv::data::DecoderStack> decoder_stack;
-    const std::vector< boost::shared_ptr<pv::view::DecodeTrace> > decode_sigs(
-        _session->get_decode_signals());
+    pv::data::DecoderStack *decoder_stack = NULL;
+    const auto &decode_sigs = _session->get_decode_signals();
     int cur_index = 0;
 
     for(auto &d : decode_sigs) {
diff --git a/DSView/pv/dialogs/protocollist.h b/DSView/pv/dialogs/protocollist.h
index 1d4c68f2..0d4024d9 100755
--- a/DSView/pv/dialogs/protocollist.h
+++ b/DSView/pv/dialogs/protocollist.h
@@ -29,8 +29,7 @@
 #include <QLabel>
 #include <QCheckBox>
 #include <QComboBox>
-
-#include <boost/shared_ptr.hpp>
+ 
 
 #include "../device/devinst.h"
 #include "../prop/binding/deviceoptions.h"
diff --git a/DSView/pv/dialogs/regionoptions.h b/DSView/pv/dialogs/regionoptions.h
index a0ec9554..b3e06b78 100755
--- a/DSView/pv/dialogs/regionoptions.h
+++ b/DSView/pv/dialogs/regionoptions.h
@@ -28,9 +28,7 @@
 #include <QVBoxLayout>
 #include <QLabel>
 #include <QComboBox>
-
-#include <boost/shared_ptr.hpp>
-
+ 
 #include "../toolbars/titlebar.h"
 #include "dsdialog.h"
 
diff --git a/DSView/pv/dialogs/search.cpp b/DSView/pv/dialogs/search.cpp
index 26744536..7f562068 100755
--- a/DSView/pv/dialogs/search.cpp
+++ b/DSView/pv/dialogs/search.cpp
@@ -52,8 +52,8 @@ Search::Search(QWidget *parent, SigSession *session, std::map<uint16_t, QString>
 
     for(auto &sig :  _session->get_signals()) {
         assert(sig);
-        boost::shared_ptr<view::LogicSignal> logic_sig;
-        if ((logic_sig = boost::dynamic_pointer_cast<view::LogicSignal>(sig))) {
+        view::LogicSignal *logic_sig = NULL;
+        if ((logic_sig = dynamic_cast<view::LogicSignal*>(sig))) {
             QLineEdit *search_lineEdit = new QLineEdit(this);
             if (pattern.find(logic_sig->get_index()) != pattern.end())
                 search_lineEdit->setText(pattern[logic_sig->get_index()]);
@@ -112,8 +112,8 @@ std::map<uint16_t, QString> Search::get_pattern()
     int index = 0;
     for(auto &sig :_session->get_signals()) {
         assert(sig);
-        boost::shared_ptr<view::LogicSignal> logic_sig;
-        if ((logic_sig = boost::dynamic_pointer_cast<view::LogicSignal>(sig))) {
+        view::LogicSignal *logic_sig = NULL;
+        if ((logic_sig = dynamic_cast<view::LogicSignal*>(sig))) {
             pattern[logic_sig->get_index()] = _search_lineEdit_vec[index]->text();
             index++;
         }
diff --git a/DSView/pv/dialogs/search.h b/DSView/pv/dialogs/search.h
index 29c3d5a4..013c4723 100755
--- a/DSView/pv/dialogs/search.h
+++ b/DSView/pv/dialogs/search.h
@@ -33,9 +33,7 @@
 #include "../toolbars/titlebar.h"
 #include "dsdialog.h"
 #include "../device/devinst.h"
-
-#include <boost/shared_ptr.hpp>
-
+ 
 namespace pv {
 namespace dialogs {
 
diff --git a/DSView/pv/dialogs/shadow.cpp b/DSView/pv/dialogs/shadow.cpp
index 0fc91ee4..c6fd3426 100755
--- a/DSView/pv/dialogs/shadow.cpp
+++ b/DSView/pv/dialogs/shadow.cpp
@@ -94,7 +94,7 @@ void Shadow::draw(QPainter* painter)
     painter->setWorldTransform(restoreTransform);
 }
 
-QRectF Shadow::boundingRectFor(const QRectF& rect) const
+QRectF Shadow::boundingRectFor(const QRectF& rect)
 {
     qreal delta = blurRadius() + distance();
     return rect.united(rect.adjusted(-delta, -delta, delta, delta));
diff --git a/DSView/pv/dialogs/shadow.h b/DSView/pv/dialogs/shadow.h
index e37bbbad..952aad24 100755
--- a/DSView/pv/dialogs/shadow.h
+++ b/DSView/pv/dialogs/shadow.h
@@ -36,16 +36,16 @@ public:
     explicit Shadow(QObject *parent = 0);
 
     void draw(QPainter* painter);
-    QRectF boundingRectFor(const QRectF& rect) const;
+    QRectF boundingRectFor(const QRectF& rect);
 
     inline void setDistance(qreal distance) { _distance = distance; updateBoundingRect(); }
-    inline qreal distance() const { return _distance; }
+    inline qreal distance() { return _distance; }
 
     inline void setBlurRadius(qreal blurRadius) { _blurRadius = blurRadius; updateBoundingRect(); }
-    inline qreal blurRadius() const { return _blurRadius; }
+    inline qreal blurRadius() { return _blurRadius; }
 
     inline void setColor(const QColor& color) { _color = color; }
-    inline QColor color() const { return _color; }
+    inline QColor color() { return _color; }
 
 private:
     qreal  _distance;
diff --git a/DSView/pv/dialogs/storeprogress.h b/DSView/pv/dialogs/storeprogress.h
index a7077142..f0475b5d 100755
--- a/DSView/pv/dialogs/storeprogress.h
+++ b/DSView/pv/dialogs/storeprogress.h
@@ -21,10 +21,7 @@
 
 #ifndef DSVIEW_PV_DIALOGS_SAVEPROGRESS_H
 #define DSVIEW_PV_DIALOGS_SAVEPROGRESS_H
-
-//#include <set>
-
-#include <boost/shared_ptr.hpp>
+ 
 #include <QProgressBar>
 #include "../storesession.h"
 #include "../dialogs/dsdialog.h" 
diff --git a/DSView/pv/dialogs/waitingdialog.cpp b/DSView/pv/dialogs/waitingdialog.cpp
index b206912b..1817c34b 100755
--- a/DSView/pv/dialogs/waitingdialog.cpp
+++ b/DSView/pv/dialogs/waitingdialog.cpp
@@ -184,11 +184,11 @@ void WaitingDialog::changeText()
                     zero_fgain = g_variant_get_boolean(gvar);
                     g_variant_unref(gvar);
                     if (zero_fgain) {
-                        boost::shared_ptr<view::DsoSignal> dsoSig;
+                        view::DsoSignal *dsoSig = NULL;
                         
                         for(auto &s : _session->get_signals())
                         {
-                            if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s)))
+                            if ((dsoSig = dynamic_cast<view::DsoSignal*>(s)))
                                 dsoSig->set_enable(dsoSig->get_index() == 0);
                         }
                         std::this_thread::sleep_for(std::chrono::milliseconds(100));
diff --git a/DSView/pv/dialogs/waitingdialog.h b/DSView/pv/dialogs/waitingdialog.h
index e8fb2474..dd1071d0 100755
--- a/DSView/pv/dialogs/waitingdialog.h
+++ b/DSView/pv/dialogs/waitingdialog.h
@@ -27,9 +27,7 @@
 #include <QTimer>
 #include <QLabel>
 #include <QMovie>
-
-#include <boost/shared_ptr.hpp>
-
+  
 #include "../sigsession.h"
 #include "../device/devinst.h"
 #include "../toolbars/titlebar.h"
diff --git a/DSView/pv/dock/dsotriggerdock.cpp b/DSView/pv/dock/dsotriggerdock.cpp
index c859f824..29698f19 100755
--- a/DSView/pv/dock/dsotriggerdock.cpp
+++ b/DSView/pv/dock/dsotriggerdock.cpp
@@ -24,8 +24,6 @@
 #include "../device/devinst.h"
 #include "../dialogs/dsmessagebox.h"
 #include "../view/dsosignal.h"
-
-#include <boost/shared_ptr.hpp>
  
 
 #include <QObject>
@@ -389,8 +387,8 @@ void DsoTriggerDock::init()
     _channel_comboBox->clear();
     
     for(auto &s : _session->get_signals()) {
-        boost::shared_ptr<view::DsoSignal> dsoSig;
-        if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
+        view::DsoSignal *dsoSig = NULL;
+        if ((dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
             _channel_comboBox->addItem(dsoSig->get_name(), QVariant::fromValue(dsoSig->get_index()));
         }
     }
diff --git a/DSView/pv/dock/measuredock.cpp b/DSView/pv/dock/measuredock.cpp
index 77166789..5b6c77dd 100755
--- a/DSView/pv/dock/measuredock.cpp
+++ b/DSView/pv/dock/measuredock.cpp
@@ -598,12 +598,15 @@ void MeasureDock::update_edge()
         if (start_ret && end_ret) {
             uint64_t rising_edges;
             uint64_t falling_edges;
-            const std::vector< boost::shared_ptr<Signal> > sigs(_session->get_signals());
+
+            const auto &sigs = _session->get_signals();
+
             for(size_t i = 0; i < sigs.size(); i++) {
-                const boost::shared_ptr<view::Signal> s(sigs[i]);
-                boost::shared_ptr<view::LogicSignal> logicSig;
+                view::Signal *s = sigs[i];
+                view::LogicSignal *logicSig = NULL;
                 assert(s);
-                if ((logicSig = dynamic_pointer_cast<view::LogicSignal>(s)) &&
+
+                if ((logicSig = dynamic_cast<view::LogicSignal*>(s)) &&
                     (logicSig->enabled()) &&
                     (logicSig->get_index() == _edge_ch_cmb_vec[edge_index]->currentText().toInt())){
                     if (logicSig->edges(_view.get_cursor_samples(end), _view.get_cursor_samples(start), rising_edges, falling_edges)) {
@@ -650,12 +653,13 @@ QComboBox* MeasureDock::create_probe_selector(QWidget *parent)
 void MeasureDock::update_probe_selector(QComboBox *selector)
 {
     selector->clear();
-    const std::vector< boost::shared_ptr<Signal> > sigs(_session->get_signals());
+    const auto &sigs = _session->get_signals();
+
     for(size_t i = 0; i < sigs.size(); i++) {
-        const boost::shared_ptr<view::Signal> s(sigs[i]);
+        const auto s = sigs[i];
         assert(s);
 
-        if (dynamic_pointer_cast<LogicSignal>(s) && s->enabled())
+        if (dynamic_cast<LogicSignal*>(s) && s->enabled())
         {
             selector->addItem(QString::number(s->get_index()));
         }
diff --git a/DSView/pv/dock/protocoldock.cpp b/DSView/pv/dock/protocoldock.cpp
index a35374ab..85150806 100755
--- a/DSView/pv/dock/protocoldock.cpp
+++ b/DSView/pv/dock/protocoldock.cpp
@@ -46,13 +46,14 @@
 #include <assert.h>
 
  
-#include <boost/shared_ptr.hpp>
 #include <algorithm>
 #include "../ui/msgbox.h"
 #include "../dsvdef.h"
 #include "../config/appconfig.h"
 #include "../data/decode/decoderstatus.h"
 
+using namespace std;
+
 namespace pv {
 namespace dock {
    
@@ -205,6 +206,8 @@ ProtocolDock::ProtocolDock(QWidget *parent, view::View &view, SigSession *sessio
     connect(_search_edit, SIGNAL(editingFinished()), this, SLOT(search_changed()));
 
     retranslateUi();
+
+    ds_debug("protocol panel\n");
 }
 
 ProtocolDock::~ProtocolDock()
@@ -333,9 +336,9 @@ void ProtocolDock::add_protocol(bool silent)
         }
 
         //progress connection
-        const std::vector<boost::shared_ptr<pv::view::DecodeTrace>> decode_sigs(_session->get_decode_signals());
+        const auto &decode_sigs  = _session->get_decode_signals();
 
-        connect(decode_sigs.back().get(), SIGNAL(decoded_progress(int)), this, SLOT(decoded_progress(int)));
+        connect(decode_sigs.back(), SIGNAL(decoded_progress(int)), this, SLOT(decoded_progress(int)));
 
         protocol_updated(); 
     }
@@ -373,8 +376,7 @@ void ProtocolDock::decoded_progress(int progress)
 
     int pg = 0;
     QString err="";
-    const std::vector< boost::shared_ptr<pv::view::DecodeTrace> > decode_sigs(
-        _session->get_decode_signals());
+    const auto &decode_sigs = _session->get_decode_signals();
     int index = 0;
 
     for(auto &d : decode_sigs) {
@@ -414,8 +416,7 @@ void ProtocolDock::set_model()
     search_done();
 
     // clear mark_index of all DecoderStacks
-    const std::vector< boost::shared_ptr<pv::view::DecodeTrace> > decode_sigs(
-        _session->get_decode_signals());
+    const auto &decode_sigs = _session->get_decode_signals();
         
     for(auto &d : decode_sigs) {
         d->decoder()->set_mark_index(-1);
@@ -425,8 +426,8 @@ void ProtocolDock::set_model()
 void ProtocolDock::update_model()
 {
     pv::data::DecoderModel *decoder_model = _session->get_decoder_model();
-    const std::vector< boost::shared_ptr<pv::view::DecodeTrace> > decode_sigs(
-        _session->get_decode_signals());
+    const auto &decode_sigs = _session->get_decode_signals();
+
     if (decode_sigs.size() == 0)
         decoder_model->setDecoderStack(NULL);
     else if (!decoder_model->getDecoderStack())
@@ -468,12 +469,12 @@ void ProtocolDock::resize_table_view(data::DecoderModel* decoder_model)
 void ProtocolDock::item_clicked(const QModelIndex &index)
 {
     pv::data::DecoderModel *decoder_model = _session->get_decoder_model();
-    boost::shared_ptr<pv::data::DecoderStack> decoder_stack = decoder_model->getDecoderStack();
+
+    auto decoder_stack = decoder_model->getDecoderStack();
     if (decoder_stack) {
         pv::data::decode::Annotation ann;
         if (decoder_stack->list_annotation(ann, index.column(), index.row())) {
-            const std::vector< boost::shared_ptr<pv::view::DecodeTrace> > decode_sigs(
-                _session->get_decode_signals());
+            const auto &decode_sigs = _session->get_decode_signals();
 
             for(auto &d : decode_sigs) {
                 d->decoder()->set_mark_index(-1);
@@ -548,7 +549,8 @@ void ProtocolDock::nav_table_view()
 {
     uint64_t row_index = 0;
     pv::data::DecoderModel *decoder_model = _session->get_decoder_model();
-    boost::shared_ptr<pv::data::DecoderStack> decoder_stack = decoder_model->getDecoderStack();
+
+    auto decoder_stack = decoder_model->getDecoderStack();
     if (decoder_stack) {
         uint64_t offset = _view.offset() * (decoder_stack->samplerate() * _view.scale());
         std::map<const pv::data::decode::Row, bool> rows = decoder_stack->get_rows_lshow();
@@ -567,8 +569,7 @@ void ProtocolDock::nav_table_view()
 
             pv::data::decode::Annotation ann;
             decoder_stack->list_annotation(ann, index.column(), index.row());
-            const std::vector< boost::shared_ptr<pv::view::DecodeTrace> > decode_sigs(
-                _session->get_decode_signals());
+            const auto &decode_sigs = _session->get_decode_signals();
 
             for(auto &d : decode_sigs) {
                 d->decoder()->set_mark_index(-1);
@@ -596,7 +597,8 @@ void ProtocolDock::search_pre()
     uint64_t rowCount = _model_proxy.rowCount();
     QModelIndex matchingIndex;
     pv::data::DecoderModel *decoder_model = _session->get_decoder_model();
-    boost::shared_ptr<pv::data::DecoderStack> decoder_stack = decoder_model->getDecoderStack();
+
+    auto decoder_stack = decoder_model->getDecoderStack();
     do {
         _cur_search_index--;
         if (_cur_search_index <= -1 || _cur_search_index >= _model_proxy.rowCount())
@@ -652,7 +654,8 @@ void ProtocolDock::search_nxt()
     uint64_t rowCount = _model_proxy.rowCount();
     QModelIndex matchingIndex;
     pv::data::DecoderModel *decoder_model = _session->get_decoder_model();
-    boost::shared_ptr<pv::data::DecoderStack> decoder_stack = decoder_model->getDecoderStack();
+
+   auto decoder_stack = decoder_model->getDecoderStack();
     do {
         _cur_search_index++;
         if (_cur_search_index < 0 || _cur_search_index >= _model_proxy.rowCount())
@@ -716,7 +719,8 @@ void ProtocolDock::search_update()
         return;
 
     pv::data::DecoderModel *decoder_model = _session->get_decoder_model();
-    boost::shared_ptr<pv::data::DecoderStack> decoder_stack = decoder_model->getDecoderStack();
+
+    auto decoder_stack = decoder_model->getDecoderStack();
     if (!decoder_stack)
         return;
 
diff --git a/DSView/pv/dock/searchdock.cpp b/DSView/pv/dock/searchdock.cpp
index 87b2cee3..33c56f66 100755
--- a/DSView/pv/dock/searchdock.cpp
+++ b/DSView/pv/dock/searchdock.cpp
@@ -40,8 +40,7 @@
 #include <QProgressDialog>
 #include <QtConcurrent/QtConcurrent>
 
-#include <stdint.h>
-#include <boost/shared_ptr.hpp>
+#include <stdint.h> 
 #include "../config/appconfig.h"
 
 namespace pv {
@@ -130,9 +129,9 @@ void SearchDock::on_previous()
     bool ret;
     int64_t last_pos;
     bool last_hit;
-    const boost::shared_ptr<data::Snapshot> snapshot(_session->get_snapshot(SR_CHANNEL_LOGIC));
+    const auto snapshot = _session->get_snapshot(SR_CHANNEL_LOGIC);
     assert(snapshot);
-    const boost::shared_ptr<data::LogicSnapshot> logic_snapshot = boost::dynamic_pointer_cast<data::LogicSnapshot>(snapshot);
+    const auto logic_snapshot = dynamic_cast<data::LogicSnapshot*>(snapshot);
 
     if (!logic_snapshot || logic_snapshot->empty()) {
         dialogs::DSMessageBox msg(this);
@@ -192,9 +191,9 @@ void SearchDock::on_next()
 {
     bool ret;
     int64_t last_pos;
-    const boost::shared_ptr<data::Snapshot> snapshot(_session->get_snapshot(SR_CHANNEL_LOGIC));
+    const auto snapshot = _session->get_snapshot(SR_CHANNEL_LOGIC);
     assert(snapshot);
-    const boost::shared_ptr<data::LogicSnapshot> logic_snapshot = boost::dynamic_pointer_cast<data::LogicSnapshot>(snapshot);
+    const auto logic_snapshot = dynamic_cast<data::LogicSnapshot*>(snapshot);
 
     if (!logic_snapshot || logic_snapshot->empty()) {
         dialogs::DSMessageBox msg(this);
diff --git a/DSView/pv/dsvdef.cpp b/DSView/pv/dsvdef.cpp
index e5203dbe..49d0e5df 100644
--- a/DSView/pv/dsvdef.cpp
+++ b/DSView/pv/dsvdef.cpp
@@ -23,6 +23,13 @@
 #include "dsvdef.h"
 #include <string.h>
 
+#ifdef DS_DEBUG_TRACE
+#include <stdio.h>
+    void ds_print(const char *s){
+        printf(s);
+    }     
+#endif
+
 namespace DecoderDataFormat
 {
       int Parse(const char *name){
diff --git a/DSView/pv/dsvdef.h b/DSView/pv/dsvdef.h
index c35a7de0..cc5283c8 100644
--- a/DSView/pv/dsvdef.h
+++ b/DSView/pv/dsvdef.h
@@ -22,6 +22,17 @@
 
 #pragma once
 
+#include "../config.h"
+
+
+#ifdef DS_DEBUG_TRACE
+    void ds_print(const char *s);
+    
+    #define ds_debug(x) ds_print((x))
+#else
+    #define ds_debug(x)
+#endif
+
 class QWidget;
 
 #define DESTROY_OBJECT(p) if((p)){delete (p); p = NULL;} 
@@ -48,3 +59,4 @@ namespace app
 
     bool is_app_top_window(QWidget* w);
 }
+
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index dd0372af..fe69e51d 100755
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -26,8 +26,7 @@
 #include "dock/protocoldock.h"
 
 
-#include <boost/bind.hpp>
-#include <boost/shared_ptr.hpp>
+#include <boost/bind.hpp> 
 
 #include <QAction>
 #include <QButtonGroup>
@@ -92,11 +91,7 @@
 #include "../ui/msgbox.h"
 #include "config/appconfig.h"
 #include "appcontrol.h"
-
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
-using std::list;
-using std::vector;
+ 
 
 namespace pv {
 
@@ -549,9 +544,9 @@ void MainWindow::device_detach()
     _view->hide_calibration();
     if (_session->get_device()->dev_inst()->mode != DSO &&
         strncmp(_session->get_device()->name().toUtf8(), "virtual", 7)) {
-        const boost::shared_ptr<data::Snapshot> logic_snapshot(_session->get_snapshot(SR_CHANNEL_LOGIC));
+        const auto logic_snapshot = _session->get_snapshot(SR_CHANNEL_LOGIC);
         assert(logic_snapshot);
-        const boost::shared_ptr<data::Snapshot> analog_snapshot(_session->get_snapshot(SR_CHANNEL_ANALOG));
+        const auto analog_snapshot = _session->get_snapshot(SR_CHANNEL_ANALOG);
         assert(analog_snapshot);
 
         if (!logic_snapshot->empty() || !analog_snapshot->empty()) {
@@ -830,8 +825,8 @@ void MainWindow::commit_trigger(bool instant)
         for(auto &s : _session->get_signals())
         {
             assert(s);
-            boost::shared_ptr<view::LogicSignal> logicSig;
-            if ((logicSig = dynamic_pointer_cast<view::LogicSignal>(s))) {
+            view::LogicSignal *logicSig = NULL;
+            if ((logicSig = dynamic_cast<view::LogicSignal*>(s))) {
                 if (logicSig->commit_trig())
                     i++;
             }
@@ -848,17 +843,19 @@ void MainWindow::commit_trigger(bool instant)
             msg.mBox()->addButton(tr("Continue"), QMessageBox::ActionRole);
 
             msg.exec();
+
             if (msg.mBox()->clickedButton() == cancelButton) {
                 for(auto &s : _session->get_signals())
                 {
                     assert(s);
-                    boost::shared_ptr<view::LogicSignal> logicSig;
-                    if ((logicSig = dynamic_pointer_cast<view::LogicSignal>(s))) {
+                    view::LogicSignal *logicSig = NULL;
+                    if ((logicSig = dynamic_cast<view::LogicSignal*>(s))) {
                         logicSig->set_trig(view::LogicSignal::NONTRIG);
                         logicSig->commit_trig();
                     }
                 }
             }
+
             if (msg.mBox()->clickedButton() == noMoreButton)
             {
                 app._appOptions.warnofMultiTrig  = false;
@@ -1068,8 +1065,8 @@ bool MainWindow::load_session_json(QJsonDocument json, bool file_dev)
                     (s->get_type() == obj["type"].toDouble())) {
                     s->set_colour(QColor(obj["colour"].toString()));
 
-                    boost::shared_ptr<view::DsoSignal> dsoSig;
-                    if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
+                    view::DsoSignal *dsoSig = NULL;
+                    if ((dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
                         dsoSig->load_settings();
                         dsoSig->set_zero_ratio(obj["zeroPos"].toDouble());
                         dsoSig->set_trig_ratio(obj["trigValue"].toDouble());
@@ -1088,21 +1085,21 @@ bool MainWindow::load_session_json(QJsonDocument json, bool file_dev)
                     s->set_colour(QColor(obj["colour"].toString()));
                     s->set_name(g_strdup(obj["name"].toString().toUtf8().data()));
 
-                    boost::shared_ptr<view::LogicSignal> logicSig;
-                    if ((logicSig = dynamic_pointer_cast<view::LogicSignal>(s))) {
+                    view::LogicSignal *logicSig = NULL;
+                    if ((logicSig = dynamic_cast<view::LogicSignal*>(s))) {
                         logicSig->set_trig(obj["strigger"].toDouble());
                     }
 
-                    boost::shared_ptr<view::DsoSignal> dsoSig;
-                    if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
+                    view::DsoSignal *dsoSig = NULL;
+                    if ((dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
                         dsoSig->load_settings();
                         dsoSig->set_zero_ratio(obj["zeroPos"].toDouble());
                         dsoSig->set_trig_ratio(obj["trigValue"].toDouble());
                         dsoSig->commit_settings();
                     }
 
-                    boost::shared_ptr<view::AnalogSignal> analogSig;
-                    if ((analogSig = dynamic_pointer_cast<view::AnalogSignal>(s))) {
+                    view::AnalogSignal *analogSig = NULL;
+                    if ((analogSig = dynamic_cast<view::AnalogSignal*>(s))) {
                         analogSig->set_zero_ratio(obj["zeroPos"].toDouble());
                         analogSig->commit_settings();
                     }
@@ -1200,13 +1197,13 @@ bool MainWindow::on_store_session(QString name)
         else
             s_obj["colour"] = QJsonValue::fromVariant("default");
 
-        boost::shared_ptr<view::LogicSignal> logicSig;
-        if ((logicSig = dynamic_pointer_cast<view::LogicSignal>(s))) {
+        view::LogicSignal *logicSig = NULL;
+        if ((logicSig = dynamic_cast<view::LogicSignal*>(s))) {
             s_obj["strigger"] = logicSig->get_trig();
         }
 
-        boost::shared_ptr<view::DsoSignal> dsoSig;
-        if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
+        view::DsoSignal *dsoSig = NULL;
+        if ((dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
             s_obj["vdiv"] = QJsonValue::fromVariant(static_cast<qulonglong>(dsoSig->get_vDialValue()));
             s_obj["vfactor"] = QJsonValue::fromVariant(static_cast<qulonglong>(dsoSig->get_factor()));
             s_obj["coupling"] = dsoSig->get_acCoupling();
@@ -1214,8 +1211,8 @@ bool MainWindow::on_store_session(QString name)
             s_obj["zeroPos"] = dsoSig->get_zero_ratio();
         }
 
-        boost::shared_ptr<view::AnalogSignal> analogSig;
-        if ((analogSig = dynamic_pointer_cast<view::AnalogSignal>(s))) {
+        view::AnalogSignal *analogSig = NULL;
+        if ((analogSig = dynamic_cast<view::AnalogSignal*>(s))) {
             s_obj["vdiv"] = QJsonValue::fromVariant(static_cast<qulonglong>(analogSig->get_vdiv()));
             s_obj["vfactor"] = QJsonValue::fromVariant(static_cast<qulonglong>(analogSig->get_factor()));
             s_obj["coupling"] = analogSig->get_acCoupling();
@@ -1289,7 +1286,7 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event)
 
     if ( event->type() == QEvent::KeyPress ) {
         SigSession *_session = _control->GetSession();
-        const vector< boost::shared_ptr<view::Signal> > sigs(_session->get_signals());
+        const auto &sigs = _session->get_signals();
         QKeyEvent *ke = (QKeyEvent *) event;
         switch(ke->key()) {
         case Qt::Key_S:
@@ -1335,8 +1332,8 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event)
             break;
         case Qt::Key_0:
              for(auto & s : sigs) {
-                boost::shared_ptr<view::DsoSignal> dsoSig;
-                if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
+                view::DsoSignal *dsoSig = NULL;
+                if ((dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
                     if (dsoSig->get_index() == 0)
                         dsoSig->set_vDialActive(!dsoSig->get_vDialActive());
                     else
@@ -1348,8 +1345,8 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event)
             break;
         case Qt::Key_1:
              for(auto & s : sigs) {
-                boost::shared_ptr<view::DsoSignal> dsoSig;
-                if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
+                view::DsoSignal *dsoSig = NULL;
+                if ((dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
                     if (dsoSig->get_index() == 1)
                         dsoSig->set_vDialActive(!dsoSig->get_vDialActive());
                     else
@@ -1361,8 +1358,8 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event)
             break;
         case Qt::Key_Up:
              for(auto &s : sigs) {
-                boost::shared_ptr<view::DsoSignal> dsoSig;
-                if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
+                view::DsoSignal *dsoSig = NULL;
+                if ((dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
                     if (dsoSig->get_vDialActive()) {
                         dsoSig->go_vDialNext(true);
                         update();
@@ -1373,8 +1370,8 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event)
             break;
         case Qt::Key_Down:
              for(auto &s : sigs) {
-                boost::shared_ptr<view::DsoSignal> dsoSig;
-                if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
+                view::DsoSignal *dsoSig = NULL;
+                if ((dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
                     if (dsoSig->get_vDialActive()) {
                         dsoSig->go_vDialPre(true);
                         update();
diff --git a/DSView/pv/minizip/mztools.c b/DSView/pv/minizip/mztools.c
index 96891c2e..6047d70c 100644
--- a/DSView/pv/minizip/mztools.c
+++ b/DSView/pv/minizip/mztools.c
@@ -12,8 +12,8 @@
 #include "unzip.h"
 
 #define READ_8(adr)  ((unsigned char)*(adr))
-#define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8) )
-#define READ_32(adr) ( READ_16(adr) | (READ_16((adr)+2) << 16) )
+#define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8)
+#define READ_32(adr) ( READ_16(adr) | (READ_16((adr)+2) << 16)
 
 #define WRITE_8(buff, n) do { \
   *((unsigned char*)(buff)) = (unsigned char) ((n) & 0xff); \
diff --git a/DSView/pv/prop/binding/binding.cpp b/DSView/pv/prop/binding/binding.cpp
index 78e231ba..345cae1e 100755
--- a/DSView/pv/prop/binding/binding.cpp
+++ b/DSView/pv/prop/binding/binding.cpp
@@ -26,14 +26,13 @@
 #include <pv/prop/property.h>
 
 #include "binding.h"
-
-using boost::shared_ptr;
+ 
 
 namespace pv {
 namespace prop {
 namespace binding {
 
-const std::vector< boost::shared_ptr<Property> >& Binding::properties()
+const std::vector<Property*>& Binding::properties()
 {
 	return _properties;
 }
@@ -47,7 +46,7 @@ void Binding::commit()
 }
 
 void Binding::add_properties_to_form(QFormLayout *layout,
-    bool auto_commit) const
+    bool auto_commit)
 {
     assert(layout);
 
@@ -71,7 +70,7 @@ void Binding::add_properties_to_form(QFormLayout *layout,
 }
 
 QWidget* Binding::get_property_form(QWidget *parent,
-    bool auto_commit) const
+    bool auto_commit)
 {
     QWidget *const form = new QWidget(parent);
     QFormLayout *const layout = new QFormLayout(form);
@@ -84,11 +83,9 @@ QWidget* Binding::get_property_form(QWidget *parent,
     return form;
 }
 
-std::map< boost::shared_ptr<Property>,
-          GVariant* > Binding::get_property_value() const
+std::map<Property*,GVariant*> Binding::get_property_value()
 {
-    std::map < boost::shared_ptr<Property>,
-            GVariant* > pvalue;
+    std::map <Property*,GVariant*> pvalue;
             
     for(auto &p : _properties)
     {
diff --git a/DSView/pv/prop/binding/binding.h b/DSView/pv/prop/binding/binding.h
index 8b413e05..68bae0d7 100755
--- a/DSView/pv/prop/binding/binding.h
+++ b/DSView/pv/prop/binding/binding.h
@@ -27,8 +27,7 @@
 #include <glib.h>
 
 #include <vector>
-#include <map>
-#include <boost/shared_ptr.hpp>
+#include <map> 
 
 #include <QString>
 
@@ -45,23 +44,22 @@ namespace binding {
 class Binding
 {
 public:
-	const std::vector< boost::shared_ptr<Property> >& properties();
+    const std::vector<Property*>& properties();
 
     void commit();
 
     void add_properties_to_form(QFormLayout *layout,
-        bool auto_commit = false) const;
+        bool auto_commit = false);
 
     QWidget* get_property_form(QWidget *parent,
-        bool auto_commit = false) const;
+        bool auto_commit = false);
 
-    std::map< boost::shared_ptr<Property>,
-              GVariant* > get_property_value() const;
+    std::map<Property*,GVariant*> get_property_value();
 
     static QString print_gvariant(GVariant *const gvar);
 
 protected:
-	std::vector< boost::shared_ptr<Property> > _properties;
+	std::vector<Property*> _properties;
 
 	QWidget *_form;
 };
diff --git a/DSView/pv/prop/binding/decoderoptions.cpp b/DSView/pv/prop/binding/decoderoptions.cpp
index df017534..cdaca0df 100755
--- a/DSView/pv/prop/binding/decoderoptions.cpp
+++ b/DSView/pv/prop/binding/decoderoptions.cpp
@@ -33,22 +33,16 @@
 #include <pv/prop/int.h>
 #include <pv/prop/string.h>
 
-using boost::bind;
-using boost::none;
-using boost::shared_ptr;
-using std::make_pair;
-using std::map;
-using std::pair;
-using std::string;
-using std::vector;
-
+using namespace boost;
+using namespace std;
+ 
 namespace pv {
 namespace prop {
 namespace binding {
 
 DecoderOptions::DecoderOptions(
-	shared_ptr<pv::data::DecoderStack> decoder_stack,
-	shared_ptr<data::decode::Decoder> decoder) :
+	pv::data::DecoderStack* decoder_stack,
+	data::decode::Decoder *decoder) :
 	_decoder_stack(decoder_stack),
 	_decoder(decoder)
 {
@@ -69,19 +63,16 @@ DecoderOptions::DecoderOptions(
 		const Property::Setter setter = bind(
 			&DecoderOptions::setter, this, opt->id, _1);
 
-		shared_ptr<Property> prop;
+		Property *prop = NULL;
 
 		if (opt->values)
             prop = bind_enum(name, opt, getter, setter);
 		else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("d")))
-            prop = shared_ptr<Property>(new Double(name, name, 2, "",
-				none, none, getter, setter));
+            prop = new Double(name, name, 2, "",none, none, getter, setter);
 		else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("x")))
-			prop = shared_ptr<Property>(
-                new Int(name, name, "", none, getter, setter));
+			prop = new Int(name, name, "", none, getter, setter);
 		else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("s")))
-			prop = shared_ptr<Property>(
-                new String(name, name, getter, setter));
+			prop = new String(name, name, getter, setter);
 		else
 			continue;
 
@@ -89,18 +80,18 @@ DecoderOptions::DecoderOptions(
 	}
 }
 
-shared_ptr<Property> DecoderOptions::bind_enum(
+Property* DecoderOptions::bind_enum(
 	const QString &name, const srd_decoder_option *option,
 	Property::Getter getter, Property::Setter setter)
 {
-	vector< pair<GVariant*, QString> > values;
+    std::vector<std::pair<GVariant*, QString> > values;
 	for (GSList *l = option->values; l; l = l->next) {
 		GVariant *const var = (GVariant*)l->data;
 		assert(var);
 		values.push_back(make_pair(var, print_gvariant(var)));
 	}
 
-    return shared_ptr<Property>(new Enum(name, name, values, getter, setter));
+    return new Enum(name, name, values, getter, setter);
 }
 
 GVariant* DecoderOptions::getter(const char *id)
@@ -111,7 +102,7 @@ GVariant* DecoderOptions::getter(const char *id)
 
 	// Get the value from the hash table if it is already present
 	const map<string, GVariant*>& options = _decoder->options();
-	map<string, GVariant*>::const_iterator iter = options.find(id);
+	auto iter = options.find(id);
 
 	if (iter != options.end())
 		val = (*iter).second;
diff --git a/DSView/pv/prop/binding/decoderoptions.h b/DSView/pv/prop/binding/decoderoptions.h
index 62d91ec3..258c3a62 100755
--- a/DSView/pv/prop/binding/decoderoptions.h
+++ b/DSView/pv/prop/binding/decoderoptions.h
@@ -23,7 +23,7 @@
 
 #include "binding.h"
 
-#include <pv/prop/property.h>
+#include "../property.h"
 
 struct srd_decoder_option;
 
@@ -42,23 +42,23 @@ namespace binding {
 class DecoderOptions : public Binding
 {
 public:
-	DecoderOptions(boost::shared_ptr<pv::data::DecoderStack> decoder_stack,
-		boost::shared_ptr<pv::data::decode::Decoder> decoder);
+	DecoderOptions(pv::data::DecoderStack *decoder_stack,
+		pv::data::decode::Decoder* decoder);
 
     GVariant* getter(const char *id);
 
     void setter(const char *id, GVariant *value);
 
 private:
-	static boost::shared_ptr<Property> bind_enum(const QString &name,
+	static Property* bind_enum(const QString &name,
 		const srd_decoder_option *option,
 		Property::Getter getter, Property::Setter setter);
 
 
 
 private:
-	boost::shared_ptr<pv::data::DecoderStack> _decoder_stack;
-	boost::shared_ptr<pv::data::decode::Decoder> _decoder;
+	pv::data::DecoderStack 		*_decoder_stack;
+	pv::data::decode::Decoder 	*_decoder;
 };
 
 } // binding
diff --git a/DSView/pv/prop/binding/deviceoptions.cpp b/DSView/pv/prop/binding/deviceoptions.cpp
index deef3fac..1b4f1b15 100755
--- a/DSView/pv/prop/binding/deviceoptions.cpp
+++ b/DSView/pv/prop/binding/deviceoptions.cpp
@@ -166,9 +166,9 @@ void DeviceOptions::config_setter(
 
 void DeviceOptions::bind_bool(const QString &name, const QString label, int key)
 {
-	_properties.push_back(boost::shared_ptr<Property>(
+	_properties.push_back(
         new Bool(name, label, bind(config_getter, _sdi, key),
-			bind(config_setter, _sdi, key, _1))));
+			bind(config_setter, _sdi, key, _1)));
 }
 
 void DeviceOptions::bind_enum(const QString &name, const QString label, int key,
@@ -176,7 +176,7 @@ void DeviceOptions::bind_enum(const QString &name, const QString label, int key,
 {
 	GVariant *gvar;
 	GVariantIter iter;
-	vector< pair<GVariant*, QString> > values;
+	std::vector< pair<GVariant*, QString> > values;
 
 	assert(gvar_list);
 
@@ -184,29 +184,29 @@ void DeviceOptions::bind_enum(const QString &name, const QString label, int key,
 	while ((gvar = g_variant_iter_next_value (&iter)))
 		values.push_back(make_pair(gvar, printer(gvar)));
 
-	_properties.push_back(boost::shared_ptr<Property>(
+	_properties.push_back(
         new Enum(name, label, values,
 			bind(config_getter, _sdi, key),
-			bind(config_setter, _sdi, key, _1))));
+			bind(config_setter, _sdi, key, _1)));
 }
 
 void DeviceOptions::bind_int(const QString &name, const QString label, int key, QString suffix,
     optional< std::pair<int64_t, int64_t> > range)
 {
-	_properties.push_back(boost::shared_ptr<Property>(
+	_properties.push_back(
         new Int(name, label, suffix, range,
 			bind(config_getter, _sdi, key),
-			bind(config_setter, _sdi, key, _1))));
+			bind(config_setter, _sdi, key, _1)));
 }
 
 void DeviceOptions::bind_double(const QString &name, const QString label, int key, QString suffix,
     optional< std::pair<double, double> > range,
     int decimals, boost::optional<double> step)
 {
-    _properties.push_back(boost::shared_ptr<Property>(
+    _properties.push_back(
         new Double(name, label, decimals, suffix, range, step,
             bind(config_getter, _sdi, key),
-            bind(config_setter, _sdi, key, _1))));
+            bind(config_setter, _sdi, key, _1)));
 }
 
 QString DeviceOptions::print_gvariant(GVariant *const gvar)
@@ -242,12 +242,12 @@ void DeviceOptions::bind_samplerate(const QString &name, const QString label,
 
 		assert(num_elements == 3);
 
-		_properties.push_back(boost::shared_ptr<Property>(
+		_properties.push_back(
             new Double(name, label, 0, QObject::tr("Hz"),
 				make_pair((double)elements[0], (double)elements[1]),
 						(double)elements[2],
 				bind(samplerate_double_getter, _sdi),
-				bind(samplerate_double_setter, _sdi, _1))));
+				bind(samplerate_double_setter, _sdi, _1)));
 
 		g_variant_unref(gvar_list_samplerates);
 	}
@@ -312,7 +312,7 @@ void DeviceOptions::bind_bandwidths(const QString &name, const QString label, in
 {
     GVariant *gvar;
     GVariantIter iter;
-    vector< pair<GVariant*, QString> > values;
+    std::vector< pair<GVariant*, QString> > values;
     bool bw_limit = FALSE;
 
     assert(gvar_list);
@@ -332,10 +332,10 @@ void DeviceOptions::bind_bandwidths(const QString &name, const QString label, in
     while ((gvar = g_variant_iter_next_value (&iter)))
         values.push_back(make_pair(gvar, printer(gvar)));
 
-    _properties.push_back(boost::shared_ptr<Property>(
+    _properties.push_back(
         new Enum(name, label, values,
             bind(config_getter, _sdi, key),
-            bind(config_setter, _sdi, key, _1))));
+            bind(config_setter, _sdi, key, _1)));
 }
 
 } // binding
diff --git a/DSView/pv/prop/binding/probeoptions.cpp b/DSView/pv/prop/binding/probeoptions.cpp
index 3b6a101f..be3806c9 100755
--- a/DSView/pv/prop/binding/probeoptions.cpp
+++ b/DSView/pv/prop/binding/probeoptions.cpp
@@ -138,9 +138,9 @@ void ProbeOptions::config_setter(
 
 void ProbeOptions::bind_bool(const QString &name, const QString label, int key)
 {
-	_properties.push_back(boost::shared_ptr<Property>(
+	_properties.push_back(
         new Bool(name, label, bind(config_getter, _sdi, _probe, key),
-            bind(config_setter, _sdi, _probe, key, _1))));
+            bind(config_setter, _sdi, _probe, key, _1)));
 }
 
 void ProbeOptions::bind_enum(const QString &name, const QString label, int key,
@@ -148,7 +148,7 @@ void ProbeOptions::bind_enum(const QString &name, const QString label, int key,
 {
 	GVariant *gvar;
 	GVariantIter iter;
-	vector< pair<GVariant*, QString> > values;
+	std::vector< pair<GVariant*, QString> > values;
 
 	assert(gvar_list);
 
@@ -156,29 +156,29 @@ void ProbeOptions::bind_enum(const QString &name, const QString label, int key,
 	while ((gvar = g_variant_iter_next_value (&iter)))
 		values.push_back(make_pair(gvar, printer(gvar)));
 
-	_properties.push_back(boost::shared_ptr<Property>(
+	_properties.push_back(
         new Enum(name, label, values,
             bind(config_getter, _sdi, _probe, key),
-            bind(config_setter, _sdi, _probe, key, _1))));
+            bind(config_setter, _sdi, _probe, key, _1)));
 }
 
 void ProbeOptions::bind_int(const QString &name, const QString label, int key, QString suffix,
     optional< std::pair<int64_t, int64_t> > range)
 {
-	_properties.push_back(boost::shared_ptr<Property>(
+	_properties.push_back(
         new Int(name, label, suffix, range,
             bind(config_getter, _sdi, _probe, key),
-            bind(config_setter, _sdi, _probe, key, _1))));
+            bind(config_setter, _sdi, _probe, key, _1)));
 }
 
 void ProbeOptions::bind_double(const QString &name, const QString label, int key, QString suffix,
     optional< std::pair<double, double> > range,
     int decimals, boost::optional<double> step)
 {
-    _properties.push_back(boost::shared_ptr<Property>(
+    _properties.push_back(
         new Double(name, label, decimals, suffix, range, step,
             bind(config_getter, _sdi, _probe, key),
-            bind(config_setter, _sdi, _probe, key, _1))));
+            bind(config_setter, _sdi, _probe, key, _1)));
 }
 
 void ProbeOptions::bind_vdiv(const QString &name, const QString label,
diff --git a/DSView/pv/prop/bool.cpp b/DSView/pv/prop/bool.cpp
index 75169b86..b31369c2 100755
--- a/DSView/pv/prop/bool.cpp
+++ b/DSView/pv/prop/bool.cpp
@@ -65,12 +65,12 @@ QWidget* Bool::get_widget(QWidget *parent, bool auto_commit)
 	return _check_box;
 }
 
-bool Bool::labeled_widget() const
+bool Bool::labeled_widget()
 {
 	return true;
 }
 
-GVariant* Bool::get_value() const
+GVariant* Bool::get_value()
 {
     GVariant *const value = _getter ? _getter() : NULL;
 
diff --git a/DSView/pv/prop/bool.h b/DSView/pv/prop/bool.h
index c9f9e409..5603914c 100755
--- a/DSView/pv/prop/bool.h
+++ b/DSView/pv/prop/bool.h
@@ -40,9 +40,9 @@ public:
 	virtual ~Bool();
 
     QWidget* get_widget(QWidget *parent, bool auto_commit);
-	bool labeled_widget() const;
+	bool labeled_widget();
 
-    GVariant* get_value() const;
+    GVariant* get_value();
 
 	void commit();
 
diff --git a/DSView/pv/prop/enum.cpp b/DSView/pv/prop/enum.cpp
index 9f5aadca..d5bd8665 100755
--- a/DSView/pv/prop/enum.cpp
+++ b/DSView/pv/prop/enum.cpp
@@ -34,13 +34,13 @@ namespace pv {
 namespace prop {
 
 Enum::Enum(QString name, QString label,
-    vector<pair<GVariant*, QString> > values,
+    std::vector<pair<GVariant*, QString> > values,
     Getter getter, Setter setter) :
     Property(name, label, getter, setter),
 	_values(values),
 	_selector(NULL)
 {
-    for (vector< pair<GVariant*, QString> >::const_iterator i =
+    for (std::vector< pair<GVariant*, QString> >::const_iterator i =
         _values.begin(); i != _values.end(); i++)
         g_variant_ref((*i).first);
 }
diff --git a/DSView/pv/prop/property.cpp b/DSView/pv/prop/property.cpp
index de7150b5..7933398f 100755
--- a/DSView/pv/prop/property.cpp
+++ b/DSView/pv/prop/property.cpp
@@ -33,22 +33,26 @@ Property::Property(QString name, QString label, Getter getter, Setter setter) :
 {
 }
 
-const QString& Property::name() const
+Property::~Property(){
+
+}
+
+const QString& Property::name()
 {
 	return _name;
 }
 
-const QString& Property::label() const
+const QString& Property::label()
 {
     return _label;
 }
 
-bool Property::labeled_widget() const
+bool Property::labeled_widget()
 {
 	return false;
 }
 
-GVariant* Property::get_value() const
+GVariant* Property::get_value()
 {
     return NULL;
 }
diff --git a/DSView/pv/prop/property.h b/DSView/pv/prop/property.h
index 2868eedb..5ba344be 100755
--- a/DSView/pv/prop/property.h
+++ b/DSView/pv/prop/property.h
@@ -47,14 +47,16 @@ protected:
     Property(QString name, QString label, Getter getter, Setter setter);
 
 public:
-    const QString& name() const;
-    const QString& label() const;
+    const QString& name();
+    const QString& label();
+
+    virtual ~Property();
 
     virtual QWidget* get_widget(QWidget *parent,
         bool auto_commit = false) = 0;
-	virtual bool labeled_widget() const;
+	virtual bool labeled_widget();
 
-    virtual GVariant* get_value() const;
+    virtual GVariant* get_value();
 
 	virtual void commit() = 0;
 
diff --git a/DSView/pv/sigsession.cpp b/DSView/pv/sigsession.cpp
index c5552d6f..b75f55c9 100755
--- a/DSView/pv/sigsession.cpp
+++ b/DSView/pv/sigsession.cpp
@@ -71,8 +71,7 @@
 
 
 using namespace boost;
-using namespace std;
-
+  
 namespace pv {
 
 // TODO: This should not be necessary
@@ -115,16 +114,16 @@ SigSession::SigSession(DeviceManager *device_manager) :
     _stop_scale = 1;
 
     // Create snapshots & data containers
-    _cur_logic_snapshot.reset(new data::LogicSnapshot());
-    _logic_data.reset(new data::Logic());
+    _cur_logic_snapshot = new data::LogicSnapshot();
+    _logic_data = new data::Logic();
     _logic_data->push_snapshot(_cur_logic_snapshot);
-    _cur_dso_snapshot.reset(new data::DsoSnapshot());
-    _dso_data.reset(new data::Dso());
+    _cur_dso_snapshot = new data::DsoSnapshot();
+    _dso_data = new data::Dso();
     _dso_data->push_snapshot(_cur_dso_snapshot);
-    _cur_analog_snapshot.reset(new data::AnalogSnapshot());
-    _analog_data.reset(new data::Analog());
+    _cur_analog_snapshot = new data::AnalogSnapshot();
+    _analog_data = new data::Analog();
     _analog_data->push_snapshot(_cur_analog_snapshot);
-    _group_data.reset(new data::Group());
+    _group_data = new data::Group();
     _group_cnt = 0;
 
     connect(&_feed_timer, SIGNAL(timeout()), this, SLOT(feed_timeout()));
@@ -136,7 +135,7 @@ SigSession::~SigSession()
 {
 }
 
-DevInst* SigSession::get_device() const
+DevInst* SigSession::get_device()
 {
     return _dev_inst;
 }
@@ -230,7 +229,7 @@ void SigSession::set_default_device(boost::function<void (const QString)> error_
 
     DevInst *default_device = NULL;
 
-    const list<DevInst*> &devices = _device_manager->devices();
+    const std::list<DevInst*> &devices = _device_manager->devices();
     if (!devices.empty()) {
         // Fall back to the first device in the list.
         default_device = devices.front();
@@ -265,18 +264,18 @@ void SigSession::release_device(DevInst *dev_inst)
     _dev_inst =  NULL;
 }
 
-SigSession::capture_state SigSession::get_capture_state() const
+SigSession::capture_state SigSession::get_capture_state()
 {
     std::lock_guard<std::mutex> lock(_sampling_mutex);
     return _capture_state;
 }
 
-uint64_t SigSession::cur_samplelimits() const
+uint64_t SigSession::cur_samplelimits()
 {
     return _cur_samplelimits;
 }
 
-uint64_t SigSession::cur_samplerate() const
+uint64_t SigSession::cur_samplerate()
 {
     // samplerate for current viewport
     if (_dev_inst->dev_inst()->mode == DSO)
@@ -285,23 +284,23 @@ uint64_t SigSession::cur_samplerate() const
         return cur_snap_samplerate();
 }
 
-uint64_t SigSession::cur_snap_samplerate() const
+uint64_t SigSession::cur_snap_samplerate()
 {
     // samplerate for current snapshot
     return _cur_snap_samplerate;
 }
 
-double SigSession::cur_sampletime() const
+double SigSession::cur_sampletime()
 {
     return  cur_samplelimits() * 1.0 / cur_samplerate();
 }
 
-double SigSession::cur_snap_sampletime() const
+double SigSession::cur_snap_sampletime()
 {
     return  cur_samplelimits() * 1.0 / cur_snap_samplerate();
 }
 
-double SigSession::cur_view_time() const
+double SigSession::cur_view_time()
 {
     return _dev_inst->get_time_base() * DS_CONF_DSO_HDIVS * 1.0 / SR_SEC(1);
 }
@@ -374,12 +373,12 @@ void SigSession::capture_init()
     for(auto &s : _signals)
     {
         assert(s);
-        boost::shared_ptr<view::DsoSignal> dsoSig;
-        if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
+        view::DsoSignal *dsoSig = NULL;
+        if ((dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
             dsoSig->set_zero_ratio(dsoSig->get_zero_ratio());
         }
-        boost::shared_ptr<view::AnalogSignal> analogSig;
-        if ((analogSig = dynamic_pointer_cast<view::AnalogSignal>(s))) {
+        view::AnalogSignal *analogSig = NULL;
+        if ((analogSig = dynamic_cast<view::AnalogSignal*>(s))) {
             analogSig->set_zero_ratio(analogSig->get_zero_ratio());
         }
     }
@@ -450,8 +449,8 @@ void SigSession::start_capture(bool instant,
     for(auto &s : _signals)
     {
         assert(s);
-        boost::shared_ptr<view::DsoSignal> dsoSig;
-        if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s)))
+        view::DsoSignal *dsoSig = NULL;
+        if ((dsoSig = dynamic_cast<view::DsoSignal*>(s)))
             dsoSig->set_mValid(false);
     }
 
@@ -489,10 +488,7 @@ void SigSession::stop_capture()
 {
     data_unlock();
 
-    for (vector< boost::shared_ptr<view::DecodeTrace> >::iterator i =
-        _decode_traces.begin();
-        i != _decode_traces.end();
-        i++)
+    for (auto i = _decode_traces.begin(); i != _decode_traces.end(); i++)
         (*i)->decoder()->stop_decode();
 
     if (get_capture_state() != Running)
@@ -530,22 +526,20 @@ bool SigSession::get_capture_status(bool &triggered, int &progress)
     return false;
 }
 
-vector< boost::shared_ptr<view::Signal> >& SigSession::get_signals()
-{
-    //boost::lock_guard<std::mutex> lock(_signals_mutex);
+std::vector<view::Signal*>& SigSession::get_signals()
+{ 
     return _signals;
 }
 
-vector< boost::shared_ptr<view::GroupSignal> > SigSession::get_group_signals()
-{
-    //boost::lock_guard<std::mutex> lock(_signals_mutex);
+std::vector<view::GroupSignal*>& SigSession::get_group_signals()
+{ 
     return _group_traces;
 }
 
-set< boost::shared_ptr<data::SignalData> > SigSession::get_data() const
+std::set<data::SignalData*> SigSession::get_data()
 {
     //lock_guard<mutex> lock(_signals_mutex);
-    set< boost::shared_ptr<data::SignalData> > data;
+    std::set<data::SignalData*> data;
 
     for(auto &sig : _signals) {
         assert(sig);
@@ -617,37 +611,25 @@ void SigSession::add_group()
 {
     std::list<int> probe_index_list;
 
-    std::vector< boost::shared_ptr<view::Signal> >::iterator i = _signals.begin();
+    auto i = _signals.begin();
     while (i != _signals.end()) {
         if ((*i)->get_type() == SR_CHANNEL_LOGIC && (*i)->selected())
             probe_index_list.push_back((*i)->get_index());
         i++;
     }
 
-    if (probe_index_list.size() > 1) {
-        //_group_data.reset(new data::Group(_last_sample_rate));
-//        if (_group_data->get_snapshots().empty())
-//            _group_data->set_samplerate(_dev_inst->get_sample_rate());
+    if (probe_index_list.size() > 1) { 
         _group_data->init();
         _group_data->set_samplerate(_cur_snap_samplerate);
-        const boost::shared_ptr<view::GroupSignal> signal(
-                    new view::GroupSignal("New Group",
-                                          _group_data, probe_index_list, _group_cnt));
+        auto signal =  new view::GroupSignal("New Group", _group_data, probe_index_list, _group_cnt);
         _group_traces.push_back(signal);
         _group_cnt++;
 
-        const deque< boost::shared_ptr<data::LogicSnapshot> > &snapshots =
-            _logic_data->get_snapshots();
-        if (!snapshots.empty()) {
-            //if (!_cur_group_snapshot)
-            //{
-                // Create a new data snapshot
-                _cur_group_snapshot = boost::shared_ptr<data::GroupSnapshot>(
-                            new data::GroupSnapshot(snapshots.front(), signal->get_index_list()));
-                //_cur_group_snapshot->append_payload();
-                _group_data->push_snapshot(_cur_group_snapshot);
-                _cur_group_snapshot.reset();
-            //}
+        const auto &snapshots = _logic_data->get_snapshots();
+        if (!snapshots.empty())
+        { 
+             auto p = new data::GroupSnapshot(snapshots.front(), signal->get_index_list());
+            _group_data->push_snapshot(p); 
         }
 
         signals_changed();
@@ -657,25 +639,32 @@ void SigSession::add_group()
 
 void SigSession::del_group()
 {
-    std::vector< boost::shared_ptr<view::GroupSignal> >::iterator i = _group_traces.begin();
+    auto i = _group_traces.begin();
+
     while (i != _group_traces.end()) {
-        if ((*i)->selected()) {
-            std::vector< boost::shared_ptr<view::GroupSignal> >::iterator j = _group_traces.begin();
+        pv::view::GroupSignal *psig = *(i);
+
+        if (psig->selected()) {
+            auto j = _group_traces.begin();
             while(j != _group_traces.end()) {
-                if ((*j)->get_sec_index() > (*i)->get_sec_index())
+                if ((*j)->get_sec_index() > psig->get_sec_index())
                     (*j)->set_sec_index((*j)->get_sec_index() - 1);
                 j++;
             }
 
-            std::deque< boost::shared_ptr<data::GroupSnapshot> > &snapshots = _group_data->get_snapshots();
+            auto &snapshots = _group_data->get_snapshots();
             if (!snapshots.empty()) {
-                _group_data->get_snapshots().at((*i)->get_sec_index()).reset();
-                std::deque< boost::shared_ptr<data::GroupSnapshot> >::iterator k = snapshots.begin();
+                int dex = psig->get_sec_index();
+                pv::data::GroupSnapshot *pshot =  _group_data->get_snapshots().at(dex);
+                delete pshot;      
+                 
+                auto k = snapshots.begin();
                 k += (*i)->get_sec_index();
                 _group_data->get_snapshots().erase(k);
             }
+             
+            delete psig;
 
-            (*i).reset();
             i = _group_traces.erase(i);
 
             _group_cnt--;
@@ -693,8 +682,8 @@ void SigSession::init_signals()
     assert(_dev_inst);
     stop_capture();
 
-    vector< boost::shared_ptr<view::Signal> > sigs;
-    boost::shared_ptr<view::Signal> signal;
+    std::vector<view::Signal*> sigs;
+    view::Signal *signal = NULL;
     unsigned int logic_probe_count = 0;
     unsigned int dso_probe_count = 0;
     unsigned int analog_probe_count = 0;
@@ -741,37 +730,35 @@ void SigSession::init_signals()
     // Make the logic probe list
     {
         _group_traces.clear();
-        vector< boost::shared_ptr<view::GroupSignal> >().swap(_group_traces);
+        std::vector<view::GroupSignal*>().swap(_group_traces);
 
         for (GSList *l = _dev_inst->dev_inst()->channels; l; l = l->next) {
             sr_channel *probe =
                 ( sr_channel *)l->data;
             assert(probe);
-            signal.reset();
+            signal = NULL;
+
             switch(probe->type) {
             case SR_CHANNEL_LOGIC:
                 if (probe->enabled)
-                   signal = boost::shared_ptr<view::Signal>(
-                       new view::LogicSignal(_dev_inst, _logic_data, probe));
+                   signal = new view::LogicSignal(_dev_inst, _logic_data, probe);
                 break;
 
             case SR_CHANNEL_DSO:
-                signal = boost::shared_ptr<view::Signal>(
-                    new view::DsoSignal(_dev_inst, _dso_data, probe));
+                signal = new view::DsoSignal(_dev_inst, _dso_data, probe);
                 break;
 
             case SR_CHANNEL_ANALOG:
                 if (probe->enabled)
-                    signal = boost::shared_ptr<view::Signal>(
-                        new view::AnalogSignal(_dev_inst, _analog_data, probe));
+                    signal = new view::AnalogSignal(_dev_inst, _analog_data, probe);
                 break;
             }
-            if(signal.get())
+            if(signal != NULL)
                 sigs.push_back(signal);
         }
 
         _signals.clear();
-        vector< boost::shared_ptr<view::Signal> >().swap(_signals);
+        std::vector<view::Signal*>().swap(_signals);
         _signals = sigs;
     }
 
@@ -789,8 +776,8 @@ void SigSession::reload()
         stop_capture();
 
     //refresh(0);
-    vector< boost::shared_ptr<view::Signal> > sigs;
-    boost::shared_ptr<view::Signal> signal;
+    std::vector<view::Signal*> sigs;
+    view::Signal *signal = NULL;
 
     // Make the logic probe list
     {
@@ -798,58 +785,54 @@ void SigSession::reload()
             sr_channel *probe =
                 (sr_channel *)l->data;
             assert(probe);
-            signal.reset();
+            signal = NULL;
+
             switch(probe->type) {
             case SR_CHANNEL_LOGIC:
                 if (probe->enabled) {
-                    std::vector< boost::shared_ptr<view::Signal> >::iterator i = _signals.begin();
+                    auto i = _signals.begin();
                     while (i != _signals.end()) {
                         if ((*i)->get_index() == probe->index) {
-                            boost::shared_ptr<view::LogicSignal> logicSig;
-                            if ((logicSig = dynamic_pointer_cast<view::LogicSignal>(*i)))
-                                signal = boost::shared_ptr<view::Signal>(
-                                  new view::LogicSignal(logicSig, _logic_data, probe));
+                            view::LogicSignal *logicSig = NULL;
+                            if ((logicSig = dynamic_cast<view::LogicSignal*>(*i)))
+                                signal = new view::LogicSignal(logicSig, _logic_data, probe);
                             break;
                         }
                         i++;
                     }
-                    if (!signal.get())
-                        signal = boost::shared_ptr<view::Signal>(
-                            new view::LogicSignal(_dev_inst, _logic_data, probe));
+                    if (signal == NULL){
+                         signal =  new view::LogicSignal(_dev_inst, _logic_data, probe);
+                    }                       
                 }
                 break;
 
-//            case SR_CHANNEL_DSO:
-//                signal = boost::shared_ptr<view::Signal>(
-//                    new view::DsoSignal(_dev_inst,_dso_data, probe));
-//                break;
-
+  
             case SR_CHANNEL_ANALOG:
                 if (probe->enabled) {
-                    std::vector< boost::shared_ptr<view::Signal> >::iterator i = _signals.begin();
+                    auto i = _signals.begin();
                     while (i != _signals.end()) {
                         if ((*i)->get_index() == probe->index) {
-                            boost::shared_ptr<view::AnalogSignal> analogSig;
-                            if ((analogSig = dynamic_pointer_cast<view::AnalogSignal>(*i)))
-                                signal = boost::shared_ptr<view::Signal>(
-                                    new view::AnalogSignal(analogSig, _analog_data, probe));
+                            view::AnalogSignal *analogSig = NULL;
+                            if ((analogSig = dynamic_cast<view::AnalogSignal*>(*i)))
+                                signal = new view::AnalogSignal(analogSig, _analog_data, probe);
                             break;
                         }
                         i++;
                     }
-                    if (!signal.get())
-                        signal = boost::shared_ptr<view::Signal>(
-                            new view::AnalogSignal(_dev_inst, _analog_data, probe));
+                    if (signal == NULL){
+                        signal =  new view::AnalogSignal(_dev_inst, _analog_data, probe);
+                    }
+                        
                 }
                 break;
             }
-            if (signal.get())
+            if (signal != NULL)
                 sigs.push_back(signal);
         }
 
         if (!sigs.empty()) {
             _signals.clear();
-            vector< boost::shared_ptr<view::Signal> >().swap(_signals);
+            std::vector<view::Signal*>().swap(_signals);
             _signals = sigs;
         }
     }
@@ -864,8 +847,7 @@ void SigSession::refresh(int holdtime)
     data_lock();
 
     if (_logic_data) {
-        _logic_data->init();
-        //_cur_logic_snapshot.reset();
+        _logic_data->init(); 
 
         for(auto &d : _decode_traces)
         {
@@ -886,8 +868,7 @@ void SigSession::refresh(int holdtime)
             _math_trace->get_math_stack()->init();
     }
     if (_analog_data) {
-        _analog_data->init();
-        //_cur_analog_snapshot.reset();
+        _analog_data->init(); 
     }
 
     QTimer::singleShot(holdtime, this, SLOT(feed_timeout()));
@@ -978,8 +959,7 @@ void SigSession::feed_in_trigger(const ds_trigger_pos &trigger_pos)
 }
 
 void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
-{
-    //boost::lock_guard<std::mutex> lock(_data_mutex);
+{ 
     if (!_logic_data || _cur_logic_snapshot->memory_failed()) {
         qDebug() << "Unexpected logic packet";
         return;
@@ -1016,9 +996,7 @@ void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
 }
 
 void SigSession::feed_in_dso(const sr_datafeed_dso &dso)
-{
-    //boost::lock_guard<std::mutex> lock(_data_mutex);
-
+{  
     if(!_dso_data || _cur_dso_snapshot->memory_failed())
     {
         qDebug() << "Unexpected dso packet";
@@ -1032,8 +1010,8 @@ void SigSession::feed_in_dso(const sr_datafeed_dso &dso)
         for(auto &s : _signals)
         {
             assert(s);
-            boost::shared_ptr<view::DsoSignal> dsoSig;
-            if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
+            view::DsoSignal *dsoSig = NULL;
+            if ((dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
                 dsoSig->set_scale(dsoSig->get_view_rect().height());
                 sig_enable[dsoSig->get_index()] = dsoSig->enabled();
             }
@@ -1047,8 +1025,8 @@ void SigSession::feed_in_dso(const sr_datafeed_dso &dso)
     }
 
     for(auto &s : _signals) {
-        boost::shared_ptr<view::DsoSignal> dsoSig;
-        if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s)) && (dsoSig->enabled()))
+        view::DsoSignal *dsoSig = NULL;
+        if ((dsoSig = dynamic_cast<view::DsoSignal*>(s)) && (dsoSig->enabled()))
             dsoSig->paint_prepare();
     }
 
@@ -1088,8 +1066,7 @@ void SigSession::feed_in_dso(const sr_datafeed_dso &dso)
 }
 
 void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
-{
-    //boost::lock_guard<std::mutex> lock(_data_mutex);
+{ 
 
     if(!_analog_data || _cur_analog_snapshot->memory_failed())
     {
@@ -1103,8 +1080,8 @@ void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
         for(auto &s : _signals)
         {
             assert(s);
-            boost::shared_ptr<view::AnalogSignal> analogSig;
-            if ((analogSig = dynamic_pointer_cast<view::AnalogSignal>(s))) {
+            view::AnalogSignal *analogSig = NULL;
+            if ((analogSig = dynamic_cast<view::AnalogSignal*>(s))) {
                 analogSig->set_scale(analogSig->get_totalHeight());
             }
         }
@@ -1187,16 +1164,14 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
     case SR_DF_END:
     {
         {
-            //boost::lock_guard<std::mutex> lock(_data_mutex);
+            
             if (!_cur_logic_snapshot->empty()) {
                 for(auto &g : _group_traces)
                 {
                     assert(g);
 
-                    _cur_group_snapshot = boost::shared_ptr<data::GroupSnapshot>(
-                                new data::GroupSnapshot(_logic_data->get_snapshots().front(), g->get_index_list()));
-                    _group_data->push_snapshot(_cur_group_snapshot);
-                    _cur_group_snapshot.reset();
+                    auto p = new data::GroupSnapshot(_logic_data->get_snapshots().front(), g->get_index_list());
+                    _group_data->push_snapshot(p); 
                 }
             }
             _cur_logic_snapshot->capture_ended();
@@ -1331,20 +1306,18 @@ uint16_t SigSession::get_ch_num(int type)
     uint16_t logic_ch_num = 0;
     uint16_t dso_ch_num = 0;
     uint16_t analog_ch_num = 0;
+
     if (_dev_inst->dev_inst()) {
         for(auto &s : _signals)
         {
             assert(s);
-            if (dynamic_pointer_cast<view::LogicSignal>(s) && s->enabled()) {
-            //if (dynamic_pointer_cast<view::LogicSignal>(s)) {
+            if (dynamic_cast<view::LogicSignal*>(s) && s->enabled()) {
                     logic_ch_num++;
             }
-            if (dynamic_pointer_cast<view::DsoSignal>(s) && s->enabled()) {
-            //if (dynamic_pointer_cast<view::DsoSignal>(s)) {
+            if (dynamic_cast<view::DsoSignal*>(s) && s->enabled()) {
                     dso_ch_num++;
             }
-            if (dynamic_pointer_cast<view::AnalogSignal>(s) && s->enabled()) {
-            //if (dynamic_pointer_cast<view::AnalogSignal>(s)) {
+            if (dynamic_cast<view::AnalogSignal*>(s) && s->enabled()) {
                     analog_ch_num++;
             }
         }
@@ -1366,75 +1339,74 @@ uint16_t SigSession::get_ch_num(int type)
 
 
 bool SigSession::add_decoder(srd_decoder *const dec, bool silent, DecoderStatus *dstatus)
-{
-    bool ret = false;
-    map<const srd_channel*, int> probes;
-    boost::shared_ptr<data::DecoderStack> decoder_stack;
+{     
+    try { 
 
-    try {
-        //lock_guard<mutex> lock(_signals_mutex);
+        bool ret = false;
 
         // Create the decoder
-        decoder_stack = boost::shared_ptr<data::DecoderStack>(
-            new data::DecoderStack(this, dec, dstatus));
+        std::map<const srd_channel*, int> probes; 
+        data::DecoderStack *decoder_stack = new data::DecoderStack(this, dec, dstatus);
+        assert(decoder_stack);
 
         // Make a list of all the probes
         std::vector<const srd_channel*> all_probes;
         for(const GSList *i = dec->channels; i; i = i->next)
             all_probes.push_back((const srd_channel*)i->data);
+
         for(const GSList *i = dec->opt_channels; i; i = i->next)
             all_probes.push_back((const srd_channel*)i->data);
-
-        assert(decoder_stack);
-        assert(!decoder_stack->stack().empty());
-        assert(decoder_stack->stack().front());
+ 
         decoder_stack->stack().front()->set_probes(probes);
 
         // Create the decode signal
-        boost::shared_ptr<view::DecodeTrace> d(
-            new view::DecodeTrace(this, decoder_stack,
-                _decode_traces.size()));
+        view::DecodeTrace *trace = new view::DecodeTrace(this, decoder_stack, _decode_traces.size());
+        assert(trace);
+
         // set view early for decode start/end region setting
         for(auto &s : _signals) {
             if (s->get_view()) {
-                d->set_view(s->get_view());
+                trace->set_view(s->get_view());
                 break;
             }
         }
         if (silent) {
-            _decode_traces.push_back(d);
+            _decode_traces.push_back(trace);
             ret = true;
-        } else if (d->create_popup()) {
-            _decode_traces.push_back(d);
+        } else if (trace->create_popup()) {
+            _decode_traces.push_back(trace);
             ret = true;
         }
-    } catch(const std::runtime_error &e) {
-        return false;
-    }
 
-    if (ret) {
-        signals_changed();
-        // Do an initial decode
-        decoder_stack->begin_decode();
-        data_updated();
-    }
+        if (ret)
+        {
+            signals_changed();
+            // Do an initial decode
+            decoder_stack->begin_decode();
+            data_updated();
+        }
+        else{
+            delete trace;
+        }
 
-    return ret;
+        return ret;
+
+    } catch(...) {
+         ds_debug("Starting a hotplug thread...\n");
+    }
+ 
+    return false;
 }
 
-vector< boost::shared_ptr<view::DecodeTrace> > SigSession::get_decode_signals() const
-{
-    //lock_guard<mutex> lock(_signals_mutex);
+std::vector<view::DecodeTrace*>& SigSession::get_decode_signals()
+{ 
     return _decode_traces;
 }
 
 void SigSession::remove_decode_signal(view::DecodeTrace *signal)
 {
-    for (vector< boost::shared_ptr<view::DecodeTrace> >::iterator i =
-        _decode_traces.begin();
-        i != _decode_traces.end();
-        i++)
-        if ((*i).get() == signal)
+    for (auto i = _decode_traces.begin();  i != _decode_traces.end(); i++)
+        if ((*i) == signal)
         {
             _decode_traces.erase(i);
             signals_changed();
@@ -1445,14 +1417,12 @@ void SigSession::remove_decode_signal(view::DecodeTrace *signal)
 void SigSession::remove_decode_signal(int index)
 {
     int cur_index = 0;
-    for (vector< boost::shared_ptr<view::DecodeTrace> >::iterator i =
-        _decode_traces.begin();
-        i != _decode_traces.end();
-        i++)
+
+    for (auto i = _decode_traces.begin(); i != _decode_traces.end(); i++)
     {
         if (cur_index == index)
         {
-            auto d = (*i)->decoder().get();
+            auto d = (*i)->decoder();
             d->stop_decode(); //stop decoder thread
             _decode_traces.erase(i);
             signals_changed();
@@ -1464,45 +1434,35 @@ void SigSession::remove_decode_signal(int index)
 
 void SigSession::rst_decoder(int index)
 {
-    int cur_index = 0;
-    for (vector< boost::shared_ptr<view::DecodeTrace> >::iterator i =
-        _decode_traces.begin();
-        i != _decode_traces.end();
-        i++)
-    {
-        if (cur_index == index)
-        {
-            if ((*i)->create_popup())
+    if (index >= 0 && index < (int)_decode_traces.size()){
+        auto p = _decode_traces[index];
+         if (p->create_popup())
             {
-                (*i)->decoder()->stop_decode();
-                (*i)->decoder()->begin_decode();
+                p->decoder()->stop_decode();
+                p->decoder()->begin_decode();
                 data_updated();
             }
-            return;
-        }
-        cur_index++;
     }
 }
 
 void SigSession::rst_decoder(view::DecodeTrace *signal)
-{
-    for (vector< boost::shared_ptr<view::DecodeTrace> >::iterator i =
-        _decode_traces.begin();
-        i != _decode_traces.end();
-        i++)
-        if ((*i).get() == signal)
-        {
-            if ((*i)->create_popup())
-            {
-                (*i)->decoder()->stop_decode();
-                (*i)->decoder()->begin_decode();
-                data_updated();
-            }
-            return;
-        }
+{ 
+  for (auto p : _decode_traces)
+  {  
+      if (p == signal)
+      {
+          if (p->create_popup())
+          { 
+              p->decoder()->stop_decode();
+              p->decoder()->begin_decode();
+              data_updated();
+          }
+          break;
+      }
+  }
 }
 
-pv::data::DecoderModel* SigSession::get_decoder_model() const
+pv::data::DecoderModel* SigSession::get_decoder_model()
 {
     return _decoder_model;
 }
@@ -1512,20 +1472,18 @@ void SigSession::spectrum_rebuild()
 {
     bool has_dso_signal = false;
     for(auto &s : _signals) {
-        boost::shared_ptr<view::DsoSignal> dsoSig;
-        if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
+        view::DsoSignal *dsoSig = NULL;
+        if ((dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
             has_dso_signal = true;
             // check already have
-            std::vector< boost::shared_ptr<view::SpectrumTrace> >::iterator iter = _spectrum_traces.begin();
+            auto iter = _spectrum_traces.begin();
             for(unsigned int i = 0; i < _spectrum_traces.size(); i++, iter++)
                 if ((*iter)->get_index() == dsoSig->get_index())
                     break;
             // if not, rebuild
             if (iter == _spectrum_traces.end()) {
-                boost::shared_ptr<data::SpectrumStack> spectrum_stack(
-                    new data::SpectrumStack(this, dsoSig->get_index()));
-                boost::shared_ptr<view::SpectrumTrace> spectrum_trace(
-                    new view::SpectrumTrace(this, spectrum_stack, dsoSig->get_index()));
+                auto spectrum_stack = new data::SpectrumStack(this, dsoSig->get_index());
+                auto spectrum_trace = new view::SpectrumTrace(this, spectrum_stack, dsoSig->get_index());
                 _spectrum_traces.push_back(spectrum_trace);
             }
         }
@@ -1537,15 +1495,14 @@ void SigSession::spectrum_rebuild()
     signals_changed();
 }
 
-vector< boost::shared_ptr<view::SpectrumTrace> > SigSession::get_spectrum_traces()
-{
-    //lock_guard<mutex> lock(_signals_mutex);
+std::vector<view::SpectrumTrace*>& SigSession::get_spectrum_traces()
+{ 
     return _spectrum_traces;
 }
 
 void SigSession::lissajous_rebuild(bool enable, int xindex, int yindex, double percent)
 {
-    _lissajous_trace.reset(new view::LissajousTrace(enable, _dso_data, xindex, yindex, percent));
+    _lissajous_trace = new view::LissajousTrace(enable, _dso_data, xindex, yindex, percent);
     signals_changed();
 }
 
@@ -1555,21 +1512,20 @@ void SigSession::lissajous_disable()
         _lissajous_trace->set_enable(false);
 }
 
-boost::shared_ptr<view::LissajousTrace> SigSession::get_lissajous_trace()
-{
-    //lock_guard<mutex> lock(_signals_mutex);
+view::LissajousTrace* SigSession::get_lissajous_trace()
+{ 
     return _lissajous_trace;
 }
 
-void SigSession::math_rebuild(bool enable,
-                              boost::shared_ptr<view::DsoSignal> dsoSig1,
-                              boost::shared_ptr<view::DsoSignal> dsoSig2,
+void SigSession::math_rebuild(bool enable,view::DsoSignal *dsoSig1, 
+                              view::DsoSignal *dsoSig2,
                               data::MathStack::MathType type)
 {
     std::lock_guard<std::mutex> lock(_data_mutex);
-    boost::shared_ptr<data::MathStack> math_stack(
-        new data::MathStack(this, dsoSig1, dsoSig2, type));
-    _math_trace.reset(new view::MathTrace(enable, math_stack, dsoSig1, dsoSig2));
+    auto math_stack = new data::MathStack(this, dsoSig1, dsoSig2, type);
+    DESTROY_OBJECT(_math_trace);
+    _math_trace = new view::MathTrace(enable, math_stack, dsoSig1, dsoSig2);
+
     if (_math_trace && _math_trace->enabled()) {
         _math_trace->get_math_stack()->set_samplerate(_dev_inst->get_sample_rate());
         _math_trace->get_math_stack()->realloc(_dev_inst->get_sample_limit());
@@ -1584,9 +1540,8 @@ void SigSession::math_disable()
         _math_trace->set_enable(false);
 }
 
-boost::shared_ptr<view::MathTrace> SigSession::get_math_trace()
+view::MathTrace* SigSession::get_math_trace()
 {
-    //lock_guard<mutex> lock(_signals_mutex);
     return _math_trace;
 }
 
@@ -1595,22 +1550,22 @@ void SigSession::set_session_time(QDateTime time)
     _session_time = time;
 }
 
-QDateTime SigSession::get_session_time() const
+QDateTime SigSession::get_session_time()
 {
     return _session_time;
 }
 
-uint64_t  SigSession::get_trigger_pos() const
+uint64_t  SigSession::get_trigger_pos()
 {
     return _trigger_pos;
 }
 
-bool SigSession::trigd() const
+bool SigSession::trigd()
 {
     return _trigger_flag;
 }
 
-uint8_t SigSession::trigd_ch() const
+uint8_t SigSession::trigd_ch()
 {
     return _trigger_ch;
 }
@@ -1634,7 +1589,7 @@ void SigSession::feed_timeout()
     }
 }
 
-boost::shared_ptr<data::Snapshot> SigSession::get_snapshot(int type)
+data::Snapshot* SigSession::get_snapshot(int type)
 {
     if (type == SR_CHANNEL_LOGIC)
         return _cur_logic_snapshot;
@@ -1646,7 +1601,7 @@ boost::shared_ptr<data::Snapshot> SigSession::get_snapshot(int type)
         return NULL;
 }
 
-SigSession::error_state SigSession::get_error() const
+SigSession::error_state SigSession::get_error()
 {
     return _error;
 }
@@ -1662,12 +1617,12 @@ void SigSession::clear_error()
     _error = No_err;
 }
 
-uint64_t SigSession::get_error_pattern() const
+uint64_t SigSession::get_error_pattern()
 {
     return _error_pattern;
 }
 
-SigSession::run_mode SigSession::get_run_mode() const
+SigSession::run_mode SigSession::get_run_mode()
 {
     return _run_mode;
 }
@@ -1677,7 +1632,7 @@ void SigSession::set_run_mode(run_mode mode)
     _run_mode = mode;
 }
 
-int SigSession::get_repeat_intvl() const
+int SigSession::get_repeat_intvl()
 {
     return _repeat_intvl;
 }
@@ -1694,7 +1649,7 @@ void SigSession::set_repeating(bool repeat)
         _repeat_hold_prg = 0;
 }
 
-bool SigSession::isRepeating() const
+bool SigSession::isRepeating()
 {
     return _repeating;
 }
@@ -1729,7 +1684,7 @@ void SigSession::repeat_update()
     }
 }
 
-int SigSession::get_repeat_hold() const
+int SigSession::get_repeat_hold()
 {
     if (isRepeating())
         return _repeat_hold_prg;
@@ -1742,7 +1697,7 @@ void SigSession::set_map_zoom(int index)
     _map_zoom = index;
 }
 
-int SigSession::get_map_zoom() const
+int SigSession::get_map_zoom()
 {
     return _map_zoom;
 }
@@ -1750,8 +1705,8 @@ int SigSession::get_map_zoom() const
 void SigSession::auto_end()
 {
     for(auto &s : _signals) {
-        boost::shared_ptr<view::DsoSignal> dsoSig;
-        if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
+        view::DsoSignal *dsoSig = NULL;
+        if ((dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
             dsoSig->auto_end();
         }
     }
@@ -1767,17 +1722,17 @@ void SigSession::set_save_end(uint64_t end)
     _save_end = end;
 }
 
-uint64_t SigSession::get_save_start() const
+uint64_t SigSession::get_save_start()
 {
     return _save_start;
 }
 
-uint64_t SigSession::get_save_end() const
+uint64_t SigSession::get_save_end()
 {
     return _save_end;
 }
 
-bool SigSession::get_saving() const
+bool SigSession::get_saving()
 {
     return _saving;
 }
@@ -1804,7 +1759,7 @@ void SigSession::exit_capture()
     }
 }
 
-float SigSession::stop_scale() const
+float SigSession::stop_scale()
 {
     return _stop_scale;
 }
diff --git a/DSView/pv/sigsession.h b/DSView/pv/sigsession.h
index 9cd6324e..2ae6c63c 100755
--- a/DSView/pv/sigsession.h
+++ b/DSView/pv/sigsession.h
@@ -24,9 +24,7 @@
 #define DSVIEW_PV_SIGSESSION_H
 
 #include <libsigrok4DSL/libsigrok.h>
-#include <boost/function.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp> 
+#include <boost/function.hpp>  
 
 #include <string>
 #include <utility>
@@ -139,7 +137,7 @@ public:
 
 	~SigSession(); 
 
-    DevInst* get_device() const;
+    DevInst* get_device();
 
 	/**
 	 * Sets device instance that will be used in the next capture session.
@@ -156,20 +154,20 @@ public:
 
     void release_device(DevInst *dev_inst);
 
-	capture_state get_capture_state() const;
+	capture_state get_capture_state();
 
-    uint64_t cur_samplerate() const;
-    uint64_t cur_snap_samplerate() const;
-    uint64_t cur_samplelimits() const;
-    double cur_sampletime() const;
-    double cur_snap_sampletime() const;
-    double cur_view_time() const;
+    uint64_t cur_samplerate();
+    uint64_t cur_snap_samplerate();
+    uint64_t cur_samplelimits();
+    double cur_sampletime();
+    double cur_snap_sampletime();
+    double cur_view_time();
 
     void set_cur_snap_samplerate(uint64_t samplerate);
     void set_cur_samplelimits(uint64_t samplelimits);
     void set_session_time(QDateTime time);
-    QDateTime get_session_time() const;
-    uint64_t get_trigger_pos() const;
+    QDateTime get_session_time();
+    uint64_t get_trigger_pos();
 
     void start_capture(bool instant,
 		boost::function<void (const QString)> error_handler);
@@ -177,19 +175,15 @@ public:
     bool get_capture_status(bool &triggered, int &progress);
     void container_init();
 
-    std::set< boost::shared_ptr<data::SignalData> > get_data() const;
+    std::set<data::SignalData*> get_data();
 
-	std::vector< boost::shared_ptr<view::Signal> >&
-		get_signals();
-
-    std::vector< boost::shared_ptr<view::GroupSignal> >
-        get_group_signals();
+	std::vector<view::Signal*>& get_signals();
 
+    std::vector<view::GroupSignal*>& get_group_signals();
 
     bool add_decoder(srd_decoder *const dec, bool silent, DecoderStatus *dstatus);
 
-    std::vector< boost::shared_ptr<view::DecodeTrace> >
-        get_decode_signals() const;
+    std::vector<view::DecodeTrace*>& get_decode_signals();
 
     void remove_decode_signal(view::DecodeTrace *signal);
 
@@ -199,17 +193,13 @@ public:
 
     void rst_decoder(view::DecodeTrace *signal);
 
-    pv::data::DecoderModel* get_decoder_model() const;
+    pv::data::DecoderModel* get_decoder_model();
 
+    std::vector<view::SpectrumTrace*>& get_spectrum_traces();
 
-    std::vector< boost::shared_ptr<view::SpectrumTrace> >
-        get_spectrum_traces();
+    view::LissajousTrace* get_lissajous_trace();
 
-    boost::shared_ptr<view::LissajousTrace>
-        get_lissajous_trace();
-
-    boost::shared_ptr<view::MathTrace>
-        get_math_trace();
+    view::MathTrace* get_math_trace();
 
     void init_signals();
 
@@ -232,40 +222,39 @@ public:
     void spectrum_rebuild();
     void lissajous_rebuild(bool enable, int xindex, int yindex, double percent);
     void lissajous_disable();
-    void math_rebuild(bool enable,
-                      boost::shared_ptr<pv::view::DsoSignal> dsoSig1,
-                      boost::shared_ptr<pv::view::DsoSignal> dsoSig2,
+    void math_rebuild(bool enable,pv::view::DsoSignal *dsoSig1,
+                      pv::view::DsoSignal *dsoSig2,
                       data::MathStack::MathType type);
     void math_disable();
 
-    bool trigd() const;
-    uint8_t trigd_ch() const;
+    bool trigd();
+    uint8_t trigd_ch();
 
-    boost::shared_ptr<data::Snapshot> get_snapshot(int type);
+    data::Snapshot* get_snapshot(int type);
 
-    error_state get_error() const;
+    error_state get_error();
     void set_error(error_state state);
     void clear_error();
-    uint64_t get_error_pattern() const;
+    uint64_t get_error_pattern();
 
-    run_mode get_run_mode() const;
+    run_mode get_run_mode();
     void set_run_mode(run_mode mode);
-    int get_repeat_intvl() const;
+    int get_repeat_intvl();
     void set_repeat_intvl(int interval);
-    bool isRepeating() const;
+    bool isRepeating();
     bool repeat_check();
-    int get_repeat_hold() const;
+    int get_repeat_hold();
 
-    int get_map_zoom() const;
+    int get_map_zoom();
 
     void set_save_start(uint64_t start);
     void set_save_end(uint64_t end);
-    uint64_t get_save_start() const;
-    uint64_t get_save_end() const;
-    bool get_saving() const;
+    uint64_t get_save_start();
+    uint64_t get_save_end();
+    bool get_saving();
     void set_saving(bool saving);
     void set_stop_scale(float scale);
-    float stop_scale() const;
+    float stop_scale();
 
     void exit_capture();
 
@@ -402,25 +391,24 @@ private:
     uint64_t _cur_samplelimits;
 
     //mutable std::mutex _signals_mutex;
-	std::vector< boost::shared_ptr<view::Signal> > _signals;
-    std::vector< boost::shared_ptr<view::GroupSignal> > _group_traces;
+	std::vector<view::Signal*> _signals;
+    std::vector<view::GroupSignal*> _group_traces;
 
-    std::vector< boost::shared_ptr<view::DecodeTrace> > _decode_traces;
-    pv::data::DecoderModel *_decoder_model;
+    std::vector<view::DecodeTrace*> _decode_traces;
+    pv::data::DecoderModel  *_decoder_model;
 
-    std::vector< boost::shared_ptr<view::SpectrumTrace> > _spectrum_traces;
-    boost::shared_ptr<view::LissajousTrace> _lissajous_trace;
-    boost::shared_ptr<view::MathTrace> _math_trace;
+    std::vector<view::SpectrumTrace*> _spectrum_traces;
+    view::LissajousTrace    *_lissajous_trace;
+    view::MathTrace *_math_trace;
 
     mutable std::mutex _data_mutex;
-	boost::shared_ptr<data::Logic> _logic_data;
-	boost::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
-    boost::shared_ptr<data::Dso> _dso_data;
-    boost::shared_ptr<data::DsoSnapshot> _cur_dso_snapshot;
-	boost::shared_ptr<data::Analog> _analog_data;
-	boost::shared_ptr<data::AnalogSnapshot> _cur_analog_snapshot;
-    boost::shared_ptr<data::Group> _group_data;
-    boost::shared_ptr<data::GroupSnapshot> _cur_group_snapshot;
+	data::Logic *_logic_data;
+	data::LogicSnapshot *_cur_logic_snapshot;
+    data::Dso *_dso_data;
+    data::DsoSnapshot *_cur_dso_snapshot;
+	data::Analog *_analog_data;
+	data::AnalogSnapshot *_cur_analog_snapshot;
+    data::Group *_group_data; 
     int _group_cnt;
 
 	std::thread     *_sampling_thread;
diff --git a/DSView/pv/storesession.cpp b/DSView/pv/storesession.cpp
index 230fd51a..c99d2efe 100755
--- a/DSView/pv/storesession.cpp
+++ b/DSView/pv/storesession.cpp
@@ -82,13 +82,13 @@ SigSession* StoreSession::session()
     return _session;
 }
 
-pair<uint64_t, uint64_t> StoreSession::progress() const
+std::pair<uint64_t, uint64_t> StoreSession::progress()
 {
     //lock_guard<mutex> lock(_mutex);
-	return make_pair(_units_stored, _unit_count);
+    return std::make_pair(_units_stored, _unit_count);
 }
 
-const QString& StoreSession::error() const
+const QString& StoreSession::error()
 {
     //lock_guard<mutex> lock(_mutex);
 	return _error;
@@ -153,7 +153,7 @@ bool StoreSession::save_start()
         return false;
     }
 
-    const boost::shared_ptr<data::Snapshot> snapshot(_session->get_snapshot(*type_set.begin()));
+    const auto snapshot = _session->get_snapshot(*type_set.begin());
 	assert(snapshot);
     // Check we have data
     if (snapshot->empty()) {
@@ -205,17 +205,17 @@ bool StoreSession::save_start()
     return false;
 }
 
-void StoreSession::save_proc(boost::shared_ptr<data::Snapshot> snapshot)
+void StoreSession::save_proc(data::Snapshot *snapshot)
 {
 	assert(snapshot);
 
     int ret = SR_ERR;
     int num = 0;
-    boost::shared_ptr<data::LogicSnapshot> logic_snapshot;
-    boost::shared_ptr<data::AnalogSnapshot> analog_snapshot;
-    boost::shared_ptr<data::DsoSnapshot> dso_snapshot;
+    data::LogicSnapshot *logic_snapshot = NULL;
+    //data::AnalogSnapshot *analog_snapshot = NULL;
+    //data::DsoSnapshot *dso_snapshot = NULL;
 
-    if ((logic_snapshot = boost::dynamic_pointer_cast<data::LogicSnapshot>(snapshot))) {
+    if ((logic_snapshot = dynamic_cast<data::LogicSnapshot*>(snapshot))) {
         uint16_t to_save_probes = 0;
         for(auto &s : _session->get_signals()) {
             if (s->enabled() && logic_snapshot->has_data(s->get_index()))
@@ -345,7 +345,7 @@ void StoreSession::save_proc(boost::shared_ptr<data::Snapshot> snapshot)
     } 
 }
 
-QString StoreSession::meta_gen(boost::shared_ptr<data::Snapshot> snapshot)
+QString StoreSession::meta_gen(data::Snapshot *snapshot)
 {
     GSList *l;
     GVariant *gvar;
@@ -396,8 +396,8 @@ QString StoreSession::meta_gen(boost::shared_ptr<data::Snapshot> snapshot)
         fprintf(meta, "total blocks = %d\n", snapshot->get_block_num());
     }
 
-    boost::shared_ptr<data::LogicSnapshot> logic_snapshot;
-    if ((logic_snapshot = dynamic_pointer_cast<data::LogicSnapshot>(snapshot))) {
+    data::LogicSnapshot *logic_snapshot = NULL;
+    if ((logic_snapshot = dynamic_cast<data::LogicSnapshot*>(snapshot))) {
         uint16_t to_save_probes = 0;
         for (l = sdi->channels; l; l = l->next) {
             probe = (struct sr_channel *)l->data;
@@ -451,8 +451,8 @@ QString StoreSession::meta_gen(boost::shared_ptr<data::Snapshot> snapshot)
     } else if (sdi->mode == LOGIC) {
         fprintf(meta, "trigger time = %lld\n", _session->get_session_time().toMSecsSinceEpoch());
     } else if (sdi->mode == ANALOG) {
-        boost::shared_ptr<data::AnalogSnapshot> analog_snapshot;
-        if ((analog_snapshot = dynamic_pointer_cast<data::AnalogSnapshot>(snapshot))) {
+        data::AnalogSnapshot *analog_snapshot = NULL;
+        if ((analog_snapshot = dynamic_cast<data::AnalogSnapshot*>(snapshot))) {
             uint8_t tmp_u8 = analog_snapshot->get_unit_bytes();
             fprintf(meta, "bits = %d\n", tmp_u8*8);
         }
@@ -559,7 +559,7 @@ bool StoreSession::export_start()
         return false;
     }
 
-    const boost::shared_ptr<data::Snapshot> snapshot(_session->get_snapshot(*type_set.begin()));
+    const auto snapshot = _session->get_snapshot(*type_set.begin());
     assert(snapshot);
     // Check we have data
     if (snapshot->empty()) {
@@ -605,20 +605,20 @@ bool StoreSession::export_start()
     return false;
 }
 
-void StoreSession::export_proc(boost::shared_ptr<data::Snapshot> snapshot)
+void StoreSession::export_proc(data::Snapshot *snapshot)
 {
     assert(snapshot);
 
-    boost::shared_ptr<data::LogicSnapshot> logic_snapshot;
-    boost::shared_ptr<data::AnalogSnapshot> analog_snapshot;
-    boost::shared_ptr<data::DsoSnapshot> dso_snapshot;
+    data::LogicSnapshot *logic_snapshot = NULL;
+    data::AnalogSnapshot *analog_snapshot = NULL;
+    data::DsoSnapshot *dso_snapshot = NULL;
     int channel_type;
 
-    if ((logic_snapshot = boost::dynamic_pointer_cast<data::LogicSnapshot>(snapshot))) {
+    if ((logic_snapshot = dynamic_cast<data::LogicSnapshot*>(snapshot))) {
         channel_type = SR_CHANNEL_LOGIC;
-    } else if ((dso_snapshot = boost::dynamic_pointer_cast<data::DsoSnapshot>(snapshot))) {
+    } else if ((dso_snapshot = dynamic_cast<data::DsoSnapshot*>(snapshot))) {
         channel_type = SR_CHANNEL_DSO;
-    } else if ((analog_snapshot = boost::dynamic_pointer_cast<data::AnalogSnapshot>(snapshot))) {
+    } else if ((analog_snapshot = dynamic_cast<data::AnalogSnapshot*>(snapshot))) {
         channel_type = SR_CHANNEL_ANALOG;
     } else {
         _has_error = true;
@@ -871,15 +871,15 @@ QJsonArray StoreSession::json_decoders()
         QJsonObject dec_obj;
         QJsonArray stack_array;
         QJsonObject show_obj;
-        const boost::shared_ptr<data::DecoderStack>& stack = t->decoder();
-        const std::list< boost::shared_ptr<data::decode::Decoder> >& decoder = stack->stack();
+        const auto &stack = t->decoder();
+        const auto &decoder = stack->stack();
 
         for(auto &dec : decoder) {
             QJsonArray ch_array;
             const srd_decoder *const d = dec->decoder();;
             const bool have_probes = (d->channels || d->opt_channels) != 0;
             if (have_probes) {
-                for(std::map<const srd_channel*, int>::const_iterator i = dec->channels().begin();
+                for(auto i = dec->channels().begin();
                     i != dec->channels().end(); i++) {
                     QJsonObject ch_obj;
                     ch_obj[(*i).first->id] = QJsonValue::fromVariant((*i).second);
@@ -888,8 +888,8 @@ QJsonArray StoreSession::json_decoders()
             }
 
             QJsonObject options_obj;
-            boost::shared_ptr<prop::binding::DecoderOptions> dec_binding(
-                new prop::binding::DecoderOptions(stack, dec));
+            auto dec_binding = new prop::binding::DecoderOptions(stack, dec);
+
             for (GSList *l = d->options; l; l = l->next)
             {
                 const srd_decoder_option *const opt =
@@ -934,10 +934,10 @@ QJsonArray StoreSession::json_decoders()
         dec_obj["stacked decoders"] = stack_array;
 
 
-        std::map<const pv::data::decode::Row, bool> rows = stack->get_rows_gshow();
-        for (std::map<const pv::data::decode::Row, bool>::const_iterator i = rows.begin();
-            i != rows.end(); i++) {
-            show_obj[(*i).first.title()] = QJsonValue::fromVariant((*i).second);
+        auto rows = stack->get_rows_gshow();
+        for (auto i = rows.begin(); i != rows.end(); i++) {
+            pv::data::decode::Row _row = (*i).first;
+            show_obj[_row.title()] = QJsonValue::fromVariant((*i).second);
         }
         dec_obj["show"] = show_obj;
 
@@ -954,17 +954,18 @@ void StoreSession::load_decoders(dock::ProtocolDock *widget, QJsonArray dec_arra
 
     foreach (const QJsonValue &dec_value, dec_array) {
         QJsonObject dec_obj = dec_value.toObject();
-        const vector< boost::shared_ptr<view::DecodeTrace> > pre_dsigs(
-            _session->get_decode_signals());
+
+        auto &pre_dsigs = _session->get_decode_signals();
         if (widget->sel_protocol(dec_obj["id"].toString()))
             widget->add_protocol(true);
-        const vector< boost::shared_ptr<view::DecodeTrace> > aft_dsigs(
-            _session->get_decode_signals());
+
+        auto &aft_dsigs = _session->get_decode_signals();
 
         if (aft_dsigs.size() > pre_dsigs.size()) {
             const GSList *l;
-            boost::shared_ptr<view::DecodeTrace> new_dsig = aft_dsigs.back();
-            const boost::shared_ptr<data::DecoderStack>& stack = new_dsig->decoder();
+            
+            auto new_dsig = aft_dsigs.back();
+            auto stack = new_dsig->decoder();
 
             if (dec_obj.contains("stacked decoders")) {
                 foreach(const QJsonValue &value, dec_obj["stacked decoders"].toArray()) {
@@ -976,8 +977,7 @@ void StoreSession::load_decoders(dock::ProtocolDock *widget, QJsonArray dec_arra
                         assert(d);
 
                         if (QString::fromUtf8(d->id) == stacked_obj["id"].toString()) {
-                            stack->push(boost::shared_ptr<data::decode::Decoder>(
-                                new data::decode::Decoder(d)));
+                            stack->push(new data::decode::Decoder(d));
                             break;
                         }
                     }
@@ -985,7 +985,7 @@ void StoreSession::load_decoders(dock::ProtocolDock *widget, QJsonArray dec_arra
                 }
             }
 
-            const std::list< boost::shared_ptr<data::decode::Decoder> >& decoder = stack->stack();
+            auto &decoder = stack->stack();
 
             for(auto &dec : decoder) {
                 const srd_decoder *const d = dec->decoder();
@@ -1074,10 +1074,13 @@ void StoreSession::load_decoders(dock::ProtocolDock *widget, QJsonArray dec_arra
             if (dec_obj.contains("show")) {
                 QJsonObject show_obj = dec_obj["show"].toObject();
                 std::map<const pv::data::decode::Row, bool> rows = stack->get_rows_gshow();
-                for (std::map<const pv::data::decode::Row, bool>::const_iterator i = rows.begin();
-                    i != rows.end(); i++) {
-                    if (show_obj.contains((*i).first.title())) {
-                        stack->set_rows_gshow((*i).first, show_obj[(*i).first.title()].toBool());
+
+                for (auto i = rows.begin();i != rows.end(); i++) {
+                        QString key = (*i).first.title();
+                    if (show_obj.contains(key)) {
+                        bool bShow = show_obj[key].toBool();
+                        const pv::data::decode::Row r = (*i).first;
+                        stack->set_rows_gshow(r, bShow);
                     }
                 }
             }
diff --git a/DSView/pv/storesession.h b/DSView/pv/storesession.h
index 2a671365..c4a49448 100755
--- a/DSView/pv/storesession.h
+++ b/DSView/pv/storesession.h
@@ -25,8 +25,7 @@
 #include <stdint.h>
 #include <string>
 #include <thread>
- 
-#include <boost/shared_ptr.hpp>
+  
 #include <QObject>
 
 #include <libsigrok4DSL/libsigrok.h>
@@ -59,9 +58,9 @@ public:
 
     SigSession* session();
 
-	std::pair<uint64_t, uint64_t> progress() const;
+	std::pair<uint64_t, uint64_t> progress();
 
-	const QString& error() const;
+	const QString& error();
 
     bool save_start();
 
@@ -72,9 +71,9 @@ public:
 	void cancel();
 
 private:
-    void save_proc(boost::shared_ptr<pv::data::Snapshot> snapshot);
-    QString meta_gen(boost::shared_ptr<data::Snapshot> snapshot);
-    void export_proc(boost::shared_ptr<pv::data::Snapshot> snapshot);
+    void save_proc(pv::data::Snapshot *snapshot);
+    QString meta_gen(data::Snapshot *snapshot);
+    void export_proc(pv::data::Snapshot *snapshot);
    
     QString decoders_gen();
  
diff --git a/DSView/pv/toolbars/filebar.cpp b/DSView/pv/toolbars/filebar.cpp
index 7c6e7880..0262e0ac 100755
--- a/DSView/pv/toolbars/filebar.cpp
+++ b/DSView/pv/toolbars/filebar.cpp
@@ -20,9 +20,7 @@
  */
 
 #include <boost/bind.hpp>
- 
-#include <boost/shared_ptr.hpp>
-
+   
 #include <QMetaObject>
 #include <QFileDialog> 
 
diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp
index 5efe3265..59fbcb42 100755
--- a/DSView/pv/toolbars/samplingbar.cpp
+++ b/DSView/pv/toolbars/samplingbar.cpp
@@ -259,7 +259,7 @@ void SamplingBar::set_device_list(const std::list<DevInst*> &devices, DevInst *s
     _updating_device_selector = false;
 }
 
-DevInst* SamplingBar::get_selected_device() const
+DevInst* SamplingBar::get_selected_device()
 {
     const int index = _device_selector.currentIndex();
     if (index < 0)
@@ -331,11 +331,11 @@ void SamplingBar::on_configure()
 
 void SamplingBar::zero_adj()
 {
-    boost::shared_ptr<view::DsoSignal> dsoSig;
+    view::DsoSignal *dsoSig = NULL;
 
     for(auto &s : _session->get_signals())
     {
-        if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s)))
+        if ((dsoSig = dynamic_cast<view::DsoSignal*>(s)))
             dsoSig->set_enable(true);
     }
     const int index_back = _sample_count.currentIndex();
@@ -352,7 +352,7 @@ void SamplingBar::zero_adj()
     if (wait.start() == QDialog::Rejected) {
         for(auto &s : _session->get_signals())
         {
-            if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s)))
+            if ((dsoSig = dynamic_cast<view::DsoSignal*>(s)))
                 dsoSig->commit_settings();
         }
     }
@@ -364,19 +364,19 @@ void SamplingBar::zero_adj()
     commit_hori_res();
 }
 
-bool SamplingBar::get_sampling() const
+bool SamplingBar::get_sampling()
 {
     return _sampling;
 }
 
-bool SamplingBar::get_instant() const
+bool SamplingBar::get_instant()
 {
     return _instant;
 }
 
 void SamplingBar::set_sampling(bool sampling)
 {
-    lock_guard<std::mutex> lock(_sampling_mutex);
+    std::lock_guard<std::mutex> lock(_sampling_mutex);
     _sampling = sampling;
 
     if (!sampling) {
@@ -505,7 +505,7 @@ void SamplingBar::update_sample_rate_selector_value()
 void SamplingBar::on_samplerate_sel(int index)
 {
     (void)index;
-    const DevInst *dev_inst = get_selected_device();
+    DevInst *dev_inst = get_selected_device();
     if (dev_inst->dev_inst()->mode != DSO)
         update_sample_count_selector();
 }
@@ -707,7 +707,7 @@ void SamplingBar::on_samplecount_sel(int index)
 {
     (void)index;
 
-    const DevInst *dev_inst = get_selected_device();
+    DevInst *dev_inst = get_selected_device();
     if (dev_inst->dev_inst()->mode == DSO)
         commit_hori_res();
     sig_duration_changed();
diff --git a/DSView/pv/toolbars/samplingbar.h b/DSView/pv/toolbars/samplingbar.h
index 833795d0..14779f96 100755
--- a/DSView/pv/toolbars/samplingbar.h
+++ b/DSView/pv/toolbars/samplingbar.h
@@ -27,9 +27,7 @@
 #include <stdint.h>
 #include <list>
 #include <map>
-
-#include <boost/shared_ptr.hpp>
-
+  
 #include <QComboBox>
 #include <QToolBar>
 #include <QToolButton>
@@ -76,13 +74,13 @@ namespace pv
 
             void set_device_list(const std::list<DevInst*> &devices, DevInst* selected);
 
-            DevInst *get_selected_device() const;
+            DevInst *get_selected_device();
 
             void update_sample_rate_selector();
 
             void set_sampling(bool sampling);
-            bool get_sampling() const;
-            bool get_instant() const;
+            bool get_sampling();
+            bool get_instant();
 
             void enable_toggle(bool enable);
 
diff --git a/DSView/pv/toolbars/titlebar.cpp b/DSView/pv/toolbars/titlebar.cpp
index 6d7b58bb..306a417a 100755
--- a/DSView/pv/toolbars/titlebar.cpp
+++ b/DSView/pv/toolbars/titlebar.cpp
@@ -69,17 +69,17 @@ TitleBar::TitleBar(bool top, QWidget *parent, bool hasClose) :
         _lay->addWidget(_minimizeButton);
         _lay->addWidget(_maximizeButton);
 
-        connect(this, SIGNAL(normalShow() ), parent, SLOT(showNormal() ) );
-        connect(this, SIGNAL( maximizedShow() ), parent, SLOT(showMaximized() ) );
-        connect(_minimizeButton, SIGNAL( clicked() ), parent, SLOT(showMinimized() ) );
-        connect(_maximizeButton, SIGNAL( clicked() ), this, SLOT(showMaxRestore() ) );
+        connect(this, SIGNAL(normalShow()), parent, SLOT(showNormal()));
+        connect(this, SIGNAL( maximizedShow()), parent, SLOT(showMaximized()));
+        connect(_minimizeButton, SIGNAL( clicked()), parent, SLOT(showMinimized()));
+        connect(_maximizeButton, SIGNAL( clicked()), this, SLOT(showMaxRestore()));
     }
 
     if (_isTop || _hasClose) {
         _closeButton= new QToolButton(this);
         _closeButton->setObjectName("CloseButton");
         _lay->addWidget(_closeButton);
-        connect(_closeButton, SIGNAL( clicked() ), parent, SLOT(close() ) );
+        connect(_closeButton, SIGNAL( clicked()), parent, SLOT(close()));
     }
 
     _lay->insertStretch(0, 500);
@@ -160,7 +160,7 @@ void TitleBar::setTitle(QString title)
     _title->setText(title);
 }
   
-QString TitleBar::title() const
+QString TitleBar::title()
 {
     return _title->text();
 }
diff --git a/DSView/pv/toolbars/titlebar.h b/DSView/pv/toolbars/titlebar.h
index a216485b..97245223 100755
--- a/DSView/pv/toolbars/titlebar.h
+++ b/DSView/pv/toolbars/titlebar.h
@@ -39,7 +39,7 @@ public:
     ~TitleBar();
     
     void setTitle(QString title); 
-    QString title() const;
+    QString title();
 
 private:
     void changeEvent(QEvent *event);
diff --git a/DSView/pv/view/analogsignal.cpp b/DSView/pv/view/analogsignal.cpp
index 605566ac..0368932f 100755
--- a/DSView/pv/view/analogsignal.cpp
+++ b/DSView/pv/view/analogsignal.cpp
@@ -47,8 +47,7 @@ const QColor AnalogSignal::SignalColours[4] = {
 
 const float AnalogSignal::EnvelopeThreshold = 16.0f;
 
-AnalogSignal::AnalogSignal(DevInst *dev_inst,
-                           boost::shared_ptr<data::Analog> data,
+AnalogSignal::AnalogSignal(DevInst *dev_inst,data::Analog *data,
                            sr_channel *probe) :
     Signal(dev_inst, probe),
     _data(data),
@@ -96,10 +95,8 @@ AnalogSignal::AnalogSignal(DevInst *dev_inst,
     }
 }
 
-AnalogSignal::AnalogSignal(boost::shared_ptr<view::AnalogSignal> s,
-                         boost::shared_ptr<pv::data::Analog> data,
-                         sr_channel *probe) :
-    Signal(*s.get(), probe),
+AnalogSignal::AnalogSignal(view::AnalogSignal *s, pv::data::Analog *data, sr_channel *probe) :
+    Signal(*s, probe),
     _data(data),
     _rects(NULL),
     _hover_en(false),
@@ -124,7 +121,7 @@ AnalogSignal::~AnalogSignal()
     }
 }
 
-boost::shared_ptr<pv::data::SignalData> AnalogSignal::data() const
+pv::data::SignalData* AnalogSignal::data()
 {
     return _data;
 }
@@ -134,27 +131,27 @@ void AnalogSignal::set_scale(int height)
     _scale = height / (_ref_max - _ref_min);
 }
 
-float AnalogSignal::get_scale() const
+float AnalogSignal::get_scale()
 {
     return _scale;
 }
 
-int AnalogSignal::get_bits() const
+int AnalogSignal::get_bits()
 {
     return _bits;
 }
 
-double AnalogSignal::get_ref_min() const
+double AnalogSignal::get_ref_min()
 {
     return _ref_min;
 }
 
-double AnalogSignal::get_ref_max() const
+double AnalogSignal::get_ref_max()
 {
     return _ref_max;
 }
 
-int AnalogSignal::get_hw_offset() const
+int AnalogSignal::get_hw_offset()
 {
     int hw_offset = 0;
     GVariant *gvar = _dev_inst->get_config(_probe, NULL, SR_CONF_PROBE_HW_OFFSET);
@@ -205,13 +202,11 @@ bool AnalogSignal::measure(const QPointF &p)
     if (!window.contains(p))
         return false;
 
-    const deque< boost::shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
-        _data->get_snapshots();
+    const auto &snapshots = _data->get_snapshots();
     if (snapshots.empty())
         return false;
 
-    const boost::shared_ptr<pv::data::AnalogSnapshot> &snapshot =
-        snapshots.front();
+    const auto snapshot = snapshots.front();
     if (snapshot->empty())
         return false;
 
@@ -248,13 +243,11 @@ QPointF AnalogSignal::get_point(uint64_t index, float &value)
     if (!enabled())
         return pt;
 
-    const deque< boost::shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
-        _data->get_snapshots();
+    const auto &snapshots = _data->get_snapshots();
     if (snapshots.empty())
         return pt;
 
-    const boost::shared_ptr<pv::data::AnalogSnapshot> &snapshot =
-        snapshots.front();
+    const auto snapshot = snapshots.front();
     if (snapshot->empty())
         return pt;
 
@@ -288,7 +281,7 @@ QPointF AnalogSignal::get_point(uint64_t index, float &value)
 /**
  * Probe options
  **/
-uint64_t AnalogSignal::get_vdiv() const
+uint64_t AnalogSignal::get_vdiv()
 {
     uint64_t vdiv = 0;
     GVariant* gvar = _dev_inst->get_config(_probe, NULL, SR_CONF_PROBE_VDIV);
@@ -299,7 +292,7 @@ uint64_t AnalogSignal::get_vdiv() const
     return vdiv;
 }
 
-uint8_t AnalogSignal::get_acCoupling() const
+uint8_t AnalogSignal::get_acCoupling()
 {
     uint64_t coupling = 0;
     GVariant* gvar = _dev_inst->get_config(_probe, NULL, SR_CONF_PROBE_COUPLING);
@@ -310,7 +303,7 @@ uint8_t AnalogSignal::get_acCoupling() const
     return coupling;
 }
 
-bool AnalogSignal::get_mapDefault() const
+bool AnalogSignal::get_mapDefault()
 {
     bool isDefault = true;
     GVariant* gvar = _dev_inst->get_config(_probe, NULL, SR_CONF_PROBE_MAP_DEFAULT);
@@ -321,7 +314,7 @@ bool AnalogSignal::get_mapDefault() const
     return isDefault;
 }
 
-QString AnalogSignal::get_mapUnit() const
+QString AnalogSignal::get_mapUnit()
 {
     QString unit;
     GVariant* gvar = _dev_inst->get_config(_probe, NULL, SR_CONF_PROBE_MAP_UNIT);
@@ -332,7 +325,7 @@ QString AnalogSignal::get_mapUnit() const
     return unit;
 }
 
-double AnalogSignal::get_mapMin() const
+double AnalogSignal::get_mapMin()
 {
     double min = -1;
     GVariant* gvar = _dev_inst->get_config(_probe, NULL, SR_CONF_PROBE_MAP_MIN);
@@ -343,7 +336,7 @@ double AnalogSignal::get_mapMin() const
     return min;
 }
 
-double AnalogSignal::get_mapMax() const
+double AnalogSignal::get_mapMax()
 {
     double max = 1;
     GVariant* gvar = _dev_inst->get_config(_probe, NULL, SR_CONF_PROBE_MAP_MAX);
@@ -354,7 +347,7 @@ double AnalogSignal::get_mapMax() const
     return max;
 }
 
-uint64_t AnalogSignal::get_factor() const
+uint64_t AnalogSignal::get_factor()
 {
     GVariant* gvar;
     uint64_t factor;
@@ -369,24 +362,24 @@ uint64_t AnalogSignal::get_factor() const
     }
 }
 
-int AnalogSignal::ratio2value(double ratio) const
+int AnalogSignal::ratio2value(double ratio)
 {
     return ratio * (_ref_max - _ref_min) + _ref_min;
 }
 
-int AnalogSignal::ratio2pos(double ratio) const
+int AnalogSignal::ratio2pos(double ratio)
 {
     const int height = get_totalHeight();
     const int top = get_y() - height * 0.5;
     return ratio * height + top;
 }
 
-double AnalogSignal::value2ratio(int value) const
+double AnalogSignal::value2ratio(int value)
 {
     return max(0.0, (value - _ref_min) / (_ref_max - _ref_min));
 }
 
-double AnalogSignal::pos2ratio(int pos) const
+double AnalogSignal::pos2ratio(int pos)
 {
     const int height = get_totalHeight();
     const int top = get_y() - height / 2;
@@ -403,7 +396,7 @@ void AnalogSignal::set_zero_vpos(int pos)
     }
 }
 
-int AnalogSignal::get_zero_vpos() const
+int AnalogSignal::get_zero_vpos()
 {
     return ratio2pos(get_zero_ratio());
 }
@@ -418,12 +411,12 @@ void AnalogSignal::set_zero_ratio(double ratio)
                           g_variant_new_uint16(_zero_offset));
 }
 
-double AnalogSignal::get_zero_ratio() const
+double AnalogSignal::get_zero_ratio()
 {
     return value2ratio(_zero_offset);
 }
 
-int AnalogSignal::get_zero_offset() const
+int AnalogSignal::get_zero_offset()
 {
     return _zero_offset;
 }
@@ -510,13 +503,11 @@ void AnalogSignal::paint_mid(QPainter &p, int left, int right, QColor fore, QCol
     assert(scale > 0);
     const int64_t offset = _view->offset();
 
-    const deque< boost::shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
-        _data->get_snapshots();
+    const auto &snapshots = _data->get_snapshots();
     if (snapshots.empty())
         return;
 
-    const boost::shared_ptr<pv::data::AnalogSnapshot> &snapshot =
-        snapshots.front();
+    const auto snapshot = snapshots.front();
     if (snapshot->empty())
         return;
 
@@ -571,7 +562,7 @@ void AnalogSignal::paint_fore(QPainter &p, int left, int right, QColor fore, QCo
 }
 
 void AnalogSignal::paint_trace(QPainter &p,
-    const boost::shared_ptr<pv::data::AnalogSnapshot> &snapshot,
+    const pv::data::AnalogSnapshot *snapshot,
     int zeroY, const int start_pixel,
     const uint64_t start_index, const int64_t sample_count,
     const double samples_per_pixel, const int order,
@@ -579,10 +570,12 @@ void AnalogSignal::paint_trace(QPainter &p,
 {
     (void)width;
 
-    const int64_t channel_num = snapshot->get_channel_num();
+    pv::data::AnalogSnapshot *pshot = const_cast<pv::data::AnalogSnapshot*>(snapshot);
+
+    int64_t channel_num = (int64_t)pshot->get_channel_num();
     if (sample_count > 0) {
-        const uint8_t unit_bytes = snapshot->get_unit_bytes();
-        const uint8_t *const samples = snapshot->get_samples(0);
+        const uint8_t unit_bytes = pshot->get_unit_bytes();
+        const uint8_t *const samples = pshot->get_samples(0);
         assert(samples);
 
         p.setPen(_colour);
@@ -603,10 +596,10 @@ void AnalogSignal::paint_trace(QPainter &p,
             yvalue = zeroY + (yvalue - hw_offset) * _scale;
             yvalue = min(max(yvalue, top), bottom);
             *point++ = QPointF(x, yvalue);
-            if (yindex == snapshot->get_ring_end())
+            if (yindex == pshot->get_ring_end())
                 break;
             yindex++;
-            yindex %= snapshot->get_sample_count();
+            yindex %= pshot->get_sample_count();
             x += pixels_per_sample;
         }
         p.drawPolyline(points, point - points);
@@ -615,7 +608,7 @@ void AnalogSignal::paint_trace(QPainter &p,
 }
 
 void AnalogSignal::paint_envelope(QPainter &p,
-    const boost::shared_ptr<pv::data::AnalogSnapshot> &snapshot,
+    const pv::data::AnalogSnapshot *snapshot,
     int zeroY, const int start_pixel,
     const uint64_t start_index, const int64_t sample_count,
     const double samples_per_pixel, const int order,
@@ -623,9 +616,10 @@ void AnalogSignal::paint_envelope(QPainter &p,
 {
     using namespace Qt;
     using pv::data::AnalogSnapshot;
+    pv::data::AnalogSnapshot *pshot = const_cast<pv::data::AnalogSnapshot*>(snapshot);
 
     AnalogSnapshot::EnvelopeSection e;
-    snapshot->get_envelope_section(e, start_index, sample_count,
+    pshot->get_envelope_section(e, start_index, sample_count,
                                    samples_per_pixel, order);
     if (e.samples_num == 0)
         return;
@@ -640,7 +634,8 @@ void AnalogSignal::paint_envelope(QPainter &p,
     float y_min = zeroY, y_max = zeroY, pre_y_min = zeroY, pre_y_max = zeroY;
     int pcnt = 0;
     const double scale_pixels_per_samples = e.scale / samples_per_pixel;
-    const uint64_t ring_end = max((int64_t)0, (int64_t)snapshot->get_ring_end() / e.scale - 1);
+    int64_t end_v = pshot->get_ring_end();
+    const uint64_t ring_end = max((int64_t)0, end_v / e.scale - 1);
     const int hw_offset = get_hw_offset();
 
     float x = start_pixel;
@@ -717,7 +712,7 @@ void AnalogSignal::paint_hover_measure(QPainter &p, QColor fore, QColor back)
         p.drawText(hover_rect, Qt::AlignCenter | Qt::AlignTop | Qt::TextDontClip, hover_str);
     }
 
-    list<Cursor*>::iterator i = _view->get_cursorList().begin();
+    auto i = _view->get_cursorList().begin();
     while (i != _view->get_cursorList().end()) {
         float pt_value;
         const QPointF pt = get_point((*i)->index(), pt_value);
diff --git a/DSView/pv/view/analogsignal.h b/DSView/pv/view/analogsignal.h
index 401351eb..48f3d7f6 100755
--- a/DSView/pv/view/analogsignal.h
+++ b/DSView/pv/view/analogsignal.h
@@ -24,8 +24,7 @@
 #define DSVIEW_PV_ANALOGSIGNAL_H
 
 #include "signal.h"
-
-#include <boost/shared_ptr.hpp>
+ 
 
 namespace pv {
 
@@ -53,23 +52,21 @@ private:
     static const uint8_t DefaultBits = 8;
 
 public:
-    AnalogSignal(DevInst* dev_inst,
-                 boost::shared_ptr<pv::data::Analog> data,
-                 sr_channel *probe);
-    AnalogSignal(boost::shared_ptr<view::AnalogSignal> s,
-                 boost::shared_ptr<pv::data::Analog> data,
+    AnalogSignal(DevInst* dev_inst, pv::data::Analog *data,
                  sr_channel *probe);
 
+    AnalogSignal(view::AnalogSignal* s, pv::data::Analog *data,  sr_channel *probe);
+
 	virtual ~AnalogSignal();
 
-    boost::shared_ptr<pv::data::SignalData> data() const;
+    pv::data::SignalData* data();
 
     void set_scale(int height);
-    float get_scale() const;
-    int get_bits() const;
-    double get_ref_min() const;
-    double get_ref_max() const;
-    int get_hw_offset() const;
+    float get_scale();
+    int get_bits();
+    double get_ref_min();
+    double get_ref_max();
+    int get_hw_offset();
     int commit_settings();
 
     /**
@@ -83,30 +80,30 @@ public:
     /**
      * Probe options
      **/
-    uint64_t get_vdiv() const;
-    uint8_t get_acCoupling() const;
-    bool get_mapDefault() const;
-    QString get_mapUnit() const;
-    double get_mapMin() const;
-    double get_mapMax() const;
-    uint64_t get_factor() const;
+    uint64_t get_vdiv();
+    uint8_t get_acCoupling();
+    bool get_mapDefault();
+    QString get_mapUnit();
+    double get_mapMin();
+    double get_mapMax();
+    uint64_t get_factor();
 
     /**
      *
      **/
     void set_zero_vpos(int pos);
-    int get_zero_vpos() const;
+    int get_zero_vpos();
     void set_zero_ratio(double ratio);
-    double get_zero_ratio() const;
-    int get_zero_offset() const;
+    double get_zero_ratio();
+    int get_zero_offset();
 
     /**
      *
      */
-    int ratio2value(double ratio) const;
-    int ratio2pos(double ratio) const;
-    double value2ratio(int value) const;
-    double pos2ratio(int pos) const;
+    int ratio2value(double ratio);
+    int ratio2pos(double ratio);
+    double value2ratio(int value);
+    double pos2ratio(int pos);
 
     /**
      * Event
@@ -139,14 +136,14 @@ public:
 
 private:
     void paint_trace(QPainter &p,
-                     const boost::shared_ptr<pv::data::AnalogSnapshot> &snapshot,
+                     const pv::data::AnalogSnapshot *snapshot,
                      int zeroY, const int start_pixel,
                      const uint64_t start_index, const int64_t sample_count,
                      const double samples_per_pixel, const int order,
                      const float top, const float bottom, const int width);
 
     void paint_envelope(QPainter &p,
-                        const boost::shared_ptr<pv::data::AnalogSnapshot> &snapshot,
+                        const pv::data::AnalogSnapshot *snapshot,
                         int zeroY, const int start_pixel,
                         const uint64_t start_index, const int64_t sample_count,
                         const double samples_per_pixel, const int order,
@@ -155,7 +152,7 @@ private:
     void paint_hover_measure(QPainter &p, QColor fore, QColor back);
 
 private:
-	boost::shared_ptr<pv::data::Analog> _data;
+	pv::data::Analog *_data;
 
     QRectF *_rects;
 
diff --git a/DSView/pv/view/cursor.cpp b/DSView/pv/view/cursor.cpp
index 7c136567..eca057ca 100755
--- a/DSView/pv/view/cursor.cpp
+++ b/DSView/pv/view/cursor.cpp
@@ -57,7 +57,7 @@ Cursor::Cursor(View &view, QColor color, uint64_t index) :
 {
 }
 
-QRect Cursor::get_label_rect(const QRect &rect, bool &visible, bool has_hoff) const
+QRect Cursor::get_label_rect(const QRect &rect, bool &visible, bool has_hoff)
 {
     const double samples_per_pixel = _view.session().cur_snap_samplerate() * _view.scale();
     const double cur_offset = _index / samples_per_pixel;
@@ -79,7 +79,7 @@ QRect Cursor::get_label_rect(const QRect &rect, bool &visible, bool has_hoff) co
     return QRect(x - label_size.width() / 2, top, label_size.width(), height);
 }
 
-QRect Cursor::get_close_rect(const QRect &rect) const
+QRect Cursor::get_close_rect(const QRect &rect)
 {
     return QRect(rect.right() - CloseSize, rect.top(), CloseSize, CloseSize);
 }
diff --git a/DSView/pv/view/cursor.h b/DSView/pv/view/cursor.h
index 2a33a8f2..6e8292fc 100755
--- a/DSView/pv/view/cursor.h
+++ b/DSView/pv/view/cursor.h
@@ -65,9 +65,9 @@ public:
 	 * @param rect The rectangle of the ruler client area.
 	 * @return Returns the label rectangle.
 	 */
-    QRect get_label_rect(const QRect &rect, bool &visible, bool has_hoff = true) const;
+    QRect get_label_rect(const QRect &rect, bool &visible, bool has_hoff = true);
 
-    QRect get_close_rect(const QRect &rect) const;
+    QRect get_close_rect(const QRect &rect);
 
 	/**
 	 * Paints the cursor's label to the ruler.
diff --git a/DSView/pv/view/decodetrace.cpp b/DSView/pv/view/decodetrace.cpp
index 07816c28..babe8024 100755
--- a/DSView/pv/view/decodetrace.cpp
+++ b/DSView/pv/view/decodetrace.cpp
@@ -116,7 +116,7 @@ const QString DecodeTrace::RegionStart = QT_TR_NOOP("Start");
 const QString DecodeTrace::RegionEnd = QT_TR_NOOP("End  ");
 
 DecodeTrace::DecodeTrace(pv::SigSession *session,
-	boost::shared_ptr<pv::data::DecoderStack> decoder_stack, int index) :
+	pv::data::DecoderStack *decoder_stack, int index) :
 	Trace(QString::fromUtf8(
         decoder_stack->stack().front()->decoder()->name), index, SR_CHANNEL_DECODER),
 	_session(session),
@@ -134,9 +134,9 @@ DecodeTrace::DecodeTrace(pv::SigSession *session,
 
 	_colour = DecodeColours[index % countof(DecodeColours)];
 
-    connect(_decoder_stack.get(), SIGNAL(new_decode_data()),
+    connect(_decoder_stack, SIGNAL(new_decode_data()),
         this, SLOT(on_new_decode_data()));
-    connect(_decoder_stack.get(), SIGNAL(decode_done()),
+    connect(_decoder_stack, SIGNAL(decode_done()),
         this, SLOT(on_decode_done()));
 
         _start_comboBox = NULL;
@@ -156,12 +156,12 @@ DecodeTrace::~DecodeTrace()
     }
 }
 
-bool DecodeTrace::enabled() const
+bool DecodeTrace::enabled()
 {
 	return true;
 }
 
-const boost::shared_ptr<pv::data::DecoderStack>& DecodeTrace::decoder() const
+pv::data::DecoderStack* DecodeTrace::decoder()
 {
 	return _decoder_stack;
 }
@@ -311,7 +311,7 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right, QColor fore, QColo
                         if ((max_annWidth > 100) ||
                             (max_annWidth > 10 && min_annWidth > 1) ||
                             (max_annWidth == 0 && samples_per_pixel < 10)) {
-                            vector<Annotation> annotations;
+                            std::vector<Annotation> annotations;
                             _decoder_stack->get_annotation_subset(annotations, row,
                                 start_sample, end_sample);
 
@@ -410,7 +410,7 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
 	_probe_selectors.clear();
 	_decoder_forms.clear();
 
-    list< boost::shared_ptr<Decoder> >& stack = _decoder_stack->stack();
+    auto &stack = _decoder_stack->stack();
 
     if (stack.empty()) {
 		QLabel *const l = new QLabel(
@@ -492,7 +492,7 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
 void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
     QPainter &p, QColor text_color, int h, int left, int right,
     double samples_per_pixel, double pixels_offset, int y,
-    size_t base_colour, double min_annWidth, QColor fore, QColor back) const
+    size_t base_colour, double min_annWidth, QColor fore, QColor back)
 {
     const double start = max(a.start_sample() / samples_per_pixel -
         pixels_offset, (double)left);
@@ -537,11 +537,12 @@ void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
                     if ((type == SRD_CHANNEL_COMMON) ||
                         ((type%100 != a.type()%100) && (type%100 != 0)))
                         continue;
-                    boost::shared_ptr<LogicSignal> logic_sig;
+                   
+                    LogicSignal *logic_sig = NULL;
 
                     for(auto &sig : _session->get_signals()) {
                         if((sig->get_index() == iter.second) &&
-                           (logic_sig = dynamic_pointer_cast<view::LogicSignal>(sig))) {
+                           (logic_sig = dynamic_cast<view::LogicSignal*>(sig))) {
                             logic_sig->paint_mark(p, start, end, type/100);
                             break;
                         }
@@ -554,7 +555,7 @@ void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
 
 void DecodeTrace::draw_nodetail(QPainter &p,
     int h, int left, int right, int y,
-    size_t base_colour, QColor fore, QColor back) const
+    size_t base_colour, QColor fore, QColor back)
 {
     (void)base_colour;
     (void)back;
@@ -578,7 +579,7 @@ void DecodeTrace::draw_nodetail(QPainter &p,
 }
 
 void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
-    QColor fill, QColor outline, QColor text_color, int h, double x, int y, double min_annWidth) const
+    QColor fill, QColor outline, QColor text_color, int h, double x, int y, double min_annWidth)
 {
     (void)outline;
 
@@ -603,13 +604,13 @@ void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &
 
 void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p,
 	QColor fill, QColor outline, QColor text_color, int h, double start,
-    double end, int y, QColor fore, QColor back) const
+    double end, int y, QColor fore, QColor back)
 {
     (void)fore;
 
 	const double top = y + .5 - h / 2;
 	const double bottom = y + .5 + h / 2;
-	const vector<QString> annotations = a.annotations();
+	const std::vector<QString> annotations = a.annotations();
 
     p.setPen(outline);
     p.setBrush(fill);
@@ -708,13 +709,15 @@ void DecodeTrace::draw_unshown_row(QPainter &p, int y, int h, int left,
 }
 
 void DecodeTrace::create_decoder_form(
-    boost::shared_ptr<pv::data::DecoderStack> &decoder_stack,
-    boost::shared_ptr<data::decode::Decoder> &dec, QWidget *parent,
+    pv::data::DecoderStack *decoder_stack,
+    data::decode::Decoder *dec, QWidget *parent,
     QFormLayout *form)
 {
 	const GSList *l;
 
     assert(dec);
+    assert(decoder_stack);
+    
 	const srd_decoder *const decoder = dec->decoder();
 	assert(decoder);
 
@@ -756,8 +759,7 @@ void DecodeTrace::create_decoder_form(
 	}
 
 	// Add the options
-    boost::shared_ptr<prop::binding::DecoderOptions> binding(
-        new prop::binding::DecoderOptions(decoder_stack, dec));
+    auto binding = new prop::binding::DecoderOptions(decoder_stack, dec);
     binding->add_properties_to_form(decoder_form, true);
 
 	_bindings.push_back(binding);
@@ -765,41 +767,43 @@ void DecodeTrace::create_decoder_form(
     //
     pv::widgets::DecoderGroupBox *const group =
         new pv::widgets::DecoderGroupBox(decoder_stack, dec, decoder_form, parent);
-    connect(group, SIGNAL(del_stack(boost::shared_ptr<data::decode::Decoder>&)),
-        this, SLOT(on_del_stack(boost::shared_ptr<data::decode::Decoder>&)));
+
+    connect(group, SIGNAL(del_stack(data::decode::Decoder*)),
+        this, SLOT(on_del_stack(data::decode::Decoder*)));
 
 	form->addRow(group);
 	_decoder_forms.push_back(group);
 }
 
 QComboBox* DecodeTrace::create_probe_selector(
-    QWidget *parent, const boost::shared_ptr<data::decode::Decoder> &dec,
+    QWidget *parent, const data::decode::Decoder *dec,
 	const srd_channel *const pdch)
 {
 	assert(dec);
 
-    const vector< boost::shared_ptr<Signal> > sigs(_session->get_signals());
+    const auto &sigs = _session->get_signals();
 
 	assert(_decoder_stack);
-    const map<const srd_channel*, int>::const_iterator probe_iter =
-		dec->channels().find(pdch);
 
+    data::decode::Decoder *_dec = const_cast<data::decode::Decoder*>(dec);
+
+    auto probe_iter = _dec->channels().find(pdch);
 	QComboBox *selector = new QComboBox(parent);
 
     selector->addItem("-", QVariant::fromValue(-1));
 
-	if (probe_iter == dec->channels().end())
+	if (probe_iter == _dec->channels().end())
 		selector->setCurrentIndex(0);
 
 	for(size_t i = 0; i < sigs.size(); i++) {
-        const boost::shared_ptr<view::Signal> s(sigs[i]);
+        const auto s = sigs[i];
 		assert(s);
 
-		if (dynamic_pointer_cast<LogicSignal>(s) && s->enabled())
+		if (dynamic_cast<LogicSignal*>(s) && s->enabled())
 		{
 			selector->addItem(s->get_name(),
                 QVariant::fromValue(s->get_index()));
-            if (probe_iter != dec->channels().end()) {
+            if (probe_iter != _dec->channels().end()) {
                 if ((*probe_iter).second == s->get_index())
                     selector->setCurrentIndex(i + 1);
             }
@@ -809,12 +813,12 @@ QComboBox* DecodeTrace::create_probe_selector(
 	return selector;
 }
 
-void DecodeTrace::commit_decoder_probes(boost::shared_ptr<data::decode::Decoder> &dec)
+void DecodeTrace::commit_decoder_probes(data::decode::Decoder *dec)
 {
 	assert(dec);
 
-    map<const srd_channel*, int> probe_map;
-    const vector< boost::shared_ptr<Signal> > sigs(_session->get_signals());
+    std::map<const srd_channel*, int> probe_map;
+    const auto &sigs = _session->get_signals();
 
     _index_list.clear();
 	for(auto &s : _probe_selectors)
@@ -863,7 +867,7 @@ void DecodeTrace::on_new_decode_data()
         _view->signals_changed();
 }
 
-int DecodeTrace::get_progress() const
+int DecodeTrace::get_progress()
 {
     return _progress;
 }
@@ -892,19 +896,18 @@ void DecodeTrace::on_stack_decoder(srd_decoder *decoder)
 {
 	assert(decoder);
 	assert(_decoder_stack);
-    _decoder_stack->push(boost::shared_ptr<data::decode::Decoder>(
-		new data::decode::Decoder(decoder)));
-    //_decoder_stack->begin_decode();
 
+    _decoder_stack->push(new data::decode::Decoder(decoder));
+     
     create_popup_form();
 }
 
-void DecodeTrace::on_del_stack(boost::shared_ptr<data::decode::Decoder> &dec)
+void DecodeTrace::on_del_stack(data::decode::Decoder *dec)
 {
     assert(dec);
     assert(_decoder_stack);
-    _decoder_stack->remove(dec);
 
+    _decoder_stack->remove(dec);
     create_popup_form();
 }
 
@@ -915,10 +918,12 @@ int DecodeTrace::rows_size()
     int size = 0;
     for(auto &dec : _decoder_stack->stack()) {
         if (dec->shown()) {
-            const std::map<const pv::data::decode::Row, bool> rows = _decoder_stack->get_rows_gshow();
-            for (std::map<const pv::data::decode::Row, bool>::const_iterator i = rows.begin();
-                i != rows.end(); i++) {
-                if ((*i).first.decoder() == dec->decoder() &&
+
+            auto rows = _decoder_stack->get_rows_gshow();
+
+            for (auto i = rows.begin(); i != rows.end(); i++) {
+                pv::data::decode::Row _row = (*i).first;
+                if (_row.decoder() == dec->decoder() &&
                     _decoder_stack->has_annotations((*i).first) &&
                     (*i).second)
                     size++;
diff --git a/DSView/pv/view/decodetrace.h b/DSView/pv/view/decodetrace.h
index 19e8015f..d2d59f37 100755
--- a/DSView/pv/view/decodetrace.h
+++ b/DSView/pv/view/decodetrace.h
@@ -30,8 +30,6 @@
 #include <QSignalMapper>
 #include <QFormLayout>
 
-#include <boost/shared_ptr.hpp>
-
 #include <pv/prop/binding/decoderoptions.h>
 #include "../dialogs/dsdialog.h"
 
@@ -68,7 +66,7 @@ private:
 	struct ProbeSelector
 	{
 		const QComboBox *_combo;
-		const boost::shared_ptr<pv::data::decode::Decoder> _decoder;
+        const pv::data::decode::Decoder *_decoder;
 		const srd_channel *_pdch;
 	};
 
@@ -98,13 +96,13 @@ private:
 
 public:
 	DecodeTrace(pv::SigSession *session,
-		boost::shared_ptr<pv::data::DecoderStack> decoder_stack,
+		pv::data::DecoderStack *decoder_stack,
 		int index);
     ~DecodeTrace();
 
-	bool enabled() const;
+	bool enabled();
 
-	const boost::shared_ptr<pv::data::DecoderStack>& decoder() const;
+	pv::data::DecoderStack* decoder();
 
 	void set_view(pv::view::View *view);
 
@@ -143,7 +141,7 @@ public:
      **/
     void frame_ended();
 
-    int get_progress() const;
+    int get_progress();
 
 protected:
     void paint_type_options(QPainter &p, int right, const QPoint pt, QColor fore);
@@ -156,18 +154,18 @@ private:
     void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
         QColor text_colour, int text_height, int left, int right,
         double samples_per_pixel, double pixels_offset, int y,
-        size_t base_colour, double min_annWidth, QColor fore, QColor back) const;
+        size_t base_colour, double min_annWidth, QColor fore, QColor back);
     void draw_nodetail(QPainter &p,
         int text_height, int left, int right, int y,
-        size_t base_colour, QColor fore, QColor back) const;
+        size_t base_colour, QColor fore, QColor back);
 
 	void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
 		QColor fill, QColor outline, QColor text_color, int h, double x,
-        int y, double min_annWidth) const;
+        int y, double min_annWidth);
 
     void draw_range(const pv::data::decode::Annotation &a, QPainter &p,
         QColor fill, QColor outline, QColor text_color, int h, double start,
-        double end, int y, QColor fore, QColor back) const;
+        double end, int y, QColor fore, QColor back);
 
 	void draw_error(QPainter &p, const QString &message,
 		int left, int right);
@@ -175,16 +173,16 @@ private:
     void draw_unshown_row(QPainter &p, int y, int h, int left,
                           int right, QString info, QColor fore, QColor back);
 
-    void create_decoder_form(boost::shared_ptr<data::DecoderStack> &decoder_stack,
-        boost::shared_ptr<pv::data::decode::Decoder> &dec,
+    void create_decoder_form(data::DecoderStack *decoder_stack,
+        pv::data::decode::Decoder *dec,
         QWidget *parent, QFormLayout *form);
 
 	QComboBox* create_probe_selector(QWidget *parent,
-		const boost::shared_ptr<pv::data::decode::Decoder> &dec,
+		const pv::data::decode::Decoder *dec,
 		const srd_channel *const pdch);
 
 	void commit_decoder_probes(
-		boost::shared_ptr<data::decode::Decoder> &dec);
+		data::decode::Decoder *dec);
 
 	void commit_probes();
 
@@ -199,32 +197,34 @@ private slots:
 	void on_probe_selected(int);
 
 	void on_stack_decoder(srd_decoder *decoder);
-    void on_del_stack(boost::shared_ptr<data::decode::Decoder> &dec);
+
+    void on_del_stack(data::decode::Decoder *dec);
 
     void on_decode_done();
 
     void on_region_set(int index);
 
 private:
-	pv::SigSession *_session;
-	boost::shared_ptr<pv::data::DecoderStack> _decoder_stack;
+	pv::SigSession 			*_session;
+	pv::data::DecoderStack 	*_decoder_stack;
 
-	uint64_t _decode_start, _decode_end;
-    int _start_index, _end_index;
-    int _start_count, _end_count;
-    QComboBox *_start_comboBox, *_end_comboBox;
-	QFormLayout *_pub_input_layer;
-    int _progress;
-
-	std::list< boost::shared_ptr<pv::prop::binding::DecoderOptions> >
-		_bindings;
+	uint64_t 		_decode_start;
+	uint64_t	 	_decode_end;
+    int 			_start_index;
+	int 	 		_end_index;
+    int 			_start_count;
+	int			 	_end_count;
+    QComboBox 		*_start_comboBox;
+	QComboBox 		*_end_comboBox;
+	QFormLayout 	*_pub_input_layer;
+    int				 _progress;
 
+	std::list<pv::prop::binding::DecoderOptions*> _bindings;
 	std::list<ProbeSelector> _probe_selectors;
 	std::vector<pv::widgets::DecoderGroupBox*> _decoder_forms;
 
-	std::vector<QString> _cur_row_headings;
- 
-    dialogs::DSDialog *_popup;
+	std::vector<QString> 	_cur_row_headings; 
+    dialogs::DSDialog 		*_popup;
 };
 
 } // namespace view
diff --git a/DSView/pv/view/devmode.cpp b/DSView/pv/view/devmode.cpp
index e34408b6..48e36f81 100755
--- a/DSView/pv/view/devmode.cpp
+++ b/DSView/pv/view/devmode.cpp
@@ -35,9 +35,7 @@
 #include <QRect>
 #include <QDebug>
 #include "../config/appconfig.h"
-
-using boost::shared_ptr;
-using namespace std;
+ 
 
 namespace pv {
 namespace view {
diff --git a/DSView/pv/view/devmode.h b/DSView/pv/view/devmode.h
index ae26e53c..d5c9fc1e 100755
--- a/DSView/pv/view/devmode.h
+++ b/DSView/pv/view/devmode.h
@@ -22,10 +22,7 @@
 
 #ifndef DSVIEW_PV_VIEW_DEVMODE_H
 #define DSVIEW_PV_VIEW_DEVMODE_H
-
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
+ 
 #include <list>
 #include <utility>
 #include <map>
diff --git a/DSView/pv/view/dsldial.cpp b/DSView/pv/view/dsldial.cpp
index 618817b1..86fa462e 100755
--- a/DSView/pv/view/dsldial.cpp
+++ b/DSView/pv/view/dsldial.cpp
@@ -119,12 +119,12 @@ void dslDial::set_sel(uint64_t sel)
     _sel = sel;
 }
 
-uint64_t dslDial::get_sel() const
+uint64_t dslDial::get_sel()
 {
     return _sel;
 }
 
-uint64_t dslDial::get_count() const
+uint64_t dslDial::get_count()
 {
     return _div;
 }
@@ -145,22 +145,22 @@ bool dslDial::isMax()
         return false;
 }
 
-uint64_t dslDial::get_min() const
+uint64_t dslDial::get_min()
 {
     return _value[0];
 }
 
-uint64_t dslDial::get_max() const
+uint64_t dslDial::get_max()
 {
     return _value[_div-1];
 }
 
-uint64_t dslDial::get_value() const
+uint64_t dslDial::get_value()
 {
     return _value[_sel];
 }
 
-uint64_t dslDial::get_value(uint64_t i) const
+uint64_t dslDial::get_value(uint64_t i)
 {
     assert(i < _div);
     return _value[i];
@@ -179,7 +179,7 @@ void dslDial::set_factor(uint64_t factor)
     }
 }
 
-uint64_t dslDial::get_factor() const
+uint64_t dslDial::get_factor()
 {
     return _factor;
 }
diff --git a/DSView/pv/view/dsldial.h b/DSView/pv/view/dsldial.h
index 120b491c..9c0895c9 100755
--- a/DSView/pv/view/dsldial.h
+++ b/DSView/pv/view/dsldial.h
@@ -50,23 +50,23 @@ public:
 
     // set/get current select
     void set_sel(uint64_t sel);
-    uint64_t get_sel() const;
-    uint64_t get_count() const;
+    uint64_t get_sel();
+    uint64_t get_count();
 
     // boundary detection
     bool isMin();
     bool isMax();
-    uint64_t get_min() const;
-    uint64_t get_max() const;
+    uint64_t get_min();
+    uint64_t get_max();
 
     // get current value
-    uint64_t get_value() const;
-    uint64_t get_value(uint64_t i) const;
+    uint64_t get_value();
+    uint64_t get_value(uint64_t i);
     void set_value(uint64_t value);
 
     // set/get factor
     void set_factor(uint64_t factor);
-    uint64_t get_factor() const;
+    uint64_t get_factor();
 
 private:
     uint64_t _div;
diff --git a/DSView/pv/view/dsosignal.cpp b/DSView/pv/view/dsosignal.cpp
index 7a295c5c..3a33628e 100755
--- a/DSView/pv/view/dsosignal.cpp
+++ b/DSView/pv/view/dsosignal.cpp
@@ -57,7 +57,7 @@ const QColor DsoSignal::SignalColours[4] = {
 const float DsoSignal::EnvelopeThreshold = 256.0f;
 
 DsoSignal::DsoSignal(DevInst *dev_inst,
-                     boost::shared_ptr<data::Dso> data,
+                     data::Dso *data,
                      sr_channel *probe):
     Signal(dev_inst, probe),
     _data(data),
@@ -108,12 +108,12 @@ DsoSignal::~DsoSignal()
 {
 }
 
-boost::shared_ptr<pv::data::SignalData> DsoSignal::data() const
+pv::data::SignalData* DsoSignal::data()
 {
     return _data;
 }
 
-boost::shared_ptr<pv::data::Dso> DsoSignal::dso_data() const
+pv::data::Dso* DsoSignal::dso_data()
 {
     return _data;
 }
@@ -133,17 +133,17 @@ uint8_t DsoSignal::get_bits()
     return _bits;
 }
 
-double DsoSignal::get_ref_min() const
+double DsoSignal::get_ref_min()
 {
     return _ref_min;
 }
 
-double DsoSignal::get_ref_max() const
+double DsoSignal::get_ref_max()
 {
     return _ref_max;
 }
 
-int DsoSignal::get_name_width() const
+int DsoSignal::get_name_width()
 {
     return 0;
 }
@@ -193,7 +193,7 @@ void DsoSignal::set_enable(bool enable)
     _en_lock = false;
 }
 
-bool DsoSignal::get_vDialActive() const
+bool DsoSignal::get_vDialActive()
 {
     return _vDialActive;
 }
@@ -400,22 +400,22 @@ int DsoSignal::commit_settings()
     return ret;
 }
 
-dslDial * DsoSignal::get_vDial() const
+dslDial * DsoSignal::get_vDial()
 {
     return _vDial;
 }
 
-uint64_t DsoSignal::get_vDialValue() const
+uint64_t DsoSignal::get_vDialValue()
 {
     return _vDial->get_value();
 }
 
-uint16_t DsoSignal::get_vDialSel() const
+uint16_t DsoSignal::get_vDialSel()
 {
     return _vDial->get_sel();
 }
 
-uint8_t DsoSignal::get_acCoupling() const
+uint8_t DsoSignal::get_acCoupling()
 {
     return _acCoupling;
 }
@@ -429,27 +429,27 @@ void DsoSignal::set_acCoupling(uint8_t coupling)
     }
 }
 
-int DsoSignal::ratio2value(double ratio) const
+int DsoSignal::ratio2value(double ratio)
 {
     return ratio * (_ref_max - _ref_min) + _ref_min;
 }
 
-int DsoSignal::ratio2pos(double ratio) const
+int DsoSignal::ratio2pos(double ratio)
 {
     return ratio * get_view_rect().height() + get_view_rect().top();
 }
 
-double DsoSignal::value2ratio(int value) const
+double DsoSignal::value2ratio(int value)
 {
     return max(0.0, (value - _ref_min) / (_ref_max - _ref_min));
 }
 
-double DsoSignal::pos2ratio(int pos) const
+double DsoSignal::pos2ratio(int pos)
 {
     return min(max(pos - get_view_rect().top(), 0), get_view_rect().height()) * 1.0 / get_view_rect().height();
 }
 
-double DsoSignal::get_trig_vrate() const
+double DsoSignal::get_trig_vrate()
 {
     if (_dev_inst->name() == "DSLogic")
         return value2ratio(_trig_value - ratio2value(0.5)) + get_zero_ratio();
@@ -485,17 +485,17 @@ void DsoSignal::set_trig_ratio(double ratio, bool delta_change)
                           g_variant_new_byte(_trig_value));
 }
 
-int DsoSignal::get_zero_vpos() const
+int DsoSignal::get_zero_vpos()
 {
     return ratio2pos(get_zero_ratio());
 }
 
-double DsoSignal::get_zero_ratio() const
+double DsoSignal::get_zero_ratio()
 {
     return value2ratio(_zero_offset);
 }
 
-int DsoSignal::get_hw_offset() const
+int DsoSignal::get_hw_offset()
 {
     int hw_offset = 0;
     GVariant *gvar = _dev_inst->get_config(_probe, NULL, SR_CONF_PROBE_HW_OFFSET);
@@ -564,7 +564,7 @@ void DsoSignal::set_show(bool show)
     _show = show;
 }
 
-bool DsoSignal::show() const
+bool DsoSignal::show()
 {
     return _show;
 }
@@ -692,7 +692,7 @@ QString DsoSignal::get_measure(enum DSO_MEASURE_TYPE type)
     return mString;
 }
 
-QRect DsoSignal::get_view_rect() const
+QRect DsoSignal::get_view_rect()
 {
     assert(_viewport);
     return QRect(0, UpMargin,
@@ -704,12 +704,11 @@ void DsoSignal::paint_prepare()
 {
     assert(_view);
 
-    const deque< boost::shared_ptr<pv::data::DsoSnapshot> > &snapshots =
-        _data->get_snapshots();
+    const auto &snapshots = _data->get_snapshots();
     if (snapshots.empty())
         return;
-    const boost::shared_ptr<pv::data::DsoSnapshot> &snapshot =
-        snapshots.front();
+
+    const auto snapshot = snapshots.front();
     if (snapshot->empty())
         return;
 
@@ -847,12 +846,11 @@ void DsoSignal::paint_mid(QPainter &p, int left, int right, QColor fore, QColor
         assert(scale > 0);
         const int64_t offset = _view->offset();
 
-        const deque< boost::shared_ptr<pv::data::DsoSnapshot> > &snapshots =
-            _data->get_snapshots();
+        const auto &snapshots = _data->get_snapshots();
         if (snapshots.empty())
             return;
-        const boost::shared_ptr<pv::data::DsoSnapshot> &snapshot =
-            snapshots.front();
+
+        const auto snapshot = snapshots.front();
         if (snapshot->empty())
             return;
 
@@ -1018,7 +1016,7 @@ void DsoSignal::paint_fore(QPainter &p, int left, int right, QColor fore, QColor
     }
 }
 
-QRectF DsoSignal::get_trig_rect(int left, int right) const
+QRectF DsoSignal::get_trig_rect(int left, int right)
 {
     (void)left;
 
@@ -1028,14 +1026,16 @@ QRectF DsoSignal::get_trig_rect(int left, int right) const
 }
 
 void DsoSignal::paint_trace(QPainter &p,
-    const boost::shared_ptr<pv::data::DsoSnapshot> &snapshot,
+    const pv::data::DsoSnapshot *snapshot,
     int zeroY, int left, const int64_t start, const int64_t end, int hw_offset,
     const double pixels_offset, const double samples_per_pixel, uint64_t num_channels)
 {
     const int64_t sample_count = end - start + 1;
 
     if (sample_count > 0) {
-        const uint8_t *const samples = snapshot->get_samples(start, end, get_index());
+        pv::data::DsoSnapshot *pshot = const_cast<pv::data::DsoSnapshot*>(snapshot);
+        auto pdata = pshot->get_samples(start, end, get_index());
+        const uint8_t *const samples = pdata;
         assert(samples);
 
         QColor trace_colour = _colour;
@@ -1073,16 +1073,18 @@ void DsoSignal::paint_trace(QPainter &p,
 }
 
 void DsoSignal::paint_envelope(QPainter &p,
-    const boost::shared_ptr<pv::data::DsoSnapshot> &snapshot,
+    const pv::data::DsoSnapshot *snapshot,
     int zeroY, int left, const int64_t start, const int64_t end, int hw_offset,
     const double pixels_offset, const double samples_per_pixel, uint64_t num_channels)
 {
 	using namespace Qt;
     using pv::data::DsoSnapshot;
 
+    data::DsoSnapshot *pshot = const_cast<data::DsoSnapshot*>(snapshot);
+
     DsoSnapshot::EnvelopeSection e;
     const uint16_t index = get_index() % num_channels;
-    snapshot->get_envelope_section(e, start, end, samples_per_pixel, index);
+    pshot->get_envelope_section(e, start, end, samples_per_pixel, index);
 
 	if (e.length < 2)
 		return;
@@ -1332,7 +1334,7 @@ void DsoSignal::paint_hover_measure(QPainter &p, QColor fore, QColor back)
         p.drawText(hover_rect, Qt::AlignCenter | Qt::AlignTop | Qt::TextDontClip, hover_str);
     }
 
-    list<Cursor*>::iterator i = _view->get_cursorList().begin();
+    auto i = _view->get_cursorList().begin();
     while (i != _view->get_cursorList().end()) {
         float pt_value;
         const QPointF pt = get_point((*i)->index(), pt_value);
@@ -1477,13 +1479,11 @@ bool DsoSignal::measure(const QPointF &p)
     if (!window.contains(p))
         return false;
 
-    const deque< boost::shared_ptr<pv::data::DsoSnapshot> > &snapshots =
-        _data->get_snapshots();
+    const auto &snapshots = _data->get_snapshots();
     if (snapshots.empty())
         return false;
 
-    const boost::shared_ptr<pv::data::DsoSnapshot> &snapshot =
-        snapshots.front();
+    auto snapshot = const_cast<data::DsoSnapshot*>(snapshots.front());
     if (snapshot->empty())
         return false;
 
@@ -1514,13 +1514,11 @@ QPointF DsoSignal::get_point(uint64_t index, float &value)
     if (!enabled())
         return pt;
 
-    const deque< boost::shared_ptr<pv::data::DsoSnapshot> > &snapshots =
-        _data->get_snapshots();
+    const auto &snapshots = _data->get_snapshots();
     if (snapshots.empty())
         return pt;
 
-    const boost::shared_ptr<pv::data::DsoSnapshot> &snapshot =
-        snapshots.front();
+    const auto snapshot = snapshots.front();
     if (snapshot->empty())
         return pt;
 
@@ -1543,13 +1541,11 @@ double DsoSignal::get_voltage(uint64_t index)
     if (!enabled())
         return 1;
 
-    const deque< boost::shared_ptr<pv::data::DsoSnapshot> > &snapshots =
-        _data->get_snapshots();
+    auto &snapshots = _data->get_snapshots();
     if (snapshots.empty())
         return 1;
 
-    const boost::shared_ptr<pv::data::DsoSnapshot> &snapshot =
-        snapshots.front();
+    auto snapshot = const_cast<data::DsoSnapshot*>(snapshots.front());
     if (snapshot->empty())
         return 1;
 
diff --git a/DSView/pv/view/dsosignal.h b/DSView/pv/view/dsosignal.h
index 50d079a9..2cdd8bde 100755
--- a/DSView/pv/view/dsosignal.h
+++ b/DSView/pv/view/dsosignal.h
@@ -24,11 +24,8 @@
 #define DSVIEW_PV_DSOSIGNAL_H
 
 #include "signal.h"
-
-#include <boost/shared_ptr.hpp>
-
+  
 namespace pv {
-
 namespace data {
 class Logic;
 class Dso;
@@ -87,46 +84,45 @@ private:
     static const uint16_t MS_RectHeight = 25;
 
 public:
-    DsoSignal(DevInst* dev_inst,
-              boost::shared_ptr<pv::data::Dso> data,
+    DsoSignal(DevInst* dev_inst, pv::data::Dso *data,
               sr_channel *probe);
 
     virtual ~DsoSignal();
 
-    boost::shared_ptr<pv::data::SignalData> data() const;
-    boost::shared_ptr<pv::data::Dso> dso_data() const;
+    pv::data::SignalData* data();
+    pv::data::Dso* dso_data();
 
     void set_scale(int height);
     float get_scale();
     uint8_t get_bits();
-    double get_ref_min() const;
-    double get_ref_max() const;
+    double get_ref_min();
+    double get_ref_max();
 
-    int get_name_width() const;
+    int get_name_width();
 
     /**
      *
      */
     void set_enable(bool enable);
-    bool get_vDialActive() const;
+    bool get_vDialActive();
     void set_vDialActive(bool active);
     bool go_vDialPre(bool manul);
     bool go_vDialNext(bool manul);
     bool update_capture(bool instant);
-    dslDial *get_vDial() const;
-    uint64_t get_vDialValue() const;
-    uint16_t get_vDialSel() const;
-    uint8_t get_acCoupling() const;
+    dslDial *get_vDial();
+    uint64_t get_vDialValue();
+    uint16_t get_vDialSel();
+    uint8_t get_acCoupling();
     void set_acCoupling(uint8_t coupling);
 
     void set_trig_vpos(int pos, bool delta_change = true);
     void set_trig_ratio(double ratio, bool delta_change = true);
-    double get_trig_vrate() const;
+    double get_trig_vrate();
 
     void set_factor(uint64_t factor);
     uint64_t get_factor();
     void set_show(bool show);
-    bool show() const;
+    bool show();
     void set_mValid(bool valid);
 
     bool load_settings();
@@ -150,9 +146,9 @@ public:
     /**
      * Gets the mid-Y position of this signal.
      */
-    int get_zero_vpos() const;
-    double get_zero_ratio() const;
-    int get_hw_offset() const;
+    int get_zero_vpos();
+    double get_zero_ratio();
+    int get_hw_offset();
     /**
      * Sets the mid-Y position of this signal.
      */
@@ -165,10 +161,10 @@ public:
     /**
      *
      */
-    int ratio2value(double ratio) const;
-    int ratio2pos(double ratio) const;
-    double value2ratio(int value) const;
-    double pos2ratio(int pos) const;
+    int ratio2value(double ratio);
+    int ratio2pos(double ratio);
+    double value2ratio(int value);
+    double pos2ratio(int pos);
 
     /**
      * paint prepare
@@ -199,9 +195,9 @@ public:
      **/
     void paint_fore(QPainter &p, int left, int right, QColor fore, QColor back);
 
-    QRect get_view_rect() const;
+    QRect get_view_rect();
 
-    QRectF get_trig_rect(int left, int right) const;
+    QRectF get_trig_rect(int left, int right);
 
     QString get_measure(enum DSO_MEASURE_TYPE type);
 
@@ -217,13 +213,13 @@ protected:
 
 private:
     void paint_trace(QPainter &p,
-        const boost::shared_ptr<pv::data::DsoSnapshot> &snapshot,
+        const pv::data::DsoSnapshot* snapshot,
         int zeroY, int left, const int64_t start, const int64_t end, int hw_offset,
         const double pixels_offset, const double samples_per_pixel,
         uint64_t num_channels);
 
     void paint_envelope(QPainter &p,
-        const boost::shared_ptr<pv::data::DsoSnapshot> &snapshot,
+        const pv::data::DsoSnapshot *snapshot,
         int zeroY, int left, const int64_t start, const int64_t end, int hw_offset,
         const double pixels_offset, const double samples_per_pixel,
         uint64_t num_channels);
@@ -232,7 +228,7 @@ private:
     void auto_set();
 
 private:
-    boost::shared_ptr<pv::data::Dso> _data;
+    pv::data::Dso *_data;
 	float _scale;
     bool _en_lock;
     bool _show;
diff --git a/DSView/pv/view/groupsignal.cpp b/DSView/pv/view/groupsignal.cpp
index 1e67f654..0c5870aa 100755
--- a/DSView/pv/view/groupsignal.cpp
+++ b/DSView/pv/view/groupsignal.cpp
@@ -42,7 +42,7 @@ const QColor GroupSignal::SignalColours[4] = {
 
 const float GroupSignal::EnvelopeThreshold = 256.0f;
 
-GroupSignal::GroupSignal(QString name, boost::shared_ptr<data::Group> data,
+GroupSignal::GroupSignal(QString name, data::Group *data,
                          std::list<int> probe_index_list, int group_index) :
     Trace(name, probe_index_list, SR_CHANNEL_GROUP, group_index),
     _data(data)
@@ -55,12 +55,12 @@ GroupSignal::~GroupSignal()
 {
 }
 
-bool GroupSignal::enabled() const
+bool GroupSignal::enabled()
 {
     return true;
 }
 
-boost::shared_ptr<pv::data::SignalData> GroupSignal::data() const
+pv::data::SignalData* GroupSignal::data()
 {
     return _data;
 }
@@ -85,13 +85,11 @@ void GroupSignal::paint_mid(QPainter &p, int left, int right, QColor fore, QColo
 
     _scale = _totalHeight * 1.0f / std::pow(2.0, static_cast<int>(_index_list.size()));
 
-    const deque< boost::shared_ptr<pv::data::GroupSnapshot> > &snapshots =
-		_data->get_snapshots();
+    const auto &snapshots = _data->get_snapshots();
     if (snapshots.empty())
 		return;
 
-    const boost::shared_ptr<pv::data::GroupSnapshot> &snapshot =
-            snapshots.at(_sec_index);
+    const auto snapshot = snapshots.at(_sec_index);
 
     const double pixels_offset = offset;
     const double samplerate = _data->samplerate();
@@ -116,13 +114,15 @@ void GroupSignal::paint_mid(QPainter &p, int left, int right, QColor fore, QColo
 }
 
 void GroupSignal::paint_trace(QPainter &p,
-    const boost::shared_ptr<pv::data::GroupSnapshot> &snapshot,
+    const pv::data::GroupSnapshot *snapshot,
 	int y, int left, const int64_t start, const int64_t end,
 	const double pixels_offset, const double samples_per_pixel)
 {
 	const int64_t sample_count = end - start;
 
-    const uint16_t *samples = snapshot->get_samples(start, end);
+	pv::data::GroupSnapshot *pshot = const_cast<pv::data::GroupSnapshot*>(snapshot);
+
+    const uint16_t *samples = pshot->get_samples(start, end);
 	assert(samples);
 
 	p.setPen(_colour);
@@ -144,7 +144,7 @@ void GroupSignal::paint_trace(QPainter &p,
 }
 
 void GroupSignal::paint_envelope(QPainter &p,
-    const boost::shared_ptr<pv::data::GroupSnapshot> &snapshot,
+    const pv::data::GroupSnapshot *snapshot,
 	int y, int left, const int64_t start, const int64_t end,
 	const double pixels_offset, const double samples_per_pixel)
 {
@@ -152,7 +152,9 @@ void GroupSignal::paint_envelope(QPainter &p,
     using pv::data::GroupSnapshot;
 
     GroupSnapshot::EnvelopeSection e;
-	snapshot->get_envelope_section(e, start, end, samples_per_pixel);
+
+	pv::data::GroupSnapshot *pshot = const_cast<pv::data::GroupSnapshot*>(snapshot);
+	pshot->get_envelope_section(e, start, end, samples_per_pixel);
 
 	if (e.length < 2)
 		return;
diff --git a/DSView/pv/view/groupsignal.h b/DSView/pv/view/groupsignal.h
index 76f1a20f..a86c388e 100755
--- a/DSView/pv/view/groupsignal.h
+++ b/DSView/pv/view/groupsignal.h
@@ -26,8 +26,7 @@
 #include "signal.h"
 #include "../data/groupsnapshot.h"
 
-#include <list>
-#include <boost/shared_ptr.hpp>
+#include <list> 
 
 namespace pv {
 
@@ -55,7 +54,7 @@ private:
 
 public:
     GroupSignal(QString name,
-        boost::shared_ptr<pv::data::Group> data,
+        pv::data::Group *data,
                 std::list<int> probe_index_list, int group_index);
 
     virtual ~GroupSignal();
@@ -63,9 +62,9 @@ public:
     /**
      * Returns true if the trace is visible and enabled.
      */
-    bool enabled() const;
+    bool enabled();
 
-    boost::shared_ptr<pv::data::SignalData> data() const;
+    pv::data::SignalData* data();
 
 	void set_scale(float scale);
 
@@ -84,17 +83,17 @@ protected:
 
 private:
 	void paint_trace(QPainter &p,
-        const boost::shared_ptr<pv::data::GroupSnapshot> &snapshot,
+        const pv::data::GroupSnapshot *snapshot,
 		int y, int left, const int64_t start, const int64_t end,
 		const double pixels_offset, const double samples_per_pixel);
 
 	void paint_envelope(QPainter &p,
-        const boost::shared_ptr<pv::data::GroupSnapshot> &snapshot,
+        const pv::data::GroupSnapshot *snapshot,
 		int y, int left, const int64_t start, const int64_t end,
 		const double pixels_offset, const double samples_per_pixel);
 
 private:
-    boost::shared_ptr<pv::data::Group> _data;
+    pv::data::Group *_data;
 	float _scale;
 };
 
diff --git a/DSView/pv/view/header.cpp b/DSView/pv/view/header.cpp
index c5c44314..e5244e67 100755
--- a/DSView/pv/view/header.cpp
+++ b/DSView/pv/view/header.cpp
@@ -99,13 +99,10 @@ int Header::get_nameEditWidth()
         return 0;
 }
 
-boost::shared_ptr<pv::view::Trace> Header::get_mTrace(
-    int &action,
-    const QPoint &pt)
+pv::view::Trace* Header::get_mTrace(int &action, const QPoint &pt)
 {
     const int w = width();
-    const vector< boost::shared_ptr<Trace> > traces(
-        _view.get_traces(ALL_VIEW));
+    const auto &traces = _view.get_traces(ALL_VIEW);
 
     for(auto &t : traces)
     {
@@ -115,7 +112,7 @@ boost::shared_ptr<pv::view::Trace> Header::get_mTrace(
             return t;
     }
 
-    return boost::shared_ptr<Trace>();
+    return NULL;
 }
 
 void Header::paintEvent(QPaintEvent*)
@@ -128,10 +125,7 @@ void Header::paintEvent(QPaintEvent*)
     style()->drawPrimitive(QStyle::PE_Widget, &o, &painter, this);
 
 	const int w = width();
-    const vector< boost::shared_ptr<Trace> > traces(
-        _view.get_traces(ALL_VIEW));
-
-  //  auto num = traces.size();
+    const auto &traces = _view.get_traces(ALL_VIEW);
 
     const bool dragging = !_drag_traces.empty();
     QColor fore(QWidget::palette().color(QWidget::foregroundRole()));
@@ -140,7 +134,6 @@ void Header::paintEvent(QPaintEvent*)
     for(auto &t : traces)
 	{
         assert(t);
-       // auto ptr = t.get();
         t->paint_label(painter, w, dragging ? QPoint(-1, -1) : _mouse_point, fore);
 	}
 
@@ -151,8 +144,7 @@ void Header::mouseDoubleClickEvent(QMouseEvent *event)
 {
     assert(event);
 
-    const vector< boost::shared_ptr<Trace> > traces(
-        _view.get_traces(ALL_VIEW));
+    const auto  &traces = _view.get_traces(ALL_VIEW);
 
     if (event->button() & Qt::LeftButton) {
         _mouse_down_point = event->pos();
@@ -175,8 +167,7 @@ void Header::mousePressEvent(QMouseEvent *event)
 {
 	assert(event);
 
-    const vector< boost::shared_ptr<Trace> > traces(
-        _view.get_traces(ALL_VIEW));
+    const auto &traces = _view.get_traces(ALL_VIEW);
     int action;
     const bool instant = _view.session().get_instant();
     if (instant && _view.session().get_capture_state() == SigSession::Running) {
@@ -193,8 +184,7 @@ void Header::mousePressEvent(QMouseEvent *event)
                     make_pair(t, t->get_v_offset()));
 
         // Select the Trace if it has been clicked
-        const boost::shared_ptr<Trace> mTrace =
-            get_mTrace(action, event->pos());
+        const auto mTrace = get_mTrace(action, event->pos());
         if (action == Trace::COLOR && mTrace) {
             _colorFlag = true;
         } else if (action == Trace::NAME && mTrace) {
@@ -229,8 +219,7 @@ void Header::mouseReleaseEvent(QMouseEvent *event)
 
     // judge for color / name / trigger / move
     int action;
-    const boost::shared_ptr<Trace> mTrace =
-        get_mTrace(action, event->pos());
+    const auto mTrace = get_mTrace(action, event->pos());
     if (mTrace){
         if (action == Trace::COLOR && _colorFlag) {
             _context_trace = mTrace;
@@ -247,10 +236,11 @@ void Header::mouseReleaseEvent(QMouseEvent *event)
         _view.signals_changed();
         _view.set_all_update(true);
 
-        const vector< boost::shared_ptr<Trace> > traces(
-            _view.get_traces(ALL_VIEW));
-        for(auto &t : traces)
+        const auto &traces = _view.get_traces(ALL_VIEW);
+
+        for(auto &t : traces){
             t->select(false);
+        }            
     }
 
     _colorFlag = false;
@@ -265,8 +255,7 @@ void Header::wheelEvent(QWheelEvent *event)
     assert(event);
 
     if (event->orientation() == Qt::Vertical) {
-        const vector< boost::shared_ptr<Trace> > traces(
-            _view.get_traces(ALL_VIEW));
+        const auto &traces = _view.get_traces(ALL_VIEW);
         // Vertical scrolling
         double shift = 0;
         #ifdef Q_OS_DARWIN
@@ -327,29 +316,27 @@ void Header::mouseMoveEvent(QMouseEvent *event)
     if (!_drag_traces.empty()) {
 		const int delta = event->pos().y() - _mouse_down_point.y();
 
-        for (std::list<std::pair<boost::weak_ptr<Trace>,
-            int> >::iterator i = _drag_traces.begin();
-            i != _drag_traces.end(); i++) {
-            const boost::shared_ptr<Trace> sig((*i).first);
+        for (auto i = _drag_traces.begin(); i != _drag_traces.end(); i++) {
+            const auto sig = (*i).first;
 			if (sig) {
                 int y = (*i).second + delta;
                 if (sig->get_type() == SR_CHANNEL_DSO) {
-                    boost::shared_ptr<DsoSignal> dsoSig;
-                    if ((dsoSig = dynamic_pointer_cast<DsoSignal>(sig))) {
+                    DsoSignal *dsoSig = NULL;
+                    if ((dsoSig = dynamic_cast<DsoSignal*>(sig))) {
                         dsoSig->set_zero_vpos(y);
                         _moveFlag = true;
                         traces_moved();
                     }
                 } else if (sig->get_type() == SR_CHANNEL_MATH) {
-                    boost::shared_ptr<MathTrace> mathTrace;
-                    if ((mathTrace = dynamic_pointer_cast<MathTrace>(sig))) {
+                    MathTrace *mathTrace = NULL;
+                    if ((mathTrace = dynamic_cast<MathTrace*>(sig))) {
                        mathTrace->set_zero_vpos(y);
                        _moveFlag = true;
                        traces_moved();
                     }
                  } else if (sig->get_type() == SR_CHANNEL_ANALOG) {
-                    boost::shared_ptr<AnalogSignal> analogSig;
-                    if ((analogSig = dynamic_pointer_cast<AnalogSignal>(sig))) {
+                    AnalogSignal *analogSig = NULL;
+                    if ((analogSig = dynamic_cast<AnalogSignal*>(sig))) {
                         analogSig->set_zero_vpos(y);
                         _moveFlag = true;
                         traces_moved();
@@ -384,7 +371,7 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
 
     int action;
 
-    const boost::shared_ptr<Trace> t = get_mTrace(action, _mouse_point);
+    const auto t = get_mTrace(action, _mouse_point);
 
     if (!t || !t->selected() || action != Trace::LABEL)
         return;
@@ -400,12 +387,12 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
 
 //    _context_trace = t;
 //    menu.exec(event->globalPos());
-//    _context_trace.reset();
+//    _context_trace.r-eset();
 }
 
 void Header::on_action_set_name_triggered()
 {
-    boost::shared_ptr<view::Trace> context_Trace = _context_trace;
+    auto context_Trace = _context_trace;
     if (!context_Trace)
 		return;
 
diff --git a/DSView/pv/view/header.h b/DSView/pv/view/header.h
index 1dc83c01..cf7741e4 100755
--- a/DSView/pv/view/header.h
+++ b/DSView/pv/view/header.h
@@ -24,9 +24,6 @@
 #ifndef DSVIEW_PV_VIEW_HEADER_H
 #define DSVIEW_PV_VIEW_HEADER_H
 
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
 #include <list>
 #include <utility>
 
@@ -49,9 +46,7 @@ public:
 	Header(View &parent);
 
 private:
-    boost::shared_ptr<pv::view::Trace> get_mTrace(
-        int &action,
-		const QPoint &pt);
+    pv::view::Trace* get_mTrace(int &action, const QPoint &pt);
 
 private:
     void changeEvent(QEvent *event);
@@ -100,10 +95,9 @@ private:
 
     QLineEdit *nameEdit;
 
-    std::list<std::pair<boost::weak_ptr<Trace>, int> >
-        _drag_traces;
+    std::list<std::pair<Trace*, int> > _drag_traces;
 
-    boost::shared_ptr<Trace> _context_trace;
+    Trace *_context_trace;
 
     QAction *_action_add_group;
     QAction *_action_del_group;
diff --git a/DSView/pv/view/lissajoustrace.cpp b/DSView/pv/view/lissajoustrace.cpp
index f1d307cc..5e091820 100755
--- a/DSView/pv/view/lissajoustrace.cpp
+++ b/DSView/pv/view/lissajoustrace.cpp
@@ -42,7 +42,7 @@ namespace pv {
 namespace view {
 
 LissajousTrace::LissajousTrace(bool enable,
-                     boost::shared_ptr<data::Dso> data,
+                     data::Dso *data,
                      int xIndex, int yIndex, int percent):
     Trace("Lissajous", xIndex, SR_CHANNEL_LISSAJOUS),
     _data(data),
@@ -58,7 +58,7 @@ LissajousTrace::~LissajousTrace()
 {
 }
 
-bool LissajousTrace::enabled() const
+bool LissajousTrace::enabled()
 {
     return _enable;
 }
@@ -68,27 +68,27 @@ void LissajousTrace::set_enable(bool enable)
     _enable = enable;
 }
 
-int LissajousTrace::xIndex() const
+int LissajousTrace::xIndex()
 {
     return _xIndex;
 }
 
-int LissajousTrace::yIndex() const
+int LissajousTrace::yIndex()
 {
     return _yIndex;
 }
 
-int LissajousTrace::percent() const
+int LissajousTrace::percent()
 {
     return _percent;
 }
 
-boost::shared_ptr<pv::data::Dso> LissajousTrace::get_data() const
+pv::data::Dso* LissajousTrace::get_data()
 {
     return _data;
 }
 
-void LissajousTrace::set_data(boost::shared_ptr<data::Dso> data)
+void LissajousTrace::set_data(data::Dso *data)
 {
     _data = data;
 }
@@ -151,12 +151,11 @@ void LissajousTrace::paint_mid(QPainter &p, int left, int right, QColor fore, QC
     assert(right >= left);
 
     if (enabled()) {
-        const deque< boost::shared_ptr<pv::data::DsoSnapshot> > &snapshots =
-            _data->get_snapshots();
+        const auto &snapshots = _data->get_snapshots();
         if (snapshots.empty())
             return;
-        const boost::shared_ptr<pv::data::DsoSnapshot> &snapshot =
-            snapshots.front();
+
+        auto snapshot = snapshots.front();
         if (snapshot->empty())
             return;
 
diff --git a/DSView/pv/view/lissajoustrace.h b/DSView/pv/view/lissajoustrace.h
index f5245d30..5a038a33 100755
--- a/DSView/pv/view/lissajoustrace.h
+++ b/DSView/pv/view/lissajoustrace.h
@@ -24,9 +24,7 @@
 #define DSVIEW_PV_LISSAJOUSTRACE_H
 
 #include "trace.h"
-
-#include <boost/shared_ptr.hpp>
-
+  
 namespace pv {
 
 namespace data {
@@ -48,20 +46,19 @@ private:
     static const int DIV_NUM = 10; 
 
 public:
-    LissajousTrace(bool enable,
-                   boost::shared_ptr<pv::data::Dso> data,
+    LissajousTrace(bool enable, pv::data::Dso *data,
                    int xIndex, int yIndex, int percent);
 
     virtual ~LissajousTrace();
 
-    bool enabled() const;
+    bool enabled();
     void set_enable(bool enable);
-    int xIndex() const;
-    int yIndex() const;
-    int percent() const;
+    int xIndex();
+    int yIndex();
+    int percent();
 
-    boost::shared_ptr<pv::data::Dso> get_data() const;
-    void set_data(boost::shared_ptr<pv::data::Dso> data);
+    pv::data::Dso* get_data();
+    void set_data(pv::data::Dso* data);
 
     int rows_size();
 
@@ -92,7 +89,7 @@ public:
     void paint_label(QPainter &p, int right, const QPoint pt, QColor fore);
 
 private:
-    boost::shared_ptr<pv::data::Dso> _data;
+    pv::data::Dso *_data;
 
     bool _enable;
     int _xIndex;
diff --git a/DSView/pv/view/logicsignal.cpp b/DSView/pv/view/logicsignal.cpp
index e336dc4a..87f9fb93 100755
--- a/DSView/pv/view/logicsignal.cpp
+++ b/DSView/pv/view/logicsignal.cpp
@@ -46,7 +46,7 @@ const int LogicSignal::StateHeight = 12;
 const int LogicSignal::StateRound = 5;
 
 LogicSignal::LogicSignal(DevInst *dev_inst,
-                         boost::shared_ptr<data::Logic> data,
+                         data::Logic *data,
                          sr_channel *probe) :
     Signal(dev_inst, probe),
     _data(data),
@@ -54,10 +54,10 @@ LogicSignal::LogicSignal(DevInst *dev_inst,
 {
 }
 
-LogicSignal::LogicSignal(boost::shared_ptr<view::LogicSignal> s,
-                         boost::shared_ptr<pv::data::Logic> data,
+LogicSignal::LogicSignal(view::LogicSignal *s,
+                         data::Logic *data,
                          sr_channel *probe) :
-    Signal(*s.get(), probe),
+    Signal(*s, probe),
     _data(data),
     _trig(s->get_trig())
 {
@@ -69,22 +69,22 @@ LogicSignal::~LogicSignal()
     _cur_pulses.clear();
 }
 
-const sr_channel* LogicSignal::probe() const
+const sr_channel* LogicSignal::probe()
 {
     return _probe;
 }
 
-boost::shared_ptr<pv::data::SignalData> LogicSignal::data() const
+pv::data::SignalData* LogicSignal::data()
 {
     return _data;
 }
 
-boost::shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
+pv::data::Logic* LogicSignal::logic_data()
 {
     return _data;
 }
 
-LogicSignal::LogicSetRegions LogicSignal::get_trig() const
+LogicSignal::LogicSetRegions LogicSignal::get_trig()
 {
     return _trig;
 }
@@ -137,14 +137,12 @@ void LogicSignal::paint_mid(QPainter &p, int left, int right, QColor fore, QColo
     const int high_offset = y - _totalHeight + 0.5f;
     const int low_offset = y + 0.5f;
 
-	const deque< boost::shared_ptr<pv::data::LogicSnapshot> > &snapshots =
-		_data->get_snapshots();
+	const auto &snapshots =_data->get_snapshots();
     double samplerate = _data->samplerate();
     if (snapshots.empty() || samplerate == 0)
 		return;
-
-	const boost::shared_ptr<pv::data::LogicSnapshot> &snapshot =
-		snapshots.front();
+  
+    auto snapshot =  const_cast<data::LogicSnapshot*>(snapshots.front());
     if (snapshot->empty() || !snapshot->has_data(_probe->index))
         return;
 
@@ -202,7 +200,7 @@ void LogicSignal::paint_mid(QPainter &p, int left, int right, QColor fore, QColo
 }
 
 void LogicSignal::paint_caps(QPainter &p, QLineF *const lines,
-    vector< pair<uint64_t, bool> > &edges, bool level,
+    std::vector< pair<uint64_t, bool> > &edges, bool level,
 	double samples_per_pixel, double pixels_offset, float x_offset,
 	float y_offset)
 {
@@ -210,7 +208,7 @@ void LogicSignal::paint_caps(QPainter &p, QLineF *const lines,
 
     uint64_t curX = 0;
     uint64_t nxtX = 0;
-	for (vector<pv::data::LogicSnapshot::EdgePair>::const_iterator i =
+	for (std::vector<pv::data::LogicSnapshot::EdgePair>::const_iterator i =
 		edges.begin(); i != (edges.end() - 1); i++)
 		if ((*i).second == level) {
             curX = ((*i).first / samples_per_pixel -
@@ -289,17 +287,15 @@ void LogicSignal::paint_type_options(QPainter &p, int right, const QPoint pt, QC
                edgeTrig_rect.right() - 5, edgeTrig_rect.bottom() - 5);
 }
 
-bool LogicSignal::measure(const QPointF &p, uint64_t &index0, uint64_t &index1, uint64_t &index2) const
+bool LogicSignal::measure(const QPointF &p, uint64_t &index0, uint64_t &index1, uint64_t &index2)
 {
     const float gap = abs(p.y() - get_y());
     if (gap < get_totalHeight() * 0.5) {
-        const deque< boost::shared_ptr<pv::data::LogicSnapshot> > &snapshots =
-            _data->get_snapshots();
+        const auto &snapshots =_data->get_snapshots();
         if (snapshots.empty())
             return false;
 
-        const boost::shared_ptr<pv::data::LogicSnapshot> &snapshot =
-            snapshots.front();
+        const auto snapshot = snapshots.front();
         if (snapshot->empty() || !snapshot->has_data(_probe->index))
             return false;
 
@@ -343,18 +339,16 @@ bool LogicSignal::measure(const QPointF &p, uint64_t &index0, uint64_t &index1,
     return false;
 }
 
-bool LogicSignal::edge(const QPointF &p, uint64_t &index, int radius) const
+bool LogicSignal::edge(const QPointF &p, uint64_t &index, int radius)
 {
     uint64_t pre_index, nxt_index;
     const float gap = abs(p.y() - get_y());
     if (gap < get_totalHeight() * 0.5) {
-        const deque< boost::shared_ptr<pv::data::LogicSnapshot> > &snapshots =
-            _data->get_snapshots();
+        const auto &snapshots = _data->get_snapshots();
         if (snapshots.empty())
             return false;
 
-        const boost::shared_ptr<pv::data::LogicSnapshot> &snapshot =
-            snapshots.front();
+        const auto snapshot = snapshots.front();
         if (snapshot->empty() || !snapshot->has_data(_probe->index))
             return false;
 
@@ -397,7 +391,7 @@ bool LogicSignal::edge(const QPointF &p, uint64_t &index, int radius) const
     return false;
 }
 
-bool LogicSignal::edges(const QPointF &p, uint64_t start, uint64_t &rising, uint64_t &falling) const
+bool LogicSignal::edges(const QPointF &p, uint64_t start, uint64_t &rising, uint64_t &falling)
 {
     uint64_t end;
     const float gap = abs(p.y() - get_y());
@@ -408,15 +402,13 @@ bool LogicSignal::edges(const QPointF &p, uint64_t start, uint64_t &rising, uint
     return false;
 }
 
-bool LogicSignal::edges(uint64_t end, uint64_t start, uint64_t &rising, uint64_t &falling) const
+bool LogicSignal::edges(uint64_t end, uint64_t start, uint64_t &rising, uint64_t &falling)
 {
-    const deque< boost::shared_ptr<pv::data::LogicSnapshot> > &snapshots =
-        _data->get_snapshots();
+    const auto &snapshots = _data->get_snapshots();
     if (snapshots.empty())
         return false;
 
-    const boost::shared_ptr<pv::data::LogicSnapshot> &snapshot =
-        snapshots.front();
+    const auto snapshot = snapshots.front();
     if (snapshot->empty() || !snapshot->has_data(_probe->index))
         return false;
 
diff --git a/DSView/pv/view/logicsignal.h b/DSView/pv/view/logicsignal.h
index d2159eb5..931c0df6 100755
--- a/DSView/pv/view/logicsignal.h
+++ b/DSView/pv/view/logicsignal.h
@@ -26,9 +26,7 @@
 
 #include "signal.h"
 
-#include <vector>
-
-#include <boost/shared_ptr.hpp>
+#include <vector> 
 
 namespace pv {
 
@@ -66,26 +64,22 @@ public:
     };
 
 public:
-    LogicSignal(DevInst *dev_inst,
-                boost::shared_ptr<pv::data::Logic> data,
-                sr_channel *probe);
+    LogicSignal(DevInst *dev_inst, data::Logic* data, sr_channel *probe);
 
-    LogicSignal(boost::shared_ptr<view::LogicSignal> s,
-                boost::shared_ptr<pv::data::Logic> data,
-                sr_channel *probe);
+    LogicSignal(view::LogicSignal*s, pv::data::Logic *data, sr_channel *probe);
 
 	virtual ~LogicSignal();
 
-    const sr_channel* probe() const;
+    const sr_channel* probe();
 
-    boost::shared_ptr<pv::data::SignalData> data() const;
+    pv::data::SignalData* data();
 
-    boost::shared_ptr<pv::data::Logic> logic_data() const;
+    pv::data::Logic* logic_data();
 
     /**
      *
      */
-    LogicSetRegions get_trig() const;
+    LogicSetRegions get_trig();
     void set_trig(int trig);
     bool commit_trig();
 
@@ -97,13 +91,13 @@ public:
 	 **/
     void paint_mid(QPainter &p, int left, int right, QColor fore, QColor back);
 
-    bool measure(const QPointF &p, uint64_t &index0, uint64_t &index1, uint64_t &index2) const;
+    bool measure(const QPointF &p, uint64_t &index0, uint64_t &index1, uint64_t &index2);
 
-    bool edge(const QPointF &p, uint64_t &index, int radius) const;
+    bool edge(const QPointF &p, uint64_t &index, int radius);
 
-    bool edges(const QPointF &p, uint64_t start, uint64_t &rising, uint64_t &falling) const;
+    bool edges(const QPointF &p, uint64_t start, uint64_t &rising, uint64_t &falling);
 
-    bool edges(uint64_t end, uint64_t start, uint64_t &rising, uint64_t &falling) const;
+    bool edges(uint64_t end, uint64_t start, uint64_t &rising, uint64_t &falling);
 
     bool mouse_press(int right, const QPoint pt);
 
@@ -122,7 +116,7 @@ private:
 		float x_offset, float y_offset);
 
 private:
-	boost::shared_ptr<pv::data::Logic> _data;
+	pv::data::Logic* _data;
     std::vector< std::pair<uint16_t, bool> > _cur_edges;
     std::vector<std::pair<bool, bool>> _cur_pulses;
     LogicSetRegions _trig;
diff --git a/DSView/pv/view/mathtrace.cpp b/DSView/pv/view/mathtrace.cpp
index a61db919..c8f6753c 100755
--- a/DSView/pv/view/mathtrace.cpp
+++ b/DSView/pv/view/mathtrace.cpp
@@ -36,16 +36,14 @@
 #include <QDebug>
 #include <QTimer>
 
-using namespace boost;
 using namespace std;
 
 namespace pv {
 namespace view {
 
-MathTrace::MathTrace(bool enable,
-                     boost::shared_ptr<data::MathStack> math_stack,
-                     boost::shared_ptr<view::DsoSignal> dsoSig1,
-                     boost::shared_ptr<view::DsoSignal> dsoSig2):
+MathTrace::MathTrace(bool enable,data::MathStack *math_stack,
+                     view::DsoSignal *dsoSig1,
+                     view::DsoSignal *dsoSig2):
     Trace("M", dsoSig1->get_index(), SR_CHANNEL_MATH),
     _math_stack(math_stack),
     _dsoSig1(dsoSig1),
@@ -71,7 +69,7 @@ MathTrace::~MathTrace()
 {
 }
 
-bool MathTrace::enabled() const
+bool MathTrace::enabled()
 {
     return _enable;
 }
@@ -81,12 +79,12 @@ void MathTrace::set_enable(bool enable)
     _enable = enable;
 }
 
-int MathTrace::src1() const
+int MathTrace::src1()
 {
     return _dsoSig1->get_index();
 }
 
-int MathTrace::src2() const
+int MathTrace::src2()
 {
     return _dsoSig2->get_index();
 }
@@ -96,7 +94,7 @@ float MathTrace::get_scale()
     return _scale;
 }
 
-int MathTrace::get_name_width() const
+int MathTrace::get_name_width()
 {
     return 0;
 }
@@ -138,12 +136,12 @@ void MathTrace::go_vDialNext()
     }
 }
 
-uint64_t MathTrace::get_vDialValue() const
+uint64_t MathTrace::get_vDialValue()
 {
     return _vDial->get_value();
 }
 
-uint16_t MathTrace::get_vDialSel() const
+uint16_t MathTrace::get_vDialSel()
 {
     return _vDial->get_sel();
 }
@@ -159,7 +157,7 @@ void MathTrace::set_zero_vrate(double rate)
     _hw_offset = _zero_vrate * (_ref_max - _ref_min) + _ref_min;
 }
 
-int MathTrace::get_zero_vpos() const
+int MathTrace::get_zero_vpos()
 {
     return _zero_vrate * get_view_rect().height() + DsoSignal::UpMargin;
 }
@@ -177,7 +175,7 @@ void MathTrace::set_show(bool show)
     _show = show;
 }
 
-QRect MathTrace::get_view_rect() const
+QRect MathTrace::get_view_rect()
 {
     assert(_viewport);
     return QRect(0, DsoSignal::UpMargin,
@@ -426,7 +424,7 @@ void MathTrace::paint_hover_measure(QPainter &p, QColor fore, QColor back)
         p.drawText(hover_rect, Qt::AlignCenter | Qt::AlignTop | Qt::TextDontClip, hover_str);
     }
 
-    list<Cursor*>::iterator i = _view->get_cursorList().begin();
+    auto i = _view->get_cursorList().begin();
     while (i != _view->get_cursorList().end()) {
         float pt_value;
         const QPointF pt = get_point((*i)->index(), pt_value);
@@ -500,7 +498,7 @@ QString MathTrace::get_time(double t)
     return str;
 }
 
-const boost::shared_ptr<pv::data::MathStack>& MathTrace::get_math_stack() const
+pv::data::MathStack* MathTrace::get_math_stack()
 {
    return _math_stack;
 }
diff --git a/DSView/pv/view/mathtrace.h b/DSView/pv/view/mathtrace.h
index 3bcd9428..8eb6413b 100755
--- a/DSView/pv/view/mathtrace.h
+++ b/DSView/pv/view/mathtrace.h
@@ -23,9 +23,7 @@
 #ifndef DSVIEW_PV_MATHTRACE_H
 #define DSVIEW_PV_MATHTRACE_H
 
-#include "trace.h"
-
-#include <boost/shared_ptr.hpp>
+#include "trace.h" 
 
 namespace pv {
 
@@ -52,15 +50,15 @@ public:
     };
 
 public:
-    MathTrace(bool enable, boost::shared_ptr<pv::data::MathStack> math_stack,
-              boost::shared_ptr<view::DsoSignal> dsoSig1,
-              boost::shared_ptr<view::DsoSignal> dsoSig2);
+    MathTrace(bool enable, pv::data::MathStack *math_stack,
+              view::DsoSignal *dsoSig1,
+              view::DsoSignal *dsoSig2);
 
     virtual ~MathTrace();
 
     float get_scale();
 
-    int get_name_width() const;
+    int get_name_width();
 
     /**
      *
@@ -68,18 +66,18 @@ public:
     void update_vDial();
     void go_vDialPre();
     void go_vDialNext();
-    uint64_t get_vDialValue() const;
-    uint16_t get_vDialSel() const;
+    uint64_t get_vDialValue();
+    uint16_t get_vDialSel();
 
-    bool enabled() const;
+    bool enabled();
     void set_enable(bool enable);
     void set_show(bool show);
 
-    int get_zero_vpos() const;
+    int get_zero_vpos();
     void set_zero_vpos(int pos);
 
-    int src1() const;
-    int src2() const;
+    int src1();
+    int src2();
 
     /**
       *
@@ -125,13 +123,13 @@ public:
      **/
     void paint_fore(QPainter &p, int left, int right, QColor fore, QColor back);
 
-    QRect get_view_rect() const;
+    QRect get_view_rect();
 
     QRectF get_rect(MathSetRegions type, int y, int right);
 
     bool mouse_wheel(int right, const QPoint pt, const int shift);
 
-    const boost::shared_ptr<pv::data::MathStack>& get_math_stack() const;
+    pv::data::MathStack* get_math_stack();
 
 protected:
     void paint_type_options(QPainter &p, int right, const QPoint pt, QColor fore);
@@ -148,9 +146,9 @@ private:
     void paint_hover_measure(QPainter &p, QColor fore, QColor back);
 
 private:
-    boost::shared_ptr<pv::data::MathStack> _math_stack;
-    boost::shared_ptr<view::DsoSignal> _dsoSig1;
-    boost::shared_ptr<view::DsoSignal> _dsoSig2;
+    pv::data::MathStack *_math_stack;
+    view::DsoSignal *_dsoSig1;
+    view::DsoSignal *_dsoSig2;
     bool _enable;
     bool _show;
 
diff --git a/DSView/pv/view/ruler.cpp b/DSView/pv/view/ruler.cpp
index 1108087b..41b9a98c 100755
--- a/DSView/pv/view/ruler.cpp
+++ b/DSView/pv/view/ruler.cpp
@@ -39,8 +39,7 @@
 #include <QPainter>
 #include <QTextStream>
 #include <QStyleOption>
-
-#include <boost/shared_ptr.hpp>
+ 
 
 using namespace boost;
 using namespace std;
@@ -219,7 +218,7 @@ void Ruler::mousePressEvent(QMouseEvent *event)
         bool visible;
         if (!_cursor_sel_visible & !_view.get_cursorList().empty()) {
             _view.show_cursors(true);
-            list<Cursor*>::iterator i = _view.get_cursorList().begin();
+            auto i = _view.get_cursorList().begin();
             while (i != _view.get_cursorList().end()) {
                 const QRect cursor_rect((*i)->get_label_rect(rect(), visible));
                 if ((*i)->get_close_rect(cursor_rect).contains(event->pos())) {
@@ -262,7 +261,7 @@ void Ruler::mouseReleaseEvent(QMouseEvent *event)
                         _view.show_cursors(true);
                         updatedCursor = true;
                     } else if (overCursor > 0) {
-                        list<Cursor*>::iterator i = _view.get_cursorList().begin();
+                        auto i = _view.get_cursorList().begin();
                         while (--overCursor != 0)
                                 i++;
                         (*i)->set_index(index);
@@ -304,7 +303,7 @@ void Ruler::mouseReleaseEvent(QMouseEvent *event)
             int overCursor;
             overCursor = in_cursor_sel_rect(event->pos());
             if (overCursor > 0) {
-                list<Cursor*>::iterator i = _view.get_cursorList().begin();
+                auto i = _view.get_cursorList().begin();
                 while (--overCursor != 0)
                         i++;
                 _view.del_cursor(*i);
@@ -430,7 +429,7 @@ void Ruler::draw_logic_tick_mark(QPainter &p)
 
     // Draw the cursors
     if (!_view.get_cursorList().empty()) {
-        list<Cursor*>::iterator i = _view.get_cursorList().begin();
+        auto i = _view.get_cursorList().begin();
         int index = 1;
         while (i != _view.get_cursorList().end()) {
             (*i)->paint_label(p, rect(), prefix, index, _view.session().get_capture_state() == SigSession::Stopped);
@@ -548,7 +547,7 @@ void Ruler::draw_osc_tick_mark(QPainter &p)
 
     // Draw the cursors
     if (!_view.get_cursorList().empty()) {
-        list<Cursor*>::iterator i = _view.get_cursorList().begin();
+        auto i = _view.get_cursorList().begin();
         int index = 1;
         while (i != _view.get_cursorList().end()) {
             (*i)->paint_label(p, rect(), prefix, index, _view.session().get_capture_state() == SigSession::Stopped);
@@ -613,7 +612,7 @@ void Ruler::draw_cursor_sel(QPainter &p)
 
     if (!_view.get_cursorList().empty()) {
         int index = 1;
-        list<Cursor*>::iterator i = _view.get_cursorList().begin();
+        auto i = _view.get_cursorList().begin();
         while (i != _view.get_cursorList().end()) {
             const QRectF cursorRect = get_cursor_sel_rect(index);
             p.setPen(QPen(Qt::black, 1, Qt::DotLine));
@@ -662,7 +661,7 @@ void Ruler::hover_point_changed()
 	update();
 }
 
-double Ruler::get_min_period() const
+double Ruler::get_min_period()
 {
     return _min_period / MinPeriodScale;
 }
diff --git a/DSView/pv/view/ruler.h b/DSView/pv/view/ruler.h
index 18b310c9..822c7d5f 100755
--- a/DSView/pv/view/ruler.h
+++ b/DSView/pv/view/ruler.h
@@ -69,7 +69,7 @@ public:
     void set_grabbed_cursor(TimeMarker* grabbed_marker);
     void rel_grabbed_cursor();
 
-    double get_min_period() const;
+    double get_min_period();
 
 private:
 	void paintEvent(QPaintEvent *event);
diff --git a/DSView/pv/view/selectableitem.cpp b/DSView/pv/view/selectableitem.cpp
index cc2b42cd..ed23e2ff 100755
--- a/DSView/pv/view/selectableitem.cpp
+++ b/DSView/pv/view/selectableitem.cpp
@@ -36,7 +36,7 @@ SelectableItem::SelectableItem() :
 {
 }
 
-bool SelectableItem::selected() const
+bool SelectableItem::selected()
 {
 	return _selected;
 }
diff --git a/DSView/pv/view/selectableitem.h b/DSView/pv/view/selectableitem.h
index 7859ee4e..4a23cc97 100755
--- a/DSView/pv/view/selectableitem.h
+++ b/DSView/pv/view/selectableitem.h
@@ -43,14 +43,14 @@ class SelectableItem : public QObject
 private:
 	static const int HighlightRadius;
 
-public:
+protected:
 	SelectableItem();
 
 public:
 	/**
 	 * Returns true if the signal has been selected by the user.
 	 */
-	bool selected() const;
+	bool selected();
 
 	/**
 	 * Selects or deselects the signal.
diff --git a/DSView/pv/view/signal.cpp b/DSView/pv/view/signal.cpp
index 3be6142d..23011a23 100755
--- a/DSView/pv/view/signal.cpp
+++ b/DSView/pv/view/signal.cpp
@@ -46,7 +46,7 @@ Signal::Signal(const Signal &s, sr_channel *probe) :
 {
 }
 
-bool Signal::enabled() const
+bool Signal::enabled()
 {
     return _probe->enabled;
 }
@@ -58,7 +58,7 @@ void Signal::set_name(QString name)
     _probe->name = g_strdup(name.toUtf8().data());
 }
 
-DevInst* Signal::get_device() const
+DevInst* Signal::get_device()
 {
     return _dev_inst;
 }
diff --git a/DSView/pv/view/signal.h b/DSView/pv/view/signal.h
index 1d3ed5ad..931d54b6 100755
--- a/DSView/pv/view/signal.h
+++ b/DSView/pv/view/signal.h
@@ -23,8 +23,7 @@
 
 #ifndef DSVIEW_PV_SIGNAL_H
 #define DSVIEW_PV_SIGNAL_H
-
-#include <boost/shared_ptr.hpp>
+ 
 
 #include <QColor>
 #include <QPainter>
@@ -69,12 +68,12 @@ protected:
     Signal(const Signal &s, sr_channel * const probe);
 
 public:
-    virtual boost::shared_ptr<pv::data::SignalData> data() const = 0;
+    virtual pv::data::SignalData* data() = 0;
 
     /**
      * Returns true if the trace is visible and enabled.
      */
-    bool enabled() const;
+    bool enabled();
 
     /**
      * Sets the name of the signal.
@@ -91,7 +90,7 @@ public:
 	 */
     //virtual void paint_label(QPainter &p, int right, bool hover, int action);
 
-    DevInst* get_device() const;
+    DevInst* get_device();
 
 protected:
     DevInst* _dev_inst;
diff --git a/DSView/pv/view/spectrumtrace.cpp b/DSView/pv/view/spectrumtrace.cpp
index bb0ffcb9..6f7ceba3 100755
--- a/DSView/pv/view/spectrumtrace.cpp
+++ b/DSView/pv/view/spectrumtrace.cpp
@@ -68,7 +68,7 @@ const int SpectrumTrace::HoverPointSize = 3;
 const double SpectrumTrace::VerticalRate = 1.0 / 2000.0;
 
 SpectrumTrace::SpectrumTrace(pv::SigSession *session,
-    boost::shared_ptr<pv::data::SpectrumStack> spectrum_stack, int index) :
+    pv::data::SpectrumStack *spectrum_stack, int index) :
     Trace("FFT("+QString::number(index)+")", index, SR_CHANNEL_FFT),
     _session(session),
     _spectrum_stack(spectrum_stack),
@@ -79,11 +79,11 @@ SpectrumTrace::SpectrumTrace(pv::SigSession *session,
     _offset(0)
 {
     _typeWidth = 0;
-    const vector< boost::shared_ptr<Signal> > sigs(_session->get_signals());
+    const auto &sigs = _session->get_signals();
     for(size_t i = 0; i < sigs.size(); i++) {
-        const boost::shared_ptr<view::Signal> s(sigs[i]);
+        const auto s = sigs[i];
         assert(s);
-        if (dynamic_pointer_cast<DsoSignal>(s) && index == s->get_index())
+        if (dynamic_cast<DsoSignal*>(s) && index == s->get_index())
             _colour = s->get_colour();
     }
 }
@@ -93,7 +93,7 @@ SpectrumTrace::~SpectrumTrace()
 
 }
 
-bool SpectrumTrace::enabled() const
+bool SpectrumTrace::enabled()
 {
     return _enable;
 }
@@ -103,7 +103,7 @@ void SpectrumTrace::set_enable(bool enable)
     _enable = enable;
 }
 
-int SpectrumTrace::view_mode() const
+int SpectrumTrace::view_mode()
 {
     return _view_mode;
 }
@@ -123,7 +123,7 @@ std::vector<QString> SpectrumTrace::get_view_modes_support()
     return modes;
 }
 
-const boost::shared_ptr<pv::data::SpectrumStack>& SpectrumTrace::get_spectrum_stack() const
+pv::data::SpectrumStack* SpectrumTrace::get_spectrum_stack()
 {
     return _spectrum_stack;
 }
@@ -160,7 +160,7 @@ void SpectrumTrace::set_offset(double delta)
     _view->update();
 }
 
-double SpectrumTrace::get_offset() const
+double SpectrumTrace::get_offset()
 {
     return _offset;
 }
@@ -173,7 +173,7 @@ void SpectrumTrace::set_scale(double scale)
     _view->update();
 }
 
-double SpectrumTrace::get_scale() const
+double SpectrumTrace::get_scale()
 {
     return _scale;
 }
@@ -183,7 +183,7 @@ void SpectrumTrace::set_dbv_range(int range)
     _dbv_range = range;
 }
 
-int SpectrumTrace::dbv_range() const
+int SpectrumTrace::dbv_range()
 {
     return _dbv_range;
 }
@@ -296,8 +296,8 @@ void SpectrumTrace::paint_mid(QPainter &p, int left, int right, QColor fore, QCo
         double vfactor = 0;
         
         for(auto &s : _session->get_signals()) {
-            boost::shared_ptr<DsoSignal> dsoSig;
-            if ((dsoSig = dynamic_pointer_cast<DsoSignal>(s))) {
+            DsoSignal *dsoSig = NULL;
+            if ((dsoSig = dynamic_cast<DsoSignal*>(s))) {
                 if(dsoSig->get_index() == _spectrum_stack->get_index()) {
                     vdiv = dsoSig->get_vDialValue();
                     vfactor = dsoSig->get_factor();
@@ -483,7 +483,7 @@ void SpectrumTrace::paint_type_options(QPainter &p, int right, const QPoint pt,
     (void)fore;
 }
 
-QRect SpectrumTrace::get_view_rect() const
+QRect SpectrumTrace::get_view_rect()
 {
     assert(_viewport);
     return QRect(0, UpMargin,
diff --git a/DSView/pv/view/spectrumtrace.h b/DSView/pv/view/spectrumtrace.h
index 293269ef..9c3f368b 100755
--- a/DSView/pv/view/spectrumtrace.h
+++ b/DSView/pv/view/spectrumtrace.h
@@ -25,8 +25,7 @@
 
 #include <list>
 #include <map>
-
-#include <boost/shared_ptr.hpp>
+ 
 
 struct srd_channel;
 
@@ -67,33 +66,32 @@ private:
     static const double VerticalRate;
 
 public:
-    SpectrumTrace(pv::SigSession *session,
-        boost::shared_ptr<pv::data::SpectrumStack> spectrum_stack, int index);
+    SpectrumTrace(pv::SigSession *session, pv::data::SpectrumStack *spectrum_stack, int index);
     ~SpectrumTrace();
 
-    bool enabled() const;
+    bool enabled();
     void set_enable(bool enable);
 
     void init_zoom();
     void zoom(double steps, int offset);
-    bool zoom_hit() const;
+    bool zoom_hit();
     void set_zoom_hit(bool hit);
 
     void set_offset(double delta);
-    double get_offset() const;
+    double get_offset();
 
     void set_scale(double scale);
-    double get_scale() const;
+    double get_scale();
 
     void set_dbv_range(int range);
-    int dbv_range() const;
+    int dbv_range();
     std::vector<int> get_dbv_ranges();
 
-    int view_mode() const;
+    int view_mode();
     void set_view_mode(unsigned int mode);
     std::vector<QString> get_view_modes_support();
 
-    const boost::shared_ptr<pv::data::SpectrumStack>& get_spectrum_stack() const;
+    pv::data::SpectrumStack* get_spectrum_stack();
 
     static QString format_freq(double freq, unsigned precision = Pricision);
 
@@ -123,7 +121,7 @@ public:
      **/
     void paint_fore(QPainter &p, int left, int right, QColor fore, QColor back);
 
-    QRect get_view_rect() const;
+    QRect get_view_rect();
 
 protected:
     void paint_type_options(QPainter &p, int right, const QPoint pt, QColor fore);
@@ -134,7 +132,7 @@ private slots:
 
 private:
     pv::SigSession *_session;
-    boost::shared_ptr<pv::data::SpectrumStack> _spectrum_stack;
+    pv::data::SpectrumStack *_spectrum_stack;
 
     bool _enable;
     int _view_mode;
diff --git a/DSView/pv/view/timemarker.cpp b/DSView/pv/view/timemarker.cpp
index f103eb7f..79a43707 100755
--- a/DSView/pv/view/timemarker.cpp
+++ b/DSView/pv/view/timemarker.cpp
@@ -48,7 +48,7 @@ TimeMarker::TimeMarker(const TimeMarker &s) :
 {
 }
 
-QColor TimeMarker::colour() const
+QColor TimeMarker::colour()
 {
     return _colour;
 }
@@ -58,7 +58,7 @@ void TimeMarker::set_colour(QColor color)
     _colour = color;
 }
 
-bool TimeMarker::grabbed() const
+bool TimeMarker::grabbed()
 {
     return _grabbed;
 }
@@ -67,7 +67,7 @@ void TimeMarker::set_grabbed(bool grabbed)
     _grabbed = grabbed;
 }
 
-uint64_t TimeMarker::index() const
+uint64_t TimeMarker::index()
 {
     return _index;
 }
diff --git a/DSView/pv/view/timemarker.h b/DSView/pv/view/timemarker.h
index abcb63d6..84cc0bcb 100755
--- a/DSView/pv/view/timemarker.h
+++ b/DSView/pv/view/timemarker.h
@@ -60,8 +60,8 @@ public:
 	/**
 	 * Gets the time of the marker.
 	 */
-	double time() const;
-    uint64_t index() const;
+	double time();
+    uint64_t index();
 
 	/**
 	 * Sets the time of the marker.
@@ -71,13 +71,13 @@ public:
     /**
      * Gets/Sets colour of the marker
      */
-    QColor colour() const;
+    QColor colour();
     void set_colour(QColor color);
 
     /*
      *
      */
-    bool grabbed() const;
+    bool grabbed();
     void set_grabbed(bool grabbed);
 
 	/**
@@ -93,7 +93,7 @@ public:
      * @param visible is this marker in visible area
 	 * @return Returns the label rectangle.
 	 */
-    virtual QRect get_label_rect(const QRect &rect, bool &visible, bool has_hoff = true) const = 0;
+    virtual QRect get_label_rect(const QRect &rect, bool &visible, bool has_hoff = true) = 0;
 
 	/**
 	 * Paints the marker's label to the ruler.
diff --git a/DSView/pv/view/trace.cpp b/DSView/pv/view/trace.cpp
index fca6addf..782dfa85 100755
--- a/DSView/pv/view/trace.cpp
+++ b/DSView/pv/view/trace.cpp
@@ -87,12 +87,12 @@ Trace::Trace(const Trace &t) :
 {
 }
 
-QString Trace::get_name() const
+QString Trace::get_name()
 {
 	return _name;
 }
 
-int Trace::get_name_width() const
+int Trace::get_name_width()
 {
     QFont font = QApplication::font();
     QFontMetrics fm(font);
@@ -105,7 +105,7 @@ void Trace::set_name(QString name)
 	_name = name;
 }
 
-QColor Trace::get_colour() const
+QColor Trace::get_colour()
 {
 	return _colour;
 }
@@ -115,7 +115,7 @@ void Trace::set_colour(QColor colour)
 	_colour = colour;
 }
 
-int Trace::get_v_offset() const
+int Trace::get_v_offset()
 {
 	return _v_offset;
 }
@@ -126,12 +126,12 @@ void Trace::set_v_offset(int v_offset)
 }
 
 
-int Trace::get_type() const
+int Trace::get_type()
 {
     return _type;
 }
 
-int Trace::get_index() const
+int Trace::get_index()
 {
     return _index_list.front();
 }
@@ -148,7 +148,7 @@ void Trace::set_index_list(std::list<int> index_list)
     _index_list = index_list;
 }
 
-int Trace::get_sec_index() const
+int Trace::get_sec_index()
 {
     return _sec_index;
 }
@@ -158,7 +158,7 @@ void Trace::set_sec_index(int sec_index)
     _sec_index = sec_index;
 }
 
-int Trace::get_old_v_offset() const
+int Trace::get_old_v_offset()
 {
     return _old_v_offset;
 }
@@ -168,12 +168,12 @@ void Trace::set_old_v_offset(int v_offset)
     _old_v_offset = v_offset;
 }
 
-int Trace::get_zero_vpos() const
+int Trace::get_zero_vpos()
 {
     return _v_offset;
 }
 
-int Trace::get_totalHeight() const
+int Trace::get_totalHeight()
 {
     return _totalHeight;
 }
@@ -195,7 +195,7 @@ void Trace::set_view(pv::view::View *view)
     connect(_view, SIGNAL(resize()), this, SLOT(resize()));
 }
 
-pv::view::View* Trace::get_view() const
+pv::view::View* Trace::get_view()
 {
     return _view;
 }
@@ -206,7 +206,7 @@ void Trace::set_viewport(pv::view::Viewport *viewport)
     _viewport = viewport;
 }
 
-pv::view::Viewport* Trace::get_viewport() const
+pv::view::Viewport* Trace::get_viewport()
 {
     return _viewport;
 }
@@ -399,18 +399,18 @@ void Trace::compute_text_size(QPainter &p)
         p.boundingRect(QRectF(), 0, "99").height());
 }
 
-QRect Trace::get_view_rect() const
+QRect Trace::get_view_rect()
 {
     assert(_view);
     return QRect(0, 0, _view->viewport()->width(), _view->viewport()->height());
 }
 
-int Trace::get_y() const
+int Trace::get_y()
 {
     return _v_offset;
 }
 
-QColor Trace::get_text_colour() const
+QColor Trace::get_text_colour()
 {
 	return (_colour.lightness() > 64) ? Qt::black : Qt::white;
 }
@@ -432,22 +432,22 @@ int Trace::rows_size()
     return 1;
 }
 
-int Trace::get_leftWidth() const
+int Trace::get_leftWidth()
 {
     return SquareWidth/2 + Margin;
 }
 
-int Trace::get_rightWidth() const
+int Trace::get_rightWidth()
 {
     return 2 * Margin + _typeWidth * SquareWidth + 1.5 * SquareWidth;
 }
 
-int Trace::get_headerHeight() const
+int Trace::get_headerHeight()
 {
     return SquareWidth;
 }
 
-QRectF Trace::get_rect(const char *s, int y, int right) const
+QRectF Trace::get_rect(const char *s, int y, int right)
 {
     const QSizeF color_size(get_leftWidth() - Margin, SquareWidth);
     const QSizeF name_size(right - get_leftWidth() - get_rightWidth(), SquareWidth);
diff --git a/DSView/pv/view/trace.h b/DSView/pv/view/trace.h
index 6c0ad638..e1b3ecfb 100755
--- a/DSView/pv/view/trace.h
+++ b/DSView/pv/view/trace.h
@@ -42,6 +42,7 @@ namespace view {
 class View;
 class Viewport;
 
+//base class
 class Trace : public SelectableItem
 {
 	Q_OBJECT
@@ -72,8 +73,8 @@ public:
 	/**
 	 * Gets the name of this signal.
 	 */
-	QString get_name() const;
-    virtual int get_name_width() const;
+	QString get_name();
+    virtual int get_name_width();
 
 	/**
 	 * Sets the name of the signal.
@@ -83,7 +84,7 @@ public:
 	/**
 	 * Get the colour of the signal.
 	 */
-	QColor get_colour() const;
+	QColor get_colour();
 
 	/**
 	 * Set the colour of the signal.
@@ -93,7 +94,7 @@ public:
 	/**
 	 * Gets the vertical layout offset of this signal.
 	 */
-	int get_v_offset() const;
+	int get_v_offset();
 
 	/**
 	 * Sets the vertical layout offset of this signal.
@@ -103,21 +104,21 @@ public:
     /**
      * Gets trace type
      */
-    int get_type() const;
+    int get_type();
 
     /**
      * Index process
      */
-    int get_index() const;
+    int get_index();
     std::list<int> &get_index_list();
     void set_index_list(std::list<int> index_list);
-    int get_sec_index() const;
+    int get_sec_index();
     void set_sec_index(int sec_index);
 
     /**
      * Gets the height of this signal.
      */
-    int get_totalHeight() const;
+    int get_totalHeight();
 
     /**
      * Sets the height of this signal.
@@ -127,31 +128,31 @@ public:
     /**
      * Geom
      */
-    int get_leftWidth() const;
-    int get_rightWidth() const;
-    int get_headerHeight() const;
+    int get_leftWidth();
+    int get_rightWidth();
+    int get_headerHeight();
 
     /**
      * Gets the old vertical layout offset of this signal.
      */
-    int get_old_v_offset() const;
+    int get_old_v_offset();
 
     /**
      * Sets the old vertical layout offset of this signal.
      */
     void set_old_v_offset(int v_offset);
 
-    virtual int get_zero_vpos() const;
+    virtual int get_zero_vpos();
 
 	/**
 	 * Returns true if the trace is visible and enabled.
 	 */
-	virtual bool enabled() const = 0;
+    virtual bool enabled() = 0;
 
 	virtual void set_view(pv::view::View *view);
-    pv::view::View* get_view() const;
+    pv::view::View* get_view();
     virtual void set_viewport(pv::view::Viewport *viewport);
-    pv::view::Viewport* get_viewport() const;
+    pv::view::Viewport* get_viewport();
 
     /**
      * Paints prepare
@@ -194,7 +195,7 @@ public:
 	/**
 	 * Gets the y-offset of the axis.
 	 */
-	int get_y() const;
+	int get_y();
 
     /**
      * Determines if a point is in the header rect.
@@ -222,11 +223,11 @@ public:
      * 	area.
      * @return Returns the rectangle of the signal label.
      */
-    QRectF get_rect(const char *s, int y, int right) const;
+    QRectF get_rect(const char *s, int y, int right);
 
     virtual int rows_size();
 
-    virtual QRect get_view_rect() const;
+    virtual QRect get_view_rect();
 
     virtual bool mouse_double_click(int right, const QPoint pt);
 
@@ -242,7 +243,7 @@ protected:
 	 * of the trace colour against a threshold to determine whether
 	 * white or black would be more visible.
 	 */
-	QColor get_text_colour() const;
+	QColor get_text_colour();
 
     /**
      * Paints optoins for different trace type.
diff --git a/DSView/pv/view/view.cpp b/DSView/pv/view/view.cpp
index 64220412..5ee7244f 100755
--- a/DSView/pv/view/view.cpp
+++ b/DSView/pv/view/view.cpp
@@ -23,8 +23,7 @@
 #include <assert.h>
 #include <limits.h>
 #include <math.h>
- 
- 
+
 #include <QEvent>
 #include <QMouseEvent>
 #include <QScrollBar>
@@ -49,7 +48,7 @@
 #include "pv/dialogs/calibration.h"
 #include "pv/dialogs/lissajousoptions.h"
 
-using namespace boost;
+
 using namespace std;
 
 namespace pv {
@@ -221,17 +220,17 @@ SigSession& View::session()
 	return *_session;
 }
 
-double View::scale() const
+double View::scale()
 {
 	return _scale;
 }
 
-int64_t View::offset() const
+int64_t View::offset()
 {
 	return _offset;
 }
 
-double View::trig_hoff() const
+double View::trig_hoff()
 {
     return _trig_hoff;
 }
@@ -241,12 +240,12 @@ void View::set_trig_hoff(double hoff)
     _trig_hoff = hoff;
 }
 
-double View::get_minscale() const
+double View::get_minscale()
 {
     return _minscale;
 }
 
-double View::get_maxscale() const
+double View::get_maxscale()
 {
     return _maxscale;
 }
@@ -323,7 +322,7 @@ bool View::zoom(double steps, int offset)
     }
 
     _offset = floor((_offset + offset) * (_preScale / _scale) - offset);
-    _offset = max(min(_offset, get_max_offset()), get_min_offset());
+    _offset = max (min(_offset, get_max_offset()), get_min_offset());
 
     if (_scale != _preScale || _offset != _preOffset) {
         _header->update();
@@ -374,20 +373,18 @@ void View::set_preScale_preOffset()
     set_scale_offset(_preScale, _preOffset);
 }
 
-vector< boost::shared_ptr<Trace> > View::get_traces(int type)
+std::vector<Trace*> View::get_traces(int type)
 {
     assert(_session);
 
-    auto array = _session->get_signals();
-    const vector< boost::shared_ptr<Signal> > sigs(array);
-    const vector< boost::shared_ptr<GroupSignal> > groups(_session->get_group_signals());
+    auto &sigs = _session->get_signals();
+    const auto &groups = _session->get_group_signals();
  
-    const vector< boost::shared_ptr<DecodeTrace> > decode_sigs(
-        _session->get_decode_signals());
+    const auto &decode_sigs = _session->get_decode_signals();
  
-    const vector< boost::shared_ptr<SpectrumTrace> > spectrums(_session->get_spectrum_traces());
+    const auto &spectrums = _session->get_spectrum_traces();
 
-    vector< boost::shared_ptr<Trace> > traces;
+    std::vector<Trace*> traces;
     for(auto &t : sigs) {
         if (type == ALL_VIEW || _trace_view_map[t->get_type()] == type)
             traces.push_back(t);
@@ -408,12 +405,12 @@ vector< boost::shared_ptr<Trace> > View::get_traces(int type)
             traces.push_back(t);
     }
 
-    boost::shared_ptr<LissajousTrace> lissajous = _session->get_lissajous_trace();
+    auto lissajous = _session->get_lissajous_trace();
     if (lissajous && lissajous->enabled() &&
         (type == ALL_VIEW || _trace_view_map[lissajous->get_type()] == type))
         traces.push_back(lissajous);
 
-    boost::shared_ptr<MathTrace> math = _session->get_math_trace();
+    auto math = _session->get_math_trace();
     if (math && math->enabled() &&
         (type == ALL_VIEW || _trace_view_map[math->get_type()] == type))
         traces.push_back(math);
@@ -422,30 +419,34 @@ vector< boost::shared_ptr<Trace> > View::get_traces(int type)
     return traces;
 }
 
-bool View::compare_trace_v_offsets(const boost::shared_ptr<Trace> &a,
-    const boost::shared_ptr<Trace> &b)
+bool View::compare_trace_v_offsets(const Trace *a,
+    const Trace *b)
 {
     assert(a);
     assert(b);
-    if (a->get_type() != b->get_type())
-        return a->get_type() < b->get_type();
-    else if (a->get_type() == SR_CHANNEL_DSO || a->get_type() == SR_CHANNEL_ANALOG)
-        return a->get_index() < b->get_index();
+
+    Trace *a1 = const_cast<Trace*>(a);
+    Trace *b1 = const_cast<Trace*>(b);
+
+    if (a1->get_type() != b1->get_type())
+        return a1->get_type() < b1->get_type();
+    else if (a1->get_type() == SR_CHANNEL_DSO || a1->get_type() == SR_CHANNEL_ANALOG)
+        return a1->get_index() < b1->get_index();
     else
-        return a->get_v_offset() < b->get_v_offset();
+        return a1->get_v_offset() < b1->get_v_offset();
 }
 
-bool View::cursors_shown() const
+bool View::cursors_shown()
 {
 	return _show_cursors;
 }
 
-bool View::trig_cursor_shown() const
+bool View::trig_cursor_shown()
 {
     return _show_trig_cursor;
 }
 
-bool View::search_cursor_shown() const
+bool View::search_cursor_shown()
 {
     return _show_search_cursor;
 }
@@ -578,14 +579,14 @@ bool View::get_search_hit()
     return _search_hit;
 }
 
-const QPoint& View::hover_point() const
+const QPoint& View::hover_point()
 {
 	return _hover_point;
 }
 
 void View::normalize_layout()
 {
-    vector< boost::shared_ptr<Trace> > traces(get_traces(ALL_VIEW));
+    auto traces = get_traces(ALL_VIEW);
 
 	int v_min = INT_MAX;
     for(auto &t : traces){
@@ -613,9 +614,9 @@ int View::get_signalHeight()
     return _signalHeight;
 }
 
-void View::get_scroll_layout(int64_t &length, int64_t &offset) const
+void View::get_scroll_layout(int64_t &length, int64_t &offset)
 {
-    const set< boost::shared_ptr<data::SignalData> > data_set = _session->get_data();
+    const auto data_set = _session->get_data();
     if (data_set.empty())
 		return;
 
@@ -695,8 +696,8 @@ void View::signals_changed()
     int total_rows = 0;
     int label_size = 0;
     uint8_t max_height = MaxHeightUnit;
-    vector< boost::shared_ptr<Trace> > time_traces;
-    vector< boost::shared_ptr<Trace> > fft_traces;
+    std::vector<Trace*> time_traces;
+    std::vector<Trace*> fft_traces;
 
     for(auto &t : get_traces(ALL_VIEW)) {
         if (_trace_view_map[t->get_type()] == TIME_VIEW)
@@ -736,7 +737,7 @@ void View::signals_changed()
     if (!time_traces.empty() && _time_viewport) {
         for(auto &t : time_traces) {
             assert(t);
-            if (dynamic_pointer_cast<DsoSignal>(t) ||
+            if (dynamic_cast<DsoSignal*>(t) ||
                 t->enabled())
                 total_rows += t->rows_size();
             if (t->rows_size() != 0)
@@ -779,13 +780,13 @@ void View::signals_changed()
             t->set_v_offset(next_v_offset + 0.5 * traceHeight + actualMargin);
             next_v_offset += traceHeight + 2 * actualMargin;
 
-            boost::shared_ptr<view::DsoSignal> dsoSig;
-            if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(t))) {
+            view::DsoSignal *dsoSig = NULL;
+            if ((dsoSig = dynamic_cast<view::DsoSignal*>(t))) {
                 dsoSig->set_scale(dsoSig->get_view_rect().height());
             }
 
-            boost::shared_ptr<view::AnalogSignal> analogSig;
-            if ((analogSig = dynamic_pointer_cast<view::AnalogSignal>(t))) {
+            view::AnalogSignal *analogSig = NULL;
+            if ((analogSig = dynamic_cast<view::AnalogSignal*>(t))) {
                 analogSig->set_scale(analogSig->get_totalHeight());
             }
         }
@@ -848,7 +849,7 @@ int View::headerWidth()
 {
     int headerWidth = _header->get_nameEditWidth();
 
-    const vector< boost::shared_ptr<Trace> > traces(get_traces(ALL_VIEW));
+    const auto &traces = get_traces(ALL_VIEW);
     if (!traces.empty()) {
         for(auto &t : traces)
             headerWidth = max(t->get_name_width() + t->get_leftWidth() + t->get_rightWidth(),
@@ -1013,7 +1014,7 @@ void View::set_cursor_middle(int index)
 {
     assert(index < (int)_cursorList.size());
 
-    list<Cursor*>::iterator i = _cursorList.begin();
+    auto i = _cursorList.begin();
     while (index-- != 0)
             i++;
     set_scale_offset(_scale, (*i)->index() / (_session->cur_snap_samplerate() * _scale) - (get_view_width() / 2));
@@ -1092,7 +1093,7 @@ void View::on_state_changed(bool stop)
 QRect View::get_view_rect()
 {
     if (_session->get_device()->dev_inst()->mode == DSO) {
-        const vector< boost::shared_ptr<Signal> > sigs(_session->get_signals());
+        const auto &sigs = _session->get_signals();
         for(auto &s : sigs) {
             return s->get_view_rect();
         }
@@ -1105,7 +1106,7 @@ int View::get_view_width()
 {
     int view_width = 0;
     if (_session->get_device()->dev_inst()->mode == DSO) {
-        const vector< boost::shared_ptr<Signal> > sigs(_session->get_signals());
+        const auto &sigs = _session->get_signals();
         for(auto &s : sigs) {
             view_width = max(view_width, s->get_view_rect().width());
         }
@@ -1120,7 +1121,7 @@ int View::get_view_height()
 {
     int view_height = 0;
     if (_session->get_device()->dev_inst()->mode == DSO) {
-        const vector< boost::shared_ptr<Signal> > sigs(_session->get_signals());
+        const auto &sigs = _session->get_signals();
         for(auto &s : sigs) {
             view_height = max(view_height, s->get_view_rect().height());
         }
@@ -1162,7 +1163,7 @@ void View::vDial_updated()
     if (_cali->isVisible()) {
         _cali->set_device(_session->get_device());
     }
-    boost::shared_ptr<view::MathTrace> math_trace = _session->get_math_trace();
+    auto math_trace = _session->get_math_trace();
     if (math_trace && math_trace->enabled()) {
         math_trace->update_vDial();
     }
@@ -1183,7 +1184,7 @@ void View::show_region(uint64_t start, uint64_t end, bool keep)
         update();
     } else if (_session->get_map_zoom() == 0) {
         const double ideal_scale = (end-start) * 2.0 / _session->cur_snap_samplerate() / get_view_width();
-        const double new_scale = max(min(ideal_scale, _maxscale), _minscale);
+        const double new_scale = max (min(ideal_scale, _maxscale), _minscale);
         const double new_off = (start + end)  * 0.5 / (_session->cur_snap_samplerate() * new_scale) - (get_view_width() / 2);
         set_scale_offset(new_scale, new_off);
     } else {
@@ -1254,7 +1255,7 @@ void View::set_capture_status()
     }
 }
 
-bool View::get_dso_trig_moved() const
+bool View::get_dso_trig_moved()
 {
     return _time_viewport->get_dso_trig_moved();
 }
@@ -1298,7 +1299,7 @@ ViewStatus* View::get_viewstatus()
     return _viewbottom;
 }
 
-bool View::back_ready() const
+bool View::back_ready()
 {
     return _back_ready;
 }
diff --git a/DSView/pv/view/view.h b/DSView/pv/view/view.h
index 306653d2..f5e8ea10 100755
--- a/DSView/pv/view/view.h
+++ b/DSView/pv/view/view.h
@@ -27,10 +27,7 @@
 #include <stdint.h>
 #include <set>
 #include <vector>
-
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
+   
 #include <QScrollArea>
 #include <QSizeF>
 #include <QDateTime>
@@ -112,18 +109,18 @@ public:
 	/**
 	 * Returns the view time scale in seconds per pixel.
 	 */
-	double scale() const;
+	double scale();
 
 	/**
      * Returns the pixels offset of the left edge of the view
 	 */
-    int64_t offset() const;
-	int v_offset() const;
+    int64_t offset();
+	int v_offset();
 
     /**
      * trigger position fix
      */
-    double trig_hoff() const;
+    double trig_hoff();
     void set_trig_hoff(double hoff);
 
     int64_t get_min_offset();
@@ -142,14 +139,14 @@ public:
     void set_scale_offset(double scale, int64_t offset);
     void set_preScale_preOffset();
 
-    std::vector< boost::shared_ptr<Trace> > get_traces(int type);
+    std::vector<Trace*> get_traces(int type);
 
 	/**
 	 * Returns true if cursors are displayed. false otherwise.
 	 */
-	bool cursors_shown() const;
-    bool trig_cursor_shown() const;
-    bool search_cursor_shown() const;
+	bool cursors_shown();
+    bool trig_cursor_shown();
+    bool search_cursor_shown();
 
     int get_spanY();
 
@@ -164,7 +161,7 @@ public:
 	 */
 	void show_cursors(bool show = true);
 
-    const QPoint& hover_point() const;
+    const QPoint& hover_point();
 
 	void normalize_layout();
 
@@ -200,8 +197,8 @@ public:
     /*
      *
      */
-    double get_minscale() const;
-    double get_maxscale() const;
+    double get_minscale();
+    double get_maxscale();
 
     void set_update(Viewport *viewport, bool need_update);
     void set_all_update(bool need_update);
@@ -225,14 +222,14 @@ public:
 
     void set_capture_status();
 
-    bool get_dso_trig_moved() const;
+    bool get_dso_trig_moved();
 
     ViewStatus* get_viewstatus();
 
     /*
      * back paint status
      */
-    bool back_ready() const;
+    bool back_ready();
     void set_back(bool ready);
 
     /*
@@ -261,15 +258,15 @@ signals:
     void auto_trig(int index);
 
 private: 
-    void get_scroll_layout(int64_t &length, int64_t &offset) const;
+    void get_scroll_layout(int64_t &length, int64_t &offset);
 	
 	void update_scroll();
 
     void update_margins();
 
     static bool compare_trace_v_offsets(
-        const boost::shared_ptr<pv::view::Trace> &a,
-        const boost::shared_ptr<pv::view::Trace> &b);
+        const pv::view::Trace *a,
+        const pv::view::Trace *b);
 
     void clear();
     void reconstruct();
diff --git a/DSView/pv/view/viewport.cpp b/DSView/pv/view/viewport.cpp
index 5c548e63..95a2ff46 100755
--- a/DSView/pv/view/viewport.cpp
+++ b/DSView/pv/view/viewport.cpp
@@ -40,8 +40,8 @@
 #include <QPainterPath> 
 #include <math.h> 
  
-
 #include "../config/appconfig.h"
+#include "../dsvdef.h"
 
 using namespace boost;
 using namespace std;
@@ -107,11 +107,11 @@ Viewport::Viewport(View &parent, View_type type) :
     connect(this, SIGNAL(customContextMenuRequested(const QPoint&)),this, SLOT(show_contextmenu(const QPoint&)));
 }
 
-int Viewport::get_total_height() const
+int Viewport::get_total_height()
 {
 	int h = 0;
 
-    const vector< boost::shared_ptr<Trace> > traces(_view.get_traces(_type));
+    const auto &traces = _view.get_traces(_type);
     for(auto &t : traces) {
         assert(t);
         h += (int)(t->get_totalHeight());
@@ -121,7 +121,7 @@ int Viewport::get_total_height() const
 	return h;
 }
 
-QPoint Viewport::get_mouse_point() const
+QPoint Viewport::get_mouse_point()
 {
     return _mouse_point;
 }
@@ -149,7 +149,8 @@ void Viewport::paintEvent(QPaintEvent *event)
     QColor back(QWidget::palette().color(QWidget::backgroundRole()));
     fore.setAlpha(View::ForeAlpha);
     _view.set_back(false);
-    const vector< boost::shared_ptr<Trace> > traces(_view.get_traces(_type));
+
+    const auto &traces = _view.get_traces(_type);
 
     for(auto &t : traces)
     {
@@ -202,15 +203,13 @@ void Viewport::paintEvent(QPaintEvent *event)
 
 void Viewport::paintSignals(QPainter &p, QColor fore, QColor back)
 {
-    const vector< boost::shared_ptr<Trace> > traces(_view.get_traces(_type));
+    const auto &traces = _view.get_traces(_type);
+
     if (_view.session().get_device()->dev_inst()->mode == LOGIC) {
 
         for(auto &t : traces)
         {
-            assert(t);
-           // auto ptr = t.get();
-           // ptr->paint_mid(p, 0, t->get_view_rect().right(), fore, back);
-         //   continue;
+            assert(t); 
 
             if (t->enabled())
                 t->paint_mid(p, 0, t->get_view_rect().right(), fore, back);
@@ -253,7 +252,7 @@ void Viewport::paintSignals(QPainter &p, QColor fore, QColor back)
     //const QRect xrect = QRect(rect().left(), rect().top(), _view.get_view_width(), rect().height());
     const QRect xrect = _view.get_view_rect();
     if (_view.cursors_shown() && _type == TIME_VIEW) {
-        list<Cursor*>::iterator i = _view.get_cursorList().begin();
+        auto i = _view.get_cursorList().begin();
         int index = 0;
         while (i != _view.get_cursorList().end()) {
             const int64_t cursorX = _view.index2pixel((*i)->index());
@@ -268,7 +267,7 @@ void Viewport::paintSignals(QPainter &p, QColor fore, QColor back)
     }
 
     if (_view.xcursors_shown() && _type == TIME_VIEW) {
-        list<XCursor*>::iterator i = _view.get_xcursorList().begin();
+        auto i = _view.get_xcursorList().begin();
         int index = 0;
         bool hovered = false;
         while (i != _view.get_xcursorList().end()) {
@@ -521,14 +520,15 @@ void Viewport::mousePressEvent(QMouseEvent *event)
     if (_action_type == NO_ACTION &&
         event->button() == Qt::LeftButton &&
         _view.session().get_device()->dev_inst()->mode == DSO) {
-        const vector< boost::shared_ptr<Signal> > sigs(_view.session().get_signals());
+
+       const auto &sigs = _view.session().get_signals();
 
        for(auto &s : sigs) {
             assert(s);
             if (!s->enabled())
                 continue;
-            boost::shared_ptr<DsoSignal> dsoSig;
-            if ((dsoSig = dynamic_pointer_cast<DsoSignal>(s))) {
+            DsoSignal *dsoSig = NULL;
+            if ((dsoSig = dynamic_cast<DsoSignal*>(s))) {
                 if (dsoSig->get_trig_rect(0, _view.get_view_width()).contains(_mouse_point)) {
                    _drag_sig = s;
                    _action_type = DSO_TRIG_MOVE;
@@ -551,7 +551,7 @@ void Viewport::mousePressEvent(QMouseEvent *event)
             }
         }
         if (_action_type == NO_ACTION && _view.cursors_shown()) {
-            list<Cursor*>::iterator i = _view.get_cursorList().begin();
+            auto i = _view.get_cursorList().begin();
             while (i != _view.get_cursorList().end()) {
                 const int64_t cursorX = _view.index2pixel((*i)->index());
                 if ((*i)->grabbed()) {
@@ -565,7 +565,7 @@ void Viewport::mousePressEvent(QMouseEvent *event)
             }
         }
         if (_action_type == NO_ACTION && _view.xcursors_shown()) {
-            list<XCursor*>::iterator i = _view.get_xcursorList().begin();
+            auto i = _view.get_xcursorList().begin();
             const QRect xrect = _view.get_view_rect();
             while (i != _view.get_xcursorList().end()) {
                 const double cursorX  = xrect.left() + (*i)->value(XCursor::XCur_Y)*xrect.width();
@@ -577,13 +577,13 @@ void Viewport::mousePressEvent(QMouseEvent *event)
                         _view.show_xcursors(false);
                     break;
                 } else if ((*i)->get_map_rect(xrect).contains(_view.hover_point())) {
-                    vector< boost::shared_ptr<Signal> > sigs(_view.session().get_signals());
-                    vector< boost::shared_ptr<Signal> >::iterator s = sigs.begin();
+                    auto &sigs = _view.session().get_signals();
+                    auto s = sigs.begin();
                     bool sig_looped = ((*i)->channel() == NULL);
                     bool no_dsoSig = true;
                     while (1) {
-                        boost::shared_ptr<view::DsoSignal> dsoSig;
-                        if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(*s)) &&
+                        view::DsoSignal *dsoSig = NULL;
+                        if ((dsoSig = dynamic_cast<view::DsoSignal*>(*s)) &&
                             dsoSig->enabled()) {
                             no_dsoSig = false;
                             if (sig_looped) {
@@ -656,8 +656,8 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
             !(event->buttons() | Qt::NoButton)) {
             if (_action_type == DSO_TRIG_MOVE) {
                 if (_drag_sig) {
-                    boost::shared_ptr<view::DsoSignal> dsoSig;
-                    if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(_drag_sig))) {
+                    view::DsoSignal *dsoSig = NULL;
+                    if ((dsoSig = dynamic_cast<view::DsoSignal*>(_drag_sig))) {
                         dsoSig->set_trig_vpos(event->pos().y());
                         _dso_trig_moved = true;
                     }
@@ -669,21 +669,21 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
                     int curX = _view.hover_point().x();
                     uint64_t index0 = 0, index1 = 0, index2 = 0;
                     bool logic = false;
-                    const vector< boost::shared_ptr<Signal> > sigs(_view.session().get_signals());
+                    const auto &sigs = _view.session().get_signals();
 
                    for(auto &s: sigs) {
                         assert(s);
-                        boost::shared_ptr<view::LogicSignal> logicSig;
-                        boost::shared_ptr<view::DsoSignal> dsoSig;
+                        view::LogicSignal *logicSig = NULL;
+                        view::DsoSignal *dsoSig = NULL;
                         if ((_view.session().get_device()->dev_inst()->mode == LOGIC) &&
-                            (logicSig = dynamic_pointer_cast<view::LogicSignal>(s))) {
+                            (logicSig = dynamic_cast<view::LogicSignal*>(s))) {
                             if (logicSig->measure(event->pos(), index0, index1, index2)) {
                                 logic = true;
                                 break;
                             }
                         }
                         if ((_view.session().get_device()->dev_inst()->mode == DSO) &&
-                            (dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
+                            (dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
                             curX = min(dsoSig->get_view_rect().right(), curX);
                             break;
                         }
@@ -712,7 +712,7 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
                     _curs_moved = true;
                 } else {
                     if (_view.xcursors_shown()) {
-                        list<XCursor*>::iterator i = _view.get_xcursorList().begin();
+                        auto i = _view.get_xcursorList().begin();
                         const QRect xrect = _view.get_view_rect();
                         while (i != _view.get_xcursorList().end()) {
                             if ((*i)->grabbed() != XCursor::XCur_None) {
@@ -787,12 +787,12 @@ void Viewport::mouseReleaseEvent(QMouseEvent *event)
                 // priority 2
                 if (_action_type == NO_ACTION) {
                     if (_mouse_down_point.x() == event->pos().x()) {
-                        const vector< boost::shared_ptr<Signal> > sigs(_view.session().get_signals());
+                        const auto &sigs = _view.session().get_signals();
 
                         for(auto &s : sigs) {
                             assert(s);
-                            boost::shared_ptr<view::LogicSignal> logicSig;
-                            if ((logicSig = dynamic_pointer_cast<view::LogicSignal>(s))) {
+                            view::LogicSignal *logicSig = NULL;
+                            if ((logicSig = dynamic_cast<view::LogicSignal*>(s))) {
                                 if (logicSig->edge(event->pos(), _edge_start, 10)) {
                                     _action_type = LOGIC_JUMP;
                                     _cur_preX = _view.index2pixel(_edge_start);
@@ -811,7 +811,7 @@ void Viewport::mouseReleaseEvent(QMouseEvent *event)
                 // priority 3
                 if (_action_type == NO_ACTION) {
                     if (_mouse_down_point.x() == event->pos().x()) {
-                        const vector< boost::shared_ptr<Signal> > sigs(_view.session().get_signals());
+                        const auto  &sigs = _view.session().get_signals();
 
                         for(auto &s : sigs) {
                             assert(s);
@@ -844,15 +844,17 @@ void Viewport::mouseReleaseEvent(QMouseEvent *event)
             }
         } else if (_action_type == DSO_TRIG_MOVE) {
             if (_dso_trig_moved && event->button() == Qt::LeftButton) {
-                _drag_sig.reset();
+                _drag_sig = NULL;
                 _action_type = NO_ACTION;
                 _dso_trig_moved = false;
 
-                const vector< boost::shared_ptr<Trace> > traces(
-                    _view.get_traces(ALL_VIEW));
-                for(auto &t : traces)
-                    t->select(false);
+                const auto &traces = _view.get_traces(ALL_VIEW);
+
+                for(auto &t : traces){
+                     t->select(false);
+                }                   
             }
+
         } else if (_action_type == DSO_XM_STEP0) {
             if (event->button() == Qt::LeftButton) {
                 _action_type = DSO_XM_STEP1;
@@ -895,7 +897,7 @@ void Viewport::mouseReleaseEvent(QMouseEvent *event)
             }
             if (_xcurs_moved && event->button() == Qt::LeftButton) {
                 _action_type = NO_ACTION;
-                list<XCursor*>::iterator i = _view.get_xcursorList().begin();
+                auto i = _view.get_xcursorList().begin();
                 while (i != _view.get_xcursorList().end()) {
                     (*i)->rel_grabbed();
                     i++;
@@ -966,11 +968,11 @@ void Viewport::mouseDoubleClickEvent(QMouseEvent *event)
             uint64_t index;
             uint64_t index0 = 0, index1 = 0, index2 = 0;
             if (_view.session().get_device()->dev_inst()->mode == LOGIC) {
-                const vector< boost::shared_ptr<Signal> > sigs(_view.session().get_signals());
+                const auto &sigs = _view.session().get_signals();
                 for(auto &s : sigs) {
                     assert(s);
-                    boost::shared_ptr<view::LogicSignal> logicSig;
-                    if ((logicSig = dynamic_pointer_cast<view::LogicSignal>(s))) {
+                    view::LogicSignal *logicSig = NULL;
+                    if ((logicSig = dynamic_cast<view::LogicSignal*>(s))) {
                         if (logicSig->measure(event->pos(), index0, index1, index2)) {
                             logic = true;
                             break;
@@ -1066,11 +1068,11 @@ void Viewport::wheelEvent(QWheelEvent *event)
         }
     }
 
-    const vector< boost::shared_ptr<Signal> > sigs(_view.session().get_signals());
+    const auto &sigs = _view.session().get_signals();
     for(auto &s : sigs) {
         assert(s);
-        boost::shared_ptr<view::DsoSignal> dsoSig;
-        if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
+        view::DsoSignal *dsoSig = NULL;
+        if ((dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
             dsoSig->auto_end();
         }
     }
@@ -1174,14 +1176,15 @@ void Viewport::measure()
     _measure_type = NO_MEASURE;
     if (_type == TIME_VIEW) {
         const uint64_t sample_rate = _view.session().cur_snap_samplerate();
-        const vector< boost::shared_ptr<Signal> > sigs(_view.session().get_signals());
+        const auto &sigs = _view.session().get_signals();
 
         for(auto &s : sigs) {
             assert(s);
-            boost::shared_ptr<view::LogicSignal> logicSig;
-            boost::shared_ptr<view::DsoSignal> dsoSig;
-            boost::shared_ptr<view::AnalogSignal> analogSig;
-            if ((logicSig = dynamic_pointer_cast<view::LogicSignal>(s))) {
+            view::LogicSignal *logicSig = NULL;
+            view::DsoSignal *dsoSig = NULL;
+            view::AnalogSignal *analogSig = NULL;
+
+            if ((logicSig = dynamic_cast<view::LogicSignal*>(s))) {
                 if (_action_type == NO_ACTION) {
                     if (logicSig->measure(_mouse_point, _cur_sample, _nxt_sample, _thd_sample)) {
                         _measure_type = LOGIC_FREQ;
@@ -1231,7 +1234,7 @@ void Viewport::measure()
                         _edge_hit = false;
                     }
                 }
-            } else if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
+            } else if ((dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
                 if (dsoSig->enabled()) {
                     if (_measure_en && dsoSig->measure(_view.hover_point())) {
                         _measure_type = DSO_VALUE;
@@ -1239,7 +1242,7 @@ void Viewport::measure()
                         _measure_type = NO_MEASURE;
                     }
                 }
-            } else if ((analogSig = dynamic_pointer_cast<view::AnalogSignal>(s))) {
+            } else if ((analogSig = dynamic_cast<view::AnalogSignal*>(s))) {
                 if (analogSig->enabled()) {
                     if (_measure_en && analogSig->measure(_view.hover_point())) {
                         _measure_type = DSO_VALUE;
@@ -1249,7 +1252,7 @@ void Viewport::measure()
                 }
             }
         }
-        const boost::shared_ptr<MathTrace> mathTrace(_view.session().get_math_trace());
+        const auto mathTrace = _view.session().get_math_trace();
         if (mathTrace && mathTrace->enabled()) {
             if (_measure_en && mathTrace->measure(_view.hover_point())) {
                 _measure_type = DSO_VALUE;
@@ -1329,14 +1332,15 @@ void Viewport::paintMeasure(QPainter &p, QColor fore, QColor back)
         }
     } 
 
-    const vector< boost::shared_ptr<Signal> > sigs(_view.session().get_signals());
+    const auto &sigs = _view.session().get_signals();
     if (_action_type == NO_ACTION &&
         _measure_type == DSO_VALUE) {
 
         for(auto &s : sigs) {
-            boost::shared_ptr<view::DsoSignal> dsoSig;
-            boost::shared_ptr<view::AnalogSignal> analogSig;
-            if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
+            view::DsoSignal *dsoSig = NULL;
+            view::AnalogSignal* analogSig = NULL;
+
+            if ((dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
                 uint64_t index;
                 double value;
                 QPointF hpoint;
@@ -1346,7 +1350,7 @@ void Viewport::paintMeasure(QPainter &p, QColor fore, QColor back)
                     p.drawLine(hpoint.x(), dsoSig->get_view_rect().top(),
                                hpoint.x(), dsoSig->get_view_rect().bottom());
                 }
-            } else if ((analogSig = dynamic_pointer_cast<view::AnalogSignal>(s))) {
+            } else if ((analogSig = dynamic_cast<view::AnalogSignal*>(s))) {
                 uint64_t index;
                 double value;
                 QPointF hpoint;
@@ -1362,8 +1366,8 @@ void Viewport::paintMeasure(QPainter &p, QColor fore, QColor back)
 
     if (_dso_ym_valid) {
         for(auto &s : sigs) {
-            boost::shared_ptr<view::DsoSignal> dsoSig;
-            if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
+            view::DsoSignal *dsoSig = NULL;
+            if ((dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
                 if (dsoSig->get_index() == _dso_ym_sig_index) {
                     p.setPen(QPen(dsoSig->get_colour(), 1, Qt::DotLine));
                     const int text_height = p.boundingRect(0, 0, INT_MAX, INT_MAX,
@@ -1670,7 +1674,7 @@ void Viewport::unshow_wait_trigger()
     update();
 }
 
-bool Viewport::get_dso_trig_moved() const
+bool Viewport::get_dso_trig_moved()
 {
     return _dso_trig_moved;
 }
diff --git a/DSView/pv/view/viewport.h b/DSView/pv/view/viewport.h
index c1d298f1..18b4dc4d 100755
--- a/DSView/pv/view/viewport.h
+++ b/DSView/pv/view/viewport.h
@@ -25,10 +25,7 @@
 #define DSVIEW_PV_VIEW_VIEWPORT_H
 
 #include <stdint.h>
-
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
+ 
 #include <QTime>
 #include <QTimer>
 #include <QWidget>
@@ -92,9 +89,9 @@ public:
 public:
     explicit Viewport(View &parent, View_type type);
 
-    int get_total_height() const;
+    int get_total_height();
 
-    QPoint get_mouse_point() const;
+    QPoint get_mouse_point();
 
     QString get_measure(QString option);
 
@@ -109,7 +106,7 @@ public:
 
     void set_need_update(bool update);
 
-    bool get_dso_trig_moved() const;
+    bool get_dso_trig_moved();
 
 protected:
     bool event(QEvent *event) override;
@@ -198,7 +195,7 @@ private:
     bool transfer_started;
     int timer_cnt;
 
-    boost::shared_ptr<Signal> _drag_sig;
+    Signal *_drag_sig;
 
     uint64_t _hover_index;
     bool _hover_hit;
diff --git a/DSView/pv/view/viewstatus.cpp b/DSView/pv/view/viewstatus.cpp
index 27345f84..3a1cf19f 100755
--- a/DSView/pv/view/viewstatus.cpp
+++ b/DSView/pv/view/viewstatus.cpp
@@ -74,14 +74,14 @@ void ViewStatus::paintEvent(QPaintEvent *)
         fore.setAlpha(View::BackAlpha);
         for(size_t i = 0; i < _mrects.size(); i++) {
             int sig_index = std::get<1>(_mrects[i]);
-            boost::shared_ptr<view::DsoSignal> dsoSig = NULL;
-            const vector< boost::shared_ptr<Signal> > sigs(_session->get_signals());
+            view::DsoSignal *dsoSig = NULL;
+            const auto &sigs = _session->get_signals();
 
             for(auto &s : sigs) {
                 assert(s);
                 if (!s->enabled())
                     continue;
-                if ((dsoSig = dynamic_pointer_cast<DsoSignal>(s))) {
+                if ((dsoSig = dynamic_cast<DsoSignal*>(s))) {
                     if (sig_index == dsoSig->get_index())
                         break;
                     else
diff --git a/DSView/pv/view/viewstatus.h b/DSView/pv/view/viewstatus.h
index 29bd473e..c8edf813 100755
--- a/DSView/pv/view/viewstatus.h
+++ b/DSView/pv/view/viewstatus.h
@@ -27,9 +27,7 @@
 #include <QDateTime>
 #include <QPushButton>
 #include <QToolButton>
-
  
-#include <boost/shared_ptr.hpp>
 
 #include <libsigrok4DSL/libsigrok.h>
 
diff --git a/DSView/pv/view/xcursor.cpp b/DSView/pv/view/xcursor.cpp
index eeecf6aa..decdc14c 100755
--- a/DSView/pv/view/xcursor.cpp
+++ b/DSView/pv/view/xcursor.cpp
@@ -46,11 +46,11 @@ XCursor::XCursor(View &view, QColor &colour,
 	_colour(colour)
 {
     _dsoSig = NULL;
-    const std::vector< boost::shared_ptr<Signal> > sigs(_view.session().get_signals());
+    const auto &sigs = _view.session().get_signals();
     
     for(auto &s : sigs) {
-        boost::shared_ptr<DsoSignal> dsoSig;
-        if ((dsoSig = dynamic_pointer_cast<DsoSignal>(s)))
+        DsoSignal *dsoSig = NULL;
+        if ((dsoSig = dynamic_cast<DsoSignal*>(s)))
             if (dsoSig->enabled()) {
                 _dsoSig = dsoSig;
                 break;
@@ -70,7 +70,7 @@ XCursor::XCursor(const XCursor &x) :
 {
 }
 
-QColor XCursor::colour() const
+QColor XCursor::colour()
 {
     return _colour;
 }
@@ -83,16 +83,16 @@ void XCursor::set_colour(QColor color)
 /**
  * Gets/Sets the mapping channel of the marker
  */
-boost::shared_ptr<DsoSignal> XCursor::channel() const
+DsoSignal* XCursor::channel()
 {
     return _dsoSig;
 }
-void XCursor::set_channel(boost::shared_ptr<DsoSignal> sig)
+void XCursor::set_channel(DsoSignal *sig)
 {
     _dsoSig = sig;
 }
 
-enum XCursor::XCur_type XCursor::grabbed() const
+enum XCursor::XCur_type XCursor::grabbed()
 {
     return _grabbed;
 }
@@ -108,7 +108,7 @@ void XCursor::rel_grabbed()
     _grabbed = XCur_None;
 }
 
-double XCursor::value(XCur_type type) const
+double XCursor::value(XCur_type type)
 {
     if (type == XCur_Y)
         return _yvalue;
@@ -182,7 +182,7 @@ void XCursor::paint(QPainter &p, const QRect &rect, XCur_type highlight,  int or
  * @param rect The rectangle of the xcursor area.
  * @return Returns the map label rectangle.
  */
-QRect XCursor::get_map_rect(const QRect &rect) const
+QRect XCursor::get_map_rect(const QRect &rect)
 {
     const int width = 10;
     const int64_t y = rect.top() + _value0 * rect.height() - width/2;
@@ -194,7 +194,7 @@ QRect XCursor::get_map_rect(const QRect &rect) const
  * @param rect The rectangle of the xcursor area.
  * @return Returns the close label rectangle.
  */
-QRect XCursor::get_close_rect(const QRect &rect) const
+QRect XCursor::get_close_rect(const QRect &rect)
 {
     const int width = 10;
     const int64_t y = rect.top() + _value1 * rect.height() - width/2;
diff --git a/DSView/pv/view/xcursor.h b/DSView/pv/view/xcursor.h
index e64d80b8..7a95bf1c 100755
--- a/DSView/pv/view/xcursor.h
+++ b/DSView/pv/view/xcursor.h
@@ -26,10 +26,7 @@
 #include <QColor>
 #include <QObject>
 #include <QRectF>
-
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
+ 
 #include <stdint.h>
 
 class QPainter;
@@ -74,25 +71,25 @@ public:
 	/**
      * Gets/Set the value of the marker.
 	 */
-    double value(enum XCur_type type) const;
+    double value(enum XCur_type type);
     void set_value(enum XCur_type type, double value);
 
     /**
      * Gets/Sets colour of the marker
      */
-    QColor colour() const;
+    QColor colour();
     void set_colour(QColor color);
 
     /**
      * Gets/Sets the mapping channel of the marker
      */
-    boost::shared_ptr<DsoSignal> channel() const;
-    void set_channel(boost::shared_ptr<DsoSignal> sig);
+    DsoSignal* channel();
+    void set_channel(DsoSignal *sig);
 
     /**
      * grab & move
      */
-    enum XCur_type grabbed() const;
+    enum XCur_type grabbed();
     void set_grabbed(enum XCur_type type, bool grabbed);
     void rel_grabbed();
 
@@ -108,14 +105,14 @@ public:
      * @param rect The rectangle of the xcursor area.
      * @return Returns the map label rectangle.
 	 */
-    QRect get_map_rect(const QRect &rect) const;
+    QRect get_map_rect(const QRect &rect);
 
     /**
      * Gets the close label rectangle.
      * @param rect The rectangle of the xcursor area.
      * @return Returns the close label rectangle.
      */
-    QRect get_close_rect(const QRect &rect) const;
+    QRect get_close_rect(const QRect &rect);
 
 	/**
      * Paints the labels to the xcursor.
@@ -128,8 +125,8 @@ signals:
     void value_changed();
 
 protected:
-    View &_view;
-    boost::shared_ptr<DsoSignal> _dsoSig;
+    View        &_view;
+    DsoSignal   *_dsoSig;
 
     double _yvalue;
     double _value0;
diff --git a/DSView/pv/widgets/decodergroupbox.cpp b/DSView/pv/widgets/decodergroupbox.cpp
index 2da50f7b..82a809b5 100755
--- a/DSView/pv/widgets/decodergroupbox.cpp
+++ b/DSView/pv/widgets/decodergroupbox.cpp
@@ -41,8 +41,8 @@
 namespace pv {
 namespace widgets {
 
-DecoderGroupBox::DecoderGroupBox(boost::shared_ptr<data::DecoderStack> &decoder_stack,
-                                 boost::shared_ptr<data::decode::Decoder> &dec,
+DecoderGroupBox::DecoderGroupBox(data::DecoderStack *decoder_stack,
+                                 data::decode::Decoder *dec,
                                  QLayout *dec_layout,
                                  QWidget *parent) :
     QScrollArea(parent),
diff --git a/DSView/pv/widgets/decodergroupbox.h b/DSView/pv/widgets/decodergroupbox.h
index 61f5599b..96812532 100755
--- a/DSView/pv/widgets/decodergroupbox.h
+++ b/DSView/pv/widgets/decodergroupbox.h
@@ -26,8 +26,7 @@
 #include <QPushButton>
 #include <QGridLayout>
 #include <QToolBar>
-#include <QScrollArea>
-#include <boost/shared_ptr.hpp>
+#include <QScrollArea> 
 
 namespace pv {
 
@@ -45,8 +44,8 @@ class DecoderGroupBox : public QScrollArea
 	Q_OBJECT
 
 public:
-    DecoderGroupBox(boost::shared_ptr<pv::data::DecoderStack> &decoder_stack,
-                    boost::shared_ptr<data::decode::Decoder> &dec, QLayout *dec_layout,
+    DecoderGroupBox(pv::data::DecoderStack *decoder_stack,
+                    data::decode::Decoder *dec, QLayout *dec_layout,
                     QWidget *parent = NULL);
     ~DecoderGroupBox();
     bool eventFilter(QObject *o, QEvent *e);
@@ -54,7 +53,7 @@ public:
 signals:
 	void show_hide_decoder();
     void show_hide_row();
-    void del_stack(boost::shared_ptr<data::decode::Decoder> &_dec);
+    void del_stack(data::decode::Decoder *_dec);
 
 private slots:
     void tog_icon();
@@ -63,8 +62,8 @@ private slots:
 private:
     QWidget *_widget;
 
-    boost::shared_ptr<pv::data::DecoderStack> &_decoder_stack;
-    boost::shared_ptr<data::decode::Decoder> &_dec;
+    pv::data::DecoderStack  *_decoder_stack;
+    data::decode::Decoder   *_dec;
     int _index;
 
     QGridLayout *_layout;

From 0e4f0ae52e847bc7e6d6305556ab8d00dd1d4ef8 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Mon, 8 Nov 2021 19:56:35 +0800
Subject: [PATCH 21/58] decode task save stop anddestory

---
 DSView/main.cpp                    |   2 +
 DSView/pv/appcontrol.cpp           |   9 +-
 DSView/pv/appcontrol.h             |   2 +
 DSView/pv/data/decode/decoder.cpp  |  19 +-
 DSView/pv/data/decode/decoder.h    |  24 +-
 DSView/pv/data/decode/rowdata.cpp  |   8 +-
 DSView/pv/data/decoderstack.cpp    | 152 +++++-----
 DSView/pv/data/decoderstack.h      |  57 ++--
 DSView/pv/data/dsosnapshot.cpp     |   4 +-
 DSView/pv/data/snapshot.cpp        |  25 +-
 DSView/pv/data/snapshot.h          |   6 +
 DSView/pv/device/devinst.cpp       |   5 +
 DSView/pv/device/devinst.h         |   2 +
 DSView/pv/device/file.cpp          |   2 +-
 DSView/pv/dock/dsotriggerdock.cpp  |  12 +-
 DSView/pv/dock/protocoldock.cpp    |   9 +-
 DSView/pv/mainwindow.cpp           |  32 +-
 DSView/pv/mainwindow.h             |   2 +-
 DSView/pv/sigsession.cpp           | 466 +++++++++++++++++++----------
 DSView/pv/sigsession.h             | 209 +++++++++----
 DSView/pv/storesession.cpp         |  53 ++--
 DSView/pv/storesession.h           |   2 +-
 DSView/pv/view/decodetrace.cpp     | 144 ++++-----
 DSView/pv/view/decodetrace.h       |  14 +-
 DSView/pv/view/view.cpp            |  66 ++--
 DSView/pv/view/viewstatus.cpp      |   2 +-
 libsigrok4DSL/hardware/demo/demo.h |   2 +-
 libsigrok4DSL/session.c            |  15 +-
 28 files changed, 810 insertions(+), 535 deletions(-)

diff --git a/DSView/main.cpp b/DSView/main.cpp
index 862befdf..c0a15a47 100755
--- a/DSView/main.cpp
+++ b/DSView/main.cpp
@@ -183,6 +183,8 @@ int main(int argc, char *argv[])
 
 		//Run the application
 		ret = a.exec();
+
+		control->Stop();
 	}
 	catch (const std::exception &e)
 	{
diff --git a/DSView/pv/appcontrol.cpp b/DSView/pv/appcontrol.cpp
index 6fa5f704..dff58bc7 100644
--- a/DSView/pv/appcontrol.cpp
+++ b/DSView/pv/appcontrol.cpp
@@ -95,11 +95,14 @@ bool AppControl::Start()
     return true;
 }
 
-void AppControl::UnInit()
-{
+ void AppControl::Stop()
+ {
     _session->Close();
     _device_manager->UnInitAll();    
-    
+ }
+
+void AppControl::UnInit()
+{  
     // Destroy libsigrokdecode
     srd_exit();
 
diff --git a/DSView/pv/appcontrol.h b/DSView/pv/appcontrol.h
index ff2742b5..8e0e1ac0 100644
--- a/DSView/pv/appcontrol.h
+++ b/DSView/pv/appcontrol.h
@@ -48,6 +48,8 @@ public:
 
     bool Start();
 
+    void Stop();
+
     void UnInit();
 
     const char* GetLastError();
diff --git a/DSView/pv/data/decode/decoder.cpp b/DSView/pv/data/decode/decoder.cpp
index a9e4c66e..4c2e80f0 100755
--- a/DSView/pv/data/decode/decoder.cpp
+++ b/DSView/pv/data/decode/decoder.cpp
@@ -29,11 +29,15 @@ namespace pv {
 namespace data {
 namespace decode {
 
-Decoder::Decoder(const srd_decoder *const dec) :
-	_decoder(dec),
-    _shown(true),
-    _setted(true)
+Decoder::Decoder(const srd_decoder *const dec):
+    _decoder(dec)
 {
+	_shown = true;
+	_setted = true;
+	_decode_start = 0;
+	_decode_end = 0;
+	_decode_start_back = 0;
+	_decode_end_back = 0;
 }
 
 Decoder::~Decoder()
@@ -65,9 +69,10 @@ void Decoder::set_decode_region(uint64_t start, uint64_t end)
 {
     _decode_start_back = start;
     _decode_end_back = end;
-    if (_decode_start != start ||
-        _decode_end != end)
-        _setted = true;
+	
+    if (_decode_start != start || _decode_end != end){
+		_setted = true;
+	} 
 }
   
 //apply setting
diff --git a/DSView/pv/data/decode/decoder.h b/DSView/pv/data/decode/decoder.h
index 3d723bdb..1f737f90 100755
--- a/DSView/pv/data/decode/decoder.h
+++ b/DSView/pv/data/decode/decoder.h
@@ -44,6 +44,8 @@ class Decoder
 public:
 	Decoder(const srd_decoder *const decoder);
 
+public: 
+
 	virtual ~Decoder();
 
 	inline const srd_decoder* decoder(){
@@ -92,19 +94,19 @@ public:
 
 private:
 	const srd_decoder *const _decoder;
+ 
+    std::map<const srd_channel*, int>   _probes;
+	std::map<std::string, GVariant*>    _options;
+    std::map<const srd_channel*, int>   _probes_back;
+    std::map<std::string, GVariant*>    _options_back;
 
-	bool _shown;
+    uint64_t        _decode_start;
+    uint64_t        _decode_end;
+    uint64_t        _decode_start_back;
+    uint64_t        _decode_end_back;
 
-    std::map<const srd_channel*, int> _probes;
-	std::map<std::string, GVariant*> _options;
-
-    std::map<const srd_channel*, int> _probes_back;
-    std::map<std::string, GVariant*> _options_back;
-
-    uint64_t _decode_start, _decode_end;
-    uint64_t _decode_start_back, _decode_end_back;
-
-    bool _setted;
+    bool            _setted;
+    bool            _shown;
 };
 
 } // namespace decode
diff --git a/DSView/pv/data/decode/rowdata.cpp b/DSView/pv/data/decode/rowdata.cpp
index e8ac9278..7dbe30a3 100755
--- a/DSView/pv/data/decode/rowdata.cpp
+++ b/DSView/pv/data/decode/rowdata.cpp
@@ -42,7 +42,7 @@ RowData::RowData() :
 
 RowData::~RowData()
 {
-    clear();
+    //stack object can not destory the sources
 }
 
 void RowData::clear()
@@ -108,10 +108,8 @@ uint64_t RowData::get_annotation_index(uint64_t start_sample)
 }
 
 bool RowData::push_annotation(Annotation *a)
-{
-    if (a == NULL){
-        return false;
-    }
+{ 
+    assert(a);
 
     std::lock_guard<std::mutex> lock(_global_visitor_mutex);
 
diff --git a/DSView/pv/data/decoderstack.cpp b/DSView/pv/data/decoderstack.cpp
index 09d3dcf4..4aa6a86e 100755
--- a/DSView/pv/data/decoderstack.cpp
+++ b/DSView/pv/data/decoderstack.cpp
@@ -46,12 +46,9 @@ namespace data {
 
 const double DecoderStack::DecodeMargin = 1.0;
 const double DecoderStack::DecodeThreshold = 0.2;
-const int64_t DecoderStack::DecodeChunkLength = 4 * 1024;
-//const int64_t DecoderStack::DecodeChunkLength = 1024 * 1024;
+const int64_t DecoderStack::DecodeChunkLength = 4 * 1024; 
 const unsigned int DecoderStack::DecodeNotifyPeriod = 1024;
-
-std::mutex DecoderStack::_global_decode_mutex;
-
+ 
 DecoderStack::DecoderStack(pv::SigSession *session,
 	const srd_decoder *const dec, DecoderStatus *decoder_status) :
 	_session(session)
@@ -61,22 +58,17 @@ DecoderStack::DecoderStack(pv::SigSession *session,
     assert(decoder_status);
     
     _samples_decoded = 0;
-    _sample_count = 0;
-    _frame_complete = false;
+    _sample_count = 0; 
     _decode_state = Stopped;
     _options_changed = false;
     _no_memory = false;
     _mark_index = -1;
     _decoder_status = decoder_status;
-    _bThreadStop = false;
-    _decode_thread = NULL;
+    _stask_stauts = NULL;
 
-	connect(_session, SIGNAL(frame_began()),
-		this, SLOT(on_new_frame()));
-	connect(_session, SIGNAL(data_received()),
-		this, SLOT(on_data_received()));
-	connect(_session, SIGNAL(frame_ended()),
-		this, SLOT(on_frame_ended()));
+	connect(_session, SIGNAL(frame_began()), this, SLOT(on_new_frame()));
+
+	connect(_session, SIGNAL(data_received()), this, SLOT(on_data_received())); 
 
     _stack.push_back(new decode::Decoder(dec));
  
@@ -84,16 +76,21 @@ DecoderStack::DecoderStack(pv::SigSession *session,
 }
 
 DecoderStack::~DecoderStack()
-{ 
-    stop_decode();
-
+{   
+    //release source
     for (auto &kv : _rows)
     {
+        kv.second->clear();
         delete kv.second;
     }
     _rows.clear();
 
+    //Decoder
+    for (auto *p : _stack){
+        delete p;
+    }
     _stack.clear();
+    
     _rows_gshow.clear();
     _rows_lshow.clear();
     _class_rows.clear();
@@ -117,7 +114,10 @@ void DecoderStack::remove(Decoder *decoder)
 
 	// Delete the element
     if (iter != _stack.end())
+    {
         _stack.erase(iter);
+        delete decoder;
+    }        
 
     build_row();
     _options_changed = true;
@@ -125,7 +125,7 @@ void DecoderStack::remove(Decoder *decoder)
 
 void DecoderStack::build_row()
 {
-    //destory data
+    //release source
     for (auto &kv : _rows)
     {
         delete kv.second;
@@ -357,8 +357,7 @@ void DecoderStack::clear()
 
 void DecoderStack::init()
 {
-    _sample_count = 0;
-    _frame_complete = false;
+    _sample_count = 0; 
     _samples_decoded = 0;
     _error_message = QString();
     _no_memory = false;
@@ -370,30 +369,44 @@ void DecoderStack::init()
 
     set_mark_index(-1);
 }
-
-void DecoderStack::stop_decode()
-{ 
-    _bThreadStop = true;
-
-     if (_decode_thread && _decode_thread->joinable()) { 
-        _decode_thread->join(); 
+ 
+void DecoderStack::stop_decode_work()
+{  
+    //set the flag to exit from task thread 
+     if (_stask_stauts){
+         _stask_stauts->m_bStop = true;
      }
-     DESTROY_OBJECT(_decode_thread);
-
-    if(_decode_state != Stopped) {       
-       _decode_state = Stopped;
-    }
+    _decode_state = Stopped; 
 }
 
-void DecoderStack::begin_decode()
+void DecoderStack::begin_decode_work()
 {
+     assert(_decode_state == Stopped);
+
+     _decode_state = Running;
+      do_decode_work();
+     _decode_state = Stopped;
+}
+
+void DecoderStack::do_decode_work()
+{
+    //set the flag to exit from task thread 
+     if (_stask_stauts){
+         _stask_stauts->m_bStop = true;
+     }
+     _stask_stauts = new decode_task_status();
+     _stask_stauts->m_bStop = false;
+  
     pv::view::LogicSignal *logic_signal = NULL;
     pv::data::Logic *data = NULL;
 
     if (!_options_changed)
+    {
+        qDebug()<<"data not be ready";
         return;
+    } 
     _options_changed = false;
-    stop_decode();
+
     init();
 
 	// Check that all decoders have the required channels
@@ -427,6 +440,7 @@ void DecoderStack::begin_decode()
     const auto &snapshots = data->get_snapshots();
 	if (snapshots.empty())
 		return;
+
 	_snapshot = snapshots.front();
     if (_snapshot->empty())
         return;
@@ -435,15 +449,8 @@ void DecoderStack::begin_decode()
 	_samplerate = data->samplerate();
     if (_samplerate == 0.0)
         return;
-
-    if (_decode_thread && _decode_thread->joinable()) { 
-            _bThreadStop = true;
-            _decode_thread->join(); 
-    }
-    DESTROY_OBJECT(_decode_thread);
-
-    _bThreadStop = false; //reset stop flag
-    _decode_thread =  new std::thread(&DecoderStack::decode_proc, this);
+     
+    decode_proc();   
 }
 
 uint64_t DecoderStack::get_max_sample_count()
@@ -457,10 +464,10 @@ uint64_t DecoderStack::get_max_sample_count()
 	return max_sample_count;
 }
 
-void DecoderStack::decode_data(
-    const uint64_t decode_start, const uint64_t decode_end,
-    srd_session *const session)
+void DecoderStack::decode_data(const uint64_t decode_start, const uint64_t decode_end, srd_session *const session)
 {
+    decode_task_status *status = _stask_stauts;    
+
     //uint8_t *chunk = NULL;
     uint64_t last_cnt = 0;
     uint64_t notify_cnt = (decode_end - decode_start + 1)/100;
@@ -480,8 +487,16 @@ void DecoderStack::decode_data(
     uint64_t i = decode_start;
     char *error = NULL;
 
-    while(!_bThreadStop && i < decode_end && !_no_memory)
-    { 
+    if( i >= decode_end){
+        qDebug()<<"decode data index have been end:"<<i;
+    }
+
+    while(i < decode_end && !_no_memory)
+    {    
+        if (status->m_bStop){
+            break;
+        }        
+
         std::vector<const uint8_t *> chunk;
         std::vector<uint8_t> chunk_const;
         uint64_t chunk_end = decode_end;
@@ -523,21 +538,19 @@ void DecoderStack::decode_data(
             new_decode_data();
         }
         entry_cnt++;
-    }
+    } 
+
     if (error)
         g_free(error);
-    decode_done();
+
+    qDebug()<<"decode tack proc end";
+    
+    if (!_session->is_closed())
+        decode_done();
 }
 
 void DecoderStack::decode_proc()
-{ 
-    std::lock_guard<std::mutex> decode_lock(_global_decode_mutex);
-    
-    if (_bThreadStop){
-        return;
-    }
-
-    optional<uint64_t> sample_count;
+{  
 	srd_session *session;
 	srd_decoder_inst *prev_di = NULL;
     uint64_t decode_start = 0;
@@ -547,12 +560,13 @@ void DecoderStack::decode_proc()
 
 	// Create the session
 	srd_session_new(&session);
+
 	assert(session);
-
-    _decode_state = Running;
-
+    
     // Get the intial sample count
-    sample_count = _sample_count = _snapshot->get_sample_count();
+    _sample_count = _snapshot->get_sample_count();
+
+    qDebug()<<"sample count:"<<_sample_count;
 
     // Create the decoders
     for(auto &dec : _stack)
@@ -592,9 +606,7 @@ void DecoderStack::decode_proc()
     if (error) {
         g_free(error);
     }
-	srd_session_destroy(session);
-
-    _decode_state = Stopped;
+	srd_session_destroy(session); 
 }
 
 uint64_t DecoderStack::sample_count()
@@ -662,18 +674,16 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
 }
 
 void DecoderStack::on_new_frame()
-{
-    //begin_decode();
+{ 
 }
 
 void DecoderStack::on_data_received()
 {  
 }
 
-void DecoderStack::on_frame_ended()
+void DecoderStack::frame_ended()
 { 
-    _options_changed = true;
-    begin_decode();
+    _options_changed = true; 
 }
 
 int DecoderStack::list_rows_size()
diff --git a/DSView/pv/data/decoderstack.h b/DSView/pv/data/decoderstack.h
index c30455b7..c8a2b929 100755
--- a/DSView/pv/data/decoderstack.h
+++ b/DSView/pv/data/decoderstack.h
@@ -21,23 +21,24 @@
 
 #ifndef DSVIEW_PV_DATA_DECODERSTACK_H
 #define DSVIEW_PV_DATA_DECODERSTACK_H
+
 #include <libsigrokdecode4DSL/libsigrokdecode.h>
-
 #include <list>
-
-#include <boost/optional.hpp> 
- 
-
+#include <boost/optional.hpp>
 #include <QObject>
 #include <QString>
-#include <mutex>
-#include <thread>
+#include <mutex> 
 
 #include "decode/row.h" 
 #include "../data/signaldata.h"
 
 class DecoderStatus;
 
+struct decode_task_status
+{  
+    volatile bool m_bStop;
+};
+
 namespace DecoderStackTest {
 class TwoDecoderStack;
 }
@@ -62,6 +63,7 @@ class RowData;
 
 class Logic;
 
+ //a torotocol have a DecoderStack, destroy by DecodeTrace
 class DecoderStack : public QObject, public SignalData
 {
 	Q_OBJECT
@@ -133,14 +135,21 @@ public:
 	QString error_message();
 
 	void clear();
+
     void init();
 
 	uint64_t get_max_sample_count();
 
-	void begin_decode();
+    inline bool IsRunning(){
+        return _decode_state == Running;
+    }
+ 
+	void begin_decode_work();
 
-    void stop_decode();
+    void do_decode_work();
 
+    void stop_decode_work();
+  
     int list_rows_size();
 
     bool options_changed();
@@ -154,6 +163,8 @@ public:
     void set_mark_index(int64_t index);
     int64_t get_mark_index();
 
+    void frame_ended();
+
 private:
     void decode_data(const uint64_t decode_start, const uint64_t decode_end, srd_session *const session);
 
@@ -164,14 +175,12 @@ private:
 private slots:
 	void on_new_frame();
 
-	void on_data_received();
-
-	void on_frame_ended();
+	void on_data_received(); 
 
 signals:
 	void new_decode_data();
     void decode_done();
-
+  
 private: 
 	std::list<decode::Decoder*> _stack;
 
@@ -184,28 +193,18 @@ private:
   
     SigSession      *_session;
     decode_state    _decode_state;
-    bool            _options_changed;
-    bool            _no_memory;
+    volatile bool   _options_changed;
+    volatile bool   _no_memory;
     int64_t         _mark_index;
     DecoderStatus   *_decoder_status;
     QString         _error_message;
     int64_t	        _samples_decoded;
-    uint64_t        _sample_count;
-	bool            _frame_complete;
-    volatile bool   _bThreadStop;
+    uint64_t        _sample_count; 
+ 
+    decode_task_status  *_stask_stauts;
     
-
-    std::thread     *_decode_thread;
     mutable std::mutex _output_mutex;
-
-	/**
-	 * This mutex prevents more than one decode operation occuring
-	 * concurrently.
-	 * @todo A proper solution should be implemented to allow multiple
-	 * decode operations.
-	 */ 
-    static std::mutex _global_decode_mutex;
-
+  
 	friend class DecoderStackTest::TwoDecoderStack;
 };
 
diff --git a/DSView/pv/data/dsosnapshot.cpp b/DSView/pv/data/dsosnapshot.cpp
index db56da10..a3649f8f 100755
--- a/DSView/pv/data/dsosnapshot.cpp
+++ b/DSView/pv/data/dsosnapshot.cpp
@@ -200,9 +200,9 @@ const uint8_t *DsoSnapshot::get_samples(
     (void)end_sample;
 
 	assert(start_sample >= 0);
-    assert(start_sample < (int64_t)get_sample_count());
+    assert(start_sample < (int64_t)sample_count());
 	assert(end_sample >= 0);
-    assert(end_sample < (int64_t)get_sample_count());
+    assert(end_sample < (int64_t)sample_count());
 	assert(start_sample <= end_sample);
 
 
diff --git a/DSView/pv/data/snapshot.cpp b/DSView/pv/data/snapshot.cpp
index 773ea130..bac3cc16 100755
--- a/DSView/pv/data/snapshot.cpp
+++ b/DSView/pv/data/snapshot.cpp
@@ -92,19 +92,34 @@ uint64_t Snapshot::get_sample_count()
     std::lock_guard<std::mutex> lock(_mutex);
     return _sample_count;
 }
-
+ 
 uint64_t Snapshot::get_ring_start()
 {
     std::lock_guard<std::mutex> lock(_mutex);
-    if (_sample_count < _total_sample_count)
-        return 0;
-    else
-        return _ring_sample_count;
+    return ring_start();    
 }
 
 uint64_t Snapshot::get_ring_end()
 {
     std::lock_guard<std::mutex> lock(_mutex);
+    return ring_end();     
+}
+
+uint64_t Snapshot::sample_count()
+{ 
+    return _sample_count;
+}
+
+uint64_t Snapshot::ring_start()
+{ 
+    if (_sample_count < _total_sample_count)
+        return 0;
+    else
+        return _ring_sample_count;
+}
+ 
+uint64_t Snapshot::ring_end()
+{ 
     if (_sample_count == 0)
         return 0;
     else if (_ring_sample_count == 0)
diff --git a/DSView/pv/data/snapshot.h b/DSView/pv/data/snapshot.h
index 79de9589..b3447b89 100755
--- a/DSView/pv/data/snapshot.h
+++ b/DSView/pv/data/snapshot.h
@@ -64,6 +64,12 @@ public:
 protected:
     virtual void free_data();
 
+    uint64_t  sample_count();
+
+    uint64_t ring_start();
+
+    uint64_t ring_end();
+
 protected:
      mutable std::mutex  _mutex;
 
diff --git a/DSView/pv/device/devinst.cpp b/DSView/pv/device/devinst.cpp
index 124ab2ef..a17b6098 100755
--- a/DSView/pv/device/devinst.cpp
+++ b/DSView/pv/device/devinst.cpp
@@ -204,6 +204,11 @@ void DevInst::run()
 	sr_session_run();
 }
 
+void DevInst::stop()
+{
+ 	sr_session_stop();
+} 
+
 bool DevInst::is_usable()
 {
     return _usable;
diff --git a/DSView/pv/device/devinst.h b/DSView/pv/device/devinst.h
index 5ad51bf0..83b1a884 100755
--- a/DSView/pv/device/devinst.h
+++ b/DSView/pv/device/devinst.h
@@ -117,6 +117,8 @@ public:
 
 	virtual void run();
 
+    virtual void stop();
+
     virtual void* get_id();
 
     virtual sr_dev_inst* dev_inst() = 0;
diff --git a/DSView/pv/device/file.cpp b/DSView/pv/device/file.cpp
index 88dd0cb5..c24233e2 100755
--- a/DSView/pv/device/file.cpp
+++ b/DSView/pv/device/file.cpp
@@ -96,7 +96,7 @@ QJsonArray File::get_decoders()
             }
         }
 
-        zip_close(archive);
+        zip_close(archive);        
     }
 
     return dec_array;
diff --git a/DSView/pv/dock/dsotriggerdock.cpp b/DSView/pv/dock/dsotriggerdock.cpp
index 29698f19..03e1a8ee 100755
--- a/DSView/pv/dock/dsotriggerdock.cpp
+++ b/DSView/pv/dock/dsotriggerdock.cpp
@@ -343,10 +343,12 @@ void DsoTriggerDock::device_change()
 void DsoTriggerDock::init()
 {
     if (_session->get_device()->name().contains("virtual")) {
-        foreach(QAbstractButton * btn, _source_group->buttons())
+        for(QAbstractButton * btn :  _source_group->buttons())
             btn->setDisabled(true);
-        foreach(QAbstractButton * btn, _type_group->buttons())
+
+        for(QAbstractButton * btn : _type_group->buttons())
             btn->setDisabled(true);
+
         _holdoff_slider->setDisabled(true);
         _holdoff_spinBox->setDisabled(true);
         _holdoff_comboBox->setDisabled(true);
@@ -354,10 +356,12 @@ void DsoTriggerDock::init()
         _channel_comboBox->setDisabled(true);
         return;
     } else {
-        foreach(QAbstractButton * btn, _source_group->buttons())
+        for(QAbstractButton * btn :  _source_group->buttons())
             btn->setDisabled(false);
-        foreach(QAbstractButton * btn, _type_group->buttons())
+
+        for(QAbstractButton * btn : _type_group->buttons())
             btn->setDisabled(false);
+            
         _holdoff_slider->setDisabled(false);
         _holdoff_spinBox->setDisabled(false);
         _holdoff_comboBox->setDisabled(false);
diff --git a/DSView/pv/dock/protocoldock.cpp b/DSView/pv/dock/protocoldock.cpp
index 85150806..04888b4a 100755
--- a/DSView/pv/dock/protocoldock.cpp
+++ b/DSView/pv/dock/protocoldock.cpp
@@ -319,6 +319,9 @@ void ProtocolDock::add_protocol(bool silent)
     DecoderStatus *dstatus = new DecoderStatus();
     dstatus->m_format = (int)DecoderDataFormat::hex;
 
+    int numm= _protocol_items.size();
+    numm += 0;
+  
     if (_session->add_decoder(decoder, silent, dstatus))
     {
         //crate item layer
@@ -360,11 +363,13 @@ void ProtocolDock::del_all_protocol()
 {  
     if (_protocol_items.size() > 0)
     {
+        _session->clear_all_decoder();
+
         for (auto it = _protocol_items.begin(); it != _protocol_items.end(); it++)
         {
              DESTROY_QT_LATER((*it)); //destory control
-            _session->remove_decode_signal(0);
         }
+
         _protocol_items.clear();
         protocol_updated();
     }
@@ -772,7 +777,7 @@ void ProtocolDock::OnProtocolDelete(void *handle){
        if ((*it) == handle){
            DESTROY_QT_LATER(*it); 
            _protocol_items.remove(dex);
-           _session->remove_decode_signal(dex);
+           _session->remove_decoder(dex);
            protocol_updated();
            break;
        }
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index fe69e51d..79b986a4 100755
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -246,7 +246,8 @@ void MainWindow::setup_ui()
 
     // update device
     update_device_list();
-    _session->start_hotplug_proc(boost::bind(&MainWindow::session_error, this,
+    
+    _session->start_hotplug_work(boost::bind(&MainWindow::session_error, this,
                                              QString(tr("Hotplug failed")), _1));
 
     retranslateUi();
@@ -375,13 +376,12 @@ void MainWindow::update_device_list()
         }
 
   
-        // load decoders
+        // load decoders 
         StoreSession ss(_session);
-        ss.load_decoders(_protocol_widget, file_dev->get_decoders());
-    
+        bool bFlag = ss.load_decoders(_protocol_widget, file_dev->get_decoders());    
 
         // load session
-        load_session_json(file_dev->get_session(), true);
+        load_session_json(file_dev->get_session(), true, !bFlag);
 
         // load data
         const QString errorMessage(
@@ -957,7 +957,7 @@ bool MainWindow::on_load_session(QString name)
     return load_session_json(sessionDoc, false);
 }
 
-bool MainWindow::load_session_json(QJsonDocument json, bool file_dev)
+bool MainWindow::load_session_json(QJsonDocument json, bool file_dev, bool bDecoder)
 {
     QJsonObject sessionObj = json.object();
 
@@ -976,9 +976,9 @@ bool MainWindow::load_session_json(QJsonDocument json, bool file_dev)
         return false;
     }
  
-    // clear decoders
-  
-    if (sdi->mode == LOGIC) {
+    // clear decoders  
+    if (sdi->mode == LOGIC && !file_dev) 
+    {
         _protocol_widget->del_all_protocol();
     } 
 
@@ -1011,7 +1011,8 @@ bool MainWindow::load_session_json(QJsonDocument json, bool file_dev)
         for (const GSList *l = _session->get_device()->dev_inst()->channels; l; l = l->next) {
             sr_channel *const probe = (sr_channel*)l->data;
             assert(probe);
-            foreach (const QJsonValue &value, sessionObj["channel"].toArray()) {
+
+            for (const QJsonValue &value : sessionObj["channel"].toArray()) {
                 QJsonObject obj = value.toObject();
                 if ((strcmp(probe->name, g_strdup(obj["name"].toString().toStdString().c_str())) == 0) &&
                     (probe->type == obj["type"].toDouble())) {
@@ -1031,7 +1032,8 @@ bool MainWindow::load_session_json(QJsonDocument json, bool file_dev)
             sr_channel *const probe = (sr_channel*)l->data;
             assert(probe);
             bool isEnabled = false;
-            foreach (const QJsonValue &value, sessionObj["channel"].toArray()) {
+
+            for (const QJsonValue &value : sessionObj["channel"].toArray()) {
                 QJsonObject obj = value.toObject();
                 if ((probe->index == obj["index"].toDouble()) &&
                     (probe->type == obj["type"].toDouble())) {
@@ -1058,8 +1060,9 @@ bool MainWindow::load_session_json(QJsonDocument json, bool file_dev)
 
     // load signal setting
     if (file_dev && (sdi->mode == DSO)) {
+
          for(auto &s :  _session->get_signals()) {
-            foreach (const QJsonValue &value, sessionObj["channel"].toArray()) {
+            for (const QJsonValue &value : sessionObj["channel"].toArray()) {
                 QJsonObject obj = value.toObject();
                 if ((strcmp(s->get_name().toStdString().c_str(), g_strdup(obj["name"].toString().toStdString().c_str())) == 0) &&
                     (s->get_type() == obj["type"].toDouble())) {
@@ -1078,7 +1081,7 @@ bool MainWindow::load_session_json(QJsonDocument json, bool file_dev)
         }
     } else {
          for(auto &s : _session->get_signals()) {
-            foreach (const QJsonValue &value, sessionObj["channel"].toArray()) {
+            for (const QJsonValue &value : sessionObj["channel"].toArray()) {
                 QJsonObject obj = value.toObject();
                 if ((s->get_index() == obj["index"].toDouble()) &&
                     (s->get_type() == obj["type"].toDouble())) {
@@ -1123,12 +1126,11 @@ bool MainWindow::load_session_json(QJsonDocument json, bool file_dev)
 
     
     // load decoders
-    if (sessionObj.contains("decoder")) {
+    if (bDecoder && sessionObj.contains("decoder")) {
         StoreSession ss(_session);
         ss.load_decoders(_protocol_widget, sessionObj["decoder"].toArray());
     }
 
-
     // load measure
     if (sessionObj.contains("measure")) {
         _view->get_viewstatus()->load_session(sessionObj["measure"].toArray());
diff --git a/DSView/pv/mainwindow.h b/DSView/pv/mainwindow.h
index 7dee5f3a..68f2dd6d 100755
--- a/DSView/pv/mainwindow.h
+++ b/DSView/pv/mainwindow.h
@@ -96,7 +96,7 @@ private:
 	void session_error(const QString text, const QString info_text);
     bool eventFilter(QObject *object, QEvent *event);
 
-    bool load_session_json(QJsonDocument json, bool file_dev);
+    bool load_session_json(QJsonDocument json, bool file_dev,bool bDecoder=true);
 
     void update_device_list();
 
diff --git a/DSView/pv/sigsession.cpp b/DSView/pv/sigsession.cpp
index b75f55c9..b63d1aa9 100755
--- a/DSView/pv/sigsession.cpp
+++ b/DSView/pv/sigsession.cpp
@@ -64,6 +64,7 @@
 #include <QJsonDocument>
 #include <QFuture>
 #include <QtConcurrent/QtConcurrent>
+#include <QDebug>
 
  
 #include "data/decode/decoderstatus.h"
@@ -95,12 +96,8 @@ SigSession::SigSession(DeviceManager *device_manager) :
     _hot_attach = false;
     _hot_detach = false;
     _group_cnt = 0;
-    _bHotplugStop = false;
-    _hotplug = NULL;
-    _sampling_thread = NULL;
- 
-
-    _feed_timer.stop();
+    _bHotplugStop = false;  
+  
     _noData_cnt = 0;
     _data_lock = false;
     _data_updated = false;
@@ -111,7 +108,9 @@ SigSession::SigSession(DeviceManager *device_manager) :
     _math_trace = NULL;
     _saving = false;
     _dso_feed = false;
-    _stop_scale = 1;
+    _stop_scale = 1; 
+    _bDecodeRunning = false;
+    _bClose = false;
 
     // Create snapshots & data containers
     _cur_logic_snapshot = new data::LogicSnapshot();
@@ -126,13 +125,15 @@ SigSession::SigSession(DeviceManager *device_manager) :
     _group_data = new data::Group();
     _group_cnt = 0;
 
+    _feed_timer.stop();
+
     connect(&_feed_timer, SIGNAL(timeout()), this, SLOT(feed_timeout()));
 }
 
 //SigSession::SigSession(SigSession &o){(void)o;}
 
 SigSession::~SigSession()
-{
+{ 
 }
 
 DevInst* SigSession::get_device()
@@ -142,7 +143,11 @@ DevInst* SigSession::get_device()
 
 void SigSession::deselect_device()
 {
+    for (auto p : _decode_traces){
+        delete p;
+    }
     _decode_traces.clear();
+
     _group_traces.clear();
     _dev_inst = NULL;
 }
@@ -153,8 +158,7 @@ void SigSession::deselect_device()
 void SigSession::set_device(DevInst *dev_inst)
 {
     // Ensure we are not capturing before setting the device
-    //stop_capture();
-
+    
     assert(dev_inst);
 
      if (_dev_inst){
@@ -168,6 +172,9 @@ void SigSession::set_device(DevInst *dev_inst)
 
     _dev_inst = dev_inst;
 
+     for (auto p : _decode_traces){
+        delete p;
+    }
     _decode_traces.clear();
 
     _group_traces.clear();
@@ -358,6 +365,7 @@ void SigSession::capture_init()
     _trigger_flag = false;
     _trigger_ch = 0;
     _hw_replied = false;
+    
     if (_dev_inst->dev_inst()->mode != LOGIC)
         _feed_timer.start(FeedInterval);
     else
@@ -418,8 +426,7 @@ void SigSession::container_init()
     //decoder_model->setDecoderStack(NULL);
     // DecoderStack
     for(auto &d : _decode_traces)
-    {
-        assert(d);
+    { 
         d->decoder()->init();
     }
 
@@ -427,7 +434,7 @@ void SigSession::container_init()
 
 void SigSession::start_capture(bool instant,
     boost::function<void (const QString)> error_handler)
-{
+{  
     // Check that a device instance has been selected.
     if (!_dev_inst) {
         qDebug() << "No device selected";
@@ -445,6 +452,7 @@ void SigSession::start_capture(bool instant,
 
     // stop previous capture
     stop_capture();
+
     // reset measure of dso signal
     for(auto &s : _signals)
     {
@@ -455,10 +463,13 @@ void SigSession::start_capture(bool instant,
     }
 
     // update setting
+    qDebug()<<"device name:"<<_dev_inst->name();
+
     if (_dev_inst->name() != "virtual-session")
         _instant = instant;
     else
         _instant = true;
+
     capture_init();
 
     // Check that at least one probe is enabled
@@ -477,30 +488,59 @@ void SigSession::start_capture(bool instant,
         return;
     }
 
-    if (_sampling_thread && _sampling_thread->joinable()){
-        _sampling_thread->join();
+    if (_sampling_thread.joinable()){
+        _sampling_thread.join();
+    } 
+    _sampling_thread  = std::thread(&SigSession::sample_thread_proc, this, _dev_inst, error_handler);
+}
+
+
+void SigSession::sample_thread_proc(DevInst *dev_inst,
+                                    boost::function<void (const QString)> error_handler)
+{
+    assert(dev_inst);
+    assert(dev_inst->dev_inst());
+    assert(error_handler);
+
+    try {
+        dev_inst->start();
+    } catch(const QString e) {
+        error_handler(e);
+        return;
     }
-    DESTROY_OBJECT(_sampling_thread);
-    _sampling_thread  = new std::thread(&SigSession::sample_thread_proc, this, _dev_inst, error_handler);
+
+    receive_data(0);
+    set_capture_state(Running);
+
+    dev_inst->run();
+
+    set_capture_state(Stopped);
+
+    // Confirm that SR_DF_END was received
+    assert(_cur_logic_snapshot->last_ended());
+    assert(_cur_dso_snapshot->last_ended());
+    assert(_cur_analog_snapshot->last_ended());
 }
 
 void SigSession::stop_capture()
 {
-    data_unlock();
+    do_stop_capture();
+    int dex = 0;
+    clear_all_decode_task(dex);
+}
 
-    for (auto i = _decode_traces.begin(); i != _decode_traces.end(); i++)
-        (*i)->decoder()->stop_decode();
+void SigSession::do_stop_capture()
+{
+    data_unlock(); 
 
-    if (get_capture_state() != Running)
-        return;
-
-    sr_session_stop();
+    if (_dev_inst){
+        _dev_inst->stop();
+    }
 
     // Check that sampling stopped
-     if (_sampling_thread && _sampling_thread->joinable()){
-        _sampling_thread->join();
+    if (_sampling_thread.joinable()){
+        _sampling_thread.join();
     }
-    DESTROY_OBJECT(_sampling_thread);
 }
 
 bool SigSession::get_capture_status(bool &triggered, int &progress)
@@ -561,37 +601,10 @@ void SigSession::set_capture_state(capture_state state)
     data_updated();
     capture_state_changed(state);
 }
-
-void SigSession::sample_thread_proc(DevInst *dev_inst,
-                                    boost::function<void (const QString)> error_handler)
-{
-    assert(dev_inst);
-    assert(dev_inst->dev_inst());
-    assert(error_handler);
-
-    try {
-        dev_inst->start();
-    } catch(const QString e) {
-        error_handler(e);
-        return;
-    }
-
-    receive_data(0);
-    set_capture_state(Running);
-
-    dev_inst->run();
-
-    set_capture_state(Stopped);
-
-    // Confirm that SR_DF_END was received
-    assert(_cur_logic_snapshot->last_ended());
-    assert(_cur_dso_snapshot->last_ended());
-    assert(_cur_analog_snapshot->last_ended());
-}
-
+ 
 void SigSession::check_update()
 {
-    std::lock_guard<std::mutex> lock(_data_mutex);
+    ds_lock_guard lock(_data_mutex);
 
     if (_capture_state != Running)
         return;
@@ -699,6 +712,9 @@ void SigSession::init_signals()
 
 
     // Clear the decode traces
+     for (auto p : _decode_traces){
+        delete p;
+    }
     _decode_traces.clear();
 
 
@@ -842,7 +858,7 @@ void SigSession::reload()
 
 void SigSession::refresh(int holdtime)
 {
-    std::lock_guard<std::mutex> lock(_data_mutex);
+    ds_lock_guard lock(_data_mutex);
 
     data_lock();
 
@@ -850,8 +866,7 @@ void SigSession::refresh(int holdtime)
         _logic_data->init(); 
 
         for(auto &d : _decode_traces)
-        {
-            assert(d);
+        { 
             d->decoder()->init();
         }
 
@@ -1062,6 +1077,7 @@ void SigSession::feed_in_dso(const sr_datafeed_dso &dso)
 
     if (!_instant)
         data_lock();
+
     _data_updated = true;
 }
 
@@ -1103,18 +1119,18 @@ void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
     //data_updated();
     _data_updated = true;
 }
-
+  
 void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
     const struct sr_datafeed_packet *packet)
 {
     assert(sdi);
     assert(packet);
-
-    std::lock_guard<std::mutex> lock(_data_mutex);
-
+   
+    ds_lock_guard lock(_data_mutex);
+  
     if (_data_lock && packet->type != SR_DF_END)
         return;
-
+  
     if (packet->type != SR_DF_END &&
         packet->status != SR_PKT_OK) {
         _error = Pkt_data_err;
@@ -1162,34 +1178,40 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
         break;
     }
     case SR_DF_END:
-    {
+    { 
+        if (!_cur_logic_snapshot->empty())
         {
-            
-            if (!_cur_logic_snapshot->empty()) {
-                for(auto &g : _group_traces)
-                {
-                    assert(g);
+            for (auto &g : _group_traces)
+            {
+                assert(g);
 
-                    auto p = new data::GroupSnapshot(_logic_data->get_snapshots().front(), g->get_index_list());
-                    _group_data->push_snapshot(p); 
-                }
+                auto p = new data::GroupSnapshot(_logic_data->get_snapshots().front(), g->get_index_list());
+                _group_data->push_snapshot(p);
             }
-            _cur_logic_snapshot->capture_ended();
-            _cur_dso_snapshot->capture_ended();
-            _cur_analog_snapshot->capture_ended();
-
-            for(auto &d : _decode_traces)
-                d->frame_ended();
-
         }
+        _cur_logic_snapshot->capture_ended();
+        _cur_dso_snapshot->capture_ended();
+        _cur_analog_snapshot->capture_ended();
+
+        qDebug()<<"data frame end";
+
+        for (auto trace : _decode_traces){
+            trace->decoder()->frame_ended();
+            trace->frame_ended();
+            add_decode_task(trace);
+        } 
 
         if (packet->status != SR_PKT_OK) {
             _error = Pkt_data_err;
             session_error();
         }
+
         frame_ended();
-        if (get_device()->dev_inst()->mode != LOGIC)
-            set_session_time(QDateTime::currentDateTime());
+
+        if (get_device()->dev_inst()->mode != LOGIC){
+             set_session_time(QDateTime::currentDateTime());
+        }
+           
         break;
     }
     }
@@ -1276,7 +1298,7 @@ void SigSession::deregister_hotplug_callback()
     libusb_hotplug_deregister_callback(NULL, _hotplug_handle);
 }
 
-void SigSession::start_hotplug_proc(boost::function<void (const QString)> error_handler)
+void SigSession::start_hotplug_work(boost::function<void (const QString)> error_handler)
 {
 
     // Begin the session
@@ -1284,20 +1306,18 @@ void SigSession::start_hotplug_proc(boost::function<void (const QString)> error_
     _hot_attach = false;
     _hot_detach = false;
 
-    if (_hotplug && _hotplug->joinable()){
-        _hotplug->join();
-    }
-    DESTROY_OBJECT(_hotplug);
-    _hotplug = new std::thread(&SigSession::hotplug_proc, this, error_handler);
+    if (_hotplug_thread.joinable()){
+        return;
+    } 
+    _hotplug_thread =  std::thread(&SigSession::hotplug_proc, this, error_handler);
 }
 
-void SigSession::stop_hotplug_proc()
+void SigSession::stop_hotplug_work()
 {  
     _bHotplugStop = true;
-     if (_hotplug && _hotplug->joinable()){
-        _hotplug->join();
-    }
-     DESTROY_OBJECT(_hotplug);
+     if (_hotplug_thread.joinable()){
+        _hotplug_thread.join();
+    } 
 }
 
 uint16_t SigSession::get_ch_num(int type)
@@ -1337,8 +1357,11 @@ uint16_t SigSession::get_ch_num(int type)
     return num_channels;
 }
 
+bool SigSession::add_decoder(srd_decoder *const dec, bool silent, DecoderStatus *dstatus){
+    return do_add_decoder(dec, silent, dstatus);
+}
 
-bool SigSession::add_decoder(srd_decoder *const dec, bool silent, DecoderStatus *dstatus)
+bool SigSession::do_add_decoder(srd_decoder *const dec, bool silent, DecoderStatus *dstatus)
 {     
     try { 
 
@@ -1370,22 +1393,21 @@ bool SigSession::add_decoder(srd_decoder *const dec, bool silent, DecoderStatus
                 break;
             }
         }
-        if (silent) {
-            _decode_traces.push_back(trace);
+        if (silent) { 
             ret = true;
-        } else if (trace->create_popup()) {
-            _decode_traces.push_back(trace);
+        } else if (trace->create_popup()) { 
             ret = true;
         }
 
         if (ret)
         {
+           _decode_traces.push_back(trace);
+            add_decode_task(trace);
             signals_changed();
-            // Do an initial decode
-            decoder_stack->begin_decode();
             data_updated();
         }
-        else{
+        else
+        {
             delete trace;
         }
 
@@ -1397,71 +1419,46 @@ bool SigSession::add_decoder(srd_decoder *const dec, bool silent, DecoderStatus
  
     return false;
 }
-
+ 
 std::vector<view::DecodeTrace*>& SigSession::get_decode_signals()
 { 
     return _decode_traces;
 }
 
-void SigSession::remove_decode_signal(view::DecodeTrace *signal)
+void SigSession::remove_decoder(int index)
 {
-    for (auto i = _decode_traces.begin();  i != _decode_traces.end(); i++)
-        if ((*i) == signal)
-        {
-            _decode_traces.erase(i);
-            signals_changed();
-            return;
-        }
-}
+    int size = (int)_decode_traces.size();
+    assert(index < size);
 
-void SigSession::remove_decode_signal(int index)
-{
-    int cur_index = 0;
+    auto it = _decode_traces.begin() + index;
+    auto trace = (*it);
+    _decode_traces.erase(it);
 
-    for (auto i = _decode_traces.begin(); i != _decode_traces.end(); i++)
-    {
-        if (cur_index == index)
-        {
-            auto d = (*i)->decoder();
-            d->stop_decode(); //stop decoder thread
-            _decode_traces.erase(i);
-            signals_changed();
-            return;
-        }
-        cur_index++;
+    bool isRunning = trace->decoder()->IsRunning();
+
+    remove_decode_task(trace);
+
+    if (isRunning){
+        //destroy it in thread
+        trace->_delete_flag = true;
     }
+    else{
+        delete trace;
+        signals_changed();
+    } 
 }
 
 void SigSession::rst_decoder(int index)
 {
-    if (index >= 0 && index < (int)_decode_traces.size()){
-        auto p = _decode_traces[index];
-         if (p->create_popup())
-            {
-                p->decoder()->stop_decode();
-                p->decoder()->begin_decode();
-                data_updated();
-            }
+     auto trace = get_decoder_trace(index);
+    
+    if (trace && trace->create_popup() ){
+        remove_decode_task(trace); //remove old task
+        add_decode_task(trace);
+        data_updated();
     }
 }
-
-void SigSession::rst_decoder(view::DecodeTrace *signal)
-{ 
-  for (auto p : _decode_traces)
-  {  
-      if (p == signal)
-      {
-          if (p->create_popup())
-          { 
-              p->decoder()->stop_decode();
-              p->decoder()->begin_decode();
-              data_updated();
-          }
-          break;
-      }
-  }
-}
-
+  
 pv::data::DecoderModel* SigSession::get_decoder_model()
 {
     return _decoder_model;
@@ -1521,7 +1518,8 @@ void SigSession::math_rebuild(bool enable,view::DsoSignal *dsoSig1,
                               view::DsoSignal *dsoSig2,
                               data::MathStack::MathType type)
 {
-    std::lock_guard<std::mutex> lock(_data_mutex);
+    ds_lock_guard lock(_data_mutex);
+
     auto math_stack = new data::MathStack(this, dsoSig1, dsoSig2, type);
     DESTROY_OBJECT(_math_trace);
     _math_trace = new view::MathTrace(enable, math_stack, dsoSig1, dsoSig2);
@@ -1581,7 +1579,7 @@ void SigSession::nodata_timeout()
 }
 
 void SigSession::feed_timeout()
-{
+{  
     data_unlock();
     if (!_data_updated) {
         if (++_noData_cnt >= (WaitShowTime/FeedInterval))
@@ -1783,11 +1781,15 @@ void SigSession::set_stop_scale(float scale)
  }
 
  void SigSession::Close()
- {
-     if (_session == NULL)
-        return;
+ { 
+     if (_bClose)
+        return; 
+
+     _bClose = true;
  
-     stop_capture();
+     do_stop_capture(); //stop capture
+
+     clear_all_decoder(); //clear all decode task, and stop decode thread
 
      ds_trigger_destroy();
 
@@ -1799,12 +1801,158 @@ void SigSession::set_stop_scale(float scale)
      // TODO: This should not be necessary
      _session = NULL;
 
+     stop_hotplug_work();
+
      if (_hotplug_handle)
-     {
-         stop_hotplug_proc();
+     { 
          deregister_hotplug_callback();
          _hotplug_handle = 0;
      }
  }
 
+//append a decode task, and try create a thread
+ void SigSession::add_decode_task(view::DecodeTrace *trace)
+ { 
+     qDebug()<<"add a decode task";
+
+     std::lock_guard<std::mutex> lock(_decode_task_mutex);
+     _decode_tasks.push_back(trace);
+
+     if (!_bDecodeRunning)
+     {
+         if (_decode_thread.joinable())
+             _decode_thread.join();
+
+         _decode_thread = std::thread(&SigSession::decode_task_proc, this);
+         _bDecodeRunning = true;
+     }
+ }
+
+ void SigSession::remove_decode_task(view::DecodeTrace *trace)
+ {
+     std::lock_guard<std::mutex> lock(_decode_task_mutex);
+
+     for (auto it = _decode_tasks.begin(); it != _decode_tasks.end(); it++){
+         if ((*it) == trace){
+              (*it)->decoder()->stop_decode_work();
+             _decode_tasks.erase(it);
+             qDebug()<<"remove a wait decode task";
+             return;  
+         }
+     }
+
+     //the task maybe is running 
+     qDebug()<<"remove a running decode task";
+     trace->decoder()->stop_decode_work();
+ }
+
+ void SigSession::clear_all_decoder()
+ {
+     //create the wait task deque
+     int dex = -1;
+     clear_all_decode_task(dex);
+
+     view::DecodeTrace *runningTrace = NULL;
+     if (dex != -1){
+         runningTrace = _decode_traces[dex];
+         runningTrace->_delete_flag = true;  //destroy it in thread
+     }
+
+     for (auto trace : _decode_traces)
+     {
+         if (trace != runningTrace){
+             delete trace;
+         }
+     }     
+     _decode_traces.clear();
+
+    //wait thread end
+     if (_decode_thread.joinable())
+     {
+         qDebug() << "wait the decode thread end";
+         _decode_thread.join();
+     }
+
+     if (!is_closed())
+        signals_changed();
+ }
+
+ void SigSession::clear_all_decode_task(int &runningDex)
+ {
+     std::lock_guard<std::mutex> lock(_decode_task_mutex);
+  
+     //remove wait task
+      for (auto trace : _decode_tasks){
+          trace->decoder()->stop_decode_work(); //set decode proc stop flag
+      } 
+      _decode_tasks.clear();
+
+      //make sure the running task can stop
+      runningDex = -1;
+      int dex = 0; 
+      for (auto trace : _decode_traces)
+      {
+          if (trace->IsRunning())
+          {
+              trace->decoder()->stop_decode_work();
+              runningDex = dex;
+          }
+          dex++;
+      }
+ }
+ 
+ view::DecodeTrace* SigSession::get_decoder_trace(int index)
+  { 
+      int size = (int)_decode_traces.size();
+      assert(index < size);
+      return   _decode_traces[index];    
+  }
+
+  view::DecodeTrace* SigSession::get_top_decode_task()
+  {
+      std::lock_guard<std::mutex> lock(_decode_task_mutex);
+
+      auto it = _decode_tasks.begin();
+      if (it != _decode_tasks.end()){
+          auto p = (*it);
+          _decode_tasks.erase(it);
+          return p;
+      } 
+
+      return NULL;
+  }
+
+  //the decode task thread proc
+  void SigSession::decode_task_proc(){ 
+
+      qDebug()<<"decode thread start";
+      auto task = get_top_decode_task();
+      
+      while (task != NULL)
+      {
+          qDebug()<<"one decode task be actived";
+ 
+          if (!task->_delete_flag){
+              task->decoder()->begin_decode_work();
+          }
+
+          if (task->_delete_flag){
+             qDebug()<<"desroy a decoder in task thread";
+
+             DESTROY_QT_LATER(task);
+             std::this_thread::sleep_for(std::chrono::milliseconds(100));
+             if (!_bClose){
+                  signals_changed();  
+             }     
+          } 
+
+          task = get_top_decode_task();
+      }  
+
+      qDebug()<<"decode thread end";
+      _bDecodeRunning = false;
+  }
+
+
+
 } // namespace pv
diff --git a/DSView/pv/sigsession.h b/DSView/pv/sigsession.h
index 2ae6c63c..9e1d124e 100755
--- a/DSView/pv/sigsession.h
+++ b/DSView/pv/sigsession.h
@@ -54,6 +54,8 @@ struct srd_channel;
 
 class DecoderStatus;
 
+typedef std::lock_guard<std::mutex> ds_lock_guard;
+
 namespace pv {
 
 class DeviceManager;
@@ -157,22 +159,31 @@ public:
 	capture_state get_capture_state();
 
     uint64_t cur_samplerate();
+
     uint64_t cur_snap_samplerate();
+
     uint64_t cur_samplelimits();
+
     double cur_sampletime();
+
     double cur_snap_sampletime();
+
     double cur_view_time();
 
     void set_cur_snap_samplerate(uint64_t samplerate);
+
     void set_cur_samplelimits(uint64_t samplelimits);
+
     void set_session_time(QDateTime time);
+
     QDateTime get_session_time();
+
     uint64_t get_trigger_pos();
 
-    void start_capture(bool instant,
-		boost::function<void (const QString)> error_handler);
-    void capture_init();
+    void start_capture(bool instant, boost::function<void (const QString)> error_handler);
+
     bool get_capture_status(bool &triggered, int &progress);
+
     void container_init();
 
     std::set<data::SignalData*> get_data();
@@ -183,16 +194,12 @@ public:
 
     bool add_decoder(srd_decoder *const dec, bool silent, DecoderStatus *dstatus);
 
+    void remove_decoder(int index);
+  
     std::vector<view::DecodeTrace*>& get_decode_signals();
-
-    void remove_decode_signal(view::DecodeTrace *signal);
-
-    void remove_decode_signal(int index);
-
+ 
     void rst_decoder(int index);
-
-    void rst_decoder(view::DecodeTrace *signal);
-
+ 
     pv::data::DecoderModel* get_decoder_model();
 
     std::vector<view::SpectrumTrace*>& get_spectrum_traces();
@@ -207,53 +214,78 @@ public:
 
     void del_group();
 
-    void start_hotplug_proc(boost::function<void (const QString)> error_handler);
-    void stop_hotplug_proc();
-	
+    void start_hotplug_work(boost::function<void (const QString)> error_handler);
+
+    void stop_hotplug_work();	
 
     uint16_t get_ch_num(int type);
     
     bool get_instant();
 
     bool get_data_lock();
+
     void data_auto_lock(int lock);
+
     void data_auto_unlock();
+
     bool get_data_auto_lock();
+
     void spectrum_rebuild();
+
     void lissajous_rebuild(bool enable, int xindex, int yindex, double percent);
+
     void lissajous_disable();
+
     void math_rebuild(bool enable,pv::view::DsoSignal *dsoSig1,
                       pv::view::DsoSignal *dsoSig2,
                       data::MathStack::MathType type);
+
     void math_disable();
 
     bool trigd();
+
     uint8_t trigd_ch();
 
     data::Snapshot* get_snapshot(int type);
 
     error_state get_error();
+
     void set_error(error_state state);
+
     void clear_error();
+
     uint64_t get_error_pattern();
 
     run_mode get_run_mode();
+
     void set_run_mode(run_mode mode);
+
     int get_repeat_intvl();
+
     void set_repeat_intvl(int interval);
+
     bool isRepeating();
+
     bool repeat_check();
+
     int get_repeat_hold();
 
     int get_map_zoom();
 
     void set_save_start(uint64_t start);
+
     void set_save_end(uint64_t end);
+
     uint64_t get_save_start();
+
     uint64_t get_save_end();
+
     bool get_saving();
+
     void set_saving(bool saving);
+
     void set_stop_scale(float scale);
+
     float stop_scale();
 
     void exit_capture();
@@ -264,12 +296,37 @@ public:
 
     void Close();
 
+    void clear_all_decoder(); 
+
+    inline bool is_closed(){
+        return _bClose;
+    }
+ 
 private:
 	void set_capture_state(capture_state state);
 
     void register_hotplug_callback();
+
     void deregister_hotplug_callback();
 
+    bool do_add_decoder(srd_decoder *const dec, bool silent, DecoderStatus *dstatus);
+
+    void add_decode_task(view::DecodeTrace *trace);
+
+    void remove_decode_task(view::DecodeTrace *trace);
+
+    void clear_all_decode_task(int &runningDex); 
+  
+    view::DecodeTrace* get_decoder_trace(int index);
+
+    void decode_task_proc();
+
+    view::DecodeTrace* get_top_decode_task();
+    
+    void capture_init();
+
+    void do_stop_capture();
+
 private:
     /**
      * Attempts to autodetect the format. Failing that
@@ -291,11 +348,16 @@ private:
 
     // data feed
 	void feed_in_header(const sr_dev_inst *sdi);
+
 	void feed_in_meta(const sr_dev_inst *sdi,
 		const sr_datafeed_meta &meta);
+
     void feed_in_trigger(const ds_trigger_pos &trigger_pos);
+
 	void feed_in_logic(const sr_datafeed_logic &logic);
+
     void feed_in_dso(const sr_datafeed_dso &dso);
+
 	void feed_in_analog(const sr_datafeed_analog &analog);
     
 	void data_feed_in(const struct sr_dev_inst *sdi,
@@ -306,6 +368,7 @@ private:
 
     // thread for hotplug
     void hotplug_proc(boost::function<void (const QString)> error_handler);
+
     static int hotplug_callback(struct libusb_context *ctx, struct libusb_device *dev,
                                 libusb_hotplug_event event, void *user_data);
 
@@ -321,6 +384,7 @@ signals:
     void receive_data(quint64 length);
 
     void device_attach();
+
     void device_detach();
 
     void receive_trigger(quint64 trigger_pos);
@@ -338,6 +402,7 @@ signals:
     void device_setted();
 
     void zero_adj();
+
     void progressSaveFileValueChanged(int percent);
 
     void decode_done();
@@ -351,6 +416,7 @@ signals:
     void session_error();
 
     void repeat_hold(int percent);
+
     void repeat_resume();
 
     void cur_snap_samplerate_changed();
@@ -359,22 +425,29 @@ signals:
 
 public slots:
     void reload();
+
     void refresh(int holdtime);
+
     void stop_capture();
+
     void check_update();
     // repeat
     void set_repeating(bool repeat);
+    
     void set_map_zoom(int index);
     // OSC auto
     void auto_end();
 
 private slots:
     void data_lock();
+
     void data_unlock();
+
     void nodata_timeout();
+
     void feed_timeout();
-    void repeat_update();
- 
+
+    void repeat_update(); 
  
 private:
 	DeviceManager   *_device_manager;
@@ -382,73 +455,77 @@ private:
 	/**
 	 * The device instance that will be used in the next capture session.
 	 */
-    DevInst     *_dev_inst;
+    DevInst                 *_dev_inst;
+    mutable std::mutex      _sampling_mutex;
+    mutable std::mutex      _data_mutex;
+    mutable std::mutex      _decode_task_mutex;
+ 
+    std::thread             _hotplug_thread;
+    std::thread             _sampling_thread;   
+    std::thread             _decode_thread;
 
-    mutable std::mutex _sampling_mutex;
-	capture_state _capture_state;
-    bool _instant;
-    uint64_t _cur_snap_samplerate;
-    uint64_t _cur_samplelimits;
+    volatile bool           _bHotplugStop;
+    volatile bool           _bDecodeRunning;
 
-    //mutable std::mutex _signals_mutex;
-	std::vector<view::Signal*> _signals;
+	capture_state           _capture_state;
+    bool                    _instant;
+    uint64_t                _cur_snap_samplerate;
+    uint64_t                _cur_samplelimits;
+ 
+	std::vector<view::Signal*>      _signals;
     std::vector<view::GroupSignal*> _group_traces;
 
     std::vector<view::DecodeTrace*> _decode_traces;
-    pv::data::DecoderModel  *_decoder_model;
+    std::vector<view::DecodeTrace*> _decode_tasks;
+    pv::data::DecoderModel          *_decoder_model;
 
     std::vector<view::SpectrumTrace*> _spectrum_traces;
-    view::LissajousTrace    *_lissajous_trace;
-    view::MathTrace *_math_trace;
-
-    mutable std::mutex _data_mutex;
-	data::Logic *_logic_data;
-	data::LogicSnapshot *_cur_logic_snapshot;
-    data::Dso *_dso_data;
-    data::DsoSnapshot *_cur_dso_snapshot;
-	data::Analog *_analog_data;
-	data::AnalogSnapshot *_cur_analog_snapshot;
-    data::Group *_group_data; 
-    int _group_cnt;
-
-	std::thread     *_sampling_thread;
-    std::thread     *_hotplug;
-    volatile bool    _bHotplugStop;
-
+    view::LissajousTrace            *_lissajous_trace;
+    view::MathTrace                 *_math_trace;
+  
+	data::Logic              *_logic_data;
+	data::LogicSnapshot      *_cur_logic_snapshot;
+    data::Dso                *_dso_data;
+    data::DsoSnapshot        *_cur_dso_snapshot;
+	data::Analog             *_analog_data;
+	data::AnalogSnapshot     *_cur_analog_snapshot;
+    data::Group              *_group_data; 
+    int                      _group_cnt;
+ 
 	libusb_hotplug_callback_handle _hotplug_handle;
     
-    bool _hot_attach;
-    bool _hot_detach;
+    bool        _hot_attach;
+    bool        _hot_detach;
 
-    QTimer _feed_timer;
-    int    _noData_cnt;
-    bool _data_lock;
-    bool _data_updated;
-    int _data_auto_lock;
+    QTimer      _feed_timer;
+    int         _noData_cnt;
+    bool        _data_lock;
+    bool        _data_updated;
+    int         _data_auto_lock;
 
-    QDateTime _session_time;
-    uint64_t _trigger_pos;
-    bool _trigger_flag;
-    uint8_t _trigger_ch;
-    bool _hw_replied;
+    QDateTime   _session_time;
+    uint64_t    _trigger_pos;
+    bool        _trigger_flag;
+    uint8_t     _trigger_ch;
+    bool        _hw_replied;
 
     error_state _error;
-    uint64_t _error_pattern;
+    uint64_t    _error_pattern;
 
-    run_mode _run_mode;
-    int _repeat_intvl;
-    bool _repeating;
-    int _repeat_hold_prg;
+    run_mode    _run_mode;
+    int         _repeat_intvl;
+    bool        _repeating;
+    int         _repeat_hold_prg;
 
-    int _map_zoom;
+    int         _map_zoom;
 
-    uint64_t _save_start;
-    uint64_t _save_end;
-    bool _saving;
+    uint64_t    _save_start;
+    uint64_t    _save_end;
+    bool        _saving;
 
-    bool _dso_feed;
-    float _stop_scale;
-   
+    bool        _dso_feed;
+    float       _stop_scale; 
+    bool        _bClose;
 
 private:
 	// TODO: This should not be necessary. Multiple concurrent
diff --git a/DSView/pv/storesession.cpp b/DSView/pv/storesession.cpp
index c99d2efe..1540affb 100755
--- a/DSView/pv/storesession.cpp
+++ b/DSView/pv/storesession.cpp
@@ -83,14 +83,12 @@ SigSession* StoreSession::session()
 }
 
 std::pair<uint64_t, uint64_t> StoreSession::progress()
-{
-    //lock_guard<mutex> lock(_mutex);
+{ 
     return std::make_pair(_units_stored, _unit_count);
 }
 
 const QString& StoreSession::error()
-{
-    //lock_guard<mutex> lock(_mutex);
+{ 
 	return _error;
 }
 
@@ -878,6 +876,7 @@ QJsonArray StoreSession::json_decoders()
             QJsonArray ch_array;
             const srd_decoder *const d = dec->decoder();;
             const bool have_probes = (d->channels || d->opt_channels) != 0;
+
             if (have_probes) {
                 for(auto i = dec->channels().begin();
                     i != dec->channels().end(); i++) {
@@ -946,29 +945,38 @@ QJsonArray StoreSession::json_decoders()
     return dec_array;
 }
 
-void StoreSession::load_decoders(dock::ProtocolDock *widget, QJsonArray dec_array)
+bool StoreSession::load_decoders(dock::ProtocolDock *widget, QJsonArray dec_array)
 {
-    if (_session->get_device()->dev_inst()->mode != LOGIC ||
-        dec_array.empty())
-        return;
+    if (_session->get_device()->dev_inst()->mode != LOGIC || dec_array.empty())
+    {
+         return false;
+    }
+       
 
-    foreach (const QJsonValue &dec_value, dec_array) {
-        QJsonObject dec_obj = dec_value.toObject();
+    for (const QJsonValue &dec_value : dec_array) {
 
-        auto &pre_dsigs = _session->get_decode_signals();
+        QJsonObject dec_obj = dec_value.toObject(); 
+        std::vector<view::DecodeTrace*> &pre_dsigs = _session->get_decode_signals();
+
+        //set current protocol
         if (widget->sel_protocol(dec_obj["id"].toString()))
-            widget->add_protocol(true);
+        {
+             widget->add_protocol(true);
+        }
+        else{
+            continue; //protocol is not exists;
+        }           
 
-        auto &aft_dsigs = _session->get_decode_signals();
+        std::vector<view::DecodeTrace*> &aft_dsigs = _session->get_decode_signals();
 
-        if (aft_dsigs.size() > pre_dsigs.size()) {
+        if (aft_dsigs.size() >= pre_dsigs.size()) {
             const GSList *l;
             
             auto new_dsig = aft_dsigs.back();
             auto stack = new_dsig->decoder();
 
             if (dec_obj.contains("stacked decoders")) {
-                foreach(const QJsonValue &value, dec_obj["stacked decoders"].toArray()) {
+                for(const QJsonValue &value : dec_obj["stacked decoders"].toArray()) {
                     QJsonObject stacked_obj = value.toObject();
 
                     GSList *dl = g_slist_copy((GSList*)srd_decoder_list());
@@ -995,9 +1003,9 @@ void StoreSession::load_decoders(dock::ProtocolDock *widget, QJsonArray dec_arra
                     std::map<const srd_channel*, int> probe_map;
                     // Load the mandatory channels
                     for(l = d->channels; l; l = l->next) {
-                        const struct srd_channel *const pdch =
-                            (struct srd_channel *)l->data;
-                        foreach (const QJsonValue &value, dec_obj["channel"].toArray()) {
+                        const struct srd_channel *const pdch = (struct srd_channel *)l->data;
+
+                        for (const QJsonValue &value : dec_obj["channel"].toArray()) {
                             QJsonObject ch_obj = value.toObject();
                             if (ch_obj.contains(pdch->id)) {
                                 probe_map[pdch] = ch_obj[pdch->id].toInt();
@@ -1008,9 +1016,9 @@ void StoreSession::load_decoders(dock::ProtocolDock *widget, QJsonArray dec_arra
 
                     // Load the optional channels
                     for(l = d->opt_channels; l; l = l->next) {
-                        const struct srd_channel *const pdch =
-                            (struct srd_channel *)l->data;
-                        foreach (const QJsonValue &value, dec_obj["channel"].toArray()) {
+                        const struct srd_channel *const pdch = (struct srd_channel *)l->data;
+
+                        for (const QJsonValue &value : dec_obj["channel"].toArray()) {
                             QJsonObject ch_obj = value.toObject();
                             if (ch_obj.contains(pdch->id)) {
                                 probe_map[pdch] = ch_obj[pdch->id].toInt();
@@ -1021,7 +1029,7 @@ void StoreSession::load_decoders(dock::ProtocolDock *widget, QJsonArray dec_arra
                     dec->set_probes(probe_map);
                     options_obj = dec_obj["options"].toObject();
                 } else {
-                    foreach(const QJsonValue &value, dec_obj["stacked decoders"].toArray()) {
+                    for(const QJsonValue &value : dec_obj["stacked decoders"].toArray()) {
                         QJsonObject stacked_obj = value.toObject();
                         if (QString::fromUtf8(d->id) == stacked_obj["id"].toString()) {
                             options_obj = stacked_obj["options"].toObject();
@@ -1087,6 +1095,7 @@ void StoreSession::load_decoders(dock::ProtocolDock *widget, QJsonArray dec_arra
         }
     }
 
+    return true;
 }
  
 
diff --git a/DSView/pv/storesession.h b/DSView/pv/storesession.h
index c4a49448..c7ef0e1d 100755
--- a/DSView/pv/storesession.h
+++ b/DSView/pv/storesession.h
@@ -80,7 +80,7 @@ private:
 
 public:    
     QJsonArray json_decoders();
-    void load_decoders(dock::ProtocolDock *widget, QJsonArray dec_array);
+    bool load_decoders(dock::ProtocolDock *widget, QJsonArray dec_array);
     QString MakeSaveFile(bool bDlg);
     QString MakeExportFile(bool bDlg);
 
diff --git a/DSView/pv/view/decodetrace.cpp b/DSView/pv/view/decodetrace.cpp
index babe8024..8cc1b1a8 100755
--- a/DSView/pv/view/decodetrace.cpp
+++ b/DSView/pv/view/decodetrace.cpp
@@ -117,31 +117,30 @@ const QString DecodeTrace::RegionEnd = QT_TR_NOOP("End  ");
 
 DecodeTrace::DecodeTrace(pv::SigSession *session,
 	pv::data::DecoderStack *decoder_stack, int index) :
-	Trace(QString::fromUtf8(
-        decoder_stack->stack().front()->decoder()->name), index, SR_CHANNEL_DECODER),
-	_session(session),
-	_decoder_stack(decoder_stack),
-    _decode_start(0),
-    _decode_end(INT64_MAX),
-    _start_index(0),
-    _end_index(0),
-    _start_count(0),
-    _end_count(0),
-    _progress(0), 
-    _popup(NULL)
+	Trace(QString::fromUtf8(decoder_stack->stack().front()->decoder()->name), index, SR_CHANNEL_DECODER)
 {
-	assert(_decoder_stack);
+    assert(decoder_stack);
 
-	_colour = DecodeColours[index % countof(DecodeColours)];
+    _colour = DecodeColours[index % countof(DecodeColours)];
+    _start_comboBox = NULL;
+    _end_comboBox = NULL;
+    _pub_input_layer = NULL;
+    _progress = 0;
 
-    connect(_decoder_stack, SIGNAL(new_decode_data()),
-        this, SLOT(on_new_decode_data()));
-    connect(_decoder_stack, SIGNAL(decode_done()),
-        this, SLOT(on_decode_done()));
+    _decode_start = 0;
+    _decode_end  = INT64_MAX; 
+    _end_count = 0;
+    _start_count = 0;
+    _end_index = 0;
+    _start_index = 0; 
 
-        _start_comboBox = NULL;
-        _end_comboBox = NULL; 
-        _pub_input_layer = NULL;
+    _decoder_stack = decoder_stack;
+    _session = session;
+    _delete_flag = false;
+
+    connect(_decoder_stack, SIGNAL(new_decode_data()), this, SLOT(on_new_decode_data()));
+
+    connect(_decoder_stack, SIGNAL(decode_done()), this, SLOT(on_decode_done()));
 }
 
 DecodeTrace::~DecodeTrace()
@@ -150,10 +149,7 @@ DecodeTrace::~DecodeTrace()
     _probe_selectors.clear();
     _bindings.clear();
 
-    if (_popup){
-        delete _popup;
-        _popup = NULL;
-    }
+    DESTROY_OBJECT(_decoder_stack);
 }
 
 bool DecodeTrace::enabled()
@@ -351,18 +347,13 @@ void DecodeTrace::paint_fore(QPainter &p, int left, int right, QColor fore, QCol
 
 //to show decoder's property setting dialog
 bool DecodeTrace::create_popup()
-{
-    if (_popup != NULL){
-         _popup->reload();          
-        return true;
-    } 
+{ 
+    int ret = false;   //setting have changed flag
+    
+    dialogs::DSDialog dlg;
+    create_popup_form(&dlg);
 
-    int ret = false;
-    _popup = new dialogs::DSDialog();
-
-    create_popup_form();
-
-    if (QDialog::Accepted == _popup->exec())
+    if (QDialog::Accepted == dlg.exec())
     {
         for(auto &dec : _decoder_stack->stack())
         {
@@ -375,26 +366,25 @@ bool DecodeTrace::create_popup()
         }
     }
 
-    //destroy object
     return ret;
 }
 
-void DecodeTrace::create_popup_form()
+void DecodeTrace::create_popup_form(dialogs::DSDialog *dlg)
 {
     // Clear the layout
 
     // Transfer the layout and the child widgets to a temporary widget
     // which then goes out of scope destroying the layout and all the child
     // widgets. 
-   QFormLayout *_popup_form = new QFormLayout();
-    _popup_form->setVerticalSpacing(5);
-    _popup_form->setFormAlignment(Qt::AlignLeft);
-    _popup_form->setLabelAlignment(Qt::AlignLeft);
-    _popup_form->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
-    _popup->layout()->addLayout(_popup_form);
-    _popup->setTitle(tr("Decoder Options"));
+   QFormLayout *form = new QFormLayout();
+    form->setVerticalSpacing(5);
+    form->setFormAlignment(Qt::AlignLeft);
+    form->setLabelAlignment(Qt::AlignLeft);
+    form->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
+    dlg->layout()->addLayout(form);
+    dlg->setTitle(tr("Decoder Options"));
 
-    populate_popup_form(_popup, _popup_form);
+    populate_popup_form(dlg, form);
 }
 
 void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
@@ -424,15 +414,14 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
 
 		form->addRow(new QLabel(
 			tr("<i>* Required channels</i>"), parent));
-	}
-
- 
+	} 
 
     //Add region combobox
     _start_comboBox = new QComboBox(parent);
     _end_comboBox = new QComboBox(parent);
     _start_comboBox->addItem(RegionStart);
     _end_comboBox->addItem(RegionEnd);
+
     if (_view) {
         int index = 1;
         for(std::list<Cursor*>::iterator i = _view->get_cursorList().begin();
@@ -443,6 +432,7 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
             index++;
         }
     }
+
     if (_start_count > _start_comboBox->count())
         _start_index = 0;
     if (_end_count > _end_comboBox->count())
@@ -452,10 +442,7 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
 
     _start_comboBox->setCurrentIndex(_start_index);
     _end_comboBox->setCurrentIndex(_end_index);
-    connect(_start_comboBox, SIGNAL(currentIndexChanged(int)),
-        this, SLOT(on_region_set(int)));
-    connect(_end_comboBox, SIGNAL(currentIndexChanged(int)),
-        this, SLOT(on_region_set(int)));
+
     on_region_set(_start_index);
     form->addRow(_start_comboBox, new QLabel(
                      tr("Decode Start From")));
@@ -465,11 +452,8 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
 	// Add stacking button
 	pv::widgets::DecoderMenu *const decoder_menu =
 		new pv::widgets::DecoderMenu(parent);
-	connect(decoder_menu, SIGNAL(decoder_selected(srd_decoder*)),
-		this, SLOT(on_stack_decoder(srd_decoder*)));
-    //connect(decoder_menu, SIGNAL(selected()),
-    //        parent, SLOT(accept()));
 
+	 
 	QPushButton *const stack_button =
 		new QPushButton(tr("Stack Decoder"), parent);
 	stack_button->setMenu(decoder_menu);
@@ -481,12 +465,21 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
     // Add ButtonBox (OK/Cancel)
     QDialogButtonBox *button_box = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
                                 Qt::Horizontal, parent);
-    connect(button_box, SIGNAL(accepted()), parent, SLOT(accept()));
-    connect(button_box, SIGNAL(rejected()), parent, SLOT(reject()));
+
 
     QHBoxLayout *confirm_button_box = new QHBoxLayout;
     confirm_button_box->addWidget(button_box, 0, Qt::AlignRight);
     form->addRow(confirm_button_box);
+
+    connect(_start_comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(on_region_set(int)));
+
+    connect(_end_comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(on_region_set(int)));
+
+    connect(decoder_menu, SIGNAL(decoder_selected(srd_decoder *)), this, SLOT(on_stack_decoder(srd_decoder *)));
+
+    connect(button_box, SIGNAL(accepted()), parent, SLOT(accept()));
+
+    connect(button_box, SIGNAL(rejected()), parent, SLOT(reject()));
 }
 
 void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
@@ -733,14 +726,15 @@ void DecodeTrace::create_decoder_form(
 		const struct srd_channel *const pdch =
 			(struct srd_channel *)l->data;
 		QComboBox *const combo = create_probe_selector(parent, dec, pdch);
-		connect(combo, SIGNAL(currentIndexChanged(int)),
-			this, SLOT(on_probe_selected(int)));
+
 		decoder_form->addRow(tr("<b>%1</b> (%2) *")
 			.arg(QString::fromUtf8(pdch->name))
 			.arg(QString::fromUtf8(pdch->desc)), combo);
 
 		const ProbeSelector s = {combo, dec, pdch};
 		_probe_selectors.push_back(s);
+
+         connect(combo, SIGNAL(currentIndexChanged(int)), this, SLOT(on_probe_selected(int)));
 	}
 
 	// Add the optional channels
@@ -748,14 +742,15 @@ void DecodeTrace::create_decoder_form(
 		const struct srd_channel *const pdch =
 			(struct srd_channel *)l->data;
 		QComboBox *const combo = create_probe_selector(parent, dec, pdch);
-		connect(combo, SIGNAL(currentIndexChanged(int)),
-			this, SLOT(on_probe_selected(int)));
+		
 		decoder_form->addRow(tr("<b>%1</b> (%2)")
 			.arg(QString::fromUtf8(pdch->name))
 			.arg(QString::fromUtf8(pdch->desc)), combo);
 
 		const ProbeSelector s = {combo, dec, pdch};
 		_probe_selectors.push_back(s);
+
+        connect(combo, SIGNAL(currentIndexChanged(int)), this, SLOT(on_probe_selected(int)));
 	}
 
 	// Add the options
@@ -767,12 +762,11 @@ void DecodeTrace::create_decoder_form(
     //
     pv::widgets::DecoderGroupBox *const group =
         new pv::widgets::DecoderGroupBox(decoder_stack, dec, decoder_form, parent);
-
-    connect(group, SIGNAL(del_stack(data::decode::Decoder*)),
-        this, SLOT(on_del_stack(data::decode::Decoder*)));
-
+ 
 	form->addRow(group);
 	_decoder_forms.push_back(group);
+
+      connect(group, SIGNAL(del_stack(data::decode::Decoder*)), this, SLOT(on_del_stack(data::decode::Decoder*)));
 }
 
 QComboBox* DecodeTrace::create_probe_selector(
@@ -873,19 +867,11 @@ int DecodeTrace::get_progress()
 }
 
 void DecodeTrace::on_decode_done()
-{
-//    if (_view) {
-//        _view->set_update(_viewport, true);
-//        _view->signals_changed();
-//    }
+{ 
     on_new_decode_data();
     _session->decode_done();
 }
-
-void DecodeTrace::on_delete()
-{
-    _session->remove_decode_signal(this);
-}
+ 
 
 void DecodeTrace::on_probe_selected(int)
 {
@@ -899,7 +885,7 @@ void DecodeTrace::on_stack_decoder(srd_decoder *decoder)
 
     _decoder_stack->push(new data::decode::Decoder(decoder));
      
-    create_popup_form();
+  //  create_popup_form();
 }
 
 void DecodeTrace::on_del_stack(data::decode::Decoder *dec)
@@ -908,7 +894,7 @@ void DecodeTrace::on_del_stack(data::decode::Decoder *dec)
     assert(_decoder_stack);
 
     _decoder_stack->remove(dec);
-    create_popup_form();
+ //   create_popup_form();
 }
 
 int DecodeTrace::rows_size()
diff --git a/DSView/pv/view/decodetrace.h b/DSView/pv/view/decodetrace.h
index d2d59f37..5b361e5c 100755
--- a/DSView/pv/view/decodetrace.h
+++ b/DSView/pv/view/decodetrace.h
@@ -58,6 +58,7 @@ class DecoderGroupBox;
 
 namespace view {
 
+//create by  SigSession
 class DecodeTrace : public Trace
 {
 	Q_OBJECT
@@ -98,6 +99,8 @@ public:
 	DecodeTrace(pv::SigSession *session,
 		pv::data::DecoderStack *decoder_stack,
 		int index);
+
+public:
     ~DecodeTrace();
 
 	bool enabled();
@@ -147,7 +150,7 @@ protected:
     void paint_type_options(QPainter &p, int right, const QPoint pt, QColor fore);
 
 private:
-    void create_popup_form();
+    void create_popup_form(dialogs::DSDialog *dlg);
 
 	void populate_popup_form(QWidget *parent, QFormLayout *form);
 
@@ -191,9 +194,7 @@ signals:
 
 private slots:
 	void on_new_decode_data();
-
-	void on_delete();
-
+  
 	void on_probe_selected(int);
 
 	void on_stack_decoder(srd_decoder *decoder);
@@ -204,6 +205,9 @@ private slots:
 
     void on_region_set(int index);
 
+public:
+	volatile bool _delete_flag; //detroy it when deocde task end
+
 private:
 	pv::SigSession 			*_session;
 	pv::data::DecoderStack 	*_decoder_stack;
@@ -214,6 +218,7 @@ private:
 	int 	 		_end_index;
     int 			_start_count;
 	int			 	_end_count;
+	
     QComboBox 		*_start_comboBox;
 	QComboBox 		*_end_comboBox;
 	QFormLayout 	*_pub_input_layer;
@@ -224,7 +229,6 @@ private:
 	std::vector<pv::widgets::DecoderGroupBox*> _decoder_forms;
 
 	std::vector<QString> 	_cur_row_headings; 
-    dialogs::DSDialog 		*_popup;
 };
 
 } // namespace view
diff --git a/DSView/pv/view/view.cpp b/DSView/pv/view/view.cpp
index 5ee7244f..91b53b5b 100755
--- a/DSView/pv/view/view.cpp
+++ b/DSView/pv/view/view.cpp
@@ -100,12 +100,7 @@ View::View(SigSession *session, pv::toolbars::SamplingBar *sampling_bar, QWidget
     assert(session);
 
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
-
-	connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
-		this, SLOT(h_scroll_value_changed(int)));
-	connect(verticalScrollBar(), SIGNAL(valueChanged(int)),
-		this, SLOT(v_scroll_value_changed(int)));
-
+  
     // trace viewport map
     _trace_view_map[SR_CHANNEL_LOGIC] = TIME_VIEW;
     _trace_view_map[SR_CHANNEL_GROUP] = TIME_VIEW;
@@ -128,16 +123,12 @@ View::View(SigSession *session, pv::toolbars::SamplingBar *sampling_bar, QWidget
     _time_viewport = new Viewport(*this, TIME_VIEW);
     _time_viewport->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
     _time_viewport->setMinimumHeight(100);
-    connect(_time_viewport, SIGNAL(measure_updated()),
-            this, SLOT(on_measure_updated()));
-    connect(_time_viewport, SIGNAL(prgRate(int)), this, SIGNAL(prgRate(int)));
+  
     _fft_viewport = new Viewport(*this, FFT_VIEW);
     _fft_viewport->setVisible(false);
     _fft_viewport->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
     _fft_viewport->setMinimumHeight(100);
-    connect(_fft_viewport, SIGNAL(measure_updated()),
-            this, SLOT(on_measure_updated()));
-
+ 
     _vsplitter = new QSplitter(this);
     _vsplitter->setOrientation(Qt::Vertical);
     _vsplitter->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
@@ -162,35 +153,6 @@ View::View(SigSession *session, pv::toolbars::SamplingBar *sampling_bar, QWidget
     _viewbottom->setFixedHeight(StatusHeight);
     layout->addWidget(_viewbottom, 1, 0);
     setViewport(_viewcenter);
-    connect(_vsplitter, SIGNAL(splitterMoved(int,int)),
-        this, SLOT(splitterMoved(int, int)));
-
-    connect(_session, SIGNAL(device_setted()),
-            _devmode, SLOT(set_device()));
-    connect(_session, SIGNAL(signals_changed()),
-        this, SLOT(signals_changed()), Qt::DirectConnection);
-    connect(_session, SIGNAL(data_updated()),
-        this, SLOT(data_updated()));
-    connect(_session, SIGNAL(receive_trigger(quint64)),
-            this, SLOT(receive_trigger(quint64)));
-    connect(_session, SIGNAL(frame_ended()),
-            this, SLOT(receive_end()));
-    connect(_session, SIGNAL(frame_began()),
-            this, SLOT(frame_began()));
-    connect(_session, SIGNAL(show_region(uint64_t, uint64_t, bool)),
-            this, SLOT(show_region(uint64_t, uint64_t, bool)));
-    connect(_session, SIGNAL(show_wait_trigger()),
-            _time_viewport, SLOT(show_wait_trigger()));
-    connect(_session, SIGNAL(repeat_hold(int)),
-            this, SLOT(repeat_show()));
-
-    connect(_devmode, SIGNAL(dev_changed(bool)),
-            this, SLOT(dev_changed(bool)), Qt::DirectConnection);
-
-    connect(_header, SIGNAL(traces_moved()),
-        this, SLOT(on_traces_moved()));
-    connect(_header, SIGNAL(header_updated()),
-        this, SLOT(header_updated()));
 
     _time_viewport->installEventFilter(this);
     _fft_viewport->installEventFilter(this);
@@ -213,6 +175,28 @@ View::View(SigSession *session, pv::toolbars::SamplingBar *sampling_bar, QWidget
 
     _cali = new pv::dialogs::Calibration(this);
     _cali->hide();
+
+	connect(horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(h_scroll_value_changed(int)));
+	connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(v_scroll_value_changed(int)));
+
+    connect(_time_viewport, SIGNAL(measure_updated()),this, SLOT(on_measure_updated()));
+    connect(_time_viewport, SIGNAL(prgRate(int)), this, SIGNAL(prgRate(int)));
+    connect(_fft_viewport, SIGNAL(measure_updated()), this, SLOT(on_measure_updated()));
+
+    connect(_vsplitter, SIGNAL(splitterMoved(int,int)), this, SLOT(splitterMoved(int, int)));
+    connect(_session, SIGNAL(device_setted()),  _devmode, SLOT(set_device()));
+    connect(_session, SIGNAL(signals_changed()), this, SLOT(signals_changed()), Qt::DirectConnection);
+    connect(_session, SIGNAL(data_updated()), this, SLOT(data_updated()));
+    connect(_session, SIGNAL(receive_trigger(quint64)), this, SLOT(receive_trigger(quint64)));
+    connect(_session, SIGNAL(frame_ended()), this, SLOT(receive_end()));
+    connect(_session, SIGNAL(frame_began()),  this, SLOT(frame_began()));
+    connect(_session, SIGNAL(show_region(uint64_t, uint64_t, bool)), this, SLOT(show_region(uint64_t, uint64_t, bool)));
+
+    connect(_session, SIGNAL(show_wait_trigger()),  _time_viewport, SLOT(show_wait_trigger()));
+    connect(_session, SIGNAL(repeat_hold(int)), this, SLOT(repeat_show()));
+    connect(_devmode, SIGNAL(dev_changed(bool)),this, SLOT(dev_changed(bool)), Qt::DirectConnection);
+    connect(_header, SIGNAL(traces_moved()),this, SLOT(on_traces_moved()));
+    connect(_header, SIGNAL(header_updated()),this, SLOT(header_updated()));
 }
 
 SigSession& View::session()
diff --git a/DSView/pv/view/viewstatus.cpp b/DSView/pv/view/viewstatus.cpp
index 3a1cf19f..cfad21d2 100755
--- a/DSView/pv/view/viewstatus.cpp
+++ b/DSView/pv/view/viewstatus.cpp
@@ -237,7 +237,7 @@ void ViewStatus::load_session(QJsonArray measure_array)
         measure_array.empty())
         return;
 
-    foreach (const QJsonValue &measure_value, measure_array) {
+    for (const QJsonValue &measure_value : measure_array) {
         QJsonObject m_obj = measure_value.toObject();
         int index = m_obj["site"].toInt();
         int sig_index = m_obj["index"].toInt();
diff --git a/libsigrok4DSL/hardware/demo/demo.h b/libsigrok4DSL/hardware/demo/demo.h
index 7fbb87e5..0a9cb52e 100755
--- a/libsigrok4DSL/hardware/demo/demo.h
+++ b/libsigrok4DSL/hardware/demo/demo.h
@@ -168,7 +168,7 @@ static const struct DEMO_profile supported_Demo[] = {
       (1 << DEMO_LOGIC100x16) |
       (1 << DEMO_ANALOG10x2) |
       (1 << DEMO_DSO200x2),
-     //SR_Mn(100),
+      //SR_Mn(100),
       SR_Gn(16),
       SR_Kn(20),              
       0,
diff --git a/libsigrok4DSL/session.c b/libsigrok4DSL/session.c
index 34923f4c..ce46fcb9 100755
--- a/libsigrok4DSL/session.c
+++ b/libsigrok4DSL/session.c
@@ -36,6 +36,8 @@
 
 int bExportOriginalData = 0; //able export all data
 
+int session_loop_stop_flag = 0;
+
 /**
  * @file
  *
@@ -403,12 +405,14 @@ SR_API int sr_session_run(void)
 
     session->running = TRUE;
 
+    session_loop_stop_flag = 0;
+
 	sr_info("Running...");
 
 	/* Do we have real sources? */
 	if (session->num_sources == 1 && session->pollfds[0].fd == -1) {
 		/* Dummy source, freewheel over it. */
-        while (session->num_sources) {
+        while (session->num_sources && !session_loop_stop_flag) {
             if (session->abort_session) {
                 session->sources[0].cb(-1, -1, session->sources[0].cb_data);
                 break;
@@ -418,8 +422,9 @@ SR_API int sr_session_run(void)
         }
 	} else {
 		/* Real sources, use g_poll() main loop. */
-        while (session->num_sources)
-            sr_session_iteration(TRUE);
+        while (session->num_sources && !session_loop_stop_flag){
+			sr_session_iteration(TRUE);
+		}            
 	}
 
     g_mutex_lock(&session->stop_mutex);
@@ -484,9 +489,11 @@ SR_API int sr_session_stop(void)
 		return SR_ERR_BUG;
 	}
 
+	session_loop_stop_flag = 1; //set flag, the run loop will exit
+
     g_mutex_lock(&session->stop_mutex);
     if (session->running)
-        session->abort_session = TRUE;
+        session->abort_session = TRUE;  
     g_mutex_unlock(&session->stop_mutex);
 
 	return SR_OK;

From 140b5bf9f5aac019e54a261bf82f2796c24cdd4e Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Tue, 9 Nov 2021 13:51:59 +0800
Subject: [PATCH 22/58] mem manager update 1

---
 DSView/pv/config/appconfig.cpp     |   2 +-
 DSView/pv/data/analog.cpp          |  10 +-
 DSView/pv/data/analog.h            |   4 +-
 DSView/pv/data/decoderstack.cpp    |  10 +-
 DSView/pv/data/dso.cpp             |  10 +-
 DSView/pv/data/dso.h               |   4 +-
 DSView/pv/data/logic.cpp           |  10 +-
 DSView/pv/data/logic.h             |   4 +-
 DSView/pv/device/devinst.cpp       |   1 -
 DSView/pv/dialogs/dsmessagebox.cpp |   1 +
 DSView/pv/dsvdef.h                 |   2 +
 DSView/pv/mainwindow.cpp           |   2 +-
 DSView/pv/sigsession.cpp           | 185 ++++++++++++++---------------
 DSView/pv/sigsession.h             |   7 +-
 DSView/pv/toolbars/titlebar.cpp    |  10 +-
 DSView/pv/toolbars/trigbar.cpp     |   9 +-
 DSView/pv/view/devmode.cpp         |  11 +-
 DSView/pv/view/mathtrace.cpp       |   5 +-
 DSView/pv/view/spectrumtrace.cpp   |   3 +-
 19 files changed, 156 insertions(+), 134 deletions(-)

diff --git a/DSView/pv/config/appconfig.cpp b/DSView/pv/config/appconfig.cpp
index 3901c7bf..b921a631 100644
--- a/DSView/pv/config/appconfig.cpp
+++ b/DSView/pv/config/appconfig.cpp
@@ -269,7 +269,7 @@ QString GetDirectoryName(QString path)
 }
 
 QString GetIconPath()
-{ 
+{   
     QString style = AppConfig::Instance()._frameOptions.style;
     if (style == ""){
         style = "dark";
diff --git a/DSView/pv/data/analog.cpp b/DSView/pv/data/analog.cpp
index 4dfcc8c4..16339621 100755
--- a/DSView/pv/data/analog.cpp
+++ b/DSView/pv/data/analog.cpp
@@ -22,6 +22,7 @@
 
 #include "analog.h"
 #include "analogsnapshot.h"
+#include <assert.h>
  
 
 using namespace std;
@@ -29,9 +30,11 @@ using namespace std;
 namespace pv {
 namespace data {
 
-Analog::Analog() :
+Analog::Analog(AnalogSnapshot *snapshot) :
     SignalData()
 {
+    assert(snapshot);
+    _snapshots.push_front(snapshot);
 }
 
 void Analog::push_snapshot(AnalogSnapshot *snapshot)
@@ -57,5 +60,10 @@ void Analog::init()
         s->init();
 }
 
+AnalogSnapshot* Analog::snapshot()
+{
+    return _snapshots[0];
+}
+
 } // namespace data
 } // namespace pv
diff --git a/DSView/pv/data/analog.h b/DSView/pv/data/analog.h
index dbba04df..d3541f8e 100755
--- a/DSView/pv/data/analog.h
+++ b/DSView/pv/data/analog.h
@@ -37,13 +37,15 @@ class AnalogSnapshot;
 class Analog : public SignalData
 {
 public:
-    Analog();
+    Analog(AnalogSnapshot *snapshot);
 
 	void push_snapshot(AnalogSnapshot *snapshot);
 	std::deque<AnalogSnapshot*>& get_snapshots();
     void clear();
     void init();
 
+    AnalogSnapshot* snapshot();
+
 private:
 	std::deque<AnalogSnapshot*> _snapshots;
 };
diff --git a/DSView/pv/data/decoderstack.cpp b/DSView/pv/data/decoderstack.cpp
index 4aa6a86e..4c76ac7e 100755
--- a/DSView/pv/data/decoderstack.cpp
+++ b/DSView/pv/data/decoderstack.cpp
@@ -401,8 +401,7 @@ void DecoderStack::do_decode_work()
     pv::data::Logic *data = NULL;
 
     if (!_options_changed)
-    {
-        qDebug()<<"data not be ready";
+    { 
         return;
     } 
     _options_changed = false;
@@ -542,9 +541,7 @@ void DecoderStack::decode_data(const uint64_t decode_start, const uint64_t decod
 
     if (error)
         g_free(error);
-
-    qDebug()<<"decode tack proc end";
-    
+  
     if (!_session->is_closed())
         decode_done();
 }
@@ -565,8 +562,7 @@ void DecoderStack::decode_proc()
     
     // Get the intial sample count
     _sample_count = _snapshot->get_sample_count();
-
-    qDebug()<<"sample count:"<<_sample_count;
+ 
 
     // Create the decoders
     for(auto &dec : _stack)
diff --git a/DSView/pv/data/dso.cpp b/DSView/pv/data/dso.cpp
index acbd6c62..ea05f5b7 100755
--- a/DSView/pv/data/dso.cpp
+++ b/DSView/pv/data/dso.cpp
@@ -21,6 +21,7 @@
 
 #include "dso.h"
 #include "dsosnapshot.h"
+#include <assert.h>
  
 
 using namespace std;
@@ -28,9 +29,11 @@ using namespace std;
 namespace pv {
 namespace data {
 
-Dso::Dso() :
+Dso::Dso(DsoSnapshot *snapshot) :
     SignalData()
 {
+    assert(snapshot);
+    _snapshots.push_front(snapshot);
 }
 
 void Dso::push_snapshot(DsoSnapshot *snapshot)
@@ -57,5 +60,10 @@ void Dso::init()
         s->init();
 }
 
+ DsoSnapshot* Dso::snapshot()
+ {
+     return _snapshots[0];
+ }
+
 } // namespace data
 } // namespace pv
diff --git a/DSView/pv/data/dso.h b/DSView/pv/data/dso.h
index 1ef87645..cd03988d 100755
--- a/DSView/pv/data/dso.h
+++ b/DSView/pv/data/dso.h
@@ -35,7 +35,7 @@ class DsoSnapshot;
 class Dso : public SignalData
 {
 public:
-    Dso();
+    Dso(DsoSnapshot *snapshot);
 
 	void push_snapshot(DsoSnapshot *snapshot);
 
@@ -44,6 +44,8 @@ public:
     void clear();
     void init();
 
+    DsoSnapshot* snapshot();
+
 private:
     std::deque<DsoSnapshot*> _snapshots;
 };
diff --git a/DSView/pv/data/logic.cpp b/DSView/pv/data/logic.cpp
index 71055656..ccc7ec54 100755
--- a/DSView/pv/data/logic.cpp
+++ b/DSView/pv/data/logic.cpp
@@ -22,15 +22,18 @@
 
 #include "logic.h"
 #include "logicsnapshot.h"
+#include <assert.h>
 
 using namespace std;
 
 namespace pv {
 namespace data {
 
-Logic::Logic() :
+Logic::Logic(LogicSnapshot *snapshot) :
     SignalData()
 {
+    assert(snapshot);
+    _snapshots.push_front(snapshot);
 }
 
 void Logic::push_snapshot(LogicSnapshot *snapshot)
@@ -57,5 +60,10 @@ void Logic::init()
         s->init();
 }
 
+ LogicSnapshot* Logic::snapshot()
+ {
+    return _snapshots[0];
+ }
+
 } // namespace data
 } // namespace pv
diff --git a/DSView/pv/data/logic.h b/DSView/pv/data/logic.h
index 2eb76aed..5f925a1c 100755
--- a/DSView/pv/data/logic.h
+++ b/DSView/pv/data/logic.h
@@ -36,7 +36,7 @@ class LogicSnapshot;
 class Logic : public SignalData
 {
 public:
-    Logic();
+    Logic(LogicSnapshot *snapshot);
 
 	void push_snapshot(LogicSnapshot *snapshot);
 
@@ -46,6 +46,8 @@ public:
 
     void init();
 
+    LogicSnapshot* snapshot();
+
 private:
 	std::deque<LogicSnapshot*> _snapshots;
 };
diff --git a/DSView/pv/device/devinst.cpp b/DSView/pv/device/devinst.cpp
index a17b6098..b0bf7d5a 100755
--- a/DSView/pv/device/devinst.cpp
+++ b/DSView/pv/device/devinst.cpp
@@ -53,7 +53,6 @@ void* DevInst::get_id()
 void DevInst::use(SigSession *owner)
 {
 	assert(owner);
-	assert(!_owner);
 	_owner = owner;
 }
 
diff --git a/DSView/pv/dialogs/dsmessagebox.cpp b/DSView/pv/dialogs/dsmessagebox.cpp
index eb8f8bbd..2df07b6e 100755
--- a/DSView/pv/dialogs/dsmessagebox.cpp
+++ b/DSView/pv/dialogs/dsmessagebox.cpp
@@ -36,6 +36,7 @@ namespace dialogs {
 DSMessageBox::DSMessageBox(QWidget *parent,const char *title) :
     QDialog(NULL) //must be null, otherwise window can not able to move
 {
+    (void)parent;
     _layout = NULL;
     _main_widget = NULL;
     _msg = NULL;
diff --git a/DSView/pv/dsvdef.h b/DSView/pv/dsvdef.h
index cc5283c8..9069c153 100644
--- a/DSView/pv/dsvdef.h
+++ b/DSView/pv/dsvdef.h
@@ -39,6 +39,8 @@ class QWidget;
 #define DESTROY_QT_OBJECT(p) if((p)){((p))->deleteLater(); p = NULL;}
 #define DESTROY_QT_LATER(p) ((p))->deleteLater();
 
+#define RELEASE_ARRAY(a)   for (auto ptr : (a)){delete ptr;} (a).clear();
+
 namespace DecoderDataFormat
 {
     enum _data_format
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index 79b986a4..5186f719 100755
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -1432,7 +1432,7 @@ void MainWindow::switchTheme(QString style)
     {
         app._frameOptions.style = style;
         app.SaveFrame();
-    }
+    } 
 
     QString qssRes = ":/" + style + ".qss";
     QFile qss(qssRes);
diff --git a/DSView/pv/sigsession.cpp b/DSView/pv/sigsession.cpp
index b63d1aa9..a42432db 100755
--- a/DSView/pv/sigsession.cpp
+++ b/DSView/pv/sigsession.cpp
@@ -78,15 +78,7 @@ namespace pv {
 // TODO: This should not be necessary
 SigSession* SigSession::_session = NULL;
 
-SigSession::SigSession(DeviceManager *device_manager) :
-    _capture_state(Init),
-    _instant(false),
-    _error(No_err),
-    _run_mode(Single),
-    _repeat_intvl(1),
-    _repeating(false),
-    _repeat_hold_prg(0),
-    _map_zoom(0)
+SigSession::SigSession(DeviceManager *device_manager) 
 {
     _hotplug_handle = 0;
     _dev_inst = NULL;
@@ -97,6 +89,15 @@ SigSession::SigSession(DeviceManager *device_manager) :
     _hot_detach = false;
     _group_cnt = 0;
     _bHotplugStop = false;  
+
+    _map_zoom = 0;
+    _repeat_hold_prg = 0;
+    _repeating = false;
+    _repeat_intvl = 1;
+    _run_mode = Single;    
+    _error = No_err;
+    _instant = false;
+    _capture_state = Init;
   
     _noData_cnt = 0;
     _data_lock = false;
@@ -112,16 +113,10 @@ SigSession::SigSession(DeviceManager *device_manager) :
     _bDecodeRunning = false;
     _bClose = false;
 
-    // Create snapshots & data containers
-    _cur_logic_snapshot = new data::LogicSnapshot();
-    _logic_data = new data::Logic();
-    _logic_data->push_snapshot(_cur_logic_snapshot);
-    _cur_dso_snapshot = new data::DsoSnapshot();
-    _dso_data = new data::Dso();
-    _dso_data->push_snapshot(_cur_dso_snapshot);
-    _cur_analog_snapshot = new data::AnalogSnapshot();
-    _analog_data = new data::Analog();
-    _analog_data->push_snapshot(_cur_analog_snapshot);
+    // Create snapshots & data containers 
+    _logic_data = new data::Logic(new data::LogicSnapshot()); 
+    _dso_data = new data::Dso(new data::DsoSnapshot()); 
+    _analog_data = new data::Analog(new data::AnalogSnapshot()); 
     _group_data = new data::Group();
     _group_cnt = 0;
 
@@ -142,13 +137,9 @@ DevInst* SigSession::get_device()
 }
 
 void SigSession::deselect_device()
-{
-    for (auto p : _decode_traces){
-        delete p;
-    }
-    _decode_traces.clear();
-
-    _group_traces.clear();
+{ 
+    RELEASE_ARRAY(_decode_traces);
+    RELEASE_ARRAY(_group_traces);
     _dev_inst = NULL;
 }
 
@@ -172,12 +163,8 @@ void SigSession::set_device(DevInst *dev_inst)
 
     _dev_inst = dev_inst;
 
-     for (auto p : _decode_traces){
-        delete p;
-    }
-    _decode_traces.clear();
-
-    _group_traces.clear();
+    RELEASE_ARRAY(_decode_traces);
+    RELEASE_ARRAY(_group_traces);
 
     if (_dev_inst) {
         try {
@@ -517,9 +504,9 @@ void SigSession::sample_thread_proc(DevInst *dev_inst,
     set_capture_state(Stopped);
 
     // Confirm that SR_DF_END was received
-    assert(_cur_logic_snapshot->last_ended());
-    assert(_cur_dso_snapshot->last_ended());
-    assert(_cur_analog_snapshot->last_ended());
+    assert(_logic_data->snapshot()->last_ended());
+    assert(_dso_data->snapshot()->last_ended());
+    assert(_analog_data->snapshot()->last_ended());
 }
 
 void SigSession::stop_capture()
@@ -654,7 +641,8 @@ void SigSession::del_group()
 {
     auto i = _group_traces.begin();
 
-    while (i != _group_traces.end()) {
+    while (i != _group_traces.end()) { 
+        
         pv::view::GroupSignal *psig = *(i);
 
         if (psig->selected()) {
@@ -711,12 +699,8 @@ void SigSession::init_signals()
         _group_data->clear();
 
 
-    // Clear the decode traces
-     for (auto p : _decode_traces){
-        delete p;
-    }
-    _decode_traces.clear();
-
+    // Clear the decode traces 
+    RELEASE_ARRAY(_decode_traces);
 
     // Detect what data types we will receive
     if(_dev_inst) {
@@ -743,41 +727,42 @@ void SigSession::init_signals()
         }
     }
 
-    // Make the logic probe list
+    // Make the logic probe list 
+    RELEASE_ARRAY(_group_traces);
+
+    std::vector<view::GroupSignal *>().swap(_group_traces);
+
+    for (GSList *l = _dev_inst->dev_inst()->channels; l; l = l->next)
     {
-        _group_traces.clear();
-        std::vector<view::GroupSignal*>().swap(_group_traces);
+        sr_channel *probe =
+            (sr_channel *)l->data;
+        assert(probe);
+        signal = NULL;
 
-        for (GSList *l = _dev_inst->dev_inst()->channels; l; l = l->next) {
-            sr_channel *probe =
-                ( sr_channel *)l->data;
-            assert(probe);
-            signal = NULL;
+        switch (probe->type)
+        {
+        case SR_CHANNEL_LOGIC:
+            if (probe->enabled)
+                signal = new view::LogicSignal(_dev_inst, _logic_data, probe);
+            break;
 
-            switch(probe->type) {
-            case SR_CHANNEL_LOGIC:
-                if (probe->enabled)
-                   signal = new view::LogicSignal(_dev_inst, _logic_data, probe);
-                break;
+        case SR_CHANNEL_DSO:
+            signal = new view::DsoSignal(_dev_inst, _dso_data, probe);
+            break;
 
-            case SR_CHANNEL_DSO:
-                signal = new view::DsoSignal(_dev_inst, _dso_data, probe);
-                break;
-
-            case SR_CHANNEL_ANALOG:
-                if (probe->enabled)
-                    signal = new view::AnalogSignal(_dev_inst, _analog_data, probe);
-                break;
-            }
-            if(signal != NULL)
-                sigs.push_back(signal);
+        case SR_CHANNEL_ANALOG:
+            if (probe->enabled)
+                signal = new view::AnalogSignal(_dev_inst, _analog_data, probe);
+            break;
         }
-
-        _signals.clear();
-        std::vector<view::Signal*>().swap(_signals);
-        _signals = sigs;
+        if (signal != NULL)
+            sigs.push_back(signal);
     }
 
+    RELEASE_ARRAY(_signals);
+    std::vector<view::Signal *>().swap(_signals);
+    _signals = sigs;
+
     spectrum_rebuild();
     lissajous_disable();
     math_disable();
@@ -846,8 +831,8 @@ void SigSession::reload()
                 sigs.push_back(signal);
         }
 
-        if (!sigs.empty()) {
-            _signals.clear();
+        if (!sigs.empty()) { 
+            RELEASE_ARRAY(_signals);
             std::vector<view::Signal*>().swap(_signals);
             _signals = sigs;
         }
@@ -869,8 +854,8 @@ void SigSession::refresh(int holdtime)
         { 
             d->decoder()->init();
         }
-
     }
+
     if (_dso_data) {
         _dso_data->init();
         // SpectrumStack
@@ -879,9 +864,11 @@ void SigSession::refresh(int holdtime)
             assert(m);
             m->get_spectrum_stack()->init();
         }
+
         if (_math_trace)
             _math_trace->get_math_stack()->init();
     }
+
     if (_analog_data) {
         _analog_data->init(); 
     }
@@ -975,7 +962,7 @@ void SigSession::feed_in_trigger(const ds_trigger_pos &trigger_pos)
 
 void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
 { 
-    if (!_logic_data || _cur_logic_snapshot->memory_failed()) {
+    if (!_logic_data || _logic_data->snapshot()->memory_failed()) {
         qDebug() << "Unexpected logic packet";
         return;
     }
@@ -986,8 +973,8 @@ void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
         session_error();
     }
 
-    if (_cur_logic_snapshot->last_ended()) {
-        _cur_logic_snapshot->first_payload(logic, _dev_inst->get_sample_limit(), _dev_inst->dev_inst()->channels);
+    if (_logic_data->snapshot()->last_ended()) {
+        _logic_data->snapshot()->first_payload(logic, _dev_inst->get_sample_limit(), _dev_inst->dev_inst()->channels);
         // @todo Putting this here means that only listeners querying
         // for logic will be notified. Currently the only user of
         // frame_began is DecoderStack, but in future we need to signal
@@ -995,10 +982,10 @@ void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
         frame_began();
     } else {
         // Append to the existing data snapshot
-        _cur_logic_snapshot->append_payload(logic);
+        _logic_data->snapshot()->append_payload(logic);
     }
 
-    if (_cur_logic_snapshot->memory_failed()) {
+    if (_logic_data->snapshot()->memory_failed()) {
         _error = Malloc_err;
         session_error();
         return;
@@ -1012,13 +999,13 @@ void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
 
 void SigSession::feed_in_dso(const sr_datafeed_dso &dso)
 {  
-    if(!_dso_data || _cur_dso_snapshot->memory_failed())
+    if(!_dso_data || _dso_data->snapshot()->memory_failed())
     {
         qDebug() << "Unexpected dso packet";
         return;	// This dso packet was not expected.
     }
 
-    if (_cur_dso_snapshot->last_ended())
+    if (_dso_data->snapshot()->last_ended())
     {
         std::map<int, bool> sig_enable;
         // reset scale of dso signal
@@ -1033,10 +1020,10 @@ void SigSession::feed_in_dso(const sr_datafeed_dso &dso)
         }
 
         // first payload
-        _cur_dso_snapshot->first_payload(dso, _dev_inst->get_sample_limit(), sig_enable, _instant);
+        _dso_data->snapshot()->first_payload(dso, _dev_inst->get_sample_limit(), sig_enable, _instant);
     } else {
         // Append to the existing data snapshot
-        _cur_dso_snapshot->append_payload(dso);
+        _dso_data->snapshot()->append_payload(dso);
     }
 
     for(auto &s : _signals) {
@@ -1051,7 +1038,7 @@ void SigSession::feed_in_dso(const sr_datafeed_dso &dso)
  
     }
 
-    if (_cur_dso_snapshot->memory_failed()) {
+    if (_dso_data->snapshot()->memory_failed()) {
         _error = Malloc_err;
         session_error();
         return;
@@ -1084,13 +1071,13 @@ void SigSession::feed_in_dso(const sr_datafeed_dso &dso)
 void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
 { 
 
-    if(!_analog_data || _cur_analog_snapshot->memory_failed())
+    if(!_analog_data || _analog_data->snapshot()->memory_failed())
     {
         qDebug() << "Unexpected analog packet";
         return;	// This analog packet was not expected.
     }
 
-    if (_cur_analog_snapshot->last_ended())
+    if (_analog_data->snapshot()->last_ended())
     {
         // reset scale of analog signal
         for(auto &s : _signals)
@@ -1103,13 +1090,13 @@ void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
         }
 
         // first payload
-        _cur_analog_snapshot->first_payload(analog, _dev_inst->get_sample_limit(), _dev_inst->dev_inst()->channels);
+        _analog_data->snapshot()->first_payload(analog, _dev_inst->get_sample_limit(), _dev_inst->dev_inst()->channels);
     } else {
         // Append to the existing data snapshot
-        _cur_analog_snapshot->append_payload(analog);
+        _analog_data->snapshot()->append_payload(analog);
     }
 
-    if (_cur_analog_snapshot->memory_failed()) {
+    if (_analog_data->snapshot()->memory_failed()) {
         _error = Malloc_err;
         session_error();
         return;
@@ -1179,7 +1166,7 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
     }
     case SR_DF_END:
     { 
-        if (!_cur_logic_snapshot->empty())
+        if (!_logic_data->snapshot()->empty())
         {
             for (auto &g : _group_traces)
             {
@@ -1189,9 +1176,9 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
                 _group_data->push_snapshot(p);
             }
         }
-        _cur_logic_snapshot->capture_ended();
-        _cur_dso_snapshot->capture_ended();
-        _cur_analog_snapshot->capture_ended();
+        _logic_data->snapshot()->capture_ended();
+        _dso_data->snapshot()->capture_ended();
+        _analog_data->snapshot()->capture_ended();
 
         qDebug()<<"data frame end";
 
@@ -1486,8 +1473,9 @@ void SigSession::spectrum_rebuild()
         }
     }
 
-    if (!has_dso_signal)
-        _spectrum_traces.clear();
+    if (!has_dso_signal){
+        RELEASE_ARRAY(_spectrum_traces);
+    }      
 
     signals_changed();
 }
@@ -1499,6 +1487,7 @@ std::vector<view::SpectrumTrace*>& SigSession::get_spectrum_traces()
 
 void SigSession::lissajous_rebuild(bool enable, int xindex, int yindex, double percent)
 {
+    DESTROY_OBJECT(_lissajous_trace);
     _lissajous_trace = new view::LissajousTrace(enable, _dso_data, xindex, yindex, percent);
     signals_changed();
 }
@@ -1590,11 +1579,11 @@ void SigSession::feed_timeout()
 data::Snapshot* SigSession::get_snapshot(int type)
 {
     if (type == SR_CHANNEL_LOGIC)
-        return _cur_logic_snapshot;
+        return _logic_data->snapshot();
     else if (type == SR_CHANNEL_ANALOG)
-        return _cur_analog_snapshot;
+        return _analog_data->snapshot();
     else if (type == SR_CHANNEL_DSO)
-        return _cur_dso_snapshot;
+        return _dso_data->snapshot();
     else
         return NULL;
 }
@@ -1892,7 +1881,7 @@ void SigSession::set_stop_scale(float scale)
       int dex = 0; 
       for (auto trace : _decode_traces)
       {
-          if (trace->IsRunning())
+          if (trace->decoder()->IsRunning())
           {
               trace->decoder()->stop_decode_work();
               runningDex = dex;
diff --git a/DSView/pv/sigsession.h b/DSView/pv/sigsession.h
index 9e1d124e..c5f97439 100755
--- a/DSView/pv/sigsession.h
+++ b/DSView/pv/sigsession.h
@@ -483,12 +483,9 @@ private:
     view::LissajousTrace            *_lissajous_trace;
     view::MathTrace                 *_math_trace;
   
-	data::Logic              *_logic_data;
-	data::LogicSnapshot      *_cur_logic_snapshot;
-    data::Dso                *_dso_data;
-    data::DsoSnapshot        *_cur_dso_snapshot;
+	data::Logic              *_logic_data; 
+    data::Dso                *_dso_data; 
 	data::Analog             *_analog_data;
-	data::AnalogSnapshot     *_cur_analog_snapshot;
     data::Group              *_group_data; 
     int                      _group_cnt;
  
diff --git a/DSView/pv/toolbars/titlebar.cpp b/DSView/pv/toolbars/titlebar.cpp
index 306a417a..d52b18fc 100755
--- a/DSView/pv/toolbars/titlebar.cpp
+++ b/DSView/pv/toolbars/titlebar.cpp
@@ -38,17 +38,17 @@ namespace pv {
 namespace toolbars {
 
 TitleBar::TitleBar(bool top, QWidget *parent, bool hasClose) :
-    QWidget(parent),
-    _parent(parent),
-    _moving(false),
-    _isTop(top),
-    _hasClose(hasClose)
+    QWidget(parent)
 {
    _title = NULL;
    _minimizeButton = NULL;
    _maximizeButton = NULL;
    _closeButton = NULL;
    _lay = NULL;
+   _moving = false;
+   _parent = parent;
+   _isTop = top;
+   _hasClose = hasClose;
 
    assert(parent);
 
diff --git a/DSView/pv/toolbars/trigbar.cpp b/DSView/pv/toolbars/trigbar.cpp
index ea5f7c8e..2d6cdf29 100755
--- a/DSView/pv/toolbars/trigbar.cpp
+++ b/DSView/pv/toolbars/trigbar.cpp
@@ -180,7 +180,8 @@ void TrigBar::reStyle()
 
      AppConfig &app = AppConfig::Instance();    
 
-    _themes->setIcon(QIcon(iconPath+"/"+ app._frameOptions.language +".svg"));
+     QString icon_fname = iconPath +"/"+ app._frameOptions.style +".svg";  
+    _themes->setIcon(QIcon(icon_fname));
 }
 
 void TrigBar::protocol_clicked()
@@ -302,13 +303,15 @@ void TrigBar::on_actionMath_triggered()
 void TrigBar::on_actionDark_triggered()
 {
     sig_setTheme(DARK_STYLE);
-    _themes->setIcon(QIcon(":/icons/"+DARK_STYLE+"/"+DARK_STYLE+".svg"));
+    QString icon = GetIconPath() + "/" + DARK_STYLE + ".svg";
+    _themes->setIcon(QIcon(icon));
 }
 
 void TrigBar::on_actionLight_triggered()
 {
     sig_setTheme(LIGHT_STYLE);
-    _themes->setIcon(QIcon(":/icons/"+LIGHT_STYLE+"/"+LIGHT_STYLE+".svg"));
+    QString icon = GetIconPath() + "/" + LIGHT_STYLE +".svg";
+    _themes->setIcon(QIcon(icon));
 }
 
 void TrigBar::on_actionLissajous_triggered()
diff --git a/DSView/pv/view/devmode.cpp b/DSView/pv/view/devmode.cpp
index 48e36f81..9ca629b1 100755
--- a/DSView/pv/view/devmode.cpp
+++ b/DSView/pv/view/devmode.cpp
@@ -111,18 +111,20 @@ void DevMode::set_device()
              l; l = l->next) {
             const sr_dev_mode *mode = (const sr_dev_mode *)l->data;
             QString icon_name = QString::fromLocal8Bit(mode->icon);
-
+ 
             QAction *action = new QAction(this);
             action->setIcon(QIcon(iconPath+"square-"+icon_name));
             if (lan == QLocale::Chinese)
                 action->setText(mode->name_cn);
             else
                 action->setText(mode->name);
+
             connect(action, SIGNAL(triggered()), this, SLOT(on_mode_change()));
 
             _mode_list[action] = mode;
             if (dev_inst->dev_inst()->mode == _mode_list[action]->mode) {
-                _mode_btn->setIcon(QIcon(iconPath+icon_name));
+                QString icon_fname = iconPath + icon_name;
+                _mode_btn->setIcon(QIcon(icon_fname));
                 if (lan== QLocale::Chinese)
                     _mode_btn->setText(mode->name_cn);
                 else
@@ -176,8 +178,9 @@ void DevMode::on_mode_change()
                                      SR_CONF_DEVICE_MODE,
                                      g_variant_new_int16((*i).second->mode));
 
-                QString icon_name = "/" + QString::fromLocal8Bit((*i).second->icon);
-                _mode_btn->setIcon(QIcon(iconPath+icon_name));
+                QString icon_fname = iconPath + "/" + QString::fromLocal8Bit((*i).second->icon);
+             
+                _mode_btn->setIcon(QIcon(icon_fname));
                 if (lan == QLocale::Chinese)
                     _mode_btn->setText((*i).second->name_cn);
                 else
diff --git a/DSView/pv/view/mathtrace.cpp b/DSView/pv/view/mathtrace.cpp
index c8f6753c..78a34280 100755
--- a/DSView/pv/view/mathtrace.cpp
+++ b/DSView/pv/view/mathtrace.cpp
@@ -31,8 +31,8 @@
 #include "../sigsession.h"
 #include "../device/devinst.h"
 #include "../view/dsosignal.h"
- 
-
+#include "../dsvdef.h"
+  
 #include <QDebug>
 #include <QTimer>
 
@@ -67,6 +67,7 @@ MathTrace::MathTrace(bool enable,data::MathStack *math_stack,
 
 MathTrace::~MathTrace()
 {
+    DESTROY_OBJECT(_math_stack);
 }
 
 bool MathTrace::enabled()
diff --git a/DSView/pv/view/spectrumtrace.cpp b/DSView/pv/view/spectrumtrace.cpp
index 6f7ceba3..3115bf33 100755
--- a/DSView/pv/view/spectrumtrace.cpp
+++ b/DSView/pv/view/spectrumtrace.cpp
@@ -33,6 +33,7 @@
 #include "../view/viewport.h"
 #include "../device/devinst.h"
 #include "../data/spectrumstack.h"
+#include "../dsvdef.h"
 
 using namespace boost;
 using namespace std;
@@ -90,7 +91,7 @@ SpectrumTrace::SpectrumTrace(pv::SigSession *session,
 
 SpectrumTrace::~SpectrumTrace()
 {
-
+    DESTROY_OBJECT(_spectrum_stack);
 }
 
 bool SpectrumTrace::enabled()

From 01b9aee7788540c1d1a6b6520825de2b59eae1ab Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Tue, 9 Nov 2021 15:36:47 +0800
Subject: [PATCH 23/58] none

---
 DSView/pv/device/devinst.cpp      | 4 ++--
 DSView/pv/devicemanager.h         | 3 ---
 DSView/pv/mainwindow.cpp          | 5 +++--
 DSView/pv/view/analogsignal.cpp   | 1 -
 DSView/pv/view/devmode.cpp        | 7 +++++--
 DSView/pv/view/dsosignal.cpp      | 8 ++------
 DSView/pv/view/groupsignal.cpp    | 3 +--
 DSView/pv/view/header.cpp         | 7 ++-----
 DSView/pv/view/lissajoustrace.cpp | 2 +-
 DSView/pv/view/ruler.cpp          | 3 +--
 DSView/pv/view/viewport.cpp       | 3 +--
 DSView/pv/view/viewstatus.cpp     | 2 +-
 DSView/pv/view/xcursor.cpp        | 4 +---
 libsigrokdecode4DSL/srd.c         | 2 +-
 14 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/DSView/pv/device/devinst.cpp b/DSView/pv/device/devinst.cpp
index b0bf7d5a..1fe1b2f4 100755
--- a/DSView/pv/device/devinst.cpp
+++ b/DSView/pv/device/devinst.cpp
@@ -214,8 +214,8 @@ bool DevInst::is_usable()
 }
 
 void DevInst::destroy(){
-	release();
-    delete this;
+	release(); 
+	//delete this;  //do not to destroy
 }
 
 } // device
diff --git a/DSView/pv/devicemanager.h b/DSView/pv/devicemanager.h
index 4862a455..79f3502d 100755
--- a/DSView/pv/devicemanager.h
+++ b/DSView/pv/devicemanager.h
@@ -29,9 +29,6 @@
 #include <list>
 #include <map>
 #include <string>
-
-#include <boost/function.hpp>  
-
 #include <QObject>
 #include <QString>
 
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index 5186f719..0ca0bc70 100755
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -599,8 +599,9 @@ void MainWindow::device_changed(bool close)
         _sampling_bar->set_sampling(false);
         _session->set_default_device(boost::bind(&MainWindow::session_error, this,
                                                 QString(tr("Set Default Device failed")), _1));
-    }
-    update_device_list();
+    }    
+
+     update_device_list();
 }
 
 void MainWindow::on_run_stop()
diff --git a/DSView/pv/view/analogsignal.cpp b/DSView/pv/view/analogsignal.cpp
index 0368932f..745834ad 100755
--- a/DSView/pv/view/analogsignal.cpp
+++ b/DSView/pv/view/analogsignal.cpp
@@ -30,7 +30,6 @@
 #include "../view/view.h"
 #include "../device/devinst.h"
 
-using namespace boost;
 using namespace std;
 
 #define byte(x) uint##x##_t
diff --git a/DSView/pv/view/devmode.cpp b/DSView/pv/view/devmode.cpp
index 9ca629b1..58b31fe5 100755
--- a/DSView/pv/view/devmode.cpp
+++ b/DSView/pv/view/devmode.cpp
@@ -35,6 +35,7 @@
 #include <QRect>
 #include <QDebug>
 #include "../config/appconfig.h"
+#include "../ui/msgbox.h"
  
 
 namespace pv {
@@ -196,8 +197,10 @@ void DevMode::on_close()
     DevInst *dev_inst = _session->get_device();
     assert(dev_inst);
 
-    _session->close_file(dev_inst);
-    dev_changed(true);
+    if (MsgBox::Confirm("are you sure to close the device?")){
+        _session->close_file(dev_inst);
+        dev_changed(true);
+    }
 }
 
 void DevMode::mousePressEvent(QMouseEvent *event)
diff --git a/DSView/pv/view/dsosignal.cpp b/DSView/pv/view/dsosignal.cpp
index 3a33628e..f4d748ba 100755
--- a/DSView/pv/view/dsosignal.cpp
+++ b/DSView/pv/view/dsosignal.cpp
@@ -28,14 +28,10 @@
 #include "pv/data/dsosnapshot.h"
 #include "view.h"
 #include "../sigsession.h"
-#include "../device/devinst.h"
-
- 
-
+#include "../device/devinst.h" 
 #include <QDebug>
 #include <QTimer>
-
-using namespace boost;
+ 
 using namespace std;
 
 namespace pv {
diff --git a/DSView/pv/view/groupsignal.cpp b/DSView/pv/view/groupsignal.cpp
index 0c5870aa..898d455c 100755
--- a/DSView/pv/view/groupsignal.cpp
+++ b/DSView/pv/view/groupsignal.cpp
@@ -26,8 +26,7 @@
 #include "pv/data/group.h"
 #include "pv/data/groupsnapshot.h"
 #include "view.h"
-
-using namespace boost;
+ 
 using namespace std;
 
 namespace pv {
diff --git a/DSView/pv/view/header.cpp b/DSView/pv/view/header.cpp
index e5244e67..3eecd685 100755
--- a/DSView/pv/view/header.cpp
+++ b/DSView/pv/view/header.cpp
@@ -34,9 +34,7 @@
 #include "../device/devinst.h"
 
 #include <assert.h>
-
- 
- 
+  
 #include <QColorDialog>
 #include <QInputDialog>
 #include <QMenu>
@@ -45,8 +43,7 @@
 #include <QRect>
 #include <QStyleOption>
 #include <QApplication>
-
-using namespace boost;
+ 
 using namespace std;
 
 namespace pv {
diff --git a/DSView/pv/view/lissajoustrace.cpp b/DSView/pv/view/lissajoustrace.cpp
index 5e091820..81d8d33f 100755
--- a/DSView/pv/view/lissajoustrace.cpp
+++ b/DSView/pv/view/lissajoustrace.cpp
@@ -35,7 +35,7 @@
 #include <QDebug>
 #include <QTimer>
 
-using namespace boost;
+ 
 using namespace std;
 
 namespace pv {
diff --git a/DSView/pv/view/ruler.cpp b/DSView/pv/view/ruler.cpp
index 41b9a98c..100292c4 100755
--- a/DSView/pv/view/ruler.cpp
+++ b/DSView/pv/view/ruler.cpp
@@ -40,8 +40,7 @@
 #include <QTextStream>
 #include <QStyleOption>
  
-
-using namespace boost;
+ 
 using namespace std;
 
 namespace pv {
diff --git a/DSView/pv/view/viewport.cpp b/DSView/pv/view/viewport.cpp
index 95a2ff46..fcd8baad 100755
--- a/DSView/pv/view/viewport.cpp
+++ b/DSView/pv/view/viewport.cpp
@@ -42,8 +42,7 @@
  
 #include "../config/appconfig.h"
 #include "../dsvdef.h"
-
-using namespace boost;
+ 
 using namespace std;
 
 namespace pv {
diff --git a/DSView/pv/view/viewstatus.cpp b/DSView/pv/view/viewstatus.cpp
index cfad21d2..6ca30b86 100755
--- a/DSView/pv/view/viewstatus.cpp
+++ b/DSView/pv/view/viewstatus.cpp
@@ -34,7 +34,7 @@
 #include "../view/trace.h"
 #include "../dialogs/dsomeasure.h"
 
-using namespace boost;
+ 
 using namespace std;
 
 namespace pv {
diff --git a/DSView/pv/view/xcursor.cpp b/DSView/pv/view/xcursor.cpp
index decdc14c..1148dfb5 100755
--- a/DSView/pv/view/xcursor.cpp
+++ b/DSView/pv/view/xcursor.cpp
@@ -28,9 +28,7 @@
 #include "dsosignal.h"
 
 #include <QPainter>
- 
-
-using namespace boost;
+  
 using namespace std;
 
 namespace pv {
diff --git a/libsigrokdecode4DSL/srd.c b/libsigrokdecode4DSL/srd.c
index 6b2569d2..38bb803e 100755
--- a/libsigrokdecode4DSL/srd.c
+++ b/libsigrokdecode4DSL/srd.c
@@ -202,7 +202,7 @@ SRD_API int srd_init(const char *path)
 	PyImport_AppendInittab("sigrokdecode", PyInit_sigrokdecode);
 
 	/* Initialize the Python interpreter. */
-	Py_InitializeEx(0);
+    Py_InitializeEx(0);
 
 	/* Locations relative to the XDG system data directories. */
 	sys_datadirs = g_get_system_data_dirs();

From 21be857649f318d9721dcaa3be197db71a885b65 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Thu, 11 Nov 2021 18:41:12 +0800
Subject: [PATCH 24/58] remove SigSession qt signal mode, change to interface
 callback

---
 DSView/pv/data/decoderstack.cpp        |  18 +-
 DSView/pv/data/decoderstack.h          |   6 +-
 DSView/pv/data/mathstack.cpp           |   9 +-
 DSView/pv/data/spectrumstack.cpp       |   1 +
 DSView/pv/device/inputfile.cpp         |  10 +-
 DSView/pv/dialogs/fftoptions.cpp       |   2 +
 DSView/pv/dialogs/lissajousoptions.cpp |   1 +
 DSView/pv/dialogs/protocollist.cpp     |  10 +-
 DSView/pv/dialogs/protocollist.h       |   1 +
 DSView/pv/dock/dsotriggerdock.cpp      |   1 +
 DSView/pv/dock/measuredock.cpp         |   1 +
 DSView/pv/dock/protocoldock.cpp        |  14 +-
 DSView/pv/dock/protocoldock.h          |   7 +-
 DSView/pv/dock/triggerdock.cpp         |   2 +
 DSView/pv/dstimer.cpp                  |  49 +++++
 DSView/pv/dstimer.h                    |  37 ++++
 DSView/pv/eventobject.cpp              |   6 +
 DSView/pv/eventobject.h                |  55 ++++++
 DSView/pv/interface/icallbacks.h       |  37 ++++
 DSView/pv/interface/uicallback.h       |  21 +++
 DSView/pv/mainwindow.cpp               | 239 +++++++++++++++++-------
 DSView/pv/mainwindow.h                 | 195 ++++++++++----------
 DSView/pv/sigsession.cpp               | 232 +++++++++++------------
 DSView/pv/sigsession.h                 | 246 +++++++------------------
 DSView/pv/storesession.cpp             |   8 +
 DSView/pv/toolbars/filebar.cpp         |   7 +-
 DSView/pv/toolbars/logobar.cpp         |   1 +
 DSView/pv/toolbars/samplingbar.cpp     |   6 +-
 DSView/pv/toolbars/trigbar.cpp         |   8 +-
 DSView/pv/view/analogsignal.cpp        |   3 +-
 DSView/pv/view/dsosignal.cpp           |  10 +-
 DSView/pv/view/dsosignal.h             |   7 +-
 DSView/pv/view/spectrumtrace.cpp       |   3 +-
 DSView/pv/view/view.cpp                |  31 ++--
 DSView/pv/view/view.h                  |  94 +++++-----
 DSView/pv/view/viewport.cpp            |   3 +-
 DSView/pv/view/viewport.h              |   4 +-
 DSView/pv/view/viewstatus.cpp          |   2 +
 38 files changed, 797 insertions(+), 590 deletions(-)
 create mode 100644 DSView/pv/dstimer.cpp
 create mode 100644 DSView/pv/dstimer.h
 create mode 100644 DSView/pv/eventobject.cpp
 create mode 100644 DSView/pv/eventobject.h
 create mode 100644 DSView/pv/interface/icallbacks.h

diff --git a/DSView/pv/data/decoderstack.cpp b/DSView/pv/data/decoderstack.cpp
index 4c76ac7e..c53affa1 100755
--- a/DSView/pv/data/decoderstack.cpp
+++ b/DSView/pv/data/decoderstack.cpp
@@ -64,12 +64,8 @@ DecoderStack::DecoderStack(pv::SigSession *session,
     _no_memory = false;
     _mark_index = -1;
     _decoder_status = decoder_status;
-    _stask_stauts = NULL;
-
-	connect(_session, SIGNAL(frame_began()), this, SLOT(on_new_frame()));
-
-	connect(_session, SIGNAL(data_received()), this, SLOT(on_data_received())); 
-
+    _stask_stauts = NULL; 
+    
     _stack.push_back(new decode::Decoder(dec));
  
     build_row();
@@ -668,15 +664,7 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
     if (!(*row_iter).second->push_annotation(a))
         d->_no_memory = true; 
 }
-
-void DecoderStack::on_new_frame()
-{ 
-}
-
-void DecoderStack::on_data_received()
-{  
-}
-
+ 
 void DecoderStack::frame_ended()
 { 
     _options_changed = true; 
diff --git a/DSView/pv/data/decoderstack.h b/DSView/pv/data/decoderstack.h
index c8a2b929..cef31dab 100755
--- a/DSView/pv/data/decoderstack.h
+++ b/DSView/pv/data/decoderstack.h
@@ -172,11 +172,7 @@ private:
 
 	static void annotation_callback(srd_proto_data *pdata, void *decoder);
 
-private slots:
-	void on_new_frame();
-
-	void on_data_received(); 
-
+  
 signals:
 	void new_decode_data();
     void decode_done();
diff --git a/DSView/pv/data/mathstack.cpp b/DSView/pv/data/mathstack.cpp
index 87dd08cd..9b2d9686 100755
--- a/DSView/pv/data/mathstack.cpp
+++ b/DSView/pv/data/mathstack.cpp
@@ -20,10 +20,11 @@
 
 #include "mathstack.h"
  
-#include <pv/data/dso.h>
-#include <pv/data/dsosnapshot.h>
-#include <pv/sigsession.h>
-#include <pv/view/dsosignal.h>
+#include  "dso.h"
+#include  "dsosnapshot.h"
+#include  "../sigsession.h"
+#include  "../view/dsosignal.h"
+#include <math.h>
 
 #define PI 3.1415
 
diff --git a/DSView/pv/data/spectrumstack.cpp b/DSView/pv/data/spectrumstack.cpp
index c5c48301..72759c7e 100755
--- a/DSView/pv/data/spectrumstack.cpp
+++ b/DSView/pv/data/spectrumstack.cpp
@@ -24,6 +24,7 @@
 #include <pv/data/dsosnapshot.h>
 #include <pv/sigsession.h>
 #include <pv/view/dsosignal.h>
+#include <math.h>
 
 #define PI 3.1415
 
diff --git a/DSView/pv/device/inputfile.cpp b/DSView/pv/device/inputfile.cpp
index 33b346bf..83ed6995 100755
--- a/DSView/pv/device/inputfile.cpp
+++ b/DSView/pv/device/inputfile.cpp
@@ -51,15 +51,7 @@ void InputFile::use(SigSession *owner)
     // only *.dsl file is valid
     // don't allow other types of file input
     throw tr("Not a valid DSView data file.");
-    return;
-
-//	_input = load_input_file_format(_path, NULL);
-//	File::use(owner);
-
-//	sr_session_new();
-
-//	if (sr_session_dev_add(_input->sdi) != SR_OK)
-//		throw tr("Failed to add session device.");
+    return; 
 }
 
 void InputFile::release()
diff --git a/DSView/pv/dialogs/fftoptions.cpp b/DSView/pv/dialogs/fftoptions.cpp
index 425854c0..5b8f44d7 100755
--- a/DSView/pv/dialogs/fftoptions.cpp
+++ b/DSView/pv/dialogs/fftoptions.cpp
@@ -24,6 +24,7 @@
   
 #include <QFormLayout>
 #include <QListWidget>
+#include <QDebug>
 
 #include "../sigsession.h"
 #include "../data/spectrumstack.h"
@@ -31,6 +32,7 @@
 #include "../view/dsosignal.h"
 #include "../view/spectrumtrace.h"
 
+
 using namespace boost;
 using namespace std;
  
diff --git a/DSView/pv/dialogs/lissajousoptions.cpp b/DSView/pv/dialogs/lissajousoptions.cpp
index 4ab1d3c2..8f8456be 100755
--- a/DSView/pv/dialogs/lissajousoptions.cpp
+++ b/DSView/pv/dialogs/lissajousoptions.cpp
@@ -30,6 +30,7 @@
 #include <QLabel>
 #include <QTabBar>
 #include <QBitmap>
+#include <math.h>
 
   
 using namespace boost;
diff --git a/DSView/pv/dialogs/protocollist.cpp b/DSView/pv/dialogs/protocollist.cpp
index 9f474fa8..4b094d90 100755
--- a/DSView/pv/dialogs/protocollist.cpp
+++ b/DSView/pv/dialogs/protocollist.cpp
@@ -49,11 +49,13 @@ ProtocolList::ProtocolList(QWidget *parent, SigSession *session) :
     _map_zoom_combobox->addItem(tr("Fit to Window"));
     _map_zoom_combobox->addItem(tr("Fixed"));
     int cur_map_zoom = _session->get_map_zoom();
+
     if (cur_map_zoom >= _map_zoom_combobox->count())
         _map_zoom_combobox->setCurrentIndex(0);
     else
         _map_zoom_combobox->setCurrentIndex(cur_map_zoom);
-    connect(_map_zoom_combobox, SIGNAL(currentIndexChanged(int)), _session, SLOT(set_map_zoom(int)));
+
+    connect(_map_zoom_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(on_set_map_zoom(int)));
 
     _protocol_combobox = new QComboBox(this);
     auto &decode_sigs = _session->get_decode_signals();
@@ -193,5 +195,11 @@ void ProtocolList::on_row_check(bool show)
 
     _session->get_decoder_model()->setDecoderStack(decoder_stack);
 }
+
+ void ProtocolList::on_set_map_zoom(int index)
+ {
+     _session->set_map_zoom(index);
+ }
+
 } // namespace dialogs
 } // namespace pv
diff --git a/DSView/pv/dialogs/protocollist.h b/DSView/pv/dialogs/protocollist.h
index 0d4024d9..f53dfcfa 100755
--- a/DSView/pv/dialogs/protocollist.h
+++ b/DSView/pv/dialogs/protocollist.h
@@ -56,6 +56,7 @@ protected:
 private slots:
     void set_protocol(int index);
     void on_row_check(bool show);
+    void on_set_map_zoom(int index);
 
 private:
     SigSession *_session;
diff --git a/DSView/pv/dock/dsotriggerdock.cpp b/DSView/pv/dock/dsotriggerdock.cpp
index 03e1a8ee..6d401770 100755
--- a/DSView/pv/dock/dsotriggerdock.cpp
+++ b/DSView/pv/dock/dsotriggerdock.cpp
@@ -35,6 +35,7 @@
 #include <QVector>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
+#include <QEvent>
 
 using namespace boost;
 using namespace std;
diff --git a/DSView/pv/dock/measuredock.cpp b/DSView/pv/dock/measuredock.cpp
index 5b6c77dd..f3b3f62a 100755
--- a/DSView/pv/dock/measuredock.cpp
+++ b/DSView/pv/dock/measuredock.cpp
@@ -308,6 +308,7 @@ void MeasureDock::reCalc()
     update_dist();
     update_edge();
 }
+ 
 
 void MeasureDock::goto_cursor()
 {
diff --git a/DSView/pv/dock/protocoldock.cpp b/DSView/pv/dock/protocoldock.cpp
index 04888b4a..26afcc8b 100755
--- a/DSView/pv/dock/protocoldock.cpp
+++ b/DSView/pv/dock/protocoldock.cpp
@@ -176,33 +176,23 @@ ProtocolDock::ProtocolDock(QWidget *parent, view::View &view, SigSession *sessio
     _split_widget->setOrientation(Qt::Vertical);
     _split_widget->setCollapsible(0, false);
     _split_widget->setCollapsible(1, false);
-    //_split_widget->setStretchFactor(1, 1);
-    //_split_widget
 
     this->setWidgetResizable(true);
     this->setWidget(_split_widget);
-    //_split_widget->setGeometry(0, 0, sizeHint().width(), 500);
+
     _split_widget->setObjectName("protocolWidget");
 
     connect(_dn_nav_button, SIGNAL(clicked()),this, SLOT(nav_table_view()));
-
     connect(_dn_save_button, SIGNAL(clicked()),this, SLOT(export_table_view()));
-
     connect(_dn_set_button, SIGNAL(clicked()),this, SLOT(set_model()));
-
     connect(_pre_button, SIGNAL(clicked()),this, SLOT(search_pre()));
-
     connect(_nxt_button, SIGNAL(clicked()),this, SLOT(search_nxt()));
-
     connect(_add_button, SIGNAL(clicked()),this, SLOT(on_add_protocol()));
+    connect(_del_all_button, SIGNAL(clicked()),this, SLOT(on_del_all_protocol())); 
 
-    connect(_del_all_button, SIGNAL(clicked()),this, SLOT(on_del_all_protocol()));
-
-    connect(_session, SIGNAL(decode_done()), this, SLOT(update_model()));
     connect(this, SIGNAL(protocol_updated()), this, SLOT(update_model()));
     connect(_table_view, SIGNAL(clicked(QModelIndex)), this, SLOT(item_clicked(QModelIndex)));
     connect(_table_view->horizontalHeader(), SIGNAL(sectionResized(int,int,int)), this, SLOT(column_resize(int, int, int)));
-    //connect(_table_view->verticalScrollBar(), SIGNAL(sliderMoved()), this, SLOT(sliderMoved()));
     connect(_search_edit, SIGNAL(editingFinished()), this, SLOT(search_changed()));
 
     retranslateUi();
diff --git a/DSView/pv/dock/protocoldock.h b/DSView/pv/dock/protocoldock.h
index b300846a..a83df95b 100755
--- a/DSView/pv/dock/protocoldock.h
+++ b/DSView/pv/dock/protocoldock.h
@@ -72,6 +72,7 @@ public:
     void del_all_protocol();
     bool sel_protocol(QString name);
     void add_protocol(bool silent);
+
 private:
     void changeEvent(QEvent *event);
     void retranslateUi();
@@ -90,12 +91,14 @@ private:
 signals:
     void protocol_updated();
 
+public slots:
+    void update_model();
+
 private slots:
     void on_add_protocol(); 
     void on_del_all_protocol();
     void decoded_progress(int progress);
-    void set_model();
-    void update_model();
+    void set_model();   
     void export_table_view();
     void nav_table_view();
     void item_clicked(const QModelIndex &index);
diff --git a/DSView/pv/dock/triggerdock.cpp b/DSView/pv/dock/triggerdock.cpp
index d69b7828..87fa9e94 100755
--- a/DSView/pv/dock/triggerdock.cpp
+++ b/DSView/pv/dock/triggerdock.cpp
@@ -32,6 +32,8 @@
 #include <QRegExpValidator>
 #include <QSplitter>
 #include <QInputMethodEvent>
+#include <QApplication>
+#include <math.h>
 
 #include "libsigrok4DSL/libsigrok.h"
 
diff --git a/DSView/pv/dstimer.cpp b/DSView/pv/dstimer.cpp
new file mode 100644
index 00000000..e3bbaad2
--- /dev/null
+++ b/DSView/pv/dstimer.cpp
@@ -0,0 +1,49 @@
+
+#include "dstimer.h" 
+#include <assert.h>
+
+DsTimer::DsTimer(){
+    _binded = false;
+}
+
+ void DsTimer::on_timeout()
+ {
+     _call(); //call back
+ } 
+
+void DsTimer::TimeOut(int millsec, CALLBACL_FUNC f)
+{
+    _call = f;
+    QTimer::singleShot(millsec, this, SLOT(on_timeout()));
+} 
+
+void DsTimer::SetCallback(CALLBACL_FUNC f)
+ {
+    assert(!_binded);
+    _binded = true;
+
+    _call = f;
+    connect(&_timer, SIGNAL(timeout()), this, SLOT(on_timeout()));
+ }
+
+ void DsTimer::Start(int millsec, CALLBACL_FUNC f)
+ {
+     assert(!_binded);
+     _binded = true;
+
+     _call = f; 
+      connect(&_timer, SIGNAL(timeout()), this, SLOT(on_timeout()));
+     _timer.start(millsec);
+ }
+
+ void DsTimer::Start(int millsec)
+ {  
+     //check if connectb
+     assert(_binded);
+    _timer.start(millsec);
+ }
+
+ void DsTimer::Stop()
+ {
+     _timer.stop();
+ }
diff --git a/DSView/pv/dstimer.h b/DSView/pv/dstimer.h
new file mode 100644
index 00000000..87c35f41
--- /dev/null
+++ b/DSView/pv/dstimer.h
@@ -0,0 +1,37 @@
+
+#ifndef _DS_TIMER_H
+#define _DS_TIMER_H
+
+#include <QObject>
+#include <functional>
+#include <QTimer>
+
+typedef std::function<void()> CALLBACL_FUNC;
+
+class DsTimer : public QObject
+{
+    Q_OBJECT
+
+public:
+    DsTimer();
+
+    void TimeOut(int millsec, CALLBACL_FUNC f);
+
+    void SetCallback(CALLBACL_FUNC f);
+
+    void Start(int millsec, CALLBACL_FUNC f);
+
+    void Start(int millsec);
+
+    void Stop(); 
+
+private slots:
+    void on_timeout();
+
+private:
+    CALLBACL_FUNC   _call;
+    QTimer          _timer;
+    bool            _binded;
+};
+
+#endif
diff --git a/DSView/pv/eventobject.cpp b/DSView/pv/eventobject.cpp
new file mode 100644
index 00000000..d8671fa3
--- /dev/null
+++ b/DSView/pv/eventobject.cpp
@@ -0,0 +1,6 @@
+
+#include "eventobject.h"
+
+EventObject::EventObject(){
+    
+}
\ No newline at end of file
diff --git a/DSView/pv/eventobject.h b/DSView/pv/eventobject.h
new file mode 100644
index 00000000..770b884d
--- /dev/null
+++ b/DSView/pv/eventobject.h
@@ -0,0 +1,55 @@
+
+/*
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
+ *
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#ifndef _EVENT_OBJECT_H
+#define _EVENT_OBJECT_H
+
+#include <QObject>
+
+class EventObject : public QObject
+{
+    Q_OBJECT
+
+public:
+    EventObject(); 
+
+
+signals:
+    void show_error(QString error);
+    void capture_state_changed(int state);
+    void data_updated();
+    void device_attach();
+    void device_detach();
+
+    void session_error();
+    void signals_changed();
+    void receive_trigger(quint64 trigger_pos);
+    void frame_ended();
+    void frame_began();
+
+    void decode_done();
+    void receive_data_len(quint64 len);
+    void cur_snap_samplerate_changed();
+};
+
+#endif
\ No newline at end of file
diff --git a/DSView/pv/interface/icallbacks.h b/DSView/pv/interface/icallbacks.h
new file mode 100644
index 00000000..1d1627c3
--- /dev/null
+++ b/DSView/pv/interface/icallbacks.h
@@ -0,0 +1,37 @@
+
+#ifndef _I_CALLBACKS_
+#define _I_CALLBACKS_
+
+class ISessionCallback
+{
+public:
+    virtual void show_error(QString error)=0;
+    virtual void session_error()=0;
+    virtual void capture_state_changed(int state)=0;
+    virtual void device_attach()=0;
+    virtual void device_detach()=0;
+
+    virtual void session_save()=0;
+    virtual void data_updated()=0;
+    virtual void repeat_resume()=0;
+    virtual void update_capture()=0;
+    virtual void cur_snap_samplerate_changed()=0;
+
+    virtual void device_setted()=0;
+    virtual void signals_changed()=0;
+    virtual void receive_trigger(quint64 trigger_pos)=0;
+    virtual void frame_ended()=0;
+    virtual void frame_began()=0;
+
+    virtual void show_region(uint64_t start, uint64_t end, bool keep)=0;
+    virtual void show_wait_trigger()=0;
+    virtual void repeat_hold(int percent)=0;
+    virtual void decode_done()=0;
+    virtual void receive_data_len(quint64 len)=0;
+    
+    virtual void receive_header()=0;
+    virtual void data_received()=0;
+  
+};
+
+#endif
diff --git a/DSView/pv/interface/uicallback.h b/DSView/pv/interface/uicallback.h
index 8af7964b..b7ae0054 100644
--- a/DSView/pv/interface/uicallback.h
+++ b/DSView/pv/interface/uicallback.h
@@ -1,4 +1,25 @@
 
+/*
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
+ *
+ * Copyright (C) 2014 Joel Holdsworth <joel@airwebreathe.org.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
 #pragma once
 
 class IDlgCallback
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index 0ca0bc70..2c711e74 100755
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -24,10 +24,7 @@
 
 #include <libsigrokdecode4DSL/libsigrokdecode.h>
 #include "dock/protocoldock.h"
-
-
-#include <boost/bind.hpp> 
-
+ 
 #include <QAction>
 #include <QButtonGroup>
 #include <QFileDialog>
@@ -91,7 +88,7 @@
 #include "../ui/msgbox.h"
 #include "config/appconfig.h"
 #include "appcontrol.h"
- 
+  
 
 namespace pv {
 
@@ -101,6 +98,7 @@ MainWindow::MainWindow(QWidget *parent) :
     _msg(NULL)
 {
     _control = AppControl::Instance();
+    _control->GetSession()->set_callback(this);
 
 	setup_ui();
 
@@ -233,8 +231,7 @@ void MainWindow::setup_ui()
     _search_dock->installEventFilter(this);
 
     // Populate the device list and select the initially selected device
-    _session->set_default_device(boost::bind(&MainWindow::session_error, this,
-                                            QString(tr("Set Default Device failed")), _1));
+    _session->set_default_device();
 
     // defaut language
     AppConfig &app = AppConfig::Instance();
@@ -247,22 +244,25 @@ void MainWindow::setup_ui()
     // update device
     update_device_list();
     
-    _session->start_hotplug_work(boost::bind(&MainWindow::session_error, this,
-                                             QString(tr("Hotplug failed")), _1));
+    _session->start_hotplug_work();
 
     retranslateUi();
 
+    //event
+    connect(&_event, SIGNAL(capture_state_changed(int)), this, SLOT(on_capture_state_changed(int)));
+    connect(&_event, SIGNAL(device_attach()), this, SLOT(on_device_attach()));
+    connect(&_event, SIGNAL(device_detach()), this, SLOT(on_device_detach())); 
+    connect(&_event, SIGNAL(session_error()), this, SLOT(on_session_error()));
+    connect(&_event, SIGNAL(show_error(QString)), this, SLOT(on_show_error(QString)));
+    connect(&_event, SIGNAL(signals_changed()), this, SLOT(on_signals_changed()));
+    connect(&_event, SIGNAL(receive_trigger(quint64)), this, SLOT(on_receive_trigger(quint64)));
+    connect(&_event, SIGNAL(frame_ended()), this, SLOT(on_frame_ended()));
+    connect(&_event, SIGNAL(frame_began()), this, SLOT(on_frame_began()));
+    connect(&_event, SIGNAL(decode_done()), this, SLOT(on_decode_done()));
+    connect(&_event, SIGNAL(data_updated()), this, SLOT(on_data_updated()));
+    connect(&_event, SIGNAL(cur_snap_samplerate_changed()), this, SLOT(on_cur_snap_samplerate_changed()));
+    connect(&_event, SIGNAL(receive_data_len(quint64)), this, SLOT(on_receive_data_len(quint64)));
 
-	// Setup _session events
-    connect(_session, SIGNAL(capture_state_changed(int)), this, SLOT(capture_state_changed(int)));
-    connect(_session, SIGNAL(device_attach()), this, SLOT(device_attach()), Qt::QueuedConnection);
-    connect(_session, SIGNAL(device_detach()), this, SLOT(device_detach()), Qt::QueuedConnection);
-    connect(_session, SIGNAL(session_error()), this, SLOT(on_show_error()), Qt::QueuedConnection);
-    connect(_session, SIGNAL(session_save()), this, SLOT(session_save()));
-    connect(_session, SIGNAL(data_updated()), _measure_widget, SLOT(reCalc()));
-    connect(_session, SIGNAL(repeat_resume()), this, SLOT(repeat_resume()));
-    connect(_session, SIGNAL(update_capture()), _view, SLOT(update_hori_res()), Qt::DirectConnection);
-    connect(_session, SIGNAL(cur_snap_samplerate_changed()), _measure_widget, SLOT(cursor_update()));
 
     //view
     connect(_view, SIGNAL(cursor_update()), _measure_widget, SLOT(cursor_update()));
@@ -293,7 +293,7 @@ void MainWindow::setup_ui()
     connect(_logo_bar, SIGNAL(sig_open_doc()), this, SLOT(on_open_doc()));
 
 
-    connect(_protocol_widget, SIGNAL(protocol_updated()), _view, SLOT(signals_changed()));
+    connect(_protocol_widget, SIGNAL(protocol_updated()), this, SLOT(on_signals_changed()));
 
     //SamplingBar
     connect(_sampling_bar, SIGNAL(sig_device_selected()), this, SLOT(on_device_selected()));
@@ -304,8 +304,7 @@ void MainWindow::setup_ui()
     connect(_sampling_bar, SIGNAL(sig_duration_changed()), _view, SLOT(timebase_changed()));
     connect(_sampling_bar, SIGNAL(sig_show_calibration()), _view, SLOT(show_calibration()));
 
-    connect(_dso_trigger_widget, SIGNAL(set_trig_pos(int)), _view, SLOT(set_trig_pos(int)));
-  
+    connect(_dso_trigger_widget, SIGNAL(set_trig_pos(int)), _view, SLOT(set_trig_pos(int))); 
 }
 
 
@@ -318,14 +317,7 @@ void MainWindow::retranslateUi()
     _search_dock->setWindowTitle(tr("Search..."));
 }
 
-void MainWindow::session_error(
-	const QString text, const QString info_text)
-{
-	QMetaObject::invokeMethod(this, "show_session_error",
-		Qt::QueuedConnection, Q_ARG(QString, text),
-		Q_ARG(QString, info_text));
-}
-
+  
 void MainWindow::on_device_selected()
 {
     update_device_list();
@@ -367,8 +359,7 @@ void MainWindow::update_device_list()
                 int16_t version = g_variant_get_int16(gvar);
                 g_variant_unref(gvar);
                 if (version == 1) {
-                    show_session_error(tr("Attension"),
-                                       tr("Current loading file has an old format. "
+                    show_error(tr("Current loading file has an old format. "
                                           "This will lead to a slow loading speed. "
                                           "Please resave it after loaded."));
                 }
@@ -386,8 +377,7 @@ void MainWindow::update_device_list()
         // load data
         const QString errorMessage(
             QString(tr("Failed to capture file data!")));
-        _session->start_capture(true, boost::bind(&MainWindow::session_error, this,
-            errorMessage, _1));
+        _session->start_capture(true);
     }
 
     if (!selected_device->name().contains("virtual")) {
@@ -448,9 +438,8 @@ void MainWindow::update_device_list()
             g_variant_unref(gvar);
 
             if (usb30_support && usb_speed == LIBUSB_SPEED_HIGH)
-                show_session_error(tr("Speed limited"), tr("This is a super-speed usb device(USB 3.0). "
-                                                           "Plug it into a USB 2.0 port will seriously affect its performance."
-                                                           "Please replug it into a USB 3.0 port."));
+                show_error("Plug it into a USB 2.0 port will seriously affect its performance."
+                                                           "Please replug it into a USB 3.0 port.");
         }
     }
 }
@@ -473,9 +462,8 @@ void MainWindow::on_load_file(QString file_name)
             session_save();
         _session->set_file(file_name);
     } catch(QString e) {
-        show_session_error(tr("Failed to load ") + file_name, e);
-        _session->set_default_device(boost::bind(&MainWindow::session_error, this,
-                                                QString(tr("Set Default Device failed")), _1));
+        show_error(tr("Failed to load ") + file_name);
+        _session->set_default_device();
         update_device_list();
         return;
     }
@@ -483,26 +471,27 @@ void MainWindow::on_load_file(QString file_name)
     update_device_list();
 }
 
-void MainWindow::show_session_error(
-	const QString text, const QString info_text)
+void MainWindow::show_error(QString error)
 {
-    dialogs::DSMessageBox msg(this);
-    _msg = &msg;
-    msg.mBox()->setText(text);
-    msg.mBox()->setInformativeText(info_text);
-    msg.mBox()->setStandardButtons(QMessageBox::Ok);
-    msg.mBox()->setIcon(QMessageBox::Warning);
-	msg.exec();
-    _msg = NULL;
+    _event.show_error(error); //safe call
+}
+
+void MainWindow::on_show_error(QString error)
+{ 
+    MsgBox::Show(NULL, error.toStdString().c_str(), this);
 }
 
 void MainWindow::device_attach()
+{
+    _event.device_attach(); //safe call
+}
+
+void MainWindow::on_device_attach()
 {
     SigSession *_session = _control->GetSession();
 
     _session->get_device()->device_updated();
-    //_session->stop_hot_plug_proc();
-
+ 
     _session->set_repeating(false);
     _session->stop_capture();
     _sampling_bar->set_sampling(false);
@@ -521,14 +510,15 @@ void MainWindow::device_attach()
         }
     }
 
-
-    _session->set_default_device(boost::bind(&MainWindow::session_error, this,
-                                            QString(tr("Set Default Device failed")), _1));
+    _session->set_default_device();
     update_device_list();
-
 }
 
-void MainWindow::device_detach()
+void MainWindow::device_detach(){
+    _event.device_detach(); //safe call
+}
+
+void MainWindow::on_device_detach()
 {
     SigSession *_session = _control->GetSession();
 
@@ -586,8 +576,7 @@ void MainWindow::device_detach_post()
         }
     }
 
-    _session->set_default_device(boost::bind(&MainWindow::session_error, this,
-                                            QString(tr("Set Default Device failed")), _1));
+    _session->set_default_device();
     update_device_list();
 }
 
@@ -597,24 +586,21 @@ void MainWindow::device_changed(bool close)
 
     if (close) {
         _sampling_bar->set_sampling(false);
-        _session->set_default_device(boost::bind(&MainWindow::session_error, this,
-                                                QString(tr("Set Default Device failed")), _1));
+        _session->set_default_device();
     }    
 
      update_device_list();
 }
 
 void MainWindow::on_run_stop()
-{
+{ 
     SigSession *_session = _control->GetSession();
 
     switch(_session->get_capture_state()) {
     case SigSession::Init:
     case SigSession::Stopped:
         commit_trigger(false);
-        _session->start_capture(false,
-            boost::bind(&MainWindow::session_error, this,
-                QString(tr("Capture failed")), _1));
+        _session->start_capture(false);
         _view->capture_init();
         break;
 
@@ -632,9 +618,7 @@ void MainWindow::on_instant_stop()
     case SigSession::Init:
     case SigSession::Stopped:
         commit_trigger(true);
-        _session->start_capture(true,
-            boost::bind(&MainWindow::session_error, this,
-                QString(tr("Capture failed")), _1));
+        _session->start_capture(true);
         _view->capture_init();
         break;
 
@@ -651,7 +635,12 @@ void MainWindow::repeat_resume()
     on_run_stop();
 }
 
-void MainWindow::on_show_error()
+void MainWindow::session_error()
+{
+    _event.session_error();
+}
+
+void MainWindow::on_session_error()
 {
     QString title;
     QString details;
@@ -725,6 +714,11 @@ void MainWindow::on_show_error()
 }
 
 void MainWindow::capture_state_changed(int state)
+{
+    _event.capture_state_changed(state);//safe call
+}
+
+void MainWindow::on_capture_state_changed(int state)
 {
     SigSession *_session = _control->GetSession();
 
@@ -1441,8 +1435,17 @@ void MainWindow::switchTheme(QString style)
     qApp->setStyleSheet(qss.readAll());
     qss.close();
 
-    SigSession *_session = _control->GetSession();
-    _session->data_updated();
+    data_updated();
+}
+
+void MainWindow::data_updated()
+{
+    _event.data_updated(); //safe call
+}
+
+void MainWindow::on_data_updated(){
+    _measure_widget->reCalc();
+    _view->data_updated();
 }
 
 void MainWindow::on_open_doc(){
@@ -1463,4 +1466,98 @@ void MainWindow::openDoc()
                 QUrl("file:///"+dir.absolutePath() + "/ug"+QString::number(lan)+".pdf"));
 }
 
+void MainWindow::update_capture(){
+    _view->update_hori_res();
+}
+
+void MainWindow::cur_snap_samplerate_changed(){
+    _event.cur_snap_samplerate_changed(); //safe call
+}
+
+void MainWindow::on_cur_snap_samplerate_changed()
+{
+    _measure_widget->cursor_update();
+}
+
+void MainWindow::device_setted(){
+    _view->set_device();
+}
+
+ void MainWindow::signals_changed()
+ {
+     _event.signals_changed(); //safe call
+ }
+
+ void MainWindow::on_signals_changed()
+ {
+     _view->signals_changed();
+ }
+
+ void MainWindow::receive_trigger(quint64 trigger_pos)
+ {
+     _event.receive_trigger(trigger_pos); //save call
+ }
+
+ void MainWindow::on_receive_trigger(quint64 trigger_pos)
+ {
+     _view->receive_trigger(trigger_pos);
+ }
+
+ void MainWindow::frame_ended()
+ {
+     _event.frame_ended(); //save call
+ }
+
+ void MainWindow::on_frame_ended()
+ {
+     _view->receive_end();
+ }
+
+ void MainWindow::frame_began()
+ {
+     _event.frame_began(); //save call
+ }
+
+ void MainWindow::on_frame_began()
+ {
+     _view->frame_began();
+ }
+
+ void MainWindow::show_region(uint64_t start, uint64_t end, bool keep){
+     _view->show_region(start, end, keep);
+ }
+
+ void MainWindow::show_wait_trigger(){
+     _view->show_wait_trigger();
+ }
+
+ void MainWindow::repeat_hold(int percent){
+     (void)percent;
+     _view->repeat_show();
+ }
+
+ void MainWindow::decode_done(){
+     _event.decode_done(); //safe call
+ }
+
+ void MainWindow::on_decode_done(){
+     _protocol_widget->update_model();
+ }
+
+ void MainWindow::receive_data_len(quint64 len){
+     _event.receive_data_len(len);//safe call
+ }
+
+void MainWindow::on_receive_data_len(quint64 len){
+     _view->set_receive_len(len);
+}
+
+void MainWindow::receive_header(){
+
+}
+
+void MainWindow::data_received(){
+
+}
+
 } // namespace pv
diff --git a/DSView/pv/mainwindow.h b/DSView/pv/mainwindow.h
index 68f2dd6d..446844b7 100755
--- a/DSView/pv/mainwindow.h
+++ b/DSView/pv/mainwindow.h
@@ -25,11 +25,11 @@
 #define DSVIEW_PV_MAINWINDOW_H
 
 #include <list>
-
 #include <QMainWindow>
-#include <QTranslator>
- 
+#include <QTranslator> 
 #include "dialogs/dsmessagebox.h"
+#include "interface/icallbacks.h"
+#include "eventobject.h"
 
 class QAction;
 class QMenuBar;
@@ -72,153 +72,148 @@ using namespace pv::device;
  
 //The mainwindow,referenced by MainFrame
 //TODO: create graph view,toolbar,and show device list
-class MainWindow : public QMainWindow
+class MainWindow : public QMainWindow, public ISessionCallback
 {
 	Q_OBJECT
 
 private:
     static constexpr int Session_Version = 2;
-
+   
 public:
-	explicit MainWindow(QWidget *parent = 0);
+    explicit MainWindow(QWidget *parent = 0);
 
-protected:
-    void closeEvent(QCloseEvent *event);
-
-public:
     void openDoc();
-
     void switchLanguage(int language);
 
 private:
+    void closeEvent(QCloseEvent *event);
+
 	void setup_ui();
-    void retranslateUi();
-	void session_error(const QString text, const QString info_text);
+    void retranslateUi(); 
     bool eventFilter(QObject *object, QEvent *event);
-
     bool load_session_json(QJsonDocument json, bool file_dev,bool bDecoder=true);
-
     void update_device_list();
 
-public slots:
-    void session_save();  
-    
+public slots: 
     void switchTheme(QString style);
-
     void restore_dock();
 
 private slots:
 	void on_load_file(QString file_name);
-
-    void on_open_doc();
-
-    /**
-     * Updates the device list in the sampling bar, and updates the
-     * selection.
-     * @param selected_device The device to select, or NULL if the
-     * first device in the device list should be selected.
-     */
-   
-
+    void on_open_doc(); 
     void on_device_updated_reload();
-
-    void show_session_error(const QString text, const QString info_text);
-
+ 
 	void on_run_stop();
-
-    void on_instant_stop();
-
-    void capture_state_changed(int state);
-
+    void on_instant_stop(); 
     void on_protocol(bool visible);
-
     void on_trigger(bool visible);
-
     void commit_trigger(bool instant);
 
     void on_measure(bool visible);
-
     void on_search(bool visible);
-
     void on_screenShot();
-
     void on_save();
 
     void on_export();
-
-    bool on_load_session(QString name);
-  
-    bool on_store_session(QString name);
-
-    /*
-     * repeat
-     */
-    void repeat_resume();
-
-    /*
-     * hotplug slot function
-     */
-    void device_attach();
-    void device_detach();
+    bool on_load_session(QString name);  
+    bool on_store_session(QString name);     
     void device_detach_post();
     void device_changed(bool close);
-    void on_device_selected();
-
-    /*
-     * errors
-     */
-    void on_show_error();
-
+    void on_device_selected();      
     void on_setLanguage(int language);
+
+    void on_capture_state_changed(int state);
+    void on_data_updated();
+    void on_device_attach();
+    void on_device_detach();
+    void on_show_error(QString str);
+    void on_session_error();
+    void on_signals_changed();
+    void on_receive_trigger(quint64 trigger_pos);
+    void on_frame_ended();
+    void on_frame_began();
+    void on_decode_done();
+    void on_receive_data_len(quint64 len);
+    void on_cur_snap_samplerate_changed();
   
 signals:
     void prgRate(int progress);
 
+//ISessionCallback
+public:
+    void session_save(); 
+
+//ISessionCallback
 private:
-    AppControl     *_control; 
-    bool           _hot_detach;
+    void show_error(QString error);
+    void session_error();
+    void capture_state_changed(int state);
+    void device_attach();
+    void device_detach();
 
-	pv::view::View *_view;
-    dialogs::DSMessageBox *_msg;
+    void data_updated();
+    void repeat_resume();
+    void update_capture();
+    void cur_snap_samplerate_changed();
+    void device_setted();
 
-	QMenuBar *_menu_bar;
-	QMenu *_menu_file;
-	QAction *_action_open;
-	QAction *_action_connect;
-	QAction *_action_quit;
+    void signals_changed();
+    void receive_trigger(quint64 trigger_pos);
+    void frame_ended();
+    void frame_began();
+    void show_region(uint64_t start, uint64_t end, bool keep);
 
-	QMenu *_menu_view;
-	QAction *_action_view_zoom_in;
-	QAction *_action_view_zoom_out;
-	QAction *_action_view_show_cursors;
+    void show_wait_trigger();
+    void repeat_hold(int percent);
+    void decode_done();
+    void receive_data_len(quint64 len);
+    void receive_header();    
+    void data_received();
 
-	QMenu *_menu_help;
-	QAction *_action_about;
+private:
+    AppControl              *_control; 
+    bool                    _hot_detach;
 
-	QWidget *_central_widget;
-	QVBoxLayout *_vertical_layout;
+	pv::view::View          *_view;
+    dialogs::DSMessageBox   *_msg;
 
-	toolbars::SamplingBar *_sampling_bar;
-    toolbars::TrigBar *_trig_bar;
-    toolbars::FileBar *_file_bar;
-    toolbars::LogoBar *_logo_bar; //help button, on top right
+	QMenuBar                *_menu_bar;
+	QMenu                   *_menu_file;
+	QAction                 *_action_open;
+	QAction                 *_action_connect;
+	QAction                 *_action_quit;
+
+	QMenu                   *_menu_view;
+	QAction                 *_action_view_zoom_in;
+	QAction                 *_action_view_zoom_out;
+	QAction                 *_action_view_show_cursors;
+
+	QMenu                   *_menu_help;
+	QAction                 *_action_about;
+
+	QWidget                 *_central_widget;
+	QVBoxLayout             *_vertical_layout;
+
+	toolbars::SamplingBar   *_sampling_bar;
+    toolbars::TrigBar       *_trig_bar;
+    toolbars::FileBar       *_file_bar;
+    toolbars::LogoBar       *_logo_bar; //help button, on top right
 
 
-    QDockWidget *_protocol_dock;
-    dock::ProtocolDock *_protocol_widget;
+    QDockWidget             *_protocol_dock;
+    dock::ProtocolDock      *_protocol_widget;
+    QDockWidget             *_trigger_dock;
+    QDockWidget             *_dso_trigger_dock;
+    dock::TriggerDock       *_trigger_widget;
+    dock::DsoTriggerDock    *_dso_trigger_widget;
+    QDockWidget             *_measure_dock;
+    dock::MeasureDock       *_measure_widget;
+    QDockWidget             *_search_dock;
+    dock::SearchDock        *_search_widget;
 
-
-    QDockWidget *_trigger_dock;
-    QDockWidget *_dso_trigger_dock;
-    dock::TriggerDock *_trigger_widget;
-    dock::DsoTriggerDock *_dso_trigger_widget;
-    QDockWidget *_measure_dock;
-    dock::MeasureDock *_measure_widget;
-    QDockWidget *_search_dock;
-    dock::SearchDock * _search_widget;
-
-    QTranslator _qtTrans;
-    QTranslator _myTrans;
+    QTranslator     _qtTrans;
+    QTranslator     _myTrans;
+    EventObject     _event;
 };
 
 } // namespace pv
diff --git a/DSView/pv/sigsession.cpp b/DSView/pv/sigsession.cpp
index a42432db..99a41300 100755
--- a/DSView/pv/sigsession.cpp
+++ b/DSView/pv/sigsession.cpp
@@ -23,7 +23,6 @@
 
 #include <libsigrokdecode4DSL/libsigrokdecode.h>
 
-
 #include "sigsession.h"
 #include "mainwindow.h"
 #include "devicemanager.h"
@@ -55,23 +54,13 @@
 
 #include <assert.h>
 #include <stdexcept>
-#include <sys/stat.h>
-
+#include <sys/stat.h> 
 #include <QDebug>
-#include <QProgressDialog>
-#include <QFile>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QFuture>
-#include <QtConcurrent/QtConcurrent>
-#include <QDebug>
-
+#include <map>
  
 #include "data/decode/decoderstatus.h"
 #include "dsvdef.h"
 
-
-using namespace boost;
   
 namespace pv {
 
@@ -103,7 +92,7 @@ SigSession::SigSession(DeviceManager *device_manager)
     _data_lock = false;
     _data_updated = false;
 
-    _decoder_model = new pv::data::DecoderModel(this);
+    _decoder_model = new pv::data::DecoderModel(NULL);
 
     _lissajous_trace = NULL;
     _math_trace = NULL;
@@ -112,6 +101,7 @@ SigSession::SigSession(DeviceManager *device_manager)
     _stop_scale = 1; 
     _bDecodeRunning = false;
     _bClose = false;
+    _callback = NULL;
 
     // Create snapshots & data containers 
     _logic_data = new data::Logic(new data::LogicSnapshot()); 
@@ -120,12 +110,11 @@ SigSession::SigSession(DeviceManager *device_manager)
     _group_data = new data::Group();
     _group_cnt = 0;
 
-    _feed_timer.stop();
-
-    connect(&_feed_timer, SIGNAL(timeout()), this, SLOT(feed_timeout()));
+    _feed_timer.Stop(); 
+    _feed_timer.SetCallback(std::bind(&SigSession::feed_timeout, this)); 
 }
 
-//SigSession::SigSession(SigSession &o){(void)o;}
+SigSession::SigSession(SigSession &o){(void)o;}
 
 SigSession::~SigSession()
 { 
@@ -181,7 +170,7 @@ void SigSession::set_device(DevInst *dev_inst)
             return;
         }
         sr_session_datafeed_callback_add(data_feed_in_proc, NULL);
-        device_setted();
+        _callback->device_setted();
     }
 }
 
@@ -217,7 +206,7 @@ void SigSession::close_file(DevInst *dev_inst)
     }
 }
 
-void SigSession::set_default_device(boost::function<void (const QString)> error_handler)
+void SigSession::set_default_device()
 {
     assert(_device_manager);
 
@@ -240,7 +229,7 @@ void SigSession::set_default_device(boost::function<void (const QString)> error_
            try {
             set_device(default_device);
         } catch(const QString e) {
-            error_handler(e);
+            _callback->show_error(e);
             return;
         }
     }
@@ -252,14 +241,14 @@ void SigSession::release_device(DevInst *dev_inst)
         return;
 
     assert(dev_inst);
-    assert(_dev_inst == dev_inst);
+   // assert(_dev_inst == dev_inst);
     assert(get_capture_state() != Running);
 
     _dev_inst =  NULL;
 }
 
 SigSession::capture_state SigSession::get_capture_state()
-{
+{ 
     std::lock_guard<std::mutex> lock(_sampling_mutex);
     return _capture_state;
 }
@@ -327,7 +316,7 @@ void SigSession::set_cur_snap_samplerate(uint64_t samplerate)
     for(auto & m : _spectrum_traces)
         m->get_spectrum_stack()->set_samplerate(_cur_snap_samplerate);
 
-    cur_snap_samplerate_changed();
+    _callback->cur_snap_samplerate_changed();
 }
 
 void SigSession::set_cur_samplelimits(uint64_t samplelimits)
@@ -343,7 +332,7 @@ void SigSession::capture_init()
         set_repeating(get_run_mode() == Repetitive);
     // update instant setting
     _dev_inst->set_config(NULL, NULL, SR_CONF_INSTANT, g_variant_new_boolean(_instant));
-    update_capture();
+    _callback->update_capture();
 
     set_cur_snap_samplerate(_dev_inst->get_sample_rate());
     set_cur_samplelimits(_dev_inst->get_sample_limit());
@@ -354,9 +343,9 @@ void SigSession::capture_init()
     _hw_replied = false;
     
     if (_dev_inst->dev_inst()->mode != LOGIC)
-        _feed_timer.start(FeedInterval);
+        _feed_timer.Start(FeedInterval);
     else
-        _feed_timer.stop();
+        _feed_timer.Stop();
 
     _noData_cnt = 0;
     data_unlock();
@@ -419,8 +408,7 @@ void SigSession::container_init()
 
 }
 
-void SigSession::start_capture(bool instant,
-    boost::function<void (const QString)> error_handler)
+void SigSession::start_capture(bool instant)
 {  
     // Check that a device instance has been selected.
     if (!_dev_inst) {
@@ -432,7 +420,7 @@ void SigSession::start_capture(bool instant,
 
     if (!_dev_inst->is_usable()) {
         _error = Hw_err;
-        session_error();
+        _callback->session_error();
         capture_state_changed(SigSession::Stopped);
         return;
     }
@@ -468,7 +456,7 @@ void SigSession::start_capture(bool instant,
             break;
     }
     if (!l) {
-        error_handler(tr("No probes enabled."));
+        _callback->show_error("No probes enabled.");
         data_updated();
         set_repeating(false);
         capture_state_changed(SigSession::Stopped);
@@ -478,29 +466,25 @@ void SigSession::start_capture(bool instant,
     if (_sampling_thread.joinable()){
         _sampling_thread.join();
     } 
-    _sampling_thread  = std::thread(&SigSession::sample_thread_proc, this, _dev_inst, error_handler);
+    _sampling_thread  = std::thread(&SigSession::sample_thread_proc, this, _dev_inst);
 }
 
 
-void SigSession::sample_thread_proc(DevInst *dev_inst,
-                                    boost::function<void (const QString)> error_handler)
+void SigSession::sample_thread_proc(DevInst *dev_inst)
 {
     assert(dev_inst);
     assert(dev_inst->dev_inst());
-    assert(error_handler);
 
     try {
         dev_inst->start();
     } catch(const QString e) {
-        error_handler(e);
+        _callback->show_error(e);
         return;
     }
 
     receive_data(0);
     set_capture_state(Running);
-
     dev_inst->run();
-
     set_capture_state(Stopped);
 
     // Confirm that SR_DF_END was received
@@ -564,8 +548,7 @@ std::vector<view::GroupSignal*>& SigSession::get_group_signals()
 }
 
 std::set<data::SignalData*> SigSession::get_data()
-{
-    //lock_guard<mutex> lock(_signals_mutex);
+{ 
     std::set<data::SignalData*> data;
 
     for(auto &sig : _signals) {
@@ -582,7 +565,7 @@ bool SigSession::get_instant()
 }
 
 void SigSession::set_capture_state(capture_state state)
-{
+{ 
     std::lock_guard<std::mutex> lock(_sampling_mutex);
     _capture_state = state;
     data_updated();
@@ -766,7 +749,6 @@ void SigSession::init_signals()
     spectrum_rebuild();
     lissajous_disable();
     math_disable();
-    //data_updated();
 }
 
 void SigSession::reload()
@@ -776,66 +758,72 @@ void SigSession::reload()
     if (_capture_state == Running)
         stop_capture();
 
-    //refresh(0);
     std::vector<view::Signal*> sigs;
     view::Signal *signal = NULL;
 
     // Make the logic probe list
+    for (GSList *l = _dev_inst->dev_inst()->channels; l; l = l->next)
     {
-        for (GSList *l = _dev_inst->dev_inst()->channels; l; l = l->next) {
-            sr_channel *probe =
-                (sr_channel *)l->data;
-            assert(probe);
-            signal = NULL;
+        sr_channel *probe =
+            (sr_channel *)l->data;
+        assert(probe);
+        signal = NULL;
 
-            switch(probe->type) {
-            case SR_CHANNEL_LOGIC:
-                if (probe->enabled) {
-                    auto i = _signals.begin();
-                    while (i != _signals.end()) {
-                        if ((*i)->get_index() == probe->index) {
-                            view::LogicSignal *logicSig = NULL;
-                            if ((logicSig = dynamic_cast<view::LogicSignal*>(*i)))
-                                signal = new view::LogicSignal(logicSig, _logic_data, probe);
-                            break;
-                        }
-                        i++;
+        switch (probe->type)
+        {
+        case SR_CHANNEL_LOGIC:
+            if (probe->enabled)
+            {
+                auto i = _signals.begin();
+                while (i != _signals.end())
+                {
+                    if ((*i)->get_index() == probe->index)
+                    {
+                        view::LogicSignal *logicSig = NULL;
+                        if ((logicSig = dynamic_cast<view::LogicSignal *>(*i)))
+                            signal = new view::LogicSignal(logicSig, _logic_data, probe);
+                        break;
                     }
-                    if (signal == NULL){
-                         signal =  new view::LogicSignal(_dev_inst, _logic_data, probe);
-                    }                       
+                    i++;
                 }
-                break;
-
-  
-            case SR_CHANNEL_ANALOG:
-                if (probe->enabled) {
-                    auto i = _signals.begin();
-                    while (i != _signals.end()) {
-                        if ((*i)->get_index() == probe->index) {
-                            view::AnalogSignal *analogSig = NULL;
-                            if ((analogSig = dynamic_cast<view::AnalogSignal*>(*i)))
-                                signal = new view::AnalogSignal(analogSig, _analog_data, probe);
-                            break;
-                        }
-                        i++;
-                    }
-                    if (signal == NULL){
-                        signal =  new view::AnalogSignal(_dev_inst, _analog_data, probe);
-                    }
-                        
+                if (signal == NULL)
+                {
+                    signal = new view::LogicSignal(_dev_inst, _logic_data, probe);
                 }
-                break;
             }
-            if (signal != NULL)
-                sigs.push_back(signal);
-        }
+            break;
 
-        if (!sigs.empty()) { 
-            RELEASE_ARRAY(_signals);
-            std::vector<view::Signal*>().swap(_signals);
-            _signals = sigs;
+        case SR_CHANNEL_ANALOG:
+            if (probe->enabled)
+            {
+                auto i = _signals.begin();
+                while (i != _signals.end())
+                {
+                    if ((*i)->get_index() == probe->index)
+                    {
+                        view::AnalogSignal *analogSig = NULL;
+                        if ((analogSig = dynamic_cast<view::AnalogSignal *>(*i)))
+                            signal = new view::AnalogSignal(analogSig, _analog_data, probe);
+                        break;
+                    }
+                    i++;
+                }
+                if (signal == NULL)
+                {
+                    signal = new view::AnalogSignal(_dev_inst, _analog_data, probe);
+                }
+            }
+            break;
         }
+        if (signal != NULL)
+            sigs.push_back(signal);
+    }
+
+    if (!sigs.empty())
+    {
+        RELEASE_ARRAY(_signals);
+        std::vector<view::Signal *>().swap(_signals);
+        _signals = sigs;
     }
 
     spectrum_rebuild();
@@ -872,9 +860,8 @@ void SigSession::refresh(int holdtime)
     if (_analog_data) {
         _analog_data->init(); 
     }
-
-    QTimer::singleShot(holdtime, this, SLOT(feed_timeout()));
-    //data_updated();
+ 
+    _out_timer.TimeOut(holdtime, std::bind(&SigSession::feed_timeout, this));
     _data_updated = true;
 }
 
@@ -912,7 +899,7 @@ void SigSession::feed_in_header(const sr_dev_inst *sdi)
 {
     (void)sdi;
     _trigger_pos = 0;
-    receive_header();
+   _callback->receive_header();
 }
 
 void SigSession::feed_in_meta(const sr_dev_inst *sdi,
@@ -941,7 +928,7 @@ void SigSession::feed_in_trigger(const ds_trigger_pos &trigger_pos)
         _trigger_flag = (trigger_pos.status & 0x01);
         if (_trigger_flag) {
             _trigger_pos = trigger_pos.real_pos;
-            receive_trigger(_trigger_pos);
+            _callback->receive_trigger(_trigger_pos);
         }
     } else {
         int probe_count = 0;
@@ -956,7 +943,7 @@ void SigSession::feed_in_trigger(const ds_trigger_pos &trigger_pos)
             }
         }
         _trigger_pos = trigger_pos.real_pos * probe_count / probe_en_count;
-        receive_trigger(_trigger_pos);
+        _callback->receive_trigger(_trigger_pos);
     }
 }
 
@@ -970,7 +957,7 @@ void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
     if (logic.data_error == 1) {
         _error = Test_data_err;
         _error_pattern = logic.error_pattern;
-        session_error();
+        _callback->session_error();
     }
 
     if (_logic_data->snapshot()->last_ended()) {
@@ -979,7 +966,7 @@ void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
         // for logic will be notified. Currently the only user of
         // frame_began is DecoderStack, but in future we need to signal
         // this after both analog and logic sweeps have begun.
-        frame_began();
+        _callback->frame_began();
     } else {
         // Append to the existing data snapshot
         _logic_data->snapshot()->append_payload(logic);
@@ -987,13 +974,14 @@ void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
 
     if (_logic_data->snapshot()->memory_failed()) {
         _error = Malloc_err;
-        session_error();
+        _callback->session_error();
         return;
     }
 
-    emit receive_data(logic.length * 8 / get_ch_num(SR_CHANNEL_LOGIC));
-    data_received();
-    //data_updated();
+    receive_data(logic.length * 8 / get_ch_num(SR_CHANNEL_LOGIC));
+    
+    _callback->data_received(); 
+    
     _data_updated = true;
 }
 
@@ -1040,7 +1028,7 @@ void SigSession::feed_in_dso(const sr_datafeed_dso &dso)
 
     if (_dso_data->snapshot()->memory_failed()) {
         _error = Malloc_err;
-        session_error();
+        _callback->session_error();
         return;
     }
 
@@ -1098,12 +1086,11 @@ void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
 
     if (_analog_data->snapshot()->memory_failed()) {
         _error = Malloc_err;
-        session_error();
+        _callback->session_error();
         return;
     }
 
     receive_data(analog.num_samples);
-    //data_updated();
     _data_updated = true;
 }
   
@@ -1121,7 +1108,7 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
     if (packet->type != SR_DF_END &&
         packet->status != SR_PKT_OK) {
         _error = Pkt_data_err;
-        session_error();
+        _callback->session_error();
         return;
     }
 
@@ -1160,7 +1147,7 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
     {
         if (_error == No_err) {
             _error = Data_overflow;
-            session_error();
+            _callback->session_error();
         }
         break;
     }
@@ -1190,10 +1177,10 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
 
         if (packet->status != SR_PKT_OK) {
             _error = Pkt_data_err;
-            session_error();
+            _callback->session_error();
         }
 
-        frame_ended();
+        _callback->frame_ended();
 
         if (get_device()->dev_inst()->mode != LOGIC){
              set_session_time(QDateTime::currentDateTime());
@@ -1235,11 +1222,9 @@ int SigSession::hotplug_callback(struct libusb_context *ctx, struct libusb_devic
     return 0;
 }
 
-void SigSession::hotplug_proc(boost::function<void (const QString)> error_handler)
+void SigSession::hotplug_proc()
 {
-    struct timeval tv;
-
-    (void)error_handler;
+    struct timeval tv; 
 
     if (!_dev_inst)
         return;
@@ -1250,12 +1235,12 @@ void SigSession::hotplug_proc(boost::function<void (const QString)> error_handle
             libusb_handle_events_timeout(NULL, &tv);
             if (_hot_attach) {
                 qDebug("DreamSourceLab hardware attached!");
-                device_attach();
+                _callback->device_attach();
                 _hot_attach = false;
             }
             if (_hot_detach) {
                 qDebug("DreamSourceLab hardware detached!");
-                device_detach();
+                _callback->device_detach();
                 _hot_detach = false;
             }
             std::this_thread::sleep_for(std::chrono::milliseconds(100));
@@ -1285,7 +1270,7 @@ void SigSession::deregister_hotplug_callback()
     libusb_hotplug_deregister_callback(NULL, _hotplug_handle);
 }
 
-void SigSession::start_hotplug_work(boost::function<void (const QString)> error_handler)
+void SigSession::start_hotplug_work()
 {
 
     // Begin the session
@@ -1296,7 +1281,7 @@ void SigSession::start_hotplug_work(boost::function<void (const QString)> error_
     if (_hotplug_thread.joinable()){
         return;
     } 
-    _hotplug_thread =  std::thread(&SigSession::hotplug_proc, this, error_handler);
+    _hotplug_thread =  std::thread(&SigSession::hotplug_proc, this);
 }
 
 void SigSession::stop_hotplug_work()
@@ -1563,7 +1548,7 @@ void SigSession::nodata_timeout()
     if (gvar == NULL)
         return;
     if (g_variant_get_byte(gvar) != DSO_TRIGGER_AUTO) {
-        show_wait_trigger();
+        _callback->show_wait_trigger();
     }
 }
 
@@ -1651,8 +1636,8 @@ bool SigSession::repeat_check()
 
     if (_dev_inst->dev_inst()->mode == LOGIC) {
         _repeat_hold_prg = 100;
-        repeat_hold(_repeat_hold_prg);
-        QTimer::singleShot(_repeat_intvl*1000/RepeatHoldDiv, this, SLOT(repeat_update()));
+        _callback->repeat_hold(_repeat_hold_prg); 
+        _out_timer.TimeOut(_repeat_intvl*1000/RepeatHoldDiv, std::bind(&SigSession::repeat_update, this));
         return true;
     } else {
         return false;
@@ -1663,9 +1648,10 @@ void SigSession::repeat_update()
 {
     if (isRepeating()) {
         _repeat_hold_prg -= 100/RepeatHoldDiv;
-        if (_repeat_hold_prg != 0)
-            QTimer::singleShot(_repeat_intvl*1000/RepeatHoldDiv, this, SLOT(repeat_update()));
-        repeat_hold(_repeat_hold_prg);
+        if (_repeat_hold_prg != 0){
+            _out_timer.TimeOut(_repeat_intvl*1000/RepeatHoldDiv, std::bind(&SigSession::repeat_update, this));
+        }
+        _callback->repeat_hold(_repeat_hold_prg);
         if (_repeat_hold_prg == 0)
             repeat_resume();
     }
diff --git a/DSView/pv/sigsession.h b/DSView/pv/sigsession.h
index c5f97439..16864adb 100755
--- a/DSView/pv/sigsession.h
+++ b/DSView/pv/sigsession.h
@@ -24,30 +24,20 @@
 #define DSVIEW_PV_SIGSESSION_H
 
 #include <libsigrok4DSL/libsigrok.h>
-#include <boost/function.hpp>  
-
-#include <string>
-#include <utility>
-#include <map>
+   
 #include <set>
 #include <string>
 #include <vector>
-#include <stdint.h>
-
-#include <QObject>
-#include <QString>
-#include <QLine>
-#include <QVector>
-#include <QMap>
-#include <QVariant>
-#include <QTimer>
-#include <QtConcurrent/QtConcurrent>
-#include <QJsonObject>
-
+#include <stdint.h> 
+#include <QString>  
 #include <libusb.h>
+#include <thread>
+#include <QDateTime>
 
 #include "view/mathtrace.h"
 #include "data/mathstack.h"
+#include "interface/icallbacks.h"
+#include "dstimer.h"
 
 struct srd_decoder;
 struct srd_channel;
@@ -96,10 +86,8 @@ class DecoderFactory;
 using namespace pv::device;
 
 //created by MainWindow
-class SigSession : public QObject
+class SigSession
 {
-        Q_OBJECT
-
 private:
     static constexpr float Oversampling = 2.0f;
     static const int RefreshTime = 500;
@@ -132,7 +120,7 @@ public:
     };
 
 private:
-   // SigSession(SigSession &o);
+    SigSession(SigSession &o);
   
 public:
     explicit SigSession(DeviceManager *device_manager);
@@ -145,95 +133,60 @@ public:
 	 * Sets device instance that will be used in the next capture session.
 	 */
     void set_device(DevInst *dev_inst);
-
     void deselect_device();
-
     void set_file(QString name);
-
     void close_file(DevInst *dev_inst);
-
-    void set_default_device(boost::function<void (const QString)> error_handler);
+    void set_default_device();
 
     void release_device(DevInst *dev_inst);
-
 	capture_state get_capture_state();
-
     uint64_t cur_samplerate();
-
     uint64_t cur_snap_samplerate();
-
     uint64_t cur_samplelimits();
 
     double cur_sampletime();
-
     double cur_snap_sampletime();
-
     double cur_view_time();
 
     void set_cur_snap_samplerate(uint64_t samplerate);
-
     void set_cur_samplelimits(uint64_t samplelimits);
-
     void set_session_time(QDateTime time);
 
     QDateTime get_session_time();
-
     uint64_t get_trigger_pos();
-
-    void start_capture(bool instant, boost::function<void (const QString)> error_handler);
-
+  
     bool get_capture_status(bool &triggered, int &progress);
 
-    void container_init();
-
+    void container_init();    
     std::set<data::SignalData*> get_data();
-
 	std::vector<view::Signal*>& get_signals();
-
     std::vector<view::GroupSignal*>& get_group_signals();
 
     bool add_decoder(srd_decoder *const dec, bool silent, DecoderStatus *dstatus);
-
-    void remove_decoder(int index);
-  
+    void remove_decoder(int index);  
     std::vector<view::DecodeTrace*>& get_decode_signals();
  
-    void rst_decoder(int index);
- 
+    void rst_decoder(int index); 
     pv::data::DecoderModel* get_decoder_model();
-
     std::vector<view::SpectrumTrace*>& get_spectrum_traces();
-
     view::LissajousTrace* get_lissajous_trace();
-
     view::MathTrace* get_math_trace();
 
     void init_signals();
-
     void add_group();
-
     void del_group();
-
-    void start_hotplug_work(boost::function<void (const QString)> error_handler);
-
-    void stop_hotplug_work();	
-
+    void start_hotplug_work();
+    void stop_hotplug_work();
     uint16_t get_ch_num(int type);
     
     bool get_instant();
-
     bool get_data_lock();
-
     void data_auto_lock(int lock);
-
     void data_auto_unlock();
-
     bool get_data_auto_lock();
 
     void spectrum_rebuild();
-
     void lissajous_rebuild(bool enable, int xindex, int yindex, double percent);
-
     void lissajous_disable();
 
     void math_rebuild(bool enable,pv::view::DsoSignal *dsoSig1,
@@ -241,91 +194,104 @@ public:
                       data::MathStack::MathType type);
 
     void math_disable();
-
     bool trigd();
-
     uint8_t trigd_ch();
-
     data::Snapshot* get_snapshot(int type);
-
     error_state get_error();
-
     void set_error(error_state state);
-
     void clear_error();
 
     uint64_t get_error_pattern();
-
     run_mode get_run_mode();
-
     void set_run_mode(run_mode mode);
-
     int get_repeat_intvl();
-
     void set_repeat_intvl(int interval);
 
     bool isRepeating();
-
     bool repeat_check();
-
     int get_repeat_hold();
-
     int get_map_zoom();
-
     void set_save_start(uint64_t start);
 
     void set_save_end(uint64_t end);
-
     uint64_t get_save_start();
-
     uint64_t get_save_end();
-
     bool get_saving();
 
     void set_saving(bool saving);
-
     void set_stop_scale(float scale);
-
     float stop_scale();
 
     void exit_capture();
-
     sr_dev_inst* get_dev_inst_c();
-
     void Open();
-
     void Close();
-
     void clear_all_decoder(); 
 
     inline bool is_closed(){
         return _bClose;
     }
+
+    inline void set_callback(ISessionCallback *callback){
+        _callback = callback;
+    }
+ 
+public:
+    inline void capture_state_changed(int state){
+        _callback->capture_state_changed(state);
+    }
+
+    inline void session_save(){
+         _callback->session_save();
+    }
+
+    inline void repeat_resume(){
+         _callback->repeat_resume();
+    }
+
+    inline void show_region(uint64_t start, uint64_t end, bool keep){
+        _callback->show_region(start, end, keep);
+    }
+
+     inline void decode_done(){
+         _callback->decode_done();
+     }
+
+private:
+    inline void data_updated(){
+        _callback->data_updated();
+    }
+
+    inline void signals_changed(){
+        _callback->signals_changed();
+    }
+
+    inline void receive_data(quint64 len){
+        _callback->receive_data_len(len);
+    } 
  
 private:
 	void set_capture_state(capture_state state);
-
     void register_hotplug_callback();
-
     void deregister_hotplug_callback();
 
     bool do_add_decoder(srd_decoder *const dec, bool silent, DecoderStatus *dstatus);
 
     void add_decode_task(view::DecodeTrace *trace);
-
     void remove_decode_task(view::DecodeTrace *trace);
+    void clear_all_decode_task(int &runningDex);   
 
-    void clear_all_decode_task(int &runningDex); 
-  
     view::DecodeTrace* get_decoder_trace(int index);
-
     void decode_task_proc();
+    view::DecodeTrace* get_top_decode_task();    
 
-    view::DecodeTrace* get_top_decode_task();
-    
     void capture_init();
-
     void do_stop_capture();
+    void data_lock();
+    void data_unlock();
+    void nodata_timeout();
+    void feed_timeout();
+    void repeat_update(); 
 
 private:
     /**
@@ -337,14 +303,8 @@ private:
      */
     static sr_input_format* determine_input_file_format(
         const std::string &filename);
-
-    static sr_input* load_input_file_format(
-        const std::string &filename,
-        boost::function<void (const QString)> error_handler,
-        sr_input_format *format = NULL);
-
-    void sample_thread_proc(DevInst *dev_inst,
-                            boost::function<void (const QString)> error_handler);
+  
+    void sample_thread_proc(DevInst *dev_inst);
 
     // data feed
 	void feed_in_header(const sr_dev_inst *sdi);
@@ -367,87 +327,20 @@ private:
 		const struct sr_datafeed_packet *packet, void *cb_data);
 
     // thread for hotplug
-    void hotplug_proc(boost::function<void (const QString)> error_handler);
+    void hotplug_proc();
 
     static int hotplug_callback(struct libusb_context *ctx, struct libusb_device *dev,
                                 libusb_hotplug_event event, void *user_data);
 
-
-
-signals:
-	void capture_state_changed(int state);
-
-	void signals_changed();
-
-	void data_updated();
-
-    void receive_data(quint64 length);
-
-    void device_attach();
-
-    void device_detach();
-
-    void receive_trigger(quint64 trigger_pos);
-
-    void receive_header();
-
-    void dso_ch_changed(uint16_t num);
-
-    void frame_began();
-
-    void data_received();
-
-    void frame_ended();
-
-    void device_setted();
-
-    void zero_adj();
-
-    void progressSaveFileValueChanged(int percent);
-
-    void decode_done();
-
-    void show_region(uint64_t start, uint64_t end, bool keep);
-
-    void show_wait_trigger();
-
-    void session_save();
-
-    void session_error();
-
-    void repeat_hold(int percent);
-
-    void repeat_resume();
-
-    void cur_snap_samplerate_changed();
-
-    void update_capture();
-
-public slots:
+public:
     void reload();
-
     void refresh(int holdtime);
-
+    void start_capture(bool instant);
     void stop_capture();
-
     void check_update();
-    // repeat
     void set_repeating(bool repeat);
-    
     void set_map_zoom(int index);
-    // OSC auto
-    void auto_end();
-
-private slots:
-    void data_lock();
-
-    void data_unlock();
-
-    void nodata_timeout();
-
-    void feed_timeout();
-
-    void repeat_update(); 
+    void auto_end(); 
  
 private:
 	DeviceManager   *_device_manager;
@@ -494,7 +387,8 @@ private:
     bool        _hot_attach;
     bool        _hot_detach;
 
-    QTimer      _feed_timer;
+    DsTimer     _feed_timer;
+    DsTimer     _out_timer;
     int         _noData_cnt;
     bool        _data_lock;
     bool        _data_updated;
@@ -524,6 +418,8 @@ private:
     float       _stop_scale; 
     bool        _bClose;
 
+    ISessionCallback *_callback;
+
 private:
 	// TODO: This should not be necessary. Multiple concurrent
 	// sessions should should be supported and it should be
diff --git a/DSView/pv/storesession.cpp b/DSView/pv/storesession.cpp
index 1540affb..eee40b78 100755
--- a/DSView/pv/storesession.cpp
+++ b/DSView/pv/storesession.cpp
@@ -43,6 +43,14 @@
  
 #include <QFileDialog>
 #include <QDir>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonArray>
+#include <QStandardPaths>
+#include <math.h>
+#include <QTextStream>
+#include <QDebug>
+
 
 #include "config/appconfig.h"
  
diff --git a/DSView/pv/toolbars/filebar.cpp b/DSView/pv/toolbars/filebar.cpp
index 0262e0ac..fb708f96 100755
--- a/DSView/pv/toolbars/filebar.cpp
+++ b/DSView/pv/toolbars/filebar.cpp
@@ -19,18 +19,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <boost/bind.hpp>
-   
+#include <boost/bind.hpp>   
 #include <QMetaObject>
 #include <QFileDialog> 
+#include <deque>
+#include <QApplication>
 
 #include "filebar.h"
 #include "../device/devinst.h" 
 #include "../ui/msgbox.h"
 #include "../config/appconfig.h"
 
-#include <deque>
-
 namespace pv {
 namespace toolbars {
 
diff --git a/DSView/pv/toolbars/logobar.cpp b/DSView/pv/toolbars/logobar.cpp
index 4c65cf41..01da8850 100755
--- a/DSView/pv/toolbars/logobar.cpp
+++ b/DSView/pv/toolbars/logobar.cpp
@@ -26,6 +26,7 @@
 #include <QFileDialog> 
 #include <QDesktopServices>
 #include <QUrl>
+#include <QApplication>
 
 #include "logobar.h"
 #include "../dialogs/about.h"
diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp
index 59fbcb42..ff193b4c 100755
--- a/DSView/pv/toolbars/samplingbar.cpp
+++ b/DSView/pv/toolbars/samplingbar.cpp
@@ -30,6 +30,7 @@
 #include <QDebug>
 #include <QLabel>
 #include <QAbstractItemView>
+#include <math.h>
 
 #include "../devicemanager.h"
 #include "../device/devinst.h"
@@ -814,6 +815,7 @@ void SamplingBar::commit_settings()
     }
 }
 
+//start or stop capture
 void SamplingBar::on_run_stop()
 {
     if (get_sampling() || _session->isRepeating()) {
@@ -886,14 +888,16 @@ void SamplingBar::on_instant_stop()
 
         if (dev_inst->dev_inst()->mode == DSO) {
             GVariant* gvar = dev_inst->get_config(NULL, NULL, SR_CONF_ZERO);
+
             if (gvar != NULL) {
                 bool zero = g_variant_get_boolean(gvar);
                 g_variant_unref(gvar);
+
                 if (zero) {
                     dialogs::DSMessageBox msg(this);
                     msg.mBox()->setText(tr("Auto Calibration"));
                     msg.mBox()->setInformativeText(tr("Auto Calibration program will be started. Don't connect any probes. It can take a while!"));
-                    //msg.mBox()->setStandardButtons(QMessageBox::Ok);
+                  
                     msg.mBox()->addButton(tr("Ok"), QMessageBox::AcceptRole);
                     msg.mBox()->addButton(tr("Skip"), QMessageBox::RejectRole);
                     msg.mBox()->setIcon(QMessageBox::Warning);
diff --git a/DSView/pv/toolbars/trigbar.cpp b/DSView/pv/toolbars/trigbar.cpp
index 2d6cdf29..4666c88b 100755
--- a/DSView/pv/toolbars/trigbar.cpp
+++ b/DSView/pv/toolbars/trigbar.cpp
@@ -20,15 +20,17 @@
  */
 
 #include "trigbar.h"
+
+#include <QBitmap>
+#include <QPainter>
+#include <QEvent>
+
 #include "../sigsession.h"
 #include "../device/devinst.h"
 #include "../dialogs/fftoptions.h"
 #include "../dialogs/lissajousoptions.h"
 #include "../dialogs/mathoptions.h"
 #include "../view/trace.h"
-
-#include <QBitmap>
-#include <QPainter>
 #include "../dialogs/applicationpardlg.h"
 #include "../config/appconfig.h"
 
diff --git a/DSView/pv/view/analogsignal.cpp b/DSView/pv/view/analogsignal.cpp
index 745834ad..1419046a 100755
--- a/DSView/pv/view/analogsignal.cpp
+++ b/DSView/pv/view/analogsignal.cpp
@@ -21,7 +21,7 @@
  */
 
 #include <extdef.h>
-
+#include <QDebug>
 #include <math.h>
 
 #include "../view/analogsignal.h"
@@ -30,6 +30,7 @@
 #include "../view/view.h"
 #include "../device/devinst.h"
 
+
 using namespace std;
 
 #define byte(x) uint##x##_t
diff --git a/DSView/pv/view/dsosignal.cpp b/DSView/pv/view/dsosignal.cpp
index f4d748ba..24b69243 100755
--- a/DSView/pv/view/dsosignal.cpp
+++ b/DSView/pv/view/dsosignal.cpp
@@ -31,6 +31,8 @@
 #include "../device/devinst.h" 
 #include <QDebug>
 #include <QTimer>
+#include <functional>
+#include <QApplication>
  
 using namespace std;
 
@@ -1457,8 +1459,8 @@ void DsoSignal::auto_start()
         _view->session().data_auto_lock(AutoLock);
         _autoV = true;
         _autoH = true;
-        _view->auto_trig(get_index());
-        QTimer::singleShot(AutoTime, &_view->session(), SLOT(auto_end()));
+        _view->auto_trig(get_index()); 
+        _end_timer.TimeOut(AutoTime, std::bind(&DsoSignal::call_auto_end, this)); //start a timeout
     }
 }
 
@@ -1572,5 +1574,9 @@ QString DsoSignal::get_time(double t)
     return str;
 }
 
+void DsoSignal::call_auto_end(){
+    _view->session().auto_end();
+}
+
 } // namespace view
 } // namespace pv
diff --git a/DSView/pv/view/dsosignal.h b/DSView/pv/view/dsosignal.h
index 2cdd8bde..606cd5ba 100755
--- a/DSView/pv/view/dsosignal.h
+++ b/DSView/pv/view/dsosignal.h
@@ -24,6 +24,7 @@
 #define DSVIEW_PV_DSOSIGNAL_H
 
 #include "signal.h"
+#include "../dstimer.h"
   
 namespace pv {
 namespace data {
@@ -107,8 +108,7 @@ public:
     bool get_vDialActive();
     void set_vDialActive(bool active);
     bool go_vDialPre(bool manul);
-    bool go_vDialNext(bool manul);
-    bool update_capture(bool instant);
+    bool go_vDialNext(bool manul); 
     dslDial *get_vDial();
     uint64_t get_vDialValue();
     uint16_t get_vDialSel();
@@ -227,6 +227,8 @@ private:
     void paint_hover_measure(QPainter &p, QColor fore, QColor back);
     void auto_set();
 
+    void call_auto_end();
+
 private:
     pv::data::Dso *_data;
 	float _scale;
@@ -268,6 +270,7 @@ private:
     uint64_t _hover_index;
     QPointF _hover_point;
     float _hover_value;
+    DsTimer _end_timer;
 };
 
 } // namespace view
diff --git a/DSView/pv/view/spectrumtrace.cpp b/DSView/pv/view/spectrumtrace.cpp
index 3115bf33..8e6bb11e 100755
--- a/DSView/pv/view/spectrumtrace.cpp
+++ b/DSView/pv/view/spectrumtrace.cpp
@@ -21,8 +21,7 @@
 #include <extdef.h>
 #include <algorithm>
 #include <math.h>
-
- 
+#include <QTextStream>
 #include <boost/functional/hash.hpp>
 
 #include "spectrumtrace.h"
diff --git a/DSView/pv/view/view.cpp b/DSView/pv/view/view.cpp
index 91b53b5b..1728e03e 100755
--- a/DSView/pv/view/view.cpp
+++ b/DSView/pv/view/view.cpp
@@ -117,7 +117,6 @@ View::View(SigSession *session, pv::toolbars::SamplingBar *sampling_bar, QWidget
     _devmode = new DevMode(this, session);
 
     setViewportMargins(headerWidth(), RulerHeight, 0, 0);
-    //setViewport(_viewport);
 
     // windows splitter
     _time_viewport = new Viewport(*this, TIME_VIEW);
@@ -184,21 +183,22 @@ View::View(SigSession *session, pv::toolbars::SamplingBar *sampling_bar, QWidget
     connect(_fft_viewport, SIGNAL(measure_updated()), this, SLOT(on_measure_updated()));
 
     connect(_vsplitter, SIGNAL(splitterMoved(int,int)), this, SLOT(splitterMoved(int, int)));
-    connect(_session, SIGNAL(device_setted()),  _devmode, SLOT(set_device()));
-    connect(_session, SIGNAL(signals_changed()), this, SLOT(signals_changed()), Qt::DirectConnection);
-    connect(_session, SIGNAL(data_updated()), this, SLOT(data_updated()));
-    connect(_session, SIGNAL(receive_trigger(quint64)), this, SLOT(receive_trigger(quint64)));
-    connect(_session, SIGNAL(frame_ended()), this, SLOT(receive_end()));
-    connect(_session, SIGNAL(frame_began()),  this, SLOT(frame_began()));
-    connect(_session, SIGNAL(show_region(uint64_t, uint64_t, bool)), this, SLOT(show_region(uint64_t, uint64_t, bool)));
-
-    connect(_session, SIGNAL(show_wait_trigger()),  _time_viewport, SLOT(show_wait_trigger()));
-    connect(_session, SIGNAL(repeat_hold(int)), this, SLOT(repeat_show()));
+      
     connect(_devmode, SIGNAL(dev_changed(bool)),this, SLOT(dev_changed(bool)), Qt::DirectConnection);
     connect(_header, SIGNAL(traces_moved()),this, SLOT(on_traces_moved()));
     connect(_header, SIGNAL(header_updated()),this, SLOT(header_updated()));
 }
 
+void View::show_wait_trigger()
+{
+    _time_viewport->show_wait_trigger();
+}
+
+void View::set_device()
+{
+    _devmode->set_device();
+}
+
 SigSession& View::session()
 {
 	return *_session;
@@ -1313,5 +1313,14 @@ uint64_t View::pixel2index(double pixel)
     return index;
 }
 
+void View::set_receive_len(uint64_t len)
+{
+    if (_time_viewport)
+        _time_viewport->set_receive_len(len);
+        
+    if (_fft_viewport)
+        _fft_viewport->set_receive_len(len);
+}
+
 } // namespace view
 } // namespace pv
diff --git a/DSView/pv/view/view.h b/DSView/pv/view/view.h
index f5e8ea10..a807dd85 100755
--- a/DSView/pv/view/view.h
+++ b/DSView/pv/view/view.h
@@ -306,6 +306,12 @@ public slots:
     //
     void header_updated();
 
+    void receive_trigger(quint64 trig_pos);
+
+    void receive_end();
+
+    void frame_began();
+
 private slots:
 
 	void h_scroll_value_changed(int value);
@@ -315,13 +321,9 @@ private slots:
 
     void on_traces_moved();
 
-    void receive_trigger(quint64 trig_pos);
+   
     void set_trig_pos(int percent);
-
-    void receive_end();
-
-    void frame_began();
-
+ 
     // calibration for oscilloscope
     void show_calibration();
     // lissajous figure
@@ -332,59 +334,65 @@ private slots:
 
     void dev_changed(bool close);
 
+public:
+    void show_wait_trigger();
+    void set_device();
+    void set_receive_len(uint64_t len);
+
 private:
 
-	SigSession  *_session;
-    pv::toolbars::SamplingBar *_sampling_bar;
+	SigSession                  *_session;
+    pv::toolbars::SamplingBar   *_sampling_bar;
 
-    QWidget *_viewcenter;
-    ViewStatus *_viewbottom;
-    QSplitter *_vsplitter;
-    Viewport * _time_viewport;
-    Viewport * _fft_viewport;
-    LissajousFigure *_lissajous;
-    Viewport *_active_viewport;
-    std::list<QWidget *> _viewport_list;
-    std::map<int, int> _trace_view_map;
-	Ruler *_ruler;
-	Header *_header;
-    DevMode *_devmode;
+    QWidget                 *_viewcenter;
+    ViewStatus              *_viewbottom;
+    QSplitter               *_vsplitter;
+    Viewport                *_time_viewport;
+    Viewport                *_fft_viewport;
+    Viewport                *_active_viewport;
+    LissajousFigure         *_lissajous;
+    std::list<QWidget *>    _viewport_list;
+    std::map<int, int>      _trace_view_map;
+	Ruler                   *_ruler;
+	Header                  *_header;
+    DevMode                 *_devmode;
+    
 
 	/// The view time scale in seconds per pixel.
-	double _scale;
-    double _preScale;
-    double _maxscale;
-    double _minscale;
+	double      _scale;
+    double      _preScale;
+    double      _maxscale;
+    double      _minscale;
 
     /// The pixels offset of the left edge of the view
-    int64_t _offset;
-    int64_t _preOffset;
-    int _spanY;
-    int _signalHeight;
-    bool _updating_scroll;
+    int64_t     _offset;
+    int64_t     _preOffset;
+    int         _spanY;
+    int         _signalHeight;
+    bool        _updating_scroll;
 
     // trigger position fix
-    double _trig_hoff;
+    double      _trig_hoff;
 
-	bool _show_cursors;
+	bool        _show_cursors;
     std::list<Cursor*> _cursorList;
-    Cursor *_trig_cursor;
-    bool _show_trig_cursor;
-    Cursor *_search_cursor;
-    bool _show_search_cursor;
-    uint64_t _search_pos;
-    bool _search_hit;
+    Cursor      *_trig_cursor;
+    bool        _show_trig_cursor;
+    Cursor      *_search_cursor;
+    bool        _show_search_cursor;
+    uint64_t    _search_pos;
+    bool        _search_hit;
 
-    bool _show_xcursors;
+    bool        _show_xcursors;
     std::list<XCursor*> _xcursorList;
 
-    QPoint _hover_point;
+    QPoint      _hover_point;
     dialogs::Calibration *_cali;
 
-    bool _dso_auto;
-    bool _show_lissajous;
-    bool _back_ready;
-    bool _trig_time_setted;
+    bool        _dso_auto;
+    bool        _show_lissajous;
+    bool        _back_ready;
+    bool        _trig_time_setted;
 };
 
 } // namespace view
diff --git a/DSView/pv/view/viewport.cpp b/DSView/pv/view/viewport.cpp
index fcd8baad..3ca32160 100755
--- a/DSView/pv/view/viewport.cpp
+++ b/DSView/pv/view/viewport.cpp
@@ -98,8 +98,7 @@ Viewport::Viewport(View &parent, View_type type) :
     setContextMenuPolicy(Qt::CustomContextMenu);
 
     connect(&trigger_timer, SIGNAL(timeout()),this, SLOT(on_trigger_timer()));
-    connect(&_drag_timer, SIGNAL(timeout()),this, SLOT(on_drag_timer()));
-    connect(&_view.session(), &SigSession::receive_data, this, &Viewport::set_receive_len);
+    connect(&_drag_timer, SIGNAL(timeout()),this, SLOT(on_drag_timer())); 
 
     connect(yAction, SIGNAL(triggered(bool)), this, SLOT(add_cursor_y()));
     connect(xAction, SIGNAL(triggered(bool)), this, SLOT(add_cursor_x()));
diff --git a/DSView/pv/view/viewport.h b/DSView/pv/view/viewport.h
index 18b4dc4d..0ba08201 100755
--- a/DSView/pv/view/viewport.h
+++ b/DSView/pv/view/viewport.h
@@ -131,8 +131,7 @@ private:
 private slots:
     void on_trigger_timer();
     void on_drag_timer();
-    void set_receive_len(quint64 length);
-
+  
     void show_contextmenu(const QPoint& pos);
     void add_cursor_x();
     void add_cursor_y();
@@ -140,6 +139,7 @@ private slots:
 public slots:
     void show_wait_trigger();
     void unshow_wait_trigger();
+    void set_receive_len(quint64 length);
 
 signals:
     void measure_updated();
diff --git a/DSView/pv/view/viewstatus.cpp b/DSView/pv/view/viewstatus.cpp
index 6ca30b86..635c02d4 100755
--- a/DSView/pv/view/viewstatus.cpp
+++ b/DSView/pv/view/viewstatus.cpp
@@ -26,6 +26,8 @@
 #include <QStyleOption>
 #include <QMouseEvent>
 #include <QBitmap>
+#include <QJsonObject>
+#include <QJsonArray>
 
 #include "../view/trace.h"
 #include "../sigsession.h"

From 801af9e1253ac4639f096552597bdf3ac60777af Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Mon, 15 Nov 2021 13:12:20 +0800
Subject: [PATCH 25/58] none

---
 DSView/pv/appcontrol.cpp           |  4 ++-
 DSView/pv/data/decoderstack.cpp    | 11 ++++--
 DSView/pv/data/decoderstack.h      | 27 +++------------
 DSView/pv/dock/protocoldock.cpp    | 15 +++++----
 DSView/pv/mainwindow.cpp           | 17 +++-------
 DSView/pv/sigsession.cpp           | 22 +++++-------
 DSView/pv/sigsession.h             | 15 ++-------
 DSView/pv/storesession.cpp         | 33 +++++++++---------
 DSView/pv/storesession.h           |  2 +-
 DSView/pv/toolbars/samplingbar.cpp |  8 +++--
 DSView/pv/toolbars/samplingbar.h   | 54 +++++++++++++-----------------
 DSView/pv/view/header.cpp          |  2 ++
 libsigrokdecode4DSL/srd.c          | 50 +++++++++++++++------------
 libsigrokdecode4DSL/util.c         |  6 ++--
 14 files changed, 122 insertions(+), 144 deletions(-)

diff --git a/DSView/pv/appcontrol.cpp b/DSView/pv/appcontrol.cpp
index dff58bc7..eae70d5d 100644
--- a/DSView/pv/appcontrol.cpp
+++ b/DSView/pv/appcontrol.cpp
@@ -71,8 +71,10 @@ bool AppControl::Init()
         return false;
     }
 
+    const char *decoderScriptDir = "/home/lala/tmpdir/any";
+
     // Initialise libsigrokdecode
-    if (srd_init(NULL) != SRD_OK)
+    if (srd_init(decoderScriptDir) != SRD_OK)
     {
         m_error = "ERROR: libsigrokdecode init failed.";
         return false;
diff --git a/DSView/pv/data/decoderstack.cpp b/DSView/pv/data/decoderstack.cpp
index c53affa1..b8c15a24 100755
--- a/DSView/pv/data/decoderstack.cpp
+++ b/DSView/pv/data/decoderstack.cpp
@@ -516,11 +516,18 @@ void DecoderStack::decode_data(const uint64_t decode_start, const uint64_t decod
         if (chunk_end - i > MaxChunkSize)
             chunk_end = i + MaxChunkSize;
 
-        if (srd_session_send(session, i, chunk_end,
-                             chunk.data(), chunk_const.data(), chunk_end - i, &error) != SRD_OK) {
+        if (srd_session_send(
+                session,
+                i,
+                chunk_end,
+                chunk.data(),
+                chunk_const.data(),
+                chunk_end - i,
+                &error) != SRD_OK){
             _error_message = QString::fromLocal8Bit(error);
             break;
         }
+
         i = chunk_end;
 
         {
diff --git a/DSView/pv/data/decoderstack.h b/DSView/pv/data/decoderstack.h
index cef31dab..7685e272 100755
--- a/DSView/pv/data/decoderstack.h
+++ b/DSView/pv/data/decoderstack.h
@@ -94,9 +94,7 @@ public:
     }
 
 	void push(decode::Decoder *decoder);
-
     void remove(decode::Decoder *decoder);
-
     void build_row();
 
 	int64_t samples_decoded();
@@ -111,7 +109,6 @@ public:
 
     uint64_t get_annotation_index(
         const decode::Row &row, uint64_t start_sample);
-
     uint64_t get_max_annotation(const decode::Row &row);
     uint64_t get_min_annotation(const decode::Row &row); // except instant(end=start) annotation
 
@@ -119,9 +116,7 @@ public:
     std::map<const decode::Row, bool> get_rows_lshow();
     void set_rows_gshow(const decode::Row row, bool show);
     void set_rows_lshow(const decode::Row row, bool show);
-
     bool has_annotations(const decode::Row &row);
-
     uint64_t list_annotation_size();
     uint64_t list_annotation_size(uint16_t row_index);
 
@@ -131,13 +126,9 @@ public:
 
 
     bool list_row_title(int row, QString &title);
-
 	QString error_message();
-
 	void clear();
-
     void init();
-
 	uint64_t get_max_sample_count();
 
     inline bool IsRunning(){
@@ -145,31 +136,22 @@ public:
     }
  
 	void begin_decode_work();
-
     void do_decode_work();
-
-    void stop_decode_work();
-  
+    void stop_decode_work();  
     int list_rows_size();
-
     bool options_changed();
     void set_options_changed(bool changed);
 
     uint64_t sample_count();
     uint64_t sample_rate();
-
     bool out_of_memory();
-
     void set_mark_index(int64_t index);
     int64_t get_mark_index();
-
     void frame_ended();
 
 private:
     void decode_data(const uint64_t decode_start, const uint64_t decode_end, srd_session *const session);
-
 	void decode_proc();
-
 	static void annotation_callback(srd_proto_data *pdata, void *decoder);
 
   
@@ -179,7 +161,6 @@ signals:
   
 private: 
 	std::list<decode::Decoder*> _stack;
-
 	pv::data::LogicSnapshot *_snapshot;
   
     std::map<const decode::Row, decode::RowData*>   _rows;
@@ -192,15 +173,15 @@ private:
     volatile bool   _options_changed;
     volatile bool   _no_memory;
     int64_t         _mark_index;
+
     DecoderStatus   *_decoder_status;
     QString         _error_message;
     int64_t	        _samples_decoded;
     uint64_t        _sample_count; 
  
-    decode_task_status  *_stask_stauts;
-    
+    decode_task_status  *_stask_stauts;    
     mutable std::mutex _output_mutex;
-  
+
 	friend class DecoderStackTest::TwoDecoderStack;
 };
 
diff --git a/DSView/pv/dock/protocoldock.cpp b/DSView/pv/dock/protocoldock.cpp
index 26afcc8b..a9affcdc 100755
--- a/DSView/pv/dock/protocoldock.cpp
+++ b/DSView/pv/dock/protocoldock.cpp
@@ -195,9 +195,7 @@ ProtocolDock::ProtocolDock(QWidget *parent, view::View &view, SigSession *sessio
     connect(_table_view->horizontalHeader(), SIGNAL(sectionResized(int,int,int)), this, SLOT(column_resize(int, int, int)));
     connect(_search_edit, SIGNAL(editingFinished()), this, SLOT(search_changed()));
 
-    retranslateUi();
-
-    ds_debug("protocol panel\n");
+    retranslateUi(); 
 }
 
 ProtocolDock::~ProtocolDock()
@@ -303,14 +301,19 @@ void ProtocolDock::add_protocol(bool silent)
         return;
     } 
 
+    //have no protocol
+    if (_protocol_combobox->count() == 0){
+        if (!silent){
+            MsgBox::Show(NULL, "Protocol list is empty!");
+        }
+        return;
+    }
+
     srd_decoder *const decoder = 
           (srd_decoder *)(_protocol_combobox->itemData(_protocol_combobox->currentIndex())).value<void *>();
 
     DecoderStatus *dstatus = new DecoderStatus();
     dstatus->m_format = (int)DecoderDataFormat::hex;
-
-    int numm= _protocol_items.size();
-    numm += 0;
   
     if (_session->add_decoder(decoder, silent, dstatus))
     {
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index 2c711e74..a8f3dc45 100755
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -21,9 +21,6 @@
  */
 
 
-
-#include <libsigrokdecode4DSL/libsigrokdecode.h>
-#include "dock/protocoldock.h"
  
 #include <QAction>
 #include <QButtonGroup>
@@ -70,6 +67,7 @@
 #include "dock/dsotriggerdock.h"
 #include "dock/measuredock.h"
 #include "dock/searchdock.h"
+#include "dock/protocoldock.h"
 
 #include "view/view.h"
 #include "view/trace.h"
@@ -168,19 +166,16 @@ void MainWindow::setup_ui()
     addToolBar(_trig_bar);
     addToolBar(_file_bar);
     addToolBar(_logo_bar);
-
-    // Setup the dockWidget
-
-    // protocol dock
+  
+    //Setup the dockWidget
     _protocol_dock=new QDockWidget(tr("Protocol"),this);
     _protocol_dock->setObjectName("protocol_dock");
     _protocol_dock->setFeatures(QDockWidget::DockWidgetMovable);
     _protocol_dock->setAllowedAreas(Qt::RightDockWidgetArea);
-    _protocol_dock->setVisible(false);
-    //dock::ProtocolDock *_protocol_widget = new dock::ProtocolDock(_protocol_dock, _session);
+    _protocol_dock->setVisible(false); 
     _protocol_widget = new dock::ProtocolDock(_protocol_dock, *_view, _session);
     _protocol_dock->setWidget(_protocol_widget);
-    qDebug() << "Protocol decoder enabled!\n";
+    //qDebug() << "Protocol decoder enabled!\n";
  
 
     // measure dock
@@ -224,9 +219,7 @@ void MainWindow::setup_ui()
     _logo_bar->installEventFilter(this);
     _dso_trigger_dock->installEventFilter(this);
     _trigger_dock->installEventFilter(this);
-
     _protocol_dock->installEventFilter(this);
-
     _measure_dock->installEventFilter(this);
     _search_dock->installEventFilter(this);
 
diff --git a/DSView/pv/sigsession.cpp b/DSView/pv/sigsession.cpp
index 99a41300..4e9e144c 100755
--- a/DSView/pv/sigsession.cpp
+++ b/DSView/pv/sigsession.cpp
@@ -437,8 +437,7 @@ void SigSession::start_capture(bool instant)
             dsoSig->set_mValid(false);
     }
 
-    // update setting
-    qDebug()<<"device name:"<<_dev_inst->name();
+    // update setting 
 
     if (_dev_inst->name() != "virtual-session")
         _instant = instant;
@@ -1167,8 +1166,6 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
         _dso_data->snapshot()->capture_ended();
         _analog_data->snapshot()->capture_ended();
 
-        qDebug()<<"data frame end";
-
         for (auto trace : _decode_traces){
             trace->decoder()->frame_ended();
             trace->frame_ended();
@@ -1248,7 +1245,7 @@ void SigSession::hotplug_proc()
     } catch(...) {
         qDebug("Interrupt exception for hotplug thread was thrown.");
     }
-    qDebug("Hotplug thread exit!");
+   // qDebug("Hotplug thread exit!");
 }
 
 void SigSession::register_hotplug_callback()
@@ -1271,10 +1268,9 @@ void SigSession::deregister_hotplug_callback()
 }
 
 void SigSession::start_hotplug_work()
-{
-
+{ 
     // Begin the session
-    qDebug() << "Starting a hotplug thread...\n";
+   // qDebug() << "Starting a hotplug thread...\n";
     _hot_attach = false;
     _hot_detach = false;
 
@@ -1788,7 +1784,7 @@ void SigSession::set_stop_scale(float scale)
 //append a decode task, and try create a thread
  void SigSession::add_decode_task(view::DecodeTrace *trace)
  { 
-     qDebug()<<"add a decode task";
+     //qDebug()<<"add a decode task";
 
      std::lock_guard<std::mutex> lock(_decode_task_mutex);
      _decode_tasks.push_back(trace);
@@ -1844,7 +1840,7 @@ void SigSession::set_stop_scale(float scale)
     //wait thread end
      if (_decode_thread.joinable())
      {
-         qDebug() << "wait the decode thread end";
+       //  qDebug() << "wait the decode thread end";
          _decode_thread.join();
      }
 
@@ -1900,12 +1896,12 @@ void SigSession::set_stop_scale(float scale)
   //the decode task thread proc
   void SigSession::decode_task_proc(){ 
 
-      qDebug()<<"decode thread start";
+      //qDebug()<<"decode thread start";
       auto task = get_top_decode_task();
       
       while (task != NULL)
       {
-          qDebug()<<"one decode task be actived";
+         // qDebug()<<"one decode task be actived";
  
           if (!task->_delete_flag){
               task->decoder()->begin_decode_work();
@@ -1924,7 +1920,7 @@ void SigSession::set_stop_scale(float scale)
           task = get_top_decode_task();
       }  
 
-      qDebug()<<"decode thread end";
+     // qDebug()<<"decode thread end";
       _bDecodeRunning = false;
   }
 
diff --git a/DSView/pv/sigsession.h b/DSView/pv/sigsession.h
index 16864adb..7f478af0 100755
--- a/DSView/pv/sigsession.h
+++ b/DSView/pv/sigsession.h
@@ -274,7 +274,6 @@ private:
 	void set_capture_state(capture_state state);
     void register_hotplug_callback();
     void deregister_hotplug_callback();
-
     bool do_add_decoder(srd_decoder *const dec, bool silent, DecoderStatus *dstatus);
 
     void add_decode_task(view::DecodeTrace *trace);
@@ -301,25 +300,17 @@ private:
      * 	used, or NULL if no input format was selected or
      * 	auto-detected.
      */
-    static sr_input_format* determine_input_file_format(
-        const std::string &filename);
-  
+    static sr_input_format* determine_input_file_format(const std::string &filename);  
     void sample_thread_proc(DevInst *dev_inst);
 
     // data feed
 	void feed_in_header(const sr_dev_inst *sdi);
-
-	void feed_in_meta(const sr_dev_inst *sdi,
-		const sr_datafeed_meta &meta);
-
+	void feed_in_meta(const sr_dev_inst *sdi, const sr_datafeed_meta &meta);
     void feed_in_trigger(const ds_trigger_pos &trigger_pos);
-
 	void feed_in_logic(const sr_datafeed_logic &logic);
 
     void feed_in_dso(const sr_datafeed_dso &dso);
-
-	void feed_in_analog(const sr_datafeed_analog &analog);
-    
+	void feed_in_analog(const sr_datafeed_analog &analog);    
 	void data_feed_in(const struct sr_dev_inst *sdi,
 		const struct sr_datafeed_packet *packet);
 
diff --git a/DSView/pv/storesession.cpp b/DSView/pv/storesession.cpp
index eee40b78..a621dc8e 100755
--- a/DSView/pv/storesession.cpp
+++ b/DSView/pv/storesession.cpp
@@ -23,23 +23,22 @@
 #define __STDC_FORMAT_MACROS
 
 #include "storesession.h"
+#include "sigsession.h"
 
-#include <pv/sigsession.h>
-#include <pv/data/logic.h>
-#include <pv/data/logicsnapshot.h>
-#include <pv/data/dsosnapshot.h>
-#include <pv/data/analogsnapshot.h>
-#include <pv/data/decoderstack.h>
-#include <pv/data/decode/decoder.h>
-#include <pv/data/decode/row.h>
-#include <pv/view/trace.h>
-#include <pv/view/signal.h>
-#include <pv/view/logicsignal.h>
-#include <pv/view/dsosignal.h>
-#include <pv/view/decodetrace.h>
-#include <pv/device/devinst.h>
-#include <pv/dock/protocoldock.h>
- 
+#include "data/logic.h"
+#include "data/logicsnapshot.h"
+#include "data/dsosnapshot.h"
+#include "data/analogsnapshot.h"
+#include "data/decoderstack.h"
+#include "data/decode/decoder.h"
+#include "data/decode/row.h"
+#include "view/trace.h"
+#include "view/signal.h"
+#include "view/logicsignal.h"
+#include "view/dsosignal.h"
+#include "view/decodetrace.h"
+#include "device/devinst.h"
+#include "dock/protocoldock.h" 
  
 #include <QFileDialog>
 #include <QDir>
@@ -51,7 +50,7 @@
 #include <QTextStream>
 #include <QDebug>
 
-
+#include <libsigrokdecode4DSL/libsigrokdecode.h> 
 #include "config/appconfig.h"
  
 namespace pv {
diff --git a/DSView/pv/storesession.h b/DSView/pv/storesession.h
index c7ef0e1d..daadef74 100755
--- a/DSView/pv/storesession.h
+++ b/DSView/pv/storesession.h
@@ -29,7 +29,7 @@
 #include <QObject>
 
 #include <libsigrok4DSL/libsigrok.h>
-#include <libsigrokdecode4DSL/libsigrokdecode.h>
+
 #include "ZipMaker.h"
 
 namespace pv {
diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp
index ff193b4c..33f52c72 100755
--- a/DSView/pv/toolbars/samplingbar.cpp
+++ b/DSView/pv/toolbars/samplingbar.cpp
@@ -339,11 +339,14 @@ void SamplingBar::zero_adj()
         if ((dsoSig = dynamic_cast<view::DsoSignal*>(s)))
             dsoSig->set_enable(true);
     }
+    
     const int index_back = _sample_count.currentIndex();
     int i = 0;
+
     for (i = 0; i < _sample_count.count(); i++)
         if (_sample_count.itemData(i).value<uint64_t>() == ZeroTimeBase)
             break;
+
     _sample_count.setCurrentIndex(i);
     commit_hori_res();
 
@@ -722,8 +725,6 @@ double SamplingBar::get_hori_res()
 double SamplingBar::hori_knob(int dir)
 {
     double hori_res = -1;
-    disconnect(&_sample_count, SIGNAL(currentIndexChanged(int)),
-        this, SLOT(on_samplecount_sel(int)));
 
     if (0 == dir) {
         hori_res = commit_hori_res();
@@ -735,6 +736,9 @@ double SamplingBar::hori_knob(int dir)
         hori_res = commit_hori_res();
     }
 
+    disconnect(&_sample_count, SIGNAL(currentIndexChanged(int)),
+        this, SLOT(on_samplecount_sel(int)));
+
     connect(&_sample_count, SIGNAL(currentIndexChanged(int)),
         this, SLOT(on_samplecount_sel(int)));
 
diff --git a/DSView/pv/toolbars/samplingbar.h b/DSView/pv/toolbars/samplingbar.h
index 14779f96..3459bb93 100755
--- a/DSView/pv/toolbars/samplingbar.h
+++ b/DSView/pv/toolbars/samplingbar.h
@@ -64,6 +64,7 @@ namespace pv
             static const int RefreshShort = 500;
             static const uint64_t LogicMaxSWDepth64 = SR_GB(16);
             static const uint64_t LogicMaxSWDepth32 = SR_GB(8);
+            
             static const uint64_t AnalogMaxSWDepth = SR_Mn(100);
             static const QString RLEString;
             static const QString DIVString;
@@ -71,11 +72,8 @@ namespace pv
 
         public:
             SamplingBar(SigSession *session, QWidget *parent);
-
             void set_device_list(const std::list<DevInst*> &devices, DevInst* selected);
-
             DevInst *get_selected_device();
-
             void update_sample_rate_selector();
 
             void set_sampling(bool sampling);
@@ -83,9 +81,7 @@ namespace pv
             bool get_instant();
 
             void enable_toggle(bool enable);
-
             void enable_run_stop(bool enable);
-
             void enable_instant(bool enable);
 
             double hori_knob(int dir);
@@ -132,37 +128,33 @@ namespace pv
             void reload();
 
         private:
-            SigSession *_session;
+            SigSession          *_session;
+            mutable std::mutex  _sampling_mutex;
+            bool                _enable;
+            bool                _sampling;
 
-            mutable std::mutex _sampling_mutex;
-            bool _enable;
-            bool _sampling;
-
-            QToolButton _device_type;
-
-            QComboBox _device_selector;
+            QToolButton         _device_type;
+            QComboBox           _device_selector;
             std::map<const void *, DevInst*> _device_selector_map;
-            bool _updating_device_selector;
+            bool                _updating_device_selector;
 
-            QToolButton _configure_button;
+            QToolButton         _configure_button;
+            QComboBox           _sample_count;
+            QComboBox           _sample_rate;
+            bool                _updating_sample_rate;
+            bool                _updating_sample_count;
 
-            QComboBox _sample_count;
-            QComboBox _sample_rate;
-            bool _updating_sample_rate;
-            bool _updating_sample_count;
+            QToolButton         _run_stop_button;
+            QToolButton         _instant_button;
+            QAction             *_run_stop_action;
+            QAction             *_instant_action;
+            QAction             *_mode_action;
+            QToolButton         _mode_button;
 
-            QToolButton _run_stop_button;
-            QToolButton _instant_button;
-            QAction *_run_stop_action;
-            QAction *_instant_action;
-
-            QAction *_mode_action;
-            QToolButton _mode_button;
-            QMenu *_mode_menu;
-            QAction *_action_repeat;
-            QAction *_action_single;
-
-            bool _instant;
+            QMenu               *_mode_menu;
+            QAction             *_action_repeat;
+            QAction             *_action_single;
+            bool                _instant;
         };
 
     } // namespace toolbars
diff --git a/DSView/pv/view/header.cpp b/DSView/pv/view/header.cpp
index 3eecd685..90b734f4 100755
--- a/DSView/pv/view/header.cpp
+++ b/DSView/pv/view/header.cpp
@@ -58,6 +58,8 @@ Header::Header(View &parent) :
     _moveFlag = false;
     _colorFlag = false;
     _nameFlag = false;
+    _context_trace = NULL;
+    
     nameEdit = new QLineEdit(this);
     nameEdit->setFixedWidth(100);
     nameEdit->hide();
diff --git a/libsigrokdecode4DSL/srd.c b/libsigrokdecode4DSL/srd.c
index 38bb803e..92be591f 100755
--- a/libsigrokdecode4DSL/srd.c
+++ b/libsigrokdecode4DSL/srd.c
@@ -190,7 +190,7 @@ SRD_API int srd_init(const char *path)
 	size_t i;
 	int ret;
 	const char *env_path;
-
+ 	
 	if (max_session_id != -1) {
 		srd_err("libsigrokdecode is already initialized.");
 		return SRD_ERR;
@@ -202,30 +202,15 @@ SRD_API int srd_init(const char *path)
 	PyImport_AppendInittab("sigrokdecode", PyInit_sigrokdecode);
 
 	/* Initialize the Python interpreter. */
-    Py_InitializeEx(0);
+    Py_InitializeEx(0); 
 
-	/* Locations relative to the XDG system data directories. */
-	sys_datadirs = g_get_system_data_dirs();
-	for (i = g_strv_length((char **)sys_datadirs); i > 0; i--) {
-		ret = searchpath_add_xdg_dir(sys_datadirs[i-1]);
-		if (ret != SRD_OK) {
-			Py_Finalize();
-			return ret;
-		}
-	}
 #ifdef DECODERS_DIR
 	/* Hardcoded decoders install location, if defined. */
 	if ((ret = srd_decoder_searchpath_add(DECODERS_DIR)) != SRD_OK) {
 		Py_Finalize();
 		return ret;
 	}
-#endif
-	/* Location relative to the XDG user data directory. */
-	ret = searchpath_add_xdg_dir(g_get_user_data_dir());
-	if (ret != SRD_OK) {
-		Py_Finalize();
-		return ret;
-	}
+#endif 
 
 	/* Path specified by the user. */
 	if (path) {
@@ -234,13 +219,36 @@ SRD_API int srd_init(const char *path)
 			return ret;
 		}
 	}
+	else{ 
+		/* Locations relative to the XDG system data directories. */
+		sys_datadirs = g_get_system_data_dirs();
+		for (i = g_strv_length((char **)sys_datadirs); i > 0; i--)
+		{
+			ret = searchpath_add_xdg_dir(sys_datadirs[i - 1]);
+			if (ret != SRD_OK)
+			{
+				Py_Finalize();
+				return ret;
+			}
+		}
 
-	/* Environment variable overrides everything, for debugging. */
-	if ((env_path = g_getenv("SIGROKDECODE_DIR"))) {
-		if ((ret = srd_decoder_searchpath_add(env_path)) != SRD_OK) {
+		/* Location relative to the XDG user data directory. */
+		ret = searchpath_add_xdg_dir(g_get_user_data_dir());
+		if (ret != SRD_OK)
+		{
 			Py_Finalize();
 			return ret;
 		}
+
+		/* Environment variable overrides everything, for debugging. */
+		if ((env_path = g_getenv("SIGROKDECODE_DIR")))
+		{
+			if ((ret = srd_decoder_searchpath_add(env_path)) != SRD_OK)
+			{
+				Py_Finalize();
+				return ret;
+			}
+		}
 	}
 
 	/* Initialize the Python GIL (this also happens to acquire it). */
diff --git a/libsigrokdecode4DSL/util.c b/libsigrokdecode4DSL/util.c
index 45fb2d1c..3211fae5 100755
--- a/libsigrokdecode4DSL/util.c
+++ b/libsigrokdecode4DSL/util.c
@@ -39,13 +39,13 @@ SRD_PRIV PyObject *py_import_by_name(const char *name)
 	PyGILState_STATE gstate;
 
 	gstate = PyGILState_Ensure();
-
+  
 	py_modname = PyUnicode_FromString(name);
 	if (!py_modname) {
 		PyGILState_Release(gstate);
 		return NULL;
-	}
-
+	} 
+ 
 	py_mod = PyImport_Import(py_modname);
 	Py_DECREF(py_modname);
 

From 4185466401cfccfb75fe9ffae0875007c41e1b7f Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Mon, 15 Nov 2021 16:08:16 +0800
Subject: [PATCH 26/58] qt pro file

---
 qtpro/DSView.icns     |  Bin 0 -> 115411 bytes
 qtpro/DSView.pro      |  379 ++++++
 qtpro/DSView.pro.user |  317 +++++
 qtpro/language.qrc    |    6 +
 qtpro/my_25.qm        |  Bin 0 -> 30023 bytes
 qtpro/my_CN.ts        | 2579 +++++++++++++++++++++++++++++++++++++++++
 qtpro/qt_25.qm        |  Bin 0 -> 118333 bytes
 7 files changed, 3281 insertions(+)
 create mode 100644 qtpro/DSView.icns
 create mode 100644 qtpro/DSView.pro
 create mode 100644 qtpro/DSView.pro.user
 create mode 100644 qtpro/language.qrc
 create mode 100644 qtpro/my_25.qm
 create mode 100644 qtpro/my_CN.ts
 create mode 100644 qtpro/qt_25.qm

diff --git a/qtpro/DSView.icns b/qtpro/DSView.icns
new file mode 100644
index 0000000000000000000000000000000000000000..d98f535111e5d7d8c01e74010f32d91ec0f0e169
GIT binary patch
literal 115411
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
DG%d(y

literal 0
HcmV?d00001

diff --git a/qtpro/DSView.pro b/qtpro/DSView.pro
new file mode 100644
index 00000000..f8e7fde1
--- /dev/null
+++ b/qtpro/DSView.pro
@@ -0,0 +1,379 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2013-07-24T17:32:25
+#
+#-------------------------------------------------
+
+QT += core gui
+CONFIG -= lib_bundle
+CONFIG += app_bundle
+macx {
+QT += svg
+}
+CONFIG += exceptions
+CONFIG += object_parallel_to_source
+greaterThan(QT_MAJOR_VERSION, 4): CONFIG += c++11
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+#QMAKE_CFLAGS_ISYSTEM = -I
+
+TARGET = DSView
+TEMPLATE = app
+
+TRANSLATIONS = my_CN.ts
+
+CONFIG += decoders
+DEFINES += decoders
+
+unix:!macx {
+INCLUDEPATH += /usr/local/include/
+INCLUDEPATH += /usr/include/glib-2.0
+INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
+INCLUDEPATH += /usr/include/libusb-1.0
+INCLUDEPATH += /usr/include/boost
+INCLUDEPATH += /usr/include/python3.8
+INCLUDEPATH += ..
+INCLUDEPATH += ../libsigrok4DSL
+INCLUDEPATH += ../DSView
+INCLUDEPATH += ../DSView/pv/dialogs
+
+LIBS += /usr/lib/x86_64-linux-gnu/libglib-2.0.so
+LIBS += /usr/lib/x86_64-linux-gnu/libusb-1.0.so
+LIBS += /usr/lib/x86_64-linux-gnu/libboost_thread.so
+LIBS += /usr/lib/x86_64-linux-gnu/libboost_system.so
+LIBS += /usr/lib/x86_64-linux-gnu/libboost_filesystem.so
+LIBS += /usr/lib/x86_64-linux-gnu/libpython3.8.so
+LIBS += /usr/lib/x86_64-linux-gnu/libfftw3.so
+LIBS += /usr/local/lib/libz.so.1.2.11
+LIBS += /usr/local/lib/libzip.so.5.4
+}
+
+macx: {
+INCLUDEPATH += /usr/local/include/
+INCLUDEPATH += /usr/local/include/glib-2.0
+INCLUDEPATH += /usr/local/lib/glib-2.0/include
+INCLUDEPATH += /usr/local/include/libusb-1.0
+INCLUDEPATH += /usr/local/include/boost
+INCLUDEPATH += /Library/Frameworks/Python.framework/Versions/3.4/include/python3.4m
+INCLUDEPATH += ..
+INCLUDEPATH += ../libsigrok4DSL
+INCLUDEPATH += ../DSView
+INCLUDEPATH += ../DSView/pv/dialogs
+
+#LIBS += -framework CoreFoundation
+#LIBS += -framework CoreServices
+#LIBS += /usr/lib/libiconv.2.dylib
+#LIBS += /usr/local/lib/libpcre.a
+#LIBS += /usr/local/opt/gettext/lib/libintl.a
+#LIBS += /usr/lib/libz.1.dylib
+#LIBS += /usr/lib/libobjc.dylib
+
+LIBS += /usr/local/lib/libglib-2.0.dylib
+LIBS += /usr/local/lib/libusb-1.0.dylib
+LIBS += /usr/local/lib/libboost_atomic-mt.a
+LIBS += /usr/local/lib/libboost_thread-mt.a
+LIBS += /usr/local/lib/libboost_system-mt.a
+LIBS += /usr/local/lib/libboost_filesystem-mt.a
+LIBS += /Library/Frameworks/Python.framework/Versions/3.4/lib/libpython3.4.dylib
+#LIBS += /opt/local/lib/libsetupapi.a
+LIBS += /usr/local/lib/libfftw3.a
+}
+
+SOURCES += \
+    ../DSView/main.cpp \
+    ../DSView/pv/sigsession.cpp \
+    ../DSView/pv/mainwindow.cpp \
+    ../DSView/pv/devicemanager.cpp \
+    ../DSView/pv/data/snapshot.cpp \
+    ../DSView/pv/data/signaldata.cpp \
+    ../DSView/pv/data/logicsnapshot.cpp \
+    ../DSView/pv/data/logic.cpp \
+    ../DSView/pv/data/analogsnapshot.cpp \
+    ../DSView/pv/data/analog.cpp \
+    ../DSView/pv/dialogs/deviceoptions.cpp \
+    ../DSView/pv/prop/property.cpp \
+    ../DSView/pv/prop/int.cpp \
+    ../DSView/pv/prop/enum.cpp \
+    ../DSView/pv/prop/double.cpp \
+    ../DSView/pv/prop/bool.cpp \
+    ../DSView/pv/prop/binding/binding.cpp \
+    ../DSView/pv/toolbars/samplingbar.cpp \
+    ../DSView/pv/view/viewport.cpp \
+    ../DSView/pv/view/view.cpp \
+    ../DSView/pv/view/timemarker.cpp \
+    ../DSView/pv/view/signal.cpp \
+    ../DSView/pv/view/ruler.cpp \
+    ../DSView/pv/view/logicsignal.cpp \
+    ../DSView/pv/view/header.cpp \
+    ../DSView/pv/view/cursor.cpp \
+    ../DSView/pv/view/analogsignal.cpp \
+    ../DSView/pv/prop/binding/deviceoptions.cpp \
+    ../DSView/pv/toolbars/trigbar.cpp \
+    ../DSView/pv/toolbars/filebar.cpp \
+    ../DSView/pv/dock/triggerdock.cpp \
+    ../DSView/pv/dock/measuredock.cpp \
+    ../DSView/pv/dock/searchdock.cpp \
+    ../DSView/pv/toolbars/logobar.cpp \
+    ../DSView/pv/data/groupsnapshot.cpp \
+    ../DSView/pv/view/groupsignal.cpp \
+    ../DSView/pv/data/group.cpp \
+    ../DSView/pv/dialogs/about.cpp \
+    ../DSView/pv/dialogs/search.cpp \
+    ../DSView/pv/data/dsosnapshot.cpp \
+    ../DSView/pv/data/dso.cpp \
+    ../DSView/pv/view/dsosignal.cpp \
+    ../DSView/pv/view/dsldial.cpp \
+    ../DSView/pv/dock/dsotriggerdock.cpp \
+    ../DSView/pv/view/trace.cpp \
+    ../DSView/pv/view/selectableitem.cpp \
+    ../DSView/pv/widgets/fakelineedit.cpp \
+    ../DSView/pv/prop/string.cpp \
+    ../DSView/pv/device/sessionfile.cpp \
+    ../DSView/pv/device/inputfile.cpp \
+    ../DSView/pv/device/file.cpp \
+    ../DSView/pv/device/devinst.cpp \
+    ../DSView/pv/dialogs/storeprogress.cpp \
+    ../DSView/pv/storesession.cpp \
+    ../DSView/pv/view/devmode.cpp \
+    ../DSView/pv/device/device.cpp \
+    ../DSView/pv/dialogs/waitingdialog.cpp \
+    ../DSView/pv/dialogs/dsomeasure.cpp \
+    ../DSView/pv/dialogs/calibration.cpp \
+    ../DSView/pv/dialogs/fftoptions.cpp \
+    ../DSView/dsapplication.cpp \
+    ../DSView/pv/toolbars/titlebar.cpp \
+    ../DSView/pv/mainframe.cpp \
+    ../DSView/pv/widgets/border.cpp \
+    ../DSView/pv/dialogs/dsmessagebox.cpp \
+    ../DSView/pv/dialogs/shadow.cpp \
+    ../DSView/pv/dialogs/dsdialog.cpp \
+    ../DSView/pv/dialogs/interval.cpp \
+    ../DSView/pv/prop/binding/probeoptions.cpp \
+    ../DSView/pv/view/xcursor.cpp \
+    ../DSView/pv/view/viewstatus.cpp \
+    ../DSView/pv/dialogs/lissajousoptions.cpp \
+    ../DSView/pv/view/lissajoustrace.cpp \
+    ../DSView/pv/view/spectrumtrace.cpp \
+    ../DSView/pv/data/spectrumstack.cpp \
+    ../DSView/pv/view/mathtrace.cpp \
+    ../DSView/pv/dialogs/mathoptions.cpp \
+    ../DSView/pv/data/mathstack.cpp \
+    ../DSView/pv/dialogs/regionoptions.cpp \
+    ../DSView/pv/ZipMaker.cpp \
+    ../DSView/pv/data/decode/AnnotationResTable.cpp \
+    ../DSView/pv/ui/msgbox.cpp \
+    ../DSView/pv/dock/protocolitemlayer.cpp \
+    ../DSView/pv/config/appconfig.cpp \
+    ../DSView/pv/dsvdef.cpp \
+    ../DSView/pv/minizip/zip.c \
+    ../DSView/pv/minizip/unzip.c \
+    ../DSView/pv/minizip/ioapi.c \
+    ../DSView/pv/dialogs/applicationpardlg.cpp \
+    ../DSView/pv/appcontrol.cpp \
+    ../DSView/pv/eventobject.cpp \
+    ../DSView/pv/dstimer.cpp
+
+HEADERS  += \
+    ../DSView/extdef.h \
+    ../DSView/config.h \
+    ../DSView/pv/sigsession.h \
+    ../DSView/pv/mainwindow.h \
+    ../DSView/pv/devicemanager.h \
+    ../DSView/pv/data/snapshot.h \
+    ../DSView/pv/data/signaldata.h \
+    ../DSView/pv/data/logicsnapshot.h \
+    ../DSView/pv/data/logic.h \
+    ../DSView/pv/data/analogsnapshot.h \
+    ../DSView/pv/data/analog.h \
+    ../DSView/pv/dialogs/deviceoptions.h \
+    ../DSView/pv/prop/property.h \
+    ../DSView/pv/prop/int.h \
+    ../DSView/pv/prop/enum.h \
+    ../DSView/pv/prop/double.h \
+    ../DSView/pv/prop/bool.h \
+    ../DSView/pv/prop/binding/deviceoptions.h \
+    ../DSView/pv/prop/binding/binding.h \
+    ../DSView/pv/toolbars/samplingbar.h \
+    ../DSView/pv/view/viewport.h \
+    ../DSView/pv/view/view.h \
+    ../DSView/pv/view/timemarker.h \
+    ../DSView/pv/view/signal.h \
+    ../DSView/pv/view/ruler.h \
+    ../DSView/pv/view/logicsignal.h \
+    ../DSView/pv/view/header.h \
+    ../DSView/pv/view/cursor.h \
+    ../DSView/pv/view/analogsignal.h \
+    ../DSView/pv/toolbars/trigbar.h \
+    ../DSView/pv/toolbars/filebar.h \
+    ../DSView/pv/dock/triggerdock.h \
+    ../DSView/pv/dock/measuredock.h \
+    ../DSView/pv/dock/searchdock.h \
+    ../DSView/pv/toolbars/logobar.h \
+    ../DSView/pv/data/groupsnapshot.h \
+    ../DSView/pv/view/groupsignal.h \
+    ../DSView/pv/data/group.h \
+    ../DSView/pv/dialogs/about.h \
+    ../DSView/pv/dialogs/search.h \
+    ../DSView/pv/data/dso.h \
+    ../DSView/pv/data/dsosnapshot.h \
+    ../DSView/pv/view/dsosignal.h \
+    ../DSView/pv/view/dsldial.h \
+    ../DSView/pv/dock/dsotriggerdock.h \
+    ../DSView/pv/view/trace.h \
+    ../DSView/pv/view/selectableitem.h \
+    ../DSView/pv/widgets/fakelineedit.h \
+    ../DSView/pv/prop/string.h \
+    ../DSView/pv/device/sessionfile.h \
+    ../DSView/pv/device/inputfile.h \
+    ../DSView/pv/device/file.h \
+    ../DSView/pv/device/devinst.h \
+    ../DSView/pv/dialogs/storeprogress.h \
+    ../DSView/pv/storesession.h \
+    ../DSView/pv/view/devmode.h \
+    ../DSView/pv/device/device.h \
+    ../DSView/pv/dialogs/waitingdialog.h \
+    ../DSView/pv/dialogs/dsomeasure.h \
+    ../DSView/pv/dialogs/calibration.h \
+    ../DSView/pv/dialogs/fftoptions.h \
+    ../DSView/dsapplication.h \
+    ../DSView/pv/toolbars/titlebar.h \
+    ../DSView/pv/mainframe.h \
+    ../DSView/pv/widgets/border.h \
+    ../DSView/pv/dialogs/dsmessagebox.h \
+    ../DSView/pv/dialogs/shadow.h \
+    ../DSView/pv/dialogs/dsdialog.h \
+    ../DSView/pv/dialogs/interval.h \
+    ../DSView/config.h \
+    ../libsigrok4DSL/config.h \
+    ../DSView/pv/prop/binding/probeoptions.h \
+    ../libsigrok4DSL/hardware/demo/demo.h \
+    ../DSView/pv/view/xcursor.h \
+    ../DSView/pv/view/viewstatus.h \
+    ../DSView/pv/dialogs/lissajousoptions.h \
+    ../DSView/pv/view/lissajoustrace.h \
+    ../DSView/pv/view/spectrumtrace.h \
+    ../DSView/pv/data/spectrumstack.h \
+    ../DSView/pv/view/mathtrace.h \
+    ../DSView/pv/dialogs/mathoptions.h \
+    ../DSView/pv/data/mathstack.h \
+    ../DSView/pv/dialogs/regionoptions.h \
+    ../DSView/mystyle.h \
+    ../DSView/pv/ZipMaker.h \
+    ../DSView/pv/data/decode/AnnotationResTable.h \
+    ../DSView/pv/ui/msgbox.h \
+    ../DSView/pv/dock/protocolitemlayer.h \
+    ../DSView/pv/config/appconfig.h \
+    ../DSView/pv/dsvdef.h \
+    ../DSView/pv/minizip/zip.h \
+    ../DSView/pv/minizip/unzip.h \
+    ../DSView/pv/minizip/ioapi.h \
+    ../DSView/pv/dialogs/applicationpardlg.h \
+    ../DSView/pv/appcontrol.h \
+    ../DSView/pv/eventobject.h \
+    ../DSView/pv/dstimer.h
+
+SOURCES += \
+    ../libsigrok4DSL/version.c \
+    ../libsigrok4DSL/strutil.c \
+    ../libsigrok4DSL/std.c \
+    ../libsigrok4DSL/session_file.c \
+    ../libsigrok4DSL/session_driver.c \
+    ../libsigrok4DSL/session.c \
+    ../libsigrok4DSL/log.c \
+    ../libsigrok4DSL/hwdriver.c \
+    ../libsigrok4DSL/error.c \
+    ../libsigrok4DSL/backend.c \
+    ../libsigrok4DSL/output/output.c \
+    ../libsigrok4DSL/input/input.c \
+    ../libsigrok4DSL/hardware/demo/demo.c \
+    ../libsigrok4DSL/input/in_binary.c \
+    ../libsigrok4DSL/input/in_vcd.c \
+    ../libsigrok4DSL/input/in_wav.c \
+    ../libsigrok4DSL/output/csv.c \
+    ../libsigrok4DSL/output/gnuplot.c \
+    ../libsigrok4DSL/output/srzip.c \
+    ../libsigrok4DSL/output/vcd.c \
+    ../libsigrok4DSL/hardware/DSL/dslogic.c \
+    ../libsigrok4DSL/hardware/common/usb.c \
+    ../libsigrok4DSL/hardware/common/ezusb.c \
+    ../libsigrok4DSL/trigger.c \
+    ../libsigrok4DSL/dsdevice.c \
+    ../libsigrok4DSL/hardware/DSL/dscope.c \
+    ../libsigrok4DSL/hardware/DSL/command.c \
+    ../libsigrok4DSL/hardware/DSL/dsl.c
+
+HEADERS  += \
+    ../libsigrok4DSL/version.h \
+    ../libsigrok4DSL/proto.h \
+    ../libsigrok4DSL/libsigrok-internal.h \
+    ../libsigrok4DSL/libsigrok.h \
+    ../libsigrok4DSL/config.h \
+    ../libsigrok4DSL/hardware/DSL/command.h \
+    ../libsigrok4DSL/hardware/DSL/dsl.h
+
+decoders {
+DEFINES += ENABLE_DECODE
+SOURCES += \
+    ../DSView/pv/data/decoderstack.cpp \
+    ../DSView/pv/data/decode/rowdata.cpp \
+    ../DSView/pv/data/decode/row.cpp \
+    ../DSView/pv/data/decode/decoder.cpp \
+    ../DSView/pv/data/decode/annotation.cpp \
+    ../DSView/pv/view/decodetrace.cpp \
+    ../DSView/pv/prop/binding/decoderoptions.cpp \
+    ../DSView/pv/dock/protocoldock.cpp \
+    ../DSView/pv/dialogs/protocollist.cpp \
+    ../DSView/pv/dialogs/protocolexp.cpp \
+    ../DSView/pv/widgets/decodermenu.cpp \
+    ../DSView/pv/widgets/decodergroupbox.cpp \
+    ../DSView/pv/data/decodermodel.cpp
+
+HEADERS  += \
+    ../DSView/pv/data/decoderstack.h \
+    ../DSView/pv/data/decode/rowdata.h \
+    ../DSView/pv/data/decode/row.h \
+    ../DSView/pv/data/decode/decoder.h \
+    ../DSView/pv/data/decode/annotation.h \
+    ../DSView/pv/view/decodetrace.h \
+    ../DSView/pv/prop/binding/decoderoptions.h \
+    ../DSView/pv/dock/protocoldock.h \
+    ../DSView/pv/dialogs/protocollist.h \
+    ../DSView/pv/dialogs/protocolexp.h \
+    ../DSView/pv/widgets/decodermenu.h \
+    ../DSView/pv/widgets/decodergroupbox.h \
+    ../DSView/pv/data/decodermodel.h
+
+
+#unix:!macx {
+#}else{
+SOURCES += \
+    #../libsigrokdecode4DSL/type_logic.c \
+    ../libsigrokdecode4DSL/type_decoder.c \
+    ../libsigrokdecode4DSL/srd.c \
+    ../libsigrokdecode4DSL/module_sigrokdecode.c \
+    ../libsigrokdecode4DSL/decoder.c \
+    ../libsigrokdecode4DSL/error.c \
+    ../libsigrokdecode4DSL/exception.c \
+    ../libsigrokdecode4DSL/instance.c \
+    ../libsigrokdecode4DSL/log.c \
+    ../libsigrokdecode4DSL/session.c \
+    ../libsigrokdecode4DSL/util.c \
+    ../libsigrokdecode4DSL/version.c
+
+HEADERS  += \
+    ../libsigrokdecode4DSL/libsigrokdecode-internal.h \
+    ../libsigrokdecode4DSL/libsigrokdecode.h \
+    ../libsigrokdecode4DSL/config.h \
+    ../libsigrokdecode4DSL/version.h
+#}
+}
+
+FORMS +=
+
+RESOURCES += \
+    ../DSView/DSView.qrc \
+    ../DSView/themes/breeze.qrc \
+    language.qrc
+
+ICON = DSView.icns
+
+MOC_DIR  = ../../DSView_tmp/DSView_moc
diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user
new file mode 100644
index 00000000..cb6bad0c
--- /dev/null
+++ b/qtpro/DSView.pro.user
@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProject>
+<!-- Written by QtCreator 4.11.0, 2021-11-12T18:52:28. -->
+<qtcreator>
+ <data>
+  <variable>EnvironmentId</variable>
+  <value type="QByteArray">{e94b86d6-950b-4ba2-9fb4-d7b4ccc4fe74}</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.ActiveTarget</variable>
+  <value type="int">0</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.EditorSettings</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
+   <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
+   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
+    <value type="QString" key="language">Cpp</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
+    </valuemap>
+   </valuemap>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
+    <value type="QString" key="language">QmlJS</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
+    </valuemap>
+   </valuemap>
+   <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
+   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
+   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
+   <value type="int" key="EditorConfiguration.IndentSize">4</value>
+   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
+   <value type="int" key="EditorConfiguration.MarginColumn">80</value>
+   <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
+   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
+   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
+   <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
+   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
+   <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
+   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
+   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
+   <value type="int" key="EditorConfiguration.TabSize">8</value>
+   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
+   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
+   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
+   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.PluginSettings</variable>
+  <valuemap type="QVariantMap">
+   <valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey"/>
+   <value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Target.0</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">桌面</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">桌面</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{ce867f0c-ef0e-4256-b807-c2554ad78bbf}</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/lala/workdir/DSView/build-DSView-unknown-Debug</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/lala/workdir/DSView/build-DSView-unknown-Release</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/lala/workdir/DSView/build-DSView-unknown-Profile</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">true</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+    <value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value>
+    <valuelist type="QVariantList" key="Analyzer.Perf.Events">
+     <value type="QString">cpu-cycles</value>
+    </valuelist>
+    <valuelist type="QVariantList" key="Analyzer.Perf.ExtraArguments"/>
+    <value type="int" key="Analyzer.Perf.Frequency">250</value>
+    <valuelist type="QVariantList" key="Analyzer.Perf.RecordArguments">
+     <value type="QString">-e</value>
+     <value type="QString">cpu-cycles</value>
+     <value type="QString">--call-graph</value>
+     <value type="QString">dwarf,4096</value>
+     <value type="QString">-F</value>
+     <value type="QString">250</value>
+    </valuelist>
+    <value type="QString" key="Analyzer.Perf.SampleMode">-F</value>
+    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
+    <value type="int" key="Analyzer.Perf.StackSize">4096</value>
+    <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
+    <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
+    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
+    <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
+    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+    <value type="QString" key="Analyzer.Valgrind.KCachegrindExecutable">kcachegrind</value>
+    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+     <value type="int">0</value>
+     <value type="int">1</value>
+     <value type="int">2</value>
+     <value type="int">3</value>
+     <value type="int">4</value>
+     <value type="int">5</value>
+     <value type="int">6</value>
+     <value type="int">7</value>
+     <value type="int">8</value>
+     <value type="int">9</value>
+     <value type="int">10</value>
+     <value type="int">11</value>
+     <value type="int">12</value>
+     <value type="int">13</value>
+     <value type="int">14</value>
+    </valuelist>
+    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/lala/workdir/DSView/qtpro/DSView.pro</value>
+    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">/home/lala/workdir/DSView/qtpro/DSView.pro</value>
+    <value type="QString" key="RunConfiguration.Arguments"></value>
+    <value type="bool" key="RunConfiguration.Arguments.multi">false</value>
+    <value type="QString" key="RunConfiguration.OverrideDebuggerStartup"></value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
+    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/lala/workdir/DSView/build-DSView-unknown-Debug</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.TargetCount</variable>
+  <value type="int">1</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
+  <value type="int">22</value>
+ </data>
+ <data>
+  <variable>Version</variable>
+  <value type="int">22</value>
+ </data>
+</qtcreator>
diff --git a/qtpro/language.qrc b/qtpro/language.qrc
new file mode 100644
index 00000000..e0eacdf8
--- /dev/null
+++ b/qtpro/language.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/">
+        <file>my_25.qm</file>
+        <file>qt_25.qm</file>
+    </qresource>
+</RCC>
diff --git a/qtpro/my_25.qm b/qtpro/my_25.qm
new file mode 100644
index 0000000000000000000000000000000000000000..2430370fea5fdfd37b1dc4487c6df93ed087dea3
GIT binary patch
literal 30023
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

literal 0
HcmV?d00001

diff --git a/qtpro/my_CN.ts b/qtpro/my_CN.ts
new file mode 100644
index 00000000..849c5c17
--- /dev/null
+++ b/qtpro/my_CN.ts
@@ -0,0 +1,2579 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="zh_CN">
+<context>
+    <name>About</name>
+    <message>
+        <source>About</source>
+        <translation type="vanished">关于</translation>
+    </message>
+</context>
+<context>
+    <name>DSApplication</name>
+    <message>
+        <location filename="../DSView/dsapplication.cpp" line="37"/>
+        <location filename="../DSView/dsapplication.cpp" line="44"/>
+        <source>Application Error</source>
+        <translation>应用程序错误</translation>
+    </message>
+    <message>
+        <location filename="../DSView/dsapplication.cpp" line="45"/>
+        <source>An unexpected error occurred</source>
+        <translation>未知的错误</translation>
+    </message>
+</context>
+<context>
+    <name>File</name>
+    <message>
+        <source>&amp;Load Session...</source>
+        <translation type="vanished">导入配置(&amp;L)...</translation>
+    </message>
+    <message>
+        <source>S&amp;tore Session...</source>
+        <translation type="vanished">存储配置(&amp;T)...</translation>
+    </message>
+    <message>
+        <source>&amp;Load...</source>
+        <translation type="vanished">导入(&amp;L)...</translation>
+    </message>
+    <message>
+        <source>S&amp;tore...</source>
+        <translation type="vanished">导出(&amp;T)...</translation>
+    </message>
+    <message>
+        <source>&amp;Default...</source>
+        <translation type="vanished">载入默认(&amp;D)...</translation>
+    </message>
+    <message>
+        <source>&amp;Open...</source>
+        <translation type="vanished">打开(&amp;O)...</translation>
+    </message>
+    <message>
+        <source>&amp;Save...</source>
+        <translation type="vanished">保存(&amp;S)...</translation>
+    </message>
+    <message>
+        <source>&amp;Export...</source>
+        <translation type="vanished">导出(&amp;E)...</translation>
+    </message>
+    <message>
+        <source>&amp;Capture...</source>
+        <translation type="vanished">截屏(&amp;C)...</translation>
+    </message>
+    <message>
+        <source>&amp;About...</source>
+        <translation type="vanished">关于(&amp;A)...</translation>
+    </message>
+    <message>
+        <source>&amp;Manual</source>
+        <translation type="vanished">手册(&amp;M)</translation>
+    </message>
+    <message>
+        <source>&amp;Bug Report</source>
+        <translation type="vanished">报告问题(&amp;B)</translation>
+    </message>
+    <message>
+        <source>&amp;Wiki</source>
+        <translation type="vanished">&amp;Wiki页面</translation>
+    </message>
+</context>
+<context>
+    <name>Math</name>
+    <message>
+        <source>&amp;FFT</source>
+        <translation type="vanished">&amp;FFT</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../DSView/pv/prop/binding/deviceoptions.cpp" line="246"/>
+        <source>Hz</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>Sampling</name>
+    <message>
+        <source>&amp;Single</source>
+        <translation type="vanished">单次</translation>
+    </message>
+    <message>
+        <source>&amp;Repetitive</source>
+        <translation type="vanished">重复</translation>
+    </message>
+</context>
+<context>
+    <name>pv::MainFrame</name>
+    <message>
+        <location filename="../DSView/pv/mainframe.cpp" line="450"/>
+        <source>Document</source>
+        <translation>文档</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainframe.cpp" line="458"/>
+        <source>Not Show Again</source>
+        <translation>不再显示</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainframe.cpp" line="459"/>
+        <source>Ignore</source>
+        <translation>忽略</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainframe.cpp" line="460"/>
+        <source>Open</source>
+        <translation>打开</translation>
+    </message>
+</context>
+<context>
+    <name>pv::MainWindow</name>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="216"/>
+        <location filename="../DSView/pv/mainwindow.cpp" line="332"/>
+        <source>Protocol</source>
+        <translation>协议</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="165"/>
+        <location filename="../DSView/pv/mainwindow.cpp" line="173"/>
+        <location filename="../DSView/pv/mainwindow.cpp" line="330"/>
+        <location filename="../DSView/pv/mainwindow.cpp" line="331"/>
+        <source>Trigger Setting...</source>
+        <translation>触发设置...</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="229"/>
+        <location filename="../DSView/pv/mainwindow.cpp" line="333"/>
+        <source>Measurement</source>
+        <translation>测量</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="237"/>
+        <location filename="../DSView/pv/mainwindow.cpp" line="334"/>
+        <source>Search...</source>
+        <translation>搜索...</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="306"/>
+        <location filename="../DSView/pv/mainwindow.cpp" line="452"/>
+        <location filename="../DSView/pv/mainwindow.cpp" line="488"/>
+        <location filename="../DSView/pv/mainwindow.cpp" line="513"/>
+        <location filename="../DSView/pv/mainwindow.cpp" line="522"/>
+        <source>Set Default Device failed</source>
+        <translation>启用默认设备失败</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="322"/>
+        <source>Hotplug failed</source>
+        <translation>热插拔失败</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="378"/>
+        <source>Attension</source>
+        <translation>注意</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="379"/>
+        <source>Current loading file has an old format. This will lead to a slow loading speed. Please resave it after loaded.</source>
+        <translation>正在载入老版本格式的文件，载入速度可能较慢，请打开后重新存为新的文件格式。</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="388"/>
+        <source>Failed to capture file data!</source>
+        <translation>无法载入文件数据！</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="450"/>
+        <source>Failed to load </source>
+        <translation>无法加载</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="535"/>
+        <location filename="../DSView/pv/mainwindow.cpp" line="553"/>
+        <source>Capture failed</source>
+        <translation>采集失败</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="581"/>
+        <source>Hardware Operation Failed</source>
+        <translation>硬件操作失败</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="582"/>
+        <source>Please replug device to refresh hardware configuration!</source>
+        <translation>请重新插拔硬件来刷新硬件配置！</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="595"/>
+        <source>Data Error</source>
+        <translation>数据错误</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="605"/>
+        <source>the received data are not consist with pre-defined test data!</source>
+        <translation>接收的数据和预定义的测试数据不一致！</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="606"/>
+        <source>0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15</source>
+        <translation>0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="743"/>
+        <source>Trigger</source>
+        <translation>触发</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="744"/>
+        <source>Trigger setted on multiple channels! Capture will Only triggered when all setted channels fullfill at one sample</source>
+        <translation>同时设置了多个通道的简单触发！只有在同一个采样点所有被设置通道的触发条件同时满足时才会触发。</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="748"/>
+        <source>Not Show Again</source>
+        <translation>不再显示</translation>
+    </message>
+    <message>
+        <source>Not Show again</source>
+        <translation type="vanished">不再显示</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="749"/>
+        <source>Clear Trig</source>
+        <translation>清除触发</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="750"/>
+        <source>Continue</source>
+        <translation>继续</translation>
+    </message>
+    <message>
+        <source>the received data are not consist with pre-defined test data!
+</source>
+        <translation type="vanished">接收的数据和预定义的测试数据不一致！</translation>
+    </message>
+    <message>
+        <source>0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
+</source>
+        <translation type="vanished">0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="609"/>
+        <source>Packet Error</source>
+        <translation>数据包错误</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="610"/>
+        <source>the content of received packet are not expected!</source>
+        <translation>接收到了非法格式的数据包！</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="616"/>
+        <source>Data Overflow</source>
+        <translation>数据溢出</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="617"/>
+        <source>USB bandwidth can not support current sample rate! 
+Please reduce the sample rate!</source>
+        <translation>当前的USB带宽受限，请降低采样频率或者减少采样通道，重新开始采样！</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="620"/>
+        <source>Undefined Error</source>
+        <translation>未定义的错误类型</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="621"/>
+        <source>Not expected error!</source>
+        <translation>未知错误！</translation>
+    </message>
+    <message>
+        <source>the receive data are not consist with pre-defined test data</source>
+        <translation type="vanished">接收的数据和预定义的数据不一致</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="587"/>
+        <source>Malloc Error</source>
+        <translation>内存申请错误</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="588"/>
+        <source>Memory is not enough for this sample!
+Please reduce the sample depth!</source>
+        <translation>无法申请到足够的内存完成此次采样！请减少采样深度后重试！</translation>
+    </message>
+    <message>
+        <source>Hardware Connect Failed</source>
+        <translation type="vanished">硬件连接问题</translation>
+    </message>
+    <message>
+        <source>Please check hardware connection!</source>
+        <translation type="vanished">请检查硬件连接！</translation>
+    </message>
+    <message>
+        <source>RLE Mode Warning</source>
+        <translation type="vanished">RLE压缩模式警告</translation>
+    </message>
+    <message>
+        <source>Hardware buffer is full!
+Actually received samples is less than setted sample depth!</source>
+        <translation type="vanished">硬件缓存已满！实际收到的采样个数少于设置的采样深度！</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="792"/>
+        <source>Save As</source>
+        <translation>另存为</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="793"/>
+        <source>%1 Files (*.%2);;All Files (*)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Save File</source>
+        <translation type="vanished">保存文件</translation>
+    </message>
+    <message>
+        <source>File Error</source>
+        <translation type="vanished">文件错误</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open session file!</source>
+        <translation type="vanished">无法打开配置文件!</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="846"/>
+        <source>Session Error</source>
+        <translation>配置错误</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/mainwindow.cpp" line="847"/>
+        <source>Session File is not compatible with current device or mode!</source>
+        <translation>配置文件和当前的设备或者模式不兼容!</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open session file to write!</source>
+        <translation type="vanished">无法写入配置文件!</translation>
+    </message>
+</context>
+<context>
+    <name>pv::SigSession</name>
+    <message>
+        <source>Exporting data... It can take a while.</source>
+        <translation type="vanished">正在导出数据...请稍等。</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="vanished">取消</translation>
+    </message>
+    <message>
+        <source>Save Capture to File... It can take a while.</source>
+        <translation type="vanished">正在保存文件...请稍等.</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/sigsession.cpp" line="449"/>
+        <source>No probes enabled.</source>
+        <translation>没有使能的通道.</translation>
+    </message>
+</context>
+<context>
+    <name>pv::StoreSession</name>
+    <message>
+        <location filename="../DSView/pv/storesession.cpp" line="128"/>
+        <source>DSView does not currently supportfile saving for multiple data types.</source>
+        <translation>DSView暂不支持同时保存多种类型的数据。</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/storesession.cpp" line="132"/>
+        <location filename="../DSView/pv/storesession.cpp" line="140"/>
+        <location filename="../DSView/pv/storesession.cpp" line="490"/>
+        <location filename="../DSView/pv/storesession.cpp" line="498"/>
+        <source>No data to save.</source>
+        <translation>没有数据需要保存.</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/storesession.cpp" line="149"/>
+        <source>Save File</source>
+        <translation>保存文件</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/storesession.cpp" line="150"/>
+        <source>DSView Data (*.dsl)</source>
+        <translation>DSView Data (*.dsl)</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/storesession.cpp" line="155"/>
+        <source>.dsl</source>
+        <translation>.dsl</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/storesession.cpp" line="166"/>
+        <source>Generate temp file failed.</source>
+        <translation>生成临时文件失败。</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/storesession.cpp" line="173"/>
+        <location filename="../DSView/pv/storesession.cpp" line="229"/>
+        <location filename="../DSView/pv/storesession.cpp" line="281"/>
+        <source>Failed to create zip file. Please check write permission of this path.</source>
+        <translation>无法创建压缩文件，请确认此文件路径的写入权限。</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/storesession.cpp" line="219"/>
+        <location filename="../DSView/pv/storesession.cpp" line="263"/>
+        <source>Failed to create zip file. Malloc error.</source>
+        <translation>无法创建压缩文件，内存申请错误。</translation>
+    </message>
+    <message>
+        <source>Malloc failed.</source>
+        <translation type="vanished">内存分配失败。</translation>
+    </message>
+    <message>
+        <source>zip_open error.</source>
+        <translation type="vanished">zip_open错误</translation>
+    </message>
+    <message>
+        <source>sr_session_append error</source>
+        <translation type="vanished">sr_session_append错误</translation>
+    </message>
+    <message>
+        <source>zip_close error</source>
+        <translation type="vanished">zip_close错误</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/storesession.cpp" line="486"/>
+        <source>DSView does not currently supportfile export for multiple data types.</source>
+        <translation>DSView暂不支持同时保存多种类型的数据。</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/storesession.cpp" line="514"/>
+        <source>Export Data</source>
+        <translation>导出数据</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/storesession.cpp" line="520"/>
+        <source>.</source>
+        <translation>.</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/storesession.cpp" line="536"/>
+        <source>Invalid export format.</source>
+        <translation>无效的导出格式。</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/storesession.cpp" line="564"/>
+        <source>data type don&apos;t support.</source>
+        <translation>数据类型不支持。</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/storesession.cpp" line="645"/>
+        <source>xbuffer malloc failed.</source>
+        <translation>xbuffer内存分配失败。</translation>
+    </message>
+    <message>
+        <source>DSView currently only has support for storing a single data stream.</source>
+        <translation type="vanished">DSView目前只支持保存单个数据流.</translation>
+    </message>
+    <message>
+        <source>DSView currently only has support for storing a logic data.</source>
+        <translation type="vanished">DSView目前只支持保存LA模式下面的数据.</translation>
+    </message>
+    <message>
+        <source>No snapshots to save.</source>
+        <translation type="vanished">没有截图需要保存.</translation>
+    </message>
+    <message>
+        <source>Error while saving.</source>
+        <translation type="vanished">保存文件错误.</translation>
+    </message>
+</context>
+<context>
+    <name>pv::data::DecoderStack</name>
+    <message>
+        <location filename="../DSView/pv/data/decoderstack.cpp" line="407"/>
+        <source>One or more required channels have not been specified</source>
+        <translation>没有指定协议需要的通道</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/data/decoderstack.cpp" line="500"/>
+        <source>At least one of selected channels are not enabled.</source>
+        <translation>协议使用中的通道未被使能。</translation>
+    </message>
+    <message>
+        <source>Decoder reported an error</source>
+        <translation type="vanished">协议分析仪遇到问题</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/data/decoderstack.cpp" line="564"/>
+        <source>Failed to create decoder instance</source>
+        <translation>无法创建协议解析器</translation>
+    </message>
+</context>
+<context>
+    <name>pv::data::MathStack</name>
+    <message>
+        <source>Rectangle</source>
+        <translation type="vanished">矩形窗</translation>
+    </message>
+    <message>
+        <source>Hann</source>
+        <translation type="vanished">汉宁窗</translation>
+    </message>
+    <message>
+        <source>Hamming</source>
+        <translation type="vanished">海明窗</translation>
+    </message>
+    <message>
+        <source>Blackman</source>
+        <translation type="vanished">布莱克曼窗</translation>
+    </message>
+    <message>
+        <source>Flat_top</source>
+        <translation type="vanished">平顶窗</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/data/mathstack.cpp" line="240"/>
+        <source> </source>
+        <translation> </translation>
+    </message>
+</context>
+<context>
+    <name>pv::data::SpectrumStack</name>
+    <message>
+        <location filename="../DSView/pv/data/spectrumstack.cpp" line="40"/>
+        <source>Rectangle</source>
+        <translation>矩形窗</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/data/spectrumstack.cpp" line="41"/>
+        <source>Hann</source>
+        <translation>汉宁窗</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/data/spectrumstack.cpp" line="42"/>
+        <source>Hamming</source>
+        <translation>海明窗</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/data/spectrumstack.cpp" line="43"/>
+        <source>Blackman</source>
+        <translation>布莱克曼窗</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/data/spectrumstack.cpp" line="44"/>
+        <source>Flat_top</source>
+        <translation>平顶窗</translation>
+    </message>
+</context>
+<context>
+    <name>pv::device::DevInst</name>
+    <message>
+        <location filename="../DSView/pv/device/devinst.cpp" line="200"/>
+        <source>Failed to start session.</source>
+        <translation>无法开始采样，请检查驱动程序和硬件连接.</translation>
+    </message>
+</context>
+<context>
+    <name>pv::device::Device</name>
+    <message>
+        <location filename="../DSView/pv/device/device.cpp" line="53"/>
+        <source>Failed to use device.</source>
+        <translation>无法使用指定设备.</translation>
+    </message>
+</context>
+<context>
+    <name>pv::device::InputFile</name>
+    <message>
+        <source>Failed to add session device.</source>
+        <translation type="vanished">无法添加指定设备.</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/device/inputfile.cpp" line="53"/>
+        <source>Not a valid DSView data file.</source>
+        <translation>非法的数据文件。</translation>
+    </message>
+    <message>
+        <source>No supported input formats available.</source>
+        <translation type="vanished">没有可用的输入格式。</translation>
+    </message>
+    <message>
+        <source>Error: no matching input module found.</source>
+        <translation type="vanished">错误：没有找到相应的输入模块。</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/device/inputfile.cpp" line="112"/>
+        <location filename="../DSView/pv/device/inputfile.cpp" line="116"/>
+        <location filename="../DSView/pv/device/inputfile.cpp" line="127"/>
+        <source>Failed to load file</source>
+        <translation>无法加载指定文件</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/device/inputfile.cpp" line="120"/>
+        <source>Failed to allocate input module.</source>
+        <translation>无法指定输入模块.</translation>
+    </message>
+</context>
+<context>
+    <name>pv::device::SessionFile</name>
+    <message>
+        <location filename="../DSView/pv/device/sessionfile.cpp" line="43"/>
+        <source>Failed to open file.
+</source>
+        <translation>无法打开指定文件.</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/device/sessionfile.cpp" line="51"/>
+        <source>Failed to start session.</source>
+        <translation>无法开始采样，请检查驱动程序和硬件连接.</translation>
+    </message>
+</context>
+<context>
+    <name>pv::dialogs::About</name>
+    <message>
+        <location filename="../DSView/pv/dialogs/about.cpp" line="51"/>
+        <source>&lt;font size=24&gt;DSView %1 (%2)&lt;/font&gt;&lt;br /&gt;</source>
+        <translation>&lt;font size=24&gt;DSView %1 (%2)&lt;/font&gt;&lt;br /&gt;</translation>
+    </message>
+    <message>
+        <source>Website: &lt;a href=&quot;%1&quot; style=&quot;color:#C0C0C0&quot;&gt;%1&lt;/a&gt;&lt;br /&gt;Gitbub: &lt;a href=&quot;%2&quot; style=&quot;color:#C0C0C0&quot;&gt;%2&lt;/a&gt;&lt;br /&gt;&lt;br /&gt;&lt;br /&gt;</source>
+        <translation type="vanished">网站: &lt;a href=&quot;%1&quot; style=&quot;color:#C0C0C0&quot;&gt;%1&lt;/a&gt;&lt;br /&gt;Gitbub: &lt;a href=&quot;%2&quot; style=&quot;color:#C0C0C0&quot;&gt;%2&lt;/a&gt;&lt;br /&gt;&lt;br /&gt;&lt;br /&gt;</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/about.cpp" line="63"/>
+        <source>&lt;font size=16&gt;Special Thanks&lt;/font&gt;&lt;br /&gt;&lt;a href=&quot;%1&quot; style=&quot;color:#C0C0C0&quot;&gt;All backers on kickstarter&lt;/a&gt;&lt;br /&gt;&lt;a href=&quot;%2&quot; style=&quot;color:#C0C0C0&quot;&gt;All members of Sigrok project&lt;/a&gt;&lt;br /&gt;All contributors of all open-source projects&lt;/a&gt;&lt;br /&gt;&lt;br /&gt;&lt;br /&gt;</source>
+        <translation>&lt;font size=16&gt;特别感谢&lt;/font&gt;&lt;br /&gt;&lt;a href=&quot;%1&quot; style=&quot;color:#C0C0C0&quot;&gt;我们众筹项目的所有支持者&lt;/a&gt;&lt;br /&gt;&lt;a href=&quot;%2&quot; style=&quot;color:#C0C0C0&quot;&gt; Sigrok项目的所有成员&lt;/a&gt;&lt;br /&gt;所有开源项目的贡献者&lt;/a&gt;&lt;br /&gt;&lt;br /&gt;&lt;br /&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;font size=16&gt;Special Thanks&lt;/font&gt;&lt;br /&gt;&lt;a href=&quot;%1&quot; style=&quot;color:#C0C0C0&quot;&gt;All backers on kickstarter&lt;/a&gt;&lt;br /&gt;&lt;a href=&quot;%1&quot; style=&quot;color:#C0C0C0&quot;&gt;All members of Sigrok project&lt;/a&gt;&lt;br /&gt;All contributors of open-source projects&lt;/a&gt;&lt;br /&gt;&lt;br /&gt;&lt;br /&gt;</source>
+        <translation type="vanished">&lt;font size=16&gt;特别感谢&lt;/font&gt;&lt;br /&gt;&lt;a href=&quot;%1&quot; style=&quot;color:#C0C0C0&quot;&gt;我们众筹项目的所有支持者&lt;/a&gt;&lt;br /&gt;&lt;a href=&quot;%1&quot; style=&quot;color:#C0C0C0&quot;&gt; Sigrok项目的所有成员&lt;/a&gt;&lt;br /&gt;所有开源项目的贡献者&lt;/a&gt;&lt;br /&gt;&lt;br /&gt;&lt;br /&gt;</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/about.cpp" line="55"/>
+        <source>Website: &lt;a href=&quot;%1&quot; style=&quot;color:#C0C0C0&quot;&gt;%1&lt;/a&gt;&lt;br /&gt;Gitbub: &lt;a href=&quot;%2&quot; style=&quot;color:#C0C0C0&quot;&gt;%2&lt;/a&gt;&lt;br /&gt;Copyright：&lt;a href=&quot;%3&quot; style=&quot;color:#C0C0C0&quot;&gt;%3&lt;/a&gt;&lt;br /&gt;&lt;br /&gt;&lt;br /&gt;</source>
+        <translation>官网: &lt;a href=&quot;%1&quot; style=&quot;color:#C0C0C0&quot;&gt;%1&lt;/a&gt;&lt;br /&gt;Gitbub: &lt;a href=&quot;%2&quot; style=&quot;color:#C0C0C0&quot;&gt;%2&lt;/a&gt;&lt;br /&gt;版权：&lt;a href=&quot;%3&quot; style=&quot;color:#C0C0C0&quot;&gt;%3&lt;/a&gt;&lt;br /&gt;&lt;br /&gt;&lt;br /&gt;</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/about.cpp" line="61"/>
+        <source>© DreamSourceLab. All rights reserved.</source>
+        <translation>©深圳市梦源科技有限公司 版权所有</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/about.cpp" line="71"/>
+        <source>&lt;font size=16&gt;Changelogs&lt;/font&gt;&lt;br /&gt;</source>
+        <translation>&lt;font size=16&gt;更新日志&lt;/font&gt;&lt;br /&gt;</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/about.cpp" line="107"/>
+        <source>About</source>
+        <translation>关于</translation>
+    </message>
+</context>
+<context>
+    <name>pv::dialogs::Calibration</name>
+    <message>
+        <location filename="../DSView/pv/dialogs/calibration.cpp" line="41"/>
+        <source> VGAIN</source>
+        <translation>增益</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/calibration.cpp" line="42"/>
+        <source> VOFF</source>
+        <translation>偏置</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/calibration.cpp" line="43"/>
+        <source> VCOMB</source>
+        <translation>单通道增益</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/calibration.cpp" line="101"/>
+        <source>Save</source>
+        <translation>保存</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/calibration.cpp" line="102"/>
+        <source>Abort</source>
+        <translation>放弃</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/calibration.cpp" line="103"/>
+        <source>Reset</source>
+        <translation>重置</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/calibration.cpp" line="104"/>
+        <source>Exit</source>
+        <translation>退出</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/calibration.cpp" line="106"/>
+        <source>Manual Calibration</source>
+        <translation>手动校准</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/calibration.cpp" line="155"/>
+        <location filename="../DSView/pv/dialogs/calibration.cpp" line="177"/>
+        <location filename="../DSView/pv/dialogs/calibration.cpp" line="200"/>
+        <source>Channel</source>
+        <translation>通道</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/calibration.cpp" line="269"/>
+        <source>Save calibration results... It can take a while.</source>
+        <translation>正在保持校准结果...请稍等。</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/calibration.cpp" line="296"/>
+        <source>Reload last calibration results... It can take a while.</source>
+        <translation>重新载入上一次的校准结果...请稍等。</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/calibration.cpp" line="365"/>
+        <source>Attention</source>
+        <translation>注意</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/calibration.cpp" line="366"/>
+        <source>All calibration settings will become the defualt values!</source>
+        <translation>恢复所有的校准参数到默认状态！</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/calibration.cpp" line="367"/>
+        <source>Ok</source>
+        <translation>确定</translation>
+    </message>
+    <message>
+        <source>Save Calibration Result... It can take a while.</source>
+        <translation type="vanished">正在保存校准结果...请稍等.</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/calibration.cpp" line="270"/>
+        <location filename="../DSView/pv/dialogs/calibration.cpp" line="297"/>
+        <location filename="../DSView/pv/dialogs/calibration.cpp" line="368"/>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+    <message>
+        <source>Reset Calibration Result... It can take a while.</source>
+        <translation type="vanished">正在重置校准设置...请稍等.</translation>
+    </message>
+</context>
+<context>
+    <name>pv::dialogs::DSMessageBox</name>
+    <message>
+        <location filename="../DSView/pv/dialogs/dsmessagebox.cpp" line="56"/>
+        <source>Message</source>
+        <translation>消息</translation>
+    </message>
+</context>
+<context>
+    <name>pv::dialogs::DeviceOptions</name>
+    <message>
+        <source>Configure Device</source>
+        <translation type="vanished">配置设备</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/deviceoptions.cpp" line="47"/>
+        <source>Mode</source>
+        <translation>模式</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/deviceoptions.cpp" line="449"/>
+        <location filename="../DSView/pv/dialogs/deviceoptions.cpp" line="469"/>
+        <source>Channels</source>
+        <translation>通道</translation>
+    </message>
+    <message>
+        <source>Zero Adjustment</source>
+        <translation type="vanished">自动校准</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/deviceoptions.cpp" line="457"/>
+        <source>Auto Calibration</source>
+        <translation>自动校准</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/deviceoptions.cpp" line="460"/>
+        <source>Manual Calibration</source>
+        <translation>手动校准</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/deviceoptions.cpp" line="61"/>
+        <source>Device Options</source>
+        <translation>设备选项</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/deviceoptions.cpp" line="121"/>
+        <source>Attention</source>
+        <translation>注意</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/deviceoptions.cpp" line="122"/>
+        <source>All channel disabled! Please enable at least one channel.</source>
+        <translation>已关闭所有通道！需要至少使能一个通道。</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/deviceoptions.cpp" line="149"/>
+        <source>Operation Mode</source>
+        <translation>运行模式</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/deviceoptions.cpp" line="235"/>
+        <source>Enable All</source>
+        <translation>打开所有通道</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/deviceoptions.cpp" line="236"/>
+        <source>Disable All</source>
+        <translation>关闭所有通道</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/deviceoptions.cpp" line="309"/>
+        <location filename="../DSView/pv/dialogs/deviceoptions.cpp" line="421"/>
+        <source>Information</source>
+        <translation>提示</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/deviceoptions.cpp" line="422"/>
+        <source>Current mode only suppport max </source>
+        <translation>当前模式最大只支持</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/deviceoptions.cpp" line="422"/>
+        <source> channels!</source>
+        <translation>个通道！</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/deviceoptions.cpp" line="464"/>
+        <source>Calibration</source>
+        <translation>校准</translation>
+    </message>
+    <message>
+        <source>Undefined</source>
+        <translation type="vanished">未定义</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/deviceoptions.cpp" line="508"/>
+        <source>Enable: </source>
+        <translation>启用：</translation>
+    </message>
+    <message>
+        <source>Zero adjustment program will be started. Please keep all channels out of singal input. It can take a while!</source>
+        <translation type="vanished">将启动调零程序，请勿连接探头，保持输入处于悬空状态，调零期间请耐心等待！</translation>
+    </message>
+    <message>
+        <source>Zero adjustment program will be started. This may take a few minutes!</source>
+        <translation type="vanished">即将启动零点校准程序.这个过程可能需要花几分钟完成!</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/deviceoptions.cpp" line="123"/>
+        <location filename="../DSView/pv/dialogs/deviceoptions.cpp" line="311"/>
+        <location filename="../DSView/pv/dialogs/deviceoptions.cpp" line="423"/>
+        <source>Ok</source>
+        <translation>确定</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/deviceoptions.cpp" line="310"/>
+        <source>Auto Calibration program will be started. Please keep all channels out of singal input. It can take a while!</source>
+        <translation>将开启自动校准程序，请拔下探头，保持所有通道处于悬空状态。</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/deviceoptions.cpp" line="312"/>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+</context>
+<context>
+    <name>pv::dialogs::DsoMeasure</name>
+    <message>
+        <source>DSO Measure Options</source>
+        <translation type="vanished">示波器测量选项</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/dsomeasure.cpp" line="75"/>
+        <source>Measurements</source>
+        <translation>测量</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/dsomeasure.cpp" line="137"/>
+        <source>NULL</source>
+        <translation>无</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/dsomeasure.cpp" line="138"/>
+        <source>Freq</source>
+        <translation>频率</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/dsomeasure.cpp" line="138"/>
+        <source>Period</source>
+        <translation>周期</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/dsomeasure.cpp" line="138"/>
+        <source>+Duty</source>
+        <translation>+占空比</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/dsomeasure.cpp" line="138"/>
+        <source>-Duty</source>
+        <translation>-占空比</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/dsomeasure.cpp" line="138"/>
+        <source>+Count</source>
+        <translation>+脉冲数</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/dsomeasure.cpp" line="139"/>
+        <source>Rise</source>
+        <translation>上升沿</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/dsomeasure.cpp" line="139"/>
+        <source>Fall</source>
+        <translation>下降沿</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/dsomeasure.cpp" line="139"/>
+        <source>+Width</source>
+        <translation>+脉宽</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/dsomeasure.cpp" line="139"/>
+        <source>-Width</source>
+        <translation>-脉宽</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/dsomeasure.cpp" line="139"/>
+        <source>BrstW</source>
+        <translation>突发脉宽</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/dsomeasure.cpp" line="140"/>
+        <source>Ampl</source>
+        <translation>幅度</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/dsomeasure.cpp" line="140"/>
+        <source>High</source>
+        <translation>高电平</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/dsomeasure.cpp" line="140"/>
+        <source>Low</source>
+        <translation>低电平</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/dsomeasure.cpp" line="140"/>
+        <source>RMS</source>
+        <translation>有效值</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/dsomeasure.cpp" line="140"/>
+        <source>Mean</source>
+        <translation>平均值</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/dsomeasure.cpp" line="141"/>
+        <source>PK-PK</source>
+        <translation>峰峰值</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/dsomeasure.cpp" line="141"/>
+        <source>Max</source>
+        <translation>最大值</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/dsomeasure.cpp" line="141"/>
+        <source>Min</source>
+        <translation>最小值</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/dsomeasure.cpp" line="141"/>
+        <source>+Over</source>
+        <translation>+过冲</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/dsomeasure.cpp" line="141"/>
+        <source>-Over</source>
+        <translation>-过冲</translation>
+    </message>
+</context>
+<context>
+    <name>pv::dialogs::FftOptions</name>
+    <message>
+        <location filename="../DSView/pv/dialogs/fftoptions.cpp" line="178"/>
+        <source>FFT Enable: </source>
+        <translation>FFT使能:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/fftoptions.cpp" line="180"/>
+        <source>FFT Length: </source>
+        <translation>FFT长度:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/fftoptions.cpp" line="182"/>
+        <source>Sample Interval: </source>
+        <translation>抽样间隔:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/fftoptions.cpp" line="184"/>
+        <source>FFT Source: </source>
+        <translation>FFT通道:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/fftoptions.cpp" line="186"/>
+        <source>FFT Window: </source>
+        <translation>FFT加窗:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/fftoptions.cpp" line="188"/>
+        <source>DC Ignored: </source>
+        <translation>忽略直流:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/fftoptions.cpp" line="190"/>
+        <source>Y-axis Mode: </source>
+        <translation>Y轴模式:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/fftoptions.cpp" line="192"/>
+        <source>DBV Range: </source>
+        <translation>DBV范围:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/fftoptions.cpp" line="202"/>
+        <source>FFT Options</source>
+        <translation>FFT选项</translation>
+    </message>
+</context>
+<context>
+    <name>pv::dialogs::Interval</name>
+    <message>
+        <location filename="../DSView/pv/dialogs/interval.cpp" line="36"/>
+        <source>Interval(s): </source>
+        <translation>间隔（s）：</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/interval.cpp" line="54"/>
+        <source>Repetitive Interval</source>
+        <translation>重复间隔</translation>
+    </message>
+</context>
+<context>
+    <name>pv::dialogs::LissajousOptions</name>
+    <message>
+        <location filename="../DSView/pv/dialogs/lissajousoptions.cpp" line="148"/>
+        <source>Enable</source>
+        <translation>使能</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/lissajousoptions.cpp" line="149"/>
+        <source>X-axis</source>
+        <translation>X轴</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/lissajousoptions.cpp" line="150"/>
+        <source>Y-axis</source>
+        <translation>Y轴</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/lissajousoptions.cpp" line="151"/>
+        <source>Lissajous Options</source>
+        <translation>李萨茹图</translation>
+    </message>
+</context>
+<context>
+    <name>pv::dialogs::MathOptions</name>
+    <message>
+        <location filename="../DSView/pv/dialogs/mathoptions.cpp" line="59"/>
+        <source>Add</source>
+        <translation>加</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/mathoptions.cpp" line="62"/>
+        <source>Substract</source>
+        <translation>减</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/mathoptions.cpp" line="65"/>
+        <source>Multiply</source>
+        <translation>乘</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/mathoptions.cpp" line="68"/>
+        <source>Divide</source>
+        <translation>除</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/mathoptions.cpp" line="170"/>
+        <source>Enable</source>
+        <translation>使能</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/mathoptions.cpp" line="171"/>
+        <source>Math Type</source>
+        <translation>运算类型</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/mathoptions.cpp" line="172"/>
+        <source>1st Source</source>
+        <translation>第一操作数</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/mathoptions.cpp" line="173"/>
+        <source>2nd Source</source>
+        <translation>第二操作数</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/mathoptions.cpp" line="174"/>
+        <source>Math Options</source>
+        <translation>数学运算选项</translation>
+    </message>
+</context>
+<context>
+    <name>pv::dialogs::ProtocolExp</name>
+    <message>
+        <location filename="../DSView/pv/dialogs/protocolexp.cpp" line="57"/>
+        <source>Comma-Separated Values (*.csv)</source>
+        <translation>Comma-Separated Values (*.csv)</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/protocolexp.cpp" line="58"/>
+        <source>Text files (*.txt)</source>
+        <translation>Text files (*.txt)</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/protocolexp.cpp" line="65"/>
+        <source>Export Format: </source>
+        <translation>导出格式:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/protocolexp.cpp" line="95"/>
+        <source>Protocol Export</source>
+        <translation>协议导出</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/protocolexp.cpp" line="125"/>
+        <source>Export Data</source>
+        <translation>导出数据</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/protocolexp.cpp" line="131"/>
+        <source>.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/protocolexp.cpp" line="195"/>
+        <source>Export Protocol List Result... It can take a while.</source>
+        <translation>正在导出协议分析的结果...请稍等.</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/protocolexp.cpp" line="196"/>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+</context>
+<context>
+    <name>pv::dialogs::ProtocolList</name>
+    <message>
+        <location filename="../DSView/pv/dialogs/protocollist.cpp" line="50"/>
+        <source>Fit to Window</source>
+        <translation>适应窗口大小</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/protocollist.cpp" line="51"/>
+        <source>Fixed</source>
+        <translation>固定</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/protocollist.cpp" line="78"/>
+        <source>Map Zoom: </source>
+        <translation>缩放：</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/protocollist.cpp" line="79"/>
+        <source>Decoded Protocols: </source>
+        <translation>已解析的协议:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/protocollist.cpp" line="87"/>
+        <source>Protocol List Viewer</source>
+        <translation>协议列表显示</translation>
+    </message>
+</context>
+<context>
+    <name>pv::dialogs::RegionOptions</name>
+    <message>
+        <location filename="../DSView/pv/dialogs/regionoptions.cpp" line="37"/>
+        <source>Start</source>
+        <translation>开始</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/regionoptions.cpp" line="38"/>
+        <source>End</source>
+        <translation>结束</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/regionoptions.cpp" line="58"/>
+        <source>Cursor </source>
+        <translation>光标</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/regionoptions.cpp" line="75"/>
+        <source>Region</source>
+        <translation>区域</translation>
+    </message>
+</context>
+<context>
+    <name>pv::dialogs::Search</name>
+    <message>
+        <source>Search Value: </source>
+        <translation type="vanished">搜索值:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/search.cpp" line="80"/>
+        <source>X: Don&apos;t care
+0: Low level
+1: High level
+R: Rising edge
+F: Falling edge
+C: Rising/Falling edge</source>
+        <translation>X: 不关心
+0: 低电平
+1: 高电平
+R: 上升沿
+F: 下降沿
+C: 上升/下降沿</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/search.cpp" line="85"/>
+        <source>Search Options</source>
+        <translation>搜索选项</translation>
+    </message>
+</context>
+<context>
+    <name>pv::dialogs::StoreProgress</name>
+    <message>
+        <location filename="../DSView/pv/dialogs/storeprogress.cpp" line="75"/>
+        <source>Saving...</source>
+        <translation>保存...</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/storeprogress.cpp" line="86"/>
+        <source>Exporting...</source>
+        <translation>导出...</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="vanished">取消</translation>
+    </message>
+    <message>
+        <source>Failed to save session.</source>
+        <translation type="vanished">无法保存当前内容.</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/storeprogress.cpp" line="99"/>
+        <source>Failed to save data.</source>
+        <translation>保存数据失败。</translation>
+    </message>
+</context>
+<context>
+    <name>pv::dialogs::StreamOptions</name>
+    <message>
+        <source>Stream Mode Options</source>
+        <translation type="vanished">Stream模式选项</translation>
+    </message>
+    <message>
+        <source>Stream Mode Active!</source>
+        <translation type="vanished">Stream模式已激活!</translation>
+    </message>
+    <message>
+        <source>Buffer Mode Active!</source>
+        <translation type="vanished">Buffer模式已激活!</translation>
+    </message>
+    <message>
+        <source>16 Channels, Max 10MHz sample rate</source>
+        <translation type="vanished">16通道，最大10MHz采样率</translation>
+    </message>
+    <message>
+        <source> 8 Channels, Max 25MHz sample rate</source>
+        <translation type="vanished">8通道，最大25MHz采样率</translation>
+    </message>
+</context>
+<context>
+    <name>pv::dialogs::WaitingDialog</name>
+    <message>
+        <location filename="../DSView/pv/dialogs/waitingdialog.cpp" line="41"/>
+        <source>Waiting</source>
+        <translation>稍等</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/waitingdialog.cpp" line="42"/>
+        <source>Finished!</source>
+        <translation>完成!</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/waitingdialog.cpp" line="98"/>
+        <source>Save calibration Result... It can take a while.</source>
+        <translation>正在保存校准结果...请稍等.</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/waitingdialog.cpp" line="127"/>
+        <source>Load current setting... It can take a while.</source>
+        <translation>正在载入当前设置...请稍等.</translation>
+    </message>
+    <message>
+        <source>Zero Adjustment</source>
+        <translation type="vanished">零点校准</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/waitingdialog.cpp" line="82"/>
+        <source>Auto Calibration</source>
+        <translation>自动校准</translation>
+    </message>
+    <message>
+        <source>Save Auto Zero Result... It can take a while.</source>
+        <translation type="vanished">正在保存校准结果...请稍等.</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dialogs/waitingdialog.cpp" line="99"/>
+        <location filename="../DSView/pv/dialogs/waitingdialog.cpp" line="128"/>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+    <message>
+        <source>Load Current Setting... It can take a while.</source>
+        <translation type="vanished">正在载入当前设置...请稍等.</translation>
+    </message>
+</context>
+<context>
+    <name>pv::dock::DsoTriggerDock</name>
+    <message>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="186"/>
+        <source>Trigger Position: </source>
+        <translation>触发位置:</translation>
+    </message>
+    <message>
+        <source>Trigger Hold Off Time: </source>
+        <translation type="vanished">触发释抑时间:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="187"/>
+        <source>Hold Off Time: </source>
+        <translation>触发释抑时间:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="66"/>
+        <source>uS</source>
+        <translation>微秒</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="67"/>
+        <source>mS</source>
+        <translation>毫秒</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="68"/>
+        <source>S</source>
+        <translation>秒</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="188"/>
+        <source>Noise Sensitivity: </source>
+        <translation>触发灵敏度:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="189"/>
+        <source>Trigger Sources: </source>
+        <translation>触发源:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="194"/>
+        <source>Auto</source>
+        <translation>自动</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="195"/>
+        <source>Channel 0</source>
+        <translation>通道0</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="196"/>
+        <source>Channel 1</source>
+        <translation>通道1</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="197"/>
+        <source>Channel 0 &amp;&amp; 1</source>
+        <translation>通道0&amp;&amp;1</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="198"/>
+        <source>Channel 0 | 1</source>
+        <translation>通道0|1</translation>
+    </message>
+    <message>
+        <source>Channel 0 &amp;&amp; Channel 1</source>
+        <translation type="vanished">通道0&amp;&amp;通道1</translation>
+    </message>
+    <message>
+        <source>Channel 0 | Channel 1</source>
+        <translation type="vanished">通道0|通道1</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="190"/>
+        <source>Trigger Types: </source>
+        <translation>触发类型:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="191"/>
+        <source>Rising Edge</source>
+        <translation>上升沿触发</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="192"/>
+        <source>Falling Edge</source>
+        <translation>下降沿触发</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="131"/>
+        <source>%</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="230"/>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="256"/>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="272"/>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="290"/>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="308"/>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="326"/>
+        <source>Trigger Setting Issue</source>
+        <translation>触发设置遇到问题</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="231"/>
+        <source>Change horiz trigger position failed!</source>
+        <translation>无法改变触发位置的设置!</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="257"/>
+        <source>Change trigger hold off time failed!</source>
+        <translation>无法改变触发释抑时间的设置!</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="273"/>
+        <source>Change trigger value sensitivity failed!</source>
+        <translation>无法改变触发灵敏度的设置!</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="291"/>
+        <source>Change trigger source failed!</source>
+        <translation>无法改变触发源的设置!</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="309"/>
+        <source>Change trigger channel failed!</source>
+        <translation>无法改变触发通道的设置!</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/dsotriggerdock.cpp" line="327"/>
+        <source>Change trigger type failed!</source>
+        <translation>无法改变触发类型的设置!</translation>
+    </message>
+</context>
+<context>
+    <name>pv::dock::MeasureDock</name>
+    <message>
+        <location filename="../DSView/pv/dock/measuredock.cpp" line="168"/>
+        <source>Mouse measurement</source>
+        <translation>鼠标测量</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/measuredock.cpp" line="169"/>
+        <source>Enable floating measurement</source>
+        <translation>使能鼠标跟随测量</translation>
+    </message>
+    <message>
+        <source>Width: </source>
+        <translation type="vanished">宽度:</translation>
+    </message>
+    <message>
+        <source>Period: </source>
+        <translation type="vanished">周期:</translation>
+    </message>
+    <message>
+        <source>Frequency: </source>
+        <translation type="vanished">频率:</translation>
+    </message>
+    <message>
+        <source>Duty Cycle: </source>
+        <translation type="vanished">占空比:</translation>
+    </message>
+    <message>
+        <source>Cursor measurement</source>
+        <translation type="vanished">光标测量</translation>
+    </message>
+    <message>
+        <source>Delta Samples: </source>
+        <translation type="vanished">采样间隔:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/measuredock.cpp" line="172"/>
+        <source>Cursors</source>
+        <translation>光标</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/measuredock.cpp" line="100"/>
+        <location filename="../DSView/pv/dock/measuredock.cpp" line="176"/>
+        <source>Time/Samples</source>
+        <translation>时间/采样点位置</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/measuredock.cpp" line="178"/>
+        <source>W: </source>
+        <translation>宽度:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/measuredock.cpp" line="179"/>
+        <source>P: </source>
+        <translation>周期:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/measuredock.cpp" line="180"/>
+        <source>F: </source>
+        <translation>频率:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/measuredock.cpp" line="181"/>
+        <source>D: </source>
+        <translation>占空比:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/measuredock.cpp" line="170"/>
+        <source>Cursor Distance</source>
+        <translation>距离测量</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/measuredock.cpp" line="171"/>
+        <source>Edges</source>
+        <translation>边沿统计</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/measuredock.cpp" line="174"/>
+        <source>Channel</source>
+        <translation>通道</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/measuredock.cpp" line="175"/>
+        <source>Rising/Falling/Edges</source>
+        <translation>上升沿/下降沿/所有边沿</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/measuredock.cpp" line="343"/>
+        <location filename="../DSView/pv/dock/measuredock.cpp" line="345"/>
+        <location filename="../DSView/pv/dock/measuredock.cpp" line="409"/>
+        <location filename="../DSView/pv/dock/measuredock.cpp" line="411"/>
+        <source> </source>
+        <translation> </translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/measuredock.cpp" line="348"/>
+        <location filename="../DSView/pv/dock/measuredock.cpp" line="414"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/measuredock.cpp" line="416"/>
+        <source>@</source>
+        <translation>@</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/measuredock.cpp" line="470"/>
+        <source>Information</source>
+        <translation>提示</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/measuredock.cpp" line="471"/>
+        <source>Please insert cursor before using cursor measure.</source>
+        <translation>使用光标测量前，请先在波形窗口插入光标。</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/measuredock.cpp" line="472"/>
+        <source>Ok</source>
+        <translation>确定</translation>
+    </message>
+    <message>
+        <source>Cursor </source>
+        <translation type="vanished">光标</translation>
+    </message>
+</context>
+<context>
+    <name>pv::dock::ProtocolDock</name>
+    <message>
+        <location filename="../DSView/pv/dock/protocoldock.cpp" line="224"/>
+        <source>Protocol List Viewer</source>
+        <translation>协议列表显示</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/protocoldock.cpp" line="222"/>
+        <source>search</source>
+        <translation>搜索</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/protocoldock.cpp" line="223"/>
+        <source>Matching Items:</source>
+        <translation>匹配项:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/protocoldock.cpp" line="310"/>
+        <location filename="../DSView/pv/dock/protocoldock.cpp" line="416"/>
+        <source>Protocol Analyzer</source>
+        <translation>协议分析</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/protocoldock.cpp" line="311"/>
+        <source>Protocol Analyzer is only valid in Digital Mode!</source>
+        <translation>协议分析功能只在LA模式下有效!</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/protocoldock.cpp" line="417"/>
+        <source>No Protocol Analyzer to delete!</source>
+        <translation>没有协议分析需要删除!</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/protocoldock.cpp" line="490"/>
+        <source>(Out of Memory)</source>
+        <translation>(内存不足)</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/protocoldock.cpp" line="820"/>
+        <source>Searching...</source>
+        <translation>搜索中...</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/protocoldock.cpp" line="821"/>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+</context>
+<context>
+    <name>pv::dock::SearchDock</name>
+    <message>
+        <location filename="../DSView/pv/dock/searchdock.cpp" line="107"/>
+        <source>search</source>
+        <translation>搜索</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/searchdock.cpp" line="138"/>
+        <location filename="../DSView/pv/dock/searchdock.cpp" line="151"/>
+        <location filename="../DSView/pv/dock/searchdock.cpp" line="178"/>
+        <location filename="../DSView/pv/dock/searchdock.cpp" line="200"/>
+        <location filename="../DSView/pv/dock/searchdock.cpp" line="212"/>
+        <location filename="../DSView/pv/dock/searchdock.cpp" line="238"/>
+        <source>Search</source>
+        <translation>搜索</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/searchdock.cpp" line="152"/>
+        <source>Search cursor at the start position!</source>
+        <translation>搜索光标已处于起始位置!</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/searchdock.cpp" line="179"/>
+        <location filename="../DSView/pv/dock/searchdock.cpp" line="239"/>
+        <source>Pattern not found!</source>
+        <translation>未找到指定波形！</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/searchdock.cpp" line="139"/>
+        <location filename="../DSView/pv/dock/searchdock.cpp" line="201"/>
+        <source>No Sample data!</source>
+        <translation>没有采样数据!</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/searchdock.cpp" line="164"/>
+        <source>Search Previous...</source>
+        <translation>搜索上一个...</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/searchdock.cpp" line="165"/>
+        <location filename="../DSView/pv/dock/searchdock.cpp" line="225"/>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+    <message>
+        <source>Pattern </source>
+        <translation type="vanished">模式</translation>
+    </message>
+    <message>
+        <source> not found!</source>
+        <translation type="vanished">没有找到!</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/searchdock.cpp" line="213"/>
+        <source>Search cursor at the end position!</source>
+        <translation>搜索光标已处于结束位置!</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/searchdock.cpp" line="224"/>
+        <source>Search Next...</source>
+        <translation>搜索下一个...</translation>
+    </message>
+</context>
+<context>
+    <name>pv::dock::TriggerDock</name>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="299"/>
+        <source>Simple Trigger</source>
+        <translation>简单触发模式</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="300"/>
+        <source>Advanced Trigger</source>
+        <translation>高级触发模式</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="301"/>
+        <source>Trigger Position: </source>
+        <translation>触发位置:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="302"/>
+        <source>Total Trigger Stages: </source>
+        <translation>总触发等级:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="83"/>
+        <source>Or</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="84"/>
+        <source>And</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="100"/>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="112"/>
+        <source>==</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="101"/>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="113"/>
+        <source>!=</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="316"/>
+        <source>Inv</source>
+        <translation>取反</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="319"/>
+        <source>Counter</source>
+        <translation>计数</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="322"/>
+        <source>Contiguous</source>
+        <translation>连续</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="312"/>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="328"/>
+        <source>X: Don&apos;t care
+0: Low level
+1: High level
+R: Rising edge
+F: Falling edge
+C: Rising/Falling edge</source>
+        <translation>X: 不关心
+0: 低电平
+1: 高电平
+R: 上升沿
+F: 下降沿
+C: 上升/下降沿</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="325"/>
+        <source>Stage</source>
+        <translation>等级</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="303"/>
+        <source>Start Flag: </source>
+        <translation>开始条件:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="304"/>
+        <source>Stop Flag: </source>
+        <translation>停止条件:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="305"/>
+        <source>Clock Flag: </source>
+        <translation>时钟设置:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="306"/>
+        <source>Data Channel: </source>
+        <translation>数据通道:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="307"/>
+        <source>Data Value: </source>
+        <translation>数据值:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="313"/>
+        <source>Data Bits</source>
+        <translation>数据位宽</translation>
+    </message>
+    <message>
+        <source>counter</source>
+        <translation type="vanished">计数</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="251"/>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="308"/>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="311"/>
+        <source>Serial Trigger</source>
+        <translation>串行触发</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="250"/>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="310"/>
+        <source>Stage Trigger</source>
+        <translation>多级触发</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="265"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="362"/>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="373"/>
+        <source>Trigger</source>
+        <translation>触发</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="363"/>
+        <source>Stream Mode Don&apos;t Support Advanced Trigger!</source>
+        <translation>Stream模式不支持高级触发功能!</translation>
+    </message>
+    <message>
+        <source>Stram Mode Don&apos;t Support Advanced Trigger!</source>
+        <translation type="vanished">Stream模式不支持高级触发!</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/dock/triggerdock.cpp" line="374"/>
+        <source>Advanced Trigger need DSLogic Hardware Support!</source>
+        <translation>高级触发功能需要DSLogic硬件支持!</translation>
+    </message>
+</context>
+<context>
+    <name>pv::toolbars::FileBar</name>
+    <message>
+        <source>Session</source>
+        <translation type="vanished">配置</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/filebar.cpp" line="142"/>
+        <source>Open File</source>
+        <translation>打开文件</translation>
+    </message>
+    <message>
+        <source>Data Export</source>
+        <translation type="vanished">数据导出</translation>
+    </message>
+    <message>
+        <source>No Data to Save!</source>
+        <translation type="vanished">没有需要保存的数据!</translation>
+    </message>
+    <message>
+        <source>Export Data</source>
+        <translation type="vanished">导出数据</translation>
+    </message>
+    <message>
+        <source>File Save</source>
+        <translation type="vanished">文件保存</translation>
+    </message>
+    <message>
+        <source>DSView currently only support saving logic data to file!</source>
+        <translation type="vanished">DSView目前只支持保存逻辑分析仪的数据到文件，其它模式可选择导出数据!</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/filebar.cpp" line="111"/>
+        <source>Settings</source>
+        <translation>配置</translation>
+    </message>
+    <message>
+        <source>Save File</source>
+        <translation type="vanished">保存文件</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/filebar.cpp" line="110"/>
+        <source>File</source>
+        <translation>文件</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/filebar.cpp" line="112"/>
+        <source>&amp;Load...</source>
+        <translation>导入(&amp;L)...</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/filebar.cpp" line="113"/>
+        <source>S&amp;tore...</source>
+        <translation>导出(&amp;T)...</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/filebar.cpp" line="114"/>
+        <source>&amp;Default...</source>
+        <translation>载入默认(&amp;D)...</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/filebar.cpp" line="115"/>
+        <source>&amp;Open...</source>
+        <translation>打开(&amp;O)...</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/filebar.cpp" line="116"/>
+        <source>&amp;Save...</source>
+        <translation>保存(&amp;S)...</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/filebar.cpp" line="117"/>
+        <source>&amp;Export...</source>
+        <translation>导出(&amp;E)...</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/filebar.cpp" line="118"/>
+        <source>&amp;Capture...</source>
+        <translation>截屏(&amp;C)...</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/filebar.cpp" line="142"/>
+        <source>DSView Data (*.dsl)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/filebar.cpp" line="176"/>
+        <source>Open Session</source>
+        <translation>打开配置文件</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/filebar.cpp" line="176"/>
+        <location filename="../DSView/pv/toolbars/filebar.cpp" line="223"/>
+        <source>DSView Session (*.dsc)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/filebar.cpp" line="195"/>
+        <source>Session Load</source>
+        <translation>配置载入</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/filebar.cpp" line="196"/>
+        <source>Cannot find default session file for this device!</source>
+        <translation>无法找到当前设备的默认配置文件!</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/filebar.cpp" line="222"/>
+        <source>Save Session</source>
+        <translation>保存配置文件</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/filebar.cpp" line="227"/>
+        <source>.dsc</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>pv::toolbars::LogoBar</name>
+    <message>
+        <location filename="../DSView/pv/toolbars/logobar.cpp" line="112"/>
+        <source>Help</source>
+        <translation>帮助</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/logobar.cpp" line="115"/>
+        <source>&amp;Language</source>
+        <translation>语言(&amp;L)</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/logobar.cpp" line="116"/>
+        <source>&amp;About...</source>
+        <translation>关于(&amp;A)...</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/logobar.cpp" line="117"/>
+        <source>&amp;Manual</source>
+        <translation>手册(&amp;M)</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/logobar.cpp" line="118"/>
+        <source>&amp;Bug Report</source>
+        <translation>报告问题(&amp;B)</translation>
+    </message>
+</context>
+<context>
+    <name>pv::toolbars::SamplingBar</name>
+    <message>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="98"/>
+        <source>run_stop_button</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="112"/>
+        <source> @ </source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Zero Adjustment</source>
+        <translation type="vanished">零点校准</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="52"/>
+        <source>(RLE)</source>
+        <translation>(压缩)</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="53"/>
+        <source> / div</source>
+        <translation>每格</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="149"/>
+        <source>Options</source>
+        <translation>选项</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="150"/>
+        <source>Mode</source>
+        <translation>模式</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="154"/>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="156"/>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="159"/>
+        <source>Stop</source>
+        <translation>停止</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="154"/>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="162"/>
+        <source>Single</source>
+        <translation>单次</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="156"/>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="164"/>
+        <source>Instant</source>
+        <translation>立即</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="157"/>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="159"/>
+        <source>Start</source>
+        <translation>开始</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="167"/>
+        <source>&amp;Single</source>
+        <translation>单次(&amp;S)</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="168"/>
+        <source>&amp;Repetitive</source>
+        <translation>重复(&amp;R)</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="804"/>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="856"/>
+        <source>Auto Calibration</source>
+        <translation>自动校准</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="805"/>
+        <source>Please adjust zero skew and save the result!</source>
+        <translation>请调整零点偏移并保存结果!</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="807"/>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="859"/>
+        <source>Ok</source>
+        <translation>确定</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="808"/>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="860"/>
+        <source>Skip</source>
+        <translation>跳过</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="857"/>
+        <source>Auto Calibration program will be started. Please keep all channels out of singal input. It can take a while!</source>
+        <translation>将开启自动校准程序，请拔下探头，保持所有通道处于悬空状态。</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/samplingbar.cpp" line="891"/>
+        <source>Failed to select </source>
+        <translation>无法选择</translation>
+    </message>
+    <message>
+        <source>Zero adjustment program will be started. Please keep all channels out of singal input. It can take a while!</source>
+        <translation type="vanished">将启动调零程序，请勿连接探头，保持输入处于悬空状态，调零过程请耐心等待!</translation>
+    </message>
+    <message>
+        <source>Please adjust zero skew and save the result!
+Please left both of channels unconnect for zero adjustment!</source>
+        <translation type="vanished">请调整零点偏移并保存结果!在此过程中请保持通道输入处于悬空状态!</translation>
+    </message>
+    <message>
+        <source>Failed to Select </source>
+        <translation type="vanished">无法选择</translation>
+    </message>
+</context>
+<context>
+    <name>pv::toolbars::TrigBar</name>
+    <message>
+        <location filename="../DSView/pv/toolbars/trigbar.cpp" line="140"/>
+        <source>Trigger</source>
+        <translation>触发</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/trigbar.cpp" line="141"/>
+        <source>Decode</source>
+        <translation>解码</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/trigbar.cpp" line="142"/>
+        <source>Measure</source>
+        <translation>测量</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/trigbar.cpp" line="143"/>
+        <source>Search</source>
+        <translation>搜索</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/trigbar.cpp" line="144"/>
+        <source>Function</source>
+        <translation>函数</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/trigbar.cpp" line="145"/>
+        <source>Display</source>
+        <translation>显示</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/trigbar.cpp" line="146"/>
+        <source>Themes</source>
+        <translation>主题</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/trigbar.cpp" line="147"/>
+        <source>Dark</source>
+        <translation>暗黑</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/trigbar.cpp" line="148"/>
+        <source>Light</source>
+        <translation>清新</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/trigbar.cpp" line="149"/>
+        <source>&amp;Lissajous</source>
+        <translation>李萨茹图(&amp;L)</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/trigbar.cpp" line="151"/>
+        <source>FFT</source>
+        <translation>FFT</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/toolbars/trigbar.cpp" line="152"/>
+        <source>Math</source>
+        <translation>数学运算</translation>
+    </message>
+</context>
+<context>
+    <name>pv::view::DecodeTrace</name>
+    <message>
+        <location filename="../DSView/pv/view/decodetrace.cpp" line="116"/>
+        <source>Start</source>
+        <translation>采样起始</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/decodetrace.cpp" line="117"/>
+        <source>End  </source>
+        <translation>采样结束</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/decodetrace.cpp" line="329"/>
+        <source>Unshown</source>
+        <translation>已隐藏</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/decodetrace.cpp" line="392"/>
+        <source>Decoder Options</source>
+        <translation>解码器选项</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/decodetrace.cpp" line="414"/>
+        <source>&lt;p&gt;&lt;i&gt;No decoders in the stack&lt;/i&gt;&lt;/p&gt;</source>
+        <translation>没有协议解析器</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/decodetrace.cpp" line="424"/>
+        <source>&lt;i&gt;* Required channels&lt;/i&gt;</source>
+        <translation>*必要的通道</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/decodetrace.cpp" line="436"/>
+        <source>Cursor </source>
+        <translation>光标</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/decodetrace.cpp" line="457"/>
+        <source>Decode Start From</source>
+        <translation>解码起始位置</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/decodetrace.cpp" line="459"/>
+        <source>Decode End to</source>
+        <translation>解码结束位置</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/decodetrace.cpp" line="470"/>
+        <source>Stack Decoder</source>
+        <translation>多层协议</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/decodetrace.cpp" line="559"/>
+        <source>Zoom in for details</source>
+        <translation>放大查看细节</translation>
+    </message>
+    <message>
+        <source>Zoom in For Detials</source>
+        <translation type="vanished">放大查看细节</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/decodetrace.cpp" line="679"/>
+        <source>Error: </source>
+        <translation>错误:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/decodetrace.cpp" line="681"/>
+        <source>Error: ...</source>
+        <translation>错误: ...</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/decodetrace.cpp" line="731"/>
+        <source>&lt;b&gt;%1&lt;/b&gt; (%2) *</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/decodetrace.cpp" line="746"/>
+        <source>&lt;b&gt;%1&lt;/b&gt; (%2)</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>pv::view::DsoSignal</name>
+    <message>
+        <location filename="../DSView/pv/view/dsosignal.cpp" line="1088"/>
+        <source>EN</source>
+        <translation>启用</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/dsosignal.cpp" line="1089"/>
+        <source>DIS</source>
+        <translation>禁用</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/dsosignal.cpp" line="1090"/>
+        <source>GND</source>
+        <translation>接地</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/dsosignal.cpp" line="1091"/>
+        <source>DC</source>
+        <translation>直流</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/dsosignal.cpp" line="1092"/>
+        <source>AC</source>
+        <translation>交流</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/dsosignal.cpp" line="1093"/>
+        <source>AUTO</source>
+        <translation>自动</translation>
+    </message>
+    <message>
+        <source>Vmax: </source>
+        <translation type="vanished">最大值：</translation>
+    </message>
+    <message>
+        <source>Vmin: </source>
+        <translation type="vanished">最小值：</translation>
+    </message>
+    <message>
+        <source>Perd: </source>
+        <translation type="vanished">周期：</translation>
+    </message>
+    <message>
+        <source>Freq: </source>
+        <translation type="vanished">频率：</translation>
+    </message>
+    <message>
+        <source>Vp-p: </source>
+        <translation type="vanished">峰-峰值：</translation>
+    </message>
+    <message>
+        <source>Vrms: </source>
+        <translation type="vanished">有效值：</translation>
+    </message>
+    <message>
+        <source>Vmean: </source>
+        <translation type="vanished">平均值：</translation>
+    </message>
+    <message>
+        <source>Vmax: #####</source>
+        <translation type="vanished">最大值：#####</translation>
+    </message>
+    <message>
+        <source>Vmin: #####</source>
+        <translation type="vanished">最小值：#####</translation>
+    </message>
+    <message>
+        <source>Perd: #####</source>
+        <translation type="vanished">周期：#####</translation>
+    </message>
+    <message>
+        <source>Freq: #####</source>
+        <translation type="vanished">频率：#####</translation>
+    </message>
+    <message>
+        <source>Vp-p: #####</source>
+        <translation type="vanished">峰-峰值：#####</translation>
+    </message>
+    <message>
+        <source>Vrms: #####</source>
+        <translation type="vanished">有效值：#####</translation>
+    </message>
+    <message>
+        <source>Vmean: #####</source>
+        <translation type="vanished">平均值：#####</translation>
+    </message>
+    <message>
+        <source>Max: </source>
+        <translation type="vanished">最大值:</translation>
+    </message>
+    <message>
+        <source>Min: </source>
+        <translation type="vanished">最小值:</translation>
+    </message>
+    <message>
+        <source>Period: </source>
+        <translation type="vanished">周期:</translation>
+    </message>
+    <message>
+        <source>Frequency: </source>
+        <translation type="vanished">频率:</translation>
+    </message>
+</context>
+<context>
+    <name>pv::view::Header</name>
+    <message>
+        <location filename="../DSView/pv/view/header.cpp" line="58"/>
+        <source>Add Group</source>
+        <translation>增加组信号</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/header.cpp" line="59"/>
+        <source>Del Group</source>
+        <translation>删除组信号</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/header.cpp" line="291"/>
+        <source>Set Channel Colour</source>
+        <translation>设置通道颜色</translation>
+    </message>
+</context>
+<context>
+    <name>pv::view::LissajousTrace</name>
+    <message>
+        <location filename="../DSView/pv/view/lissajoustrace.cpp" line="137"/>
+        <source>Lissajous Figure</source>
+        <translation>李萨茹图</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/lissajoustrace.cpp" line="172"/>
+        <source>Data source error.</source>
+        <translation>数据源错误</translation>
+    </message>
+</context>
+<context>
+    <name>pv::view::View</name>
+    <message>
+        <location filename="../DSView/pv/view/view.cpp" line="200"/>
+        <source>ViewArea_center</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/view.cpp" line="201"/>
+        <source>ViewArea_ruler</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/view.cpp" line="202"/>
+        <source>ViewArea_header</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>pv::view::ViewStatus</name>
+    <message>
+        <location filename="../DSView/pv/view/viewstatus.cpp" line="117"/>
+        <source>Measure</source>
+        <translation>测量</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/viewstatus.cpp" line="166"/>
+        <source>Trigger Time: </source>
+        <translation>触发时间:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/viewstatus.cpp" line="171"/>
+        <source> Samples Captured!</source>
+        <translation>个数据被采集!</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/viewstatus.cpp" line="177"/>
+        <source>Triggered! </source>
+        <translation>已触发！</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/viewstatus.cpp" line="177"/>
+        <location filename="../DSView/pv/view/viewstatus.cpp" line="179"/>
+        <source>% Captured</source>
+        <translation>% 已采集</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/viewstatus.cpp" line="179"/>
+        <source>Waiting for Trigger! </source>
+        <translation>等待触发！</translation>
+    </message>
+</context>
+<context>
+    <name>pv::view::Viewport</name>
+    <message>
+        <location filename="../DSView/pv/view/viewport.cpp" line="103"/>
+        <source>Add Y-cursor</source>
+        <translation>添加Y轴光标</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/viewport.cpp" line="104"/>
+        <source>Add X-cursor</source>
+        <translation>添加X轴光标</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/viewport.cpp" line="444"/>
+        <source>Triggered! </source>
+        <translation>已触发！</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/viewport.cpp" line="444"/>
+        <location filename="../DSView/pv/view/viewport.cpp" line="449"/>
+        <source>% Captured</source>
+        <translation>% 已采集</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/viewport.cpp" line="449"/>
+        <source>Waiting for Trigger! </source>
+        <translation>等待触发！</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/viewport.cpp" line="1163"/>
+        <source>Rising: </source>
+        <translation>上升沿: </translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/viewport.cpp" line="1164"/>
+        <source>Falling: </source>
+        <translation>下降沿: </translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/viewport.cpp" line="1165"/>
+        <source>Edges: </source>
+        <translation>跳变沿: </translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/viewport.cpp" line="1264"/>
+        <source>Width: </source>
+        <translation>宽度:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/viewport.cpp" line="1266"/>
+        <source>Period: </source>
+        <translation>周期:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/viewport.cpp" line="1268"/>
+        <source>Frequency: </source>
+        <translation>频率:</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/viewport.cpp" line="1270"/>
+        <source>Duty Cycle: </source>
+        <translation>占空比:</translation>
+    </message>
+</context>
+<context>
+    <name>pv::view::dslDial</name>
+    <message>
+        <source> / div</source>
+        <translation type="vanished">每格</translation>
+    </message>
+    <message>
+        <location filename="../DSView/pv/view/dsldial.cpp" line="89"/>
+        <source>/div</source>
+        <translation>/格</translation>
+    </message>
+</context>
+<context>
+    <name>pv::widgets::ViewStatus</name>
+    <message>
+        <source>Trigger Time: </source>
+        <translation type="vanished">触发时间:</translation>
+    </message>
+    <message>
+        <source>Triggered! </source>
+        <translation type="vanished">已触发！</translation>
+    </message>
+    <message>
+        <source>% Captured</source>
+        <translation type="vanished">% 已采集</translation>
+    </message>
+    <message>
+        <source>Waiting for Trigger! </source>
+        <translation type="vanished">等待触发！</translation>
+    </message>
+    <message>
+        <source>RLE FULL: </source>
+        <translation type="vanished">RLE缓存已满: </translation>
+    </message>
+    <message>
+        <source> Samples Captured!</source>
+        <translation type="vanished">个数据被采集!</translation>
+    </message>
+</context>
+</TS>
diff --git a/qtpro/qt_25.qm b/qtpro/qt_25.qm
new file mode 100644
index 0000000000000000000000000000000000000000..3e5c146b14e0e5bd643a55a9f4fa625c547ad2b0
GIT binary patch
literal 118333
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
E2ZWfXlmGw#

literal 0
HcmV?d00001


From 264f57fe95394b5e8531d54d8612633c553a075c Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Tue, 16 Nov 2021 15:49:26 +0800
Subject: [PATCH 27/58] config.h

---
 DSView/config.h                 | 36 +++++++++++++++++++++++++++++++++
 DSView/pv/appcontrol.cpp        |  3 ++-
 DSView/pv/data/decoderstack.cpp |  4 +++-
 DSView/pv/sigsession.cpp        |  2 +-
 qtpro/DSView.pro.user           | 19 ++++++++++++++++-
 5 files changed, 60 insertions(+), 4 deletions(-)
 create mode 100755 DSView/config.h

diff --git a/DSView/config.h b/DSView/config.h
new file mode 100755
index 00000000..25d9638f
--- /dev/null
+++ b/DSView/config.h
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the PulseView project.
+ *
+ * Copyright (C) 2012 Alexandru Gagniuc <mr.nuke.me@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _DSVIEW_CONFIG_H
+#define _DSVIEW_CONFIG_H
+
+/* Application details */
+#define DS_TITLE "DSView"
+#define DS_DESCRIPTION "A GUI for instruments of DreamSourceLab"
+#define DS_BIN_NAME "DSView"
+
+/* DSView version information */
+#define DS_VERSION_MAJOR 1
+#define DS_VERSION_MINOR 5
+#define DS_VERSION_MICRO 0
+#define DS_VERSION_STRING "1.5.0"
+
+#define DS_DEBUG_TRACE
+
+#endif
diff --git a/DSView/pv/appcontrol.cpp b/DSView/pv/appcontrol.cpp
index eae70d5d..39461b2c 100644
--- a/DSView/pv/appcontrol.cpp
+++ b/DSView/pv/appcontrol.cpp
@@ -71,7 +71,8 @@ bool AppControl::Init()
         return false;
     }
 
-    const char *decoderScriptDir = "/home/lala/tmpdir/any";
+   // const char *decoderScriptDir = "/home/lala/tmpdir/any";
+    const char * decoderScriptDir = NULL;
 
     // Initialise libsigrokdecode
     if (srd_init(decoderScriptDir) != SRD_OK)
diff --git a/DSView/pv/data/decoderstack.cpp b/DSView/pv/data/decoderstack.cpp
index b8c15a24..9a32a7ab 100755
--- a/DSView/pv/data/decoderstack.cpp
+++ b/DSView/pv/data/decoderstack.cpp
@@ -480,7 +480,7 @@ void DecoderStack::decode_data(const uint64_t decode_start, const uint64_t decod
 
     uint64_t entry_cnt = 0;
     uint64_t i = decode_start;
-    char *error = NULL;
+    char *error = NULL; 
 
     if( i >= decode_end){
         qDebug()<<"decode data index have been end:"<<i;
@@ -542,6 +542,8 @@ void DecoderStack::decode_data(const uint64_t decode_start, const uint64_t decod
         entry_cnt++;
     } 
 
+    qDebug()<<"send to decoder times:"<<entry_cnt;
+
     if (error)
         g_free(error);
   
diff --git a/DSView/pv/sigsession.cpp b/DSView/pv/sigsession.cpp
index 4e9e144c..2816eddb 100755
--- a/DSView/pv/sigsession.cpp
+++ b/DSView/pv/sigsession.cpp
@@ -1813,7 +1813,7 @@ void SigSession::set_stop_scale(float scale)
      }
 
      //the task maybe is running 
-     qDebug()<<"remove a running decode task";
+  //   qDebug()<<"remove a running decode task";
      trace->decoder()->stop_decode_work();
  }
 
diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user
index cb6bad0c..562886c3 100644
--- a/qtpro/DSView.pro.user
+++ b/qtpro/DSView.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2021-11-12T18:52:28. -->
+<!-- Written by QtCreator 4.11.0, 2021-11-15T18:43:34. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -55,8 +55,25 @@
  <data>
   <variable>ProjectExplorer.Project.PluginSettings</variable>
   <valuemap type="QVariantMap">
+   <valuemap type="QVariantMap" key="AutoTest.ActiveFrameworks">
+    <value type="bool" key="AutoTest.Framework.Boost">true</value>
+    <value type="bool" key="AutoTest.Framework.GTest">true</value>
+    <value type="bool" key="AutoTest.Framework.QtQuickTest">true</value>
+    <value type="bool" key="AutoTest.Framework.QtTest">true</value>
+   </valuemap>
+   <value type="int" key="AutoTest.RunAfterBuild">0</value>
+   <value type="bool" key="AutoTest.UseGlobal">true</value>
    <valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey"/>
    <value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
+   <valuemap type="QVariantMap" key="ClangTools">
+    <value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
+    <value type="QString" key="ClangTools.DiagnosticConfig">Builtin.TidyAndClazy</value>
+    <value type="int" key="ClangTools.ParallelJobs">4</value>
+    <valuelist type="QVariantList" key="ClangTools.SelectedDirs"/>
+    <valuelist type="QVariantList" key="ClangTools.SelectedFiles"/>
+    <valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
+    <value type="bool" key="ClangTools.UseGlobalSettings">true</value>
+   </valuemap>
   </valuemap>
  </data>
  <data>

From 8aa8fdf0eb0f56482ddfbd6245790f152775b9aa Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Tue, 16 Nov 2021 18:24:12 +0800
Subject: [PATCH 28/58] update capture screen method

---
 DSView/pv/mainwindow.cpp | 42 ++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index a8f3dc45..e1fa249c 100755
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -30,10 +30,8 @@
 #include <QMenuBar>
 #include <QStatusBar>
 #include <QVBoxLayout>
-#include <QWidget>
-#include <QDockWidget>
-#include <QDebug>
-#include <QDesktopWidget>
+#include <QWidget> 
+#include <QDebug> 
 #include <QDesktopServices>
 #include <QKeyEvent>
 #include <QEvent>
@@ -868,20 +866,29 @@ void MainWindow::on_screenShot()
 {
     AppConfig &app = AppConfig::Instance();     
     QString default_name = app._userHistory.screenShotPath + "/DSView" + QDateTime::currentDateTime().toString("-yyMMdd-hhmmss");
-    QPixmap pixmap;
-    QScreen *screen = QGuiApplication::primaryScreen();
-    QDesktopWidget *desktop = QApplication::desktop();
-    pixmap = screen->grabWindow(desktop->winId(), parentWidget()->pos().x(), parentWidget()->pos().y(),
-                                                 parentWidget()->frameGeometry().width(), parentWidget()->frameGeometry().height());
+    QPixmap pixmap = QPixmap::grabWindow(winId()); 
     QString format = "png";
 
-    QString fileName = QFileDialog::getSaveFileName(this,
-                       tr("Save As"), default_name,
-                       tr("%1 Files (*.%2);;All Files (*)")
-                       .arg(format.toUpper()).arg(format));
+    QString fileName = QFileDialog::getSaveFileName(
+                       this,
+                       tr("Save As"), 
+                       default_name,
+                      // tr("%1 Files (*.%2);;All Files (*)")
+                      "png file(*.png);;jpeg file(*.jpeg)",
+                       &format);
 
-    if (!fileName.isEmpty()) { 
-        pixmap.save(fileName, format.toLatin1());
+    if (!fileName.isEmpty()) {
+
+        QStringList list = format.split('.').last().split(')');
+        QString suffix = list.first();
+
+        QFileInfo f(fileName);
+        if (f.suffix().compare(suffix))
+        {
+            fileName += tr(".") + suffix;
+        }
+
+        pixmap.save(fileName, suffix.toLatin1());
  
         fileName = GetDirectoryName(fileName);
 
@@ -895,10 +902,7 @@ void MainWindow::on_screenShot()
 //save file
 void MainWindow::on_save()
 {
-    using pv::dialogs::StoreProgress;
-
-//    dialogs::RegionOptions *regionDlg = new dialogs::RegionOptions(_view, _session, this);
-//    regionDlg->exec();
+    using pv::dialogs::StoreProgress; 
 
     SigSession *_session = _control->GetSession();
 

From b0bb9b5da3fc7fe5e304d9930c6356c173cceb75 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Wed, 17 Nov 2021 09:54:52 +0800
Subject: [PATCH 29/58] none

---
 libsigrokdecode4DSL/version.h | 71 +++++++++++++++++++++++++++++++++++
 qtpro/DSView.pro.user         |  2 +-
 2 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 libsigrokdecode4DSL/version.h

diff --git a/libsigrokdecode4DSL/version.h b/libsigrokdecode4DSL/version.h
new file mode 100644
index 00000000..d131411e
--- /dev/null
+++ b/libsigrokdecode4DSL/version.h
@@ -0,0 +1,71 @@
+/* version.h.  Generated from version.h.in by configure.  */
+/*
+ * This file is part of the libsigrokdecode project.
+ *
+ * Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
+ * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBSIGROKDECODE_VERSION_H
+#define LIBSIGROKDECODE_VERSION_H
+
+/**
+ * @file
+ *
+ * Version number definitions and macros.
+ */
+
+/**
+ * @ingroup grp_versions
+ *
+ * @{
+ */
+
+/*
+ * Package version macros (can be used for conditional compilation).
+ */
+
+/** The libsigrokdecode package 'major' version number. */
+#define SRD_PACKAGE_VERSION_MAJOR 0
+
+/** The libsigrokdecode package 'minor' version number. */
+#define SRD_PACKAGE_VERSION_MINOR 6
+
+/** The libsigrokdecode package 'micro' version number. */
+#define SRD_PACKAGE_VERSION_MICRO 0
+
+/** The libsigrokdecode package version ("major.minor.micro") as string. */
+#define SRD_PACKAGE_VERSION_STRING "0.6.0-git-c708a00"
+
+/*
+ * Library/libtool version macros (can be used for conditional compilation).
+ */
+
+/** The libsigrokdecode libtool 'current' version number. */
+#define SRD_LIB_VERSION_CURRENT 4
+
+/** The libsigrokdecode libtool 'revision' version number. */
+#define SRD_LIB_VERSION_REVISION 0
+
+/** The libsigrokdecode libtool 'age' version number. */
+#define SRD_LIB_VERSION_AGE 0
+
+/** The libsigrokdecode libtool version ("current:revision:age") as string. */
+#define SRD_LIB_VERSION_STRING "4:0:0"
+
+/** @} */
+
+#endif
diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user
index 562886c3..cf656ba4 100644
--- a/qtpro/DSView.pro.user
+++ b/qtpro/DSView.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2021-11-15T18:43:34. -->
+<!-- Written by QtCreator 4.11.0, 2021-11-16T18:44:24. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

From 6995e5d55ee06d4a21c09487bcd8bc587ce3dd7c Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Wed, 17 Nov 2021 10:02:59 +0800
Subject: [PATCH 30/58] none

---
 libsigrok4DSL/version.h | 69 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 libsigrok4DSL/version.h

diff --git a/libsigrok4DSL/version.h b/libsigrok4DSL/version.h
new file mode 100644
index 00000000..8597d4f8
--- /dev/null
+++ b/libsigrok4DSL/version.h
@@ -0,0 +1,69 @@
+/*
+ * This file is part of the libsigrok project.
+ *
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBSIGROK_VERSION_H
+#define LIBSIGROK_VERSION_H
+
+/**
+ * @file
+ *
+ * Version number definitions and macros.
+ */
+
+/**
+ * @ingroup grp_versions
+ *
+ * @{
+ */
+
+/*
+ * Package version macros (can be used for conditional compilation).
+ */
+
+/** The libsigrok package 'major' version number. */
+#define SR_PACKAGE_VERSION_MAJOR 0
+
+/** The libsigrok package 'minor' version number. */
+#define SR_PACKAGE_VERSION_MINOR 2
+
+/** The libsigrok package 'micro' version number. */
+#define SR_PACKAGE_VERSION_MICRO 0
+
+/** The libsigrok package version ("major.minor.micro") as string. */
+#define SR_PACKAGE_VERSION_STRING "0.2.0"
+
+/*
+ * Library/libtool version macros (can be used for conditional compilation).
+ */
+
+/** The libsigrok libtool 'current' version number. */
+#define SR_LIB_VERSION_CURRENT 1
+
+/** The libsigrok libtool 'revision' version number. */
+#define SR_LIB_VERSION_REVISION 2
+
+/** The libsigrok libtool 'age' version number. */
+#define SR_LIB_VERSION_AGE 0
+
+/** The libsigrok libtool version ("current:revision:age") as string. */
+#define SR_LIB_VERSION_STRING "1:2:0"
+
+/** @} */
+
+#endif

From c7a6ce2ef56eba4028f9ca7da84995f2b45afa5a Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Fri, 19 Nov 2021 14:24:26 +0800
Subject: [PATCH 31/58] switch qt class to 6.0 version

---
 DSView/pv/config/appconfig.cpp           |  10 +-
 DSView/pv/config/appconfig.h             |   7 +-
 DSView/pv/data/dsosnapshot.cpp           |   2 +-
 DSView/pv/dialogs/about.cpp              |  12 +-
 DSView/pv/dialogs/deviceoptions.cpp      |   6 +-
 DSView/pv/dialogs/dsdialog.cpp           |  31 ++---
 DSView/pv/dialogs/dsmessagebox.cpp       |   7 +-
 DSView/pv/dialogs/dsomeasure.cpp         |   1 -
 DSView/pv/dialogs/lissajousoptions.cpp   |   1 -
 DSView/pv/dialogs/mathoptions.cpp        |   3 +-
 DSView/pv/dialogs/protocolexp.cpp        |   3 +-
 DSView/pv/dialogs/regionoptions.cpp      |   2 +-
 DSView/pv/dialogs/search.cpp             |   6 +-
 DSView/pv/dialogs/shadow.cpp             |   2 +-
 DSView/pv/dialogs/shadow.h               |   8 +-
 DSView/pv/dock/measuredock.cpp           |   3 +-
 DSView/pv/dock/protocoldock.cpp          |   4 +-
 DSView/pv/dock/searchdock.cpp            |   3 +-
 DSView/pv/dock/triggerdock.cpp           |   6 +-
 DSView/pv/dsvdef.cpp                     |  17 +++
 DSView/pv/dsvdef.h                       |   5 +
 DSView/pv/mainframe.cpp                  | 154 +++++++++++++----------
 DSView/pv/mainframe.h                    |   8 +-
 DSView/pv/mainwindow.cpp                 |   6 +-
 DSView/pv/prop/binding/deviceoptions.cpp |   5 +-
 DSView/pv/prop/binding/probeoptions.cpp  |   4 +-
 DSView/pv/prop/double.cpp                |   4 +-
 DSView/pv/prop/int.cpp                   |   2 +-
 DSView/pv/storesession.cpp               |  50 ++++----
 DSView/pv/storesession.h                 |   1 +
 DSView/pv/toolbars/samplingbar.cpp       |   1 -
 DSView/pv/toolbars/titlebar.cpp          |  31 +++--
 DSView/pv/toolbars/titlebar.h            |   9 +-
 DSView/pv/ui/msgbox.cpp                  |  12 +-
 DSView/pv/view/decodetrace.cpp           |   1 +
 DSView/pv/view/devmode.cpp               |   4 +-
 DSView/pv/view/header.cpp                |  96 ++++++++++----
 DSView/pv/view/ruler.cpp                 |   6 +-
 DSView/pv/view/viewport.cpp              |  88 +++++++++----
 qtpro/DSView.pro                         |   2 +
 qtpro/DSView.pro.user                    |   2 +-
 41 files changed, 385 insertions(+), 240 deletions(-)

diff --git a/DSView/pv/config/appconfig.cpp b/DSView/pv/config/appconfig.cpp
index b921a631..42bc78d3 100644
--- a/DSView/pv/config/appconfig.cpp
+++ b/DSView/pv/config/appconfig.cpp
@@ -119,7 +119,10 @@ void _loadFrame(FrameOptions &o, QSettings &st){
     getFiled("style", st, o.style, "dark");
     getFiled("language", st, o.language, -1);
     getFiled("isMax", st, o.isMax, false);  
-    o.geometry = st.value("geometry", QByteArray()).toByteArray();
+    getFiled("left", st, o.left, 0);
+    getFiled("top", st, o.top, 0);
+    getFiled("right", st, o.right, 0);
+    getFiled("bottom", st, o.bottom, 0);
     o.windowState = st.value("windowState", QByteArray()).toByteArray();
     st.endGroup();
 
@@ -135,7 +138,10 @@ void _saveFrame(FrameOptions &o, QSettings &st){
     setFiled("style", st, o.style);
     setFiled("language", st, o.language);
     setFiled("isMax", st, o.isMax);  
-    st.setValue("geometry", o.geometry); 
+    setFiled("left", st, o.left);
+    setFiled("top", st, o.top);
+    setFiled("right", st, o.right);
+    setFiled("bottom", st, o.bottom); 
     st.setValue("windowState", o.windowState); 
     st.endGroup();
 }
diff --git a/DSView/pv/config/appconfig.h b/DSView/pv/config/appconfig.h
index 7cddff2a..f01678ad 100644
--- a/DSView/pv/config/appconfig.h
+++ b/DSView/pv/config/appconfig.h
@@ -57,8 +57,11 @@ struct AppOptions
 struct FrameOptions
 { 
   QString     style;
-  int         language;
-  QByteArray  geometry;
+  int         language; 
+  int         left; //frame region
+  int         top;
+  int         right;
+  int         bottom;
   bool        isMax;
   QByteArray  windowState;
 };
diff --git a/DSView/pv/data/dsosnapshot.cpp b/DSView/pv/data/dsosnapshot.cpp
index a3649f8f..bf389c11 100755
--- a/DSView/pv/data/dsosnapshot.cpp
+++ b/DSView/pv/data/dsosnapshot.cpp
@@ -378,7 +378,7 @@ double DsoSnapshot::cal_vrms(double zero_off, int index)
         vrms = vrms_pre + vrms / get_sample_count();
         vrms_pre = vrms;
     }
-    vrms = std::pow(vrms, 0.5);
+    vrms = pow(vrms, 0.5);
 
     return vrms;
 }
diff --git a/DSView/pv/dialogs/about.cpp b/DSView/pv/dialogs/about.cpp
index a0a40099..3392d2a0 100755
--- a/DSView/pv/dialogs/about.cpp
+++ b/DSView/pv/dialogs/about.cpp
@@ -21,6 +21,8 @@
  */
 
 
+#include "about.h"
+
 #include <QPixmap>
 #include <QApplication>
 #include <QTextBrowser>
@@ -28,10 +30,9 @@
 #include <QDir>
 #include <QTextStream>
 #include <QScrollBar>
-#include <QTextCodec>
-
-#include "about.h"
+  
 #include "../config/appconfig.h"
+#include "../dsvdef.h"
 
 namespace pv {
 namespace dialogs {
@@ -88,9 +89,10 @@ About::About(QWidget *parent) :
     QString filename = dir.absolutePath() + "/NEWS" + QString::number(lan);
     QFile news(filename);
     if (news.open(QIODevice::ReadOnly)) {
-        QTextCodec *code=QTextCodec::codecForName("UTF-8");
+   
         QTextStream stream(&news);
-        stream.setCodec(code);
+        app::set_utf8(stream);
+
         QString line;
         while (!stream.atEnd()){
             line = stream.readLine();
diff --git a/DSView/pv/dialogs/deviceoptions.cpp b/DSView/pv/dialogs/deviceoptions.cpp
index 96436f78..ee506833 100755
--- a/DSView/pv/dialogs/deviceoptions.cpp
+++ b/DSView/pv/dialogs/deviceoptions.cpp
@@ -55,7 +55,7 @@ DeviceOptions::DeviceOptions(QWidget *parent, DevInst *dev_inst) :
                                           this);
     _dynamic_box->setLayout(&_dynamic_layout);
     _layout.addWidget(_dynamic_box);
-    _dynamic_box->setVisible(_dynamic_box->title() != NULL);
+    _dynamic_box->setVisible(_dynamic_box->title() != "");
 
     _layout.addStretch(1);
 	_layout.addWidget(&_button_box);
@@ -346,7 +346,7 @@ void DeviceOptions::mode_check()
 
         if (mode != _mode) {
             dynamic_widget(_dynamic_layout);
-            _dynamic_box->setVisible(_dynamic_box->title() != NULL);
+            _dynamic_box->setVisible(_dynamic_box->title() != "");
             _mode = mode;
         }
     }
@@ -375,7 +375,7 @@ void DeviceOptions::channel_check()
     if(sc != NULL)
         _dev_inst->set_config(NULL, NULL, SR_CONF_CHANNEL_MODE, g_variant_new_string(text.toUtf8().data()));
     dynamic_widget(_dynamic_layout);
-    _dynamic_box->setVisible(_dynamic_box->title() != NULL);
+    _dynamic_box->setVisible(_dynamic_box->title() != "");
 }
 
 void DeviceOptions::analog_channel_check()
diff --git a/DSView/pv/dialogs/dsdialog.cpp b/DSView/pv/dialogs/dsdialog.cpp
index 1d8f15ff..37a0e7cd 100755
--- a/DSView/pv/dialogs/dsdialog.cpp
+++ b/DSView/pv/dialogs/dsdialog.cpp
@@ -78,9 +78,7 @@ DSDialog::~DSDialog()
 }
 
 void DSDialog::accept()
-{
-    using namespace Qt;
-
+{  
     _clickYes = true;
     if (m_callback){
         m_callback->OnDlgResult(true);
@@ -91,8 +89,7 @@ void DSDialog::accept()
 }
 
 void DSDialog::reject()
-{
-    using namespace Qt;
+{ 
     _clickYes = false;
 
     if (m_callback){
@@ -133,24 +130,28 @@ void DSDialog::build_base(bool hasClose)
 {    
     _main_widget = new QWidget(this);
     _main_layout = new QVBoxLayout(_main_widget);
-    _titlebar = new toolbars::TitleBar(false, this, hasClose);
-    _base_layout = new QVBoxLayout(this); 
-  
     _main_widget->setLayout(_main_layout);
-    _main_widget->setAutoFillBackground(true);
 
-    _shadow  = new Shadow(_main_widget);
+    _shadow  = new Shadow(this);
     _shadow->setBlurRadius(10.0);
     _shadow->setDistance(3.0);
     _shadow->setColor(QColor(0, 0, 0, 80));
-    _main_widget->setGraphicsEffect(_shadow);
-  
-    _main_layout->addWidget(_titlebar);  
+    _main_widget->setAutoFillBackground(true); 
+    this->setGraphicsEffect(_shadow);
+
+    _titlebar = new toolbars::TitleBar(false, this, hasClose);
+     _main_layout->addWidget(_titlebar);
+
+     QWidget *space = new QWidget(this);
+     space->setFixedHeight(15);
+    _main_layout->addWidget(space);
+
+    _base_layout = new QVBoxLayout(this);   
     _base_layout->addWidget(_main_widget);
-    setLayout(_base_layout);  
+    setLayout(_base_layout); 
 
     _main_layout->setAlignment(Qt::AlignCenter | Qt::AlignTop);
-  
+    _main_layout->setContentsMargins(10,5,10,10);   
 } 
 
 } // namespace dialogs
diff --git a/DSView/pv/dialogs/dsmessagebox.cpp b/DSView/pv/dialogs/dsmessagebox.cpp
index 2df07b6e..1d6fb9ef 100755
--- a/DSView/pv/dialogs/dsmessagebox.cpp
+++ b/DSView/pv/dialogs/dsmessagebox.cpp
@@ -53,7 +53,7 @@ DSMessageBox::DSMessageBox(QWidget *parent,const char *title) :
     _main_layout = new QVBoxLayout(_main_widget);
     _main_widget->setLayout(_main_layout);  
 
-    _shadow = new Shadow();
+    _shadow = new Shadow(this);
     _msg = new QMessageBox(this);
     _titlebar = new toolbars::TitleBar(false, this);
     _layout = new QVBoxLayout(this);
@@ -63,7 +63,8 @@ DSMessageBox::DSMessageBox(QWidget *parent,const char *title) :
     _shadow->setColor(QColor(0, 0, 0, 80));
 
     _main_widget->setAutoFillBackground(true);
-    _main_widget->setGraphicsEffect(_shadow);  
+    this->setGraphicsEffect(_shadow);  
+
     _msg->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);   
 
     if (title){ 
@@ -77,7 +78,7 @@ DSMessageBox::DSMessageBox(QWidget *parent,const char *title) :
     _main_layout->addWidget(_msg);   
     _layout->addWidget(_main_widget);
 
-    setLayout(_layout);
+    setLayout(_layout); 
 
     connect(_msg, SIGNAL(buttonClicked(QAbstractButton*)), this, SLOT(on_button(QAbstractButton*)));
 }
diff --git a/DSView/pv/dialogs/dsomeasure.cpp b/DSView/pv/dialogs/dsomeasure.cpp
index a25e7307..7e9825ef 100755
--- a/DSView/pv/dialogs/dsomeasure.cpp
+++ b/DSView/pv/dialogs/dsomeasure.cpp
@@ -90,7 +90,6 @@ void DsoMeasure::add_measure(QWidget *widget, const view::DsoSignal *dsoSig)
     const int Column = 5;
     const int IconSizeForText = 5;
     QGridLayout *layout = new QGridLayout(widget);
-    layout->setMargin(0);
     layout->setSpacing(0);
 
     pv::view::DsoSignal *psig = const_cast<pv::view::DsoSignal*>(dsoSig);
diff --git a/DSView/pv/dialogs/lissajousoptions.cpp b/DSView/pv/dialogs/lissajousoptions.cpp
index 8f8456be..2ae27886 100755
--- a/DSView/pv/dialogs/lissajousoptions.cpp
+++ b/DSView/pv/dialogs/lissajousoptions.cpp
@@ -125,7 +125,6 @@ LissajousOptions::LissajousOptions(SigSession *session, QWidget *parent) :
     }
 
     _layout = new QGridLayout();
-    _layout->setMargin(0);
     _layout->setSpacing(0);
     _layout->addWidget(lisa_label, 0, 0, 1, 2, Qt::AlignCenter);
     _layout->addWidget(_enable, 1, 0, 1, 1);
diff --git a/DSView/pv/dialogs/mathoptions.cpp b/DSView/pv/dialogs/mathoptions.cpp
index 21e2d6ab..afc2e9f9 100755
--- a/DSView/pv/dialogs/mathoptions.cpp
+++ b/DSView/pv/dialogs/mathoptions.cpp
@@ -139,8 +139,7 @@ MathOptions::MathOptions(SigSession *session, QWidget *parent) :
         }
     }
 
-    _layout = new QGridLayout();
-    _layout->setMargin(0);
+    _layout = new QGridLayout(); 
     _layout->setSpacing(0);
     _layout->addWidget(lisa_label, 0, 0, 1, 2, Qt::AlignCenter);
     _layout->addWidget(_enable, 1, 0, 1, 1);
diff --git a/DSView/pv/dialogs/protocolexp.cpp b/DSView/pv/dialogs/protocolexp.cpp
index b9445c60..7a9e6104 100755
--- a/DSView/pv/dialogs/protocolexp.cpp
+++ b/DSView/pv/dialogs/protocolexp.cpp
@@ -37,6 +37,7 @@
 #include "../view/decodetrace.h"
 #include "../data/decodermodel.h"
 #include "../config/appconfig.h"
+#include "../dsvdef.h"
 
 using namespace boost;
 using namespace std;
@@ -148,7 +149,7 @@ void ProtocolExp::accept()
             QFile file(file_name);
             file.open(QIODevice::WriteOnly | QIODevice::Text);
             QTextStream out(&file);
-            out.setCodec("UTF-8");
+            app::set_utf8(out);
             //out.setGenerateByteOrderMark(true); // UTF-8 without BOM
 
             QFuture<void> future;
diff --git a/DSView/pv/dialogs/regionoptions.cpp b/DSView/pv/dialogs/regionoptions.cpp
index 62ff127a..ce71775d 100755
--- a/DSView/pv/dialogs/regionoptions.cpp
+++ b/DSView/pv/dialogs/regionoptions.cpp
@@ -43,7 +43,7 @@ RegionOptions::RegionOptions(view::View *view, SigSession *session, QWidget *par
         Qt::Horizontal, this)
 {
     QHBoxLayout *hlayout = new QHBoxLayout();
-    hlayout->setMargin(0);
+    hlayout->setContentsMargins(0,0,0,0);
     hlayout->setSpacing(0);
     _start_comboBox = new QComboBox(this);
     _end_comboBox = new QComboBox(this);
diff --git a/DSView/pv/dialogs/search.cpp b/DSView/pv/dialogs/search.cpp
index 7f562068..406f1be8 100755
--- a/DSView/pv/dialogs/search.cpp
+++ b/DSView/pv/dialogs/search.cpp
@@ -23,7 +23,7 @@
 #include "../view/logicsignal.h"
 
 #include <assert.h>
-#include <QRegExpValidator>
+#include <QRegularExpressionValidator>
  
 
 namespace pv {
@@ -39,8 +39,8 @@ Search::Search(QWidget *parent, SigSession *session, std::map<uint16_t, QString>
     font.setFixedPitch(true);
     //this->setMinimumWidth(350);
 
-    QRegExp value_rx("[10XRFCxrfc]+");
-    QValidator *value_validator = new QRegExpValidator(value_rx, this);
+    QRegularExpression value_rx("[10XRFCxrfc]+");
+    QValidator *value_validator = new QRegularExpressionValidator(value_rx, this);
 
     search_buttonBox.addButton(QDialogButtonBox::Ok);
     search_buttonBox.addButton(QDialogButtonBox::Cancel);
diff --git a/DSView/pv/dialogs/shadow.cpp b/DSView/pv/dialogs/shadow.cpp
index c6fd3426..0fc91ee4 100755
--- a/DSView/pv/dialogs/shadow.cpp
+++ b/DSView/pv/dialogs/shadow.cpp
@@ -94,7 +94,7 @@ void Shadow::draw(QPainter* painter)
     painter->setWorldTransform(restoreTransform);
 }
 
-QRectF Shadow::boundingRectFor(const QRectF& rect)
+QRectF Shadow::boundingRectFor(const QRectF& rect) const
 {
     qreal delta = blurRadius() + distance();
     return rect.united(rect.adjusted(-delta, -delta, delta, delta));
diff --git a/DSView/pv/dialogs/shadow.h b/DSView/pv/dialogs/shadow.h
index 952aad24..e37bbbad 100755
--- a/DSView/pv/dialogs/shadow.h
+++ b/DSView/pv/dialogs/shadow.h
@@ -36,16 +36,16 @@ public:
     explicit Shadow(QObject *parent = 0);
 
     void draw(QPainter* painter);
-    QRectF boundingRectFor(const QRectF& rect);
+    QRectF boundingRectFor(const QRectF& rect) const;
 
     inline void setDistance(qreal distance) { _distance = distance; updateBoundingRect(); }
-    inline qreal distance() { return _distance; }
+    inline qreal distance() const { return _distance; }
 
     inline void setBlurRadius(qreal blurRadius) { _blurRadius = blurRadius; updateBoundingRect(); }
-    inline qreal blurRadius() { return _blurRadius; }
+    inline qreal blurRadius() const { return _blurRadius; }
 
     inline void setColor(const QColor& color) { _color = color; }
-    inline QColor color() { return _color; }
+    inline QColor color() const { return _color; }
 
 private:
     qreal  _distance;
diff --git a/DSView/pv/dock/measuredock.cpp b/DSView/pv/dock/measuredock.cpp
index f3b3f62a..68b983bd 100755
--- a/DSView/pv/dock/measuredock.cpp
+++ b/DSView/pv/dock/measuredock.cpp
@@ -38,8 +38,7 @@
 #include "../dialogs/dsmessagebox.h"
 
 #include <QObject>
-#include <QPainter>
-#include <QRegExpValidator>
+#include <QPainter> 
 #include <QMessageBox>
 #include "../config/appconfig.h"
 
diff --git a/DSView/pv/dock/protocoldock.cpp b/DSView/pv/dock/protocoldock.cpp
index a9affcdc..ba3f0282 100755
--- a/DSView/pv/dock/protocoldock.cpp
+++ b/DSView/pv/dock/protocoldock.cpp
@@ -38,7 +38,7 @@
 #include <QHeaderView>
 #include <QScrollBar>
 #include <QLineEdit>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QFuture>
 #include <QProgressDialog>
 #include <QtConcurrent/QtConcurrent>
@@ -696,7 +696,7 @@ void ProtocolDock::search_nxt()
 void ProtocolDock::search_done()
 {
     QString str = _search_edit->text().trimmed();
-    QRegExp rx("(-)");
+    QRegularExpression rx("(-)");
     _str_list = str.split(rx);
     _model_proxy.setFilterFixedString(_str_list.first());
     if (_str_list.size() > 1)
diff --git a/DSView/pv/dock/searchdock.cpp b/DSView/pv/dock/searchdock.cpp
index 33c56f66..bc3de15f 100755
--- a/DSView/pv/dock/searchdock.cpp
+++ b/DSView/pv/dock/searchdock.cpp
@@ -32,8 +32,7 @@
 #include "../dialogs/dsmessagebox.h"
 
 #include <QObject>
-#include <QPainter>
-#include <QRegExpValidator>
+#include <QPainter> 
 #include <QRect>
 #include <QMouseEvent>
 #include <QFuture>
diff --git a/DSView/pv/dock/triggerdock.cpp b/DSView/pv/dock/triggerdock.cpp
index 87fa9e94..d90da9fd 100755
--- a/DSView/pv/dock/triggerdock.cpp
+++ b/DSView/pv/dock/triggerdock.cpp
@@ -29,7 +29,7 @@
 #include <QGridLayout>
 #include <QVBoxLayout>
 #include <QPainter>
-#include <QRegExpValidator>
+#include <QRegularExpressionValidator>
 #include <QSplitter>
 #include <QInputMethodEvent>
 #include <QApplication>
@@ -566,8 +566,8 @@ void TriggerDock::setup_adv_tab()
     _stage_tabWidget->setUsesScrollButtons(false);
 
     const QString mask = "N N N N N N N N N N N N N N N N";
-    QRegExp value_rx("[10XRFCxrfc ]+");
-    QValidator *value_validator = new QRegExpValidator(value_rx, _stage_tabWidget);
+    QRegularExpression value_rx("[10XRFCxrfc ]+");
+    QValidator *value_validator = new QRegularExpressionValidator(value_rx, _stage_tabWidget);
     for (int i = 0; i < TriggerStages; i++) {
         QComboBox *_logic_comboBox = new QComboBox(_stage_tabWidget);
         _logic_comboBox->addItem(tr("Or"));
diff --git a/DSView/pv/dsvdef.cpp b/DSView/pv/dsvdef.cpp
index 49d0e5df..0ad7c4ef 100644
--- a/DSView/pv/dsvdef.cpp
+++ b/DSView/pv/dsvdef.cpp
@@ -30,6 +30,14 @@
     }     
 #endif
 
+#include <QTextStream>
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <QStringConverter>
+#else
+#include <QTextCodec>
+#endif 
+
 namespace DecoderDataFormat
 {
       int Parse(const char *name){
@@ -71,4 +79,13 @@ namespace app
          }
          return false;
       }
+
+    void set_utf8(QTextStream &stream){
+        #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+        stream.setEncoding(QStringConverter::Utf8);      
+        #else
+        QTextCodec *code=QTextCodec::codecForName("UTF-8");
+        stream.setCodec(code);
+        #endif
+    }
 }
diff --git a/DSView/pv/dsvdef.h b/DSView/pv/dsvdef.h
index 9069c153..9a5ef516 100644
--- a/DSView/pv/dsvdef.h
+++ b/DSView/pv/dsvdef.h
@@ -34,6 +34,7 @@
 #endif
 
 class QWidget;
+class QTextStream;
 
 #define DESTROY_OBJECT(p) if((p)){delete (p); p = NULL;} 
 #define DESTROY_QT_OBJECT(p) if((p)){((p))->deleteLater(); p = NULL;}
@@ -41,6 +42,8 @@ class QWidget;
 
 #define RELEASE_ARRAY(a)   for (auto ptr : (a)){delete ptr;} (a).clear();
 
+#define ABS_VAL(x) (x>0?x:-x)
+
 namespace DecoderDataFormat
 {
     enum _data_format
@@ -60,5 +63,7 @@ namespace app
     QWidget* get_app_window_instance(QWidget *ins, bool bSet);
 
     bool is_app_top_window(QWidget* w);
+
+    void set_utf8(QTextStream &stream);
 }
 
diff --git a/DSView/pv/mainframe.cpp b/DSView/pv/mainframe.cpp
index fca633f7..173c1427 100755
--- a/DSView/pv/mainframe.cpp
+++ b/DSView/pv/mainframe.cpp
@@ -42,6 +42,7 @@
 #include <QMessageBox> 
 #include <QScreen>
 #include <QApplication>
+#include <QDebug>
 
 #include "dsvdef.h"
 #include "config/appconfig.h"
@@ -53,6 +54,13 @@ namespace pv {
 
 MainFrame::MainFrame()
 {
+    _layout = NULL;
+    _bDraging = false;
+    _hit_border = None;
+    _freezing = false; 
+    _titleBar = NULL;
+    _mainWindow = NULL;
+
     setAttribute(Qt::WA_TranslucentBackground);
     // Make this a borderless window which can't
     // be resized or moved via the window system
@@ -61,23 +69,17 @@ MainFrame::MainFrame()
     #else
     setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);
     #endif
+
     setMinimumHeight(minHeight);
     setMinimumWidth(minWidth);
-    //resize(1024, 768);
-
+  
     // Set the window icon
     QIcon icon;
-    icon.addFile(QString::fromUtf8(":/icons/logo.svg"),
-        QSize(), QIcon::Normal, QIcon::Off);
+    icon.addFile(QString::fromUtf8(":/icons/logo.svg"), QSize(), QIcon::Normal, QIcon::Off);
     setWindowIcon(icon);
 
     app::get_app_window_instance(this, true);
- 
-    _bDraging = false;
-    _hit_border = None;
-    _freezing = false;
-    _minimized = false;
-
+  
     // Title
     _titleBar = new toolbars::TitleBar(true, this);
      
@@ -87,7 +89,7 @@ MainFrame::MainFrame()
     _titleBar->setTitle(_mainWindow->windowTitle());
 
     QVBoxLayout *vbox = new QVBoxLayout();
-    vbox->setMargin(0);
+    vbox->setContentsMargins(0,0,0,0);
     vbox->setSpacing(0);
     vbox->addWidget(_titleBar);
     vbox->addWidget(_mainWindow);
@@ -120,8 +122,8 @@ MainFrame::MainFrame()
     _bottom_right->installEventFilter(this);
 
     _layout = new QGridLayout(this);
-    _layout->setMargin(0);
     _layout->setSpacing(0);
+    _layout->setContentsMargins(0,0,0,0);
     _layout->addWidget(_top_left, 0, 0);
     _layout->addWidget(_top, 0, 1);
     _layout->addWidget(_top_right, 0, 2);
@@ -132,28 +134,17 @@ MainFrame::MainFrame()
     _layout->addWidget(_bottom, 2, 1);
     _layout->addWidget(_bottom_right, 2, 2);
 
-    connect(&_timer, SIGNAL(timeout()), this, SLOT(unfreezing()));
-    //readSettings();
-  
+    connect(&_timer, SIGNAL(timeout()), this, SLOT(unfreezing()));  
 }
-
-void MainFrame::changeEvent(QEvent* event)
-{
-    QFrame::changeEvent(event);
-    QWindowStateChangeEvent* win_event = static_cast< QWindowStateChangeEvent* >(event);
-    if(win_event->type() == QEvent::WindowStateChange) {
-    if (win_event->oldState() & Qt::WindowMinimized) {
-         if (_minimized) {
-             readSettings();
-             _minimized = false;
-         }
-     }
-    }
-}
-
+ 
 void MainFrame::resizeEvent(QResizeEvent *event)
 {
     QFrame::resizeEvent(event);
+
+    if (_layout == NULL){
+        return;
+    }
+
     if (isMaximized()) {
         hide_border();
     } else {
@@ -201,19 +192,18 @@ void MainFrame::show_border()
 
 void MainFrame::showNormal()
 {
-    show_border();
+    show_border();  
     QFrame::showNormal();
 }
 
 void MainFrame::showMaximized()
-{
+{ 
     hide_border();
     QFrame::showMaximized();
 }
 
 void MainFrame::showMinimized()
-{
-    _minimized = true;
+{ 
     writeSettings();
     QFrame::showMinimized();
 }
@@ -285,57 +275,69 @@ bool MainFrame::eventFilter(QObject *object, QEvent *event)
                         newLeft = mouse_event->globalX();
                     if (newHeight > minimumHeight())
                         newTop = mouse_event->globalY();
-                    setGeometry(newLeft, newTop,
-                                newWidth, newHeight);
+                    setGeometry(newLeft, newTop, newWidth, newHeight);
+                    saveWindowRegion();                    
                    break;
+
                 case BottomLeft:
                     newWidth = std::max(_dragStartGeometry.right() - mouse_event->globalX(), minimumWidth());
                     newHeight = std::max(mouse_event->globalY() - _dragStartGeometry.top(), minimumHeight());
                     newLeft = geometry().left();
                     if (newWidth > minimumWidth())
                         newLeft = mouse_event->globalX();
-                    setGeometry(newLeft, _dragStartGeometry.top(),
-                                newWidth, newHeight);
+                    setGeometry(newLeft, _dragStartGeometry.top(), newWidth, newHeight);
+                    saveWindowRegion();
                    break;
+
                 case TopRight:
                     newWidth = std::max(mouse_event->globalX() - _dragStartGeometry.left(), minimumWidth());
                     newHeight = std::max(_dragStartGeometry.bottom() - mouse_event->globalY(), minimumHeight());
                     newTop = geometry().top();
                     if (newHeight > minimumHeight())
                         newTop = mouse_event->globalY();
-                    setGeometry(_dragStartGeometry.left(), newTop,
-                                newWidth, newHeight);
+                    setGeometry(_dragStartGeometry.left(), newTop, newWidth, newHeight);
+                    saveWindowRegion();
                    break;
+
                 case BottomRight:
                     newWidth = std::max(mouse_event->globalX() - _dragStartGeometry.left(), minimumWidth());
                     newHeight = std::max(mouse_event->globalY() - _dragStartGeometry.top(), minimumHeight());
-                    setGeometry(_dragStartGeometry.left(), _dragStartGeometry.top(),
-                                newWidth, newHeight);
+                    setGeometry(_dragStartGeometry.left(), _dragStartGeometry.top(), newWidth, newHeight);
+                    saveWindowRegion();
                    break;
+
                 case Left:
                     newWidth = _dragStartGeometry.right() - mouse_event->globalX();
-                    if (newWidth > minimumWidth())
-                        setGeometry(mouse_event->globalX(), _dragStartGeometry.top(),
-                                    newWidth, height());
+                    if (newWidth > minimumWidth()){
+                         setGeometry(mouse_event->globalX(), _dragStartGeometry.top(), newWidth, height());
+                         saveWindowRegion();
+                    }                       
                    break;
+
                 case Right:
                     newWidth = mouse_event->globalX() - _dragStartGeometry.left();
-                    if (newWidth > minimumWidth())
-                        setGeometry(_dragStartGeometry.left(), _dragStartGeometry.top(),
-                                    newWidth, height());
+                    if (newWidth > minimumWidth()){
+                         setGeometry(_dragStartGeometry.left(), _dragStartGeometry.top(), newWidth, height());
+                         saveWindowRegion();
+                    }                       
                    break;
+
                 case Top:
                     newHeight = _dragStartGeometry.bottom() - mouse_event->globalY();
-                    if (newHeight > minimumHeight())
-                        setGeometry(_dragStartGeometry.left(), mouse_event->globalY(),
-                                    width(), newHeight);
+                    if (newHeight > minimumHeight()){
+                        setGeometry(_dragStartGeometry.left(), mouse_event->globalY(),width(), newHeight);
+                        saveWindowRegion();
+                    }                        
                    break;
+
                 case Bottom:
                     newHeight = mouse_event->globalY() - _dragStartGeometry.top();
-                    if (newHeight > minimumHeight())
-                        setGeometry(_dragStartGeometry.left(), _dragStartGeometry.top(),
-                                    width(), newHeight);
+                    if (newHeight > minimumHeight()){
+                        setGeometry(_dragStartGeometry.left(), _dragStartGeometry.top(), width(), newHeight);
+                        saveWindowRegion();
+                    }                       
                    break;
+
                 default:
                    break;
                 }
@@ -366,39 +368,59 @@ bool MainFrame::eventFilter(QObject *object, QEvent *event)
     return QFrame::eventFilter(object, event);
 }
 
+ void MainFrame::saveWindowRegion()
+ {
+     AppConfig &app = AppConfig::Instance();    
+     QRect rc = geometry();
+     app._frameOptions.left = rc.left();
+     app._frameOptions.top = rc.top();
+     app._frameOptions.right = rc.right();
+     app._frameOptions.bottom = rc.bottom();
+ }
+
 void MainFrame::writeSettings()
 {  
     AppConfig &app = AppConfig::Instance();
-    app._frameOptions.isMax = isMaximized();
-    app._frameOptions.geometry = saveGeometry();
+    app._frameOptions.isMax = isMaximized(); 
+
+    if (!isMaximized()){
+          saveWindowRegion();
+    }
+  
     app.SaveFrame(); 
 }
 
 void MainFrame::readSettings()
 {
+    if (_layout == NULL)
+        return;
+
     AppConfig &app = AppConfig::Instance(); 
    
     if (app._frameOptions.language > 0){
          _mainWindow->switchLanguage(app._frameOptions.language);
     }   
 
-    if (app._frameOptions.geometry.isEmpty()) {
+    if (app._frameOptions.right == 0) {
         QScreen *screen=QGuiApplication::primaryScreen ();
         const QRect availableGeometry = screen->availableGeometry();
         resize(availableGeometry.width() / 2, availableGeometry.height() / 1.5);
         const int origX = std::max(0, (availableGeometry.width() - width()) / 2);
         const int origY = std::max(0, (availableGeometry.height() - height()) / 2);
         move(origX, origY);
+
     } else {
-        try
-        {            
-         QByteArray ge = app._frameOptions.geometry;
-         restoreGeometry(ge);
-        }
-        catch(...)
-        {
-             MsgBox::Show(NULL, "restore frame status error!");
-        } 
+         if (app._frameOptions.isMax){
+            showMaximized(); //show max by system api
+         }
+         else{
+            int left = app._frameOptions.left;
+            int top = app._frameOptions.top;
+            int right = app._frameOptions.right;
+            int bottom = app._frameOptions.bottom;
+            resize(right-left, bottom-top);
+            move(left, top);         
+         }
     }
 
     // restore dockwidgets
diff --git a/DSView/pv/mainframe.h b/DSView/pv/mainframe.h
index e04ac0ee..25b8df4b 100755
--- a/DSView/pv/mainframe.h
+++ b/DSView/pv/mainframe.h
@@ -69,8 +69,7 @@ public:
 
     void readSettings();
 
-protected:
-    void changeEvent(QEvent* event);
+protected: 
     void resizeEvent(QResizeEvent *event);
     void closeEvent(QCloseEvent *event);
     bool eventFilter(QObject *object, QEvent *event);
@@ -86,8 +85,8 @@ public slots:
 private:
     void hide_border();
     void show_border();
-
     void writeSettings();
+    void saveWindowRegion();
 
 private:
     toolbars::TitleBar *_titleBar;
@@ -107,8 +106,7 @@ private:
     QRect   _dragStartGeometry;
     int     _hit_border;
     QTimer  _timer;
-    bool    _freezing;
-    bool    _minimized;
+    bool    _freezing; 
 };
 
 } // namespace pv
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index e1fa249c..0869e39b 100755
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -38,6 +38,7 @@
 #include <QtGlobal>
 #include <QScreen>
 #include <QApplication>
+#include <QStandardPaths>
 
 #include "mainwindow.h"
 
@@ -84,6 +85,7 @@
 #include "../ui/msgbox.h"
 #include "config/appconfig.h"
 #include "appcontrol.h"
+#include "../dsvdef.h"
   
 
 namespace pv {
@@ -117,7 +119,6 @@ void MainWindow::setup_ui()
 
 	setObjectName(QString::fromUtf8("MainWindow"));
     setContentsMargins(0,0,0,0);
-    layout()->setMargin(0);
     layout()->setSpacing(0);
 
 	// Setup the central widget
@@ -1140,7 +1141,8 @@ bool MainWindow::on_store_session(QString name)
         return false;
     }
     QTextStream outStream(&sessionFile);
-    outStream.setCodec("UTF-8");
+    app::set_utf8(outStream); 
+
     //outStream.setGenerateByteOrderMark(true); // UTF-8 without BOM
 
     AppConfig &app = AppConfig::Instance(); 
diff --git a/DSView/pv/prop/binding/deviceoptions.cpp b/DSView/pv/prop/binding/deviceoptions.cpp
index 1b4f1b15..a0e051c2 100755
--- a/DSView/pv/prop/binding/deviceoptions.cpp
+++ b/DSView/pv/prop/binding/deviceoptions.cpp
@@ -24,6 +24,7 @@
 
 #include <QDebug>
 #include <QObject>
+#include <QLocale>
 
 #include <stdint.h>
 
@@ -191,7 +192,7 @@ void DeviceOptions::bind_enum(const QString &name, const QString label, int key,
 }
 
 void DeviceOptions::bind_int(const QString &name, const QString label, int key, QString suffix,
-    optional< std::pair<int64_t, int64_t> > range)
+    boost::optional< std::pair<int64_t, int64_t> > range)
 {
 	_properties.push_back(
         new Int(name, label, suffix, range,
@@ -200,7 +201,7 @@ void DeviceOptions::bind_int(const QString &name, const QString label, int key,
 }
 
 void DeviceOptions::bind_double(const QString &name, const QString label, int key, QString suffix,
-    optional< std::pair<double, double> > range,
+    boost::optional< std::pair<double, double> > range,
     int decimals, boost::optional<double> step)
 {
     _properties.push_back(
diff --git a/DSView/pv/prop/binding/probeoptions.cpp b/DSView/pv/prop/binding/probeoptions.cpp
index be3806c9..cf916b04 100755
--- a/DSView/pv/prop/binding/probeoptions.cpp
+++ b/DSView/pv/prop/binding/probeoptions.cpp
@@ -163,7 +163,7 @@ void ProbeOptions::bind_enum(const QString &name, const QString label, int key,
 }
 
 void ProbeOptions::bind_int(const QString &name, const QString label, int key, QString suffix,
-    optional< std::pair<int64_t, int64_t> > range)
+    boost::optional< std::pair<int64_t, int64_t> > range)
 {
 	_properties.push_back(
         new Int(name, label, suffix, range,
@@ -172,7 +172,7 @@ void ProbeOptions::bind_int(const QString &name, const QString label, int key, Q
 }
 
 void ProbeOptions::bind_double(const QString &name, const QString label, int key, QString suffix,
-    optional< std::pair<double, double> > range,
+    boost::optional< std::pair<double, double> > range,
     int decimals, boost::optional<double> step)
 {
     _properties.push_back(
diff --git a/DSView/pv/prop/double.cpp b/DSView/pv/prop/double.cpp
index 2c832d9a..b5c7c3d7 100755
--- a/DSView/pv/prop/double.cpp
+++ b/DSView/pv/prop/double.cpp
@@ -35,8 +35,8 @@ namespace prop {
 Double::Double(QString name, QString label,
     int decimals,
     QString suffix,
-    optional< pair<double, double> > range,
-    optional<double> step,
+    boost::optional< pair<double, double> > range,
+    boost::optional<double> step,
     Getter getter,
     Setter setter) :
     Property(name, label, getter, setter),
diff --git a/DSView/pv/prop/int.cpp b/DSView/pv/prop/int.cpp
index ac7961ee..3648193d 100755
--- a/DSView/pv/prop/int.cpp
+++ b/DSView/pv/prop/int.cpp
@@ -51,7 +51,7 @@ namespace prop {
 
 Int::Int(QString name, QString label,
     QString suffix,
-    optional< pair<int64_t, int64_t> > range,
+    boost::optional< pair<int64_t, int64_t> > range,
     Getter getter,
     Setter setter) :
     Property(name, label, getter, setter),
diff --git a/DSView/pv/storesession.cpp b/DSView/pv/storesession.cpp
index a621dc8e..322ebd5f 100755
--- a/DSView/pv/storesession.cpp
+++ b/DSView/pv/storesession.cpp
@@ -52,22 +52,9 @@
 
 #include <libsigrokdecode4DSL/libsigrokdecode.h> 
 #include "config/appconfig.h"
+#include "dsvdef.h"
  
-namespace pv {
-
-      char chunk_name[30] = {0};
-
-    void MakeChunkName(int chunk_num, int index, int type, int version){       
-        if (version == 2) {
-            const char *type_name = NULL;
-            type_name = (type == SR_CHANNEL_LOGIC) ? "L" :
-                    (type == SR_CHANNEL_DSO) ? "O" :
-                    (type == SR_CHANNEL_ANALOG) ? "A" : "U";
-            snprintf(chunk_name, 15, "%s-%d/%d", type_name, index, chunk_num);
-        } else {
-            snprintf(chunk_name, 15, "data");
-        }
-    }
+namespace pv { 
 
 StoreSession::StoreSession(SigSession *session) :
 	_session(session),
@@ -188,7 +175,7 @@ bool StoreSession::save_start()
         */
 
     //make zip file
-    if (meta_file != NULL && m_zipDoc.CreateNew(_file_name.toUtf8().data(), false))
+    if (meta_file != "" && m_zipDoc.CreateNew(_file_name.toUtf8().data(), false))
     {
         if (!m_zipDoc.AddFromFile(meta_file.toUtf8().data(), "header") 
         || !m_zipDoc.AddFromFile(decoders_file.toUtf8().data(), "decoders") 
@@ -214,6 +201,8 @@ void StoreSession::save_proc(data::Snapshot *snapshot)
 {
 	assert(snapshot);
 
+    char chunk_name[20] = {0};
+
     int ret = SR_ERR;
     int num = 0;
     data::LogicSnapshot *logic_snapshot = NULL;
@@ -253,7 +242,7 @@ void StoreSession::save_proc(data::Snapshot *snapshot)
                    // ret = sr_session_append(_file_name.toUtf8().data(), buf, size,
                     //                  i, ch_index, ch_type, File_Version);
                     
-                    MakeChunkName(i, ch_index, ch_type, File_Version);
+                    MakeChunkName(chunk_name, i, ch_index, ch_type, File_Version);
                     ret = m_zipDoc.AddFromBuffer(chunk_name, (const char*)buf, size) ? SR_OK : -1;
 
                     if (ret != SR_OK) {
@@ -304,7 +293,7 @@ void StoreSession::save_proc(data::Snapshot *snapshot)
                   // ret = sr_session_append(_file_name.toUtf8().data(), tmp, size,
                     //                 i, 0, ch_type, File_Version);
 
-                    MakeChunkName(i, 0, ch_type, File_Version);
+                    MakeChunkName(chunk_name, i, 0, ch_type, File_Version);
                     ret = m_zipDoc.AddFromBuffer(chunk_name, (const char*)tmp, size) ? SR_OK : -1;
 
                     buf += (size - _unit_count);
@@ -315,7 +304,7 @@ void StoreSession::save_proc(data::Snapshot *snapshot)
                   //  ret = sr_session_append(_file_name.toUtf8().data(), buf, size,
                   //                 i, 0, ch_type, File_Version);
 
-                    MakeChunkName(i, 0, ch_type, File_Version);
+                    MakeChunkName(chunk_name, i, 0, ch_type, File_Version);
                     ret = m_zipDoc.AddFromBuffer(chunk_name, (const char*)buf, size) ? SR_OK : -1;
 
                     buf += size;
@@ -646,8 +635,8 @@ void StoreSession::export_proc(data::Snapshot *snapshot)
 
     QFile file(_file_name);
     file.open(QIODevice::WriteOnly | QIODevice::Text);
-    QTextStream out(&file);
-    out.setCodec("UTF-8");
+    QTextStream out(&file); 
+    app::set_utf8(out);
     //out.setGenerateByteOrderMark(true);  // UTF-8 without BOM
 
     // Meta
@@ -853,7 +842,7 @@ QString StoreSession::decoders_gen()
             return NULL;
         }
         QTextStream outStream(&sessionFile);
-        outStream.setCodec("UTF-8");
+        app::set_utf8(outStream);
         //outStream.setGenerateByteOrderMark(true); // UTF-8 without BOM
 
         QJsonArray dec_array = json_decoders();
@@ -1293,5 +1282,22 @@ bool StoreSession::IsLogicDataType()
     return false;
 }
 
+void StoreSession::MakeChunkName(char *chunk_name, int chunk_num, int index, int type, int version)
+{ 
+    chunk_name[0] = 0;
+
+    if (version == 2)
+    {
+        const char *type_name = NULL;
+        type_name = (type == SR_CHANNEL_LOGIC) ? "L" : (type == SR_CHANNEL_DSO)  ? "O"
+                                                   : (type == SR_CHANNEL_ANALOG) ? "A"
+                                                                                 : "U";
+        snprintf(chunk_name, 15, "%s-%d/%d", type_name, index, chunk_num);
+    }
+    else
+    {
+        snprintf(chunk_name, 15, "data");
+    }
+}
 
 } // pv
diff --git a/DSView/pv/storesession.h b/DSView/pv/storesession.h
index daadef74..99db9f12 100755
--- a/DSView/pv/storesession.h
+++ b/DSView/pv/storesession.h
@@ -93,6 +93,7 @@ public:
 private:
     QList<QString> getSuportedExportFormats();
     double get_integer(GVariant * var);
+    void MakeChunkName(char *chunk_name, int chunk_num, int index, int type, int version);
 
 signals:
 	void progress_updated();
diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp
index 33f52c72..50ceebe8 100755
--- a/DSView/pv/toolbars/samplingbar.cpp
+++ b/DSView/pv/toolbars/samplingbar.cpp
@@ -75,7 +75,6 @@ SamplingBar::SamplingBar(SigSession *session, QWidget *parent) :
 {
     setMovable(false);
     setContentsMargins(0,0,0,0);
-    layout()->setMargin(0);
     layout()->setSpacing(0);
  
     _mode_button.setPopupMode(QToolButton::InstantPopup);
diff --git a/DSView/pv/toolbars/titlebar.cpp b/DSView/pv/toolbars/titlebar.cpp
index d52b18fc..982fab1d 100755
--- a/DSView/pv/toolbars/titlebar.cpp
+++ b/DSView/pv/toolbars/titlebar.cpp
@@ -25,6 +25,7 @@
 #include <QLabel>
 #include <QToolButton>
 #include <QHBoxLayout>
+#include <QVBoxLayout>
 #include <QEvent>
 #include <QMouseEvent> 
 #include <QPainter>
@@ -39,26 +40,26 @@ namespace toolbars {
 
 TitleBar::TitleBar(bool top, QWidget *parent, bool hasClose) :
     QWidget(parent)
-{
-   _title = NULL;
+{ 
    _minimizeButton = NULL;
    _maximizeButton = NULL;
    _closeButton = NULL;
-   _lay = NULL;
    _moving = false;
    _parent = parent;
    _isTop = top;
    _hasClose = hasClose;
+   _title = NULL;
 
    assert(parent);
 
     setObjectName("TitleBar");
     setContentsMargins(0,0,0,0);
-    setFixedHeight(32);
+    setFixedHeight(32); 
+
+    QHBoxLayout *lay1 = new QHBoxLayout(this);
 
     _title = new QLabel(this);
-    _lay = new QHBoxLayout(this);
-    _lay->addWidget(_title);
+    lay1->addWidget(_title);
 
     if (_isTop) {
         _minimizeButton = new QToolButton(this);
@@ -66,8 +67,8 @@ TitleBar::TitleBar(bool top, QWidget *parent, bool hasClose) :
         _maximizeButton = new QToolButton(this);
         _maximizeButton->setObjectName("MaximizeButton");
 
-        _lay->addWidget(_minimizeButton);
-        _lay->addWidget(_maximizeButton);
+        lay1->addWidget(_minimizeButton);
+        lay1->addWidget(_maximizeButton);
 
         connect(this, SIGNAL(normalShow()), parent, SLOT(showNormal()));
         connect(this, SIGNAL( maximizedShow()), parent, SLOT(showMaximized()));
@@ -78,24 +79,22 @@ TitleBar::TitleBar(bool top, QWidget *parent, bool hasClose) :
     if (_isTop || _hasClose) {
         _closeButton= new QToolButton(this);
         _closeButton->setObjectName("CloseButton");
-        _lay->addWidget(_closeButton);
+        lay1->addWidget(_closeButton);
         connect(_closeButton, SIGNAL( clicked()), parent, SLOT(close()));
     }
 
-    _lay->insertStretch(0, 500);
-    _lay->insertStretch(2, 500);
-    _lay->setMargin(0);
-    _lay->setSpacing(0);
+    lay1->insertStretch(0, 500);
+    lay1->insertStretch(2, 500);
+    lay1->setContentsMargins(0,0,0,0);
+    lay1->setSpacing(0);
 
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 }
 
-TitleBar::~TitleBar(){
-    DESTROY_QT_OBJECT(_title);
+TitleBar::~TitleBar(){ 
     DESTROY_QT_OBJECT(_minimizeButton);
     DESTROY_QT_OBJECT(_maximizeButton);
     DESTROY_QT_OBJECT(_closeButton);
-    DESTROY_QT_OBJECT(_lay);
 }
 
 void TitleBar::changeEvent(QEvent *event)
diff --git a/DSView/pv/toolbars/titlebar.h b/DSView/pv/toolbars/titlebar.h
index 97245223..47d937fa 100755
--- a/DSView/pv/toolbars/titlebar.h
+++ b/DSView/pv/toolbars/titlebar.h
@@ -23,9 +23,10 @@
 #define DSVIEW_PV_TOOLBARS_TITLEBAR_H
 
 #include <QWidget>
-class QLabel;
+
 class QToolButton;
 class QHBoxLayout;
+class QLabel;
 
 namespace pv {
 namespace toolbars {
@@ -61,12 +62,12 @@ protected:
     void mouseReleaseEvent(QMouseEvent *event);
     void mouseDoubleClickEvent(QMouseEvent *event);
  
-    QLabel *_title;
+    
     QToolButton *_minimizeButton;
     QToolButton *_maximizeButton;
     QToolButton *_closeButton;
-    QHBoxLayout *_lay;
-
+    QLabel      *_title;
+  
     bool _moving;
     bool _isTop;
     bool _hasClose;
diff --git a/DSView/pv/ui/msgbox.cpp b/DSView/pv/ui/msgbox.cpp
index 88b415db..3b10c38e 100644
--- a/DSView/pv/ui/msgbox.cpp
+++ b/DSView/pv/ui/msgbox.cpp
@@ -34,8 +34,12 @@ void MsgBox::Show(const char *title, const char *text, QWidget *parent)
 {
     assert(text);
 
+    QString str;
+    str.append("\n");
+    str.append(text);
+
     pv::dialogs::DSMessageBox msg(parent, title);
-     msg.mBox()->setText(QString(text));
+     msg.mBox()->setText(str);
    // msg.mBox()->setInformativeText(QString(text));
     msg.mBox()->setStandardButtons(QMessageBox::Ok);
     msg.mBox()->setIcon(QMessageBox::Warning);
@@ -46,8 +50,12 @@ bool MsgBox::Confirm(const char *text, QWidget *parent)
 {
     assert(text);
 
+    QString str;
+    str.append("\n");
+    str.append(text);
+
     pv::dialogs::DSMessageBox msg(parent, "Question");
-    msg.mBox()->setText(QString(text));
+    msg.mBox()->setText(str);
     msg.mBox()->setStandardButtons(QMessageBox::Yes | QMessageBox::No);
     msg.mBox()->setIcon(QMessageBox::Question);
     msg.exec();
diff --git a/DSView/pv/view/decodetrace.cpp b/DSView/pv/view/decodetrace.cpp
index 8cc1b1a8..1de94a9b 100755
--- a/DSView/pv/view/decodetrace.cpp
+++ b/DSView/pv/view/decodetrace.cpp
@@ -351,6 +351,7 @@ bool DecodeTrace::create_popup()
     int ret = false;   //setting have changed flag
     
     dialogs::DSDialog dlg;
+    //dlg.setMinimumSize(500,600);
     create_popup_form(&dlg);
 
     if (QDialog::Accepted == dlg.exec())
diff --git a/DSView/pv/view/devmode.cpp b/DSView/pv/view/devmode.cpp
index 58b31fe5..a69f082d 100755
--- a/DSView/pv/view/devmode.cpp
+++ b/DSView/pv/view/devmode.cpp
@@ -47,7 +47,6 @@ DevMode::DevMode(QWidget *parent, SigSession *session) :
     
 {
     _layout = new QHBoxLayout(this);
-    _layout->setMargin(0);
     _layout->setSpacing(0);
     _layout->setContentsMargins(2, 0, 0, 0);
 
@@ -71,8 +70,7 @@ DevMode::DevMode(QWidget *parent, SigSession *session) :
     _mode_btn->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum);
 
     _layout->addWidget(_close_button);
-    _layout->addWidget(_mode_btn);
-    //_layout->addWidget(new QWidget(this));
+    _layout->addWidget(_mode_btn); 
     _layout->setStretch(1, 100);
     setLayout(_layout);
 }
diff --git a/DSView/pv/view/header.cpp b/DSView/pv/view/header.cpp
index 90b734f4..b3aed97f 100755
--- a/DSView/pv/view/header.cpp
+++ b/DSView/pv/view/header.cpp
@@ -20,20 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "header.h"
-#include "view.h"
-
-#include "../../extdef.h"
-#include "trace.h"
-#include "dsosignal.h"
-#include "logicsignal.h"
-#include "analogsignal.h"
-#include "groupsignal.h"
-#include "decodetrace.h"
-#include "../sigsession.h"
-#include "../device/devinst.h"
-
-#include <assert.h>
+#include "header.h" 
   
 #include <QColorDialog>
 #include <QInputDialog>
@@ -43,6 +30,20 @@
 #include <QRect>
 #include <QStyleOption>
 #include <QApplication>
+#include <assert.h>
+
+#include "view.h"
+#include "trace.h"
+#include "dsosignal.h"
+#include "logicsignal.h"
+#include "analogsignal.h"
+#include "groupsignal.h"
+#include "decodetrace.h"
+#include "../sigsession.h"
+#include "../device/devinst.h"
+#include "../../extdef.h"
+#include "../dsvdef.h"
+
  
 using namespace std;
 
@@ -253,33 +254,74 @@ void Header::wheelEvent(QWheelEvent *event)
 {
     assert(event);
 
-    if (event->orientation() == Qt::Vertical) {
+    int x = 0;
+    int y = 0;
+    int delta = 0;
+    bool isVertical = true;
+    QPoint pos;
+    (void)x;
+    (void)y;
+     
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    x = (int)event->position().x();
+    y = (int)event->position().y();    
+    int anglex = event->angleDelta().x();
+    int angley = event->angleDelta().y();
+
+    pos.setX(x);
+    pos.setY(y);
+
+    if (anglex == 0 || ABS_VAL(angley) >= ABS_VAL(anglex)){
+        delta = angley;
+        isVertical = true;
+    }
+    else{
+        delta = anglex;
+        isVertical = false; //hori direction
+    }
+#else
+    x = event->x();
+    delta = event->delta();
+    isVertical = event->orientation() == Qt::Vertical;
+    pos = event->pos(); 
+#endif
+
+    if (isVertical)
+    {
         const auto &traces = _view.get_traces(ALL_VIEW);
         // Vertical scrolling
         double shift = 0;
-        #ifdef Q_OS_DARWIN
+
+#ifdef Q_OS_DARWIN
         static bool active = true;
         static int64_t last_time;
-        if (event->source() == Qt::MouseEventSynthesizedBySystem) {
-            if (active) {
+        if (event->source() == Qt::MouseEventSynthesizedBySystem)
+        {
+            if (active)
+            {
                 last_time = QDateTime::currentMSecsSinceEpoch();
-                shift = event->delta() > 1.5 ? -1 :
-                        event->delta() < -1.5 ? 1 : 0;
+                shift = delta > 1.5 ? -1 : delta < -1.5 ? 1 : 0;
             }
             int64_t cur_time = QDateTime::currentMSecsSinceEpoch();
             if (cur_time - last_time > 100)
                 active = true;
             else
                 active = false;
-        } else {
-            shift = -event->delta() / 80.0;
         }
-        #else
-            shift = event->delta() / 80.0;
-        #endif
-        for(auto &t : traces)
-            if (t->mouse_wheel(width(), event->pos(), shift))
+        else
+        {
+            shift = -delta / 80.0;
+        }
+#else
+        shift = delta / 80.0;
+#endif
+
+        for (auto &t : traces)
+        {
+            if (t->mouse_wheel(width(), pos, shift))
                 break;
+        }
+
         update();
     }
 }
diff --git a/DSView/pv/view/ruler.cpp b/DSView/pv/view/ruler.cpp
index 100292c4..25c54a95 100755
--- a/DSView/pv/view/ruler.cpp
+++ b/DSView/pv/view/ruler.cpp
@@ -28,8 +28,7 @@
 #include "../sigsession.h"
 #include "../device/devinst.h"
 #include "dsosignal.h"
-
-#include <extdef.h>
+#include "../../extdef.h"
 
 #include <assert.h>
 #include <math.h>
@@ -38,10 +37,11 @@
 #include <QMouseEvent>
 #include <QPainter>
 #include <QTextStream>
-#include <QStyleOption>
+#include <QStyleOption>  
  
  
 using namespace std;
+using namespace Qt;
 
 namespace pv {
 namespace view {
diff --git a/DSView/pv/view/viewport.cpp b/DSView/pv/view/viewport.cpp
index 3ca32160..ff65b2fd 100755
--- a/DSView/pv/view/viewport.cpp
+++ b/DSView/pv/view/viewport.cpp
@@ -38,7 +38,9 @@
 #include <QMouseEvent>
 #include <QStyleOption>
 #include <QPainterPath> 
-#include <math.h> 
+#include <math.h>
+#include <QWheelEvent>
+#include <QDebug>
  
 #include "../config/appconfig.h"
 #include "../dsvdef.h"
@@ -1023,54 +1025,86 @@ void Viewport::mouseDoubleClickEvent(QMouseEvent *event)
 
 void Viewport::wheelEvent(QWheelEvent *event)
 {
-	assert(event);
+    assert(event);
 
-    if (_type == FFT_VIEW) {
-        for(auto &t : _view.session().get_spectrum_traces()) {
-            assert(t);
-            if(t->enabled()) {
-                t->zoom(event->delta() / 80, event->x());
+    int x = 0;  //mouse x pos
+    int delta = 0;
+    bool isVertical = true;
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    x = (int)event->position().x(); 
+    int anglex = event->angleDelta().x();
+    int angley = event->angleDelta().y();
+
+    if (anglex == 0 || ABS_VAL(angley) >= ABS_VAL(anglex)){
+        delta = angley;
+        isVertical = true;
+    }
+    else{
+        delta = anglex;
+        isVertical = false; //hori direction
+    }
+#else
+    x = event->x();
+    delta = event->delta();
+    isVertical = event->orientation() == Qt::Vertical;
+#endif
+
+    if (_type == FFT_VIEW)
+    {
+        for (auto &t : _view.session().get_spectrum_traces())
+        { 
+            if (t->enabled())
+            {
+                t->zoom(delta / 80, x);
                 break;
             }
         }
-    } else if (_type == TIME_VIEW){
-        if (event->orientation() == Qt::Vertical) {
+    }
+    else if (_type == TIME_VIEW)
+    {
+        if (isVertical)
+        {
             // Vertical scrolling is interpreted as zooming in/out
-            const int offset = event->x();
-            #ifdef Q_OS_DARWIN
+#ifdef Q_OS_DARWIN
             static bool active = true;
             static int64_t last_time;
-            if (event->source() == Qt::MouseEventSynthesizedBySystem) {
-                if (active && (event->modifiers() & Qt::ShiftModifier)) {
+            if (event->source() == Qt::MouseEventSynthesizedBySystem)
+            {
+                if (active && (event->modifiers() & Qt::ShiftModifier))
+                {
                     last_time = QDateTime::currentMSecsSinceEpoch();
-                    const double scale = event->delta() > 1.5 ? 1 :
-                                         event->delta() < -1.5 ? -1 : 0;
-                    _view.zoom(scale, offset);
+                    const double scale = delta > 1.5 ? 1 : (delta < -1.5 ? -1 : 0);
+                    _view.zoom(scale, x);
                 }
                 int64_t cur_time = QDateTime::currentMSecsSinceEpoch();
                 if (cur_time - last_time > 50)
                     active = true;
                 else
                     active = false;
-            } else {
-                _view.zoom(-event->delta() / 80, offset);
             }
-            #else
-            _view.zoom(event->delta() / 80, offset);
-            #endif
-        } else if (event->orientation() == Qt::Horizontal) {
+            else
+            {
+                _view.zoom(-delta / 80, x);
+            }
+#else
+            _view.zoom(delta / 80, x);
+#endif
+        }
+        else
+        {
             // Horizontal scrolling is interpreted as moving left/right
             if (!(event->modifiers() & Qt::ShiftModifier))
-                _view.set_scale_offset(_view.scale(),
-                                       _view.offset() - event->delta());
+                _view.set_scale_offset(_view.scale(), _view.offset() - delta);
         }
     }
 
     const auto &sigs = _view.session().get_signals();
-    for(auto &s : sigs) {
-        assert(s);
+    for (auto &s : sigs)
+    { 
         view::DsoSignal *dsoSig = NULL;
-        if ((dsoSig = dynamic_cast<view::DsoSignal*>(s))) {
+        if ((dsoSig = dynamic_cast<view::DsoSignal *>(s)))
+        {
             dsoSig->auto_end();
         }
     }
diff --git a/qtpro/DSView.pro b/qtpro/DSView.pro
index f8e7fde1..5fd987c2 100644
--- a/qtpro/DSView.pro
+++ b/qtpro/DSView.pro
@@ -12,8 +12,10 @@ QT += svg
 }
 CONFIG += exceptions
 CONFIG += object_parallel_to_source
+
 greaterThan(QT_MAJOR_VERSION, 4): CONFIG += c++11
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
 #QMAKE_CFLAGS_ISYSTEM = -I
 
 TARGET = DSView
diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user
index cf656ba4..8871a8fc 100644
--- a/qtpro/DSView.pro.user
+++ b/qtpro/DSView.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2021-11-16T18:44:24. -->
+<!-- Written by QtCreator 4.11.0, 2021-11-19T11:46:54. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

From 0368988a8cf3da9a4b3d5413b3c1d3ce8bd5361c Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Tue, 23 Nov 2021 13:35:08 +0800
Subject: [PATCH 32/58] fix combobox's bug at macos

---
 DSView/DSView.desktop                   |  10 --
 DSView/main.cpp                         |  11 +-
 DSView/pv/ZipMaker.cpp                  |   4 +-
 DSView/pv/appcontrol.cpp                |  14 +-
 DSView/pv/dialogs/deviceoptions.cpp     |   2 +-
 DSView/pv/dialogs/deviceoptions.h       |   2 +-
 DSView/pv/dialogs/fftoptions.cpp        |  22 +--
 DSView/pv/dialogs/fftoptions.h          |  18 +--
 DSView/pv/dialogs/protocolexp.cpp       |   2 +-
 DSView/pv/dialogs/protocolexp.h         |   4 +-
 DSView/pv/dialogs/protocollist.cpp      |   4 +-
 DSView/pv/dialogs/protocollist.h        |   9 +-
 DSView/pv/dialogs/regionoptions.cpp     |   4 +-
 DSView/pv/dialogs/regionoptions.h       |   6 +-
 DSView/pv/dock/dsotriggerdock.cpp       |   4 +-
 DSView/pv/dock/dsotriggerdock.h         |   7 +-
 DSView/pv/dock/measuredock.cpp          |  10 +-
 DSView/pv/dock/measuredock.h            |   9 +-
 DSView/pv/dock/protocoldock.cpp         |  10 +-
 DSView/pv/dock/protocoldock.h           |   4 +-
 DSView/pv/dock/protocolitemlayer.cpp    |   3 +-
 DSView/pv/dock/protocolitemlayer.h      |   5 +-
 DSView/pv/dock/searchdock.cpp           |   4 +-
 DSView/pv/dock/searchdock.h             |   2 +-
 DSView/pv/dock/triggerdock.cpp          |  12 +-
 DSView/pv/dock/triggerdock.h            |  15 +-
 DSView/pv/dsvdef.h                      |   1 +
 DSView/pv/mainframe.cpp                 |  47 +++---
 DSView/pv/mainwindow.cpp                |  14 +-
 DSView/pv/prop/binding/probeoptions.cpp |   1 +
 DSView/pv/prop/enum.cpp                 |   4 +-
 DSView/pv/prop/enum.h                   |   4 +-
 DSView/pv/toolbars/samplingbar.cpp      |   6 +-
 DSView/pv/toolbars/samplingbar.h        |   8 +-
 DSView/pv/ui/dscombobox.cpp             |  72 +++++++++
 DSView/pv/ui/dscombobox.h               |  46 ++++++
 DSView/pv/view/decodetrace.cpp          |  14 +-
 DSView/pv/view/decodetrace.h            |  10 +-
 DSView/pv/view/spectrumtrace.cpp        |  18 ++-
 DSView/pv/view/viewport.cpp             |   4 +-
 DSView/pv/view/viewstatus.cpp           |   7 +-
 libsigrok4DSL/config.h                  | 192 ++++++++++++++++++++++++
 libsigrok4DSL/output/gnuplot.c          |   2 +-
 qtpro/DSView.pro                        |   2 +
 qtpro/DSView.pro.user                   |   2 +-
 45 files changed, 506 insertions(+), 145 deletions(-)
 delete mode 100755 DSView/DSView.desktop
 mode change 100755 => 100644 DSView/pv/mainframe.cpp
 mode change 100755 => 100644 DSView/pv/mainwindow.cpp
 create mode 100644 DSView/pv/ui/dscombobox.cpp
 create mode 100644 DSView/pv/ui/dscombobox.h
 create mode 100644 libsigrok4DSL/config.h

diff --git a/DSView/DSView.desktop b/DSView/DSView.desktop
deleted file mode 100755
index e1143240..00000000
--- a/DSView/DSView.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=DSView
-Comment=GUI Program for DreamSourceLab USB-based Instruments
-TryExec=DSView
-Exec=DSView
-Icon=dsview
-Terminal=false
-Categories=Development;Electronics;Qt;
diff --git a/DSView/main.cpp b/DSView/main.cpp
index c0a15a47..210f9241 100755
--- a/DSView/main.cpp
+++ b/DSView/main.cpp
@@ -144,12 +144,13 @@ int main(int argc, char *argv[])
 		return 1;
     } else if (argcFinal - optind == 1)
         open_file = argvFinal[argcFinal - 1];
-
-	// Initialise DS_RES_PATH
+ 
     QDir dir(QCoreApplication::applicationDirPath());
+ 
+#ifdef Q_OS_LINUX
     if (dir.cd("..") &&
         dir.cd("share") &&
-        dir.cd(QApplication::applicationName()) &&
+        dir.cd("DSView") &&
         dir.cd("res")) {
 		// the path command like: cd ../share/DSView/res
         QString res_dir = dir.absolutePath() + "/";
@@ -158,6 +159,10 @@ int main(int argc, char *argv[])
         qDebug() << "DSView run ERROR: config files don't exist.";
         return 1;
     }
+#endif
+
+//#ifdef Q_OS_DARWIN 
+//#endif
 
 	//load app config
 	AppConfig::Instance().LoadAll();
diff --git a/DSView/pv/ZipMaker.cpp b/DSView/pv/ZipMaker.cpp
index bf57dd14..18e48fc6 100644
--- a/DSView/pv/ZipMaker.cpp
+++ b/DSView/pv/ZipMaker.cpp
@@ -23,7 +23,7 @@
 
 #include "ZipMaker.h" 
 #include <assert.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <time.h>
@@ -251,7 +251,7 @@ const char *ZipMaker::GetError()
      unzOpenCurrentFile((unzFile)m_uzDoc);
 
      //read file data to buffer
-     void *buf = inf.pData;
+     char *buf = (char*)inf.pData;
      long long buflen = inf.dataLen;
      long long rdlen = 0;
 
diff --git a/DSView/pv/appcontrol.cpp b/DSView/pv/appcontrol.cpp
index 39461b2c..fb477aea 100644
--- a/DSView/pv/appcontrol.cpp
+++ b/DSView/pv/appcontrol.cpp
@@ -25,6 +25,8 @@
 
 #include <libsigrok4DSL/libsigrok.h>
 #include <libsigrokdecode4DSL/libsigrokdecode.h>
+#include <QDir>
+#include <QCoreApplication>
 
 #include "devicemanager.h"
 #include "sigsession.h"
@@ -72,7 +74,17 @@ bool AppControl::Init()
     }
 
    // const char *decoderScriptDir = "/home/lala/tmpdir/any";
-    const char * decoderScriptDir = NULL;
+    //const char * decoderScriptDir = NULL;
+
+    char decoderScriptDir[256] = {0};
+    QDir dir(QCoreApplication::applicationDirPath());
+#ifdef Q_OS_LINUX  
+    dir.cd("../share/DSView/decoders");    
+#else
+    dir.cd("decoders");
+#endif
+
+    strcpy(decoderScriptDir, dir.absolutePath().toUtf8().data());
 
     // Initialise libsigrokdecode
     if (srd_init(decoderScriptDir) != SRD_OK)
diff --git a/DSView/pv/dialogs/deviceoptions.cpp b/DSView/pv/dialogs/deviceoptions.cpp
index ee506833..3fa3be2c 100755
--- a/DSView/pv/dialogs/deviceoptions.cpp
+++ b/DSView/pv/dialogs/deviceoptions.cpp
@@ -391,7 +391,7 @@ void DeviceOptions::analog_channel_check()
         }
     }
     dynamic_widget(_dynamic_layout);
-    _dynamic_box->setVisible(_dynamic_box->title() != NULL);
+    _dynamic_box->setVisible(_dynamic_box->title() != "");
 }
 
 void DeviceOptions::channel_enable()
diff --git a/DSView/pv/dialogs/deviceoptions.h b/DSView/pv/dialogs/deviceoptions.h
index c09f83aa..7c4d1cdd 100755
--- a/DSView/pv/dialogs/deviceoptions.h
+++ b/DSView/pv/dialogs/deviceoptions.h
@@ -34,7 +34,6 @@
 #include <QVector>
 #include <QLabel>
 #include <QCheckBox>
-#include <QComboBox>
 #include <QRadioButton>
 #include <QTimer> 
 
@@ -44,6 +43,7 @@
 #include "../prop/binding/probeoptions.h"
 #include "../toolbars/titlebar.h"
 #include "../dialogs/dsdialog.h"
+#include "../ui/dscombobox.h"
 
 using namespace pv::device;
 
diff --git a/DSView/pv/dialogs/fftoptions.cpp b/DSView/pv/dialogs/fftoptions.cpp
index 5b8f44d7..10855971 100755
--- a/DSView/pv/dialogs/fftoptions.cpp
+++ b/DSView/pv/dialogs/fftoptions.cpp
@@ -31,6 +31,7 @@
 #include "../view/trace.h"
 #include "../view/dsosignal.h"
 #include "../view/spectrumtrace.h"
+#include "../dsvdef.h"
 
 
 using namespace boost;
@@ -58,15 +59,15 @@ FftOptions::FftOptions(QWidget *parent, SigSession *session) :
     _layout = NULL;
 
     _en_checkbox = new QCheckBox(this);
-    _len_combobox = new QComboBox(this);
-    _interval_combobox = new QComboBox(this);
-    _ch_combobox = new QComboBox(this);
-    _window_combobox = new QComboBox(this);
+    _len_combobox = new DsComboBox(this);
+    _interval_combobox = new DsComboBox(this);
+    _ch_combobox = new DsComboBox(this);
+    _window_combobox = new DsComboBox(this);
     _dc_checkbox = new QCheckBox(this);
     _dc_checkbox->setChecked(true);
-    _view_combobox = new QComboBox(this);
-    _dbv_combobox = new QComboBox(this);
-
+    _view_combobox = new DsComboBox(this);
+    _dbv_combobox = new DsComboBox(this);
+ 
     // setup _ch_combobox
     for(auto &s : _session->get_signals()) {
         view::DsoSignal *dsoSig = NULL;
@@ -217,9 +218,9 @@ FftOptions::FftOptions(QWidget *parent, SigSession *session) :
 
     connect(&_button_box, SIGNAL(accepted()), this, SLOT(accept()));
     connect(&_button_box, SIGNAL(rejected()), this, SLOT(reject()));
-    connect(_window_combobox, SIGNAL(currentIndexChanged(QString)), this, SLOT(window_changed(QString)));
+    connect(_window_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(window_changed(int)));
     connect(_len_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(len_changed(int)));
-    connect(_session->get_device(), SIGNAL(device_updated()), this, SLOT(reject()));
+    connect(_session->get_device(), SIGNAL(device_updated()), this, SLOT(reject()));    
 }
 
 FftOptions::~FftOptions(){
@@ -261,8 +262,9 @@ void FftOptions::reject()
     QDialog::reject();
 }
 
-void FftOptions::window_changed(QString str)
+void FftOptions::window_changed(int index)
 {
+    QString str = _window_combobox->itemText(index);
     QString hint_pic= ":/icons/" + str +".png";
     QPixmap pixmap(hint_pic);
     _hint_label->setPixmap(pixmap);
diff --git a/DSView/pv/dialogs/fftoptions.h b/DSView/pv/dialogs/fftoptions.h
index b863d6d5..631713bf 100755
--- a/DSView/pv/dialogs/fftoptions.h
+++ b/DSView/pv/dialogs/fftoptions.h
@@ -27,13 +27,13 @@
 #include <QFormLayout>
 #include <QVBoxLayout>
 #include <QLabel>
-#include <QCheckBox>
-#include <QComboBox>
+#include <QCheckBox> 
  
 
 #include "../device/devinst.h"
 #include "../toolbars/titlebar.h"
 #include "dsdialog.h"
+#include "../ui/dscombobox.h"
 
 namespace pv {
 
@@ -58,21 +58,21 @@ protected:
     void reject();
 
 private slots:
-    void window_changed(QString str);
+    void window_changed(int index);
     void len_changed(int index);
 
 private:
     SigSession *_session;
     uint64_t _sample_limit;
  
-    QComboBox *_len_combobox;
-    QComboBox *_interval_combobox;
+    DsComboBox *_len_combobox;
+    DsComboBox *_interval_combobox;
     QCheckBox *_en_checkbox;
-    QComboBox *_ch_combobox;
-    QComboBox *_window_combobox;
+    DsComboBox *_ch_combobox;
+    DsComboBox *_window_combobox;
     QCheckBox *_dc_checkbox;
-    QComboBox *_view_combobox;
-    QComboBox *_dbv_combobox;
+    DsComboBox *_view_combobox;
+    DsComboBox *_dbv_combobox;
 
     QLabel *_hint_label;
     QGridLayout *_glayout;
diff --git a/DSView/pv/dialogs/protocolexp.cpp b/DSView/pv/dialogs/protocolexp.cpp
index 7a9e6104..728410e5 100755
--- a/DSView/pv/dialogs/protocolexp.cpp
+++ b/DSView/pv/dialogs/protocolexp.cpp
@@ -52,7 +52,7 @@ ProtocolExp::ProtocolExp(QWidget *parent, SigSession *session) :
         Qt::Horizontal, this),
     _export_cancel(false)
 {
-    _format_combobox = new QComboBox(this);
+    _format_combobox = new DsComboBox(this);
     _format_combobox->addItem(tr("Comma-Separated Values (*.csv)"));
     _format_combobox->addItem(tr("Text files (*.txt)"));
 
diff --git a/DSView/pv/dialogs/protocolexp.h b/DSView/pv/dialogs/protocolexp.h
index 8688fd96..a4894459 100755
--- a/DSView/pv/dialogs/protocolexp.h
+++ b/DSView/pv/dialogs/protocolexp.h
@@ -28,12 +28,12 @@
 #include <QVBoxLayout>
 #include <QLabel>
 #include <QRadioButton>
-#include <QComboBox>
  
 #include "../device/devinst.h"
 #include "../prop/binding/deviceoptions.h"
 #include "../toolbars/titlebar.h"
 #include "dsdialog.h"
+#include "../ui/dscombobox.h"
 
 namespace pv {
 
@@ -68,7 +68,7 @@ private:
     SigSession *_session;
 
     toolbars::TitleBar *_titlebar;
-    QComboBox *_format_combobox;
+    DsComboBox *_format_combobox;
     std::list<QRadioButton *> _row_sel_list;
     std::list<QLabel *> _row_label_list;
     QFormLayout *_flayout;
diff --git a/DSView/pv/dialogs/protocollist.cpp b/DSView/pv/dialogs/protocollist.cpp
index 4b094d90..4144cc58 100755
--- a/DSView/pv/dialogs/protocollist.cpp
+++ b/DSView/pv/dialogs/protocollist.cpp
@@ -45,7 +45,7 @@ ProtocolList::ProtocolList(QWidget *parent, SigSession *session) :
 {
     pv::data::DecoderModel* decoder_model = _session->get_decoder_model();
 
-    _map_zoom_combobox = new QComboBox(this);
+    _map_zoom_combobox = new DsComboBox(this);
     _map_zoom_combobox->addItem(tr("Fit to Window"));
     _map_zoom_combobox->addItem(tr("Fixed"));
     int cur_map_zoom = _session->get_map_zoom();
@@ -57,7 +57,7 @@ ProtocolList::ProtocolList(QWidget *parent, SigSession *session) :
 
     connect(_map_zoom_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(on_set_map_zoom(int)));
 
-    _protocol_combobox = new QComboBox(this);
+    _protocol_combobox = new DsComboBox(this);
     auto &decode_sigs = _session->get_decode_signals();
     int index = 0;
 
diff --git a/DSView/pv/dialogs/protocollist.h b/DSView/pv/dialogs/protocollist.h
index f53dfcfa..879787c0 100755
--- a/DSView/pv/dialogs/protocollist.h
+++ b/DSView/pv/dialogs/protocollist.h
@@ -27,14 +27,13 @@
 #include <QFormLayout>
 #include <QVBoxLayout>
 #include <QLabel>
-#include <QCheckBox>
-#include <QComboBox>
- 
+#include <QCheckBox> 
 
 #include "../device/devinst.h"
 #include "../prop/binding/deviceoptions.h"
 #include "../toolbars/titlebar.h"
 #include "dsdialog.h"
+#include "../ui/dscombobox.h"
 
 namespace pv {
 
@@ -62,8 +61,8 @@ private:
     SigSession *_session;
 
     toolbars::TitleBar *_titlebar;
-    QComboBox *_map_zoom_combobox;
-    QComboBox *_protocol_combobox;
+    DsComboBox *_map_zoom_combobox;
+    DsComboBox *_protocol_combobox;
     std::list<QCheckBox *> _show_checkbox_list;
     std::list<QLabel *> _show_label_list;
     QFormLayout *_flayout;
diff --git a/DSView/pv/dialogs/regionoptions.cpp b/DSView/pv/dialogs/regionoptions.cpp
index ce71775d..8c455d26 100755
--- a/DSView/pv/dialogs/regionoptions.cpp
+++ b/DSView/pv/dialogs/regionoptions.cpp
@@ -45,8 +45,8 @@ RegionOptions::RegionOptions(view::View *view, SigSession *session, QWidget *par
     QHBoxLayout *hlayout = new QHBoxLayout();
     hlayout->setContentsMargins(0,0,0,0);
     hlayout->setSpacing(0);
-    _start_comboBox = new QComboBox(this);
-    _end_comboBox = new QComboBox(this);
+    _start_comboBox = new DsComboBox(this);
+    _end_comboBox = new DsComboBox(this);
     _start_comboBox->addItem(RegionStart);
     _end_comboBox->addItem(RegionEnd);
     if (_view) {
diff --git a/DSView/pv/dialogs/regionoptions.h b/DSView/pv/dialogs/regionoptions.h
index b3e06b78..a66b2811 100755
--- a/DSView/pv/dialogs/regionoptions.h
+++ b/DSView/pv/dialogs/regionoptions.h
@@ -27,10 +27,10 @@
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QLabel>
-#include <QComboBox>
  
 #include "../toolbars/titlebar.h"
 #include "dsdialog.h"
+#include "../ui/dscombobox.h"
 
 namespace pv {
 
@@ -59,8 +59,8 @@ private:
     SigSession *_session;
     view::View *_view;
 
-    QComboBox *_start_comboBox;
-    QComboBox *_end_comboBox;
+    DsComboBox *_start_comboBox;
+    DsComboBox *_end_comboBox;
 
     QDialogButtonBox _button_box;
 
diff --git a/DSView/pv/dock/dsotriggerdock.cpp b/DSView/pv/dock/dsotriggerdock.cpp
index 6d401770..7fce3f47 100755
--- a/DSView/pv/dock/dsotriggerdock.cpp
+++ b/DSView/pv/dock/dsotriggerdock.cpp
@@ -61,7 +61,7 @@ DsoTriggerDock::DsoTriggerDock(QWidget *parent, SigSession *session) :
     connect(_position_slider, SIGNAL(valueChanged(int)), this, SLOT(pos_changed(int)));
 
     _holdoff_label = new QLabel(_widget);
-    _holdoff_comboBox = new QComboBox(_widget);
+    _holdoff_comboBox = new DsComboBox(_widget);
     _holdoff_comboBox->addItem(tr("uS"), QVariant::fromValue(1000));
     _holdoff_comboBox->addItem(tr("mS"), QVariant::fromValue(1000000));
     _holdoff_comboBox->addItem(tr("S"), QVariant::fromValue(1000000000));
@@ -103,7 +103,7 @@ DsoTriggerDock::DsoTriggerDock(QWidget *parent, SigSession *session) :
     connect(_falling_radioButton, SIGNAL(clicked()), this, SLOT(type_changed()));
 
     _source_group=new QButtonGroup(_widget);
-    _channel_comboBox = new QComboBox(_widget);
+    _channel_comboBox = new DsComboBox(_widget);
     _type_group=new QButtonGroup(_widget);
 
     _source_group->addButton(_auto_radioButton);
diff --git a/DSView/pv/dock/dsotriggerdock.h b/DSView/pv/dock/dsotriggerdock.h
index 4688577e..847194e5 100755
--- a/DSView/pv/dock/dsotriggerdock.h
+++ b/DSView/pv/dock/dsotriggerdock.h
@@ -27,12 +27,13 @@
 #include <QSpinBox>
 #include <QButtonGroup>
 #include <QScrollArea>
-#include <QComboBox>
 #include <QLabel>
 #include <QRadioButton>
 
 #include <vector>
 
+#include "../ui/dscombobox.h"
+
 namespace pv {
 
 class SigSession;
@@ -79,7 +80,7 @@ private:
 
     QWidget *_widget;
 
-    QComboBox *_holdoff_comboBox;
+    DsComboBox *_holdoff_comboBox;
     QSpinBox *_holdoff_spinBox;
     QSlider *_holdoff_slider;
 
@@ -89,7 +90,7 @@ private:
     QSlider *_position_slider;
 
     QButtonGroup *_source_group;
-    QComboBox *_channel_comboBox;
+    DsComboBox *_channel_comboBox;
     QButtonGroup *_type_group;
 
     QLabel *_position_label;
diff --git a/DSView/pv/dock/measuredock.cpp b/DSView/pv/dock/measuredock.cpp
index 68b983bd..cd98281f 100755
--- a/DSView/pv/dock/measuredock.cpp
+++ b/DSView/pv/dock/measuredock.cpp
@@ -216,7 +216,7 @@ void MeasureDock::reload()
     else
         _edge_groupBox->setDisabled(true);
 
-    for (QVector <QComboBox *>::const_iterator i = _edge_ch_cmb_vec.begin();
+    for (QVector <DsComboBox *>::const_iterator i = _edge_ch_cmb_vec.begin();
          i != _edge_ch_cmb_vec.end(); i++) {
         update_probe_selector(*i);
     }
@@ -416,7 +416,7 @@ void MeasureDock::add_edge_measure()
     g_label->setContentsMargins(0,0,0,0);
     QLabel *a_label = new QLabel(tr("@"), row_widget);
     a_label->setContentsMargins(0,0,0,0);
-    QComboBox *ch_cmb = create_probe_selector(row_widget);
+    DsComboBox *ch_cmb = create_probe_selector(row_widget);
     _edge_del_btn_vec.push_back(del_btn);
     _edge_s_btn_vec.push_back(s_btn);
     _edge_e_btn_vec.push_back(e_btn);
@@ -643,14 +643,14 @@ void MeasureDock::set_cursor_btn_color(QPushButton *btn)
     btn->setStyleSheet(style);
 }
 
-QComboBox* MeasureDock::create_probe_selector(QWidget *parent)
+DsComboBox* MeasureDock::create_probe_selector(QWidget *parent)
 {
-    QComboBox *selector = new QComboBox(parent);
+    DsComboBox *selector = new DsComboBox(parent);
     update_probe_selector(selector);
     return selector;
 }
 
-void MeasureDock::update_probe_selector(QComboBox *selector)
+void MeasureDock::update_probe_selector(DsComboBox *selector)
 {
     selector->clear();
     const auto &sigs = _session->get_signals();
diff --git a/DSView/pv/dock/measuredock.h b/DSView/pv/dock/measuredock.h
index 379b1d38..63b77b52 100755
--- a/DSView/pv/dock/measuredock.h
+++ b/DSView/pv/dock/measuredock.h
@@ -24,7 +24,6 @@
 
 #include <QDockWidget>
 #include <QPushButton>
-#include <QComboBox>
 #include <QLabel>
 #include <QRadioButton>
 #include <QSlider>
@@ -42,6 +41,8 @@
 
 #include <vector>
 
+#include "../ui/dscombobox.h"
+
 namespace pv {
 
 class SigSession;
@@ -73,8 +74,8 @@ private:
     void reStyle();
 
 private:
-    QComboBox* create_probe_selector(QWidget *parent);
-    void update_probe_selector(QComboBox *selector);
+    DsComboBox* create_probe_selector(QWidget *parent);
+    void update_probe_selector(DsComboBox *selector);
 
 signals:
 
@@ -129,7 +130,7 @@ private:
     QVector<QToolButton *> _edge_del_btn_vec;
     QVector<QPushButton *> _edge_s_btn_vec;
     QVector<QPushButton *> _edge_e_btn_vec;
-    QVector<QComboBox *> _edge_ch_cmb_vec;
+    QVector<DsComboBox *> _edge_ch_cmb_vec;
     QVector<QLabel *> _edge_r_label_vec;
 
     QPushButton *_sel_btn;
diff --git a/DSView/pv/dock/protocoldock.cpp b/DSView/pv/dock/protocoldock.cpp
index ba3f0282..28cf86b0 100755
--- a/DSView/pv/dock/protocoldock.cpp
+++ b/DSView/pv/dock/protocoldock.cpp
@@ -75,7 +75,7 @@ ProtocolDock::ProtocolDock(QWidget *parent, view::View &view, SigSession *sessio
     _del_all_button = new QPushButton(_up_widget);
     _del_all_button->setFlat(true);
     _del_all_button->setCheckable(true);
-    _protocol_combobox = new QComboBox(_up_widget);
+    _protocol_combobox = new DsComboBox(_up_widget);
 
     GSList *l = g_slist_sort(g_slist_copy(
         (GSList*)srd_decoder_list()), decoder_name_cmp);
@@ -248,8 +248,12 @@ void ProtocolDock::paintEvent(QPaintEvent *)
 void ProtocolDock::resizeEvent(QResizeEvent *event)
 {
     int width = this->visibleRegion().boundingRect().width();
-    width = width - _dn_layout->margin() * 2 -
-            _dn_search_layout->margin() * 2 -
+
+    int mg1 = 10;
+    int mg2 = 10;
+
+    width = width - mg1 * 2 -
+            mg2 * 2 -
             _dn_search_layout->spacing() * 2 -
             _pre_button->width()-_nxt_button->width();
     width = std::max(width, 0);
diff --git a/DSView/pv/dock/protocoldock.h b/DSView/pv/dock/protocoldock.h
index a83df95b..2fc198e1 100755
--- a/DSView/pv/dock/protocoldock.h
+++ b/DSView/pv/dock/protocoldock.h
@@ -27,7 +27,6 @@
 
 #include <QDockWidget>
 #include <QPushButton>
-#include <QComboBox>
 #include <QLabel>
 #include <QVector>
 #include <QVBoxLayout>
@@ -42,6 +41,7 @@
 
 #include "../data/decodermodel.h"
 #include "protocolitemlayer.h"
+#include "../ui/dscombobox.h"
 
 
 namespace pv {
@@ -135,7 +135,7 @@ private:
 
     QPushButton *_add_button;
     QPushButton *_del_all_button;
-    QComboBox *_protocol_combobox; 
+    DsComboBox *_protocol_combobox; 
     QVector <int > _protocol_index_list; 
     QVBoxLayout *_up_layout;
     QVector <ProtocolItemLayer*> _protocol_items; //protocol item layers
diff --git a/DSView/pv/dock/protocolitemlayer.cpp b/DSView/pv/dock/protocolitemlayer.cpp
index bde54209..4dfe4cfb 100644
--- a/DSView/pv/dock/protocolitemlayer.cpp
+++ b/DSView/pv/dock/protocolitemlayer.cpp
@@ -21,7 +21,6 @@
 
 #include "protocolitemlayer.h"
 #include "../dsvdef.h"
-#include <QtCore> 
 #include <assert.h> 
 #include "../config/appconfig.h"
  
@@ -40,7 +39,7 @@ ProtocolItemLayer::ProtocolItemLayer(QWidget *parent, QString protocolName, IPro
         _progress_label = new QLabel(parent);
         _set_button = new QPushButton(parent);
         _del_button = new QPushButton(parent);
-        _format_combox = new QComboBox(parent);
+        _format_combox = new DsComboBox(parent);
 
         QString iconPath = GetIconPath();
         _del_button->setFlat(true);
diff --git a/DSView/pv/dock/protocolitemlayer.h b/DSView/pv/dock/protocolitemlayer.h
index 45901ef4..3591cb9e 100644
--- a/DSView/pv/dock/protocolitemlayer.h
+++ b/DSView/pv/dock/protocolitemlayer.h
@@ -23,10 +23,9 @@
 
 #include <QHBoxLayout>
 #include <QPushButton>
-#include <QComboBox>
 #include <QLabel>
-#include <QComboBox>
 #include <QString>
+#include "../ui/dscombobox.h"
 
 class DecoderStatus;
  
@@ -68,7 +67,7 @@ private:
     QLabel *_progress_label;
     QPushButton *_set_button;
     QPushButton *_del_button;
-    QComboBox  *_format_combox;
+    DsComboBox  *_format_combox;
     IProtocolItemLayerCallback *m_callback;
     QString _protocolName;
     bool    m_bSetting;
diff --git a/DSView/pv/dock/searchdock.cpp b/DSView/pv/dock/searchdock.cpp
index bc3de15f..1d7cd1c3 100755
--- a/DSView/pv/dock/searchdock.cpp
+++ b/DSView/pv/dock/searchdock.cpp
@@ -261,7 +261,9 @@ void SearchDock::on_set()
 
         _search_value->setText(search_label);
         QFontMetrics fm = this->fontMetrics();
-        _search_value->setFixedWidth(fm.width(search_label)+_search_button->width()+20);
+        //fm.width(search_label)
+        int tw = fm.boundingRect(search_label).width();
+        _search_value->setFixedWidth(tw + _search_button->width()+20);
 
         if (new_pattern != _pattern) {
             _view.set_search_pos(_view.get_search_pos(), false);
diff --git a/DSView/pv/dock/searchdock.h b/DSView/pv/dock/searchdock.h
index 6e940bb3..d53c261e 100755
--- a/DSView/pv/dock/searchdock.h
+++ b/DSView/pv/dock/searchdock.h
@@ -25,7 +25,6 @@
 
 #include <QDockWidget>
 #include <QPushButton>
-#include <QComboBox>
 #include <QLabel>
 #include <QRadioButton>
 #include <QSlider>
@@ -43,6 +42,7 @@
 #include <vector>
 
 #include "../widgets/fakelineedit.h"
+#include "../ui/dscombobox.h"
 
 namespace pv {
 
diff --git a/DSView/pv/dock/triggerdock.cpp b/DSView/pv/dock/triggerdock.cpp
index d90da9fd..1b869fe0 100755
--- a/DSView/pv/dock/triggerdock.cpp
+++ b/DSView/pv/dock/triggerdock.cpp
@@ -71,7 +71,7 @@ TriggerDock::TriggerDock(QWidget *parent, SigSession *session) :
 
     _stages_label = new QLabel(_widget);
     _stages_label->setDisabled(true);
-    stages_comboBox = new QComboBox(_widget);
+    stages_comboBox = new DsComboBox(_widget);
     for (int i = 1; i <= TriggerStages; i++)
         stages_comboBox->addItem(QString::number(i));
     //stages_comboBox->setCurrentIndex(stages_comboBox->count() - 1);
@@ -569,7 +569,7 @@ void TriggerDock::setup_adv_tab()
     QRegularExpression value_rx("[10XRFCxrfc ]+");
     QValidator *value_validator = new QRegularExpressionValidator(value_rx, _stage_tabWidget);
     for (int i = 0; i < TriggerStages; i++) {
-        QComboBox *_logic_comboBox = new QComboBox(_stage_tabWidget);
+        DsComboBox *_logic_comboBox = new DsComboBox(_stage_tabWidget);
         _logic_comboBox->addItem(tr("Or"));
         _logic_comboBox->addItem(tr("And"));
         _logic_comboBox->setCurrentIndex(1);
@@ -586,7 +586,7 @@ void TriggerDock::setup_adv_tab()
         _count_spinBox->setRange(1, INT32_MAX);
         _count_spinBox->setButtonSymbols(QAbstractSpinBox::NoButtons);
         _count_spinBox_list.push_back(_count_spinBox);
-        QComboBox *_inv0_comboBox = new QComboBox(_stage_tabWidget);
+        DsComboBox *_inv0_comboBox = new DsComboBox(_stage_tabWidget);
         _inv0_comboBox->addItem(tr("=="));
         _inv0_comboBox->addItem(tr("!="));
         _inv0_comboBox_list.push_back(_inv0_comboBox);
@@ -598,7 +598,7 @@ void TriggerDock::setup_adv_tab()
         _value1_lineEdit->setInputMask(mask);
         _value1_lineEdit->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
         _value1_lineEdit_list.push_back(_value1_lineEdit);
-        QComboBox *_inv1_comboBox = new QComboBox(_stage_tabWidget);
+        DsComboBox *_inv1_comboBox = new DsComboBox(_stage_tabWidget);
         _inv1_comboBox->addItem(tr("=="));
         _inv1_comboBox->addItem(tr("!="));
         _inv1_comboBox_list.push_back(_inv1_comboBox);
@@ -734,7 +734,7 @@ void TriggerDock::setup_adv_tab()
     _serial_edge_lineEdit->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
 
     _serial_data_label = new QLabel(_serial_groupBox);
-    _serial_data_comboBox = new QComboBox(_serial_groupBox);
+    _serial_data_comboBox = new DsComboBox(_serial_groupBox);
     for(int i = 0; i < _cur_ch_num; i++)
         _serial_data_comboBox->addItem(QString::number(i));
 
@@ -746,7 +746,7 @@ void TriggerDock::setup_adv_tab()
     _serial_value_lineEdit->setInputMask(mask);
     _serial_value_lineEdit->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
 
-    _serial_bits_comboBox = new QComboBox(_serial_groupBox);
+    _serial_bits_comboBox = new DsComboBox(_serial_groupBox);
     for(int i = 1; i <= 16; i++)
         _serial_bits_comboBox->addItem(QString::number(i));
 
diff --git a/DSView/pv/dock/triggerdock.h b/DSView/pv/dock/triggerdock.h
index 336f5dc7..eef9cab3 100755
--- a/DSView/pv/dock/triggerdock.h
+++ b/DSView/pv/dock/triggerdock.h
@@ -25,7 +25,6 @@
 
 #include <QDockWidget>
 #include <QPushButton>
-#include <QComboBox>
 #include <QLabel>
 #include <QRadioButton>
 #include <QSlider>
@@ -43,6 +42,8 @@
 
 #include <vector>
 
+#include "../ui/dscombobox.h"
+
 namespace pv {
 
 class SigSession;
@@ -108,20 +109,20 @@ private:
     QSlider *_position_slider;
 
     QLabel *_stages_label;
-    QComboBox *stages_comboBox;
+    DsComboBox *stages_comboBox;
 
     QTabWidget *_stage_tabWidget;
 
     QVector <QGroupBox *> _stage_groupBox_list;
     QVector <QLabel *>    _mu_label_list;
-    QVector <QComboBox *> _logic_comboBox_list;
+    QVector <DsComboBox *> _logic_comboBox_list;
     QVector <QLineEdit *> _value0_lineEdit_list;
     QVector <QLineEdit *> _value0_ext32_lineEdit_list;
     QVector <QSpinBox *> _count_spinBox_list;
-    QVector <QComboBox *> _inv0_comboBox_list;
+    QVector <DsComboBox *> _inv0_comboBox_list;
     QVector <QLineEdit *> _value1_lineEdit_list;
     QVector <QLineEdit *> _value1_ext32_lineEdit_list;
-    QVector <QComboBox *> _inv1_comboBox_list;
+    QVector <DsComboBox *> _inv1_comboBox_list;
     QVector <QCheckBox *> _contiguous_checkbox_list;
 
     QTabWidget *_adv_tabWidget;
@@ -136,10 +137,10 @@ private:
     QLineEdit *_serial_edge_lineEdit;
     QLineEdit *_serial_edge_ext32_lineEdit;
     QLabel *_serial_data_label;
-    QComboBox *_serial_data_comboBox;
+    DsComboBox *_serial_data_comboBox;
     QLabel *_serial_value_label;
     QLineEdit *_serial_value_lineEdit;
-    QComboBox *_serial_bits_comboBox;
+    DsComboBox *_serial_bits_comboBox;
 
     QLabel *_serial_note_label;
     QLabel *_data_bits_label;
diff --git a/DSView/pv/dsvdef.h b/DSView/pv/dsvdef.h
index 9a5ef516..b2b26002 100644
--- a/DSView/pv/dsvdef.h
+++ b/DSView/pv/dsvdef.h
@@ -23,6 +23,7 @@
 #pragma once
 
 #include "../config.h"
+#include <QString>
 
 
 #ifdef DS_DEBUG_TRACE
diff --git a/DSView/pv/mainframe.cpp b/DSView/pv/mainframe.cpp
old mode 100755
new mode 100644
index 173c1427..a48232f6
--- a/DSView/pv/mainframe.cpp
+++ b/DSView/pv/mainframe.cpp
@@ -36,7 +36,6 @@
 #include <QDialogButtonBox>
 #include <QBitmap>
 #include <QResizeEvent>
-#include <QDesktopWidget>
 #include <QDesktopServices>
 #include <QPushButton>
 #include <QMessageBox> 
@@ -229,7 +228,15 @@ bool MainFrame::eventFilter(QObject *object, QEvent *event)
        return QFrame::eventFilter(object, event);
     }
 
-    if (!_bDraging && type == QEvent::MouseMove && (!(mouse_event->buttons() || Qt::NoButton))){
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    int x0 = (int)mouse_event->globalPosition().x();
+    int y0 = (int)mouse_event->globalPosition().y();
+#else
+    int x0 = mouse_event->globalX();
+    int y0 = mouse_event->globalY();
+#endif
+
+    if (!_bDraging && type == QEvent::MouseMove && (!(mouse_event->buttons() | Qt::NoButton))){
            if (object == _top_left) {
                 _hit_border = TopLeft;
                 setCursor(Qt::SizeFDiagCursor);
@@ -267,55 +274,55 @@ bool MainFrame::eventFilter(QObject *object, QEvent *event)
             if (!_freezing) {
                 switch (_hit_border) {
                 case TopLeft:
-                    newWidth = std::max(_dragStartGeometry.right() - mouse_event->globalX(), minimumWidth());
-                    newHeight = std::max(_dragStartGeometry.bottom() - mouse_event->globalY(), minimumHeight());
+                    newWidth = std::max(_dragStartGeometry.right() - x0, minimumWidth());
+                    newHeight = std::max(_dragStartGeometry.bottom() - y0, minimumHeight());
                     newLeft = geometry().left();
                     newTop = geometry().top();
                     if (newWidth > minimumWidth())
-                        newLeft = mouse_event->globalX();
+                        newLeft = x0;
                     if (newHeight > minimumHeight())
-                        newTop = mouse_event->globalY();
+                        newTop = y0;
                     setGeometry(newLeft, newTop, newWidth, newHeight);
                     saveWindowRegion();                    
                    break;
 
                 case BottomLeft:
-                    newWidth = std::max(_dragStartGeometry.right() - mouse_event->globalX(), minimumWidth());
-                    newHeight = std::max(mouse_event->globalY() - _dragStartGeometry.top(), minimumHeight());
+                    newWidth = std::max(_dragStartGeometry.right() - x0, minimumWidth());
+                    newHeight = std::max(y0 - _dragStartGeometry.top(), minimumHeight());
                     newLeft = geometry().left();
                     if (newWidth > minimumWidth())
-                        newLeft = mouse_event->globalX();
+                        newLeft = x0;
                     setGeometry(newLeft, _dragStartGeometry.top(), newWidth, newHeight);
                     saveWindowRegion();
                    break;
 
                 case TopRight:
-                    newWidth = std::max(mouse_event->globalX() - _dragStartGeometry.left(), minimumWidth());
-                    newHeight = std::max(_dragStartGeometry.bottom() - mouse_event->globalY(), minimumHeight());
+                    newWidth = std::max(x0 - _dragStartGeometry.left(), minimumWidth());
+                    newHeight = std::max(_dragStartGeometry.bottom() - y0, minimumHeight());
                     newTop = geometry().top();
                     if (newHeight > minimumHeight())
-                        newTop = mouse_event->globalY();
+                        newTop = y0;
                     setGeometry(_dragStartGeometry.left(), newTop, newWidth, newHeight);
                     saveWindowRegion();
                    break;
 
                 case BottomRight:
-                    newWidth = std::max(mouse_event->globalX() - _dragStartGeometry.left(), minimumWidth());
-                    newHeight = std::max(mouse_event->globalY() - _dragStartGeometry.top(), minimumHeight());
+                    newWidth = std::max(x0 - _dragStartGeometry.left(), minimumWidth());
+                    newHeight = std::max(y0 - _dragStartGeometry.top(), minimumHeight());
                     setGeometry(_dragStartGeometry.left(), _dragStartGeometry.top(), newWidth, newHeight);
                     saveWindowRegion();
                    break;
 
                 case Left:
-                    newWidth = _dragStartGeometry.right() - mouse_event->globalX();
+                    newWidth = _dragStartGeometry.right() - x0;
                     if (newWidth > minimumWidth()){
-                         setGeometry(mouse_event->globalX(), _dragStartGeometry.top(), newWidth, height());
+                         setGeometry(x0, _dragStartGeometry.top(), newWidth, height());
                          saveWindowRegion();
                     }                       
                    break;
 
                 case Right:
-                    newWidth = mouse_event->globalX() - _dragStartGeometry.left();
+                    newWidth = x0 - _dragStartGeometry.left();
                     if (newWidth > minimumWidth()){
                          setGeometry(_dragStartGeometry.left(), _dragStartGeometry.top(), newWidth, height());
                          saveWindowRegion();
@@ -323,15 +330,15 @@ bool MainFrame::eventFilter(QObject *object, QEvent *event)
                    break;
 
                 case Top:
-                    newHeight = _dragStartGeometry.bottom() - mouse_event->globalY();
+                    newHeight = _dragStartGeometry.bottom() - y0;
                     if (newHeight > minimumHeight()){
-                        setGeometry(_dragStartGeometry.left(), mouse_event->globalY(),width(), newHeight);
+                        setGeometry(_dragStartGeometry.left(), y0,width(), newHeight);
                         saveWindowRegion();
                     }                        
                    break;
 
                 case Bottom:
-                    newHeight = mouse_event->globalY() - _dragStartGeometry.top();
+                    newHeight = y0 - _dragStartGeometry.top();
                     if (newHeight > minimumHeight()){
                         setGeometry(_dragStartGeometry.left(), _dragStartGeometry.top(), width(), newHeight);
                         saveWindowRegion();
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
old mode 100755
new mode 100644
index 0869e39b..9f171525
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -39,6 +39,11 @@
 #include <QScreen>
 #include <QApplication>
 #include <QStandardPaths>
+#include <QScreen>
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <QGuiApplication>
+#endif
 
 #include "mainwindow.h"
 
@@ -867,7 +872,14 @@ void MainWindow::on_screenShot()
 {
     AppConfig &app = AppConfig::Instance();     
     QString default_name = app._userHistory.screenShotPath + "/DSView" + QDateTime::currentDateTime().toString("-yyMMdd-hhmmss");
-    QPixmap pixmap = QPixmap::grabWindow(winId()); 
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    QScreen *scr = QGuiApplication::primaryScreen();
+    QPixmap pixmap = scr->grabWindow(winId());
+#else
+    QPixmap pixmap = QPixmap::grabWindow(winId());
+#endif
+
     QString format = "png";
 
     QString fileName = QFileDialog::getSaveFileName(
diff --git a/DSView/pv/prop/binding/probeoptions.cpp b/DSView/pv/prop/binding/probeoptions.cpp
index cf916b04..87647d9c 100755
--- a/DSView/pv/prop/binding/probeoptions.cpp
+++ b/DSView/pv/prop/binding/probeoptions.cpp
@@ -23,6 +23,7 @@
 
 #include <QDebug>
 #include <QObject>
+#include <QLocale>
 
 #include <stdint.h>
 
diff --git a/DSView/pv/prop/enum.cpp b/DSView/pv/prop/enum.cpp
index d5bd8665..e70f1925 100755
--- a/DSView/pv/prop/enum.cpp
+++ b/DSView/pv/prop/enum.cpp
@@ -22,10 +22,10 @@
 
 #include <assert.h>
 
-#include <QComboBox>
 #include <QAbstractItemView>
 
 #include "enum.h"
+#include "../ui/dscombobox.h"
 
 using namespace boost;
 using namespace std;
@@ -62,7 +62,7 @@ QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
         return NULL;
     }
 
-	_selector = new QComboBox(parent);
+	_selector = new DsComboBox(parent);
 	for (unsigned int i = 0; i < _values.size(); i++) {
 		const pair<GVariant*, QString> &v = _values[i];
         _selector->addItem(v.second, QVariant::fromValue((void*)v.first));
diff --git a/DSView/pv/prop/enum.h b/DSView/pv/prop/enum.h
index 6b1214cd..41606271 100755
--- a/DSView/pv/prop/enum.h
+++ b/DSView/pv/prop/enum.h
@@ -28,7 +28,7 @@
 
 #include "property.h"
 
-class QComboBox;
+class DsComboBox;
 
 namespace pv {
 namespace prop {
@@ -53,7 +53,7 @@ private slots:
 private:
 	const std::vector< std::pair<GVariant*, QString> > _values;
 
-	QComboBox *_selector;
+	DsComboBox *_selector;
 };
 
 } // prop
diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp
index 50ceebe8..49b84f8b 100755
--- a/DSView/pv/toolbars/samplingbar.cpp
+++ b/DSView/pv/toolbars/samplingbar.cpp
@@ -79,9 +79,9 @@ SamplingBar::SamplingBar(SigSession *session, QWidget *parent) :
  
     _mode_button.setPopupMode(QToolButton::InstantPopup);
 
-    _device_selector.setSizeAdjustPolicy(QComboBox::AdjustToContents);
-    _sample_rate.setSizeAdjustPolicy(QComboBox::AdjustToContents);
-    _sample_count.setSizeAdjustPolicy(QComboBox::AdjustToContents);
+    _device_selector.setSizeAdjustPolicy(DsComboBox::AdjustToContents);
+    _sample_rate.setSizeAdjustPolicy(DsComboBox::AdjustToContents);
+    _sample_count.setSizeAdjustPolicy(DsComboBox::AdjustToContents);
     _device_selector.setMaximumWidth(ComboBoxMaxWidth);
  
     //_run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
diff --git a/DSView/pv/toolbars/samplingbar.h b/DSView/pv/toolbars/samplingbar.h
index 3459bb93..81ca3c8c 100755
--- a/DSView/pv/toolbars/samplingbar.h
+++ b/DSView/pv/toolbars/samplingbar.h
@@ -28,11 +28,11 @@
 #include <list>
 #include <map>
   
-#include <QComboBox>
 #include <QToolBar>
 #include <QToolButton>
 #include <QAction>
 #include <QMenu>
+#include "../ui/dscombobox.h"
 
 struct st_dev_inst;
 class QAction;
@@ -134,13 +134,13 @@ namespace pv
             bool                _sampling;
 
             QToolButton         _device_type;
-            QComboBox           _device_selector;
+            DsComboBox           _device_selector;
             std::map<const void *, DevInst*> _device_selector_map;
             bool                _updating_device_selector;
 
             QToolButton         _configure_button;
-            QComboBox           _sample_count;
-            QComboBox           _sample_rate;
+            DsComboBox           _sample_count;
+            DsComboBox           _sample_rate;
             bool                _updating_sample_rate;
             bool                _updating_sample_count;
 
diff --git a/DSView/pv/ui/dscombobox.cpp b/DSView/pv/ui/dscombobox.cpp
new file mode 100644
index 00000000..f405b6b9
--- /dev/null
+++ b/DSView/pv/ui/dscombobox.cpp
@@ -0,0 +1,72 @@
+/*
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
+ *
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+
+#include "dscombobox.h"
+#include <QFontMetrics>
+#include <QString>
+#include "../config/appconfig.h"
+
+DsComboBox::DsComboBox(QWidget *parent) : QComboBox(parent)
+{
+    _contentWidth = 0;
+    QComboBox::setSizeAdjustPolicy(QComboBox::AdjustToContents);   
+}
+  
+ void DsComboBox::addItem(const QString &atext, const QVariant &auserData)
+ {
+      QComboBox::addItem(atext, auserData);
+
+#ifdef Q_OS_DARWIN
+      if (!atext.isEmpty()){
+          QFontMetrics fm = this->fontMetrics();
+          int w = fm.boundingRect(atext).width();
+          if (w > _contentWidth){
+              _contentWidth = w;                                
+              this->setStyleSheet("QAbstractItemView{min-width:" + QString::number(w + 30) + "px;}");
+          }
+      }
+#endif
+ }
+
+ void DsComboBox::showPopup()
+ {
+	QComboBox::showPopup();
+
+#ifdef Q_OS_DARWIN
+
+    QWidget *popup = this->findChild<QFrame*>();
+    auto rc = popup->geometry();
+    int x = rc.left() + 6;
+    int y = rc.top();
+    int w = rc.right() - rc.left();
+    int h = rc.bottom() - rc.top() + 15;
+    popup->setGeometry(x, y, w, h);
+    
+    if (AppConfig::Instance()._frameOptions.style == "dark"){       
+        popup->setStyleSheet("background-color:#262626;");
+    }
+    else{
+        popup->setStyleSheet("background-color:#white;");
+    }
+#endif
+ }
diff --git a/DSView/pv/ui/dscombobox.h b/DSView/pv/ui/dscombobox.h
new file mode 100644
index 00000000..c8d1230e
--- /dev/null
+++ b/DSView/pv/ui/dscombobox.h
@@ -0,0 +1,46 @@
+
+/*
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
+ *
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+
+#ifndef DSCOMBOBOX_H
+#define DSCOMBOBOX_H
+
+#include <QComboBox>
+
+class DsComboBox : public QComboBox
+{
+    Q_OBJECT
+
+public:
+    explicit DsComboBox(QWidget *parent = nullptr);
+
+    void addItem(const QString &atext, const QVariant &userData = QVariant());
+
+protected:
+    void showPopup();
+
+private:
+    int _contentWidth;
+};
+
+#endif // DSCOMBOBOX_H
diff --git a/DSView/pv/view/decodetrace.cpp b/DSView/pv/view/decodetrace.cpp
index 1de94a9b..aea46fe0 100755
--- a/DSView/pv/view/decodetrace.cpp
+++ b/DSView/pv/view/decodetrace.cpp
@@ -27,7 +27,6 @@
 #include <boost/functional/hash.hpp>
 
 #include <QAction> 
-#include <QComboBox>
 #include <QFormLayout>
 #include <QLabel>
 #include <QMenu>
@@ -53,6 +52,7 @@
 #include "../view/cursor.h"
 #include "../toolbars/titlebar.h"
 #include "../dsvdef.h"
+#include "../ui/dscombobox.h"
 
 using namespace boost;
 using namespace std;
@@ -418,8 +418,8 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
 	} 
 
     //Add region combobox
-    _start_comboBox = new QComboBox(parent);
-    _end_comboBox = new QComboBox(parent);
+    _start_comboBox = new DsComboBox(parent);
+    _end_comboBox = new DsComboBox(parent);
     _start_comboBox->addItem(RegionStart);
     _end_comboBox->addItem(RegionEnd);
 
@@ -726,7 +726,7 @@ void DecodeTrace::create_decoder_form(
 	for(l = decoder->channels; l; l = l->next) {
 		const struct srd_channel *const pdch =
 			(struct srd_channel *)l->data;
-		QComboBox *const combo = create_probe_selector(parent, dec, pdch);
+		DsComboBox *const combo = create_probe_selector(parent, dec, pdch);
 
 		decoder_form->addRow(tr("<b>%1</b> (%2) *")
 			.arg(QString::fromUtf8(pdch->name))
@@ -742,7 +742,7 @@ void DecodeTrace::create_decoder_form(
 	for(l = decoder->opt_channels; l; l = l->next) {
 		const struct srd_channel *const pdch =
 			(struct srd_channel *)l->data;
-		QComboBox *const combo = create_probe_selector(parent, dec, pdch);
+		DsComboBox *const combo = create_probe_selector(parent, dec, pdch);
 		
 		decoder_form->addRow(tr("<b>%1</b> (%2)")
 			.arg(QString::fromUtf8(pdch->name))
@@ -770,7 +770,7 @@ void DecodeTrace::create_decoder_form(
       connect(group, SIGNAL(del_stack(data::decode::Decoder*)), this, SLOT(on_del_stack(data::decode::Decoder*)));
 }
 
-QComboBox* DecodeTrace::create_probe_selector(
+DsComboBox* DecodeTrace::create_probe_selector(
     QWidget *parent, const data::decode::Decoder *dec,
 	const srd_channel *const pdch)
 {
@@ -783,7 +783,7 @@ QComboBox* DecodeTrace::create_probe_selector(
     data::decode::Decoder *_dec = const_cast<data::decode::Decoder*>(dec);
 
     auto probe_iter = _dec->channels().find(pdch);
-	QComboBox *selector = new QComboBox(parent);
+	DsComboBox *selector = new DsComboBox(parent);
 
     selector->addItem("-", QVariant::fromValue(-1));
 
diff --git a/DSView/pv/view/decodetrace.h b/DSView/pv/view/decodetrace.h
index 5b361e5c..4f70df85 100755
--- a/DSView/pv/view/decodetrace.h
+++ b/DSView/pv/view/decodetrace.h
@@ -36,7 +36,7 @@
 struct srd_channel;
 struct srd_decoder;
 
-class QComboBox;
+class DsComboBox;
 
 namespace pv {
 
@@ -66,7 +66,7 @@ class DecodeTrace : public Trace
 private:
 	struct ProbeSelector
 	{
-		const QComboBox *_combo;
+		const DsComboBox *_combo;
         const pv::data::decode::Decoder *_decoder;
 		const srd_channel *_pdch;
 	};
@@ -180,7 +180,7 @@ private:
         pv::data::decode::Decoder *dec,
         QWidget *parent, QFormLayout *form);
 
-	QComboBox* create_probe_selector(QWidget *parent,
+	DsComboBox* create_probe_selector(QWidget *parent,
 		const pv::data::decode::Decoder *dec,
 		const srd_channel *const pdch);
 
@@ -219,8 +219,8 @@ private:
     int 			_start_count;
 	int			 	_end_count;
 	
-    QComboBox 		*_start_comboBox;
-	QComboBox 		*_end_comboBox;
+    DsComboBox 		*_start_comboBox;
+	DsComboBox 		*_end_comboBox;
 	QFormLayout 	*_pub_input_layer;
     int				 _progress;
 
diff --git a/DSView/pv/view/spectrumtrace.cpp b/DSView/pv/view/spectrumtrace.cpp
index 8e6bb11e..3527a013 100755
--- a/DSView/pv/view/spectrumtrace.cpp
+++ b/DSView/pv/view/spectrumtrace.cpp
@@ -23,6 +23,7 @@
 #include <math.h>
 #include <QTextStream>
 #include <boost/functional/hash.hpp>
+#include <stdlib.h>
 
 #include "spectrumtrace.h"
 #include "../sigsession.h"
@@ -208,12 +209,17 @@ QString SpectrumTrace::format_freq(double freq, unsigned precision)
         const int prefix = floor((order - FirstSIPrefixPower)/ 3.0f);
         const double divider = pow(10.0, max(prefix * 3.0 + FirstSIPrefixPower, 0.0));
 
-        QString s;
-        QTextStream ts(&s);
-        ts.setRealNumberPrecision(precision);
-        ts << fixed << freq / divider <<
-            FreqPrefixes[prefix] << "Hz";
-        return s;
+        //QString s;
+        //QTextStream ts(&s);
+        //ts.setRealNumberPrecision(precision);
+        //ts << fixed << freq / divider << FreqPrefixes[prefix] << "Hz";
+        //return s;
+        char buf[20] = {0};
+        char format[10] = {0}; 
+        sprintf(format, "%%.%df%%s", precision);
+        QString prev = FreqPrefixes[prefix] + "Hz";
+        sprintf(buf, format, freq / divider, prev.toLatin1().data());
+        return QString(buf);        
     }
 }
 
diff --git a/DSView/pv/view/viewport.cpp b/DSView/pv/view/viewport.cpp
index ff65b2fd..6bbaa6da 100755
--- a/DSView/pv/view/viewport.cpp
+++ b/DSView/pv/view/viewport.cpp
@@ -1597,7 +1597,9 @@ void Viewport::paintMeasure(QPainter &p, QColor fore, QColor back)
             QString delta_text = _view.get_index_delta(_edge_start, _edge_end) +
                                  "/" + QString::number(delta);
             QFontMetrics fm = this->fontMetrics();
-            const int rectW = fm.width(delta_text) + 60;
+          //  const int rectW = fm.width(delta_text) + 60;
+            const int rectW = fm.boundingRect(delta_text).width() + 60;
+
             const int rectH = fm.height() + 10;
             //const int rectY = (_cur_aftY >= _cur_preY) ? _cur_preY_top : _cur_preY_bottom;
             //const int rectX = (_cur_aftX >= _cur_preX) ? _cur_preX : _cur_preX - rectW;
diff --git a/DSView/pv/view/viewstatus.cpp b/DSView/pv/view/viewstatus.cpp
index 635c02d4..ccd3872a 100755
--- a/DSView/pv/view/viewstatus.cpp
+++ b/DSView/pv/view/viewstatus.cpp
@@ -54,7 +54,12 @@ ViewStatus::ViewStatus(SigSession *session, View &parent) :
 void ViewStatus::paintEvent(QPaintEvent *)
 {
     QStyleOption opt;
-    opt.init(this);
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+      opt.initFrom(this);
+ #else
+      opt.init(this);
+ #endif
+
     QPainter p(this);
     style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
 
diff --git a/libsigrok4DSL/config.h b/libsigrok4DSL/config.h
new file mode 100644
index 00000000..1c40c8d3
--- /dev/null
+++ b/libsigrok4DSL/config.h
@@ -0,0 +1,192 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+#ifndef SR_CONFIG_H
+#define SR_CONFIG_H    /* To stop multiple inclusions. */
+
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* DreamSourceLab hardware driver support */
+#define HAVE_DSL_DEVICE 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Demo driver support */
+#define HAVE_LA_DEMO 1
+
+/* Specifies whether we have libserialport. */
+/* #undef HAVE_LIBSERIALPORT */
+
+/* Specifies whether we have a libusb.h header. */
+#define HAVE_LIBUSB_1_0 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `memset' function. */
+#define HAVE_MEMSET 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strchr' function. */
+#define HAVE_STRCHR 1
+
+/* Define to 1 if you have the `strcspn' function. */
+#define HAVE_STRCSPN 1
+
+/* Define to 1 if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define to 1 if you have the `strerror' function. */
+#define HAVE_STRERROR 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strncasecmp' function. */
+#define HAVE_STRNCASECMP 1
+
+/* Define to 1 if you have the `strstr' function. */
+#define HAVE_STRSTR 1
+
+/* Define to 1 if you have the `strtol' function. */
+#define HAVE_STRTOL 1
+
+/* Define to 1 if you have the `strtoul' function. */
+#define HAVE_STRTOUL 1
+
+/* Define to 1 if you have the `strtoull' function. */
+#define HAVE_STRTOULL 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <termios.h> header file. */
+#define HAVE_TERMIOS_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "libsigrok4DSL"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "support@dreamsourcelab.com"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "libsigrok4DSL"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libsigrok4DSL 0.2.0"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libsigrok4DSL"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL "http://www.dreamsourcelab.com"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "0.2.0"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "0.2.0"
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* #  undef WORDS_BIGENDIAN */
+# endif
+#endif
+
+/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   #define below would cause a syntax error. */
+/* #undef _UINT32_T */
+
+/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   #define below would cause a syntax error. */
+/* #undef _UINT64_T */
+
+/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   #define below would cause a syntax error. */
+/* #undef _UINT8_T */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
+
+/* Define to the type of a signed integer type of width exactly 16 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef int16_t */
+
+/* Define to the type of a signed integer type of width exactly 32 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef int32_t */
+
+/* Define to the type of a signed integer type of width exactly 64 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef int64_t */
+
+/* Define to the type of a signed integer type of width exactly 8 bits if such
+   a type exists and the standard includes do not define it. */
+/* #undef int8_t */
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+/* Define to the type of an unsigned integer type of width exactly 16 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef uint16_t */
+
+/* Define to the type of an unsigned integer type of width exactly 32 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef uint32_t */
+
+/* Define to the type of an unsigned integer type of width exactly 64 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef uint64_t */
+
+/* Define to the type of an unsigned integer type of width exactly 8 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef uint8_t */
+
+#endif /* SR_CONFIG_H */
diff --git a/libsigrok4DSL/output/gnuplot.c b/libsigrok4DSL/output/gnuplot.c
index 92b01324..1644fceb 100755
--- a/libsigrok4DSL/output/gnuplot.c
+++ b/libsigrok4DSL/output/gnuplot.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <inttypes.h>
 #include <glib.h>
-#include "config.h" /* Needed for PACKAGE_STRING and others. */
+#include "../config.h" /* Needed for PACKAGE_STRING and others. */
 
 #define LOG_PREFIX "output/gnuplot"
 
diff --git a/qtpro/DSView.pro b/qtpro/DSView.pro
index 5fd987c2..5d30bed6 100644
--- a/qtpro/DSView.pro
+++ b/qtpro/DSView.pro
@@ -163,6 +163,7 @@ SOURCES += \
     ../DSView/pv/ZipMaker.cpp \
     ../DSView/pv/data/decode/AnnotationResTable.cpp \
     ../DSView/pv/ui/msgbox.cpp \
+    ../DSView/pv/ui/dscombobox.cpp \
     ../DSView/pv/dock/protocolitemlayer.cpp \
     ../DSView/pv/config/appconfig.cpp \
     ../DSView/pv/dsvdef.cpp \
@@ -262,6 +263,7 @@ HEADERS  += \
     ../DSView/pv/ZipMaker.h \
     ../DSView/pv/data/decode/AnnotationResTable.h \
     ../DSView/pv/ui/msgbox.h \
+    ../DSView/pv/ui/dscombobox.h \
     ../DSView/pv/dock/protocolitemlayer.h \
     ../DSView/pv/config/appconfig.h \
     ../DSView/pv/dsvdef.h \
diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user
index 8871a8fc..c4f4a0b2 100644
--- a/qtpro/DSView.pro.user
+++ b/qtpro/DSView.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2021-11-19T11:46:54. -->
+<!-- Written by QtCreator 4.11.0, 2021-11-22T18:49:27. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

From f85170e93f1dc4697439323b773a7b0cdf86cc54 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Tue, 23 Nov 2021 17:24:15 +0800
Subject: [PATCH 33/58] update the app data directory get mode,fix switch
 language bug at macos

---
 DSView/main.cpp                          | 26 ++++++--------------
 DSView/pv/appcontrol.cpp                 | 22 ++++++-----------
 DSView/pv/config/appconfig.cpp           | 31 ++++++++++++++++++++++--
 DSView/pv/config/appconfig.h             |  6 +++++
 DSView/pv/devicemanager.cpp              |  3 ++-
 DSView/pv/dialogs/about.cpp              |  7 +-----
 DSView/pv/interface/uicallback.h         |  5 ++++
 DSView/pv/mainframe.cpp                  | 13 ++++++++--
 DSView/pv/mainwindow.cpp                 | 28 ++++++---------------
 DSView/pv/mainwindow.h                   | 13 ++++++----
 DSView/pv/prop/binding/deviceoptions.cpp | 24 +++++++++---------
 DSView/pv/prop/binding/probeoptions.cpp  | 11 ++++-----
 DSView/pv/toolbars/filebar.cpp           | 11 +++------
 DSView/pv/toolbars/logobar.cpp           | 29 +++++++++++-----------
 DSView/pv/toolbars/logobar.h             | 13 ++++++----
 DSView/pv/ui/dscombobox.h                |  3 ++-
 DSView/pv/view/devmode.cpp               |  6 ++---
 17 files changed, 130 insertions(+), 121 deletions(-)

diff --git a/DSView/main.cpp b/DSView/main.cpp
index 210f9241..978f37b2 100755
--- a/DSView/main.cpp
+++ b/DSView/main.cpp
@@ -38,8 +38,6 @@
 #include "config.h"
 #include "pv/appcontrol.h"
 
-char DS_RES_PATH[256];
-
 void usage()
 {
 	fprintf(stdout,
@@ -53,6 +51,8 @@ void usage()
 		"\n", DS_BIN_NAME, DS_DESCRIPTION);
 } 
 
+char DS_RES_PATH[256] = {0};
+
 int main(int argc, char *argv[])
 {  
 	int ret = 0; 
@@ -142,24 +142,12 @@ int main(int argc, char *argv[])
     if (argcFinal - optind > 1) {
 		fprintf(stderr, "Only one file can be openened.\n");
 		return 1;
-    } else if (argcFinal - optind == 1)
+    } else if (argcFinal - optind == 1){
         open_file = argvFinal[argcFinal - 1];
- 
-    QDir dir(QCoreApplication::applicationDirPath());
- 
-#ifdef Q_OS_LINUX
-    if (dir.cd("..") &&
-        dir.cd("share") &&
-        dir.cd("DSView") &&
-        dir.cd("res")) {
-		// the path command like: cd ../share/DSView/res
-        QString res_dir = dir.absolutePath() + "/";
-        strcpy(DS_RES_PATH, res_dir.toUtf8().data());
-    } else {
-        qDebug() << "DSView run ERROR: config files don't exist.";
-        return 1;
-    }
-#endif
+	}
+
+	QString path = GetAppDataDir();
+	strcpy(DS_RES_PATH, path.toUtf8().data());
 
 //#ifdef Q_OS_DARWIN 
 //#endif
diff --git a/DSView/pv/appcontrol.cpp b/DSView/pv/appcontrol.cpp
index fb477aea..34fb8f99 100644
--- a/DSView/pv/appcontrol.cpp
+++ b/DSView/pv/appcontrol.cpp
@@ -31,6 +31,7 @@
 #include "devicemanager.h"
 #include "sigsession.h"
 #include "dsvdef.h"
+#include "config/appconfig.h"
 
 AppControl::AppControl()
 {
@@ -71,23 +72,14 @@ bool AppControl::Init()
     {
         m_error = "DSView run ERROR: libsigrok init failed.";
         return false;
-    }
-
-   // const char *decoderScriptDir = "/home/lala/tmpdir/any";
-    //const char * decoderScriptDir = NULL;
-
-    char decoderScriptDir[256] = {0};
-    QDir dir(QCoreApplication::applicationDirPath());
-#ifdef Q_OS_LINUX  
-    dir.cd("../share/DSView/decoders");    
-#else
-    dir.cd("decoders");
-#endif
-
-    strcpy(decoderScriptDir, dir.absolutePath().toUtf8().data());
+    } 
+    
+    QString dir = GetAppDataDir() + "/decoders";
+    char path[256] = {0};
+    strcpy(path, dir.toUtf8().data());
 
     // Initialise libsigrokdecode
-    if (srd_init(decoderScriptDir) != SRD_OK)
+    if (srd_init(path) != SRD_OK)
     {
         m_error = "ERROR: libsigrokdecode init failed.";
         return false;
diff --git a/DSView/pv/config/appconfig.cpp b/DSView/pv/config/appconfig.cpp
index 42bc78d3..50aeb5cb 100644
--- a/DSView/pv/config/appconfig.cpp
+++ b/DSView/pv/config/appconfig.cpp
@@ -24,6 +24,9 @@
 #include <QApplication>
 #include <QSettings>
 #include <QLocale>
+#include <QDir>
+#include <QDebug>
+#include <assert.h>
   
 #define MAX_PROTOCOL_FORMAT_LIST 15
 
@@ -126,10 +129,14 @@ void _loadFrame(FrameOptions &o, QSettings &st){
     o.windowState = st.value("windowState", QByteArray()).toByteArray();
     st.endGroup();
 
-    if (o.language == -1){
+    if (o.language == -1 || (o.language != LAN_CN && o.language != LAN_EN)){
         //get local language
         QLocale locale;
-        o.language = locale.language();
+
+        if (QLocale::languageToString(locale.language()) == "Chinese")
+            o.language = LAN_CN;            
+        else
+            o.language = LAN_EN; 
     }
 }
 
@@ -282,3 +289,23 @@ QString GetIconPath()
     }
     return ":/icons/" + style;
 }
+
+QString GetAppDataDir()
+{
+//applicationDirPath not end with '/'
+#ifdef Q_OS_LINUX
+    QDir dir(QCoreApplication::applicationDirPath());
+    if (dir.cd("..") && dir.cd("share") &&dir.cd("DSView"))
+    {
+         return dir.absolutePath();        
+    }
+    qDebug() << "dir is not exists:" << QCoreApplication::applicationDirPath() + "/../share/DSView";
+    assert(false);   
+#else
+    return QCoreApplication::applicationDirPath();
+#endif
+}
+
+QString GetResourceDir(){
+    return GetAppDataDir() + "/res";
+}
diff --git a/DSView/pv/config/appconfig.h b/DSView/pv/config/appconfig.h
index f01678ad..f9cdb6a8 100644
--- a/DSView/pv/config/appconfig.h
+++ b/DSView/pv/config/appconfig.h
@@ -27,6 +27,8 @@
 #include <QString>
 #include <QByteArray>
 
+#define LAN_CN  25
+#define LAN_EN  31
   
 //--------------------api---
 
@@ -34,6 +36,10 @@ QString GetDirectoryName(QString path);
 
 QString GetIconPath();
 
+QString GetAppDataDir();
+
+QString GetResourceDir();
+
 //------------------class
   
 class StringPair
diff --git a/DSView/pv/devicemanager.cpp b/DSView/pv/devicemanager.cpp
index 51a4a128..448272ef 100755
--- a/DSView/pv/devicemanager.cpp
+++ b/DSView/pv/devicemanager.cpp
@@ -33,6 +33,7 @@
 #include <QObject>
 #include <QDebug>
 #include <QDir>
+#include "config/appconfig.h"
 
 using std::list;
 using std::map;
@@ -116,7 +117,7 @@ void DeviceManager::driver_scan(
 
     // Check If DSL hardware driver
     if (strncmp(driver->name, "virtual", 7)) {
-        QDir dir(DS_RES_PATH);
+        QDir dir(GetResourceDir());
         if (!dir.exists())
             return;
     }
diff --git a/DSView/pv/dialogs/about.cpp b/DSView/pv/dialogs/about.cpp
index 3392d2a0..920dfeaa 100755
--- a/DSView/pv/dialogs/about.cpp
+++ b/DSView/pv/dialogs/about.cpp
@@ -76,13 +76,8 @@ About::About(QWidget *parent) :
                         .arg("http://sigrok.org/");
 
     QString changlogs = tr("<font size=16>Changelogs</font><br />");
-    #ifndef Q_OS_LINUX
-    QDir dir(QCoreApplication::applicationDirPath());
-    #else
-    QDir dir(DS_RES_PATH);
-    dir.cdUp();
-    #endif
 
+    QDir dir(GetAppDataDir());
     AppConfig &app = AppConfig::Instance(); 
     int lan = app._frameOptions.language;
 
diff --git a/DSView/pv/interface/uicallback.h b/DSView/pv/interface/uicallback.h
index b7ae0054..58c2394c 100644
--- a/DSView/pv/interface/uicallback.h
+++ b/DSView/pv/interface/uicallback.h
@@ -27,3 +27,8 @@ class IDlgCallback
 public:
     virtual void OnDlgResult(bool bYes)=0;
 };
+
+class IMainForm{
+public:
+    virtual void switchLanguage(int language)=0;
+};
diff --git a/DSView/pv/mainframe.cpp b/DSView/pv/mainframe.cpp
index a48232f6..cd9b1e71 100644
--- a/DSView/pv/mainframe.cpp
+++ b/DSView/pv/mainframe.cpp
@@ -42,6 +42,7 @@
 #include <QScreen>
 #include <QApplication>
 #include <QDebug>
+#include <QFile>
 
 #include "dsvdef.h"
 #include "config/appconfig.h"
@@ -449,12 +450,18 @@ void MainFrame::show_doc()
         dialogs::DSDialog dlg(this, true);
         dlg.setTitle(tr("Document"));
 
+        QString path = GetAppDataDir() + "/showDoc" + QString::number(lan)+ ".png";
+        if (!QFile::exists(path)){
+            path = ":/icons/showDoc"+QString::number(lan)+".png";
+        }
+
         QLabel tipsLabel;
-        tipsLabel.setPixmap(QPixmap(":/icons/showDoc"+QString::number(lan)+".png"));
+        tipsLabel.setPixmap(path);
+
         QMessageBox msg;
         msg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);
         msg.setContentsMargins(0, 0, 0, 0);
-        connect(&msg, SIGNAL(buttonClicked(QAbstractButton*)), &dlg, SLOT(accept()));
+       
         QPushButton *noMoreButton = msg.addButton(tr("Not Show Again"), QMessageBox::ActionRole);
         msg.addButton(tr("Ignore"), QMessageBox::ActionRole);
         QPushButton *openButton = msg.addButton(tr("Open"), QMessageBox::ActionRole);
@@ -465,6 +472,8 @@ void MainFrame::show_doc()
         layout.setContentsMargins(0, 0, 0, 0);
 
         dlg.layout()->addLayout(&layout);
+        connect(&msg, SIGNAL(buttonClicked(QAbstractButton*)), &dlg, SLOT(accept()));
+
         dlg.exec();
 
         if (msg.clickedButton() == openButton) {
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index 9f171525..44d528b6 100644
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -286,7 +286,6 @@ void MainWindow::setup_ui()
     connect(_file_bar, SIGNAL(sig_store_session(QString)), this, SLOT(on_store_session(QString)));
 
     //logobar
-    connect(_logo_bar, SIGNAL(sig_setLanguage(int)), this, SLOT(on_setLanguage(int)));
     connect(_logo_bar, SIGNAL(sig_open_doc()), this, SLOT(on_open_doc()));
 
 
@@ -302,6 +301,8 @@ void MainWindow::setup_ui()
     connect(_sampling_bar, SIGNAL(sig_show_calibration()), _view, SLOT(show_calibration()));
 
     connect(_dso_trigger_widget, SIGNAL(set_trig_pos(int)), _view, SLOT(set_trig_pos(int))); 
+
+    _logo_bar->set_mainform_callback(this);
 }
 
 
@@ -397,12 +398,8 @@ void MainWindow::update_device_list()
     } else {
         _file_bar->set_settings_en(false);
         _logo_bar->dsl_connected(false);
-        #ifdef Q_OS_LINUX
-            QDir dir(DS_RES_PATH);
-        #else
-            QDir dir(QCoreApplication::applicationDirPath());
-            assert(dir.cd("res"));
-        #endif
+
+        QDir dir(GetResourceDir());
         if (dir.exists()) {
             QString str = dir.absolutePath() + "/";
             QString ses_name = str +
@@ -1395,11 +1392,7 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event)
     }
     return false;
 }
-
- void MainWindow::on_setLanguage(int language)
- {
-     switchLanguage(language);
- }
+ 
  
 void MainWindow::switchLanguage(int language)
 {
@@ -1414,7 +1407,7 @@ void MainWindow::switchLanguage(int language)
         app.SaveFrame();
     }
 
-    if (language != QLocale::English)
+    if (language == LAN_CN)
     {
         _qtTrans.load(":/qt_" + QString::number(language));
         qApp->installTranslator(&_qtTrans);
@@ -1464,13 +1457,8 @@ void MainWindow::on_open_doc(){
 }
 
 void MainWindow::openDoc()
-{
-    #ifndef Q_OS_LINUX
-    QDir dir(QCoreApplication::applicationDirPath());
-    #else
-    QDir dir(DS_RES_PATH);
-    dir.cdUp();
-    #endif
+{ 
+    QDir dir(GetAppDataDir());
     AppConfig &app = AppConfig::Instance(); 
     int lan = app._frameOptions.language;
     QDesktopServices::openUrl(
diff --git a/DSView/pv/mainwindow.h b/DSView/pv/mainwindow.h
index 446844b7..8cbf35a9 100755
--- a/DSView/pv/mainwindow.h
+++ b/DSView/pv/mainwindow.h
@@ -30,6 +30,7 @@
 #include "dialogs/dsmessagebox.h"
 #include "interface/icallbacks.h"
 #include "eventobject.h"
+#include "interface/uicallback.h"
 
 class QAction;
 class QMenuBar;
@@ -72,7 +73,7 @@ using namespace pv::device;
  
 //The mainwindow,referenced by MainFrame
 //TODO: create graph view,toolbar,and show device list
-class MainWindow : public QMainWindow, public ISessionCallback
+class MainWindow : public QMainWindow, public ISessionCallback, public IMainForm
 {
 	Q_OBJECT
 
@@ -83,8 +84,7 @@ public:
     explicit MainWindow(QWidget *parent = 0);
 
     void openDoc();
-    void switchLanguage(int language);
-
+  
 private:
     void closeEvent(QCloseEvent *event);
 
@@ -119,8 +119,7 @@ private slots:
     bool on_store_session(QString name);     
     void device_detach_post();
     void device_changed(bool close);
-    void on_device_selected();      
-    void on_setLanguage(int language);
+    void on_device_selected();       
 
     void on_capture_state_changed(int state);
     void on_data_updated();
@@ -139,6 +138,10 @@ private slots:
 signals:
     void prgRate(int progress);
 
+//IMainForm
+public:
+   void switchLanguage(int language);
+
 //ISessionCallback
 public:
     void session_save(); 
diff --git a/DSView/pv/prop/binding/deviceoptions.cpp b/DSView/pv/prop/binding/deviceoptions.cpp
index a0e051c2..0b25ba33 100755
--- a/DSView/pv/prop/binding/deviceoptions.cpp
+++ b/DSView/pv/prop/binding/deviceoptions.cpp
@@ -20,20 +20,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <boost/bind.hpp>
-
-#include <QDebug>
-#include <QObject>
-#include <QLocale>
-
-#include <stdint.h>
-
 #include "deviceoptions.h"
 
-#include <pv/prop/bool.h>
-#include <pv/prop/double.h>
-#include <pv/prop/enum.h>
-#include <pv/prop/int.h>
+#include <boost/bind.hpp>
+#include <QDebug>
+#include <QObject>
+#include <stdint.h>
+
+#include "../bool.h"
+#include "../double.h"
+#include "../enum.h"
+#include "../int.h"
+#include "../config/appconfig.h"
 
 using namespace boost;
 using namespace std;
@@ -73,7 +71,7 @@ DeviceOptions::DeviceOptions(struct sr_dev_inst *sdi) :
         if (sr_config_get(_sdi->driver, _sdi, NULL, NULL, SR_CONF_LANGUAGE, &gvar_tmp) == SR_OK) {
             if (gvar_tmp != NULL) {
                 int language = g_variant_get_int16(gvar_tmp);
-                if (language == QLocale::Chinese)
+                if (language == LAN_CN)
                     label_char = info->label_cn;
                 g_variant_unref(gvar_tmp);
             }
diff --git a/DSView/pv/prop/binding/probeoptions.cpp b/DSView/pv/prop/binding/probeoptions.cpp
index 87647d9c..ec876265 100755
--- a/DSView/pv/prop/binding/probeoptions.cpp
+++ b/DSView/pv/prop/binding/probeoptions.cpp
@@ -19,21 +19,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include "probeoptions.h"
+
 #include <boost/bind.hpp>
 
 #include <QDebug>
 #include <QObject>
-#include <QLocale>
-
 #include <stdint.h>
-
-#include "probeoptions.h"
-
 #include <pv/prop/bool.h>
 #include <pv/prop/double.h>
 #include <pv/prop/enum.h>
 #include <pv/prop/int.h>
 
+#include "../../config/appconfig.h"
+
 using namespace boost;
 using namespace std;
 
@@ -74,7 +73,7 @@ ProbeOptions::ProbeOptions(struct sr_dev_inst *sdi,
         if (sr_config_get(_sdi->driver, _sdi, NULL, NULL, SR_CONF_LANGUAGE, &gvar_tmp) == SR_OK) {
             if (gvar_tmp != NULL) {
                 int language = g_variant_get_int16(gvar_tmp);
-                if (language == QLocale::Chinese)
+                if (language == LAN_CN)
                     label_char = info->label_cn;
                 g_variant_unref(gvar_tmp);
             }
diff --git a/DSView/pv/toolbars/filebar.cpp b/DSView/pv/toolbars/filebar.cpp
index fb708f96..81996711 100755
--- a/DSView/pv/toolbars/filebar.cpp
+++ b/DSView/pv/toolbars/filebar.cpp
@@ -191,13 +191,8 @@ void FileBar::on_actionLoad_triggered()
 }
 
 void FileBar::on_actionDefault_triggered()
-{
-#ifdef Q_OS_LINUX
-    QDir dir(DS_RES_PATH);
-#else
-    QDir dir(QCoreApplication::applicationDirPath());
-    assert(dir.cd("res"));
-#endif
+{ 
+    QDir dir(GetResourceDir());
     if (!dir.exists()) { 
           MsgBox::Show(NULL, "Cannot find default session file for this device!", this);
           return;
@@ -205,7 +200,7 @@ void FileBar::on_actionDefault_triggered()
 
     QString driver_name = _session->get_device()->name();
     QString mode_name = QString::number(_session->get_device()->dev_inst()->mode);
-    int language = QLocale::English;
+    int language = LAN_EN;
     GVariant *gvar_tmp = _session->get_device()->get_config(NULL, NULL, SR_CONF_LANGUAGE);
     if (gvar_tmp != NULL) {
         language = g_variant_get_int16(gvar_tmp);
diff --git a/DSView/pv/toolbars/logobar.cpp b/DSView/pv/toolbars/logobar.cpp
index 01da8850..c08d2bc1 100755
--- a/DSView/pv/toolbars/logobar.cpp
+++ b/DSView/pv/toolbars/logobar.cpp
@@ -27,6 +27,7 @@
 #include <QDesktopServices>
 #include <QUrl>
 #include <QApplication>
+#include <assert.h>
 
 #include "logobar.h"
 #include "../dialogs/about.h"
@@ -43,6 +44,8 @@ LogoBar::LogoBar(SigSession *session, QWidget *parent) :
     _session(session),
     _logo_button(this)
 {
+    _mainForm  = NULL;
+
     setMovable(false);
     setContentsMargins(0,0,0,0);
 
@@ -118,7 +121,7 @@ void LogoBar::retranslateUi()
     _issue->setText(tr("&Bug Report"));
 
     AppConfig &app = AppConfig::Instance(); 
-    if (app._frameOptions.language == QLocale::Chinese)
+    if (app._frameOptions.language == LAN_CN)
         _language->setIcon(QIcon(":/icons/Chinese.svg"));
     else
         _language->setIcon(QIcon(":/icons/English.svg"));
@@ -170,14 +173,17 @@ void LogoBar::on_actionEn_triggered()
 {
     _language->setIcon(QIcon::fromTheme("file",
         QIcon(":/icons/English.svg")));
-    sig_setLanguage(QLocale::English);
+
+    assert(_mainForm);
+    _mainForm->switchLanguage(LAN_EN);
 }
 
 void LogoBar::on_actionCn_triggered()
 {
     _language->setIcon(QIcon::fromTheme("file",
         QIcon(":/icons/Chinese.svg")));
-    sig_setLanguage(QLocale::Chinese);   
+    assert(_mainForm);
+    _mainForm->switchLanguage(LAN_CN);  
 }
 
 void LogoBar::on_actionAbout_triggered()
@@ -187,22 +193,15 @@ void LogoBar::on_actionAbout_triggered()
 }
 
 void LogoBar::on_actionManual_triggered()
-{
-    #ifndef Q_OS_LINUX
-    QDir dir(QCoreApplication::applicationDirPath());
-    #else
-    QDir dir(DS_RES_PATH);
-    dir.cdUp();
-    #endif
-    QDesktopServices::openUrl(
-                QUrl("file:///"+dir.absolutePath() + "/ug.pdf"));
+{ 
+    QDir dir(GetAppDataDir());
+    QDesktopServices::openUrl( QUrl("file:///"+dir.absolutePath() + "/ug.pdf"));
 }
 
 void LogoBar::on_actionIssue_triggered()
 {
-    QDir dir(QCoreApplication::applicationDirPath());
-    QDesktopServices::openUrl(
-                QUrl(QLatin1String("https://github.com/DreamSourceLab/DSView/issues")));
+    QDir dir(GetAppDataDir());
+    QDesktopServices::openUrl(QUrl(QLatin1String("https://github.com/DreamSourceLab/DSView/issues")));
 }
 
 void LogoBar::enable_toggle(bool enable)
diff --git a/DSView/pv/toolbars/logobar.h b/DSView/pv/toolbars/logobar.h
index 19cf5d3c..a3f8982b 100755
--- a/DSView/pv/toolbars/logobar.h
+++ b/DSView/pv/toolbars/logobar.h
@@ -27,10 +27,11 @@
 #include <QToolButton>
 #include <QAction>
 #include <QMenu>
+#include <libsigrok4DSL/libsigrok.h>
 
 #include "../sigsession.h"
+#include "../interface/uicallback.h"
 
-#include <libsigrok4DSL/libsigrok.h>
 
 namespace pv {
 namespace toolbars {
@@ -49,6 +50,10 @@ public:
    //show the hardware device conneted status with logo picture
     void dsl_connected(bool conn);
 
+    inline void set_mainform_callback(IMainForm *callback){
+        _mainForm = callback;
+    }
+
 private:
     void changeEvent(QEvent *event);
     void retranslateUi();
@@ -59,10 +64,7 @@ private:
     void show_session_error(
         const QString text, const QString info_text);
 
-signals:
-    //post event message to set language, MainWindow class receive it
-    void sig_setLanguage(int language);  
-
+signals: 
     //post event message to open user help document, MainWindow class receive it
     void sig_open_doc(); 
 
@@ -89,6 +91,7 @@ private:
     QAction *_about;
     QAction *_manual;
     QAction *_issue;
+    IMainForm *_mainForm;
 };
 
 } // namespace toolbars
diff --git a/DSView/pv/ui/dscombobox.h b/DSView/pv/ui/dscombobox.h
index c8d1230e..00820d50 100644
--- a/DSView/pv/ui/dscombobox.h
+++ b/DSView/pv/ui/dscombobox.h
@@ -21,7 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-
 #ifndef DSCOMBOBOX_H
 #define DSCOMBOBOX_H
 
@@ -43,4 +42,6 @@ private:
     int _contentWidth;
 };
 
+
+
 #endif // DSCOMBOBOX_H
diff --git a/DSView/pv/view/devmode.cpp b/DSView/pv/view/devmode.cpp
index a69f082d..cfc6c0db 100755
--- a/DSView/pv/view/devmode.cpp
+++ b/DSView/pv/view/devmode.cpp
@@ -113,7 +113,7 @@ void DevMode::set_device()
  
             QAction *action = new QAction(this);
             action->setIcon(QIcon(iconPath+"square-"+icon_name));
-            if (lan == QLocale::Chinese)
+            if (lan == LAN_CN)
                 action->setText(mode->name_cn);
             else
                 action->setText(mode->name);
@@ -124,7 +124,7 @@ void DevMode::set_device()
             if (dev_inst->dev_inst()->mode == _mode_list[action]->mode) {
                 QString icon_fname = iconPath + icon_name;
                 _mode_btn->setIcon(QIcon(icon_fname));
-                if (lan== QLocale::Chinese)
+                if (lan== LAN_CN)
                     _mode_btn->setText(mode->name_cn);
                 else
                     _mode_btn->setText(mode->name);
@@ -180,7 +180,7 @@ void DevMode::on_mode_change()
                 QString icon_fname = iconPath + "/" + QString::fromLocal8Bit((*i).second->icon);
              
                 _mode_btn->setIcon(QIcon(icon_fname));
-                if (lan == QLocale::Chinese)
+                if (lan == LAN_CN)
                     _mode_btn->setText((*i).second->name_cn);
                 else
                     _mode_btn->setText((*i).second->name);

From 55ef4298cf18e4c5892b7386d1597cf531cf399a Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Wed, 24 Nov 2021 14:41:25 +0800
Subject: [PATCH 34/58] adjust interface style at macos

---
 DSView/pv/view/devmode.cpp | 131 ++++++++++++++++++++-----------------
 DSView/pv/view/devmode.h   |  14 ++--
 DSView/pv/view/view.cpp    |  11 ++--
 DSView/themes/dark.qss     |  22 +++++--
 DSView/themes/light.qss    |  21 ++++--
 qtpro/DSView.pro.user      |   2 +-
 6 files changed, 115 insertions(+), 86 deletions(-)

diff --git a/DSView/pv/view/devmode.cpp b/DSView/pv/view/devmode.cpp
index cfc6c0db..1c3b5a8d 100755
--- a/DSView/pv/view/devmode.cpp
+++ b/DSView/pv/view/devmode.cpp
@@ -26,53 +26,60 @@
 #include "../device/devinst.h"
 #include "../device/file.h"
 
-#include <assert.h>
- 
- 
+#include <assert.h> 
 #include <QStyleOption>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QRect>
 #include <QDebug>
+#include <QHBoxLayout>
+
 #include "../config/appconfig.h"
 #include "../ui/msgbox.h"
- 
-
+  
 namespace pv {
 namespace view {
 
 DevMode::DevMode(QWidget *parent, SigSession *session) :
     QWidget(parent),
-    _session(session)
-    
+    _session(session)    
 {
-    _layout = new QHBoxLayout(this);
-    _layout->setSpacing(0);
-    _layout->setContentsMargins(2, 0, 0, 0);
+    _bFile = false;
 
-    _close_button = new QToolButton(this);
+   QHBoxLayout *layout = new QHBoxLayout(this);
+    layout->setSpacing(0);
+    layout->setContentsMargins(2, 0, 0, 0);
+
+    _close_button = new QToolButton();
     _close_button->setObjectName("FileCloseButton");
     _close_button->setContentsMargins(0, 0, 0, 0);
     _close_button->setFixedWidth(10);
     _close_button->setFixedHeight(height());
     _close_button->setIconSize(QSize(10, 10));
-    _close_button->setToolButtonStyle(Qt::ToolButtonIconOnly);
+    _close_button->setToolButtonStyle(Qt::ToolButtonIconOnly); 
+    _close_button->setMinimumWidth(10);
 
-    _pop_menu = new QMenu(this);
-
-    _mode_btn = new QToolButton(this);
+    _mode_btn = new QToolButton();
     _mode_btn->setObjectName("ModeButton");
-    _mode_btn->setIconSize(QSize(height()*2, height()));
+    _mode_btn->setIconSize(QSize(height() * 1.5, height()));
     _mode_btn->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-    _mode_btn->setContentsMargins(0, 0, 1000, 0);
-    _mode_btn->setMenu(_pop_menu);
+    _mode_btn->setContentsMargins(0, 0, 0, 0);  
     _mode_btn->setPopupMode(QToolButton::InstantPopup);
     _mode_btn->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum);
 
-    _layout->addWidget(_close_button);
-    _layout->addWidget(_mode_btn); 
-    _layout->setStretch(1, 100);
-    setLayout(_layout);
+   // _mode_btn->setArrowType(Qt::NoArrow);
+
+    _pop_menu = new QMenu(this);
+    _pop_menu->setContentsMargins(15,0,0,0);
+    _mode_btn->setMenu(_pop_menu);
+
+    layout->addWidget(_close_button);
+    layout->addWidget(_mode_btn); 
+
+    layout->setStretch(1, 100); 
+    setLayout(layout);
+
+    connect(_close_button, SIGNAL(clicked()), this, SLOT(on_close()));
 }
 
 
@@ -89,7 +96,10 @@ void DevMode::set_device()
 { 
     DevInst* dev_inst = _session->get_device();
     assert(dev_inst);
+
+    _bFile = false;
    
+   //remove all action object
     for(std::map<QAction *, const sr_dev_mode *>::const_iterator i = _mode_list.begin();
         i != _mode_list.end(); i++) {
         (*i).first->setParent(NULL);
@@ -97,53 +107,54 @@ void DevMode::set_device()
         delete (*i).first;
     }
     _mode_list.clear();
+
     _close_button->setIcon(QIcon());
-    _close_button->setDisabled(true);
-    disconnect(_close_button, SIGNAL(clicked()), this, SLOT(on_close()));
+    _close_button->setDisabled(true); 
 
     AppConfig &app = AppConfig::Instance(); 
     int lan = app._frameOptions.language;
 
-    if (true) {
-        QString iconPath = GetIconPath() + "/";
-        for (const GSList *l = dev_inst->get_dev_mode_list();
-             l; l = l->next) {
-            const sr_dev_mode *mode = (const sr_dev_mode *)l->data;
-            QString icon_name = QString::fromLocal8Bit(mode->icon);
- 
-            QAction *action = new QAction(this);
-            action->setIcon(QIcon(iconPath+"square-"+icon_name));
+    QString iconPath = GetIconPath() + "/";
+
+    for (const GSList *l = dev_inst->get_dev_mode_list(); l; l = l->next)
+    {
+        const sr_dev_mode *mode = (const sr_dev_mode *)l->data;
+        QString icon_name = QString::fromLocal8Bit(mode->icon);
+
+        QAction *action = new QAction(this);
+        action->setIcon(QIcon(iconPath + "square-" + icon_name));
+        if (lan == LAN_CN)
+            action->setText(mode->name_cn);
+        else
+            action->setText(mode->name);
+
+        connect(action, SIGNAL(triggered()), this, SLOT(on_mode_change()));
+
+        _mode_list[action] = mode;
+        if (dev_inst->dev_inst()->mode == _mode_list[action]->mode)
+        {
+            QString icon_fname = iconPath + icon_name;
+            _mode_btn->setIcon(QIcon(icon_fname));
             if (lan == LAN_CN)
-                action->setText(mode->name_cn);
+                _mode_btn->setText(mode->name_cn);
             else
-                action->setText(mode->name);
-
-            connect(action, SIGNAL(triggered()), this, SLOT(on_mode_change()));
-
-            _mode_list[action] = mode;
-            if (dev_inst->dev_inst()->mode == _mode_list[action]->mode) {
-                QString icon_fname = iconPath + icon_name;
-                _mode_btn->setIcon(QIcon(icon_fname));
-                if (lan== LAN_CN)
-                    _mode_btn->setText(mode->name_cn);
-                else
-                    _mode_btn->setText(mode->name);
-            }
-            _pop_menu->addAction(action);
-        }
-
-        File *file_dev;
-        if((file_dev = dynamic_cast<File*>(dev_inst))) {
-            _close_button->setDisabled(false);
-            _close_button->setIcon(QIcon(iconPath+"/close.svg"));
-            connect(_close_button, SIGNAL(clicked()), this, SLOT(on_close()));
+                _mode_btn->setText(mode->name);
         }
+        _pop_menu->addAction(action);
     }
+
+    if ((dynamic_cast<File *>(dev_inst)))
+    {
+        _close_button->setDisabled(false);
+        _close_button->setIcon(QIcon(iconPath + "/close.svg"));
+        _bFile = true;
+    }
+
     update();
 }
 
 void DevMode::paintEvent(QPaintEvent*)
-{ 
+{  
     using pv::view::Trace;
 
     QStyleOption o;
@@ -164,8 +175,8 @@ void DevMode::on_mode_change()
     AppConfig &app = AppConfig::Instance(); 
     int lan = app._frameOptions.language;
 
-    for(std::map<QAction *, const sr_dev_mode *>::const_iterator i = _mode_list.begin();
-        i != _mode_list.end(); i++) {
+    for(auto i = _mode_list.begin();i != _mode_list.end(); i++)
+    {
         if ((*i).first == action) {
             if (dev_inst->dev_inst()->mode != (*i).second->mode) {
                 _session->set_run_mode(SigSession::Single);
@@ -186,6 +197,8 @@ void DevMode::on_mode_change()
                     _mode_btn->setText((*i).second->name);
                 dev_changed(false);
             }
+
+            break;
         }
     }
 }
@@ -195,7 +208,7 @@ void DevMode::on_close()
     DevInst *dev_inst = _session->get_device();
     assert(dev_inst);
 
-    if (MsgBox::Confirm("are you sure to close the device?")){
+    if (_bFile && MsgBox::Confirm("are you sure to close the device?")){
         _session->close_file(dev_inst);
         dev_changed(true);
     }
diff --git a/DSView/pv/view/devmode.h b/DSView/pv/view/devmode.h
index d5c9fc1e..0d148da6 100755
--- a/DSView/pv/view/devmode.h
+++ b/DSView/pv/view/devmode.h
@@ -30,13 +30,12 @@
 
 #include <QWidget>
 #include <QPushButton>
-#include <QHBoxLayout>
 #include <QVector>
 #include <QToolButton>
 #include <QLabel>
 
 #include <libsigrok4DSL/libsigrok.h>
-
+ 
 namespace pv {
 
 namespace device{
@@ -81,13 +80,12 @@ signals:
 
 private:
     SigSession *_session;
-
-    QHBoxLayout *  _layout;
     std::map <QAction *, const sr_dev_mode *> _mode_list;
-    QToolButton *_mode_btn;
-    QMenu *_pop_menu;
-    QPoint _mouse_point;
-    QToolButton *_close_button;
+    QToolButton     *_mode_btn;
+    QMenu           *_pop_menu;
+    QPoint          _mouse_point;
+    QToolButton     *_close_button;
+    bool            _bFile;
 };
 
 } // namespace view
diff --git a/DSView/pv/view/view.cpp b/DSView/pv/view/view.cpp
index 1728e03e..f0a196f0 100755
--- a/DSView/pv/view/view.cpp
+++ b/DSView/pv/view/view.cpp
@@ -922,12 +922,11 @@ void View::data_updated()
 
 void View::update_margins()
 {
-    _ruler->setGeometry(_viewcenter->x(), 0,
-        get_view_width(), _viewcenter->y());
-    _header->setGeometry(0, _viewcenter->y(),
-        _viewcenter->x(), _viewcenter->height());
-    _devmode->setGeometry(0, 0,
-        _viewcenter->x(), _viewcenter->y());
+    _ruler->setGeometry(_viewcenter->x(), 0,  get_view_width(), _viewcenter->y());
+
+    _header->setGeometry(0, _viewcenter->y(), _viewcenter->x(), _viewcenter->height());
+
+    _devmode->setGeometry(0, 0, _viewcenter->x(), _viewcenter->y());
 }
 
 void View::header_updated()
diff --git a/DSView/themes/dark.qss b/DSView/themes/dark.qss
index 4ff510ba..194d7c97 100755
--- a/DSView/themes/dark.qss
+++ b/DSView/themes/dark.qss
@@ -1279,25 +1279,35 @@ QToolButton::menu-arrow:open
 
 QToolButton#ModeButton::menu-arrow
 {
-    image: url(:/dark/mode_down_arrow.svg);
+   /* image: url(:/dark/mode_down_arrow.svg);*/
+   image:none;
 }
 
 /* the subcontrol below is used only in the InstantPopup or DelayedPopup mode */
 QToolButton::menu-indicator
 {
     image: url(:/dark/down_arrow.svg);
-    top: -7px;
-    left: -2px;
+    top: -20px;
+    left: 0px;
+    width:8px;
+    height:10px;
 }
+
+QToolButton{
+    font-size:14px;
+}
+
 QToolButton#ModeButton::menu-indicator
 {
     image: url(:/dark/mode_down_arrow.svg);
-    top: -7px;
-    left: -3px;
+    top: 0px;
+    left: 0px;
+    width:12px;
+    height:12px;
 }
 QToolButton#ModeButton::menu-indicator:hover
 {
-    top: -5px;
+    top: 0px;
 }
 
 QPushButton::menu-indicator
diff --git a/DSView/themes/light.qss b/DSView/themes/light.qss
index 06f704e6..54463857 100755
--- a/DSView/themes/light.qss
+++ b/DSView/themes/light.qss
@@ -1319,26 +1319,35 @@ QToolButton::menu-arrow:open
 
 QToolButton#ModeButton::menu-arrow
 {
-    image: url(:/light/mode_down_arrow.svg);
+    /*image: url(:/light/mode_down_arrow.svg);*/
+    image:none;
 }
 
 /* the subcontrol below is used only in the InstantPopup or DelayedPopup mode */
 QToolButton::menu-indicator
 {
     image: url(:/light/down_arrow.svg);
-    top: -7px;
-    left: -2px;
+    top: -20px;
+    left: 0px;
+    width:8px;
+    height:10px;
+}
+
+QToolButton{
+    font-size:14px;
 }
 
 QToolButton#ModeButton::menu-indicator
 {
     image: url(:/light/mode_down_arrow.svg);
-    top: -7px;
-    left: -3px;
+    top: 0px;
+    left: 0px;
+    width:12px;
+    height:12px;
 }
 QToolButton#ModeButton::menu-indicator:hover
 {
-    top: -5px;
+    top: 0px;
 }
 
 QPushButton::menu-indicator
diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user
index c4f4a0b2..cc096235 100644
--- a/qtpro/DSView.pro.user
+++ b/qtpro/DSView.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2021-11-22T18:49:27. -->
+<!-- Written by QtCreator 4.11.0, 2021-11-23T18:40:01. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

From 0c2b4cf4302a7ae1dbb4cca80efd66f36845b62a Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Wed, 24 Nov 2021 14:42:16 +0800
Subject: [PATCH 35/58] none

---
 DSView/themes/dark.qss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DSView/themes/dark.qss b/DSView/themes/dark.qss
index 194d7c97..63e3fd7b 100755
--- a/DSView/themes/dark.qss
+++ b/DSView/themes/dark.qss
@@ -1279,7 +1279,7 @@ QToolButton::menu-arrow:open
 
 QToolButton#ModeButton::menu-arrow
 {
-   /* image: url(:/dark/mode_down_arrow.svg);*/
+   /*image: url(:/dark/mode_down_arrow.svg);*/
    image:none;
 }
 

From 050b6023d52ef53a5787b89b97bf5e6a1f51deb8 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Wed, 24 Nov 2021 17:04:12 +0800
Subject: [PATCH 36/58] any head file path ref mode changed

---
 DSView/pv/data/analogsnapshot.cpp         |  4 +---
 DSView/pv/data/decodermodel.h             |  2 +-
 DSView/pv/data/dsosnapshot.cpp            |  4 +---
 DSView/pv/data/groupsnapshot.cpp          |  5 ++---
 DSView/pv/data/logicsnapshot.cpp          |  5 ++---
 DSView/pv/data/spectrumstack.cpp          |  8 ++++----
 DSView/pv/device/devinst.cpp              |  2 +-
 DSView/pv/dialogs/about.h                 |  3 +--
 DSView/pv/dialogs/calibration.h           |  2 +-
 DSView/pv/dialogs/deviceoptions.cpp       |  2 +-
 DSView/pv/dialogs/storeprogress.cpp       |  2 +-
 DSView/pv/dock/triggerdock.cpp            |  2 +-
 DSView/{ => pv}/extdef.h                  |  0
 DSView/pv/mainframe.cpp                   |  2 +-
 DSView/pv/mainwindow.cpp                  |  4 ++--
 DSView/pv/prop/binding/binding.cpp        |  3 +--
 DSView/pv/prop/binding/decoderoptions.cpp | 12 ++++++------
 DSView/pv/prop/binding/deviceoptions.cpp  |  2 +-
 DSView/pv/prop/binding/probeoptions.cpp   |  8 ++++----
 DSView/pv/storesession.cpp                |  2 +-
 DSView/pv/toolbars/samplingbar.cpp        |  6 ++----
 DSView/pv/view/analogsignal.cpp           |  3 ++-
 DSView/pv/view/cursor.cpp                 |  2 +-
 DSView/pv/view/decodetrace.cpp            |  2 +-
 DSView/pv/view/decodetrace.h              |  2 +-
 DSView/pv/view/dsosignal.cpp              | 10 ++++------
 DSView/pv/view/groupsignal.cpp            | 10 +++++-----
 DSView/pv/view/header.cpp                 |  2 +-
 DSView/pv/view/lissajoustrace.cpp         | 10 +++++-----
 DSView/pv/view/logicsignal.cpp            | 11 ++++-------
 DSView/pv/view/mathtrace.cpp              |  4 ++--
 DSView/pv/view/ruler.cpp                  |  2 +-
 DSView/pv/view/signal.cpp                 |  8 +++-----
 DSView/pv/view/spectrumtrace.cpp          |  3 ++-
 DSView/pv/view/trace.cpp                  |  3 ++-
 DSView/pv/view/view.cpp                   | 10 +++++-----
 DSView/pv/view/view.h                     |  3 ++-
 DSView/pv/view/viewport.h                 |  2 +-
 DSView/pv/view/viewstatus.h               |  1 -
 DSView/test/data/analogsnapshot.cpp       |  6 ++----
 DSView/test/data/logicsnapshot.cpp        |  2 +-
 libsigrok4DSL/hardware/DSL/command.c      |  4 ++--
 libsigrok4DSL/hardware/DSL/command.h      |  4 ++--
 libsigrok4DSL/hardware/DSL/dscope.c       |  4 ++--
 libsigrok4DSL/hardware/DSL/dsl.c          |  4 ++--
 libsigrok4DSL/hardware/DSL/dsl.h          |  4 ++--
 libsigrok4DSL/hardware/DSL/dslogic.c      |  4 ++--
 libsigrok4DSL/hardware/common/ezusb.c     |  4 ++--
 libsigrok4DSL/hardware/common/usb.c       |  4 ++--
 libsigrok4DSL/hardware/demo/demo.h        |  4 ++--
 libsigrok4DSL/input/in_binary.c           |  4 ++--
 libsigrok4DSL/input/in_vcd.c              |  4 ++--
 libsigrok4DSL/input/in_wav.c              |  4 ++--
 libsigrok4DSL/input/input.c               |  4 ++--
 libsigrok4DSL/output/csv.c                |  6 +++---
 libsigrok4DSL/output/gnuplot.c            |  4 ++--
 libsigrok4DSL/output/output.c             |  4 ++--
 libsigrok4DSL/output/srzip.c              |  4 ++--
 libsigrok4DSL/output/vcd.c                |  6 +++---
 qtpro/DSView.pro                          | 13 +++++--------
 qtpro/DSView.pro.user                     |  2 +-
 61 files changed, 124 insertions(+), 143 deletions(-)
 rename DSView/{ => pv}/extdef.h (100%)

diff --git a/DSView/pv/data/analogsnapshot.cpp b/DSView/pv/data/analogsnapshot.cpp
index 0fb067f3..329bafdf 100755
--- a/DSView/pv/data/analogsnapshot.cpp
+++ b/DSView/pv/data/analogsnapshot.cpp
@@ -20,16 +20,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <extdef.h>
-
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
-
 #include <algorithm>
  
 #include "analogsnapshot.h"
+#include "../extdef.h"
 
 using namespace std;
 
diff --git a/DSView/pv/data/decodermodel.h b/DSView/pv/data/decodermodel.h
index 3a9d1760..a08fe1bf 100755
--- a/DSView/pv/data/decodermodel.h
+++ b/DSView/pv/data/decodermodel.h
@@ -23,7 +23,7 @@
 
 #include <QAbstractTableModel>
   
-#include <pv/data/decode/rowdata.h>
+#include "decode/rowdata.h"
 
 namespace pv {
 namespace data {
diff --git a/DSView/pv/data/dsosnapshot.cpp b/DSView/pv/data/dsosnapshot.cpp
index bf389c11..62642a94 100755
--- a/DSView/pv/data/dsosnapshot.cpp
+++ b/DSView/pv/data/dsosnapshot.cpp
@@ -19,16 +19,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <extdef.h>
-
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
-
 #include <algorithm>
  
 #include "dsosnapshot.h"
+#include "../extdef.h"
 
 using namespace std;
 
diff --git a/DSView/pv/data/groupsnapshot.cpp b/DSView/pv/data/groupsnapshot.cpp
index 3eae0efb..1e8430a4 100755
--- a/DSView/pv/data/groupsnapshot.cpp
+++ b/DSView/pv/data/groupsnapshot.cpp
@@ -18,9 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
-
-#include <extdef.h>
-
+ 
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
@@ -30,6 +28,7 @@
 
 #include "logicsnapshot.h"
 #include "groupsnapshot.h"
+#include "../extdef.h"
 
 using namespace std;
 
diff --git a/DSView/pv/data/logicsnapshot.cpp b/DSView/pv/data/logicsnapshot.cpp
index 025422ba..f4e42584 100755
--- a/DSView/pv/data/logicsnapshot.cpp
+++ b/DSView/pv/data/logicsnapshot.cpp
@@ -19,9 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
-
-#include <extdef.h>
-
+  
 #include <QDebug>
 
 #include <assert.h>
@@ -30,6 +28,7 @@
 #include <math.h>
  
 #include "logicsnapshot.h"
+#include "../extdef.h"
 
 using namespace std;
 
diff --git a/DSView/pv/data/spectrumstack.cpp b/DSView/pv/data/spectrumstack.cpp
index 72759c7e..99c34e9b 100755
--- a/DSView/pv/data/spectrumstack.cpp
+++ b/DSView/pv/data/spectrumstack.cpp
@@ -20,10 +20,10 @@
 
 #include "spectrumstack.h"
  
-#include <pv/data/dso.h>
-#include <pv/data/dsosnapshot.h>
-#include <pv/sigsession.h>
-#include <pv/view/dsosignal.h>
+#include "dso.h"
+#include "dsosnapshot.h"
+#include "../sigsession.h"
+#include "../view/dsosignal.h"
 #include <math.h>
 
 #define PI 3.1415
diff --git a/DSView/pv/device/devinst.cpp b/DSView/pv/device/devinst.cpp
index 1fe1b2f4..29777872 100755
--- a/DSView/pv/device/devinst.cpp
+++ b/DSView/pv/device/devinst.cpp
@@ -25,7 +25,7 @@
 
 #include "devinst.h"
 
-#include <pv/sigsession.h>
+#include "../sigsession.h"
 
 namespace pv {
 namespace device {
diff --git a/DSView/pv/dialogs/about.h b/DSView/pv/dialogs/about.h
index a82377e7..a86ca127 100755
--- a/DSView/pv/dialogs/about.h
+++ b/DSView/pv/dialogs/about.h
@@ -27,8 +27,7 @@
 #include <QLabel>
 #include "dsdialog.h"
 
-#include <libsigrok4DSL/libsigrok.h>
-
+  
 namespace pv {
 namespace dialogs {
 
diff --git a/DSView/pv/dialogs/calibration.h b/DSView/pv/dialogs/calibration.h
index b5c71e27..6253de04 100755
--- a/DSView/pv/dialogs/calibration.h
+++ b/DSView/pv/dialogs/calibration.h
@@ -31,7 +31,7 @@
 
 #include <list> 
 
-#include <pv/device/devinst.h>
+#include "../device/devinst.h"
 #include "../toolbars/titlebar.h"
 #include "dsdialog.h"
 
diff --git a/DSView/pv/dialogs/deviceoptions.cpp b/DSView/pv/dialogs/deviceoptions.cpp
index 3fa3be2c..b0b6119e 100755
--- a/DSView/pv/dialogs/deviceoptions.cpp
+++ b/DSView/pv/dialogs/deviceoptions.cpp
@@ -27,7 +27,7 @@
 #include <QDoubleSpinBox>
 
 #include "dsmessagebox.h"
-#include <pv/prop/property.h>
+#include "../prop/property.h"
 #include "../dsvdef.h"
 
 using namespace boost;
diff --git a/DSView/pv/dialogs/storeprogress.cpp b/DSView/pv/dialogs/storeprogress.cpp
index 7c0b31de..168a4c75 100755
--- a/DSView/pv/dialogs/storeprogress.cpp
+++ b/DSView/pv/dialogs/storeprogress.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "storeprogress.h" 
-#include "pv/sigsession.h"
+#include "../sigsession.h"
 #include <QGridLayout>
 #include <QDialogButtonBox>
 #include <QTimer>
diff --git a/DSView/pv/dock/triggerdock.cpp b/DSView/pv/dock/triggerdock.cpp
index 1b869fe0..962f6a9f 100755
--- a/DSView/pv/dock/triggerdock.cpp
+++ b/DSView/pv/dock/triggerdock.cpp
@@ -35,7 +35,7 @@
 #include <QApplication>
 #include <math.h>
 
-#include "libsigrok4DSL/libsigrok.h"
+#include <libsigrok4DSL/libsigrok.h>
 
 namespace pv {
 namespace dock {
diff --git a/DSView/extdef.h b/DSView/pv/extdef.h
similarity index 100%
rename from DSView/extdef.h
rename to DSView/pv/extdef.h
diff --git a/DSView/pv/mainframe.cpp b/DSView/pv/mainframe.cpp
index cd9b1e71..5f7c3be0 100644
--- a/DSView/pv/mainframe.cpp
+++ b/DSView/pv/mainframe.cpp
@@ -46,7 +46,7 @@
 
 #include "dsvdef.h"
 #include "config/appconfig.h"
-#include "../ui/msgbox.h"
+#include "ui/msgbox.h"
 
 #include <algorithm>
 
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index 44d528b6..cfd76a37 100644
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -87,10 +87,10 @@
 #include <glib.h>
 #include <list>
 #include <libusb.h>
-#include "../ui/msgbox.h"
+#include "ui/msgbox.h"
 #include "config/appconfig.h"
 #include "appcontrol.h"
-#include "../dsvdef.h"
+#include "dsvdef.h"
   
 
 namespace pv {
diff --git a/DSView/pv/prop/binding/binding.cpp b/DSView/pv/prop/binding/binding.cpp
index 345cae1e..4d861370 100755
--- a/DSView/pv/prop/binding/binding.cpp
+++ b/DSView/pv/prop/binding/binding.cpp
@@ -23,8 +23,7 @@
 
 #include <QFormLayout>
 
-#include <pv/prop/property.h>
-
+#include "../property.h"
 #include "binding.h"
  
 
diff --git a/DSView/pv/prop/binding/decoderoptions.cpp b/DSView/pv/prop/binding/decoderoptions.cpp
index cdaca0df..b1ecae3b 100755
--- a/DSView/pv/prop/binding/decoderoptions.cpp
+++ b/DSView/pv/prop/binding/decoderoptions.cpp
@@ -26,12 +26,12 @@
  
 #include <boost/none_t.hpp>
 
-#include <pv/data/decoderstack.h>
-#include <pv/data/decode/decoder.h>
-#include <pv/prop/double.h>
-#include <pv/prop/enum.h>
-#include <pv/prop/int.h>
-#include <pv/prop/string.h>
+#include "../../data/decoderstack.h"
+#include "../../data/decode/decoder.h"
+#include "../double.h"
+#include "../enum.h"
+#include "../int.h"
+#include "../string.h"
 
 using namespace boost;
 using namespace std;
diff --git a/DSView/pv/prop/binding/deviceoptions.cpp b/DSView/pv/prop/binding/deviceoptions.cpp
index 0b25ba33..66a9900f 100755
--- a/DSView/pv/prop/binding/deviceoptions.cpp
+++ b/DSView/pv/prop/binding/deviceoptions.cpp
@@ -31,7 +31,7 @@
 #include "../double.h"
 #include "../enum.h"
 #include "../int.h"
-#include "../config/appconfig.h"
+#include "../../config/appconfig.h"
 
 using namespace boost;
 using namespace std;
diff --git a/DSView/pv/prop/binding/probeoptions.cpp b/DSView/pv/prop/binding/probeoptions.cpp
index ec876265..74b18088 100755
--- a/DSView/pv/prop/binding/probeoptions.cpp
+++ b/DSView/pv/prop/binding/probeoptions.cpp
@@ -26,10 +26,10 @@
 #include <QDebug>
 #include <QObject>
 #include <stdint.h>
-#include <pv/prop/bool.h>
-#include <pv/prop/double.h>
-#include <pv/prop/enum.h>
-#include <pv/prop/int.h>
+#include "../bool.h"
+#include "../double.h"
+#include "../enum.h"
+#include "../int.h"
 
 #include "../../config/appconfig.h"
 
diff --git a/DSView/pv/storesession.cpp b/DSView/pv/storesession.cpp
index 322ebd5f..b65b36ed 100755
--- a/DSView/pv/storesession.cpp
+++ b/DSView/pv/storesession.cpp
@@ -50,7 +50,7 @@
 #include <QTextStream>
 #include <QDebug>
 
-#include <libsigrokdecode4DSL/libsigrokdecode.h> 
+#include <libsigrokdecode4DSL/libsigrokdecode.h>
 #include "config/appconfig.h"
 #include "dsvdef.h"
  
diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp
index 49b84f8b..7281bde6 100755
--- a/DSView/pv/toolbars/samplingbar.cpp
+++ b/DSView/pv/toolbars/samplingbar.cpp
@@ -20,12 +20,10 @@
  */
 
 #include "samplingbar.h"
+#include "../extdef.h"
 
-#include <extdef.h>
-#include <assert.h>
- 
+#include <assert.h> 
 #include <libusb.h>
-
 #include <QAction>
 #include <QDebug>
 #include <QLabel>
diff --git a/DSView/pv/view/analogsignal.cpp b/DSView/pv/view/analogsignal.cpp
index 1419046a..498d46f9 100755
--- a/DSView/pv/view/analogsignal.cpp
+++ b/DSView/pv/view/analogsignal.cpp
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <extdef.h>
+ 
 #include <QDebug>
 #include <math.h>
 
@@ -29,6 +29,7 @@
 #include "../data/analogsnapshot.h"
 #include "../view/view.h"
 #include "../device/devinst.h"
+#include "../extdef.h"
 
 
 using namespace std;
diff --git a/DSView/pv/view/cursor.cpp b/DSView/pv/view/cursor.cpp
index eca057ca..a4b667a3 100755
--- a/DSView/pv/view/cursor.cpp
+++ b/DSView/pv/view/cursor.cpp
@@ -35,7 +35,7 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include <extdef.h>
+#include "../extdef.h"
 
 namespace pv {
 namespace view {
diff --git a/DSView/pv/view/decodetrace.cpp b/DSView/pv/view/decodetrace.cpp
index aea46fe0..250ca49c 100755
--- a/DSView/pv/view/decodetrace.cpp
+++ b/DSView/pv/view/decodetrace.cpp
@@ -21,7 +21,7 @@
 
 #include <libsigrokdecode4DSL/libsigrokdecode.h>
 
-#include <extdef.h>
+#include "../extdef.h"
 
  
 #include <boost/functional/hash.hpp>
diff --git a/DSView/pv/view/decodetrace.h b/DSView/pv/view/decodetrace.h
index 4f70df85..fde1ff23 100755
--- a/DSView/pv/view/decodetrace.h
+++ b/DSView/pv/view/decodetrace.h
@@ -30,7 +30,7 @@
 #include <QSignalMapper>
 #include <QFormLayout>
 
-#include <pv/prop/binding/decoderoptions.h>
+#include "../prop/binding/decoderoptions.h"
 #include "../dialogs/dsdialog.h"
 
 struct srd_channel;
diff --git a/DSView/pv/view/dsosignal.cpp b/DSView/pv/view/dsosignal.cpp
index 24b69243..65e5fb59 100755
--- a/DSView/pv/view/dsosignal.cpp
+++ b/DSView/pv/view/dsosignal.cpp
@@ -19,13 +19,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <extdef.h>
-#include <math.h>
-
-#include "../../extdef.h"
+#include "../extdef.h"
 #include "dsosignal.h"
-#include "pv/data/dso.h"
-#include "pv/data/dsosnapshot.h"
+#include "../data/dso.h"
+#include "../data/dsosnapshot.h"
 #include "view.h"
 #include "../sigsession.h"
 #include "../device/devinst.h" 
@@ -33,6 +30,7 @@
 #include <QTimer>
 #include <functional>
 #include <QApplication>
+#include <math.h>
  
 using namespace std;
 
diff --git a/DSView/pv/view/groupsignal.cpp b/DSView/pv/view/groupsignal.cpp
index 898d455c..b33ae478 100755
--- a/DSView/pv/view/groupsignal.cpp
+++ b/DSView/pv/view/groupsignal.cpp
@@ -19,13 +19,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <extdef.h>
-#include <math.h>
-
+#include "../extdef.h"
 #include "groupsignal.h"
-#include "pv/data/group.h"
-#include "pv/data/groupsnapshot.h"
+#include "../data/group.h"
+#include "../data/groupsnapshot.h"
 #include "view.h"
+
+#include <math.h>
  
 using namespace std;
 
diff --git a/DSView/pv/view/header.cpp b/DSView/pv/view/header.cpp
index b3aed97f..58563dd3 100755
--- a/DSView/pv/view/header.cpp
+++ b/DSView/pv/view/header.cpp
@@ -41,7 +41,7 @@
 #include "decodetrace.h"
 #include "../sigsession.h"
 #include "../device/devinst.h"
-#include "../../extdef.h"
+#include "../extdef.h"
 #include "../dsvdef.h"
 
  
diff --git a/DSView/pv/view/lissajoustrace.cpp b/DSView/pv/view/lissajoustrace.cpp
index 81d8d33f..a39a66e7 100755
--- a/DSView/pv/view/lissajoustrace.cpp
+++ b/DSView/pv/view/lissajoustrace.cpp
@@ -19,14 +19,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <extdef.h>
+ 
 #include <math.h>
 
-#include "../../extdef.h"
-#include "lissajoustrace.h"
-#include "pv/data/dso.h"
-#include "pv/data/dsosnapshot.h"
 #include "view.h"
+#include "../extdef.h"
+#include "lissajoustrace.h"
+#include "../data/dso.h"
+#include "../data/dsosnapshot.h"
 #include "../sigsession.h"
 #include "../device/devinst.h"
 
diff --git a/DSView/pv/view/logicsignal.cpp b/DSView/pv/view/logicsignal.cpp
index 87f9fb93..dae072a8 100755
--- a/DSView/pv/view/logicsignal.cpp
+++ b/DSView/pv/view/logicsignal.cpp
@@ -21,18 +21,15 @@
  */
 
 #include <libsigrokdecode4DSL/libsigrokdecode.h>
-
-#include <extdef.h>
-
+ 
 #include <QDebug>
-
 #include <math.h>
-
 #include "logicsignal.h"
 #include "view.h"
-#include "pv/data/logic.h"
-#include "pv/data/logicsnapshot.h"
+#include "../data/logic.h"
+#include "../data/logicsnapshot.h"
 #include "view.h"
+#include "../extdef.h"
 
 using namespace boost;
 using namespace std;
diff --git a/DSView/pv/view/mathtrace.cpp b/DSView/pv/view/mathtrace.cpp
index 78a34280..8ea5d8ff 100755
--- a/DSView/pv/view/mathtrace.cpp
+++ b/DSView/pv/view/mathtrace.cpp
@@ -19,10 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <extdef.h>
+
 #include <math.h>
 
-#include "../../extdef.h"
 #include "mathtrace.h"
 #include "../data/dso.h"
 #include "../data/dsosnapshot.h"
@@ -32,6 +31,7 @@
 #include "../device/devinst.h"
 #include "../view/dsosignal.h"
 #include "../dsvdef.h"
+#include "../extdef.h"
   
 #include <QDebug>
 #include <QTimer>
diff --git a/DSView/pv/view/ruler.cpp b/DSView/pv/view/ruler.cpp
index 25c54a95..905d9de7 100755
--- a/DSView/pv/view/ruler.cpp
+++ b/DSView/pv/view/ruler.cpp
@@ -28,7 +28,7 @@
 #include "../sigsession.h"
 #include "../device/devinst.h"
 #include "dsosignal.h"
-#include "../../extdef.h"
+#include "../extdef.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/DSView/pv/view/signal.cpp b/DSView/pv/view/signal.cpp
index 23011a23..f8146bef 100755
--- a/DSView/pv/view/signal.cpp
+++ b/DSView/pv/view/signal.cpp
@@ -20,14 +20,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <extdef.h>
-
-#include <math.h>
- 
-
+  
+#include <math.h> 
 #include "signal.h"
 #include "view.h"
 #include "../device/devinst.h"
+#include "../extdef.h"
 
 namespace pv {
 namespace view {
diff --git a/DSView/pv/view/spectrumtrace.cpp b/DSView/pv/view/spectrumtrace.cpp
index 3527a013..b55a1325 100755
--- a/DSView/pv/view/spectrumtrace.cpp
+++ b/DSView/pv/view/spectrumtrace.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <extdef.h>
+ 
 #include <algorithm>
 #include <math.h>
 #include <QTextStream>
@@ -34,6 +34,7 @@
 #include "../device/devinst.h"
 #include "../data/spectrumstack.h"
 #include "../dsvdef.h"
+#include "../extdef.h"
 
 using namespace boost;
 using namespace std;
diff --git a/DSView/pv/view/trace.cpp b/DSView/pv/view/trace.cpp
index 782dfa85..cf6f17e3 100755
--- a/DSView/pv/view/trace.cpp
+++ b/DSView/pv/view/trace.cpp
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <extdef.h>
+ 
 #include <assert.h>
 #include <math.h> 
 #include <QFormLayout>
@@ -31,6 +31,7 @@
 #include "view.h"
 #include "../device/devinst.h"
 #include "../sigsession.h"
+#include "../extdef.h"
 
 
 namespace pv {
diff --git a/DSView/pv/view/view.cpp b/DSView/pv/view/view.cpp
index f0a196f0..3328fb5d 100755
--- a/DSView/pv/view/view.cpp
+++ b/DSView/pv/view/view.cpp
@@ -42,11 +42,11 @@
 #include "analogsignal.h"
 
 #include "../device/devinst.h"
-#include "pv/sigsession.h"
-#include "pv/data/logic.h"
-#include "pv/data/logicsnapshot.h"
-#include "pv/dialogs/calibration.h"
-#include "pv/dialogs/lissajousoptions.h"
+#include "../sigsession.h"
+#include "../data/logic.h"
+#include "../data/logicsnapshot.h"
+#include "../dialogs/calibration.h"
+#include "../dialogs/lissajousoptions.h"
 
 
 using namespace std;
diff --git a/DSView/pv/view/view.h b/DSView/pv/view/view.h
index a807dd85..6475cd7d 100755
--- a/DSView/pv/view/view.h
+++ b/DSView/pv/view/view.h
@@ -33,7 +33,7 @@
 #include <QDateTime>
 #include <QSplitter>
 
-#include "../../extdef.h"
+ 
 #include "../toolbars/samplingbar.h"
 #include "../data/signaldata.h"
 #include "../view/viewport.h"
@@ -41,6 +41,7 @@
 #include "xcursor.h"
 #include "signal.h"
 #include "viewstatus.h"
+#include "../extdef.h"
 
 namespace pv {
 
diff --git a/DSView/pv/view/viewport.h b/DSView/pv/view/viewport.h
index 0ba08201..0442645d 100755
--- a/DSView/pv/view/viewport.h
+++ b/DSView/pv/view/viewport.h
@@ -33,7 +33,7 @@
 #include <QElapsedTimer>
 
 #include "../view/view.h"
-#include "../../extdef.h"
+#include "../extdef.h"
 
 class QPainter;
 class QPaintEvent;
diff --git a/DSView/pv/view/viewstatus.h b/DSView/pv/view/viewstatus.h
index c8edf813..c4125ca3 100755
--- a/DSView/pv/view/viewstatus.h
+++ b/DSView/pv/view/viewstatus.h
@@ -28,7 +28,6 @@
 #include <QPushButton>
 #include <QToolButton>
  
-
 #include <libsigrok4DSL/libsigrok.h>
 
 namespace pv {
diff --git a/DSView/test/data/analogsnapshot.cpp b/DSView/test/data/analogsnapshot.cpp
index cd1fd773..7cf4f289 100755
--- a/DSView/test/data/analogsnapshot.cpp
+++ b/DSView/test/data/analogsnapshot.cpp
@@ -17,15 +17,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
-
-#include <extdef.h>
-
+ 
 #define __STDC_LIMIT_MACROS
 #include <stdint.h>
 
 #include <boost/test/unit_test.hpp>
-
 #include "../../pv/data/analogsnapshot.h"
+#include "../extdef.h"
 
 using namespace std;
 
diff --git a/DSView/test/data/logicsnapshot.cpp b/DSView/test/data/logicsnapshot.cpp
index bbc74383..2473580e 100755
--- a/DSView/test/data/logicsnapshot.cpp
+++ b/DSView/test/data/logicsnapshot.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <extdef.h>
+#include "../extdef.h"
 
 #define __STDC_LIMIT_MACROS
 #include <stdint.h>
diff --git a/libsigrok4DSL/hardware/DSL/command.c b/libsigrok4DSL/hardware/DSL/command.c
index 82170f08..b391237d 100755
--- a/libsigrok4DSL/hardware/DSL/command.c
+++ b/libsigrok4DSL/hardware/DSL/command.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../../libsigrok.h"
+#include "../../libsigrok-internal.h"
 
 #include "command.h"
 #include "dsl.h"
diff --git a/libsigrok4DSL/hardware/DSL/command.h b/libsigrok4DSL/hardware/DSL/command.h
index 0a541c47..a5647638 100755
--- a/libsigrok4DSL/hardware/DSL/command.h
+++ b/libsigrok4DSL/hardware/DSL/command.h
@@ -21,8 +21,8 @@
 #define LIBDSL_HARDWARE_COMMAND_H
 
 #include <glib.h>
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../../libsigrok.h"
+#include "../../libsigrok-internal.h"
 
 /* Protocol commands */
 #define CMD_CTL_WR              0xb0
diff --git a/libsigrok4DSL/hardware/DSL/dscope.c b/libsigrok4DSL/hardware/DSL/dscope.c
index 12652a55..b9bdb446 100755
--- a/libsigrok4DSL/hardware/DSL/dscope.c
+++ b/libsigrok4DSL/hardware/DSL/dscope.c
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../../libsigrok.h"
+#include "../../libsigrok-internal.h"
 
 #include "dsl.h"
 #include "command.h"
diff --git a/libsigrok4DSL/hardware/DSL/dsl.c b/libsigrok4DSL/hardware/DSL/dsl.c
index a08452b1..01e2e01c 100755
--- a/libsigrok4DSL/hardware/DSL/dsl.c
+++ b/libsigrok4DSL/hardware/DSL/dsl.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../../libsigrok.h"
+#include "../../libsigrok-internal.h"
 #include "command.h"
 #include "dsl.h"
 
diff --git a/libsigrok4DSL/hardware/DSL/dsl.h b/libsigrok4DSL/hardware/DSL/dsl.h
index 4d695380..9f9fe95f 100755
--- a/libsigrok4DSL/hardware/DSL/dsl.h
+++ b/libsigrok4DSL/hardware/DSL/dsl.h
@@ -22,8 +22,8 @@
 #define LIBDSL_HARDWARE_DSL_H
 
 #include <glib.h>
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../../libsigrok.h"
+#include "../../libsigrok-internal.h"
 #include "command.h"
 
 #include <stdio.h>
diff --git a/libsigrok4DSL/hardware/DSL/dslogic.c b/libsigrok4DSL/hardware/DSL/dslogic.c
index 443c8052..76419965 100755
--- a/libsigrok4DSL/hardware/DSL/dslogic.c
+++ b/libsigrok4DSL/hardware/DSL/dslogic.c
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../../libsigrok.h"
+#include "../../libsigrok-internal.h"
 
 #include "dsl.h"
 #include "command.h"
diff --git a/libsigrok4DSL/hardware/common/ezusb.c b/libsigrok4DSL/hardware/common/ezusb.c
index d05d2a79..dce61729 100755
--- a/libsigrok4DSL/hardware/common/ezusb.c
+++ b/libsigrok4DSL/hardware/common/ezusb.c
@@ -20,8 +20,8 @@
 /*
  * Helper functions for the Cypress EZ-USB / FX2 series chips.
  */
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../../libsigrok.h"
+#include "../../libsigrok-internal.h"
 //#include <libusb.h>
 #include <glib.h>
 #include <glib/gstdio.h>
diff --git a/libsigrok4DSL/hardware/common/usb.c b/libsigrok4DSL/hardware/common/usb.c
index 09c287ea..5e11c710 100755
--- a/libsigrok4DSL/hardware/common/usb.c
+++ b/libsigrok4DSL/hardware/common/usb.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../../libsigrok.h"
+#include "../../libsigrok-internal.h"
 #include <stdlib.h>
 #include <glib.h>
 //#include <libusb.h>
diff --git a/libsigrok4DSL/hardware/demo/demo.h b/libsigrok4DSL/hardware/demo/demo.h
index 0a9cb52e..e347401f 100755
--- a/libsigrok4DSL/hardware/demo/demo.h
+++ b/libsigrok4DSL/hardware/demo/demo.h
@@ -22,8 +22,8 @@
 #define LIBDSL_HARDWARE_DEMO_H
 
 #include <glib.h>
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../../libsigrok.h"
+#include "../../libsigrok-internal.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libsigrok4DSL/input/in_binary.c b/libsigrok4DSL/input/in_binary.c
index f75e1a1a..e9e3d7e8 100755
--- a/libsigrok4DSL/input/in_binary.c
+++ b/libsigrok4DSL/input/in_binary.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../libsigrok.h"
+#include "../libsigrok-internal.h"
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/libsigrok4DSL/input/in_vcd.c b/libsigrok4DSL/input/in_vcd.c
index 41ff6c0b..a19146a5 100755
--- a/libsigrok4DSL/input/in_vcd.c
+++ b/libsigrok4DSL/input/in_vcd.c
@@ -57,8 +57,8 @@
 
 /*  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../libsigrok.h"
+#include "../libsigrok-internal.h"
 #include <stdlib.h>
 #include <glib.h>
 #include <stdio.h>
diff --git a/libsigrok4DSL/input/in_wav.c b/libsigrok4DSL/input/in_wav.c
index 33db01d9..a576aa8a 100755
--- a/libsigrok4DSL/input/in_wav.c
+++ b/libsigrok4DSL/input/in_wav.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../libsigrok.h"
+#include "../libsigrok-internal.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/libsigrok4DSL/input/input.c b/libsigrok4DSL/input/input.c
index 68ae49e4..bcfb6576 100755
--- a/libsigrok4DSL/input/input.c
+++ b/libsigrok4DSL/input/input.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../libsigrok.h"
+#include "../libsigrok-internal.h"
 
 /**
  * @file
diff --git a/libsigrok4DSL/output/csv.c b/libsigrok4DSL/output/csv.c
index ad95756b..4aa398a5 100755
--- a/libsigrok4DSL/output/csv.c
+++ b/libsigrok4DSL/output/csv.c
@@ -18,12 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../libsigrok.h"
+#include "../libsigrok-internal.h"
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "config.h" /* Needed for PACKAGE_STRING and others. */
+#include "../config.h" /* Needed for PACKAGE_STRING and others. */
 
 #define LOG_PREFIX "output/csv"
  
diff --git a/libsigrok4DSL/output/gnuplot.c b/libsigrok4DSL/output/gnuplot.c
index 1644fceb..e39c1d4c 100755
--- a/libsigrok4DSL/output/gnuplot.c
+++ b/libsigrok4DSL/output/gnuplot.c
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../libsigrok.h"
+#include "../libsigrok-internal.h"
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/libsigrok4DSL/output/output.c b/libsigrok4DSL/output/output.c
index 639bd24b..68292a86 100755
--- a/libsigrok4DSL/output/output.c
+++ b/libsigrok4DSL/output/output.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../libsigrok.h"
+#include "../libsigrok-internal.h"
 #include <string.h>
 
 /** @cond PRIVATE */
diff --git a/libsigrok4DSL/output/srzip.c b/libsigrok4DSL/output/srzip.c
index 5f19f5ab..f723ce69 100755
--- a/libsigrok4DSL/output/srzip.c
+++ b/libsigrok4DSL/output/srzip.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../libsigrok.h"
+#include "../libsigrok-internal.h"
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
diff --git a/libsigrok4DSL/output/vcd.c b/libsigrok4DSL/output/vcd.c
index ce923350..37a5a9af 100755
--- a/libsigrok4DSL/output/vcd.c
+++ b/libsigrok4DSL/output/vcd.c
@@ -19,12 +19,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../libsigrok.h"
+#include "../libsigrok-internal.h"
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "config.h" /* Needed for PACKAGE and others. */
+#include "../config.h" /* Needed for PACKAGE and others. */
 
 #define LOG_PREFIX "output/vcd"
 
diff --git a/qtpro/DSView.pro b/qtpro/DSView.pro
index 5d30bed6..419d9b4a 100644
--- a/qtpro/DSView.pro
+++ b/qtpro/DSView.pro
@@ -27,16 +27,14 @@ CONFIG += decoders
 DEFINES += decoders
 
 unix:!macx {
-INCLUDEPATH += /usr/local/include/
 INCLUDEPATH += /usr/include/glib-2.0
 INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
 INCLUDEPATH += /usr/include/libusb-1.0
 INCLUDEPATH += /usr/include/boost
 INCLUDEPATH += /usr/include/python3.8
 INCLUDEPATH += ..
-INCLUDEPATH += ../libsigrok4DSL
-INCLUDEPATH += ../DSView
-INCLUDEPATH += ../DSView/pv/dialogs
+#INCLUDEPATH += ../libsigrok4DSL
+#INCLUDEPATH += ../DSView
 
 LIBS += /usr/lib/x86_64-linux-gnu/libglib-2.0.so
 LIBS += /usr/lib/x86_64-linux-gnu/libusb-1.0.so
@@ -57,9 +55,8 @@ INCLUDEPATH += /usr/local/include/libusb-1.0
 INCLUDEPATH += /usr/local/include/boost
 INCLUDEPATH += /Library/Frameworks/Python.framework/Versions/3.4/include/python3.4m
 INCLUDEPATH += ..
-INCLUDEPATH += ../libsigrok4DSL
-INCLUDEPATH += ../DSView
-INCLUDEPATH += ../DSView/pv/dialogs
+#INCLUDEPATH += ../libsigrok4DSL
+#INCLUDEPATH += ../DSView
 
 #LIBS += -framework CoreFoundation
 #LIBS += -framework CoreServices
@@ -176,7 +173,7 @@ SOURCES += \
     ../DSView/pv/dstimer.cpp
 
 HEADERS  += \
-    ../DSView/extdef.h \
+    ../DSView/pv/extdef.h \
     ../DSView/config.h \
     ../DSView/pv/sigsession.h \
     ../DSView/pv/mainwindow.h \
diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user
index cc096235..2e3a9259 100644
--- a/qtpro/DSView.pro.user
+++ b/qtpro/DSView.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2021-11-23T18:40:01. -->
+<!-- Written by QtCreator 4.11.0, 2021-11-24T15:20:06. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

From 5740946c7c833b7bc2bc1b5bc487a4446cd0c553 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Thu, 25 Nov 2021 10:50:39 +0800
Subject: [PATCH 37/58] fix resource dir not find bug

---
 DSView/main.cpp                    |  5 +----
 DSView/pv/appcontrol.cpp           |  3 +++
 DSView/pv/config/appconfig.cpp     |  7 ++++++-
 DSView/pv/devicemanager.h          |  4 +---
 DSView/pv/mainwindow.cpp           |  1 -
 DSView/pv/toolbars/logobar.cpp     |  1 -
 DSView/pv/toolbars/samplingbar.cpp |  1 -
 libsigrok4DSL/libsigrok-internal.h |  6 ++++++
 libsigrok4DSL/libsigrok.h          |  2 --
 libsigrok4DSL/proto.h              |  2 ++
 libsigrok4DSL/session.c            | 15 +++++++++++++++
 qtpro/DSView.pro                   |  4 ----
 qtpro/DSView.pro.user              |  2 +-
 13 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/DSView/main.cpp b/DSView/main.cpp
index 978f37b2..8485be26 100755
--- a/DSView/main.cpp
+++ b/DSView/main.cpp
@@ -51,7 +51,6 @@ void usage()
 		"\n", DS_BIN_NAME, DS_DESCRIPTION);
 } 
 
-char DS_RES_PATH[256] = {0};
 
 int main(int argc, char *argv[])
 {  
@@ -146,9 +145,7 @@ int main(int argc, char *argv[])
         open_file = argvFinal[argcFinal - 1];
 	}
 
-	QString path = GetAppDataDir();
-	strcpy(DS_RES_PATH, path.toUtf8().data());
-
+	
 //#ifdef Q_OS_DARWIN 
 //#endif
 
diff --git a/DSView/pv/appcontrol.cpp b/DSView/pv/appcontrol.cpp
index 34fb8f99..52275e88 100644
--- a/DSView/pv/appcontrol.cpp
+++ b/DSView/pv/appcontrol.cpp
@@ -73,6 +73,9 @@ bool AppControl::Init()
         m_error = "DSView run ERROR: libsigrok init failed.";
         return false;
     } 
+
+    QString resdir = GetResourceDir();
+	sr_set_firmware_resource_dir(resdir.toUtf8());
     
     QString dir = GetAppDataDir() + "/decoders";
     char path[256] = {0};
diff --git a/DSView/pv/config/appconfig.cpp b/DSView/pv/config/appconfig.cpp
index 50aeb5cb..920300fe 100644
--- a/DSView/pv/config/appconfig.cpp
+++ b/DSView/pv/config/appconfig.cpp
@@ -307,5 +307,10 @@ QString GetAppDataDir()
 }
 
 QString GetResourceDir(){
-    return GetAppDataDir() + "/res";
+    QDir dir =  GetAppDataDir() + "/res";
+    if (dir.exists()){
+        return dir.absolutePath();
+    }
+    qDebug() << "dir is not exists:" << dir.absolutePath();
+    assert(false);
 }
diff --git a/DSView/pv/devicemanager.h b/DSView/pv/devicemanager.h
index 79f3502d..c8b85b63 100755
--- a/DSView/pv/devicemanager.h
+++ b/DSView/pv/devicemanager.h
@@ -35,9 +35,7 @@
 struct sr_context;
 struct sr_dev_driver;
 struct sr_dev_inst;
-struct libusbhp_t;
-struct libusbhp_device_t;
-
+  
 namespace pv {
 
 class SigSession;
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index cfd76a37..61979413 100644
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -86,7 +86,6 @@
 #include <stdarg.h>
 #include <glib.h>
 #include <list>
-#include <libusb.h>
 #include "ui/msgbox.h"
 #include "config/appconfig.h"
 #include "appcontrol.h"
diff --git a/DSView/pv/toolbars/logobar.cpp b/DSView/pv/toolbars/logobar.cpp
index c08d2bc1..3914d9f0 100755
--- a/DSView/pv/toolbars/logobar.cpp
+++ b/DSView/pv/toolbars/logobar.cpp
@@ -200,7 +200,6 @@ void LogoBar::on_actionManual_triggered()
 
 void LogoBar::on_actionIssue_triggered()
 {
-    QDir dir(GetAppDataDir());
     QDesktopServices::openUrl(QUrl(QLatin1String("https://github.com/DreamSourceLab/DSView/issues")));
 }
 
diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp
index 7281bde6..753eeb92 100755
--- a/DSView/pv/toolbars/samplingbar.cpp
+++ b/DSView/pv/toolbars/samplingbar.cpp
@@ -23,7 +23,6 @@
 #include "../extdef.h"
 
 #include <assert.h> 
-#include <libusb.h>
 #include <QAction>
 #include <QDebug>
 #include <QLabel>
diff --git a/libsigrok4DSL/libsigrok-internal.h b/libsigrok4DSL/libsigrok-internal.h
index de86db20..9eb3f5fc 100755
--- a/libsigrok4DSL/libsigrok-internal.h
+++ b/libsigrok4DSL/libsigrok-internal.h
@@ -27,6 +27,9 @@
 #include <libusb.h>
 #endif
 
+// firmware binary file directory, endswith letter '/'
+extern char DS_RES_PATH[256];
+
 /**
  * @file
  *
@@ -119,6 +122,9 @@ SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
 		const struct sr_datafeed_packet *packet);
 SR_PRIV int sr_session_stop_sync(void);
 
+SR_PRIV int usb_hotplug_callback(struct libusb_context *ctx, struct libusb_device *dev,
+                                  libusb_hotplug_event event, void *user_data);
+
 /*--- std.c -----------------------------------------------------------------*/
 
 typedef int (*dev_close_t)(struct sr_dev_inst *sdi);
diff --git a/libsigrok4DSL/libsigrok.h b/libsigrok4DSL/libsigrok.h
index d36dffcf..9ca4936b 100755
--- a/libsigrok4DSL/libsigrok.h
+++ b/libsigrok4DSL/libsigrok.h
@@ -134,8 +134,6 @@ enum {
 #define MAX_TIMEBASE SR_SEC(10)
 #define MIN_TIMEBASE SR_NS(10)
 
-extern char DS_RES_PATH[256];
-
 /** libsigrok loglevels. */
 enum {
 	SR_LOG_NONE = 0, /**< Output no messages at all. */
diff --git a/libsigrok4DSL/proto.h b/libsigrok4DSL/proto.h
index 81452c3a..0ebd0d26 100755
--- a/libsigrok4DSL/proto.h
+++ b/libsigrok4DSL/proto.h
@@ -186,5 +186,7 @@ SR_API void sr_set_export_original_data(int flag);
 
 SR_API int sr_get_export_original_flag();
 
+SR_API void sr_set_firmware_resource_dir(const char *dir);
+
 
 #endif
diff --git a/libsigrok4DSL/session.c b/libsigrok4DSL/session.c
index ce46fcb9..ba857999 100755
--- a/libsigrok4DSL/session.c
+++ b/libsigrok4DSL/session.c
@@ -34,6 +34,8 @@
 #define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
 #define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
 
+char DS_RES_PATH[256] = {0};
+
 int bExportOriginalData = 0; //able export all data
 
 int session_loop_stop_flag = 0;
@@ -832,4 +834,17 @@ SR_API int sr_get_export_original_flag()
 	return bExportOriginalData;
 }
 
+void sr_set_firmware_resource_dir(const char *dir)
+{
+	if (dir){
+		strcpy(DS_RES_PATH, dir);
+
+		int len = strlen(DS_RES_PATH);
+		if (DS_RES_PATH[len-1] != '/'){
+			DS_RES_PATH[len] = '/';
+			DS_RES_PATH[len+1] = 0;
+		}
+	}
+}
+
 /** @} */
diff --git a/qtpro/DSView.pro b/qtpro/DSView.pro
index 419d9b4a..57b0ae30 100644
--- a/qtpro/DSView.pro
+++ b/qtpro/DSView.pro
@@ -33,8 +33,6 @@ INCLUDEPATH += /usr/include/libusb-1.0
 INCLUDEPATH += /usr/include/boost
 INCLUDEPATH += /usr/include/python3.8
 INCLUDEPATH += ..
-#INCLUDEPATH += ../libsigrok4DSL
-#INCLUDEPATH += ../DSView
 
 LIBS += /usr/lib/x86_64-linux-gnu/libglib-2.0.so
 LIBS += /usr/lib/x86_64-linux-gnu/libusb-1.0.so
@@ -55,8 +53,6 @@ INCLUDEPATH += /usr/local/include/libusb-1.0
 INCLUDEPATH += /usr/local/include/boost
 INCLUDEPATH += /Library/Frameworks/Python.framework/Versions/3.4/include/python3.4m
 INCLUDEPATH += ..
-#INCLUDEPATH += ../libsigrok4DSL
-#INCLUDEPATH += ../DSView
 
 #LIBS += -framework CoreFoundation
 #LIBS += -framework CoreServices
diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user
index 2e3a9259..1c801f1b 100644
--- a/qtpro/DSView.pro.user
+++ b/qtpro/DSView.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2021-11-24T15:20:06. -->
+<!-- Written by QtCreator 4.11.0, 2021-11-24T19:16:06. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

From f6ca1f6ed8e8e1b3e6edb7dcb335444020c51227 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Thu, 25 Nov 2021 15:41:00 +0800
Subject: [PATCH 38/58] fix capture thread stop bug

---
 DSView/pv/data/snapshot.cpp        |  42 +----------
 DSView/pv/data/snapshot.h          |  36 ++++++---
 DSView/pv/device/devinst.cpp       |   7 +-
 DSView/pv/mainwindow.cpp           |  11 ++-
 DSView/pv/mainwindow.h             |   4 +-
 libsigrok4DSL/libsigrok-internal.h |   2 +-
 libsigrok4DSL/session.c            |  16 ++--
 libsigrokdecode4DSL/config.h       | 114 +++++++++++++++++++++++++++++
 8 files changed, 161 insertions(+), 71 deletions(-)
 create mode 100644 libsigrokdecode4DSL/config.h

diff --git a/DSView/pv/data/snapshot.cpp b/DSView/pv/data/snapshot.cpp
index bac3cc16..c359addb 100755
--- a/DSView/pv/data/snapshot.cpp
+++ b/DSView/pv/data/snapshot.cpp
@@ -64,11 +64,6 @@ void Snapshot::free_data()
     _ch_index.clear();
 }
 
-bool Snapshot::memory_failed()
-{
-    return _memory_failed;
-}
-
 bool Snapshot::empty()
 {
     if (get_sample_count() == 0)
@@ -77,16 +72,6 @@ bool Snapshot::empty()
         return false;
 }
 
-bool Snapshot::last_ended()
-{
-    return _last_ended;
-}
-
-void Snapshot::set_last_ended(bool ended)
-{
-    _last_ended = ended;
-}
-
 uint64_t Snapshot::get_sample_count()
 {
     std::lock_guard<std::mutex> lock(_mutex);
@@ -104,12 +89,7 @@ uint64_t Snapshot::get_ring_end()
     std::lock_guard<std::mutex> lock(_mutex);
     return ring_end();     
 }
-
-uint64_t Snapshot::sample_count()
-{ 
-    return _sample_count;
-}
-
+ 
 uint64_t Snapshot::ring_start()
 { 
     if (_sample_count < _total_sample_count)
@@ -128,26 +108,6 @@ uint64_t Snapshot::ring_end()
         return _ring_sample_count - 1;
 }
 
-const void* Snapshot::get_data()
-{
-    return _data;
-}
-
-int Snapshot::unit_size()
-{
-    return _unit_size;
-}
-
-uint8_t Snapshot::get_unit_bytes()
-{
-    return _unit_bytes;
-}
-
-unsigned int Snapshot::get_channel_num()
-{
-    return _channel_num;
-}
-
 void Snapshot::capture_ended()
 {
     set_last_ended(true);
diff --git a/DSView/pv/data/snapshot.h b/DSView/pv/data/snapshot.h
index b3447b89..5113aef0 100755
--- a/DSView/pv/data/snapshot.h
+++ b/DSView/pv/data/snapshot.h
@@ -43,18 +43,35 @@ public:
     uint64_t get_ring_start();
     uint64_t get_ring_end();
 
-    const void * get_data();
+    inline const void* get_data(){
+        return _data;
+    }
 
-    int unit_size();
-    uint8_t get_unit_bytes();
+    inline int unit_size(){
+        return _unit_size;
+    }
+
+    inline uint8_t get_unit_bytes(){
+        return _unit_bytes;
+    }
+
+    inline bool memory_failed(){
+        return _memory_failed;
+    }
 
-    bool memory_failed();
     bool empty();
 
-    bool last_ended();
-    void set_last_ended(bool ended);
+    inline bool last_ended(){
+        return _last_ended;
+    }
 
-    unsigned int get_channel_num();
+    inline void set_last_ended(bool ended){
+        _last_ended = ended;
+    }
+
+    inline unsigned int get_channel_num(){
+        return _channel_num;
+    }
 
     virtual void capture_ended();
     virtual bool has_data(int index) = 0;
@@ -64,10 +81,11 @@ public:
 protected:
     virtual void free_data();
 
-    uint64_t  sample_count();
+    inline uint64_t sample_count(){
+        return _sample_count;
+    }
 
     uint64_t ring_start();
-
     uint64_t ring_end();
 
 protected:
diff --git a/DSView/pv/device/devinst.cpp b/DSView/pv/device/devinst.cpp
index 29777872..f4b03485 100755
--- a/DSView/pv/device/devinst.cpp
+++ b/DSView/pv/device/devinst.cpp
@@ -200,7 +200,12 @@ void DevInst::start()
 
 void DevInst::run()
 {
-	sr_session_run();
+	qDebug()<<"session run loop start";
+	int ret = sr_session_run();
+	if (ret != SR_OK){
+        qDebug()<<"start session error!";
+	}
+    qDebug()<<"session run loop end";
 }
 
 void DevInst::stop()
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index 61979413..cbd65ecd 100644
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -40,6 +40,7 @@
 #include <QApplication>
 #include <QStandardPaths>
 #include <QScreen>
+#include <QTimer>
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 #include <QGuiApplication>
@@ -236,10 +237,7 @@ void MainWindow::setup_ui()
   
     // UI initial
     _measure_widget->add_dist_measure();
-
-    // update device
-    update_device_list();
-    
+ 
     _session->start_hotplug_work();
 
     retranslateUi();
@@ -302,6 +300,9 @@ void MainWindow::setup_ui()
     connect(_dso_trigger_widget, SIGNAL(set_trig_pos(int)), _view, SLOT(set_trig_pos(int))); 
 
     _logo_bar->set_mainform_callback(this);
+
+    //delay to update device list
+    QTimer::singleShot(200, this, SLOT(update_device_list()));
 }
 
 
@@ -457,8 +458,6 @@ void MainWindow::on_load_file(QString file_name)
     } catch(QString e) {
         show_error(tr("Failed to load ") + file_name);
         _session->set_default_device();
-        update_device_list();
-        return;
     }
 
     update_device_list();
diff --git a/DSView/pv/mainwindow.h b/DSView/pv/mainwindow.h
index 8cbf35a9..6e284bb8 100755
--- a/DSView/pv/mainwindow.h
+++ b/DSView/pv/mainwindow.h
@@ -91,8 +91,7 @@ private:
 	void setup_ui();
     void retranslateUi(); 
     bool eventFilter(QObject *object, QEvent *event);
-    bool load_session_json(QJsonDocument json, bool file_dev,bool bDecoder=true);
-    void update_device_list();
+    bool load_session_json(QJsonDocument json, bool file_dev,bool bDecoder=true);  
 
 public slots: 
     void switchTheme(QString style);
@@ -102,6 +101,7 @@ private slots:
 	void on_load_file(QString file_name);
     void on_open_doc(); 
     void on_device_updated_reload();
+    void update_device_list();
  
 	void on_run_stop();
     void on_instant_stop(); 
diff --git a/libsigrok4DSL/libsigrok-internal.h b/libsigrok4DSL/libsigrok-internal.h
index 9eb3f5fc..c310a370 100755
--- a/libsigrok4DSL/libsigrok-internal.h
+++ b/libsigrok4DSL/libsigrok-internal.h
@@ -28,7 +28,7 @@
 #endif
 
 // firmware binary file directory, endswith letter '/'
-extern char DS_RES_PATH[256];
+extern char DS_RES_PATH[500];
 
 /**
  * @file
diff --git a/libsigrok4DSL/session.c b/libsigrok4DSL/session.c
index ba857999..74ca9996 100755
--- a/libsigrok4DSL/session.c
+++ b/libsigrok4DSL/session.c
@@ -34,12 +34,10 @@
 #define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
 #define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
 
-char DS_RES_PATH[256] = {0};
+char DS_RES_PATH[500] = {0};
 
 int bExportOriginalData = 0; //able export all data
 
-int session_loop_stop_flag = 0;
-
 /**
  * @file
  *
@@ -407,14 +405,12 @@ SR_API int sr_session_run(void)
 
     session->running = TRUE;
 
-    session_loop_stop_flag = 0;
-
 	sr_info("Running...");
 
 	/* Do we have real sources? */
 	if (session->num_sources == 1 && session->pollfds[0].fd == -1) {
 		/* Dummy source, freewheel over it. */
-        while (session->num_sources && !session_loop_stop_flag) {
+        while (session->num_sources) {
             if (session->abort_session) {
                 session->sources[0].cb(-1, -1, session->sources[0].cb_data);
                 break;
@@ -424,7 +420,7 @@ SR_API int sr_session_run(void)
         }
 	} else {
 		/* Real sources, use g_poll() main loop. */
-        while (session->num_sources && !session_loop_stop_flag){
+        while (session->num_sources){
 			sr_session_iteration(TRUE);
 		}            
 	}
@@ -491,8 +487,6 @@ SR_API int sr_session_stop(void)
 		return SR_ERR_BUG;
 	}
 
-	session_loop_stop_flag = 1; //set flag, the run loop will exit
-
     g_mutex_lock(&session->stop_mutex);
     if (session->running)
         session->abort_session = TRUE;  
@@ -841,8 +835,8 @@ void sr_set_firmware_resource_dir(const char *dir)
 
 		int len = strlen(DS_RES_PATH);
 		if (DS_RES_PATH[len-1] != '/'){
-			DS_RES_PATH[len] = '/';
-			DS_RES_PATH[len+1] = 0;
+			DS_RES_PATH[len] = '/'; 
+			DS_RES_PATH[len + 1] = 0;
 		}
 	}
 }
diff --git a/libsigrokdecode4DSL/config.h b/libsigrokdecode4DSL/config.h
new file mode 100644
index 00000000..1d480390
--- /dev/null
+++ b/libsigrokdecode4DSL/config.h
@@ -0,0 +1,114 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
+/* The canonical host libsigrokdecode will run on. */
+#define CONF_HOST "x86_64-pc-linux-gnu"
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#define LT_OBJDIR ".libs/"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "support@dreamsourcelab.com"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "libsigrokdecode4DSL"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libsigrokdecode4DSL 0.6.0"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libsigrokdecode4DSL"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL "http://www.dreamsourcelab.com"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "0.6.0"
+
+/* Binary age of libsigrokdecode4DSL. */
+#define SRD_LIB_VERSION_AGE 0
+
+/* Binary version of libsigrokdecode4DSL. */
+#define SRD_LIB_VERSION_CURRENT 4
+
+/* Binary revision of libsigrokdecode4DSL. */
+#define SRD_LIB_VERSION_REVISION 0
+
+/* Binary version triple of libsigrokdecode4DSL. */
+#define SRD_LIB_VERSION_STRING "4:0:0"
+
+/* Major version number of libsigrokdecode4DSL. */
+#define SRD_PACKAGE_VERSION_MAJOR 0
+
+/* Micro version number of libsigrokdecode4DSL. */
+#define SRD_PACKAGE_VERSION_MICRO 0
+
+/* Minor version number of libsigrokdecode4DSL. */
+#define SRD_PACKAGE_VERSION_MINOR 6
+
+/* Version of libsigrokdecode4DSL. */
+#define SRD_PACKAGE_VERSION_STRING "0.6.0-git-c708a00"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* #  undef WORDS_BIGENDIAN */
+# endif
+#endif
+
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+/* #undef _FILE_OFFSET_BITS */
+
+/* Define for large files, on AIX-style hosts. */
+/* #undef _LARGE_FILES */
+
+/* The targeted POSIX standard. */
+#ifndef _POSIX_C_SOURCE
+# define _POSIX_C_SOURCE 200112L
+#endif

From 82da3a6acd1aba361fe863cbbe72396a972f8da1 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Tue, 30 Nov 2021 14:17:47 +0800
Subject: [PATCH 39/58] make zip file in memory, function update

---
 DSView/pv/config/appconfig.cpp      |  10 +
 DSView/pv/config/appconfig.h        |   4 +-
 DSView/pv/device/device.cpp         |  15 +-
 DSView/pv/device/devinst.cpp        |   3 +-
 DSView/pv/device/sessionfile.cpp    |  25 +-
 DSView/pv/devicemanager.cpp         |   3 +-
 DSView/pv/dialogs/storeprogress.cpp |   6 +-
 DSView/pv/dialogs/storeprogress.h   |   3 +-
 DSView/pv/interface/icallbacks.h    |   6 +
 DSView/pv/mainwindow.cpp            |  72 +++---
 DSView/pv/mainwindow.h              |   9 +-
 DSView/pv/sigsession.cpp            |   8 +-
 DSView/pv/storesession.cpp          | 382 ++++++++++++++++------------
 DSView/pv/storesession.h            |  18 +-
 libsigrok4DSL/dsdevice.c            |   2 +-
 libsigrok4DSL/proto.h               |   3 +
 libsigrok4DSL/session.c             |  11 +
 qtpro/DSView.pro                    |   1 +
 qtpro/DSView.pro.user               |   2 +-
 19 files changed, 333 insertions(+), 250 deletions(-)

diff --git a/DSView/pv/config/appconfig.cpp b/DSView/pv/config/appconfig.cpp
index 920300fe..75fae622 100644
--- a/DSView/pv/config/appconfig.cpp
+++ b/DSView/pv/config/appconfig.cpp
@@ -27,6 +27,7 @@
 #include <QDir>
 #include <QDebug>
 #include <assert.h>
+#include <QStandardPaths>
   
 #define MAX_PROTOCOL_FORMAT_LIST 15
 
@@ -314,3 +315,12 @@ QString GetResourceDir(){
     qDebug() << "dir is not exists:" << dir.absolutePath();
     assert(false);
 }
+
+QString GetUserDataDir()
+{
+    #if QT_VERSION >= 0x050400
+    return QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
+    #else
+    return QStandardPaths::writableLocation(QStandardPaths::DataLocation);
+    #endif
+}
diff --git a/DSView/pv/config/appconfig.h b/DSView/pv/config/appconfig.h
index f9cdb6a8..250e1868 100644
--- a/DSView/pv/config/appconfig.h
+++ b/DSView/pv/config/appconfig.h
@@ -33,12 +33,10 @@
 //--------------------api---
 
 QString GetDirectoryName(QString path);
-
 QString GetIconPath();
-
 QString GetAppDataDir();
-
 QString GetResourceDir();
+QString GetUserDataDir();
 
 //------------------class
   
diff --git a/DSView/pv/device/device.cpp b/DSView/pv/device/device.cpp
index 1f6c0bdb..4e056b45 100755
--- a/DSView/pv/device/device.cpp
+++ b/DSView/pv/device/device.cpp
@@ -33,8 +33,6 @@ Device::Device(sr_dev_inst *sdi) :
     _sdi(sdi)
 {
 	assert(_sdi);
-    void *p = this;
-    (void)p;
 }
 
 Device::~Device()
@@ -52,9 +50,8 @@ void Device::use(SigSession *owner)
     DevInst::use(owner);
 
     sr_session_new();
-
-    assert(_sdi);
     sr_dev_open(_sdi);
+
     _usable = (_sdi->status == SR_ST_ACTIVE);
     if (sr_session_dev_add(_sdi) != SR_OK)
         throw QString(tr("Failed to use device."));
@@ -74,15 +71,6 @@ QString Device::format_device_title()
 {
 	ostringstream s;
 
-	assert(_sdi);
-
-//	if (_sdi->vendor && _sdi->vendor[0]) {
-//		s << _sdi->vendor;
-//		if ((_sdi->model && _sdi->model[0]) ||
-//			(_sdi->version && _sdi->version[0]))
-//			s << ' ';
-//	}
-
 	if (_sdi->model && _sdi->model[0]) {
 		s << _sdi->model;
 		if (_sdi->version && _sdi->version[0])
@@ -97,7 +85,6 @@ QString Device::format_device_title()
 
 bool Device::is_trigger_enabled()
 {
-	assert(_sdi);
 	for (const GSList *l = _sdi->channels; l; l = l->next) {
 		const sr_channel *const p = (const sr_channel *)l->data;
 		assert(p);
diff --git a/DSView/pv/device/devinst.cpp b/DSView/pv/device/devinst.cpp
index f4b03485..92c4894f 100755
--- a/DSView/pv/device/devinst.cpp
+++ b/DSView/pv/device/devinst.cpp
@@ -195,7 +195,8 @@ bool DevInst::is_trigger_enabled()
 void DevInst::start()
 {
 	if (sr_session_start() != SR_OK)
-		throw tr("Failed to start session.");
+		 throw tr("Failed to start session.");
+		//assert(false);
 }
 
 void DevInst::run()
diff --git a/DSView/pv/device/sessionfile.cpp b/DSView/pv/device/sessionfile.cpp
index 6d3f53d2..3873fa22 100755
--- a/DSView/pv/device/sessionfile.cpp
+++ b/DSView/pv/device/sessionfile.cpp
@@ -25,9 +25,9 @@ namespace pv {
 namespace device {
 
 SessionFile::SessionFile(QString path) :
-	File(path),
-	_sdi(NULL)
+	File(path)
 {
+	_sdi = NULL;
 }
 
 sr_dev_inst* SessionFile::dev_inst()
@@ -38,6 +38,9 @@ sr_dev_inst* SessionFile::dev_inst()
 void SessionFile::use(SigSession *owner)
 {
 	assert(!_sdi);
+	if (_sdi){
+		//return;
+	}
 
     if (sr_session_load(_path.toUtf8().data()) != SR_OK)
 		throw tr("Failed to open file.\n");
@@ -58,15 +61,15 @@ void SessionFile::use(SigSession *owner)
 }
 
 void SessionFile::release()
-{
-    if (!_owner || !_sdi)
-		return;
-
-	File::release();
-	sr_dev_close(_sdi);
-	sr_dev_clear(_sdi->driver);
-	sr_session_destroy();
-	_sdi = NULL;
+{  
+    if (_owner != NULL && _sdi != NULL)
+	{
+		File::release();
+		sr_dev_close(_sdi);
+		sr_dev_clear(_sdi->driver);
+		sr_session_destroy();
+		_sdi = NULL;
+	}
 }
 
 } // device
diff --git a/DSView/pv/devicemanager.cpp b/DSView/pv/devicemanager.cpp
index 448272ef..f148ee11 100755
--- a/DSView/pv/devicemanager.cpp
+++ b/DSView/pv/devicemanager.cpp
@@ -102,8 +102,7 @@ void DeviceManager::driver_scan(
 	// list. They will not be valid after the scan.
     auto i = _devices.begin();
 	while (i != _devices.end()) {
-        if ((*i)->dev_inst() &&
-            (*i)->dev_inst()->driver == driver) {
+        if ((*i)->dev_inst() && (*i)->dev_inst()->driver == driver) {
             (*i)->release();
 			i = _devices.erase(i);
         } else {
diff --git a/DSView/pv/dialogs/storeprogress.cpp b/DSView/pv/dialogs/storeprogress.cpp
index 168a4c75..28fa1571 100755
--- a/DSView/pv/dialogs/storeprogress.cpp
+++ b/DSView/pv/dialogs/storeprogress.cpp
@@ -158,18 +158,20 @@ void StoreProgress::timeout()
         _store_session.session()->set_saving(false);
         save_done();
         close(); 
+        delete this;
+        
     } else {
         QTimer::singleShot(100, this, SLOT(timeout()));
     }
 }
 
-void StoreProgress::save_run(QString session_file)
+void StoreProgress::save_run(ISessionDataGetter *getter)
 {
     _isExport = false;
     setTitle(tr("Saving..."));
     QString file = _store_session.MakeSaveFile(false);
     _fileLab->setText(file);
-    _store_session._sessionFile = session_file;
+    _store_session._sessionDataGetter = getter;
     show();  
 }
 
diff --git a/DSView/pv/dialogs/storeprogress.h b/DSView/pv/dialogs/storeprogress.h
index f0475b5d..54a5b548 100755
--- a/DSView/pv/dialogs/storeprogress.h
+++ b/DSView/pv/dialogs/storeprogress.h
@@ -25,6 +25,7 @@
 #include <QProgressBar>
 #include "../storesession.h"
 #include "../dialogs/dsdialog.h" 
+#include "../interface/icallbacks.h"
 
 class QLineEdit;
 class QCheckBox;
@@ -59,7 +60,7 @@ signals:
     void save_done();
 
 public slots:
-    void save_run(QString session_file);
+    void save_run(ISessionDataGetter *getter);
     void export_run();
 
 private slots:
diff --git a/DSView/pv/interface/icallbacks.h b/DSView/pv/interface/icallbacks.h
index 1d1627c3..0fca6f66 100644
--- a/DSView/pv/interface/icallbacks.h
+++ b/DSView/pv/interface/icallbacks.h
@@ -34,4 +34,10 @@ public:
   
 };
 
+class ISessionDataGetter
+{
+public:
+    virtual bool genSessionData(std::string &str) = 0;
+};
+
 #endif
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index cbd65ecd..70caa8f4 100644
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -913,25 +913,11 @@ void MainWindow::on_save()
     using pv::dialogs::StoreProgress; 
 
     SigSession *_session = _control->GetSession();
-
     _session->set_saving(true);
-    QString session_file;
-    QDir dir;
-    #if QT_VERSION >= 0x050400
-    QString path = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
-    #else
-    QString path = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
-    #endif
-    if(dir.mkpath(path)) {
-        dir.cd(path);
-
-        session_file = dir.absolutePath() + "/DSView-session-XXXXXX";
-        on_store_session(session_file);
-    }
 
     StoreProgress *dlg = new StoreProgress(_session, this);
     connect(dlg, SIGNAL(save_done()), this, SLOT(device_detach_post()));
-    dlg->save_run(session_file);
+    dlg->save_run(this);
 }
 
 void MainWindow::on_export()
@@ -1139,21 +1125,9 @@ bool MainWindow::load_session_json(QJsonDocument json, bool file_dev, bool bDeco
     return true;
 }
 
-
-bool MainWindow::on_store_session(QString name)
-{
-    QFile sessionFile(name);
-    if (!sessionFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
-        qDebug("Warning: Couldn't open session file to write!");
-        return false;
-    }
-    QTextStream outStream(&sessionFile);
-    app::set_utf8(outStream); 
-
-    //outStream.setGenerateByteOrderMark(true); // UTF-8 without BOM
-
-    AppConfig &app = AppConfig::Instance(); 
+bool MainWindow::gen_session_json(QJsonArray &array){
     SigSession *_session = _control->GetSession();
+    AppConfig &app = AppConfig::Instance();
 
     GVariant *gvar_opts;
     GVariant *gvar;
@@ -1168,6 +1142,7 @@ bool MainWindow::on_store_session(QString name)
 
     if ((sr_config_list(sdi->driver, sdi, NULL, SR_CONF_DEVICE_SESSIONS, &gvar_opts) != SR_OK))
         return false;   /* Driver supports no device instance sessions. */
+
     const int *const options = (const int32_t *)g_variant_get_fixed_array(
         gvar_opts, &num_opts, sizeof(int32_t));
     for (unsigned int i = 0; i < num_opts; i++) {
@@ -1231,23 +1206,52 @@ bool MainWindow::on_store_session(QString name)
     if (_session->get_device()->dev_inst()->mode == LOGIC) {
         sessionVar["trigger"] = _trigger_widget->get_session();
     }
-
-   
+ 
     StoreSession ss(_session);
-    sessionVar["decoder"] = ss.json_decoders();
-
+    QJsonArray decodeJson;
+    ss.json_decoders(decodeJson);
+    sessionVar["decoder"] = decodeJson;
 
     if (_session->get_device()->dev_inst()->mode == DSO) {
         sessionVar["measure"] = _view->get_viewstatus()->get_session();
+    } 
+ 
+    array.push_back(sessionVar);
+    return true;
+}
+
+bool MainWindow::on_store_session(QString name)
+{
+    QFile sessionFile(name);
+    if (!sessionFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
+        qDebug("Warning: Couldn't open session file to write!");
+        return false;
     }
 
-    QJsonDocument sessionDoc(sessionVar);
+    QTextStream outStream(&sessionFile);
+    app::set_utf8(outStream);
+    
+    QJsonArray jsonArray;
+    if (!gen_session_json(jsonArray))
+        return false;
+    QJsonDocument sessionDoc(jsonArray);
     //sessionFile.write(QString::fromUtf8(sessionDoc.toJson()));
     outStream << QString::fromUtf8(sessionDoc.toJson());
     sessionFile.close(); 
     return true;
 }
 
+bool MainWindow::genSessionData(std::string &str)
+{
+    QJsonArray jsonArray;
+    if (!gen_session_json(jsonArray))
+        return false;
+    QJsonDocument sessionDoc(jsonArray);
+    QString data = QString::fromUtf8(sessionDoc.toJson());
+    str.append(data.toLatin1().data());
+    return true;
+}
+
 void MainWindow::restore_dock()
 {
     // default dockwidget size 
diff --git a/DSView/pv/mainwindow.h b/DSView/pv/mainwindow.h
index 6e284bb8..047024ad 100755
--- a/DSView/pv/mainwindow.h
+++ b/DSView/pv/mainwindow.h
@@ -73,7 +73,7 @@ using namespace pv::device;
  
 //The mainwindow,referenced by MainFrame
 //TODO: create graph view,toolbar,and show device list
-class MainWindow : public QMainWindow, public ISessionCallback, public IMainForm
+class MainWindow : public QMainWindow, public ISessionCallback, public IMainForm, ISessionDataGetter
 {
 	Q_OBJECT
 
@@ -146,6 +146,10 @@ public:
 public:
     void session_save(); 
 
+    //ISessionDataGetter
+private:
+    bool genSessionData(std::string &str);
+
 //ISessionCallback
 private:
     void show_error(QString error);
@@ -173,6 +177,9 @@ private:
     void receive_header();    
     void data_received();
 
+    //------private
+    bool gen_session_json(QJsonArray &array);
+
 private:
     AppControl              *_control; 
     bool                    _hot_detach;
diff --git a/DSView/pv/sigsession.cpp b/DSView/pv/sigsession.cpp
index 2816eddb..0806c8ba 100755
--- a/DSView/pv/sigsession.cpp
+++ b/DSView/pv/sigsession.cpp
@@ -418,6 +418,8 @@ void SigSession::start_capture(bool instant)
     }
     assert(_dev_inst->dev_inst());
 
+    qDebug()<<"start capture, device title:"<<_dev_inst->format_device_title();
+
     if (!_dev_inst->is_usable()) {
         _error = Hw_err;
         _callback->session_error();
@@ -431,7 +433,6 @@ void SigSession::start_capture(bool instant)
     // reset measure of dso signal
     for(auto &s : _signals)
     {
-        assert(s);
         view::DsoSignal *dsoSig = NULL;
         if ((dsoSig = dynamic_cast<view::DsoSignal*>(s)))
             dsoSig->set_mValid(false);
@@ -465,6 +466,10 @@ void SigSession::start_capture(bool instant)
     if (_sampling_thread.joinable()){
         _sampling_thread.join();
     } 
+
+    if (sr_check_session_start_before() != 0){
+        assert(false);
+    }
     _sampling_thread  = std::thread(&SigSession::sample_thread_proc, this, _dev_inst);
 }
 
@@ -483,6 +488,7 @@ void SigSession::sample_thread_proc(DevInst *dev_inst)
 
     receive_data(0);
     set_capture_state(Running);
+     //session loop
     dev_inst->run();
     set_capture_state(Stopped);
 
diff --git a/DSView/pv/storesession.cpp b/DSView/pv/storesession.cpp
index b65b36ed..33a4b829 100755
--- a/DSView/pv/storesession.cpp
+++ b/DSView/pv/storesession.cpp
@@ -49,10 +49,11 @@
 #include <math.h>
 #include <QTextStream>
 #include <QDebug>
-
+ 
 #include <libsigrokdecode4DSL/libsigrokdecode.h>
 #include "config/appconfig.h"
 #include "dsvdef.h"
+
  
 namespace pv { 
 
@@ -64,6 +65,7 @@ StoreSession::StoreSession(SigSession *session) :
     _has_error(false),
     _canceled(false)
 { 
+    _sessionDataGetter = NULL;
 }
 
 StoreSession::~StoreSession()
@@ -117,12 +119,8 @@ QList<QString> StoreSession::getSuportedExportFormats(){
 }
 
 bool StoreSession::save_start()
-{
-    if (_sessionFile == "")
-    {
-        _error = tr("No set session file name.");
-        return false;
-    }
+{ 
+    assert(_sessionDataGetter);
 
     std::set<int> type_set;
     for(auto &sig : _session->get_signals()) {
@@ -151,11 +149,7 @@ bool StoreSession::save_start()
     if (snapshot->empty()) {
         _error = tr("No data to save.");
         return false;
-    }
-
-    QString meta_file = meta_gen(snapshot);
-
-    QString decoders_file = decoders_gen();
+    } 
 
     /*
         if (meta_file == NULL) {
@@ -174,13 +168,37 @@ bool StoreSession::save_start()
         }
         */
 
-    //make zip file
-    if (meta_file != "" && m_zipDoc.CreateNew(_file_name.toUtf8().data(), false))
-    {
-        if (!m_zipDoc.AddFromFile(meta_file.toUtf8().data(), "header") 
-        || !m_zipDoc.AddFromFile(decoders_file.toUtf8().data(), "decoders") 
-        || !m_zipDoc.AddFromFile(_sessionFile.toUtf8().data(), "session"))
-        {
+    std::string meta_data;
+    std::string decoder_data;
+    std::string session_data;
+    
+    meta_gen(snapshot, meta_data);
+    decoders_gen(decoder_data);
+    _sessionDataGetter->genSessionData(session_data);
+
+    if (meta_data.empty()) {
+        _error = tr("Generate temp file data failed.");
+        QFile::remove(_file_name);
+        return false;
+    }
+    if (decoder_data.empty()){
+        _error = tr("Generate decoder file data failed.");
+        QFile::remove(_file_name);
+        return false;
+    }
+    if (session_data.empty()){
+        _error = tr("Generate session file data failed.");
+        QFile::remove(_file_name);
+        return false;
+    }
+   
+    std::string _filename = getFileName(_file_name);
+    if (m_zipDoc.CreateNew(_filename.c_str(), false))
+    {    
+        if ( !m_zipDoc.AddFromBuffer("header", meta_data.c_str(), meta_data.size())
+            || !m_zipDoc.AddFromBuffer("decoders", decoder_data.c_str(), decoder_data.size())
+            || !m_zipDoc.AddFromBuffer("session", session_data.c_str(), session_data.size())
+        ){
             _has_error = true;
             _error = m_zipDoc.GetError();
         }
@@ -191,9 +209,11 @@ bool StoreSession::save_start()
             return !_has_error;
         }
     }
+    else{
+         _error = tr("Generate zip file failed.");
+    }
 
     QFile::remove(_file_name);
-    //_error.clear();
     return false;
 }
 
@@ -339,55 +359,35 @@ void StoreSession::save_proc(data::Snapshot *snapshot)
     } 
 }
 
-QString StoreSession::meta_gen(data::Snapshot *snapshot)
+bool StoreSession::meta_gen(data::Snapshot *snapshot, std::string &str)
 {
     GSList *l;
-    GVariant *gvar;
-    FILE *meta = NULL;
+    GVariant *gvar; 
     struct sr_channel *probe;
     int probecnt;
     char *s;
     struct sr_status status;
-    QString metafile;
+    const sr_dev_inst *sdi = NULL;
+    char meta[300] = {0};
+ 
+    sdi = _session->get_device()->dev_inst();
+  
+    sprintf(meta, "%s", "[version]\n"); str += meta;
+    sprintf(meta, "version = %d\n", File_Version); str += meta;
+    sprintf(meta, "%s", "[header]\n"); str += meta;
 
-    /* init "metadata" */
-    QDir dir;
-    #if QT_VERSION >= 0x050400
-    QString path = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
-    #else
-    QString path = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
-    #endif
-    if(dir.mkpath(path)) {
-        dir.cd(path);
-        metafile = dir.absolutePath() + "/DSView-meta-XXXXXX";
-    } else {
-        return NULL;
-    }
-
-    const sr_dev_inst *sdi = _session->get_device()->dev_inst();
-    meta = fopen(metafile.toUtf8().data(), "wb");
-    if (meta == NULL) {
-        qDebug() << "Failed to create temp meta file.";
-        return NULL;
-    }
-
-    fprintf(meta, "[version]\n");
-    fprintf(meta, "version = %d\n", File_Version);
-
-    /* metadata */
-    fprintf(meta, "[header]\n");
     if (sdi->driver) {
-        fprintf(meta, "driver = %s\n", sdi->driver->name);
-        fprintf(meta, "device mode = %d\n", sdi->mode);
+        sprintf(meta, "driver = %s\n", sdi->driver->name); str += meta;
+        sprintf(meta, "device mode = %d\n", sdi->mode); str += meta;
     }
 
     /* metadata */
-    fprintf(meta, "capturefile = data\n");
-    fprintf(meta, "total samples = %" PRIu64 "\n", snapshot->get_sample_count());
+    sprintf(meta, "capturefile = data\n"); str += meta;
+    sprintf(meta, "total samples = %" PRIu64 "\n", snapshot->get_sample_count()); str += meta;
 
     if (sdi->mode != LOGIC) {
-        fprintf(meta, "total probes = %d\n", snapshot->get_channel_num());
-        fprintf(meta, "total blocks = %d\n", snapshot->get_block_num());
+        sprintf(meta, "total probes = %d\n", snapshot->get_channel_num()); str += meta;
+        sprintf(meta, "total blocks = %d\n", snapshot->get_block_num()); str += meta;
     }
 
     data::LogicSnapshot *logic_snapshot = NULL;
@@ -398,140 +398,198 @@ QString StoreSession::meta_gen(data::Snapshot *snapshot)
             if (probe->enabled && logic_snapshot->has_data(probe->index))
                 to_save_probes++;
         }
-        fprintf(meta, "total probes = %d\n", to_save_probes);
-        fprintf(meta, "total blocks = %d\n", logic_snapshot->get_block_num());
+        sprintf(meta, "total probes = %d\n", to_save_probes); str += meta;
+        sprintf(meta, "total blocks = %d\n", logic_snapshot->get_block_num()); str += meta;
     }
 
     s = sr_samplerate_string(_session->cur_snap_samplerate());
-    fprintf(meta, "samplerate = %s\n", s);
+
+    sprintf(meta, "samplerate = %s\n", s); str += meta;
 
     if (sdi->mode == DSO) {
         gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_TIMEBASE);
         if (gvar != NULL) {
             uint64_t tmp_u64 = g_variant_get_uint64(gvar);
-            fprintf(meta, "hDiv = %" PRIu64 "\n", tmp_u64);
+            sprintf(meta, "hDiv = %" PRIu64 "\n", tmp_u64); str += meta;
             g_variant_unref(gvar);
         }
         gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_MAX_TIMEBASE);
         if (gvar != NULL) {
             uint64_t tmp_u64 = g_variant_get_uint64(gvar);
-            fprintf(meta, "hDiv max = %" PRIu64 "\n", tmp_u64);
+            sprintf(meta, "hDiv max = %" PRIu64 "\n", tmp_u64); str += meta;
             g_variant_unref(gvar);
         }
         gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_MIN_TIMEBASE);
         if (gvar != NULL) {
             uint64_t tmp_u64 = g_variant_get_uint64(gvar);
-            fprintf(meta, "hDiv min = %" PRIu64 "\n", tmp_u64);
+            sprintf(meta, "hDiv min = %" PRIu64 "\n", tmp_u64); str += meta;
             g_variant_unref(gvar);
         }
         gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_UNIT_BITS);
         if (gvar != NULL) {
             uint8_t tmp_u8 = g_variant_get_byte(gvar);
-            fprintf(meta, "bits = %d\n", tmp_u8);
+            sprintf(meta, "bits = %d\n", tmp_u8); str += meta;
             g_variant_unref(gvar);
         }
         gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_REF_MIN);
         if (gvar != NULL) {
             uint32_t tmp_u32 = g_variant_get_uint32(gvar);
-            fprintf(meta, "ref min = %d\n", tmp_u32);
+            sprintf(meta, "ref min = %d\n", tmp_u32); str += meta;
             g_variant_unref(gvar);
         }
         gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_REF_MAX);
         if (gvar != NULL) {
             uint32_t tmp_u32 = g_variant_get_uint32(gvar);
-            fprintf(meta, "ref max = %d\n", tmp_u32);
+            sprintf(meta, "ref max = %d\n", tmp_u32); str += meta;
             g_variant_unref(gvar);
         }
     } else if (sdi->mode == LOGIC) {
-        fprintf(meta, "trigger time = %lld\n", _session->get_session_time().toMSecsSinceEpoch());
+        sprintf(meta, "trigger time = %lld\n", _session->get_session_time().toMSecsSinceEpoch()); str += meta;
     } else if (sdi->mode == ANALOG) {
         data::AnalogSnapshot *analog_snapshot = NULL;
         if ((analog_snapshot = dynamic_cast<data::AnalogSnapshot*>(snapshot))) {
             uint8_t tmp_u8 = analog_snapshot->get_unit_bytes();
-            fprintf(meta, "bits = %d\n", tmp_u8*8);
+            sprintf(meta, "bits = %d\n", tmp_u8*8); str += meta;
         }
         gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_REF_MIN);
         if (gvar != NULL) {
             uint32_t tmp_u32 = g_variant_get_uint32(gvar);
-            fprintf(meta, "ref min = %d\n", tmp_u32);
+            sprintf(meta, "ref min = %d\n", tmp_u32); str += meta;
             g_variant_unref(gvar);
         }
         gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_REF_MAX);
         if (gvar != NULL) {
             uint32_t tmp_u32 = g_variant_get_uint32(gvar);
-            fprintf(meta, "ref max = %d\n", tmp_u32);
+            sprintf(meta, "ref max = %d\n", tmp_u32); str += meta;
             g_variant_unref(gvar);
         }
     }
-    fprintf(meta, "trigger pos = %" PRIu64 "\n", _session->get_trigger_pos());
+    sprintf(meta, "trigger pos = %" PRIu64 "\n", _session->get_trigger_pos()); str += meta;
+
+    probecnt = 0; 
 
-    probecnt = 0;
     for (l = sdi->channels; l; l = l->next) {
+        
         probe = (struct sr_channel *)l->data;
-        if (snapshot->has_data(probe->index)) {
-            if (sdi->mode == LOGIC && !probe->enabled)
-                continue;
+        if (!snapshot->has_data(probe->index))
+            continue;
+        if (sdi->mode == LOGIC && !probe->enabled)
+            continue;
 
-            if (probe->name)
-                fprintf(meta, "probe%d = %s\n", (sdi->mode == LOGIC) ? probe->index : probecnt, probe->name);
-            if (probe->trigger)
-                fprintf(meta, " trigger%d = %s\n", probecnt, probe->trigger);
-            if (sdi->mode == DSO) {
-                fprintf(meta, " enable%d = %d\n", probecnt, probe->enabled);
-                fprintf(meta, " coupling%d = %d\n", probecnt, probe->coupling);
-                fprintf(meta, " vDiv%d = %" PRIu64 "\n", probecnt, probe->vdiv);
-                fprintf(meta, " vFactor%d = %" PRIu64 "\n", probecnt, probe->vfactor);
-                fprintf(meta, " vOffset%d = %d\n", probecnt, probe->hw_offset);
-                fprintf(meta, " vTrig%d = %d\n", probecnt, probe->trig_value);
-                if (sr_status_get(sdi, &status, false) == SR_OK) {
-                    if (probe->index == 0) {
-                        fprintf(meta, " period%d = %" PRIu32 "\n", probecnt, status.ch0_cyc_tlen);
-                        fprintf(meta, " pcnt%d = %" PRIu32 "\n", probecnt, status.ch0_cyc_cnt);
-                        fprintf(meta, " max%d = %d\n", probecnt, status.ch0_max);
-                        fprintf(meta, " min%d = %d\n", probecnt, status.ch0_min);
-                        fprintf(meta, " plen%d = %" PRIu32 "\n", probecnt, status.ch0_cyc_plen);
-                        fprintf(meta, " llen%d = %" PRIu32 "\n", probecnt, status.ch0_cyc_llen);
-                        fprintf(meta, " level%d = %d\n", probecnt, status.ch0_level_valid);
-                        fprintf(meta, " plevel%d = %d\n", probecnt, status.ch0_plevel);
-                        fprintf(meta, " low%d = %" PRIu32 "\n", probecnt, status.ch0_low_level);
-                        fprintf(meta, " high%d = %" PRIu32 "\n", probecnt, status.ch0_high_level);
-                        fprintf(meta, " rlen%d = %" PRIu32 "\n", probecnt, status.ch0_cyc_rlen);
-                        fprintf(meta, " flen%d = %" PRIu32 "\n", probecnt, status.ch0_cyc_flen);
-                        fprintf(meta, " rms%d = %" PRIu64 "\n", probecnt, status.ch0_acc_square);
-                        fprintf(meta, " mean%d = %" PRIu32 "\n", probecnt, status.ch0_acc_mean);
-                    } else {
-                        fprintf(meta, " period%d = %" PRIu32 "\n", probecnt, status.ch1_cyc_tlen);
-                        fprintf(meta, " pcnt%d = %" PRIu32 "\n", probecnt, status.ch1_cyc_cnt);
-                        fprintf(meta, " max%d = %d\n", probecnt, status.ch1_max);
-                        fprintf(meta, " min%d = %d\n", probecnt, status.ch1_min);
-                        fprintf(meta, " plen%d = %" PRIu32 "\n", probecnt, status.ch1_cyc_plen);
-                        fprintf(meta, " llen%d = %" PRIu32 "\n", probecnt, status.ch1_cyc_llen);
-                        fprintf(meta, " level%d = %d\n", probecnt, status.ch1_level_valid);
-                        fprintf(meta, " plevel%d = %d\n", probecnt, status.ch1_plevel);
-                        fprintf(meta, " low%d = %" PRIu32 "\n", probecnt, status.ch1_low_level);
-                        fprintf(meta, " high%d = %" PRIu32 "\n", probecnt, status.ch1_high_level);
-                        fprintf(meta, " rlen%d = %" PRIu32 "\n", probecnt, status.ch1_cyc_rlen);
-                        fprintf(meta, " flen%d = %" PRIu32 "\n", probecnt, status.ch1_cyc_flen);
-                        fprintf(meta, " rms%d = %" PRIu64 "\n", probecnt, status.ch1_acc_square);
-                        fprintf(meta, " mean%d = %" PRIu32 "\n", probecnt, status.ch1_acc_mean);
-                    }
-                }
-            } else if (sdi->mode == ANALOG) {
-                fprintf(meta, " enable%d = %d\n", probecnt, probe->enabled);
-                fprintf(meta, " coupling%d = %d\n", probecnt, probe->coupling);
-                fprintf(meta, " vDiv%d = %" PRIu64 "\n", probecnt, probe->vdiv);
-                fprintf(meta, " vOffset%d = %d\n", probecnt, probe->hw_offset);
-                fprintf(meta, " mapUnit%d = %s\n", probecnt, probe->map_unit);
-                fprintf(meta, " mapMax%d = %lf\n", probecnt, probe->map_max);
-                fprintf(meta, " mapMin%d = %lf\n", probecnt, probe->map_min);
-            }
-            probecnt++;
+        if (probe->name)
+        {
+            int sigdex = (sdi->mode == LOGIC) ? probe->index : probecnt;
+            sprintf(meta, "probe%d = %s\n", sigdex, probe->name);
+            str += meta;
         }
-    }
 
-    fclose(meta);
+        if (probe->trigger){
+            sprintf(meta, " trigger%d = %s\n", probecnt, probe->trigger); 
+            str += meta;
+        }
 
-    return metafile;
+        if (sdi->mode == DSO)
+        {
+            sprintf(meta, " enable%d = %d\n", probecnt, probe->enabled);
+            str += meta;
+            sprintf(meta, " coupling%d = %d\n", probecnt, probe->coupling);
+            str += meta;
+            sprintf(meta, " vDiv%d = %" PRIu64 "\n", probecnt, probe->vdiv);
+            str += meta;
+            sprintf(meta, " vFactor%d = %" PRIu64 "\n", probecnt, probe->vfactor);
+            str += meta;
+            sprintf(meta, " vOffset%d = %d\n", probecnt, probe->hw_offset);
+            str += meta;
+            sprintf(meta, " vTrig%d = %d\n", probecnt, probe->trig_value);
+            str += meta;
+
+            if (sr_status_get(sdi, &status, false) == SR_OK)
+            {
+                if (probe->index == 0)
+                {
+                    sprintf(meta, " period%d = %" PRIu32 "\n", probecnt, status.ch0_cyc_tlen);
+                    str += meta;
+                    sprintf(meta, " pcnt%d = %" PRIu32 "\n", probecnt, status.ch0_cyc_cnt);
+                    str += meta;
+                    sprintf(meta, " max%d = %d\n", probecnt, status.ch0_max);
+                    str += meta;
+                    sprintf(meta, " min%d = %d\n", probecnt, status.ch0_min);
+                    str += meta;
+                    sprintf(meta, " plen%d = %" PRIu32 "\n", probecnt, status.ch0_cyc_plen);
+                    str += meta;
+                    sprintf(meta, " llen%d = %" PRIu32 "\n", probecnt, status.ch0_cyc_llen);
+                    str += meta;
+                    sprintf(meta, " level%d = %d\n", probecnt, status.ch0_level_valid);
+                    str += meta;
+                    sprintf(meta, " plevel%d = %d\n", probecnt, status.ch0_plevel);
+                    str += meta;
+                    sprintf(meta, " low%d = %" PRIu32 "\n", probecnt, status.ch0_low_level);
+                    str += meta;
+                    sprintf(meta, " high%d = %" PRIu32 "\n", probecnt, status.ch0_high_level);
+                    str += meta;
+                    sprintf(meta, " rlen%d = %" PRIu32 "\n", probecnt, status.ch0_cyc_rlen);
+                    str += meta;
+                    sprintf(meta, " flen%d = %" PRIu32 "\n", probecnt, status.ch0_cyc_flen);
+                    str += meta;
+                    sprintf(meta, " rms%d = %" PRIu64 "\n", probecnt, status.ch0_acc_square);
+                    str += meta;
+                    sprintf(meta, " mean%d = %" PRIu32 "\n", probecnt, status.ch0_acc_mean);
+                    str += meta;
+                }
+                else
+                {
+                    sprintf(meta, " period%d = %" PRIu32 "\n", probecnt, status.ch1_cyc_tlen);
+                    str += meta;
+                    sprintf(meta, " pcnt%d = %" PRIu32 "\n", probecnt, status.ch1_cyc_cnt);
+                    str += meta;
+                    sprintf(meta, " max%d = %d\n", probecnt, status.ch1_max);
+                    str += meta;
+                    sprintf(meta, " min%d = %d\n", probecnt, status.ch1_min);
+                    str += meta;
+                    sprintf(meta, " plen%d = %" PRIu32 "\n", probecnt, status.ch1_cyc_plen);
+                    str += meta;
+                    sprintf(meta, " llen%d = %" PRIu32 "\n", probecnt, status.ch1_cyc_llen);
+                    str += meta;
+                    sprintf(meta, " level%d = %d\n", probecnt, status.ch1_level_valid);
+                    str += meta;
+                    sprintf(meta, " plevel%d = %d\n", probecnt, status.ch1_plevel);
+                    str += meta;
+                    sprintf(meta, " low%d = %" PRIu32 "\n", probecnt, status.ch1_low_level);
+                    str += meta;
+                    sprintf(meta, " high%d = %" PRIu32 "\n", probecnt, status.ch1_high_level);
+                    str += meta;
+                    sprintf(meta, " rlen%d = %" PRIu32 "\n", probecnt, status.ch1_cyc_rlen);
+                    str += meta;
+                    sprintf(meta, " flen%d = %" PRIu32 "\n", probecnt, status.ch1_cyc_flen);
+                    str += meta;
+                    sprintf(meta, " rms%d = %" PRIu64 "\n", probecnt, status.ch1_acc_square);
+                    str += meta;
+                    sprintf(meta, " mean%d = %" PRIu32 "\n", probecnt, status.ch1_acc_mean);
+                    str += meta;
+                }
+            }
+        }
+        else if (sdi->mode == ANALOG)
+        {
+            sprintf(meta, " enable%d = %d\n", probecnt, probe->enabled);
+            str += meta;
+            sprintf(meta, " coupling%d = %d\n", probecnt, probe->coupling);
+            str += meta;
+            sprintf(meta, " vDiv%d = %" PRIu64 "\n", probecnt, probe->vdiv);
+            str += meta;
+            sprintf(meta, " vOffset%d = %d\n", probecnt, probe->hw_offset);
+            str += meta;
+            sprintf(meta, " mapUnit%d = %s\n", probecnt, probe->map_unit);
+            str += meta;
+            sprintf(meta, " mapMax%d = %lf\n", probecnt, probe->map_max);
+            str += meta;
+            sprintf(meta, " mapMin%d = %lf\n", probecnt, probe->map_min);
+            str += meta;
+        }
+        probecnt++;
+    } 
+
+    return true;
 }
 
 //export as csv file
@@ -824,43 +882,19 @@ void StoreSession::export_proc(data::Snapshot *snapshot)
 }
 
  
-QString StoreSession::decoders_gen()
-{
-    QDir dir;
-    #if QT_VERSION >= 0x050400
-    QString path = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
-    #else
-    QString path = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
-    #endif
-    if(dir.mkpath(path)) {
-        dir.cd(path);
-
-        QString file_name = dir.absolutePath() + "/DSView-decoders-XXXXXX";
-        QFile sessionFile(file_name);
-        if (!sessionFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
-            qDebug("Warning: Couldn't open session file to write!");
-            return NULL;
-        }
-        QTextStream outStream(&sessionFile);
-        app::set_utf8(outStream);
-        //outStream.setGenerateByteOrderMark(true); // UTF-8 without BOM
-
-        QJsonArray dec_array = json_decoders();
-        QJsonDocument sessionDoc(dec_array);
-        outStream << QString::fromUtf8(sessionDoc.toJson());
-        sessionFile.close();
-
-        return file_name;
-    } else {
-        return NULL;
-    }
-
+bool StoreSession::decoders_gen(std::string &str)
+{  
+    QJsonArray dec_array;
+    if (!json_decoders(dec_array))
+        return false;
+    QJsonDocument sessionDoc(dec_array);
+    QString data = QString::fromUtf8(sessionDoc.toJson());
+    str.append(data.toLatin1().data());
+    return true;
 }
 
-QJsonArray StoreSession::json_decoders()
-{
-    QJsonArray dec_array;
-
+bool StoreSession::json_decoders(QJsonArray &array)
+{  
     for(auto &t : _session->get_decode_signals()) {
         QJsonObject dec_obj;
         QJsonArray stack_array;
@@ -913,7 +947,6 @@ QJsonArray StoreSession::json_decoders()
                 }
             }
 
-
             if (have_probes) {
                 dec_obj["id"] = QJsonValue::fromVariant(d->id);
                 dec_obj["channel"] = ch_array;
@@ -936,9 +969,10 @@ QJsonArray StoreSession::json_decoders()
         }
         dec_obj["show"] = show_obj;
 
-        dec_array.push_back(dec_obj);
+        array.push_back(dec_obj);
     }
-    return dec_array;
+
+    return true;
 }
 
 bool StoreSession::load_decoders(dock::ProtocolDock *widget, QJsonArray dec_array)
@@ -1300,4 +1334,14 @@ void StoreSession::MakeChunkName(char *chunk_name, int chunk_num, int index, int
     }
 }
 
+std::string StoreSession::getFileName(QString fileName)
+{
+#if defined(_WIN32)
+    QTextCodec *code = QTextCodec::codecForName("GB2312");
+    return code->fromUnicode(fileName).data();
+#else
+    return _file_name.toUtf8().toStdString();
+#endif
+}
+
 } // pv
diff --git a/DSView/pv/storesession.h b/DSView/pv/storesession.h
index 99db9f12..882653e9 100755
--- a/DSView/pv/storesession.h
+++ b/DSView/pv/storesession.h
@@ -24,12 +24,12 @@
 
 #include <stdint.h>
 #include <string>
-#include <thread>
-  
+#include <thread>  
 #include <QObject>
-
 #include <libsigrok4DSL/libsigrok.h>
 
+#include "interface/icallbacks.h"
+
 #include "ZipMaker.h"
 
 namespace pv {
@@ -72,14 +72,13 @@ public:
 
 private:
     void save_proc(pv::data::Snapshot *snapshot);
-    QString meta_gen(data::Snapshot *snapshot);
-    void export_proc(pv::data::Snapshot *snapshot);
-   
-    QString decoders_gen();
+    bool meta_gen(data::Snapshot *snapshot, std::string &str);
+    void export_proc(pv::data::Snapshot *snapshot);   
+    bool decoders_gen(std::string &str);
  
 
 public:    
-    QJsonArray json_decoders();
+    bool json_decoders(QJsonArray &array);
     bool load_decoders(dock::ProtocolDock *widget, QJsonArray dec_array);
     QString MakeSaveFile(bool bDlg);
     QString MakeExportFile(bool bDlg);
@@ -94,12 +93,13 @@ private:
     QList<QString> getSuportedExportFormats();
     double get_integer(GVariant * var);
     void MakeChunkName(char *chunk_name, int chunk_num, int index, int type, int version);
+    std:: string getFileName(QString fileName);
 
 signals:
 	void progress_updated();
 
 public:
-    QString          _sessionFile;
+   ISessionDataGetter   *_sessionDataGetter;
 
 private:
     QString         _file_name;
diff --git a/libsigrok4DSL/dsdevice.c b/libsigrok4DSL/dsdevice.c
index bf0c6ce9..213a91db 100755
--- a/libsigrok4DSL/dsdevice.c
+++ b/libsigrok4DSL/dsdevice.c
@@ -360,7 +360,7 @@ SR_API int sr_dev_open(struct sr_dev_inst *sdi)
 SR_API int sr_dev_close(struct sr_dev_inst *sdi)
 {
 	int ret;
-
+ 
 	if (!sdi || !sdi->driver || !sdi->driver->dev_close)
 		return SR_ERR;
 
diff --git a/libsigrok4DSL/proto.h b/libsigrok4DSL/proto.h
index 0ebd0d26..88aaec0e 100755
--- a/libsigrok4DSL/proto.h
+++ b/libsigrok4DSL/proto.h
@@ -117,6 +117,9 @@ SR_API int sr_session_source_remove(int fd);
 SR_API int sr_session_source_remove_pollfd(GPollFD *pollfd);
 SR_API int sr_session_source_remove_channel(GIOChannel *channel);
 
+//0:ok, 1:error
+SR_API int sr_check_session_start_before();
+
 /*--- input/input.c ---------------------------------------------------------*/
 
 SR_API struct sr_input_format **sr_input_list(void);
diff --git a/libsigrok4DSL/session.c b/libsigrok4DSL/session.c
index 74ca9996..24786c07 100755
--- a/libsigrok4DSL/session.c
+++ b/libsigrok4DSL/session.c
@@ -383,6 +383,17 @@ SR_API int sr_session_start(void)
 	return ret;
 }
 
+/*
+* check session if be created
+*/
+int sr_check_session_start_before(){
+
+	if (!session || !session->devs) {
+		return 1;		 
+	}
+	return 0;
+}
+
 /**
  * Run the session.
  *
diff --git a/qtpro/DSView.pro b/qtpro/DSView.pro
index 57b0ae30..c3540636 100644
--- a/qtpro/DSView.pro
+++ b/qtpro/DSView.pro
@@ -18,6 +18,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 #QMAKE_CFLAGS_ISYSTEM = -I
 
+
 TARGET = DSView
 TEMPLATE = app
 
diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user
index 1c801f1b..936f882c 100644
--- a/qtpro/DSView.pro.user
+++ b/qtpro/DSView.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2021-11-24T19:16:06. -->
+<!-- Written by QtCreator 4.11.0, 2021-11-29T18:27:06. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

From 092827434ec4aba970ed885287ac12edbe8939de Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Fri, 3 Dec 2021 18:50:31 +0800
Subject: [PATCH 40/58] fix usb2.0 device  alaim interface error bug

---
 DSView/main.cpp                      |  4 ++
 libsigrok4DSL/hardware/DSL/dsl.c     | 21 ++++++--
 libsigrok4DSL/hardware/DSL/dslogic.c |  6 ++-
 libsigrok4DSL/hwdriver.c             | 78 ++++++++++++++++++++++++++++
 libsigrok4DSL/proto.h                | 18 +++----
 qtpro/DSView.pro.user                |  2 +-
 6 files changed, 114 insertions(+), 15 deletions(-)

diff --git a/DSView/main.cpp b/DSView/main.cpp
index 8485be26..dac39c93 100755
--- a/DSView/main.cpp
+++ b/DSView/main.cpp
@@ -38,6 +38,8 @@
 #include "config.h"
 #include "pv/appcontrol.h"
 
+//#include <libsigrok4DSL/libsigrok.h>
+
 void usage()
 {
 	fprintf(stdout,
@@ -54,6 +56,8 @@ void usage()
 
 int main(int argc, char *argv[])
 {  
+   // sr_test_usb_api();return 0;
+	 
 	int ret = 0; 
 	const char *open_file = NULL;
  
diff --git a/libsigrok4DSL/hardware/DSL/dsl.c b/libsigrok4DSL/hardware/DSL/dsl.c
index 01e2e01c..70c5da81 100755
--- a/libsigrok4DSL/hardware/DSL/dsl.c
+++ b/libsigrok4DSL/hardware/DSL/dsl.c
@@ -1779,6 +1779,7 @@ SR_PRIV int dsl_dev_open(struct sr_dev_driver *di, struct sr_dev_inst *sdi, gboo
     int ret;
     uint8_t hw_info;
     struct ctl_rd_cmd rd_cmd;
+    int fdError = 0;
 
     devc = sdi->priv;
     usb = sdi->conn;
@@ -1799,7 +1800,7 @@ SR_PRIV int dsl_dev_open(struct sr_dev_driver *di, struct sr_dev_inst *sdi, gboo
         sr_err("%s: Unable to open device.", __func__);
         return SR_ERR;
     }
-
+  
     ret = libusb_claim_interface(usb->devhdl, USB_INTERFACE);
     if (ret != 0) {
         switch(ret) {
@@ -1810,13 +1811,27 @@ SR_PRIV int dsl_dev_open(struct sr_dev_driver *di, struct sr_dev_inst *sdi, gboo
         case LIBUSB_ERROR_NO_DEVICE:
             sr_err("%s: Device has been disconnected.", __func__);
             break;
+        case LIBUSB_ERROR_NOT_FOUND:
+            {
+                sr_err("%s: Unable to claim interface, try again: LIBUSB_ERROR_NOT_FOUND.", __func__);
+                ret = libusb_claim_interface(usb->devhdl, USB_INTERFACE);
+                fdError = 1;
+            }
+            break;
         default:
-            sr_err("%s: Unable to claim interface: %s.",
+            sr_err("%s: Unable to claim interface, try again: %s.",
                    __func__, libusb_error_name(ret));
             break;
         }
 
-        return SR_ERR;
+        if (ret != 0 && fdError == 1){
+             sr_err("%s: Unable to claim interface, the second time: %s.",
+                   __func__, libusb_error_name(ret));
+        }
+
+        if (ret != 0){
+            return SR_ERR;
+        } 
     }
 
     rd_cmd.header.dest = DSL_CTL_HW_STATUS;
diff --git a/libsigrok4DSL/hardware/DSL/dslogic.c b/libsigrok4DSL/hardware/DSL/dslogic.c
index 76419965..345f9db9 100755
--- a/libsigrok4DSL/hardware/DSL/dslogic.c
+++ b/libsigrok4DSL/hardware/DSL/dslogic.c
@@ -287,7 +287,9 @@ static GSList *scan(GSList *options)
 
     /* Find all DSLogic compatible devices and upload firmware to them. */
 	devices = NULL;
-    libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
+    int usbnum = libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
+    int stdnum = 0;
+
 	for (i = 0; devlist[i]; i++) {
 		if (conn) {
 			usb = NULL;
@@ -314,6 +316,8 @@ static GSList *scan(GSList *options)
             (usb_speed != LIBUSB_SPEED_SUPER))
             continue;
 
+        stdnum++;
+
 		prof = NULL;
         for (j = 0; supported_DSLogic[j].vid; j++) {
             if (des.idVendor == supported_DSLogic[j].vid &&
diff --git a/libsigrok4DSL/hwdriver.c b/libsigrok4DSL/hwdriver.c
index 6af67d91..5be41d3d 100755
--- a/libsigrok4DSL/hwdriver.c
+++ b/libsigrok4DSL/hwdriver.c
@@ -27,6 +27,8 @@
 #include <glib.h>
 #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
 
+#include "hardware/DSL/dsl.h"
+
 /* Message logging helpers with subsystem-specific prefix string. */
 #define LOG_PREFIX "hwdriver: "
 #define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
@@ -475,3 +477,79 @@ SR_PRIV int sr_source_add(int fd, int events, int timeout,
 }
 
 /** @} */
+
+/*
+test usb device api
+*/
+SR_API void sr_test_usb_api()
+{
+    libusb_context *ctx;
+    struct libusb_device_descriptor des;
+    int usb_speed;
+    int ret;
+    int i;
+    int num_devs;
+    libusb_device **devlist;
+    int stdnum = 0;
+    int j;
+    int bfind = 0;
+    int dlsnum = 0;
+    struct libusb_device_handle *devhandle;
+
+    printf("\n");
+
+    ret = libusb_init(&ctx);
+    if (ret) {
+	printf("unable to initialize libusb: %i\n", ret);
+    return;	 
+   }
+  
+    num_devs = libusb_get_device_list(ctx, &devlist);
+    printf("usb dev num:%d\n", num_devs);
+
+    for (i=0; i<num_devs; i++){
+        libusb_get_device_descriptor(devlist[i], &des);
+
+        usb_speed = libusb_get_device_speed( devlist[i]);
+
+        if ((usb_speed != LIBUSB_SPEED_HIGH) && (usb_speed != LIBUSB_SPEED_SUPER))
+            continue;
+        stdnum++;
+        bfind = 0;
+
+        for (j = 0; supported_DSLogic[j].vid; j++) {
+            if (des.idVendor == supported_DSLogic[j].vid &&
+                des.idProduct == supported_DSLogic[j].pid &&
+                usb_speed == supported_DSLogic[j].usb_speed) {
+                bfind = 1;
+                break;
+			}
+		}
+
+        if (bfind){
+            dlsnum++;
+
+            devhandle = NULL;
+            ret = libusb_open(devlist[i], &devhandle);
+            if (ret){
+                printf("open device error!%s\n", libusb_error_name(ret));
+            }
+            else{
+                //printf("dev open success\n");
+                  ret = libusb_claim_interface(devhandle, USB_INTERFACE);
+                  if (ret){
+                         printf("Unable to claim interface: %s\n", libusb_error_name(ret));
+                  }
+
+                libusb_close(devhandle);
+            }
+        }
+    }
+
+    printf("std usb dev num:%d\n", stdnum);
+    printf("dls dev num:%d\n", dlsnum);
+
+    libusb_free_device_list(devlist, 0);
+
+   libusb_exit(NULL);
+}
diff --git a/libsigrok4DSL/proto.h b/libsigrok4DSL/proto.h
index 88aaec0e..31937370 100755
--- a/libsigrok4DSL/proto.h
+++ b/libsigrok4DSL/proto.h
@@ -82,10 +82,16 @@ SR_API int sr_status_get(const struct sr_dev_inst *sdi, struct sr_status *status
 SR_API struct sr_config *sr_config_new(int key, GVariant *data);
 SR_API void sr_config_free(struct sr_config *src);
 
-/*--- session.c -------------------------------------------------------------*/
+SR_API void sr_test_usb_api();
 
+/*--------------------session.c----------------*/
 typedef void (*sr_datafeed_callback_t)(const struct sr_dev_inst *sdi,
 		const struct sr_datafeed_packet *packet, void *cb_data);
+                
+SR_API void sr_set_export_original_data(int flag);
+SR_API int sr_get_export_original_flag();
+SR_API void sr_set_firmware_resource_dir(const char *dir);
+
 
 /* Session setup */
 SR_API int sr_session_load(const char *filename);
@@ -183,13 +189,5 @@ SR_PRIV uint16_t ds_trigger_get_mask1(uint16_t stage, uint16_t msc, uint16_t lsc
 SR_PRIV uint16_t ds_trigger_get_value1(uint16_t stage, uint16_t msc, uint16_t lsc, gboolean qutr_mode, gboolean half_mode);
 SR_PRIV uint16_t ds_trigger_get_edge1(uint16_t stage, uint16_t msc, uint16_t lsc, gboolean qutr_mode, gboolean half_mode);
 
-/*--------------------session.c----------------*/
-
-SR_API void sr_set_export_original_data(int flag);
-
-SR_API int sr_get_export_original_flag();
-
-SR_API void sr_set_firmware_resource_dir(const char *dir);
-
-
+ 
 #endif
diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user
index 936f882c..de29711f 100644
--- a/qtpro/DSView.pro.user
+++ b/qtpro/DSView.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2021-11-29T18:27:06. -->
+<!-- Written by QtCreator 4.11.0, 2021-12-03T14:57:33. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

From 65f5946fe3b58eee5f94fa5a16589955e2b1b3aa Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Mon, 6 Dec 2021 15:57:04 +0800
Subject: [PATCH 41/58] fix dock panel can not restore bug

---
 DSView/pv/config/appconfig.cpp | 32 +++++++++++++++--
 DSView/pv/config/appconfig.h   | 13 ++++++-
 DSView/pv/mainwindow.cpp       |  5 ++-
 DSView/pv/toolbars/trigbar.cpp | 66 ++++++++++++++++++++++++++++++++--
 DSView/pv/toolbars/trigbar.h   | 40 ++++++++++++---------
 qtpro/DSView.pro.user          |  2 +-
 6 files changed, 134 insertions(+), 24 deletions(-)

diff --git a/DSView/pv/config/appconfig.cpp b/DSView/pv/config/appconfig.cpp
index 75fae622..f94c7304 100644
--- a/DSView/pv/config/appconfig.cpp
+++ b/DSView/pv/config/appconfig.cpp
@@ -111,13 +111,31 @@ void _saveApp(AppOptions &o, QSettings &st){
     setFiled("warnofMultiTrig", st, o.warnofMultiTrig);
     setFiled("originalData", st, o.originalData);
 
-
     QString fmt =  FormatArrayToString(o.m_protocolFormats);
     setFiled("protocalFormats", st, fmt);
     st.endGroup();  
 }
 
 //-----frame
+
+void _loadDockOptions(DockOptions &o, QSettings &st, const char *group){
+    st.beginGroup(group);
+    getFiled("decodeDoc", st, o.decodeDoc, false);
+    getFiled("triggerDoc", st, o.triggerDoc, false);
+    getFiled("measureDoc", st, o.measureDoc, false);
+    getFiled("searchDoc", st, o.searchDoc, false);
+    st.endGroup();
+}
+
+void _saveDockOptions(DockOptions &o, QSettings &st, const char *group){
+    st.beginGroup(group);
+    setFiled("decodeDoc", st, o.decodeDoc);
+    setFiled("triggerDoc", st, o.triggerDoc);
+    setFiled("measureDoc", st, o.measureDoc);
+    setFiled("searchDoc", st, o.searchDoc);
+    st.endGroup();
+}
+
 void _loadFrame(FrameOptions &o, QSettings &st){
     st.beginGroup("MainFrame"); 
     getFiled("style", st, o.style, "dark");
@@ -127,6 +145,11 @@ void _loadFrame(FrameOptions &o, QSettings &st){
     getFiled("top", st, o.top, 0);
     getFiled("right", st, o.right, 0);
     getFiled("bottom", st, o.bottom, 0);
+
+    _loadDockOptions(o._logicDock, st, "LOGIC_DOCK");
+    _loadDockOptions(o._analogDock, st, "ANALOG_DOCK");
+    _loadDockOptions(o._dsoDock, st, "DSO_DOCK");
+
     o.windowState = st.value("windowState", QByteArray()).toByteArray();
     st.endGroup();
 
@@ -149,8 +172,13 @@ void _saveFrame(FrameOptions &o, QSettings &st){
     setFiled("left", st, o.left);
     setFiled("top", st, o.top);
     setFiled("right", st, o.right);
-    setFiled("bottom", st, o.bottom); 
+    setFiled("bottom", st, o.bottom);
     st.setValue("windowState", o.windowState); 
+
+    _saveDockOptions(o._logicDock, st, "LOGIC_DOCK");
+    _saveDockOptions(o._analogDock, st, "ANALOG_DOCK");
+    _saveDockOptions(o._dsoDock, st, "DSO_DOCK");
+    
     st.endGroup();
 }
 
diff --git a/DSView/pv/config/appconfig.h b/DSView/pv/config/appconfig.h
index 250e1868..176180fd 100644
--- a/DSView/pv/config/appconfig.h
+++ b/DSView/pv/config/appconfig.h
@@ -58,6 +58,13 @@ struct AppOptions
     std::vector<StringPair> m_protocolFormats;
 };
  
+ struct DockOptions{
+  bool        decodeDoc;
+  bool        triggerDoc;
+  bool        measureDoc;
+  bool        searchDoc;
+};
+
 struct FrameOptions
 { 
   QString     style;
@@ -68,6 +75,10 @@ struct FrameOptions
   int         bottom;
   bool        isMax;
   QByteArray  windowState;
+
+  DockOptions   _logicDock;
+  DockOptions   _analogDock;
+  DockOptions   _dsoDock;
 };
 
 struct UserHistory
@@ -103,5 +114,5 @@ public:
 public:
   AppOptions    _appOptions;
   UserHistory   _userHistory;
-  FrameOptions  _frameOptions; 
+  FrameOptions  _frameOptions;
 };
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index 70caa8f4..8437868f 100644
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -303,6 +303,7 @@ void MainWindow::setup_ui()
 
     //delay to update device list
     QTimer::singleShot(200, this, SLOT(update_device_list()));
+
 }
 
 
@@ -436,6 +437,8 @@ void MainWindow::update_device_list()
                                                            "Please replug it into a USB 3.0 port.");
         }
     }
+
+       _trig_bar->restore_status();
 }
 
 
@@ -1260,7 +1263,7 @@ void MainWindow::restore_dock()
     if (!st.isEmpty()){
         try
         {
-            restoreState(st);     
+            restoreState(st); 
         }        
         catch(...)
         { 
diff --git a/DSView/pv/toolbars/trigbar.cpp b/DSView/pv/toolbars/trigbar.cpp
index 4666c88b..202eb572 100755
--- a/DSView/pv/toolbars/trigbar.cpp
+++ b/DSView/pv/toolbars/trigbar.cpp
@@ -43,7 +43,7 @@ const QString TrigBar::LIGHT_STYLE = "light";
 TrigBar::TrigBar(SigSession *session, QWidget *parent) :
     QToolBar("Trig Bar", parent),
     _session(session),
-    _enable(true),
+ 
     _trig_button(this),
     _protocol_button(this),
     _measure_button(this),
@@ -51,6 +51,8 @@ TrigBar::TrigBar(SigSession *session, QWidget *parent) :
     _function_button(this),
     _setting_button(this)
 {
+    _enable = true;
+
     setMovable(false);
     setContentsMargins(0,0,0,0);
  
@@ -187,13 +189,21 @@ void TrigBar::reStyle()
 }
 
 void TrigBar::protocol_clicked()
-{
+{  
     sig_protocol(_protocol_button.isChecked());
+ 
+    DockOptions *opt = getDockOptions();
+    opt->decodeDoc = _protocol_button.isChecked();
+    AppConfig::Instance().SaveFrame();
 }
 
 void TrigBar::trigger_clicked()
 {
     sig_trigger(_trig_button.isChecked());
+ 
+    DockOptions *opt = getDockOptions();
+    opt->triggerDoc = _trig_button.isChecked();
+    AppConfig::Instance().SaveFrame();
 }
 
 void TrigBar::update_trig_btn(bool checked)
@@ -219,11 +229,19 @@ void TrigBar::update_search_btn(bool checked)
 void TrigBar::measure_clicked()
 {
     sig_measure(_measure_button.isChecked());
+    
+    DockOptions *opt = getDockOptions();
+    opt->measureDoc = _measure_button.isChecked();
+    AppConfig::Instance().SaveFrame();
 }
 
 void TrigBar::search_clicked()
 {
     sig_search(_search_button.isChecked());
+    
+    DockOptions *opt = getDockOptions();
+    opt->searchDoc = _search_button.isChecked();
+    AppConfig::Instance().SaveFrame();
 }
 
 void TrigBar::enable_toggle(bool enable)
@@ -264,6 +282,7 @@ void TrigBar::close_all()
 void TrigBar::reload()
 {
     close_all();
+
     if (_session->get_device()->dev_inst()->mode == LOGIC) {
         _trig_action->setVisible(true);
         _protocol_action->setVisible(true);
@@ -271,6 +290,7 @@ void TrigBar::reload()
         _search_action->setVisible(true);
         _function_action->setVisible(false);
         _action_lissajous->setVisible(false);
+
     } else if (_session->get_device()->dev_inst()->mode == ANALOG) {
         _trig_action->setVisible(false);
         _protocol_action->setVisible(false);
@@ -278,6 +298,7 @@ void TrigBar::reload()
         _search_action->setVisible(false);
         _function_action->setVisible(false);
         _action_lissajous->setVisible(false);
+
     } else if (_session->get_device()->dev_inst()->mode == DSO) {
         _trig_action->setVisible(true);
         _protocol_action->setVisible(false);
@@ -286,6 +307,7 @@ void TrigBar::reload()
         _function_action->setVisible(true);
         _action_lissajous->setVisible(true);
     }
+
     enable_toggle(true);
     update();
 }
@@ -329,5 +351,45 @@ void TrigBar::on_actionLissajous_triggered()
      dlg.ShowDlg(this);
  }
 
+ 
+void TrigBar::restore_status()
+{ 
+    DockOptions *opt = getDockOptions();
+    int mode = _session->get_device()->dev_inst()->mode;
+
+    if (opt->decodeDoc){
+         _protocol_button.setChecked(true);
+         sig_protocol(true);
+    }
+
+    if (opt->triggerDoc){
+         _trig_button.setChecked(true);
+         sig_trigger(true);
+    }
+
+    if (opt->measureDoc){
+        _measure_button.setChecked(true);
+        sig_measure(true);
+    }
+
+    if (opt->searchDoc){
+        _search_button.setChecked(true);
+        sig_search(true);
+    }
+}
+
+ DockOptions* TrigBar::getDockOptions()
+ {
+     AppConfig &app = AppConfig::Instance(); 
+     int mode = _session->get_device()->dev_inst()->mode;
+
+     if (mode == LOGIC)
+        return &app._frameOptions._logicDock;
+     else if (mode == DSO)
+        return &app._frameOptions._dsoDock;
+    else
+        return &app._frameOptions._analogDock;
+ }
+
 } // namespace toolbars
 } // namespace pv
diff --git a/DSView/pv/toolbars/trigbar.h b/DSView/pv/toolbars/trigbar.h
index f22ce207..68f6c219 100755
--- a/DSView/pv/toolbars/trigbar.h
+++ b/DSView/pv/toolbars/trigbar.h
@@ -28,6 +28,8 @@
 #include <QAction>
 #include <QMenu>
 
+class DockOptions;
+
 namespace pv {
 
 class SigSession;
@@ -56,6 +58,7 @@ private:
     void changeEvent(QEvent *event);
     void retranslateUi();
     void reStyle();
+    DockOptions* getDockOptions();
 
 signals:
     void sig_setTheme(QString style);
@@ -85,32 +88,35 @@ public slots:
     void on_actionMath_triggered();
     void on_application_param();
 
+public:
+    void restore_status();
+
 private:
-    SigSession      *_session;
-    bool            _enable;
+    SigSession  *_session;
+    bool        _enable;
     QToolButton _trig_button;
     QToolButton _protocol_button;
     QToolButton _measure_button;
     QToolButton _search_button;
     QToolButton _function_button;
     QToolButton _setting_button;
-    QAction* _trig_action;
-    QAction* _protocol_action;
-    QAction* _measure_action;
-    QAction* _search_action;
-    QAction* _function_action; 
-    QAction* _display_action;
+    QAction     *_trig_action;
+    QAction     *_protocol_action;
+    QAction     *_measure_action;
+    QAction     *_search_action;
+    QAction     *_function_action; 
+    QAction     *_display_action;
 
-    QMenu* _function_menu;
-    QAction* _action_fft;
-    QAction* _action_math;
+    QMenu       *_function_menu;
+    QAction     *_action_fft;
+    QAction     *_action_math;
 
-    QMenu* _display_menu;
-    QMenu *_themes;
-    QAction *_appParam_action;
-    QAction *_dark_style;
-    QAction *_light_style;
-    QAction* _action_lissajous;
+    QMenu       *_display_menu;
+    QMenu       *_themes;
+    QAction     *_appParam_action;
+    QAction     *_dark_style;
+    QAction     *_light_style;
+    QAction     *_action_lissajous;
 };
 
 } // namespace toolbars
diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user
index de29711f..994a2dc4 100644
--- a/qtpro/DSView.pro.user
+++ b/qtpro/DSView.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2021-12-03T14:57:33. -->
+<!-- Written by QtCreator 4.11.0, 2021-12-03T18:50:47. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

From 26f4e65b7b6592173aa1b23fcd23861b4d3d1c3d Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Mon, 6 Dec 2021 16:38:13 +0800
Subject: [PATCH 42/58] auto load file data from application startup param

---
 DSView/main.cpp          |  1 +
 DSView/pv/appcontrol.h   |  3 +++
 DSView/pv/mainwindow.cpp | 25 ++++++++++++++-----------
 DSView/pv/mainwindow.h   |  1 +
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/DSView/main.cpp b/DSView/main.cpp
index dac39c93..0fce15d8 100755
--- a/DSView/main.cpp
+++ b/DSView/main.cpp
@@ -147,6 +147,7 @@ int main(int argc, char *argv[])
 		return 1;
     } else if (argcFinal - optind == 1){
         open_file = argvFinal[argcFinal - 1];
+		control->_open_file_name = open_file;
 	}
 
 	
diff --git a/DSView/pv/appcontrol.h b/DSView/pv/appcontrol.h
index 8e0e1ac0..2766cbae 100644
--- a/DSView/pv/appcontrol.h
+++ b/DSView/pv/appcontrol.h
@@ -62,6 +62,9 @@ public:
     inline pv::DeviceManager& GetDeviceManager()
         { return *_device_manager;}
 
+public:
+    std::string        _open_file_name; 
+
 private:
     std::string         m_error;
     struct sr_context   *sr_ctx;
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index 8437868f..9efe422f 100644
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -91,6 +91,7 @@
 #include "config/appconfig.h"
 #include "appcontrol.h"
 #include "dsvdef.h"
+#include "appcontrol.h"
   
 
 namespace pv {
@@ -102,20 +103,11 @@ MainWindow::MainWindow(QWidget *parent) :
 {
     _control = AppControl::Instance();
     _control->GetSession()->set_callback(this);
+    _bFirstLoad = true;
 
 	setup_ui();
 
-    setContextMenuPolicy(Qt::NoContextMenu);
-
-    /*
-	if (open_file_name) {
-        qDebug("Open file: %s", open_file_name);
-        const QString s(QString::fromUtf8(open_file_name));
-		QMetaObject::invokeMethod(this, "on_load_file",
-			Qt::QueuedConnection,
-			Q_ARG(QString, s));
-	}
-    */
+    setContextMenuPolicy(Qt::NoContextMenu); 
 }
 
 void MainWindow::setup_ui()
@@ -439,6 +431,17 @@ void MainWindow::update_device_list()
     }
 
        _trig_bar->restore_status();
+
+        //load specified file name from application startup param
+       if (_bFirstLoad){
+           _bFirstLoad = false;
+
+           if (AppControl::Instance()->_open_file_name != ""){
+                QString f(QString::fromUtf8(AppControl::Instance()->_open_file_name.c_str()));
+                qDebug()<<"auto load file:"<<f;
+		        on_load_file(f);
+           } 
+       }
 }
 
 
diff --git a/DSView/pv/mainwindow.h b/DSView/pv/mainwindow.h
index 047024ad..553a58be 100755
--- a/DSView/pv/mainwindow.h
+++ b/DSView/pv/mainwindow.h
@@ -224,6 +224,7 @@ private:
     QTranslator     _qtTrans;
     QTranslator     _myTrans;
     EventObject     _event;
+    bool            _bFirstLoad;
 };
 
 } // namespace pv

From a16b97cf9025f869ef5607223b7c4bbe0bfa05b0 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Mon, 13 Dec 2021 09:18:03 +0800
Subject: [PATCH 43/58] Set python home at windows os

---
 DSView/main.cpp                       | 10 +++++-----
 DSView/pv/appcontrol.cpp              | 13 ++++++++++++-
 DSView/pv/sigsession.cpp              |  1 +
 DSView/pv/sigsession.h                |  7 ++++---
 DSView/pv/toolbars/titlebar.cpp       |  3 ++-
 INSTALL                               |  1 +
 libsigrokdecode4DSL/libsigrokdecode.h |  1 +
 libsigrokdecode4DSL/srd.c             |  6 ++++++
 qtpro/DSView.pro                      |  5 +++--
 qtpro/DSView.pro.user                 |  2 +-
 10 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/DSView/main.cpp b/DSView/main.cpp
index 0fce15d8..d0cb7161 100755
--- a/DSView/main.cpp
+++ b/DSView/main.cpp
@@ -42,7 +42,7 @@
 
 void usage()
 {
-	fprintf(stdout,
+	printf(
 		"Usage:\n"
 		"  %s [OPTION…] [FILE] — %s\n"
 		"\n"
@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
 
 		case 'V':
 			// Print version info
-			fprintf(stdout, "%s %s\n", DS_TITLE, DS_VERSION_STRING);
+			printf("%s %s\n", DS_TITLE, DS_VERSION_STRING);
 			return 0;
 
 		case 'h':
@@ -143,7 +143,7 @@ int main(int argc, char *argv[])
 	}
 
     if (argcFinal - optind > 1) {
-		fprintf(stderr, "Only one file can be openened.\n");
+		printf("Only one file can be openened.\n");
 		return 1;
     } else if (argcFinal - optind == 1){
         open_file = argvFinal[argcFinal - 1];
@@ -159,7 +159,7 @@ int main(int argc, char *argv[])
 
 	//init core
 	if (!control->Init()){
-        fprintf(stderr, "init error!");
+        printf("init error!");
         qDebug() << control->GetLastError();
 		return 1;
 	}
@@ -183,7 +183,7 @@ int main(int argc, char *argv[])
 	}
 	catch (const std::exception &e)
 	{
-        fprintf(stderr, "main() catch a except!");
+        printf("main() catch a except!");
 		const char *exstr = e.what();
 		qDebug() << exstr;
 	}
diff --git a/DSView/pv/appcontrol.cpp b/DSView/pv/appcontrol.cpp
index 52275e88..15c0e52d 100644
--- a/DSView/pv/appcontrol.cpp
+++ b/DSView/pv/appcontrol.cpp
@@ -75,7 +75,18 @@ bool AppControl::Init()
     } 
 
     QString resdir = GetResourceDir();
-	sr_set_firmware_resource_dir(resdir.toUtf8());
+	sr_set_firmware_resource_dir(resdir.toUtf8().data());
+
+#ifdef _WIN32
+    QString pythonHome = GetAppDataDir() + "/Python";   
+    QDir pydir;
+    if (pydir.exists(pythonHome)){
+          srd_set_python_home(pythonHome.toUtf8().data());
+    }else{
+        qDebug()<<"python home directory not exists,"<<pythonHome;        
+    }
+  
+#endif
     
     QString dir = GetAppDataDir() + "/decoders";
     char path[256] = {0};
diff --git a/DSView/pv/sigsession.cpp b/DSView/pv/sigsession.cpp
index 0806c8ba..d3d9a848 100755
--- a/DSView/pv/sigsession.cpp
+++ b/DSView/pv/sigsession.cpp
@@ -23,6 +23,7 @@
 
 #include <libsigrokdecode4DSL/libsigrokdecode.h>
 
+
 #include "sigsession.h"
 #include "mainwindow.h"
 #include "devicemanager.h"
diff --git a/DSView/pv/sigsession.h b/DSView/pv/sigsession.h
index 7f478af0..ca38e3bd 100755
--- a/DSView/pv/sigsession.h
+++ b/DSView/pv/sigsession.h
@@ -22,9 +22,7 @@
 
 #ifndef DSVIEW_PV_SIGSESSION_H
 #define DSVIEW_PV_SIGSESSION_H
-
-#include <libsigrok4DSL/libsigrok.h>
-   
+ 
 #include <set>
 #include <string>
 #include <vector>
@@ -39,8 +37,11 @@
 #include "interface/icallbacks.h"
 #include "dstimer.h"
 
+#include <libsigrok4DSL/libsigrok.h>
+
 struct srd_decoder;
 struct srd_channel;
+ 
 
 class DecoderStatus;
 
diff --git a/DSView/pv/toolbars/titlebar.cpp b/DSView/pv/toolbars/titlebar.cpp
index 982fab1d..aae90e15 100755
--- a/DSView/pv/toolbars/titlebar.cpp
+++ b/DSView/pv/toolbars/titlebar.cpp
@@ -188,7 +188,8 @@ void TitleBar::setRestoreButton(bool max)
   
 void TitleBar::mousePressEvent(QMouseEvent* event)
 { 
-    if(event->button() == Qt::LeftButton && !parentWidget()->isMaximized()) {
+    if(event->button() == Qt::LeftButton && !parentWidget()->isMaximized()) 
+    {
         int x = event->pos().x();
         int y = event->pos().y(); 
         bool bTopWidow = app::is_app_top_window(_parent);
diff --git a/INSTALL b/INSTALL
index 94bdb080..abe9eafe 100755
--- a/INSTALL
+++ b/INSTALL
@@ -26,6 +26,7 @@ Requirements
 	This is part of the standard OpenBSD install (not an extra package), apparently.
  - check >= 0.9.4 (optional, only needed to run unit tests)
  - libfftw3 >= 3.3
+ - zlib
 
 Building and installing
 -----------------------
diff --git a/libsigrokdecode4DSL/libsigrokdecode.h b/libsigrokdecode4DSL/libsigrokdecode.h
index 491c3371..d66cc74e 100755
--- a/libsigrokdecode4DSL/libsigrokdecode.h
+++ b/libsigrokdecode4DSL/libsigrokdecode.h
@@ -361,6 +361,7 @@ struct srd_pd_callback {
 SRD_API int srd_init(const char *path);
 SRD_API int srd_exit(void);
 SRD_API GSList *srd_searchpaths_get(void);
+SRD_API void srd_set_python_home(const char *path);
 
 /* session.c */
 SRD_API int srd_session_new(struct srd_session **sess);
diff --git a/libsigrokdecode4DSL/srd.c b/libsigrokdecode4DSL/srd.c
index 92be591f..caec1fd0 100755
--- a/libsigrokdecode4DSL/srd.c
+++ b/libsigrokdecode4DSL/srd.c
@@ -386,4 +386,10 @@ SRD_API GSList *srd_searchpaths_get(void)
 	return paths;
 }
 
+//set python home directory
+SRD_API void srd_set_python_home(const char *path)
+{
+	Py_SetPythonHome((wchar_t*)path);
+}
+
 /** @} */
diff --git a/qtpro/DSView.pro b/qtpro/DSView.pro
index c3540636..575d247e 100644
--- a/qtpro/DSView.pro
+++ b/qtpro/DSView.pro
@@ -13,8 +13,9 @@ QT += svg
 CONFIG += exceptions
 CONFIG += object_parallel_to_source
 
-greaterThan(QT_MAJOR_VERSION, 4): CONFIG += c++11
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+//QT += core5compat
+CONFIG += c++11
+QT += widgets
 
 #QMAKE_CFLAGS_ISYSTEM = -I
 
diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user
index 994a2dc4..536a527e 100644
--- a/qtpro/DSView.pro.user
+++ b/qtpro/DSView.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2021-12-03T18:50:47. -->
+<!-- Written by QtCreator 4.11.0, 2021-12-10T18:13:59. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

From dd11e1096cc666e2abac30aab9209478b41d99d3 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Mon, 13 Dec 2021 11:56:25 +0800
Subject: [PATCH 44/58] python home set at windows os,fix path string encoding

---
 DSView/pv/appcontrol.cpp              | 7 +++++--
 libsigrokdecode4DSL/libsigrokdecode.h | 2 +-
 libsigrokdecode4DSL/srd.c             | 2 +-
 qtpro/DSView.pro.user                 | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/DSView/pv/appcontrol.cpp b/DSView/pv/appcontrol.cpp
index 15c0e52d..23fd92d0 100644
--- a/DSView/pv/appcontrol.cpp
+++ b/DSView/pv/appcontrol.cpp
@@ -77,19 +77,22 @@ bool AppControl::Init()
     QString resdir = GetResourceDir();
 	sr_set_firmware_resource_dir(resdir.toUtf8().data());
 
+     
+
 #ifdef _WIN32
     QString pythonHome = GetAppDataDir() + "/Python";   
     QDir pydir;
     if (pydir.exists(pythonHome)){
-          srd_set_python_home(pythonHome.toUtf8().data());
+        const wchar_t *pyhome = reinterpret_cast<const wchar_t*>(pythonHome.utf16());
+        srd_set_python_home(pyhome);
     }else{
         qDebug()<<"python home directory not exists,"<<pythonHome;        
     }
   
 #endif
     
-    QString dir = GetAppDataDir() + "/decoders";
     char path[256] = {0};
+    QString dir = GetAppDataDir() + "/decoders";   
     strcpy(path, dir.toUtf8().data());
 
     // Initialise libsigrokdecode
diff --git a/libsigrokdecode4DSL/libsigrokdecode.h b/libsigrokdecode4DSL/libsigrokdecode.h
index d66cc74e..77d8a216 100755
--- a/libsigrokdecode4DSL/libsigrokdecode.h
+++ b/libsigrokdecode4DSL/libsigrokdecode.h
@@ -361,7 +361,7 @@ struct srd_pd_callback {
 SRD_API int srd_init(const char *path);
 SRD_API int srd_exit(void);
 SRD_API GSList *srd_searchpaths_get(void);
-SRD_API void srd_set_python_home(const char *path);
+SRD_API void srd_set_python_home(const wchar_t *path);
 
 /* session.c */
 SRD_API int srd_session_new(struct srd_session **sess);
diff --git a/libsigrokdecode4DSL/srd.c b/libsigrokdecode4DSL/srd.c
index caec1fd0..b070ab24 100755
--- a/libsigrokdecode4DSL/srd.c
+++ b/libsigrokdecode4DSL/srd.c
@@ -387,7 +387,7 @@ SRD_API GSList *srd_searchpaths_get(void)
 }
 
 //set python home directory
-SRD_API void srd_set_python_home(const char *path)
+SRD_API void srd_set_python_home(const wchar_t *path)
 {
 	Py_SetPythonHome((wchar_t*)path);
 }
diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user
index 536a527e..69735a38 100644
--- a/qtpro/DSView.pro.user
+++ b/qtpro/DSView.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2021-12-10T18:13:59. -->
+<!-- Written by QtCreator 4.11.0, 2021-12-13T10:43:31. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -93,7 +93,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
       <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">true</value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
      </valuemap>

From 0e5fed0855633025612533944c89591a6a7a68d6 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Mon, 13 Dec 2021 17:19:23 +0800
Subject: [PATCH 45/58] fix form resize exception under windows

---
 DSView/main.cpp          |  7 ++++---
 DSView/pv/mainframe.cpp  | 22 +++++++++++-----------
 DSView/pv/sigsession.cpp | 17 ++++++++++-------
 DSView/pv/sigsession.h   |  2 +-
 qtpro/DSView.pro.user    |  4 ++--
 5 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/DSView/main.cpp b/DSView/main.cpp
index d0cb7161..6b45764b 100755
--- a/DSView/main.cpp
+++ b/DSView/main.cpp
@@ -165,12 +165,13 @@ int main(int argc, char *argv[])
 	}
 
 	try
-	{  
-	   control->Start();
-	   
+	{   
+		control->Start();
+		
 		// Initialise the main frame
         pv::MainFrame w;
 		w.show(); 
+ 
 		w.readSettings();
 		 
 		//to show the dailog for open help document
diff --git a/DSView/pv/mainframe.cpp b/DSView/pv/mainframe.cpp
index 5f7c3be0..adab48f6 100644
--- a/DSView/pv/mainframe.cpp
+++ b/DSView/pv/mainframe.cpp
@@ -228,15 +228,7 @@ bool MainFrame::eventFilter(QObject *object, QEvent *event)
     if (isMaximized() || _titleBar->IsMoving()){
        return QFrame::eventFilter(object, event);
     }
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    int x0 = (int)mouse_event->globalPosition().x();
-    int y0 = (int)mouse_event->globalPosition().y();
-#else
-    int x0 = mouse_event->globalX();
-    int y0 = mouse_event->globalY();
-#endif
-
+ 
     if (!_bDraging && type == QEvent::MouseMove && (!(mouse_event->buttons() | Qt::NoButton))){
            if (object == _top_left) {
                 _hit_border = TopLeft;
@@ -271,6 +263,15 @@ bool MainFrame::eventFilter(QObject *object, QEvent *event)
     }
 
   if (type == QEvent::MouseMove) {
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    int x0 = (int)mouse_event->globalPosition().x();
+    int y0 = (int)mouse_event->globalPosition().y();
+#else
+    int x0 = mouse_event->globalX();
+    int y0 = mouse_event->globalY();
+#endif
+
          if(mouse_event->buttons().testFlag(Qt::LeftButton)) {
             if (!_freezing) {
                 switch (_hit_border) {
@@ -362,8 +363,7 @@ bool MainFrame::eventFilter(QObject *object, QEvent *event)
         _dragStartGeometry = geometry();
     } 
     else if (type == QEvent::MouseButtonRelease) {
-        if (mouse_event->button() == Qt::LeftButton) {
-         
+        if (mouse_event->button() == Qt::LeftButton) {         
             _bDraging = false;
             _timer.stop();
         }
diff --git a/DSView/pv/sigsession.cpp b/DSView/pv/sigsession.cpp
index d3d9a848..1eff15f9 100755
--- a/DSView/pv/sigsession.cpp
+++ b/DSView/pv/sigsession.cpp
@@ -61,8 +61,7 @@
  
 #include "data/decode/decoderstatus.h"
 #include "dsvdef.h"
-
-  
+ 
 namespace pv {
 
 // TODO: This should not be necessary
@@ -1259,13 +1258,17 @@ void SigSession::register_hotplug_callback()
 {
     int ret;
 
-    ret = libusb_hotplug_register_callback(NULL, (libusb_hotplug_event)(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
-                                           LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT),
-                                           (libusb_hotplug_flag)LIBUSB_HOTPLUG_ENUMERATE, 0x2A0E, LIBUSB_HOTPLUG_MATCH_ANY,
-                                           LIBUSB_HOTPLUG_MATCH_ANY, hotplug_callback, NULL,
+    ret = libusb_hotplug_register_callback(NULL,
+                                           (libusb_hotplug_event)(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT),
+                                           (libusb_hotplug_flag)LIBUSB_HOTPLUG_ENUMERATE,
+                                           0x2A0E,
+                                           LIBUSB_HOTPLUG_MATCH_ANY,
+                                           LIBUSB_HOTPLUG_MATCH_ANY, 
+                                           hotplug_callback,
+                                           NULL,
                                            &_hotplug_handle);
     if (LIBUSB_SUCCESS != ret){
-    qDebug() << "Error creating a hotplug callback\n";
+        qDebug() << "Error creating a hotplug callback,code:"<<ret;
     }
 }
 
diff --git a/DSView/pv/sigsession.h b/DSView/pv/sigsession.h
index ca38e3bd..b4b7f9db 100755
--- a/DSView/pv/sigsession.h
+++ b/DSView/pv/sigsession.h
@@ -411,7 +411,7 @@ private:
     bool        _bClose;
 
     ISessionCallback *_callback;
-
+   
 private:
 	// TODO: This should not be necessary. Multiple concurrent
 	// sessions should should be supported and it should be
diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user
index 69735a38..d7a2e816 100644
--- a/qtpro/DSView.pro.user
+++ b/qtpro/DSView.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2021-12-13T10:43:31. -->
+<!-- Written by QtCreator 4.11.0, 2021-12-13T14:10:07. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -93,7 +93,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
       <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">true</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
      </valuemap>

From d6c126c33eaa705e74a7968b892327b71d21f9a1 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Tue, 14 Dec 2021 17:18:11 +0800
Subject: [PATCH 46/58] libuse callback function set stdcall mode, add app logo

---
 DSView.icns              | Bin 0 -> 115411 bytes
 DSView/main.cpp          |   1 +
 DSView/pv/appcontrol.cpp |   1 +
 DSView/pv/sigsession.h   |   2 +-
 applogo.rc               |   1 +
 qtpro/DSView.pro         |   5 +++++
 qtpro/DSView.pro.user    |   2 +-
 7 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 DSView.icns
 create mode 100644 applogo.rc

diff --git a/DSView.icns b/DSView.icns
new file mode 100644
index 0000000000000000000000000000000000000000..d98f535111e5d7d8c01e74010f32d91ec0f0e169
GIT binary patch
literal 115411
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
DG%d(y

literal 0
HcmV?d00001

diff --git a/DSView/main.cpp b/DSView/main.cpp
index 6b45764b..3ec0a875 100755
--- a/DSView/main.cpp
+++ b/DSView/main.cpp
@@ -62,6 +62,7 @@ int main(int argc, char *argv[])
 	const char *open_file = NULL;
  
     #if QT_VERSION >= QT_VERSION_CHECK(5,6,0)
+		//On Windows, need to compile with the QT5 version of the library, which makes the interface slightly larger.
         QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
         QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
     #endif // QT_VERSION
diff --git a/DSView/pv/appcontrol.cpp b/DSView/pv/appcontrol.cpp
index 23fd92d0..0f3d01e4 100644
--- a/DSView/pv/appcontrol.cpp
+++ b/DSView/pv/appcontrol.cpp
@@ -27,6 +27,7 @@
 #include <libsigrokdecode4DSL/libsigrokdecode.h>
 #include <QDir>
 #include <QCoreApplication>
+#include <QDebug>
 
 #include "devicemanager.h"
 #include "sigsession.h"
diff --git a/DSView/pv/sigsession.h b/DSView/pv/sigsession.h
index b4b7f9db..4de67805 100755
--- a/DSView/pv/sigsession.h
+++ b/DSView/pv/sigsession.h
@@ -321,7 +321,7 @@ private:
     // thread for hotplug
     void hotplug_proc();
 
-    static int hotplug_callback(struct libusb_context *ctx, struct libusb_device *dev,
+    static LIBUSB_CALL int hotplug_callback(struct libusb_context *ctx, struct libusb_device *dev,
                                 libusb_hotplug_event event, void *user_data);
 
 public:
diff --git a/applogo.rc b/applogo.rc
new file mode 100644
index 00000000..5e20a8c3
--- /dev/null
+++ b/applogo.rc
@@ -0,0 +1 @@
+IDI_ICON1 ICON DISCARDABLE "DSView.icns"
diff --git a/qtpro/DSView.pro b/qtpro/DSView.pro
index 575d247e..2637a9b8 100644
--- a/qtpro/DSView.pro
+++ b/qtpro/DSView.pro
@@ -375,4 +375,9 @@ RESOURCES += \
 
 ICON = DSView.icns
 
+RC_FILE += ../applogo.rc
+
 MOC_DIR  = ../../DSView_tmp/DSView_moc
+
+DISTFILES += \
+    ../applogo.rc
diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user
index d7a2e816..1dc0ec18 100644
--- a/qtpro/DSView.pro.user
+++ b/qtpro/DSView.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2021-12-13T14:10:07. -->
+<!-- Written by QtCreator 4.11.0, 2021-12-13T18:09:39. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

From ada05d91edc9c93c358df9209ed714cd0571be84 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Wed, 15 Dec 2021 10:45:03 +0800
Subject: [PATCH 47/58] windows app logo

---
 applogo.rc            |   2 +-
 logo-win.ico          | Bin 0 -> 68588 bytes
 qtpro/DSView.pro      |   4 ++--
 qtpro/DSView.pro.user |   2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 logo-win.ico

diff --git a/applogo.rc b/applogo.rc
index 5e20a8c3..3f4ac618 100644
--- a/applogo.rc
+++ b/applogo.rc
@@ -1 +1 @@
-IDI_ICON1 ICON DISCARDABLE "DSView.icns"
+IDI_ICON1 ICON DISCARDABLE "logo-win.ico"
diff --git a/logo-win.ico b/logo-win.ico
new file mode 100644
index 0000000000000000000000000000000000000000..881489ad5c6c2ff5329ef2ea6b1627bec75f14c0
GIT binary patch
literal 68588
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

literal 0
HcmV?d00001

diff --git a/qtpro/DSView.pro b/qtpro/DSView.pro
index 2637a9b8..c0b4a15e 100644
--- a/qtpro/DSView.pro
+++ b/qtpro/DSView.pro
@@ -366,7 +366,6 @@ HEADERS  += \
 #}
 }
 
-FORMS +=
 
 RESOURCES += \
     ../DSView/DSView.qrc \
@@ -375,7 +374,8 @@ RESOURCES += \
 
 ICON = DSView.icns
 
-RC_FILE += ../applogo.rc
+# make app logo on windows
+#RC_FILE += ../applogo.rc
 
 MOC_DIR  = ../../DSView_tmp/DSView_moc
 
diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user
index 1dc0ec18..79cd0fe4 100644
--- a/qtpro/DSView.pro.user
+++ b/qtpro/DSView.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2021-12-13T18:09:39. -->
+<!-- Written by QtCreator 4.11.0, 2021-12-14T18:05:36. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

From de9818f159cc7084ca9fd98db2e0da7d222e2cd7 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Wed, 15 Dec 2021 15:23:51 +0800
Subject: [PATCH 48/58] Save Dailog path text style

---
 DSView/pv/dialogs/storeprogress.cpp |  1 +
 DSView/themes/dark.qss              |  4 ++++
 DSView/themes/light.qss             |  4 ++++
 qtpro/DSView.pro                    | 10 +++++++++-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/DSView/pv/dialogs/storeprogress.cpp b/DSView/pv/dialogs/storeprogress.cpp
index 28fa1571..ad6d4596 100755
--- a/DSView/pv/dialogs/storeprogress.cpp
+++ b/DSView/pv/dialogs/storeprogress.cpp
@@ -62,6 +62,7 @@ StoreProgress::StoreProgress(SigSession *session, QWidget *parent) :
 
     _fileLab = new QLineEdit();
     _fileLab->setEnabled(false);    
+    _fileLab->setObjectName("PathLine");
 
     QPushButton *openButton = new QPushButton(this);
     openButton->setText(tr("change"));
diff --git a/DSView/themes/dark.qss b/DSView/themes/dark.qss
index 63e3fd7b..d9d62acd 100755
--- a/DSView/themes/dark.qss
+++ b/DSView/themes/dark.qss
@@ -1622,3 +1622,7 @@ QTextBrowser:hover
 {
    border: 1px transparent;
 }
+
+QLineEdit#PathLine{
+    color:#eff0f1;
+}
\ No newline at end of file
diff --git a/DSView/themes/light.qss b/DSView/themes/light.qss
index 54463857..06b47f2e 100755
--- a/DSView/themes/light.qss
+++ b/DSView/themes/light.qss
@@ -1660,3 +1660,7 @@ QTextBrowser:hover
 {
    border: 1px transparent;
 }
+
+QLineEdit#PathLine{
+    color:#2A2A2A;
+}
diff --git a/qtpro/DSView.pro b/qtpro/DSView.pro
index c0b4a15e..228a0d42 100644
--- a/qtpro/DSView.pro
+++ b/qtpro/DSView.pro
@@ -13,7 +13,10 @@ QT += svg
 CONFIG += exceptions
 CONFIG += object_parallel_to_source
 
-//QT += core5compat
+#QT += core5compat
+#able to show console log on widnows
+#CONFIG += console thread
+
 CONFIG += c++11
 QT += widgets
 
@@ -378,6 +381,11 @@ ICON = DSView.icns
 #RC_FILE += ../applogo.rc
 
 MOC_DIR  = ../../DSView_tmp/DSView_moc
+RCC_DIR  = ../../DSView_tmp/RCC_DIR
+UI_HEADERS_DIR  = ../../DSView_tmp/UI_HEADERS_DIR
+UI_SOURCES_DIR = ../../DSView_tmp/UI_SOURCES_DIR
+UI_DIR   = ../../DSView_tmp/UI_DIR
+OBJECTS_DIR = ../../DSView_tmp/OBJECTS_DIR
 
 DISTFILES += \
     ../applogo.rc

From c407ab22f7ab647da1f67365c52d5ce4ed4a4a11 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Wed, 15 Dec 2021 16:07:52 +0800
Subject: [PATCH 49/58] Get the right startup param name for auto open data
 file

---
 DSView/main.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/DSView/main.cpp b/DSView/main.cpp
index 3ec0a875..39df2e69 100755
--- a/DSView/main.cpp
+++ b/DSView/main.cpp
@@ -38,6 +38,10 @@
 #include "config.h"
 #include "pv/appcontrol.h"
 
+#if _WIN32
+#include <windows.h>
+#endif
+
 //#include <libsigrok4DSL/libsigrok.h>
 
 void usage()

From a04eb6ff5d79556d4756d664ef6ca04ead4720a0 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Wed, 15 Dec 2021 16:13:47 +0800
Subject: [PATCH 50/58] fix include

---
 DSView/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DSView/main.cpp b/DSView/main.cpp
index 39df2e69..7a4845d2 100755
--- a/DSView/main.cpp
+++ b/DSView/main.cpp
@@ -38,7 +38,7 @@
 #include "config.h"
 #include "pv/appcontrol.h"
 
-#if _WIN32
+#ifdef _WIN32
 #include <windows.h>
 #endif
 

From cabc8bf61dacf18048ff2b67c94ed5d96e44f8e1 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Wed, 15 Dec 2021 16:45:09 +0800
Subject: [PATCH 51/58] check the auto load file if be exists

---
 DSView/pv/mainwindow.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index 9efe422f..c6522eab 100644
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -435,11 +435,19 @@ void MainWindow::update_device_list()
         //load specified file name from application startup param
        if (_bFirstLoad){
            _bFirstLoad = false;
-
+ 
            if (AppControl::Instance()->_open_file_name != ""){
-                QString f(QString::fromUtf8(AppControl::Instance()->_open_file_name.c_str()));
-                qDebug()<<"auto load file:"<<f;
-		        on_load_file(f);
+                QString opf(QString::fromUtf8(AppControl::Instance()->_open_file_name.c_str()));
+                QFile fpath;   
+
+                if (fpath.exists(opf)){             
+                    qDebug()<<"auto load file:"<<opf;
+                    on_load_file(opf);
+                }
+                else{
+                    qDebug()<<"file is not exists:"<<opf;
+                    MsgBox::Show("Open file error!", opf.toStdString().c_str());      
+                }              
            } 
        }
 }

From 3552a749555a8051509a3b378dbcd50be19bff81 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Fri, 17 Dec 2021 13:18:10 +0800
Subject: [PATCH 52/58] ruler tooltip text froma

---
 DSView/pv/view/ruler.cpp | 18 ++++++++++++++++++
 qtpro/DSView.pro         |  4 ++++
 qtpro/DSView.pro.user    |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/DSView/pv/view/ruler.cpp b/DSView/pv/view/ruler.cpp
index 905d9de7..7abc58e7 100755
--- a/DSView/pv/view/ruler.cpp
+++ b/DSView/pv/view/ruler.cpp
@@ -96,12 +96,21 @@ QString Ruler::format_freq(double period, unsigned precision)
         const int prefix = ceil((order - FirstSIPrefixPower) / 3.0f);
         const double multiplier = pow(10.0, max(-prefix * 3.0 - FirstSIPrefixPower, 0.0));
 
+      /*
         QString s;
         QTextStream ts(&s);
         ts.setRealNumberPrecision(precision);
         ts << fixed << 1 / (period  * multiplier) <<
             FreqPrefixes[prefix] << "Hz";
         return s;
+        */
+
+        char buf[20] = {0};
+        char format[10] = {0}; 
+        sprintf(format, "%%.%df%%s", precision);
+        QString prev = FreqPrefixes[prefix] + "Hz";
+        sprintf(buf, format, 1 / (period  * multiplier), prev.toLatin1().data());
+        return QString(buf);  
     }
 }
 
@@ -110,12 +119,21 @@ QString Ruler::format_time(double t, int prefix,
 {
     const double multiplier = pow(10.0, -prefix * 3 - FirstSIPrefixPower + 6.0);
 
+  /*
 	QString s;
 	QTextStream ts(&s);
 	ts.setRealNumberPrecision(precision);
     ts << fixed << forcesign << (t  * multiplier) / 1000000.0 <<
 		SIPrefixes[prefix] << "s";
 	return s;
+    */
+
+    char buf[20] = {0};
+    char format[10] = {0}; 
+    sprintf(format, "%%.%df%%s", precision);
+    QString prev = FreqPrefixes[prefix] + "s";
+    sprintf(buf, format, (t  * multiplier) / 1000000.0, prev.toLatin1().data());
+    return QString(buf);  
 }
 
 QString Ruler::format_time(double t)
diff --git a/qtpro/DSView.pro b/qtpro/DSView.pro
index 228a0d42..a122b7a1 100644
--- a/qtpro/DSView.pro
+++ b/qtpro/DSView.pro
@@ -22,6 +22,10 @@ QT += widgets
 
 #QMAKE_CFLAGS_ISYSTEM = -I
 
+win32:{
+ #QMAKE_LFLAGS += -shared
+}
+
 
 TARGET = DSView
 TEMPLATE = app
diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user
index 79cd0fe4..152e14ab 100644
--- a/qtpro/DSView.pro.user
+++ b/qtpro/DSView.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2021-12-14T18:05:36. -->
+<!-- Written by QtCreator 4.11.0, 2021-12-15T18:25:40. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

From d2bab86a8fcf32e24404b4c7c99f9186b211c013 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Tue, 28 Dec 2021 10:11:15 +0800
Subject: [PATCH 53/58] Set custom python home, for able to debug with
 qtcreator on windows

---
 .gitignore                 |  1 +
 DSView/pv/appcontrol.cpp   |  5 ++-
 DSView/pv/storesession.cpp |  4 +++
 qtpro/DSView.pro           | 63 ++++++++++++++++++++++++++------------
 qtpro/DSView.pro.user      |  2 +-
 5 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index e48ca087..c855d007 100755
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,4 @@ moc_*.cpp_parameters
 DSView-prj
 build*
 share
+.vscode
diff --git a/DSView/pv/appcontrol.cpp b/DSView/pv/appcontrol.cpp
index 0f3d01e4..286e8019 100644
--- a/DSView/pv/appcontrol.cpp
+++ b/DSView/pv/appcontrol.cpp
@@ -81,13 +81,12 @@ bool AppControl::Init()
      
 
 #ifdef _WIN32
-    QString pythonHome = GetAppDataDir() + "/Python";   
+    //able run debug with qtcreator
+    QString pythonHome = "c:/python";
     QDir pydir;
     if (pydir.exists(pythonHome)){
         const wchar_t *pyhome = reinterpret_cast<const wchar_t*>(pythonHome.utf16());
         srd_set_python_home(pyhome);
-    }else{
-        qDebug()<<"python home directory not exists,"<<pythonHome;        
     }
   
 #endif
diff --git a/DSView/pv/storesession.cpp b/DSView/pv/storesession.cpp
index 33a4b829..44404627 100755
--- a/DSView/pv/storesession.cpp
+++ b/DSView/pv/storesession.cpp
@@ -49,6 +49,10 @@
 #include <math.h>
 #include <QTextStream>
 #include <QDebug>
+
+#ifdef _WIN32
+#include <QTextCodec>
+#endif
  
 #include <libsigrokdecode4DSL/libsigrokdecode.h>
 #include "config/appconfig.h"
diff --git a/qtpro/DSView.pro b/qtpro/DSView.pro
index a122b7a1..53e0acad 100644
--- a/qtpro/DSView.pro
+++ b/qtpro/DSView.pro
@@ -5,26 +5,32 @@
 #-------------------------------------------------
 
 QT += core gui
+
+win32{
+QT += winextras
+QT += svg
+QMAKE_LFLAGS += -static
+}else{
 CONFIG -= lib_bundle
 CONFIG += app_bundle
+}
+
 macx {
 QT += svg
+#QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
+QMAKE_CXXFLAGS += -fvisibility=hidden
+QMAKE_CXXFLAGS += -fvisibility-inlines-hidden
 }
+
 CONFIG += exceptions
 CONFIG += object_parallel_to_source
 
 #QT += core5compat
-#able to show console log on widnows
 #CONFIG += console thread
 
 CONFIG += c++11
 QT += widgets
-
-#QMAKE_CFLAGS_ISYSTEM = -I
-
-win32:{
- #QMAKE_LFLAGS += -shared
-}
+QMAKE_CFLAGS_ISYSTEM = -I
 
 
 TARGET = DSView
@@ -35,6 +41,24 @@ TRANSLATIONS = my_CN.ts
 CONFIG += decoders
 DEFINES += decoders
 
+win32:{
+#INCLUDEPATH += C:\Qt\Tools\mingw730_32\i686-w64-mingw32\include
+INCLUDEPATH += D:\msys64\mingw32\lib\glib-2.0\include
+INCLUDEPATH += D:\msys64\mingw32\include\glib-2.0
+INCLUDEPATH += D:\msys64\mingw32\include
+INCLUDEPATH += D:\msys64\mingw32\include\libusb-1.0
+INCLUDEPATH += C:\Python\Python310-32\include
+INCLUDEPATH += D:\msys64\mingw32\include\boost
+INCLUDEPATH += ..
+
+LIBS += D:\msys64\mingw32\lib\libglib-2.0.a
+LIBS += D:\msys64\mingw32\lib\libzip.a
+LIBS += D:\msys64\mingw32\lib\libusb-1.0.a
+LIBS += D:\msys64\mingw32\lib\libz.a
+LIBS += D:\msys64\mingw32\lib\libfftw3.a
+LIBS += C:\Python\Python310-32\libs\python310.lib
+}
+
 unix:!macx {
 INCLUDEPATH += /usr/include/glib-2.0
 INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
@@ -78,7 +102,6 @@ LIBS += /usr/local/lib/libboost_thread-mt.a
 LIBS += /usr/local/lib/libboost_system-mt.a
 LIBS += /usr/local/lib/libboost_filesystem-mt.a
 LIBS += /Library/Frameworks/Python.framework/Versions/3.4/lib/libpython3.4.dylib
-#LIBS += /opt/local/lib/libsetupapi.a
 LIBS += /usr/local/lib/libfftw3.a
 }
 
@@ -379,17 +402,19 @@ RESOURCES += \
     ../DSView/themes/breeze.qrc \
     language.qrc
 
-ICON = DSView.icns
-
 # make app logo on windows
-#RC_FILE += ../applogo.rc
 
-MOC_DIR  = ../../DSView_tmp/DSView_moc
-RCC_DIR  = ../../DSView_tmp/RCC_DIR
-UI_HEADERS_DIR  = ../../DSView_tmp/UI_HEADERS_DIR
-UI_SOURCES_DIR = ../../DSView_tmp/UI_SOURCES_DIR
-UI_DIR   = ../../DSView_tmp/UI_DIR
-OBJECTS_DIR = ../../DSView_tmp/OBJECTS_DIR
+win32 {
+RC_FILE += ../applogo.rc
+}else{
+ICON = DSView.icns
+}
+
+MOC_DIR  = ../../DSView-build/MOC_DIR
+RCC_DIR  = ../../DSView-build/RCC_DIR
+UI_HEADERS_DIR  = ../../DSView-build/UI_HEADERS_DIR
+UI_SOURCES_DIR = ../../DSView-build/UI_SOURCES_DIR
+UI_DIR   = ../../DSView-build/UI_DIR
+OBJECTS_DIR = ../../DSView-build/OBJECTS_DIR
+DESTDIR  = ../../DSView-build/bin
 
-DISTFILES += \
-    ../applogo.rc
diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user
index 152e14ab..7ba4c464 100644
--- a/qtpro/DSView.pro.user
+++ b/qtpro/DSView.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2021-12-15T18:25:40. -->
+<!-- Written by QtCreator 4.11.0, 2021-12-17T18:05:34. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

From be2514f00947c02f011457094031927bd70d8ecd Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Mon, 10 Jan 2022 17:47:27 +0800
Subject: [PATCH 54/58] More flexible conversion of numeric formats

---
 DSView/pv/data/decode/AnnotationResTable.cpp  | 163 +++++++++-
 DSView/pv/data/decode/AnnotationResTable.h    |  30 +-
 DSView/pv/data/decode/annotation.cpp          | 285 ++++++------------
 DSView/pv/data/decode/annotation.h            |  14 +-
 DSView/pv/data/decode/decoder.cpp             |   4 +-
 DSView/pv/data/decoderstack.cpp               |   3 +
 DSView/pv/dock/protocoldock.cpp               |  20 +-
 DSView/pv/dock/protocoldock.h                 |   2 +-
 DSView/pv/dock/protocolitemlayer.cpp          |  18 +-
 DSView/pv/dsvdef.cpp                          |   5 +-
 DSView/pv/dsvdef.h                            |   3 +-
 .../decoders => decoders}/0-i2c/__init__.py   |   0
 .../decoders => decoders}/0-i2c/pd.py         |   0
 .../decoders => decoders}/0-spi/__init__.py   |   0
 .../decoders => decoders}/0-spi/pd.py         |   0
 .../decoders => decoders}/0-uart/__init__.py  |   0
 .../decoders => decoders}/0-uart/pd.py        |   0
 .../decoders => decoders}/1-i2c/__init__.py   |   0
 .../decoders => decoders}/1-i2c/pd.py         |   0
 .../decoders => decoders}/1-spi/__init__.py   |   0
 .../decoders => decoders}/1-spi/pd.py         |   0
 .../decoders => decoders}/1-uart/__init__.py  |   0
 .../decoders => decoders}/1-uart/pd.py        |   0
 .../decoders => decoders}/a7105/__init__.py   |   0
 .../decoders => decoders}/a7105/pd.py         |   0
 .../decoders => decoders}/ac97/__init__.py    |   0
 .../decoders => decoders}/ac97/pd.py          |   0
 .../decoders => decoders}/ad5626/__init__.py  |   0
 .../decoders => decoders}/ad5626/pd.py        |   0
 .../decoders => decoders}/ad79x0/__init__.py  |   0
 .../decoders => decoders}/ad79x0/pd.py        |   0
 .../decoders => decoders}/ade77xx/__init__.py |   0
 .../decoders => decoders}/ade77xx/lists.py    |   0
 .../decoders => decoders}/ade77xx/pd.py       |   0
 .../decoders => decoders}/adf435x/__init__.py |   0
 .../decoders => decoders}/adf435x/pd.py       |   0
 .../adns5020/__init__.py                      |   0
 .../decoders => decoders}/adns5020/pd.py      |   0
 .../decoders => decoders}/adxl345/__init__.py |   0
 .../decoders => decoders}/adxl345/lists.py    |   0
 .../decoders => decoders}/adxl345/pd.py       |   0
 .../decoders => decoders}/am230x/__init__.py  |   0
 .../decoders => decoders}/am230x/pd.py        |   0
 .../amulet_ascii/__init__.py                  |   0
 .../amulet_ascii/lists.py                     |   0
 .../decoders => decoders}/amulet_ascii/pd.py  |   0
 .../arm_etmv3/__init__.py                     |   0
 .../decoders => decoders}/arm_etmv3/pd.py     |   0
 .../decoders => decoders}/arm_itm/__init__.py |   0
 .../decoders => decoders}/arm_itm/pd.py       |   0
 .../arm_tpiu/__init__.py                      |   0
 .../decoders => decoders}/arm_tpiu/pd.py      |   0
 .../atsha204a/__init__.py                     |   0
 .../decoders => decoders}/atsha204a/pd.py     |   0
 .../decoders => decoders}/aud/__init__.py     |   0
 .../decoders => decoders}/aud/pd.py           |   0
 .../decoders => decoders}/avr_isp/__init__.py |   0
 .../decoders => decoders}/avr_isp/parts.py    |   0
 .../decoders => decoders}/avr_isp/pd.py       |   0
 .../decoders => decoders}/avr_pdi/__init__.py |   0
 .../decoders => decoders}/avr_pdi/pd.py       |   0
 .../decoders => decoders}/caliper/__init__.py |   0
 .../decoders => decoders}/caliper/pd.py       |   0
 .../decoders => decoders}/can/__init__.py     |   0
 .../decoders => decoders}/can/pd.py           |   0
 .../decoders => decoders}/cc1101/__init__.py  |   0
 .../decoders => decoders}/cc1101/lists.py     |   0
 .../decoders => decoders}/cc1101/pd.py        |   0
 .../decoders => decoders}/cec/__init__.py     |   0
 .../decoders => decoders}/cec/pd.py           |   0
 .../decoders => decoders}/cec/protocoldata.py |   0
 .../decoders => decoders}/cfp/__init__.py     |   0
 .../decoders => decoders}/cfp/pd.py           |   0
 .../cjtag-oscan0/__init__.py                  |   0
 .../decoders => decoders}/cjtag-oscan0/pd.py  |   0
 .../decoders => decoders}/common/__init__.py  |   0
 .../common/plugtrx/__init__.py                |   0
 .../common/plugtrx/mod.py                     |   0
 .../common/sdcard/__init__.py                 |   0
 .../common/sdcard/mod.py                      |   0
 .../common/srdhelper/__init__.py              |   0
 .../common/srdhelper/mod.py                   |   0
 .../decoders => decoders}/counter/__init__.py |   0
 .../decoders => decoders}/counter/pd.py       |   0
 .../decoders => decoders}/dali/__init__.py    |   0
 .../decoders => decoders}/dali/lists.py       |   0
 .../decoders => decoders}/dali/pd.py          |   0
 .../decoders => decoders}/dcf77/__init__.py   |   0
 .../decoders => decoders}/dcf77/pd.py         |   0
 .../decoders => decoders}/dmx512/__init__.py  |   0
 .../decoders => decoders}/dmx512/pd.py        |   0
 .../decoders => decoders}/ds1307/__init__.py  |   0
 .../decoders => decoders}/ds1307/pd.py        |   0
 .../decoders => decoders}/ds2408/__init__.py  |   0
 .../decoders => decoders}/ds2408/pd.py        |   0
 .../decoders => decoders}/ds243x/__init__.py  |   0
 .../decoders => decoders}/ds243x/pd.py        |   0
 .../ds28ea00/__init__.py                      |   0
 .../decoders => decoders}/ds28ea00/pd.py      |   0
 .../decoders => decoders}/dsi/__init__.py     |   0
 .../decoders => decoders}/dsi/pd.py           |   0
 .../decoders => decoders}/edid/__init__.py    |   0
 .../decoders => decoders}/edid/config         |   0
 .../decoders => decoders}/edid/pd.py          |   0
 .../decoders => decoders}/edid/pnpids.txt     |   0
 .../eeprom24xx/__init__.py                    |   0
 .../decoders => decoders}/eeprom24xx/lists.py |   0
 .../decoders => decoders}/eeprom24xx/pd.py    |   0
 .../eeprom93xx/__init__.py                    |   0
 .../decoders => decoders}/eeprom93xx/pd.py    |   0
 .../decoders => decoders}/em4100/__init__.py  |   0
 .../decoders => decoders}/em4100/pd.py        |   0
 .../decoders => decoders}/em4305/__init__.py  |   0
 .../decoders => decoders}/em4305/pd.py        |   0
 .../enc28j60/__init__.py                      |   0
 .../decoders => decoders}/enc28j60/lists.py   |   0
 .../decoders => decoders}/enc28j60/pd.py      |   0
 .../decoders => decoders}/flexray/__init__.py |   0
 .../decoders => decoders}/flexray/pd.py       |   0
 .../decoders => decoders}/fsi/__init__.py     |   0
 .../decoders => decoders}/fsi/pd.py           |   0
 .../decoders => decoders}/gpib/__init__.py    |   0
 .../decoders => decoders}/gpib/pd.py          |   0
 .../graycode/__init__.py                      |   0
 .../decoders => decoders}/graycode/pd.py      |   0
 .../guess_bitrate/__init__.py                 |   0
 .../decoders => decoders}/guess_bitrate/pd.py |   0
 .../decoders => decoders}/hdcp/__init__.py    |   0
 .../decoders => decoders}/hdcp/pd.py          |   0
 .../i2cdemux/__init__.py                      |   0
 .../decoders => decoders}/i2cdemux/pd.py      |   0
 .../i2cfilter/__init__.py                     |   0
 .../decoders => decoders}/i2cfilter/pd.py     |   0
 .../decoders => decoders}/i2s/__init__.py     |   0
 .../decoders => decoders}/i2s/pd.py           |   0
 .../decoders => decoders}/iec/__init__.py     |   0
 .../decoders => decoders}/iec/pd.py           |   0
 .../decoders => decoders}/ieee488/__init__.py |   0
 .../decoders => decoders}/ieee488/pd.py       |   0
 .../decoders => decoders}/ir_irmp/__init__.py |   0
 .../ir_irmp/irmp_library.py                   |   0
 .../decoders => decoders}/ir_irmp/pd.py       |   0
 .../decoders => decoders}/ir_nec/__init__.py  |   0
 .../decoders => decoders}/ir_nec/lists.py     |   0
 .../decoders => decoders}/ir_nec/pd.py        |   0
 .../decoders => decoders}/ir_rc5/__init__.py  |   0
 .../decoders => decoders}/ir_rc5/lists.py     |   0
 .../decoders => decoders}/ir_rc5/pd.py        |   0
 .../decoders => decoders}/ir_rc6/__init__.py  |   0
 .../decoders => decoders}/ir_rc6/pd.py        |   0
 .../decoders => decoders}/ir_sirc/__init__.py |   0
 .../decoders => decoders}/ir_sirc/lists.py    |   0
 .../decoders => decoders}/ir_sirc/pd.py       |   0
 .../decoders => decoders}/jitter/__init__.py  |   0
 .../decoders => decoders}/jitter/pd.py        |   0
 .../decoders => decoders}/jtag/__init__.py    |   0
 .../decoders => decoders}/jtag/pd.py          |   0
 .../jtag_ejtag/__init__.py                    |   0
 .../decoders => decoders}/jtag_ejtag/pd.py    |   0
 .../jtag_stm32/__init__.py                    |   0
 .../decoders => decoders}/jtag_stm32/pd.py    |   0
 .../decoders => decoders}/lfast/__init__.py   |   0
 .../decoders => decoders}/lfast/pd.py         |   0
 .../decoders => decoders}/lin/__init__.py     |   0
 .../decoders => decoders}/lin/pd.py           |   0
 .../decoders => decoders}/lm75/__init__.py    |   0
 .../decoders => decoders}/lm75/pd.py          |   0
 .../decoders => decoders}/lpc/__init__.py     |   0
 .../decoders => decoders}/lpc/pd.py           |   0
 .../decoders => decoders}/ltc242x/__init__.py |   0
 .../decoders => decoders}/ltc242x/pd.py       |   0
 .../decoders => decoders}/ltc26x7/__init__.py |   0
 .../decoders => decoders}/ltc26x7/pd.py       |   0
 .../maple_bus/__init__.py                     |   0
 .../decoders => decoders}/maple_bus/pd.py     |   0
 .../decoders => decoders}/max7219/__init__.py |   0
 .../decoders => decoders}/max7219/pd.py       |   0
 .../decoders => decoders}/mcs48/__init__.py   |   0
 .../decoders => decoders}/mcs48/pd.py         |   0
 .../decoders => decoders}/mdio/__init__.py    |   0
 .../decoders => decoders}/mdio/pd.py          |   0
 .../microwire/__init__.py                     |   0
 .../decoders => decoders}/microwire/pd.py     |   0
 .../decoders => decoders}/midi/__init__.py    |   0
 .../decoders => decoders}/midi/lists.py       |   0
 .../decoders => decoders}/midi/pd.py          |   0
 .../decoders => decoders}/miller/__init__.py  |   0
 .../decoders => decoders}/miller/pd.py        |   0
 .../mipi_dsi/__init__.py                      |   0
 .../decoders => decoders}/mipi_dsi/pd.py      |   0
 .../mipi_rffe/__init__.py                     |   0
 .../decoders => decoders}/mipi_rffe/pd.py     |   0
 .../mlx90614/__init__.py                      |   0
 .../decoders => decoders}/mlx90614/pd.py      |   0
 .../decoders => decoders}/modbus/__init__.py  |   0
 .../decoders => decoders}/modbus/pd.py        |   0
 .../decoders => decoders}/morse/__init__.py   |   0
 .../decoders => decoders}/morse/pd.py         |   0
 .../mrf24j40/__init__.py                      |   0
 .../decoders => decoders}/mrf24j40/lists.py   |   0
 .../decoders => decoders}/mrf24j40/pd.py      |   0
 .../mxc6225xu/__init__.py                     |   0
 .../decoders => decoders}/mxc6225xu/pd.py     |   0
 .../nes_gamepad/__init__.py                   |   0
 .../decoders => decoders}/nes_gamepad/pd.py   |   0
 .../nrf24l01/__init__.py                      |   0
 .../decoders => decoders}/nrf24l01/pd.py      |   0
 .../decoders => decoders}/nrf905/__init__.py  |   0
 .../decoders => decoders}/nrf905/pd.py        |   0
 .../numbers_and_state/__init__.py             |   0
 .../numbers_and_state/pd.py                   |   0
 .../decoders => decoders}/nunchuk/__init__.py |   0
 .../decoders => decoders}/nunchuk/pd.py       |   0
 .../onewire_link/__init__.py                  |   0
 .../decoders => decoders}/onewire_link/pd.py  |   0
 .../onewire_network/__init__.py               |   0
 .../onewire_network/pd.py                     |   0
 .../decoders => decoders}/ook/__init__.py     |   0
 .../decoders => decoders}/ook/pd.py           |   0
 .../ook_oregon/__init__.py                    |   0
 .../decoders => decoders}/ook_oregon/lists.py |   0
 .../decoders => decoders}/ook_oregon/pd.py    |   0
 .../decoders => decoders}/ook_vis/__init__.py |   0
 .../decoders => decoders}/ook_vis/pd.py       |   0
 .../decoders => decoders}/pan1321/__init__.py |   0
 .../decoders => decoders}/pan1321/pd.py       |   0
 .../parallel/__init__.py                      |   0
 .../decoders => decoders}/parallel/pd.py      |   0
 .../decoders => decoders}/pca9571/__init__.py |   0
 .../decoders => decoders}/pca9571/pd.py       |   0
 .../decoders => decoders}/pjdl/__init__.py    |   0
 .../decoders => decoders}/pjdl/pd.py          |   0
 .../decoders => decoders}/pjon/__init__.py    |   0
 .../decoders => decoders}/pjon/pd.py          |   0
 .../decoders => decoders}/ps2/__init__.py     |   0
 .../decoders => decoders}/ps2/pd.py           |   0
 .../decoders => decoders}/pwm/__init__.py     |   0
 .../decoders => decoders}/pwm/pd.py           |   0
 .../decoders => decoders}/qi/__init__.py      |   0
 .../decoders => decoders}/qi/pd.py            |   0
 .../decoders => decoders}/qspi/__init__.py    |   0
 .../decoders => decoders}/qspi/pd.py          |   0
 .../rc_encode/__init__.py                     |   0
 .../decoders => decoders}/rc_encode/pd.py     |   0
 .../decoders => decoders}/rfm12/__init__.py   |   0
 .../decoders => decoders}/rfm12/pd.py         |   0
 .../rgb_led_spi/__init__.py                   |   0
 .../decoders => decoders}/rgb_led_spi/pd.py   |   0
 .../rgb_led_ws281x/__init__.py                |   0
 .../rgb_led_ws281x/pd.py                      |   0
 .../decoders => decoders}/rtc8564/__init__.py |   0
 .../decoders => decoders}/rtc8564/pd.py       |   0
 .../sae_j1850_vpw/__init__.py                 |   0
 .../decoders => decoders}/sae_j1850_vpw/pd.py |   0
 .../decoders => decoders}/sda2506/__init__.py |   0
 .../decoders => decoders}/sda2506/pd.py       |   0
 .../sdcard_sd/__init__.py                     |   0
 .../decoders => decoders}/sdcard_sd/pd.py     |   0
 .../sdcard_spi/__init__.py                    |   0
 .../decoders => decoders}/sdcard_spi/pd.py    |   0
 .../decoders => decoders}/sdq/__init__.py     |   0
 .../decoders => decoders}/sdq/pd.py           |   0
 .../seven_segment/__init__.py                 |   0
 .../decoders => decoders}/seven_segment/pd.py |   0
 .../signature/__init__.py                     |   0
 .../decoders => decoders}/signature/pd.py     |   0
 .../decoders => decoders}/sipi/__init__.py    |   0
 .../decoders => decoders}/sipi/pd.py          |   0
 .../decoders => decoders}/sle44xx/__init__.py |   0
 .../decoders => decoders}/sle44xx/pd.py       |   0
 .../decoders => decoders}/spdif/__init__.py   |   0
 .../decoders => decoders}/spdif/pd.py         |   0
 .../spiflash/__init__.py                      |   0
 .../decoders => decoders}/spiflash/lists.py   |   0
 .../decoders => decoders}/spiflash/pd.py      |   0
 .../decoders => decoders}/ssi32/__init__.py   |   0
 .../decoders => decoders}/ssi32/pd.py         |   0
 .../st25r39xx_spi/__init__.py                 |   0
 .../st25r39xx_spi/lists.py                    |   0
 .../decoders => decoders}/st25r39xx_spi/pd.py |   0
 .../decoders => decoders}/st7735/__init__.py  |   0
 .../decoders => decoders}/st7735/pd.py        |   0
 .../decoders => decoders}/st7789/__init__.py  |   0
 .../decoders => decoders}/st7789/pd.py        |   0
 .../stepper_motor/__init__.py                 |   0
 .../decoders => decoders}/stepper_motor/pd.py |   0
 .../decoders => decoders}/swd/__init__.py     |   0
 .../decoders => decoders}/swd/pd.py           |   0
 .../decoders => decoders}/swim/__init__.py    |   0
 .../decoders => decoders}/swim/pd.py          |   0
 .../decoders => decoders}/t55xx/__init__.py   |   0
 .../decoders => decoders}/t55xx/pd.py         |   0
 .../tca6408a/__init__.py                      |   0
 .../decoders => decoders}/tca6408a/pd.py      |   0
 .../tdm_audio/__init__.py                     |   0
 .../decoders => decoders}/tdm_audio/pd.py     |   0
 .../decoders => decoders}/timing/__init__.py  |   0
 .../decoders => decoders}/timing/pd.py        |   0
 .../decoders => decoders}/tlc5620/__init__.py |   0
 .../decoders => decoders}/tlc5620/pd.py       |   0
 .../usb_packet/__init__.py                    |   0
 .../decoders => decoders}/usb_packet/pd.py    |   0
 .../usb_power_delivery/__init__.py            |   0
 .../usb_power_delivery/pd.py                  |   0
 .../usb_request/__init__.py                   |   0
 .../decoders => decoders}/usb_request/pd.py   |   0
 .../usb_signalling/__init__.py                |   0
 .../usb_signalling/pd.py                      |   0
 .../decoders => decoders}/wiegand/__init__.py |   0
 .../decoders => decoders}/wiegand/pd.py       |   0
 .../decoders => decoders}/x2444m/__init__.py  |   0
 .../decoders => decoders}/x2444m/pd.py        |   0
 .../decoders => decoders}/xfp/__init__.py     |   0
 .../decoders => decoders}/xfp/pd.py           |   0
 .../decoders => decoders}/xy2-100/__init__.py |   0
 .../decoders => decoders}/xy2-100/pd.py       |   0
 .../decoders => decoders}/z80/__init__.py     |   0
 .../decoders => decoders}/z80/pd.py           |   0
 .../decoders => decoders}/z80/tables.py       |   0
 doc/decoder.txt                               |  28 ++
 libsigrokdecode4DSL/decoder.c                 |  14 +-
 libsigrokdecode4DSL/instance.c                |  15 +-
 libsigrokdecode4DSL/libsigrokdecode.h         |  22 +-
 libsigrokdecode4DSL/session.c                 |   1 +
 libsigrokdecode4DSL/srd.c                     |   3 +-
 libsigrokdecode4DSL/type_decoder.c            | 129 +++++++-
 qtpro/DSView.pro.user                         |   4 +-
 .../tests => test/decode_test}/core.c         |   0
 .../tests => test/decode_test}/decoder.c      |   0
 .../tests => test/decode_test}/inst.c         |   0
 .../tests => test/decode_test}/lib.h          |   0
 .../tests => test/decode_test}/main.c         |   0
 .../tests => test/decode_test}/session.c      |   0
 333 files changed, 489 insertions(+), 274 deletions(-)
 rename {libsigrokdecode4DSL/decoders => decoders}/0-i2c/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/0-i2c/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/0-spi/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/0-spi/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/0-uart/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/0-uart/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/1-i2c/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/1-i2c/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/1-spi/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/1-spi/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/1-uart/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/1-uart/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/a7105/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/a7105/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ac97/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ac97/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ad5626/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ad5626/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ad79x0/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ad79x0/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ade77xx/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ade77xx/lists.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ade77xx/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/adf435x/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/adf435x/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/adns5020/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/adns5020/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/adxl345/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/adxl345/lists.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/adxl345/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/am230x/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/am230x/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/amulet_ascii/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/amulet_ascii/lists.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/amulet_ascii/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/arm_etmv3/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/arm_etmv3/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/arm_itm/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/arm_itm/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/arm_tpiu/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/arm_tpiu/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/atsha204a/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/atsha204a/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/aud/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/aud/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/avr_isp/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/avr_isp/parts.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/avr_isp/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/avr_pdi/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/avr_pdi/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/caliper/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/caliper/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/can/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/can/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/cc1101/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/cc1101/lists.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/cc1101/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/cec/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/cec/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/cec/protocoldata.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/cfp/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/cfp/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/cjtag-oscan0/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/cjtag-oscan0/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/common/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/common/plugtrx/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/common/plugtrx/mod.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/common/sdcard/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/common/sdcard/mod.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/common/srdhelper/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/common/srdhelper/mod.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/counter/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/counter/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/dali/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/dali/lists.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/dali/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/dcf77/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/dcf77/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/dmx512/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/dmx512/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ds1307/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ds1307/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ds2408/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ds2408/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ds243x/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ds243x/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ds28ea00/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ds28ea00/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/dsi/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/dsi/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/edid/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/edid/config (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/edid/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/edid/pnpids.txt (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/eeprom24xx/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/eeprom24xx/lists.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/eeprom24xx/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/eeprom93xx/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/eeprom93xx/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/em4100/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/em4100/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/em4305/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/em4305/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/enc28j60/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/enc28j60/lists.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/enc28j60/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/flexray/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/flexray/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/fsi/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/fsi/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/gpib/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/gpib/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/graycode/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/graycode/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/guess_bitrate/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/guess_bitrate/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/hdcp/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/hdcp/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/i2cdemux/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/i2cdemux/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/i2cfilter/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/i2cfilter/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/i2s/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/i2s/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/iec/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/iec/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ieee488/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ieee488/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ir_irmp/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ir_irmp/irmp_library.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ir_irmp/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ir_nec/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ir_nec/lists.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ir_nec/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ir_rc5/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ir_rc5/lists.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ir_rc5/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ir_rc6/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ir_rc6/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ir_sirc/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ir_sirc/lists.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ir_sirc/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/jitter/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/jitter/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/jtag/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/jtag/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/jtag_ejtag/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/jtag_ejtag/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/jtag_stm32/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/jtag_stm32/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/lfast/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/lfast/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/lin/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/lin/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/lm75/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/lm75/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/lpc/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/lpc/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ltc242x/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ltc242x/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ltc26x7/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ltc26x7/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/maple_bus/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/maple_bus/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/max7219/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/max7219/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/mcs48/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/mcs48/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/mdio/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/mdio/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/microwire/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/microwire/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/midi/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/midi/lists.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/midi/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/miller/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/miller/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/mipi_dsi/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/mipi_dsi/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/mipi_rffe/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/mipi_rffe/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/mlx90614/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/mlx90614/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/modbus/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/modbus/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/morse/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/morse/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/mrf24j40/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/mrf24j40/lists.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/mrf24j40/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/mxc6225xu/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/mxc6225xu/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/nes_gamepad/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/nes_gamepad/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/nrf24l01/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/nrf24l01/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/nrf905/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/nrf905/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/numbers_and_state/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/numbers_and_state/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/nunchuk/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/nunchuk/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/onewire_link/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/onewire_link/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/onewire_network/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/onewire_network/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ook/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ook/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ook_oregon/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ook_oregon/lists.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ook_oregon/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ook_vis/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ook_vis/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/pan1321/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/pan1321/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/parallel/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/parallel/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/pca9571/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/pca9571/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/pjdl/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/pjdl/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/pjon/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/pjon/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ps2/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ps2/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/pwm/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/pwm/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/qi/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/qi/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/qspi/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/qspi/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/rc_encode/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/rc_encode/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/rfm12/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/rfm12/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/rgb_led_spi/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/rgb_led_spi/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/rgb_led_ws281x/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/rgb_led_ws281x/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/rtc8564/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/rtc8564/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/sae_j1850_vpw/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/sae_j1850_vpw/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/sda2506/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/sda2506/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/sdcard_sd/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/sdcard_sd/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/sdcard_spi/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/sdcard_spi/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/sdq/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/sdq/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/seven_segment/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/seven_segment/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/signature/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/signature/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/sipi/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/sipi/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/sle44xx/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/sle44xx/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/spdif/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/spdif/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/spiflash/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/spiflash/lists.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/spiflash/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ssi32/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/ssi32/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/st25r39xx_spi/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/st25r39xx_spi/lists.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/st25r39xx_spi/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/st7735/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/st7735/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/st7789/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/st7789/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/stepper_motor/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/stepper_motor/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/swd/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/swd/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/swim/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/swim/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/t55xx/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/t55xx/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/tca6408a/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/tca6408a/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/tdm_audio/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/tdm_audio/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/timing/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/timing/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/tlc5620/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/tlc5620/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/usb_packet/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/usb_packet/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/usb_power_delivery/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/usb_power_delivery/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/usb_request/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/usb_request/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/usb_signalling/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/usb_signalling/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/wiegand/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/wiegand/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/x2444m/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/x2444m/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/xfp/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/xfp/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/xy2-100/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/xy2-100/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/z80/__init__.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/z80/pd.py (100%)
 rename {libsigrokdecode4DSL/decoders => decoders}/z80/tables.py (100%)
 create mode 100644 doc/decoder.txt
 rename {libsigrokdecode4DSL/tests => test/decode_test}/core.c (100%)
 rename {libsigrokdecode4DSL/tests => test/decode_test}/decoder.c (100%)
 rename {libsigrokdecode4DSL/tests => test/decode_test}/inst.c (100%)
 rename {libsigrokdecode4DSL/tests => test/decode_test}/lib.h (100%)
 rename {libsigrokdecode4DSL/tests => test/decode_test}/main.c (100%)
 rename {libsigrokdecode4DSL/tests => test/decode_test}/session.c (100%)

diff --git a/DSView/pv/data/decode/AnnotationResTable.cpp b/DSView/pv/data/decode/AnnotationResTable.cpp
index 805129f3..f9be9e16 100644
--- a/DSView/pv/data/decode/AnnotationResTable.cpp
+++ b/DSView/pv/data/decode/AnnotationResTable.cpp
@@ -21,36 +21,169 @@
 
 #include "AnnotationResTable.h"
 #include <assert.h>
+#include "../../dsvdef.h"
+
+#define DECODER_MAX_DATA_BLOCK_LEN 25
+#define FORMAT_TMP_BUFFER_SIZE 100
+
+const char g_bin_cvt_table[] = "0000000100100011010001010110011110001001101010111100110111101111";
+char g_bin_format_tmp_buffer[FORMAT_TMP_BUFFER_SIZE + 3];
+char g_oct_format_tmp_buffer[FORMAT_TMP_BUFFER_SIZE + 6];
+char g_number_tmp_64[30];
  
+ char* bin2oct_string(char *buf, int size, const char *bin, int len){
+	char *wr = buf + size - 1;
+	*wr = 0; //end flag
 
-AnnotationResTable::AnnotationResTable(){
-    
+	char *rd = (char*)bin + len - 1; //move to last byte
+	char tmp[3]; 
+
+	while (rd >= bin && wr > buf)
+	{  
+		wr--;
+		int num = 0;
+
+		while (rd >= bin && num < 3)
+		{
+			tmp[2-num] = *rd;			 
+			rd--;
+			num++;
+		}
+
+		//fill
+		while (num < 3)
+		{
+			tmp[2-num] = '0';
+			++num;
+		}		
+
+	    if (strncmp(tmp, "000", 3) == 0)
+			*wr = '0';
+		else if (strncmp(tmp, "001", 3) == 0)
+			*wr = '1';
+		else if (strncmp(tmp, "010", 3) == 0)
+			*wr = '2';
+		else if (strncmp(tmp, "011", 3) == 0)
+			*wr = '3';
+		else if (strncmp(tmp, "100", 3) == 0)
+			*wr = '4';
+		else if (strncmp(tmp, "101", 3) == 0)
+			*wr = '5';
+		else if (strncmp(tmp, "110", 3) == 0)
+			*wr = '6';
+		else if (strncmp(tmp, "111", 3) == 0)
+			*wr = '7';
+	} 
+
+	return wr;
 }
 
-AnnotationResTable::~AnnotationResTable(){
-     
+long long bin2long_string(const char *bin, int len)
+{
+	char *rd = (char *)bin + len - 1; //move to last byte
+	int dex = 0;
+	long long value = 0;
+	long long bv = 0;
+
+    while (rd >= bin)
+	{
+		if (*rd == '1')
+		{
+			bv = 1 << dex;
+			value += bv;
+		}
+		rd--;
+		++dex;
+	}
+
+	return value;
 }
 
-int AnnotationResTable::MakeIndex(const std::string &key, AnnotationStringList *&ls)
+ 
+int AnnotationResTable::MakeIndex(const std::string &key, AnnotationSourceItem* &newItem)
 {   
-    auto fd =m_indexs.find(key);
+    auto fd = m_indexs.find(key);
     if (fd != m_indexs.end()){
         return (*fd).second;
     } 
- 
+  
+    AnnotationSourceItem *item = new AnnotationSourceItem();
+    m_resourceTable.push_back(item);
+
+    item->cur_display_format = -1;
+    item->is_numerical = false;
+    newItem = item;
+   
     int dex = m_indexs.size();
     m_indexs[key] = dex;
-
-    //make a new string vector
-    m_resourceTable.push_back(AnnotationStringList());
-    ls = &m_resourceTable[dex];
-   
     return dex;
 }
 
-const AnnotationStringList& AnnotationResTable::GetString(int index){
-    int num = m_resourceTable.size();
-    assert(index >= 0 && index < num);
+AnnotationSourceItem* AnnotationResTable::GetItem(int index){
+    assert(index >= 0 && index < m_resourceTable.size());
     return m_resourceTable[index];
 }
+
+const char* AnnotationResTable::format_numberic(const char *hex_str, int fmt)
+{
+    assert(hex_str);
+
+    //flow, convert to oct\dec\bin format
+	 const char *data = hex_str;
+	 if (data[0] == 0 || fmt == DecoderDataFormat::hex){
+		 return data;
+	 }
+	
+	 //convert to bin format
+	 char *buf = g_bin_format_tmp_buffer + FORMAT_TMP_BUFFER_SIZE;
+	 *(buf + 1) = 0; //set the end flag
+	 *buf = 0;
+
+	 int len = strlen(data);
+	  //buffer is not enough
+	 if (len > DECODER_MAX_DATA_BLOCK_LEN){
+		 return data;
+	 }
+
+     char *rd = (char*)data + len - 1; //move to last byte
+	 char c = 0;
+	 int dex = 0;
+
+	 while (rd >= data)
+	 {
+		 c = *rd;
+		 dex = (int)(c <= '9' ? (c - '0') : (c - 'A' + 10));
+         char *ptable = (char*)g_bin_cvt_table + dex * 4;
+
+		 buf -= 4; //move to left for 4 bytes
+		 buf[0] = ptable[0];
+		 buf[1] = ptable[1];
+		 buf[2] = ptable[2];
+		 buf[3] = ptable[3];
+	
+		 rd--;
+	 } 
+
+	 //get bin format 
+	 if (fmt == DecoderDataFormat::bin){
+		  return buf;
+	 }
+
+	 //get oct format
+	 if (fmt == DecoderDataFormat::oct){
+		 char *oct_buf = bin2oct_string(g_oct_format_tmp_buffer, 
+		                  sizeof(g_oct_format_tmp_buffer), buf,  len * 4);
+		 return oct_buf;
+	 }
+
+	//64 bit integer
+	 if (fmt == DecoderDataFormat::dec && len * 4 <= 64){
+         long long lv = bin2long_string(buf, len *4);
+		 g_number_tmp_64[0] = 0;
+    	 sprintf(g_number_tmp_64, "%lld", lv);
+         return g_number_tmp_64;
+	 }
+
+    return data;    
+}
  
diff --git a/DSView/pv/data/decode/AnnotationResTable.h b/DSView/pv/data/decode/AnnotationResTable.h
index 21639ae5..3d6ea3ed 100644
--- a/DSView/pv/data/decode/AnnotationResTable.h
+++ b/DSView/pv/data/decode/AnnotationResTable.h
@@ -26,23 +26,27 @@
 #include <vector>
 #include <QString>
 
-typedef std::vector<QString> AnnotationStringList;
+struct AnnotationSourceItem
+{
+    bool    is_numerical;
+    char    str_number_hex[18]; //numerical value hex format string
+    std::vector<QString> src_lines; //the origin source string lines
+    std::vector<QString> cvt_lines; //the converted to bin/hex/oct format string lines
+    int     cur_display_format; //current format  as bin/ex/oct..., init with -1
+};
  
-class AnnotationResTable{
-
+class AnnotationResTable
+{ 
     public:
-       AnnotationResTable();
+       int MakeIndex(const std::string &key, AnnotationSourceItem* &newItem);
+       AnnotationSourceItem* GetItem(int index);
 
-       ~AnnotationResTable();
+       inline int GetCount(){
+           return m_resourceTable.size();} 
 
-       int MakeIndex(const std::string &key, AnnotationStringList *&ls);
-
-       const AnnotationStringList& GetString(int index);
-
-       inline int GetCount(){return m_resourceTable.size();}
- 
+       static const char* format_numberic(const char *hex_str, int fmt);
 
     private:
-        std::map<std::string, int> m_indexs;
-        std::vector<AnnotationStringList> m_resourceTable;
+        std::map<std::string, int>          m_indexs;
+        std::vector<AnnotationSourceItem*>  m_resourceTable;
 };
\ No newline at end of file
diff --git a/DSView/pv/data/decode/annotation.cpp b/DSView/pv/data/decode/annotation.cpp
index 1949e0ec..87c97c65 100755
--- a/DSView/pv/data/decode/annotation.cpp
+++ b/DSView/pv/data/decode/annotation.cpp
@@ -32,134 +32,84 @@
 #include "../../config/appconfig.h"
 #include "decoderstatus.h"
 #include "../../dsvdef.h"
+ 
+ //a find talbe instance
+AnnotationResTable annTable;
+char sz_format_tmp_buf[50];
 
-#define DECODER_MAX_DATA_BLOCK_LEN 300
-#define FORMAT_TMP_BUFFER_SIZE 1200
+bool is_hex_number_str(const char *str)
+{ 
+	char c = *str;
 
-const char g_bin_cvt_table[] = "0000000100100011010001010110011110001001101010111100110111101111";
-char g_bin_format_tmp_buffer[FORMAT_TMP_BUFFER_SIZE + 3];
-char g_oct_format_tmp_buffer[FORMAT_TMP_BUFFER_SIZE + 6];
-std::vector<QString> g_format_ret_vector;
-
-char* bin2oct_string(char *buf, int size, const char *bin, int len){
-	char *wr = buf + size - 1;
-	*wr = 0; //end flag
-
-	char *rd = (char*)bin + len - 1; //move to last byte
-
-	char tmp[3]; 
-
-	while (rd >= bin && wr > buf)
-	{  
-		wr--;
-
-		int num = 0;
-
-		while (rd >= bin && num < 3)
-		{
-			tmp[2-num] = *rd;			 
-			rd--;
-			num++;
-		}
-
-		//fill
-		while (num < 3)
-		{
-			tmp[2-num] = '0';
-			++num;
-		}
-		
-
-	    if (strncmp(tmp, "000", 3) == 0)
-			*wr = '0';
-		else if (strncmp(tmp, "001", 3) == 0)
-			*wr = '1';
-		else if (strncmp(tmp, "010", 3) == 0)
-			*wr = '2';
-		else if (strncmp(tmp, "011", 3) == 0)
-			*wr = '3';
-		else if (strncmp(tmp, "100", 3) == 0)
-			*wr = '4';
-		else if (strncmp(tmp, "101", 3) == 0)
-			*wr = '5';
-		else if (strncmp(tmp, "110", 3) == 0)
-			*wr = '6';
-		else if (strncmp(tmp, "111", 3) == 0)
-			*wr = '7';
-	} 
-
-	return wr;
-}
-
-long long bin2long_string(const char *bin, int len)
-{
-	char *rd = (char *)bin + len - 1; //move to last byte
-	int dex = 0;
-	long long value = 0;
-	long long bv = 0;
-
-    while (rd >= bin)
+	while (c)
 	{
-		if (*rd == '1')
-		{
-			bv = 1 << dex;
-			value += bv;
+		if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F')){
+			c = *str;
+			str++;
+			continue;
 		}
-		rd--;
-		++dex;
+		return false;		
 	}
-
-	return value;
+	
+	return true;
 }
 
 namespace pv {
 namespace data {
 namespace decode {
-
-//a find talbe instance
-AnnotationResTable *Annotation::m_resTable = new AnnotationResTable();
-
-Annotation::Annotation(const srd_proto_data *const pdata, DecoderStatus *status) :
-	_start_sample(pdata->start_sample),
-	_end_sample(pdata->end_sample)
+ 
+Annotation::Annotation(const srd_proto_data *const pdata, DecoderStatus *status)
 {
 	assert(pdata);
 	const srd_proto_data_annotation *const pda =
 		(const srd_proto_data_annotation*)pdata->data;
 	assert(pda);
 
-    _format = pda->ann_class;
-    _type = pda->ann_type;
-	_status = status;
-
-	//have numerical
-	if (_type >= 100 && _type < 200){
-		 status->m_bNumerical = true;
-	}
-
-	_strIndex = 0;
-
-	std::string key; 
+	_start_sample =	pdata->start_sample;
+	_end_sample	  =	pdata->end_sample;
+	_format 	= pda->ann_class;
+    _type 		= pda->ann_type;
+	_resIndex 	= 0;
+	_status 	= status;
+ 
 	//make resource find key
-    const char *const *annotations = (char**)pda->ann_text;
-    while(*annotations) { 
-        const char *ptr = *annotations;
-		key.append(ptr, strlen(ptr));
+	std::string key;
+
+    char **annotations = pda->ann_text;
+    while(annotations && *annotations) {
+		key.append(*annotations, strlen(*annotations));
 		annotations++;  
 	}
-
-	AnnotationStringList *annotationArray = NULL;
-    _strIndex = Annotation::m_resTable->MakeIndex(key, annotationArray);
+	
+	if (pda->str_number_hex[0]){
+		//append numeric string
+		key.append(pda->str_number_hex, strlen(pda->str_number_hex));
+	}
+ 
+	AnnotationSourceItem *resItem = NULL;
+    _resIndex = annTable.MakeIndex(key, resItem);
      
-     //save new string lines
-	if (annotationArray){
-        annotations = (char **)pda->ann_text;
-		while (*annotations)
-		{
-			annotationArray->push_back(QString::fromUtf8(*annotations));
-			annotations++;
+     //is a new item
+	if (resItem != NULL){ 
+        char **annotations = pda->ann_text;
+    	while(annotations && *annotations) {
+			resItem->src_lines.push_back(QString::fromUtf8(*annotations));
+			annotations++;  
 		}
-	} 
+
+		//get numerical data
+		if (pda->str_number_hex[0]){
+			strcpy(resItem->str_number_hex, pda->str_number_hex);
+			resItem->is_numerical = true;
+		}
+		else if (resItem->src_lines.size() == 1 && _type >= 100 && _type < 200){
+			if (is_hex_number_str(resItem->src_lines[0].toLatin1().data())){
+              	resItem->is_numerical = true;
+			}
+		}
+
+		_status->m_bNumerical |= resItem->is_numerical;
+	}
 }
 
 Annotation::Annotation()
@@ -172,93 +122,52 @@ Annotation::~Annotation()
 {
      
 }
- 
- 
-
+  
 const std::vector<QString>& Annotation::annotations() const
 {
 	 assert(_status);
-
-     int fmt = _status->m_format;
-     const std::vector<QString>& vct = Annotation::m_resTable->GetString(_strIndex);
-
-     if (!(_type >= 100 && _type < 200) || fmt == DecoderDataFormat::ascii || fmt == DecoderDataFormat::hex){
-        return vct;
+ 
+     AnnotationSourceItem &resItem = *annTable.GetItem(_resIndex);
+ 
+	//get origin data, is not a numberical value
+     if (!resItem.is_numerical){
+        return resItem.src_lines;
      }
-	 if (vct.size() != 1){
-		 return vct;
+  
+	 if (resItem.cur_display_format !=  _status->m_format){
+		 resItem.cur_display_format = _status->m_format;
+		 resItem.cvt_lines.clear();
+
+		 if (resItem.src_lines.size() > 0)
+		 {
+			 for (QString &rd_src : resItem.src_lines)
+			 {
+				 if (resItem.str_number_hex[0] != 0)
+				 {
+					 QString src = rd_src.replace("{$}", "%s");
+					 const char *num_str = AnnotationResTable::format_numberic(resItem.str_number_hex, resItem.cur_display_format);
+					 sprintf(sz_format_tmp_buf, src.toLatin1().data(), num_str);
+					 resItem.cvt_lines.push_back(QString(sz_format_tmp_buf));
+				 }
+				 else
+				 {
+					 const char *src_str = rd_src.toLatin1().data();
+					 const char *num_str = AnnotationResTable::format_numberic(src_str, resItem.cur_display_format);
+					 if (src_str != num_str)
+						 resItem.cvt_lines.push_back(QString(num_str));
+					 else
+						 resItem.cvt_lines.push_back(QString(rd_src));
+				 }
+			 }
+		 }
+		 else{
+			 const char *num_str = AnnotationResTable::format_numberic(resItem.str_number_hex, resItem.cur_display_format);
+			 resItem.cvt_lines.push_back(QString(num_str));
+		 }
 	 }
 
-	 //flow, convert to oct\dec\bin format
-	 const char *data = vct[0].toStdString().c_str();
-	 if (*data == 0 || *data == '['){
-		 return vct;
-	 }
-	
-	 //convert to bin format
-	 char *buf = g_bin_format_tmp_buffer + FORMAT_TMP_BUFFER_SIZE;
-	 *(buf + 1) = 0; //set the end flag
-	 *buf = 0;
-
-	 int len = strlen(data);
-	  //buffer is not enough
-	 if (len > DECODER_MAX_DATA_BLOCK_LEN){
-		 return vct;
-	 }
-
-     char *rd = (char*)data + len - 1; //move to last byte
-	 char c = 0;
-	 int dex = 0;
-
-	 while (rd >= data)
-	 {
-		 c = *rd;
-		 dex = (int)(c <= '9' ? (c - '0') : (c - 'A' + 10));
-         char *ptable = (char*)g_bin_cvt_table + dex * 4;
-
-		 buf -= 4; //move to left for 4 bytes
-		 buf[0] = ptable[0];
-		 buf[1] = ptable[1];
-		 buf[2] = ptable[2];
-		 buf[3] = ptable[3];
-	
-		 rd--;
-	 }
-	 
-	 std::vector<QString> &vct2 = g_format_ret_vector;
-	 if (vct2.size() == 0){
-		 vct2.push_back(QString());
-	 }
-
-	 //get bin format 
-	 if (fmt == DecoderDataFormat::bin){
-		 vct2[0].clear();
-		 vct2[0].append(buf);
-		 return vct2;
-	 }
-
-	 //get oct format
-	 if (fmt == DecoderDataFormat::oct){
-		 char *oct_buf = bin2oct_string(g_oct_format_tmp_buffer, 
-		                  sizeof(g_oct_format_tmp_buffer), buf,  len * 4);
-		 vct2[0].clear();
-		 vct2[0].append(oct_buf);
-		 return vct2;
-	 }
-
-	//64 bit integer
-	 if (fmt == DecoderDataFormat::dec && len * 4 <= 64){
-         long long lv = bin2long_string(buf, len *4);
-		 char vbuf[30] = {0};
-    	 sprintf(vbuf, "%lld", lv);
-
-		 vct2[0].clear();
-		 vct2[0].append(vbuf);
-		 return vct2;
-	 }
-
-	 return vct2;
-} 
+	return resItem.cvt_lines;
+}                   
  
 
 } // namespace decode
diff --git a/DSView/pv/data/decode/annotation.h b/DSView/pv/data/decode/annotation.h
index 2e8d359e..f2025776 100755
--- a/DSView/pv/data/decode/annotation.h
+++ b/DSView/pv/data/decode/annotation.h
@@ -66,14 +66,12 @@ public:
 	const std::vector<QString>& annotations() const;
 
 private:
-	uint64_t _start_sample;
-	uint64_t _end_sample;
-	short 	_format;
-    short 	_type; //100-199: is a numerical value type,can show hex/oct format
-	short 	_strIndex;
-	DecoderStatus *_status;
- 
-	static AnnotationResTable *  m_resTable;
+	uint64_t 		_start_sample;
+	uint64_t 		_end_sample;
+	short 			_format;
+	short 			_type;
+	short 			_resIndex;
+	DecoderStatus 	*_status; /*a global variable*/
 };
 
 } // namespace decode
diff --git a/DSView/pv/data/decode/decoder.cpp b/DSView/pv/data/decode/decoder.cpp
index 4c2e80f0..81e4f1c7 100755
--- a/DSView/pv/data/decode/decoder.cpp
+++ b/DSView/pv/data/decode/decoder.cpp
@@ -127,9 +127,7 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session)
 	GHashTable *const probes = g_hash_table_new_full(g_str_hash,
 		g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
 
-    for(std::map<const srd_channel*, int>::
-		const_iterator i = _probes.begin();
-		i != _probes.end(); i++)
+    for(auto i = _probes.begin(); i != _probes.end(); i++)
 	{
         GVariant *const gvar = g_variant_new_int32((*i).second);
 		g_variant_ref_sink(gvar);
diff --git a/DSView/pv/data/decoderstack.cpp b/DSView/pv/data/decoderstack.cpp
index 9a32a7ab..7b7f3930 100755
--- a/DSView/pv/data/decoderstack.cpp
+++ b/DSView/pv/data/decoderstack.cpp
@@ -463,6 +463,8 @@ void DecoderStack::decode_data(const uint64_t decode_start, const uint64_t decod
 {
     decode_task_status *status = _stask_stauts;    
 
+   // qDebug()<<"decode start:"<<decode_start<<",  decode end:"<<decode_end;
+
     //uint8_t *chunk = NULL;
     uint64_t last_cnt = 0;
     uint64_t notify_cnt = (decode_end - decode_start + 1)/100;
@@ -530,6 +532,7 @@ void DecoderStack::decode_data(const uint64_t decode_start, const uint64_t decod
 
         i = chunk_end;
 
+        //use mutex
         {
             std::lock_guard<std::mutex> lock(_output_mutex);
             _samples_decoded = i - decode_start + 1;
diff --git a/DSView/pv/dock/protocoldock.cpp b/DSView/pv/dock/protocoldock.cpp
index 28cf86b0..9a49da9c 100755
--- a/DSView/pv/dock/protocoldock.cpp
+++ b/DSView/pv/dock/protocoldock.cpp
@@ -484,6 +484,8 @@ void ProtocolDock::item_clicked(const QModelIndex &index)
 
             decoder_stack->set_mark_index((ann.start_sample()+ann.end_sample())/2);
             _session->show_region(ann.start_sample(), ann.end_sample(), false);
+
+           // qDebug()<<ann.annotations().at(0)<<"type:"<<ann.type();
         }
     }
     _table_view->resizeRowToContents(index.row());
@@ -652,31 +654,44 @@ void ProtocolDock::search_nxt()
         _cur_search_index = -1;
         return;
     }
+
     int i = 0;
     uint64_t rowCount = _model_proxy.rowCount();
     QModelIndex matchingIndex;
     pv::data::DecoderModel *decoder_model = _session->get_decoder_model();
+    auto decoder_stack = decoder_model->getDecoderStack();
+
+    if (decoder_stack == NULL){
+        qDebug()<<"decoder_stack is null";
+        return;
+    }  
 
-   auto decoder_stack = decoder_model->getDecoderStack();
     do {
         _cur_search_index++;
         if (_cur_search_index < 0 || _cur_search_index >= _model_proxy.rowCount())
             _cur_search_index = 0;
 
         matchingIndex = _model_proxy.mapToSource(_model_proxy.index(floor(_cur_search_index),_model_proxy.filterKeyColumn()));
-        if (!decoder_stack || !matchingIndex.isValid())
+        
+        if (!matchingIndex.isValid())
             break;
+
+      //  qDebug()<<"row:"<<matchingIndex.row();
+
         i = 1;
         uint64_t row = matchingIndex.row() + 1;
         uint64_t col = matchingIndex.column();
         pv::data::decode::Annotation ann;
         bool ann_valid;
+
         while(i < _str_list.size()) {
             QString nxt = _str_list.at(i);
             do {
                 ann_valid = decoder_stack->list_annotation(ann, col, row);
                 row++;
             }while(ann_valid && (ann.type() < 100 || ann.type() > 999));
+
+            auto strlist = ann.annotations();
             QString source = ann.annotations().at(0);
             if (ann_valid && source.contains(nxt))
                 i++;
@@ -748,7 +763,6 @@ void ProtocolDock::search_update()
         search_done();
     }
     _search_edited = false;
-    //search_done();
 }
 
  //-------------------IProtocolItemLayerCallback
diff --git a/DSView/pv/dock/protocoldock.h b/DSView/pv/dock/protocoldock.h
index 2fc198e1..c01245f0 100755
--- a/DSView/pv/dock/protocoldock.h
+++ b/DSView/pv/dock/protocoldock.h
@@ -117,7 +117,7 @@ private:
     SigSession *_session;
     view::View &_view;
     QSortFilterProxyModel _model_proxy;
-    double _cur_search_index;
+    int _cur_search_index;
     QStringList _str_list;
 
     QSplitter *_split_widget;
diff --git a/DSView/pv/dock/protocolitemlayer.cpp b/DSView/pv/dock/protocolitemlayer.cpp
index 4dfe4cfb..784c2a19 100644
--- a/DSView/pv/dock/protocolitemlayer.cpp
+++ b/DSView/pv/dock/protocolitemlayer.cpp
@@ -120,20 +120,14 @@ void ProtocolItemLayer::LoadFormatSelect(bool bSingle)
     m_singleFlag = bSingle;
 
     m_bSetting = true;
-    _format_combox->clear();
-    _format_combox->addItem("ascii");
-    int dex = 0;
+    _format_combox->clear(); 
 
-    if (!bSingle)
-    {
-        _format_combox->addItem("dec");
-        _format_combox->addItem("hex");
-        _format_combox->addItem("oct");
-        _format_combox->addItem("bin");
-        dex = 2;
-    }
+    _format_combox->addItem("hex");
+    _format_combox->addItem("dec");       
+    _format_combox->addItem("oct");
+    _format_combox->addItem("bin");
     
-    _format_combox->setCurrentIndex(dex);
+    _format_combox->setCurrentIndex(0);
     m_bSetting = false;
 }
 
diff --git a/DSView/pv/dsvdef.cpp b/DSView/pv/dsvdef.cpp
index 0ad7c4ef..35c57072 100644
--- a/DSView/pv/dsvdef.cpp
+++ b/DSView/pv/dsvdef.cpp
@@ -41,9 +41,6 @@
 namespace DecoderDataFormat
 {
       int Parse(const char *name){
-        if (strcmp(name, "ascii") == 0){
-            return (int)ascii;
-        }
         if (strcmp(name, "dec") == 0){
             return (int)dec;
         }
@@ -56,7 +53,7 @@ namespace DecoderDataFormat
          if (strcmp(name, "bin") == 0){
             return (int)bin;
         }
-        return (int)ascii;
+        return (int)hex;
     }
 }
 
diff --git a/DSView/pv/dsvdef.h b/DSView/pv/dsvdef.h
index b2b26002..fc209a79 100644
--- a/DSView/pv/dsvdef.h
+++ b/DSView/pv/dsvdef.h
@@ -49,9 +49,8 @@ namespace DecoderDataFormat
 {
     enum _data_format
     {
-        ascii = 0,
-        dec,
         hex,
+        dec,       
         oct,
         bin
     };
diff --git a/libsigrokdecode4DSL/decoders/0-i2c/__init__.py b/decoders/0-i2c/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/0-i2c/__init__.py
rename to decoders/0-i2c/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/0-i2c/pd.py b/decoders/0-i2c/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/0-i2c/pd.py
rename to decoders/0-i2c/pd.py
diff --git a/libsigrokdecode4DSL/decoders/0-spi/__init__.py b/decoders/0-spi/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/0-spi/__init__.py
rename to decoders/0-spi/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/0-spi/pd.py b/decoders/0-spi/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/0-spi/pd.py
rename to decoders/0-spi/pd.py
diff --git a/libsigrokdecode4DSL/decoders/0-uart/__init__.py b/decoders/0-uart/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/0-uart/__init__.py
rename to decoders/0-uart/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/0-uart/pd.py b/decoders/0-uart/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/0-uart/pd.py
rename to decoders/0-uart/pd.py
diff --git a/libsigrokdecode4DSL/decoders/1-i2c/__init__.py b/decoders/1-i2c/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/1-i2c/__init__.py
rename to decoders/1-i2c/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/1-i2c/pd.py b/decoders/1-i2c/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/1-i2c/pd.py
rename to decoders/1-i2c/pd.py
diff --git a/libsigrokdecode4DSL/decoders/1-spi/__init__.py b/decoders/1-spi/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/1-spi/__init__.py
rename to decoders/1-spi/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/1-spi/pd.py b/decoders/1-spi/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/1-spi/pd.py
rename to decoders/1-spi/pd.py
diff --git a/libsigrokdecode4DSL/decoders/1-uart/__init__.py b/decoders/1-uart/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/1-uart/__init__.py
rename to decoders/1-uart/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/1-uart/pd.py b/decoders/1-uart/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/1-uart/pd.py
rename to decoders/1-uart/pd.py
diff --git a/libsigrokdecode4DSL/decoders/a7105/__init__.py b/decoders/a7105/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/a7105/__init__.py
rename to decoders/a7105/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/a7105/pd.py b/decoders/a7105/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/a7105/pd.py
rename to decoders/a7105/pd.py
diff --git a/libsigrokdecode4DSL/decoders/ac97/__init__.py b/decoders/ac97/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ac97/__init__.py
rename to decoders/ac97/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/ac97/pd.py b/decoders/ac97/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ac97/pd.py
rename to decoders/ac97/pd.py
diff --git a/libsigrokdecode4DSL/decoders/ad5626/__init__.py b/decoders/ad5626/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ad5626/__init__.py
rename to decoders/ad5626/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/ad5626/pd.py b/decoders/ad5626/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ad5626/pd.py
rename to decoders/ad5626/pd.py
diff --git a/libsigrokdecode4DSL/decoders/ad79x0/__init__.py b/decoders/ad79x0/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ad79x0/__init__.py
rename to decoders/ad79x0/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/ad79x0/pd.py b/decoders/ad79x0/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ad79x0/pd.py
rename to decoders/ad79x0/pd.py
diff --git a/libsigrokdecode4DSL/decoders/ade77xx/__init__.py b/decoders/ade77xx/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ade77xx/__init__.py
rename to decoders/ade77xx/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/ade77xx/lists.py b/decoders/ade77xx/lists.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ade77xx/lists.py
rename to decoders/ade77xx/lists.py
diff --git a/libsigrokdecode4DSL/decoders/ade77xx/pd.py b/decoders/ade77xx/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ade77xx/pd.py
rename to decoders/ade77xx/pd.py
diff --git a/libsigrokdecode4DSL/decoders/adf435x/__init__.py b/decoders/adf435x/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/adf435x/__init__.py
rename to decoders/adf435x/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/adf435x/pd.py b/decoders/adf435x/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/adf435x/pd.py
rename to decoders/adf435x/pd.py
diff --git a/libsigrokdecode4DSL/decoders/adns5020/__init__.py b/decoders/adns5020/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/adns5020/__init__.py
rename to decoders/adns5020/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/adns5020/pd.py b/decoders/adns5020/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/adns5020/pd.py
rename to decoders/adns5020/pd.py
diff --git a/libsigrokdecode4DSL/decoders/adxl345/__init__.py b/decoders/adxl345/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/adxl345/__init__.py
rename to decoders/adxl345/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/adxl345/lists.py b/decoders/adxl345/lists.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/adxl345/lists.py
rename to decoders/adxl345/lists.py
diff --git a/libsigrokdecode4DSL/decoders/adxl345/pd.py b/decoders/adxl345/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/adxl345/pd.py
rename to decoders/adxl345/pd.py
diff --git a/libsigrokdecode4DSL/decoders/am230x/__init__.py b/decoders/am230x/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/am230x/__init__.py
rename to decoders/am230x/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/am230x/pd.py b/decoders/am230x/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/am230x/pd.py
rename to decoders/am230x/pd.py
diff --git a/libsigrokdecode4DSL/decoders/amulet_ascii/__init__.py b/decoders/amulet_ascii/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/amulet_ascii/__init__.py
rename to decoders/amulet_ascii/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/amulet_ascii/lists.py b/decoders/amulet_ascii/lists.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/amulet_ascii/lists.py
rename to decoders/amulet_ascii/lists.py
diff --git a/libsigrokdecode4DSL/decoders/amulet_ascii/pd.py b/decoders/amulet_ascii/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/amulet_ascii/pd.py
rename to decoders/amulet_ascii/pd.py
diff --git a/libsigrokdecode4DSL/decoders/arm_etmv3/__init__.py b/decoders/arm_etmv3/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/arm_etmv3/__init__.py
rename to decoders/arm_etmv3/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/arm_etmv3/pd.py b/decoders/arm_etmv3/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/arm_etmv3/pd.py
rename to decoders/arm_etmv3/pd.py
diff --git a/libsigrokdecode4DSL/decoders/arm_itm/__init__.py b/decoders/arm_itm/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/arm_itm/__init__.py
rename to decoders/arm_itm/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/arm_itm/pd.py b/decoders/arm_itm/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/arm_itm/pd.py
rename to decoders/arm_itm/pd.py
diff --git a/libsigrokdecode4DSL/decoders/arm_tpiu/__init__.py b/decoders/arm_tpiu/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/arm_tpiu/__init__.py
rename to decoders/arm_tpiu/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/arm_tpiu/pd.py b/decoders/arm_tpiu/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/arm_tpiu/pd.py
rename to decoders/arm_tpiu/pd.py
diff --git a/libsigrokdecode4DSL/decoders/atsha204a/__init__.py b/decoders/atsha204a/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/atsha204a/__init__.py
rename to decoders/atsha204a/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/atsha204a/pd.py b/decoders/atsha204a/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/atsha204a/pd.py
rename to decoders/atsha204a/pd.py
diff --git a/libsigrokdecode4DSL/decoders/aud/__init__.py b/decoders/aud/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/aud/__init__.py
rename to decoders/aud/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/aud/pd.py b/decoders/aud/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/aud/pd.py
rename to decoders/aud/pd.py
diff --git a/libsigrokdecode4DSL/decoders/avr_isp/__init__.py b/decoders/avr_isp/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/avr_isp/__init__.py
rename to decoders/avr_isp/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/avr_isp/parts.py b/decoders/avr_isp/parts.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/avr_isp/parts.py
rename to decoders/avr_isp/parts.py
diff --git a/libsigrokdecode4DSL/decoders/avr_isp/pd.py b/decoders/avr_isp/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/avr_isp/pd.py
rename to decoders/avr_isp/pd.py
diff --git a/libsigrokdecode4DSL/decoders/avr_pdi/__init__.py b/decoders/avr_pdi/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/avr_pdi/__init__.py
rename to decoders/avr_pdi/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/avr_pdi/pd.py b/decoders/avr_pdi/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/avr_pdi/pd.py
rename to decoders/avr_pdi/pd.py
diff --git a/libsigrokdecode4DSL/decoders/caliper/__init__.py b/decoders/caliper/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/caliper/__init__.py
rename to decoders/caliper/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/caliper/pd.py b/decoders/caliper/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/caliper/pd.py
rename to decoders/caliper/pd.py
diff --git a/libsigrokdecode4DSL/decoders/can/__init__.py b/decoders/can/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/can/__init__.py
rename to decoders/can/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/can/pd.py b/decoders/can/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/can/pd.py
rename to decoders/can/pd.py
diff --git a/libsigrokdecode4DSL/decoders/cc1101/__init__.py b/decoders/cc1101/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/cc1101/__init__.py
rename to decoders/cc1101/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/cc1101/lists.py b/decoders/cc1101/lists.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/cc1101/lists.py
rename to decoders/cc1101/lists.py
diff --git a/libsigrokdecode4DSL/decoders/cc1101/pd.py b/decoders/cc1101/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/cc1101/pd.py
rename to decoders/cc1101/pd.py
diff --git a/libsigrokdecode4DSL/decoders/cec/__init__.py b/decoders/cec/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/cec/__init__.py
rename to decoders/cec/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/cec/pd.py b/decoders/cec/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/cec/pd.py
rename to decoders/cec/pd.py
diff --git a/libsigrokdecode4DSL/decoders/cec/protocoldata.py b/decoders/cec/protocoldata.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/cec/protocoldata.py
rename to decoders/cec/protocoldata.py
diff --git a/libsigrokdecode4DSL/decoders/cfp/__init__.py b/decoders/cfp/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/cfp/__init__.py
rename to decoders/cfp/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/cfp/pd.py b/decoders/cfp/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/cfp/pd.py
rename to decoders/cfp/pd.py
diff --git a/libsigrokdecode4DSL/decoders/cjtag-oscan0/__init__.py b/decoders/cjtag-oscan0/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/cjtag-oscan0/__init__.py
rename to decoders/cjtag-oscan0/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/cjtag-oscan0/pd.py b/decoders/cjtag-oscan0/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/cjtag-oscan0/pd.py
rename to decoders/cjtag-oscan0/pd.py
diff --git a/libsigrokdecode4DSL/decoders/common/__init__.py b/decoders/common/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/common/__init__.py
rename to decoders/common/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/common/plugtrx/__init__.py b/decoders/common/plugtrx/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/common/plugtrx/__init__.py
rename to decoders/common/plugtrx/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/common/plugtrx/mod.py b/decoders/common/plugtrx/mod.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/common/plugtrx/mod.py
rename to decoders/common/plugtrx/mod.py
diff --git a/libsigrokdecode4DSL/decoders/common/sdcard/__init__.py b/decoders/common/sdcard/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/common/sdcard/__init__.py
rename to decoders/common/sdcard/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/common/sdcard/mod.py b/decoders/common/sdcard/mod.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/common/sdcard/mod.py
rename to decoders/common/sdcard/mod.py
diff --git a/libsigrokdecode4DSL/decoders/common/srdhelper/__init__.py b/decoders/common/srdhelper/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/common/srdhelper/__init__.py
rename to decoders/common/srdhelper/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/common/srdhelper/mod.py b/decoders/common/srdhelper/mod.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/common/srdhelper/mod.py
rename to decoders/common/srdhelper/mod.py
diff --git a/libsigrokdecode4DSL/decoders/counter/__init__.py b/decoders/counter/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/counter/__init__.py
rename to decoders/counter/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/counter/pd.py b/decoders/counter/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/counter/pd.py
rename to decoders/counter/pd.py
diff --git a/libsigrokdecode4DSL/decoders/dali/__init__.py b/decoders/dali/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/dali/__init__.py
rename to decoders/dali/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/dali/lists.py b/decoders/dali/lists.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/dali/lists.py
rename to decoders/dali/lists.py
diff --git a/libsigrokdecode4DSL/decoders/dali/pd.py b/decoders/dali/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/dali/pd.py
rename to decoders/dali/pd.py
diff --git a/libsigrokdecode4DSL/decoders/dcf77/__init__.py b/decoders/dcf77/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/dcf77/__init__.py
rename to decoders/dcf77/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/dcf77/pd.py b/decoders/dcf77/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/dcf77/pd.py
rename to decoders/dcf77/pd.py
diff --git a/libsigrokdecode4DSL/decoders/dmx512/__init__.py b/decoders/dmx512/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/dmx512/__init__.py
rename to decoders/dmx512/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/dmx512/pd.py b/decoders/dmx512/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/dmx512/pd.py
rename to decoders/dmx512/pd.py
diff --git a/libsigrokdecode4DSL/decoders/ds1307/__init__.py b/decoders/ds1307/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ds1307/__init__.py
rename to decoders/ds1307/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/ds1307/pd.py b/decoders/ds1307/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ds1307/pd.py
rename to decoders/ds1307/pd.py
diff --git a/libsigrokdecode4DSL/decoders/ds2408/__init__.py b/decoders/ds2408/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ds2408/__init__.py
rename to decoders/ds2408/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/ds2408/pd.py b/decoders/ds2408/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ds2408/pd.py
rename to decoders/ds2408/pd.py
diff --git a/libsigrokdecode4DSL/decoders/ds243x/__init__.py b/decoders/ds243x/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ds243x/__init__.py
rename to decoders/ds243x/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/ds243x/pd.py b/decoders/ds243x/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ds243x/pd.py
rename to decoders/ds243x/pd.py
diff --git a/libsigrokdecode4DSL/decoders/ds28ea00/__init__.py b/decoders/ds28ea00/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ds28ea00/__init__.py
rename to decoders/ds28ea00/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/ds28ea00/pd.py b/decoders/ds28ea00/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ds28ea00/pd.py
rename to decoders/ds28ea00/pd.py
diff --git a/libsigrokdecode4DSL/decoders/dsi/__init__.py b/decoders/dsi/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/dsi/__init__.py
rename to decoders/dsi/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/dsi/pd.py b/decoders/dsi/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/dsi/pd.py
rename to decoders/dsi/pd.py
diff --git a/libsigrokdecode4DSL/decoders/edid/__init__.py b/decoders/edid/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/edid/__init__.py
rename to decoders/edid/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/edid/config b/decoders/edid/config
similarity index 100%
rename from libsigrokdecode4DSL/decoders/edid/config
rename to decoders/edid/config
diff --git a/libsigrokdecode4DSL/decoders/edid/pd.py b/decoders/edid/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/edid/pd.py
rename to decoders/edid/pd.py
diff --git a/libsigrokdecode4DSL/decoders/edid/pnpids.txt b/decoders/edid/pnpids.txt
similarity index 100%
rename from libsigrokdecode4DSL/decoders/edid/pnpids.txt
rename to decoders/edid/pnpids.txt
diff --git a/libsigrokdecode4DSL/decoders/eeprom24xx/__init__.py b/decoders/eeprom24xx/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/eeprom24xx/__init__.py
rename to decoders/eeprom24xx/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/eeprom24xx/lists.py b/decoders/eeprom24xx/lists.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/eeprom24xx/lists.py
rename to decoders/eeprom24xx/lists.py
diff --git a/libsigrokdecode4DSL/decoders/eeprom24xx/pd.py b/decoders/eeprom24xx/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/eeprom24xx/pd.py
rename to decoders/eeprom24xx/pd.py
diff --git a/libsigrokdecode4DSL/decoders/eeprom93xx/__init__.py b/decoders/eeprom93xx/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/eeprom93xx/__init__.py
rename to decoders/eeprom93xx/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/eeprom93xx/pd.py b/decoders/eeprom93xx/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/eeprom93xx/pd.py
rename to decoders/eeprom93xx/pd.py
diff --git a/libsigrokdecode4DSL/decoders/em4100/__init__.py b/decoders/em4100/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/em4100/__init__.py
rename to decoders/em4100/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/em4100/pd.py b/decoders/em4100/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/em4100/pd.py
rename to decoders/em4100/pd.py
diff --git a/libsigrokdecode4DSL/decoders/em4305/__init__.py b/decoders/em4305/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/em4305/__init__.py
rename to decoders/em4305/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/em4305/pd.py b/decoders/em4305/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/em4305/pd.py
rename to decoders/em4305/pd.py
diff --git a/libsigrokdecode4DSL/decoders/enc28j60/__init__.py b/decoders/enc28j60/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/enc28j60/__init__.py
rename to decoders/enc28j60/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/enc28j60/lists.py b/decoders/enc28j60/lists.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/enc28j60/lists.py
rename to decoders/enc28j60/lists.py
diff --git a/libsigrokdecode4DSL/decoders/enc28j60/pd.py b/decoders/enc28j60/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/enc28j60/pd.py
rename to decoders/enc28j60/pd.py
diff --git a/libsigrokdecode4DSL/decoders/flexray/__init__.py b/decoders/flexray/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/flexray/__init__.py
rename to decoders/flexray/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/flexray/pd.py b/decoders/flexray/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/flexray/pd.py
rename to decoders/flexray/pd.py
diff --git a/libsigrokdecode4DSL/decoders/fsi/__init__.py b/decoders/fsi/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/fsi/__init__.py
rename to decoders/fsi/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/fsi/pd.py b/decoders/fsi/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/fsi/pd.py
rename to decoders/fsi/pd.py
diff --git a/libsigrokdecode4DSL/decoders/gpib/__init__.py b/decoders/gpib/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/gpib/__init__.py
rename to decoders/gpib/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/gpib/pd.py b/decoders/gpib/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/gpib/pd.py
rename to decoders/gpib/pd.py
diff --git a/libsigrokdecode4DSL/decoders/graycode/__init__.py b/decoders/graycode/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/graycode/__init__.py
rename to decoders/graycode/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/graycode/pd.py b/decoders/graycode/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/graycode/pd.py
rename to decoders/graycode/pd.py
diff --git a/libsigrokdecode4DSL/decoders/guess_bitrate/__init__.py b/decoders/guess_bitrate/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/guess_bitrate/__init__.py
rename to decoders/guess_bitrate/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/guess_bitrate/pd.py b/decoders/guess_bitrate/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/guess_bitrate/pd.py
rename to decoders/guess_bitrate/pd.py
diff --git a/libsigrokdecode4DSL/decoders/hdcp/__init__.py b/decoders/hdcp/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/hdcp/__init__.py
rename to decoders/hdcp/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/hdcp/pd.py b/decoders/hdcp/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/hdcp/pd.py
rename to decoders/hdcp/pd.py
diff --git a/libsigrokdecode4DSL/decoders/i2cdemux/__init__.py b/decoders/i2cdemux/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/i2cdemux/__init__.py
rename to decoders/i2cdemux/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/i2cdemux/pd.py b/decoders/i2cdemux/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/i2cdemux/pd.py
rename to decoders/i2cdemux/pd.py
diff --git a/libsigrokdecode4DSL/decoders/i2cfilter/__init__.py b/decoders/i2cfilter/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/i2cfilter/__init__.py
rename to decoders/i2cfilter/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/i2cfilter/pd.py b/decoders/i2cfilter/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/i2cfilter/pd.py
rename to decoders/i2cfilter/pd.py
diff --git a/libsigrokdecode4DSL/decoders/i2s/__init__.py b/decoders/i2s/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/i2s/__init__.py
rename to decoders/i2s/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/i2s/pd.py b/decoders/i2s/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/i2s/pd.py
rename to decoders/i2s/pd.py
diff --git a/libsigrokdecode4DSL/decoders/iec/__init__.py b/decoders/iec/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/iec/__init__.py
rename to decoders/iec/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/iec/pd.py b/decoders/iec/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/iec/pd.py
rename to decoders/iec/pd.py
diff --git a/libsigrokdecode4DSL/decoders/ieee488/__init__.py b/decoders/ieee488/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ieee488/__init__.py
rename to decoders/ieee488/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/ieee488/pd.py b/decoders/ieee488/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ieee488/pd.py
rename to decoders/ieee488/pd.py
diff --git a/libsigrokdecode4DSL/decoders/ir_irmp/__init__.py b/decoders/ir_irmp/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ir_irmp/__init__.py
rename to decoders/ir_irmp/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/ir_irmp/irmp_library.py b/decoders/ir_irmp/irmp_library.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ir_irmp/irmp_library.py
rename to decoders/ir_irmp/irmp_library.py
diff --git a/libsigrokdecode4DSL/decoders/ir_irmp/pd.py b/decoders/ir_irmp/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ir_irmp/pd.py
rename to decoders/ir_irmp/pd.py
diff --git a/libsigrokdecode4DSL/decoders/ir_nec/__init__.py b/decoders/ir_nec/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ir_nec/__init__.py
rename to decoders/ir_nec/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/ir_nec/lists.py b/decoders/ir_nec/lists.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ir_nec/lists.py
rename to decoders/ir_nec/lists.py
diff --git a/libsigrokdecode4DSL/decoders/ir_nec/pd.py b/decoders/ir_nec/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ir_nec/pd.py
rename to decoders/ir_nec/pd.py
diff --git a/libsigrokdecode4DSL/decoders/ir_rc5/__init__.py b/decoders/ir_rc5/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ir_rc5/__init__.py
rename to decoders/ir_rc5/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/ir_rc5/lists.py b/decoders/ir_rc5/lists.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ir_rc5/lists.py
rename to decoders/ir_rc5/lists.py
diff --git a/libsigrokdecode4DSL/decoders/ir_rc5/pd.py b/decoders/ir_rc5/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ir_rc5/pd.py
rename to decoders/ir_rc5/pd.py
diff --git a/libsigrokdecode4DSL/decoders/ir_rc6/__init__.py b/decoders/ir_rc6/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ir_rc6/__init__.py
rename to decoders/ir_rc6/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/ir_rc6/pd.py b/decoders/ir_rc6/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ir_rc6/pd.py
rename to decoders/ir_rc6/pd.py
diff --git a/libsigrokdecode4DSL/decoders/ir_sirc/__init__.py b/decoders/ir_sirc/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ir_sirc/__init__.py
rename to decoders/ir_sirc/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/ir_sirc/lists.py b/decoders/ir_sirc/lists.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ir_sirc/lists.py
rename to decoders/ir_sirc/lists.py
diff --git a/libsigrokdecode4DSL/decoders/ir_sirc/pd.py b/decoders/ir_sirc/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ir_sirc/pd.py
rename to decoders/ir_sirc/pd.py
diff --git a/libsigrokdecode4DSL/decoders/jitter/__init__.py b/decoders/jitter/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/jitter/__init__.py
rename to decoders/jitter/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/jitter/pd.py b/decoders/jitter/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/jitter/pd.py
rename to decoders/jitter/pd.py
diff --git a/libsigrokdecode4DSL/decoders/jtag/__init__.py b/decoders/jtag/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/jtag/__init__.py
rename to decoders/jtag/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/jtag/pd.py b/decoders/jtag/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/jtag/pd.py
rename to decoders/jtag/pd.py
diff --git a/libsigrokdecode4DSL/decoders/jtag_ejtag/__init__.py b/decoders/jtag_ejtag/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/jtag_ejtag/__init__.py
rename to decoders/jtag_ejtag/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/jtag_ejtag/pd.py b/decoders/jtag_ejtag/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/jtag_ejtag/pd.py
rename to decoders/jtag_ejtag/pd.py
diff --git a/libsigrokdecode4DSL/decoders/jtag_stm32/__init__.py b/decoders/jtag_stm32/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/jtag_stm32/__init__.py
rename to decoders/jtag_stm32/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/jtag_stm32/pd.py b/decoders/jtag_stm32/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/jtag_stm32/pd.py
rename to decoders/jtag_stm32/pd.py
diff --git a/libsigrokdecode4DSL/decoders/lfast/__init__.py b/decoders/lfast/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/lfast/__init__.py
rename to decoders/lfast/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/lfast/pd.py b/decoders/lfast/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/lfast/pd.py
rename to decoders/lfast/pd.py
diff --git a/libsigrokdecode4DSL/decoders/lin/__init__.py b/decoders/lin/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/lin/__init__.py
rename to decoders/lin/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/lin/pd.py b/decoders/lin/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/lin/pd.py
rename to decoders/lin/pd.py
diff --git a/libsigrokdecode4DSL/decoders/lm75/__init__.py b/decoders/lm75/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/lm75/__init__.py
rename to decoders/lm75/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/lm75/pd.py b/decoders/lm75/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/lm75/pd.py
rename to decoders/lm75/pd.py
diff --git a/libsigrokdecode4DSL/decoders/lpc/__init__.py b/decoders/lpc/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/lpc/__init__.py
rename to decoders/lpc/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/lpc/pd.py b/decoders/lpc/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/lpc/pd.py
rename to decoders/lpc/pd.py
diff --git a/libsigrokdecode4DSL/decoders/ltc242x/__init__.py b/decoders/ltc242x/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ltc242x/__init__.py
rename to decoders/ltc242x/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/ltc242x/pd.py b/decoders/ltc242x/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ltc242x/pd.py
rename to decoders/ltc242x/pd.py
diff --git a/libsigrokdecode4DSL/decoders/ltc26x7/__init__.py b/decoders/ltc26x7/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ltc26x7/__init__.py
rename to decoders/ltc26x7/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/ltc26x7/pd.py b/decoders/ltc26x7/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ltc26x7/pd.py
rename to decoders/ltc26x7/pd.py
diff --git a/libsigrokdecode4DSL/decoders/maple_bus/__init__.py b/decoders/maple_bus/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/maple_bus/__init__.py
rename to decoders/maple_bus/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/maple_bus/pd.py b/decoders/maple_bus/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/maple_bus/pd.py
rename to decoders/maple_bus/pd.py
diff --git a/libsigrokdecode4DSL/decoders/max7219/__init__.py b/decoders/max7219/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/max7219/__init__.py
rename to decoders/max7219/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/max7219/pd.py b/decoders/max7219/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/max7219/pd.py
rename to decoders/max7219/pd.py
diff --git a/libsigrokdecode4DSL/decoders/mcs48/__init__.py b/decoders/mcs48/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/mcs48/__init__.py
rename to decoders/mcs48/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/mcs48/pd.py b/decoders/mcs48/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/mcs48/pd.py
rename to decoders/mcs48/pd.py
diff --git a/libsigrokdecode4DSL/decoders/mdio/__init__.py b/decoders/mdio/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/mdio/__init__.py
rename to decoders/mdio/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/mdio/pd.py b/decoders/mdio/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/mdio/pd.py
rename to decoders/mdio/pd.py
diff --git a/libsigrokdecode4DSL/decoders/microwire/__init__.py b/decoders/microwire/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/microwire/__init__.py
rename to decoders/microwire/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/microwire/pd.py b/decoders/microwire/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/microwire/pd.py
rename to decoders/microwire/pd.py
diff --git a/libsigrokdecode4DSL/decoders/midi/__init__.py b/decoders/midi/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/midi/__init__.py
rename to decoders/midi/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/midi/lists.py b/decoders/midi/lists.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/midi/lists.py
rename to decoders/midi/lists.py
diff --git a/libsigrokdecode4DSL/decoders/midi/pd.py b/decoders/midi/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/midi/pd.py
rename to decoders/midi/pd.py
diff --git a/libsigrokdecode4DSL/decoders/miller/__init__.py b/decoders/miller/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/miller/__init__.py
rename to decoders/miller/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/miller/pd.py b/decoders/miller/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/miller/pd.py
rename to decoders/miller/pd.py
diff --git a/libsigrokdecode4DSL/decoders/mipi_dsi/__init__.py b/decoders/mipi_dsi/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/mipi_dsi/__init__.py
rename to decoders/mipi_dsi/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/mipi_dsi/pd.py b/decoders/mipi_dsi/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/mipi_dsi/pd.py
rename to decoders/mipi_dsi/pd.py
diff --git a/libsigrokdecode4DSL/decoders/mipi_rffe/__init__.py b/decoders/mipi_rffe/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/mipi_rffe/__init__.py
rename to decoders/mipi_rffe/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/mipi_rffe/pd.py b/decoders/mipi_rffe/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/mipi_rffe/pd.py
rename to decoders/mipi_rffe/pd.py
diff --git a/libsigrokdecode4DSL/decoders/mlx90614/__init__.py b/decoders/mlx90614/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/mlx90614/__init__.py
rename to decoders/mlx90614/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/mlx90614/pd.py b/decoders/mlx90614/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/mlx90614/pd.py
rename to decoders/mlx90614/pd.py
diff --git a/libsigrokdecode4DSL/decoders/modbus/__init__.py b/decoders/modbus/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/modbus/__init__.py
rename to decoders/modbus/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/modbus/pd.py b/decoders/modbus/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/modbus/pd.py
rename to decoders/modbus/pd.py
diff --git a/libsigrokdecode4DSL/decoders/morse/__init__.py b/decoders/morse/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/morse/__init__.py
rename to decoders/morse/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/morse/pd.py b/decoders/morse/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/morse/pd.py
rename to decoders/morse/pd.py
diff --git a/libsigrokdecode4DSL/decoders/mrf24j40/__init__.py b/decoders/mrf24j40/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/mrf24j40/__init__.py
rename to decoders/mrf24j40/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/mrf24j40/lists.py b/decoders/mrf24j40/lists.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/mrf24j40/lists.py
rename to decoders/mrf24j40/lists.py
diff --git a/libsigrokdecode4DSL/decoders/mrf24j40/pd.py b/decoders/mrf24j40/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/mrf24j40/pd.py
rename to decoders/mrf24j40/pd.py
diff --git a/libsigrokdecode4DSL/decoders/mxc6225xu/__init__.py b/decoders/mxc6225xu/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/mxc6225xu/__init__.py
rename to decoders/mxc6225xu/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/mxc6225xu/pd.py b/decoders/mxc6225xu/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/mxc6225xu/pd.py
rename to decoders/mxc6225xu/pd.py
diff --git a/libsigrokdecode4DSL/decoders/nes_gamepad/__init__.py b/decoders/nes_gamepad/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/nes_gamepad/__init__.py
rename to decoders/nes_gamepad/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/nes_gamepad/pd.py b/decoders/nes_gamepad/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/nes_gamepad/pd.py
rename to decoders/nes_gamepad/pd.py
diff --git a/libsigrokdecode4DSL/decoders/nrf24l01/__init__.py b/decoders/nrf24l01/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/nrf24l01/__init__.py
rename to decoders/nrf24l01/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/nrf24l01/pd.py b/decoders/nrf24l01/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/nrf24l01/pd.py
rename to decoders/nrf24l01/pd.py
diff --git a/libsigrokdecode4DSL/decoders/nrf905/__init__.py b/decoders/nrf905/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/nrf905/__init__.py
rename to decoders/nrf905/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/nrf905/pd.py b/decoders/nrf905/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/nrf905/pd.py
rename to decoders/nrf905/pd.py
diff --git a/libsigrokdecode4DSL/decoders/numbers_and_state/__init__.py b/decoders/numbers_and_state/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/numbers_and_state/__init__.py
rename to decoders/numbers_and_state/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/numbers_and_state/pd.py b/decoders/numbers_and_state/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/numbers_and_state/pd.py
rename to decoders/numbers_and_state/pd.py
diff --git a/libsigrokdecode4DSL/decoders/nunchuk/__init__.py b/decoders/nunchuk/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/nunchuk/__init__.py
rename to decoders/nunchuk/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/nunchuk/pd.py b/decoders/nunchuk/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/nunchuk/pd.py
rename to decoders/nunchuk/pd.py
diff --git a/libsigrokdecode4DSL/decoders/onewire_link/__init__.py b/decoders/onewire_link/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/onewire_link/__init__.py
rename to decoders/onewire_link/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/onewire_link/pd.py b/decoders/onewire_link/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/onewire_link/pd.py
rename to decoders/onewire_link/pd.py
diff --git a/libsigrokdecode4DSL/decoders/onewire_network/__init__.py b/decoders/onewire_network/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/onewire_network/__init__.py
rename to decoders/onewire_network/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/onewire_network/pd.py b/decoders/onewire_network/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/onewire_network/pd.py
rename to decoders/onewire_network/pd.py
diff --git a/libsigrokdecode4DSL/decoders/ook/__init__.py b/decoders/ook/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ook/__init__.py
rename to decoders/ook/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/ook/pd.py b/decoders/ook/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ook/pd.py
rename to decoders/ook/pd.py
diff --git a/libsigrokdecode4DSL/decoders/ook_oregon/__init__.py b/decoders/ook_oregon/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ook_oregon/__init__.py
rename to decoders/ook_oregon/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/ook_oregon/lists.py b/decoders/ook_oregon/lists.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ook_oregon/lists.py
rename to decoders/ook_oregon/lists.py
diff --git a/libsigrokdecode4DSL/decoders/ook_oregon/pd.py b/decoders/ook_oregon/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ook_oregon/pd.py
rename to decoders/ook_oregon/pd.py
diff --git a/libsigrokdecode4DSL/decoders/ook_vis/__init__.py b/decoders/ook_vis/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ook_vis/__init__.py
rename to decoders/ook_vis/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/ook_vis/pd.py b/decoders/ook_vis/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ook_vis/pd.py
rename to decoders/ook_vis/pd.py
diff --git a/libsigrokdecode4DSL/decoders/pan1321/__init__.py b/decoders/pan1321/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/pan1321/__init__.py
rename to decoders/pan1321/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/pan1321/pd.py b/decoders/pan1321/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/pan1321/pd.py
rename to decoders/pan1321/pd.py
diff --git a/libsigrokdecode4DSL/decoders/parallel/__init__.py b/decoders/parallel/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/parallel/__init__.py
rename to decoders/parallel/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/parallel/pd.py b/decoders/parallel/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/parallel/pd.py
rename to decoders/parallel/pd.py
diff --git a/libsigrokdecode4DSL/decoders/pca9571/__init__.py b/decoders/pca9571/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/pca9571/__init__.py
rename to decoders/pca9571/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/pca9571/pd.py b/decoders/pca9571/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/pca9571/pd.py
rename to decoders/pca9571/pd.py
diff --git a/libsigrokdecode4DSL/decoders/pjdl/__init__.py b/decoders/pjdl/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/pjdl/__init__.py
rename to decoders/pjdl/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/pjdl/pd.py b/decoders/pjdl/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/pjdl/pd.py
rename to decoders/pjdl/pd.py
diff --git a/libsigrokdecode4DSL/decoders/pjon/__init__.py b/decoders/pjon/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/pjon/__init__.py
rename to decoders/pjon/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/pjon/pd.py b/decoders/pjon/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/pjon/pd.py
rename to decoders/pjon/pd.py
diff --git a/libsigrokdecode4DSL/decoders/ps2/__init__.py b/decoders/ps2/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ps2/__init__.py
rename to decoders/ps2/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/ps2/pd.py b/decoders/ps2/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ps2/pd.py
rename to decoders/ps2/pd.py
diff --git a/libsigrokdecode4DSL/decoders/pwm/__init__.py b/decoders/pwm/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/pwm/__init__.py
rename to decoders/pwm/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/pwm/pd.py b/decoders/pwm/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/pwm/pd.py
rename to decoders/pwm/pd.py
diff --git a/libsigrokdecode4DSL/decoders/qi/__init__.py b/decoders/qi/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/qi/__init__.py
rename to decoders/qi/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/qi/pd.py b/decoders/qi/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/qi/pd.py
rename to decoders/qi/pd.py
diff --git a/libsigrokdecode4DSL/decoders/qspi/__init__.py b/decoders/qspi/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/qspi/__init__.py
rename to decoders/qspi/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/qspi/pd.py b/decoders/qspi/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/qspi/pd.py
rename to decoders/qspi/pd.py
diff --git a/libsigrokdecode4DSL/decoders/rc_encode/__init__.py b/decoders/rc_encode/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/rc_encode/__init__.py
rename to decoders/rc_encode/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/rc_encode/pd.py b/decoders/rc_encode/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/rc_encode/pd.py
rename to decoders/rc_encode/pd.py
diff --git a/libsigrokdecode4DSL/decoders/rfm12/__init__.py b/decoders/rfm12/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/rfm12/__init__.py
rename to decoders/rfm12/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/rfm12/pd.py b/decoders/rfm12/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/rfm12/pd.py
rename to decoders/rfm12/pd.py
diff --git a/libsigrokdecode4DSL/decoders/rgb_led_spi/__init__.py b/decoders/rgb_led_spi/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/rgb_led_spi/__init__.py
rename to decoders/rgb_led_spi/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/rgb_led_spi/pd.py b/decoders/rgb_led_spi/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/rgb_led_spi/pd.py
rename to decoders/rgb_led_spi/pd.py
diff --git a/libsigrokdecode4DSL/decoders/rgb_led_ws281x/__init__.py b/decoders/rgb_led_ws281x/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/rgb_led_ws281x/__init__.py
rename to decoders/rgb_led_ws281x/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/rgb_led_ws281x/pd.py b/decoders/rgb_led_ws281x/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/rgb_led_ws281x/pd.py
rename to decoders/rgb_led_ws281x/pd.py
diff --git a/libsigrokdecode4DSL/decoders/rtc8564/__init__.py b/decoders/rtc8564/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/rtc8564/__init__.py
rename to decoders/rtc8564/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/rtc8564/pd.py b/decoders/rtc8564/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/rtc8564/pd.py
rename to decoders/rtc8564/pd.py
diff --git a/libsigrokdecode4DSL/decoders/sae_j1850_vpw/__init__.py b/decoders/sae_j1850_vpw/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/sae_j1850_vpw/__init__.py
rename to decoders/sae_j1850_vpw/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/sae_j1850_vpw/pd.py b/decoders/sae_j1850_vpw/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/sae_j1850_vpw/pd.py
rename to decoders/sae_j1850_vpw/pd.py
diff --git a/libsigrokdecode4DSL/decoders/sda2506/__init__.py b/decoders/sda2506/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/sda2506/__init__.py
rename to decoders/sda2506/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/sda2506/pd.py b/decoders/sda2506/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/sda2506/pd.py
rename to decoders/sda2506/pd.py
diff --git a/libsigrokdecode4DSL/decoders/sdcard_sd/__init__.py b/decoders/sdcard_sd/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/sdcard_sd/__init__.py
rename to decoders/sdcard_sd/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/sdcard_sd/pd.py b/decoders/sdcard_sd/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/sdcard_sd/pd.py
rename to decoders/sdcard_sd/pd.py
diff --git a/libsigrokdecode4DSL/decoders/sdcard_spi/__init__.py b/decoders/sdcard_spi/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/sdcard_spi/__init__.py
rename to decoders/sdcard_spi/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/sdcard_spi/pd.py b/decoders/sdcard_spi/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/sdcard_spi/pd.py
rename to decoders/sdcard_spi/pd.py
diff --git a/libsigrokdecode4DSL/decoders/sdq/__init__.py b/decoders/sdq/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/sdq/__init__.py
rename to decoders/sdq/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/sdq/pd.py b/decoders/sdq/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/sdq/pd.py
rename to decoders/sdq/pd.py
diff --git a/libsigrokdecode4DSL/decoders/seven_segment/__init__.py b/decoders/seven_segment/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/seven_segment/__init__.py
rename to decoders/seven_segment/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/seven_segment/pd.py b/decoders/seven_segment/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/seven_segment/pd.py
rename to decoders/seven_segment/pd.py
diff --git a/libsigrokdecode4DSL/decoders/signature/__init__.py b/decoders/signature/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/signature/__init__.py
rename to decoders/signature/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/signature/pd.py b/decoders/signature/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/signature/pd.py
rename to decoders/signature/pd.py
diff --git a/libsigrokdecode4DSL/decoders/sipi/__init__.py b/decoders/sipi/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/sipi/__init__.py
rename to decoders/sipi/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/sipi/pd.py b/decoders/sipi/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/sipi/pd.py
rename to decoders/sipi/pd.py
diff --git a/libsigrokdecode4DSL/decoders/sle44xx/__init__.py b/decoders/sle44xx/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/sle44xx/__init__.py
rename to decoders/sle44xx/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/sle44xx/pd.py b/decoders/sle44xx/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/sle44xx/pd.py
rename to decoders/sle44xx/pd.py
diff --git a/libsigrokdecode4DSL/decoders/spdif/__init__.py b/decoders/spdif/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/spdif/__init__.py
rename to decoders/spdif/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/spdif/pd.py b/decoders/spdif/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/spdif/pd.py
rename to decoders/spdif/pd.py
diff --git a/libsigrokdecode4DSL/decoders/spiflash/__init__.py b/decoders/spiflash/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/spiflash/__init__.py
rename to decoders/spiflash/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/spiflash/lists.py b/decoders/spiflash/lists.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/spiflash/lists.py
rename to decoders/spiflash/lists.py
diff --git a/libsigrokdecode4DSL/decoders/spiflash/pd.py b/decoders/spiflash/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/spiflash/pd.py
rename to decoders/spiflash/pd.py
diff --git a/libsigrokdecode4DSL/decoders/ssi32/__init__.py b/decoders/ssi32/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ssi32/__init__.py
rename to decoders/ssi32/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/ssi32/pd.py b/decoders/ssi32/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/ssi32/pd.py
rename to decoders/ssi32/pd.py
diff --git a/libsigrokdecode4DSL/decoders/st25r39xx_spi/__init__.py b/decoders/st25r39xx_spi/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/st25r39xx_spi/__init__.py
rename to decoders/st25r39xx_spi/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/st25r39xx_spi/lists.py b/decoders/st25r39xx_spi/lists.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/st25r39xx_spi/lists.py
rename to decoders/st25r39xx_spi/lists.py
diff --git a/libsigrokdecode4DSL/decoders/st25r39xx_spi/pd.py b/decoders/st25r39xx_spi/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/st25r39xx_spi/pd.py
rename to decoders/st25r39xx_spi/pd.py
diff --git a/libsigrokdecode4DSL/decoders/st7735/__init__.py b/decoders/st7735/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/st7735/__init__.py
rename to decoders/st7735/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/st7735/pd.py b/decoders/st7735/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/st7735/pd.py
rename to decoders/st7735/pd.py
diff --git a/libsigrokdecode4DSL/decoders/st7789/__init__.py b/decoders/st7789/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/st7789/__init__.py
rename to decoders/st7789/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/st7789/pd.py b/decoders/st7789/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/st7789/pd.py
rename to decoders/st7789/pd.py
diff --git a/libsigrokdecode4DSL/decoders/stepper_motor/__init__.py b/decoders/stepper_motor/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/stepper_motor/__init__.py
rename to decoders/stepper_motor/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/stepper_motor/pd.py b/decoders/stepper_motor/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/stepper_motor/pd.py
rename to decoders/stepper_motor/pd.py
diff --git a/libsigrokdecode4DSL/decoders/swd/__init__.py b/decoders/swd/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/swd/__init__.py
rename to decoders/swd/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/swd/pd.py b/decoders/swd/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/swd/pd.py
rename to decoders/swd/pd.py
diff --git a/libsigrokdecode4DSL/decoders/swim/__init__.py b/decoders/swim/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/swim/__init__.py
rename to decoders/swim/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/swim/pd.py b/decoders/swim/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/swim/pd.py
rename to decoders/swim/pd.py
diff --git a/libsigrokdecode4DSL/decoders/t55xx/__init__.py b/decoders/t55xx/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/t55xx/__init__.py
rename to decoders/t55xx/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/t55xx/pd.py b/decoders/t55xx/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/t55xx/pd.py
rename to decoders/t55xx/pd.py
diff --git a/libsigrokdecode4DSL/decoders/tca6408a/__init__.py b/decoders/tca6408a/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/tca6408a/__init__.py
rename to decoders/tca6408a/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/tca6408a/pd.py b/decoders/tca6408a/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/tca6408a/pd.py
rename to decoders/tca6408a/pd.py
diff --git a/libsigrokdecode4DSL/decoders/tdm_audio/__init__.py b/decoders/tdm_audio/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/tdm_audio/__init__.py
rename to decoders/tdm_audio/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/tdm_audio/pd.py b/decoders/tdm_audio/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/tdm_audio/pd.py
rename to decoders/tdm_audio/pd.py
diff --git a/libsigrokdecode4DSL/decoders/timing/__init__.py b/decoders/timing/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/timing/__init__.py
rename to decoders/timing/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/timing/pd.py b/decoders/timing/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/timing/pd.py
rename to decoders/timing/pd.py
diff --git a/libsigrokdecode4DSL/decoders/tlc5620/__init__.py b/decoders/tlc5620/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/tlc5620/__init__.py
rename to decoders/tlc5620/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/tlc5620/pd.py b/decoders/tlc5620/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/tlc5620/pd.py
rename to decoders/tlc5620/pd.py
diff --git a/libsigrokdecode4DSL/decoders/usb_packet/__init__.py b/decoders/usb_packet/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/usb_packet/__init__.py
rename to decoders/usb_packet/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/usb_packet/pd.py b/decoders/usb_packet/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/usb_packet/pd.py
rename to decoders/usb_packet/pd.py
diff --git a/libsigrokdecode4DSL/decoders/usb_power_delivery/__init__.py b/decoders/usb_power_delivery/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/usb_power_delivery/__init__.py
rename to decoders/usb_power_delivery/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/usb_power_delivery/pd.py b/decoders/usb_power_delivery/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/usb_power_delivery/pd.py
rename to decoders/usb_power_delivery/pd.py
diff --git a/libsigrokdecode4DSL/decoders/usb_request/__init__.py b/decoders/usb_request/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/usb_request/__init__.py
rename to decoders/usb_request/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/usb_request/pd.py b/decoders/usb_request/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/usb_request/pd.py
rename to decoders/usb_request/pd.py
diff --git a/libsigrokdecode4DSL/decoders/usb_signalling/__init__.py b/decoders/usb_signalling/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/usb_signalling/__init__.py
rename to decoders/usb_signalling/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/usb_signalling/pd.py b/decoders/usb_signalling/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/usb_signalling/pd.py
rename to decoders/usb_signalling/pd.py
diff --git a/libsigrokdecode4DSL/decoders/wiegand/__init__.py b/decoders/wiegand/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/wiegand/__init__.py
rename to decoders/wiegand/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/wiegand/pd.py b/decoders/wiegand/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/wiegand/pd.py
rename to decoders/wiegand/pd.py
diff --git a/libsigrokdecode4DSL/decoders/x2444m/__init__.py b/decoders/x2444m/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/x2444m/__init__.py
rename to decoders/x2444m/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/x2444m/pd.py b/decoders/x2444m/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/x2444m/pd.py
rename to decoders/x2444m/pd.py
diff --git a/libsigrokdecode4DSL/decoders/xfp/__init__.py b/decoders/xfp/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/xfp/__init__.py
rename to decoders/xfp/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/xfp/pd.py b/decoders/xfp/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/xfp/pd.py
rename to decoders/xfp/pd.py
diff --git a/libsigrokdecode4DSL/decoders/xy2-100/__init__.py b/decoders/xy2-100/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/xy2-100/__init__.py
rename to decoders/xy2-100/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/xy2-100/pd.py b/decoders/xy2-100/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/xy2-100/pd.py
rename to decoders/xy2-100/pd.py
diff --git a/libsigrokdecode4DSL/decoders/z80/__init__.py b/decoders/z80/__init__.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/z80/__init__.py
rename to decoders/z80/__init__.py
diff --git a/libsigrokdecode4DSL/decoders/z80/pd.py b/decoders/z80/pd.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/z80/pd.py
rename to decoders/z80/pd.py
diff --git a/libsigrokdecode4DSL/decoders/z80/tables.py b/decoders/z80/tables.py
similarity index 100%
rename from libsigrokdecode4DSL/decoders/z80/tables.py
rename to decoders/z80/tables.py
diff --git a/doc/decoder.txt b/doc/decoder.txt
new file mode 100644
index 00000000..542a084f
--- /dev/null
+++ b/doc/decoder.txt
@@ -0,0 +1,28 @@
+sigrokdecode module's types
+
+output types: 
+	1.OUTPUT_ANN
+	2.OUTPUT_PYTHON
+	3.OUTPUT_BINARY
+	4.OUTPUT_META
+	
+default sample rate name: SRD_CONF_SAMPLERATE,value is 10000
+
+sigrokdecode.Decoder methods:
+
+class Decoder{
+	PyObject* put(PyObject *self, PyObject *args);
+	PyObject* register(PyObject *self, PyObject *args,PyObject *kwargs);
+	PyObject* wait(PyObject *self, PyObject *args);
+	PyObject* has_channel(PyObject *self, PyObject *args);
+}
+
+
+c can call's method of python:
+	1.reset
+	2.start
+	3.decode
+	4.metadata
+
+	
+
diff --git a/libsigrokdecode4DSL/decoder.c b/libsigrokdecode4DSL/decoder.c
index 4906b5d9..809cb25b 100755
--- a/libsigrokdecode4DSL/decoder.c
+++ b/libsigrokdecode4DSL/decoder.c
@@ -40,7 +40,10 @@
 
 /** @cond PRIVATE */
 
-/* The list of loaded protocol decoders. */
+/* 
+	The list of loaded protocol decoders. 
+	Is srd_decoder* type
+*/
 static GSList *pd_list = NULL;
 
 /* srd.c */
@@ -719,6 +722,7 @@ SRD_API int srd_decoder_load(const char *module_name)
 	d = g_malloc0(sizeof(struct srd_decoder));
 	fail_txt = NULL;
 
+	//Load module from python script file,module_name is a sub directory
 	d->py_mod = py_import_by_name(module_name);
 	if (!d->py_mod) {
 		fail_txt = "import by name failed";
@@ -731,13 +735,19 @@ SRD_API int srd_decoder_load(const char *module_name)
 		goto err_out;
 	}
 
-	/* Get the 'Decoder' class as Python object. */
+	/* 
+		Get the 'Decoder' class as Python object. 
+		Here, Decoder is python class type
+	*/
 	d->py_dec = PyObject_GetAttrString(d->py_mod, "Decoder");
 	if (!d->py_dec) {
 		fail_txt = "no 'Decoder' attribute in imported module";
 		goto except_out;
 	}
 
+	/*
+	   Here, Decoder is c class type
+	*/
 	py_basedec = PyObject_GetAttrString(mod_sigrokdecode, "Decoder");
 	if (!py_basedec) {
 		fail_txt = "no 'Decoder' attribute in sigrokdecode(3)";
diff --git a/libsigrokdecode4DSL/instance.c b/libsigrokdecode4DSL/instance.c
index 5d96701f..1b3d5df7 100755
--- a/libsigrokdecode4DSL/instance.c
+++ b/libsigrokdecode4DSL/instance.c
@@ -379,9 +379,10 @@ SRD_API struct srd_decoder_inst *srd_inst_new(struct srd_session *sess,
     di->py_pinvalues = NULL;
 	di->dec_num_channels = g_slist_length(di->decoder->channels) +
 			g_slist_length(di->decoder->opt_channels);
+			
 	if (di->dec_num_channels) {
-		di->dec_channelmap =
-				g_malloc(sizeof(int) * di->dec_num_channels);
+		di->dec_channelmap = g_malloc(sizeof(int) * di->dec_num_channels);
+
 		for (i = 0; i < di->dec_num_channels; i++)
 			di->dec_channelmap[i] = i;
 
@@ -913,7 +914,8 @@ static gboolean all_terms_match(struct srd_decoder_inst *di,
 	return TRUE;
 }
 
-static gboolean find_match(struct srd_decoder_inst *di)
+static gboolean 
+find_match(struct srd_decoder_inst *di)
 {
     uint64_t j;
 	GSList *l, *cond;
@@ -1059,9 +1061,11 @@ static gpointer di_thread(gpointer data)
 	 * "Regular" termination of the decode() method is not expected.
 	 */
     //Py_IncRef(di->py_inst);
+	//srd_err("start call decode()");
 	srd_dbg("%s: Calling decode().", di->inst_id);
 	py_res = PyObject_CallMethod(di->py_inst, "decode", NULL);
 	srd_dbg("%s: decode() terminated.", di->inst_id);
+ 	//srd_err("end call decode()");
 
 	if (!py_res)
 		di->decoder_state = SRD_ERR;
@@ -1210,7 +1214,10 @@ SRD_PRIV int srd_inst_decode(struct srd_decoder_inst *di,
         abs_start_samplenum, abs_end_samplenum,
         abs_end_samplenum - abs_start_samplenum, inbuflen, di->inst_id);
 
-	/* If this is the first call, start the worker thread. */
+	/* 
+		If this is the first call, start the worker thread. 
+		One session may be have more decoder,so more thread will be created
+	*/
 	if (!di->thread_handle) {
 		srd_dbg("No worker thread for this decoder stack "
 			"exists yet, creating one: %s.", di->inst_id);
diff --git a/libsigrokdecode4DSL/libsigrokdecode.h b/libsigrokdecode4DSL/libsigrokdecode.h
index 77d8a216..9bc23973 100755
--- a/libsigrokdecode4DSL/libsigrokdecode.h
+++ b/libsigrokdecode4DSL/libsigrokdecode.h
@@ -32,7 +32,10 @@ extern "C" {
 struct srd_session {
     int session_id;
 
-    /* List of decoder instances. */
+    /* 
+		List of decoder instances.
+		srd_decoder_inst* type
+	*/
     GSList *di_list;
 
     /* List of frontend callbacks to receive decoder output. */
@@ -257,14 +260,16 @@ struct srd_decoder_inst {
 	struct srd_decoder *decoder;
 	struct srd_session *sess;
 	void *py_inst;
-    void *py_pinvalues;
+    void *py_pinvalues;  /* is a python duple type, like (1,0,255,255)*/
 	char *inst_id;
-	GSList *pd_output;
+	GSList *pd_output;   /* srd_pd_output* type */
 	int dec_num_channels;
 	int *dec_channelmap;
 	GSList *next_di;
 
-	/** List of conditions a PD wants to wait for. */
+	/** List of conditions a PD wants to wait for. 
+	 *  Type is srd_term* of GSList*
+	*/
 	GSList *condition_list;
 
 	/** Array of booleans denoting which conditions matched. */
@@ -291,7 +296,9 @@ struct srd_decoder_inst {
     /** Absolute current sample matched conditions. */
     gboolean abs_cur_matched;
 
-	/** Array of "old" (previous sample) pin values. */
+	/** Array of "old" (previous sample) pin values.
+	 *  Type of uint8_t
+	 */
 	GArray *old_pins_array;
 
 	/** Handle for this PD stack's worker thread. */
@@ -339,8 +346,9 @@ struct srd_proto_data {
 };
 struct srd_proto_data_annotation {
 	int ann_class;
-    int ann_type;
-	char **ann_text;
+    int ann_type; 
+	char str_number_hex[18]; //numerical value hex format string
+	char **ann_text; //text string lines
 };
 struct srd_proto_data_binary {
 	int bin_class;
diff --git a/libsigrokdecode4DSL/session.c b/libsigrokdecode4DSL/session.c
index e60a9da1..32597486 100755
--- a/libsigrokdecode4DSL/session.c
+++ b/libsigrokdecode4DSL/session.c
@@ -269,6 +269,7 @@ SRD_API int srd_session_send(struct srd_session *sess,
 	if (!sess)
 		return SRD_ERR_ARG;
 
+	//foreach srd_decoder_inst* stack
 	for (d = sess->di_list; d; d = d->next) {
 		if ((ret = srd_inst_decode(d->data, abs_start_samplenum,
                 abs_end_samplenum, inbuf, inbuf_const, inbuflen, error)) != SRD_OK)
diff --git a/libsigrokdecode4DSL/srd.c b/libsigrokdecode4DSL/srd.c
index b070ab24..5a43b98e 100755
--- a/libsigrokdecode4DSL/srd.c
+++ b/libsigrokdecode4DSL/srd.c
@@ -255,7 +255,7 @@ SRD_API int srd_init(const char *path)
 	PyEval_InitThreads();
 
 	/* Release the GIL (ignore return value, we don't need it here). */
-	(void)PyEval_SaveThread();
+	PyEval_SaveThread();
 
 	max_session_id = 0;
 
@@ -359,6 +359,7 @@ SRD_PRIV int srd_decoder_searchpath_add(const char *path)
 
 	PyGILState_Release(gstate);
 
+	//append the directory to search list
 	searchpaths = g_slist_prepend(searchpaths, g_strdup(path));
 
 	return SRD_OK;
diff --git a/libsigrokdecode4DSL/type_decoder.c b/libsigrokdecode4DSL/type_decoder.c
index d4b9782b..86599c6b 100755
--- a/libsigrokdecode4DSL/type_decoder.c
+++ b/libsigrokdecode4DSL/type_decoder.c
@@ -53,6 +53,91 @@ static void release_annotation(struct srd_proto_data_annotation *pda)
 		g_strfreev(pda->ann_text);
 }
 
+static int py_parse_ann_data(PyObject *list_obj, char ***out_strv, int list_size, char *hex_str_buf)
+{
+	PyObject *py_item, *py_bytes;
+	char **strv, *str; 
+	PyGILState_STATE gstate;
+	int ret = SRD_ERR_PYTHON;
+	int ijmp = 0;
+	int text_num = 0;
+	PyObject* text_items[10];
+	PyObject *py_tmp;
+	PyObject *py_numobj = NULL;	
+	int i; 
+	long long lv; 
+	 
+	gstate = PyGILState_Ensure();
+
+    str = NULL;
+    strv = NULL;  
+
+	//get annotation text count
+	for (i = 0; i < list_size; i++){
+		py_tmp = PyList_GetItem(list_obj, i);
+
+		//is a string
+		if (PyUnicode_Check(py_tmp)){
+			text_items[text_num] = py_tmp;
+			text_num++;
+		}
+		else if (PyLong_Check(py_tmp)){
+			py_numobj = py_tmp;	
+		}	
+	}
+
+	if (py_numobj == NULL && text_num == 0){
+		srd_err("list element type must be string or numberical");
+		goto err;
+	}
+
+	if (py_numobj != NULL){
+		lv = PyLong_AsLongLong(py_numobj);
+		sprintf(hex_str_buf, "%02llX", lv); 
+	}
+
+	//have no text, only one numberical
+	if (text_num == 0){
+		PyGILState_Release(gstate);
+		return SRD_OK;
+	}
+ 
+	//more annotation text
+	strv = g_try_new0(char *, text_num + 1);
+	if (!strv) {
+		srd_err("Failed to allocate result string vector.");
+		ret = SRD_ERR_MALLOC;
+		goto err;
+	}
+
+	for (i = 0; i < text_num; i++) { 
+		py_bytes = PyUnicode_AsUTF8String(text_items[i]);
+		if (!py_bytes)
+			goto err;
+
+		str = g_strdup(PyBytes_AsString(py_bytes));
+		Py_DECREF(py_bytes);
+		if (!str)
+			goto err;
+
+		strv[i] = str;
+	}
+
+	*out_strv = strv;
+	PyGILState_Release(gstate);
+	return SRD_OK;
+
+err:
+	if (strv)
+		g_strfreev(strv);
+    srd_exception_catch(NULL, "Failed to obtain string item");
+	PyGILState_Release(gstate);
+	return ret;
+}
+
+/*
+ @obj is the fourth param from python calls put()
+*/
 static int convert_annotation(struct srd_decoder_inst *di, PyObject *obj,
 		struct srd_proto_data *pdata)
 {
@@ -62,6 +147,9 @@ static int convert_annotation(struct srd_decoder_inst *di, PyObject *obj,
     char **ann_text;
 	gpointer ann_type_ptr;
 	PyGILState_STATE gstate;
+	int ann_size; 
+
+	pda = pdata->data;
 
 	gstate = PyGILState_Ensure();
 
@@ -96,27 +184,37 @@ static int convert_annotation(struct srd_decoder_inst *di, PyObject *obj,
 //			"annotation class %d.", di->decoder->name, ann_class);
 //		return SRD_ERR_PYTHON;
 //	}
-	if (ann_class >= g_slist_length(di->decoder->ann_types)) {
+	if (ann_class >= g_slist_length(di->decoder->ann_types) || ann_class < 0) {
 		srd_err("Protocol decoder %s submitted data to unregistered "
 			"annotation class %d.", di->decoder->name, ann_class);
 		goto err;
 	}
 	ann_type_ptr = g_slist_nth_data(di->decoder->ann_types, ann_class);
 
-	/* Second element must be a list. */
+	/* 
+		Second element must be a list.
+	 */
 	py_tmp = PyList_GetItem(obj, 1);
 	if (!PyList_Check(py_tmp)) {
 		srd_err("Protocol decoder %s submitted annotation list, but "
 			"second element was not a list.", di->decoder->name);
 		goto err;
 	}
-    if (py_strseq_to_char(py_tmp, &ann_text) != SRD_OK) {
+
+	ann_size = PyList_Size(py_tmp);
+	if (ann_size == 0){
+			srd_err("Protocol decoder %s, put() param, the annotation list is empty.", di->decoder->name);
+		goto err;
+	}
+	 
+	pda->str_number_hex[0] = 0;
+	ann_text = NULL;
+    if (py_parse_ann_data(py_tmp, &ann_text, ann_size, pda->str_number_hex) != SRD_OK) {
         srd_err("Protocol decoder %s submitted annotation list, but "
             "second element was malformed.", di->decoder->name);
         goto err;
     }
-
-	pda = pdata->data;
+ 
 	pda->ann_class = ann_class;
 	pda->ann_type = GPOINTER_TO_INT(ann_type_ptr);
     pda->ann_text = ann_text;
@@ -334,7 +432,7 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 	struct srd_pd_callback *cb;
 	PyGILState_STATE gstate;
 
-	py_data = NULL;
+	py_data = NULL; //the fourth param from python
 
 	gstate = PyGILState_Ensure();
 
@@ -394,17 +492,20 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
     case SRD_OUTPUT_PYTHON:
         for (l = di->next_di; l; l = l->next) {
             next_di = l->data;
+
             srd_spew("Instance %s put %" PRIu64 "-%" PRIu64 " %s "
                  "on oid %d (%s) to instance %s.", di->inst_id,
                  start_sample,
                  end_sample, output_type_name(pdo->output_type),
                  output_id, pdo->proto_id, next_di->inst_id);
+
             if (!(py_res = PyObject_CallMethod(
                 next_di->py_inst, "decode", "KKO", start_sample,
                 end_sample, py_data))) {
                 srd_exception_catch(NULL, "Calling %s decode() failed",
                             next_di->inst_id);
             }
+
             Py_XDECREF(py_res);
         }
         if ((cb = srd_pd_output_callback_find(di->sess, pdo->output_type))) {
@@ -459,6 +560,9 @@ err:
 	return NULL;
 }
 
+/*
+ return output info index
+*/
 static PyObject *Decoder_register(PyObject *self, PyObject *args,
 		PyObject *kwargs)
 {
@@ -612,7 +716,9 @@ static int get_current_pinvalues(const struct srd_decoder_inst *di)
 	for (i = 0; i < di->dec_num_channels; i++) {
 		/* A channelmap value of -1 means "unused optional channel". */
 		if (di->dec_channelmap[i] == -1) {
-			/* Value of unused channel is 0xff, instead of 0 or 1. */
+			/* Value of unused channel is 0xff, instead of 0 or 1. 
+			   Done set -1 by srd_inst_channel_set_all()
+			*/
             PyTuple_SetItem(di->py_pinvalues, i, PyLong_FromLong(0xff));
 		} else {
             if (*(di->inbuf + i) == NULL) {
@@ -905,6 +1011,7 @@ static PyObject *Decoder_wait(PyObject *self, PyObject *args)
         while (!di->got_new_samples && !di->want_wait_terminate)
             g_cond_wait(&di->got_new_samples_cond, &di->data_mutex);
 
+ 
         /*
          * Check whether any of the current condition(s) match.
          * Arrange for termination requests to take a code path which
@@ -915,7 +1022,7 @@ static PyObject *Decoder_wait(PyObject *self, PyObject *args)
         found_match = FALSE;
 
         /* Ignore return value for now, should never be negative. */
-        (void)process_samples_until_condition_match(di, &found_match);
+        process_samples_until_condition_match(di, &found_match);
 
         Py_END_ALLOW_THREADS
 
@@ -940,7 +1047,7 @@ static PyObject *Decoder_wait(PyObject *self, PyObject *args)
             Py_INCREF(di->py_pinvalues);
             return (PyObject *)di->py_pinvalues;
         }
-
+ 
 		/* No match, reset state for the next chunk. */
 		di->got_new_samples = FALSE;
 		di->handled_all_samples = TRUE;
@@ -1032,12 +1139,16 @@ err:
 static PyMethodDef Decoder_methods[] = {
 	{ "put", Decoder_put, METH_VARARGS,
 	  "Accepts a dictionary with the following keys: startsample, endsample, data" },
+
 	{ "register", (PyCFunction)Decoder_register, METH_VARARGS|METH_KEYWORDS,
 			"Register a new output stream" },
+
 	{ "wait", Decoder_wait, METH_VARARGS,
 			"Wait for one or more conditions to occur" },
+
 	{ "has_channel", Decoder_has_channel, METH_VARARGS,
 			"Report whether a channel was supplied" },
+
 	{NULL, NULL, 0, NULL}
 };
 
diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user
index 7ba4c464..6fe947fc 100644
--- a/qtpro/DSView.pro.user
+++ b/qtpro/DSView.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2021-12-17T18:05:34. -->
+<!-- Written by QtCreator 4.11.0, 2022-01-10T16:21:21. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -314,7 +314,7 @@
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
     <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/lala/workdir/DSView/build-DSView-unknown-Debug</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/lala/workdir/DSView-build/bin</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
   </valuemap>
diff --git a/libsigrokdecode4DSL/tests/core.c b/test/decode_test/core.c
similarity index 100%
rename from libsigrokdecode4DSL/tests/core.c
rename to test/decode_test/core.c
diff --git a/libsigrokdecode4DSL/tests/decoder.c b/test/decode_test/decoder.c
similarity index 100%
rename from libsigrokdecode4DSL/tests/decoder.c
rename to test/decode_test/decoder.c
diff --git a/libsigrokdecode4DSL/tests/inst.c b/test/decode_test/inst.c
similarity index 100%
rename from libsigrokdecode4DSL/tests/inst.c
rename to test/decode_test/inst.c
diff --git a/libsigrokdecode4DSL/tests/lib.h b/test/decode_test/lib.h
similarity index 100%
rename from libsigrokdecode4DSL/tests/lib.h
rename to test/decode_test/lib.h
diff --git a/libsigrokdecode4DSL/tests/main.c b/test/decode_test/main.c
similarity index 100%
rename from libsigrokdecode4DSL/tests/main.c
rename to test/decode_test/main.c
diff --git a/libsigrokdecode4DSL/tests/session.c b/test/decode_test/session.c
similarity index 100%
rename from libsigrokdecode4DSL/tests/session.c
rename to test/decode_test/session.c

From 1cd25f29a66e90a24c29f132b4a4614c643240b4 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Tue, 11 Jan 2022 15:19:28 +0800
Subject: [PATCH 55/58] Add ascii display format for numberic value from the
 decode result

---
 DSView/pv/data/decode/AnnotationResTable.cpp | 33 +++++++++++++++-----
 DSView/pv/data/decode/AnnotationResTable.h   |  3 +-
 DSView/pv/data/decode/annotation.cpp         | 32 +++++++++++--------
 DSView/pv/data/decode/annotation.h           |  2 ++
 DSView/pv/data/decode/decoderstatus.h        |  6 ++--
 DSView/pv/dock/protocoldock.cpp              |  7 +++--
 DSView/pv/dock/protocolitemlayer.cpp         | 11 ++++---
 DSView/pv/dsvdef.cpp                         |  9 ++++--
 DSView/pv/dsvdef.h                           |  9 +++---
 decoders/0-i2c/pd.py                         |  3 +-
 decoders/0-spi/pd.py                         |  4 +--
 decoders/0-uart/pd.py                        | 10 +++---
 decoders/1-i2c/pd.py                         |  5 ++-
 decoders/1-uart/pd.py                        |  8 +++--
 libsigrokdecode4DSL/libsigrokdecode.h        |  1 +
 libsigrokdecode4DSL/type_decoder.c           |  9 ++++--
 qtpro/DSView.pro.user                        |  2 +-
 17 files changed, 97 insertions(+), 57 deletions(-)

diff --git a/DSView/pv/data/decode/AnnotationResTable.cpp b/DSView/pv/data/decode/AnnotationResTable.cpp
index f9be9e16..223a3409 100644
--- a/DSView/pv/data/decode/AnnotationResTable.cpp
+++ b/DSView/pv/data/decode/AnnotationResTable.cpp
@@ -24,11 +24,10 @@
 #include "../../dsvdef.h"
 
 #define DECODER_MAX_DATA_BLOCK_LEN 25
-#define FORMAT_TMP_BUFFER_SIZE 100
 
 const char g_bin_cvt_table[] = "0000000100100011010001010110011110001001101010111100110111101111";
-char g_bin_format_tmp_buffer[FORMAT_TMP_BUFFER_SIZE + 3];
-char g_oct_format_tmp_buffer[FORMAT_TMP_BUFFER_SIZE + 6];
+char g_bin_format_tmp_buffer[DECODER_MAX_DATA_BLOCK_LEN * 4 + 2];
+char g_oct_format_tmp_buffer[DECODER_MAX_DATA_BLOCK_LEN * 3 + 2];
 char g_number_tmp_64[30];
  
  char* bin2oct_string(char *buf, int size, const char *bin, int len){
@@ -111,7 +110,7 @@ int AnnotationResTable::MakeIndex(const std::string &key, AnnotationSourceItem*
     m_resourceTable.push_back(item);
 
     item->cur_display_format = -1;
-    item->is_numerical = false;
+    item->is_numeric = false;
     newItem = item;
    
     int dex = m_indexs.size();
@@ -135,9 +134,9 @@ const char* AnnotationResTable::format_numberic(const char *hex_str, int fmt)
 	 }
 	
 	 //convert to bin format
-	 char *buf = g_bin_format_tmp_buffer + FORMAT_TMP_BUFFER_SIZE;
-	 *(buf + 1) = 0; //set the end flag
-	 *buf = 0;
+	 char *buf = g_bin_format_tmp_buffer + sizeof(g_bin_format_tmp_buffer) - 2;
+	 buf[1] = 0; //set the end flag
+	 buf[0] = 0;
 
 	 int len = strlen(data);
 	  //buffer is not enough
@@ -178,11 +177,29 @@ const char* AnnotationResTable::format_numberic(const char *hex_str, int fmt)
 
 	//64 bit integer
 	 if (fmt == DecoderDataFormat::dec && len * 4 <= 64){
-         long long lv = bin2long_string(buf, len *4);
+         long long lv = bin2long_string(buf, len * 4);
 		 g_number_tmp_64[0] = 0;
     	 sprintf(g_number_tmp_64, "%lld", lv);
          return g_number_tmp_64;
 	 }
+	 
+	 //ascii
+	 if (fmt == DecoderDataFormat::ascii && len < 30 - 3){
+		 if (len == 2){
+             int lv = (int)bin2long_string(buf, len * 4);
+			 //can display chars
+			 if (lv >= 33 && lv <= 126){
+				 sprintf(g_number_tmp_64, "%c", (char)lv);
+				 return g_number_tmp_64;
+			 }
+		 }
+		 char * const wr_buf = g_number_tmp_64;
+         g_number_tmp_64[0] = '[';
+         strcpy(g_number_tmp_64 + 1, data);
+         g_number_tmp_64[len+1] = ']';
+         g_number_tmp_64[len+2] = 0;
+         return g_number_tmp_64;
+	 }
 
     return data;    
 }
diff --git a/DSView/pv/data/decode/AnnotationResTable.h b/DSView/pv/data/decode/AnnotationResTable.h
index 3d6ea3ed..1cf98f73 100644
--- a/DSView/pv/data/decode/AnnotationResTable.h
+++ b/DSView/pv/data/decode/AnnotationResTable.h
@@ -28,8 +28,9 @@
 
 struct AnnotationSourceItem
 {
-    bool    is_numerical;
+    bool    is_numeric;
     char    str_number_hex[18]; //numerical value hex format string
+    long long numberic_value;
     std::vector<QString> src_lines; //the origin source string lines
     std::vector<QString> cvt_lines; //the converted to bin/hex/oct format string lines
     int     cur_display_format; //current format  as bin/ex/oct..., init with -1
diff --git a/DSView/pv/data/decode/annotation.cpp b/DSView/pv/data/decode/annotation.cpp
index 87c97c65..6bd60bee 100755
--- a/DSView/pv/data/decode/annotation.cpp
+++ b/DSView/pv/data/decode/annotation.cpp
@@ -40,9 +40,11 @@ char sz_format_tmp_buf[50];
 bool is_hex_number_str(const char *str)
 { 
 	char c = *str;
+	int len = 0;
 
 	while (c)
 	{
+		++len;
 		if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F')){
 			c = *str;
 			str++;
@@ -50,8 +52,7 @@ bool is_hex_number_str(const char *str)
 		}
 		return false;		
 	}
-	
-	return true;
+	return len % 2 == 0 && len > 0;
 }
 
 namespace pv {
@@ -96,19 +97,19 @@ Annotation::Annotation(const srd_proto_data *const pdata, DecoderStatus *status)
 			resItem->src_lines.push_back(QString::fromUtf8(*annotations));
 			annotations++;  
 		}
-
-		//get numerical data
+ 
+		//get numeric data
 		if (pda->str_number_hex[0]){
 			strcpy(resItem->str_number_hex, pda->str_number_hex);
-			resItem->is_numerical = true;
+			resItem->is_numeric = true;
 		}
 		else if (resItem->src_lines.size() == 1 && _type >= 100 && _type < 200){
 			if (is_hex_number_str(resItem->src_lines[0].toLatin1().data())){
-              	resItem->is_numerical = true;
+              	resItem->is_numeric = true;
 			}
 		}
 
-		_status->m_bNumerical |= resItem->is_numerical;
+		_status->m_bNumeric |= resItem->is_numeric;
 	}
 }
 
@@ -126,11 +127,11 @@ Annotation::~Annotation()
 const std::vector<QString>& Annotation::annotations() const
 {
 	 assert(_status);
- 
+
      AnnotationSourceItem &resItem = *annTable.GetItem(_resIndex);
- 
-	//get origin data, is not a numberical value
-     if (!resItem.is_numerical){
+
+	//get origin data, is not a numberic value
+     if (!resItem.is_numeric){
         return resItem.src_lines;
      }
   
@@ -167,8 +168,13 @@ const std::vector<QString>& Annotation::annotations() const
 	 }
 
 	return resItem.cvt_lines;
-}                   
- 
+}       
+
+bool Annotation::is_numberic()
+{
+	AnnotationSourceItem *resItem = annTable.GetItem(_resIndex);
+	return resItem->is_numeric;
+} 
 
 } // namespace decode
 } // namespace data
diff --git a/DSView/pv/data/decode/annotation.h b/DSView/pv/data/decode/annotation.h
index f2025776..629ea6fa 100755
--- a/DSView/pv/data/decode/annotation.h
+++ b/DSView/pv/data/decode/annotation.h
@@ -62,6 +62,8 @@ public:
 		return _type;
 	}  
 
+	bool is_numberic();
+
 public:
 	const std::vector<QString>& annotations() const;
 
diff --git a/DSView/pv/data/decode/decoderstatus.h b/DSView/pv/data/decode/decoderstatus.h
index d80780b3..8761bcc2 100644
--- a/DSView/pv/data/decode/decoderstatus.h
+++ b/DSView/pv/data/decode/decoderstatus.h
@@ -26,13 +26,13 @@ class DecoderStatus
 public:
     DecoderStatus()
     {
-        m_bNumerical = false;
+        m_bNumeric = false;
         m_format = 0;
         sdr_decoder_handle = NULL;
     }
 
 public:
-    bool m_bNumerical; //when decoder get any numerical data,it will be set
+    bool m_bNumeric; //when decoder get any numerical data,it will be set
     int  m_format; //protocol format code
     void *sdr_decoder_handle;
-};
\ No newline at end of file
+};
diff --git a/DSView/pv/dock/protocoldock.cpp b/DSView/pv/dock/protocoldock.cpp
index 9a49da9c..6081c64f 100755
--- a/DSView/pv/dock/protocoldock.cpp
+++ b/DSView/pv/dock/protocoldock.cpp
@@ -618,10 +618,12 @@ void ProtocolDock::search_pre()
         bool ann_valid;
         while(i < _str_list.size()) {
             QString nxt = _str_list.at(i);
+
             do {
                 ann_valid = decoder_stack->list_annotation(ann, col, row);
                 row++;
-            }while(ann_valid && (ann.type() < 100 || ann.type() > 999));
+            }while(ann_valid && !ann.is_numberic());
+
             QString source = ann.annotations().at(0);
             if (ann_valid && source.contains(nxt))
                 i++;
@@ -686,10 +688,11 @@ void ProtocolDock::search_nxt()
 
         while(i < _str_list.size()) {
             QString nxt = _str_list.at(i);
+
             do {
                 ann_valid = decoder_stack->list_annotation(ann, col, row);
                 row++;
-            }while(ann_valid && (ann.type() < 100 || ann.type() > 999));
+            }while(ann_valid && !ann.is_numberic());
 
             auto strlist = ann.annotations();
             QString source = ann.annotations().at(0);
diff --git a/DSView/pv/dock/protocolitemlayer.cpp b/DSView/pv/dock/protocolitemlayer.cpp
index 784c2a19..863bbaa9 100644
--- a/DSView/pv/dock/protocolitemlayer.cpp
+++ b/DSView/pv/dock/protocolitemlayer.cpp
@@ -122,10 +122,13 @@ void ProtocolItemLayer::LoadFormatSelect(bool bSingle)
     m_bSetting = true;
     _format_combox->clear(); 
 
-    _format_combox->addItem("hex");
-    _format_combox->addItem("dec");       
-    _format_combox->addItem("oct");
-    _format_combox->addItem("bin");
+    if (!bSingle){
+        _format_combox->addItem("hex");
+        _format_combox->addItem("dec");       
+        _format_combox->addItem("oct");
+        _format_combox->addItem("bin");
+    }
+     _format_combox->addItem("ascii");
     
     _format_combox->setCurrentIndex(0);
     m_bSetting = false;
diff --git a/DSView/pv/dsvdef.cpp b/DSView/pv/dsvdef.cpp
index 35c57072..113cac13 100644
--- a/DSView/pv/dsvdef.cpp
+++ b/DSView/pv/dsvdef.cpp
@@ -44,15 +44,18 @@ namespace DecoderDataFormat
         if (strcmp(name, "dec") == 0){
             return (int)dec;
         }
-         if (strcmp(name, "hex") == 0){
+        if (strcmp(name, "hex") == 0){
             return (int)hex;
         }
-         if (strcmp(name, "oct") == 0){
+        if (strcmp(name, "oct") == 0){
             return (int)oct;
         }
-         if (strcmp(name, "bin") == 0){
+        if (strcmp(name, "bin") == 0){
             return (int)bin;
         }
+        if (strcmp(name, "ascii") == 0){
+            return (int)ascii;
+        }
         return (int)hex;
     }
 }
diff --git a/DSView/pv/dsvdef.h b/DSView/pv/dsvdef.h
index fc209a79..13c61d51 100644
--- a/DSView/pv/dsvdef.h
+++ b/DSView/pv/dsvdef.h
@@ -49,10 +49,11 @@ namespace DecoderDataFormat
 {
     enum _data_format
     {
-        hex,
-        dec,       
-        oct,
-        bin
+        hex=0,
+        dec=1,       
+        oct=2,
+        bin=3,
+        ascii=4
     };
 
     int Parse(const char *name);       
diff --git a/decoders/0-i2c/pd.py b/decoders/0-i2c/pd.py
index 8cb47ee0..dad9922d 100755
--- a/decoders/0-i2c/pd.py
+++ b/decoders/0-i2c/pd.py
@@ -188,8 +188,7 @@ class Decoder(srd.Decoder):
             self.putx([proto[cmd][0], w])
             self.ss, self.es = self.ss_byte, self.samplenum
 
-        self.putx([proto[cmd][0], ['%s: %02X' % (proto[cmd][1], d),
-                   '%s: %02X' % (proto[cmd][2], d), '%02X' % d]])
+        self.putx([proto[cmd][0], ['%s: {$}' % proto[cmd][1], '%s: {$}' % proto[cmd][2], '{$}', d]])
 
         # Done with this packet.
         self.bitcount = self.databyte = 0
diff --git a/decoders/0-spi/pd.py b/decoders/0-spi/pd.py
index 4708a98d..2d397f02 100755
--- a/decoders/0-spi/pd.py
+++ b/decoders/0-spi/pd.py
@@ -151,9 +151,9 @@ class Decoder(srd.Decoder):
 
         # Dataword annotations.
         if self.have_miso:
-            self.put(ss, es, self.out_ann, [0, ['%02X' % self.misodata]])
+            self.put(ss, es, self.out_ann, [0, [self.misodata]])
         if self.have_mosi:
-            self.put(ss, es, self.out_ann, [1, ['%02X' % self.mosidata]])
+            self.put(ss, es, self.out_ann, [1, [self.mosidata]])
 
     def reset_decoder_state(self):
         self.misodata = 0 if self.have_miso else None
diff --git a/decoders/0-uart/pd.py b/decoders/0-uart/pd.py
index fdb7c28b..9edf2254 100755
--- a/decoders/0-uart/pd.py
+++ b/decoders/0-uart/pd.py
@@ -218,11 +218,11 @@ class Decoder(srd.Decoder):
         if self.options['bit_order'] == 'msb-first':
             bits.reverse()
         self.datavalue = bitpack(bits)
-
-        b = self.datavalue
-        formatted = self.format_value(b)
-        if formatted is not None:
-            self.putx([0, [formatted]])
+        self.putx([0, [self.datavalue]])
+        #b = self.datavalue
+        #formatted = self.format_value(b)
+        #if formatted is not None:
+        #   self.putx([0, [formatted]])
 
         self.databits = []
 
diff --git a/decoders/1-i2c/pd.py b/decoders/1-i2c/pd.py
index fb6af6bb..a163eba4 100755
--- a/decoders/1-i2c/pd.py
+++ b/decoders/1-i2c/pd.py
@@ -213,11 +213,10 @@ class Decoder(srd.Decoder):
         if cmd.startswith('ADDRESS'):
             self.ss, self.es = self.samplenum, self.samplenum + self.bitwidth
             w = ['Write', 'Wr', 'W'] if self.wr else ['Read', 'Rd', 'R']
-            self.putx([proto[cmd][0], w])
+            self.putx([0, w])
             self.ss, self.es = self.ss_byte, self.samplenum
 
-        self.putx([proto[cmd][0], ['%s: %02X' % (proto[cmd][1], d),
-                   '%s: %02X' % (proto[cmd][2], d), '%02X' % d]])
+        self.putx([proto[cmd][0], ['%s: {$}' % proto[cmd][1], '%s: {$}' % proto[cmd][2], '{$}', d]])
 
         # Done with this packet.
         self.bitcount = self.databyte = 0
diff --git a/decoders/1-uart/pd.py b/decoders/1-uart/pd.py
index 1984f4e1..f3d6181c 100755
--- a/decoders/1-uart/pd.py
+++ b/decoders/1-uart/pd.py
@@ -253,10 +253,12 @@ class Decoder(srd.Decoder):
         self.datavalue = bitpack(bits)
         self.putpx(['DATA', 0, (self.datavalue, self.databits)])
 
+        self.putx([0, [self.datavalue]])
+
         b = self.datavalue
-        formatted = self.format_value(b)
-        if formatted is not None:
-            self.putx([0, [formatted]])
+        #formatted = self.format_value(b)
+        #if formatted is not None:
+        #   self.putx([0, [formatted]])
 
         bdata = b.to_bytes(self.bw, byteorder='big')
         self.putbin([0, bdata])
diff --git a/libsigrokdecode4DSL/libsigrokdecode.h b/libsigrokdecode4DSL/libsigrokdecode.h
index 9bc23973..a399de18 100755
--- a/libsigrokdecode4DSL/libsigrokdecode.h
+++ b/libsigrokdecode4DSL/libsigrokdecode.h
@@ -348,6 +348,7 @@ struct srd_proto_data_annotation {
 	int ann_class;
     int ann_type; 
 	char str_number_hex[18]; //numerical value hex format string
+	long long numberic_value;
 	char **ann_text; //text string lines
 };
 struct srd_proto_data_binary {
diff --git a/libsigrokdecode4DSL/type_decoder.c b/libsigrokdecode4DSL/type_decoder.c
index 86599c6b..6199652b 100755
--- a/libsigrokdecode4DSL/type_decoder.c
+++ b/libsigrokdecode4DSL/type_decoder.c
@@ -53,7 +53,7 @@ static void release_annotation(struct srd_proto_data_annotation *pda)
 		g_strfreev(pda->ann_text);
 }
 
-static int py_parse_ann_data(PyObject *list_obj, char ***out_strv, int list_size, char *hex_str_buf)
+static int py_parse_ann_data(PyObject *list_obj, char ***out_strv, int list_size, char *hex_str_buf, long long *numberic_value)
 {
 	PyObject *py_item, *py_bytes;
 	char **strv, *str; 
@@ -93,7 +93,8 @@ static int py_parse_ann_data(PyObject *list_obj, char ***out_strv, int list_size
 
 	if (py_numobj != NULL){
 		lv = PyLong_AsLongLong(py_numobj);
-		sprintf(hex_str_buf, "%02llX", lv); 
+		sprintf(hex_str_buf, "%02llX", lv);
+		*numberic_value = lv;
 	}
 
 	//have no text, only one numberical
@@ -209,7 +210,9 @@ static int convert_annotation(struct srd_decoder_inst *di, PyObject *obj,
 	 
 	pda->str_number_hex[0] = 0;
 	ann_text = NULL;
-    if (py_parse_ann_data(py_tmp, &ann_text, ann_size, pda->str_number_hex) != SRD_OK) {
+	pda->numberic_value = 0;
+
+    if (py_parse_ann_data(py_tmp, &ann_text, ann_size, pda->str_number_hex, &pda->numberic_value) != SRD_OK) {
         srd_err("Protocol decoder %s submitted annotation list, but "
             "second element was malformed.", di->decoder->name);
         goto err;
diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user
index 6fe947fc..e06307fe 100644
--- a/qtpro/DSView.pro.user
+++ b/qtpro/DSView.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2022-01-10T16:21:21. -->
+<!-- Written by QtCreator 4.11.0, 2022-01-10T18:22:56. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

From e080c8b4189302117d788600ea62cb74a07256c6 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Thu, 13 Jan 2022 11:00:53 +0800
Subject: [PATCH 56/58] fix bug for stack decoder can not add and remove

---
 DSView/pv/view/decodetrace.cpp | 160 ++++++++++++++++++++++++++-------
 DSView/pv/view/decodetrace.h   |  21 +++--
 qtpro/DSView.pro.user          |   4 +-
 3 files changed, 145 insertions(+), 40 deletions(-)

diff --git a/DSView/pv/view/decodetrace.cpp b/DSView/pv/view/decodetrace.cpp
index 250ca49c..9c05d62e 100755
--- a/DSView/pv/view/decodetrace.cpp
+++ b/DSView/pv/view/decodetrace.cpp
@@ -53,6 +53,7 @@
 #include "../toolbars/titlebar.h"
 #include "../dsvdef.h"
 #include "../ui/dscombobox.h"
+#include <QDebug>
 
 using namespace boost;
 using namespace std;
@@ -133,6 +134,8 @@ DecodeTrace::DecodeTrace(pv::SigSession *session,
     _start_count = 0;
     _end_index = 0;
     _start_index = 0; 
+    _decoder_container = NULL;
+    _form_base_height = 0;
 
     _decoder_stack = decoder_stack;
     _session = session;
@@ -349,6 +352,8 @@ void DecodeTrace::paint_fore(QPainter &p, int left, int right, QColor fore, QCol
 bool DecodeTrace::create_popup()
 { 
     int ret = false;   //setting have changed flag
+    _form_base_height = 0;
+    _decoder_container = NULL;
     
     dialogs::DSDialog dlg;
     //dlg.setMinimumSize(500,600);
@@ -367,27 +372,59 @@ bool DecodeTrace::create_popup()
         }
     }
 
+    _decoder_container = NULL;
     return ret;
 }
 
 void DecodeTrace::create_popup_form(dialogs::DSDialog *dlg)
 {
-    // Clear the layout
-
     // Transfer the layout and the child widgets to a temporary widget
     // which then goes out of scope destroying the layout and all the child
     // widgets. 
-   QFormLayout *form = new QFormLayout();
+    QFormLayout *form = new QFormLayout();
     form->setVerticalSpacing(5);
     form->setFormAlignment(Qt::AlignLeft);
     form->setLabelAlignment(Qt::AlignLeft);
     form->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
+
+    _decoder_container = new QWidget(dlg);
+    dlg->layout()->addWidget(_decoder_container);
+    
+    QVBoxLayout *decoder_lay = new QVBoxLayout();
+    decoder_lay->setContentsMargins(0, 0, 0, 0);
+    decoder_lay->setDirection(QBoxLayout::TopToBottom);
+    _decoder_container->setLayout(decoder_lay);
+    
     dlg->layout()->addLayout(form);
     dlg->setTitle(tr("Decoder Options"));
 
     populate_popup_form(dlg, form);
 }
 
+void DecodeTrace::load_all_decoder_property(std::list<pv::data::decode::Decoder*> &ls)
+{ 
+    assert(_decoder_container); 
+    QVBoxLayout *lay = dynamic_cast<QVBoxLayout*>(_decoder_container->layout());
+    assert(lay);
+ 
+    for(auto &dec : ls) 
+    { 
+        QWidget *panel = new QWidget(_decoder_container);
+        QFormLayout *form = new QFormLayout();
+        form->setContentsMargins(0,0,0,0);
+        panel->setLayout(form);
+        lay->addWidget(panel);
+       
+        create_decoder_form(_decoder_stack, dec, panel, form);
+
+        decoder_panel_item inf;
+        inf.decoder_handle = dec; 
+        inf.panel = panel;
+        inf.panel_height = 0;
+        _decoder_panels.push_back(inf); 
+	}
+}
+
 void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
 	using pv::data::decode::Decoder;
@@ -401,21 +438,11 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
 	_probe_selectors.clear();
 	_decoder_forms.clear();
 
-    auto &stack = _decoder_stack->stack();
+    load_all_decoder_property(_decoder_stack->stack());
 
-    if (stack.empty()) {
-		QLabel *const l = new QLabel(
-			tr("<p><i>No decoders in the stack</i></p>")); 
-		l->setAlignment(Qt::AlignCenter);
-		form->addRow(l);
-    } else {
-        for(auto &dec : stack) { 
-            create_decoder_form(_decoder_stack, dec, parent, form);
-		}
-
-		form->addRow(new QLabel(
-			tr("<i>* Required channels</i>"), parent));
-	} 
+    if (_decoder_stack->stack().size() > 0){
+        form->addRow(new QLabel(tr("<i>* Required channels</i>"), parent));
+    }
 
     //Add region combobox
     _start_comboBox = new DsComboBox(parent);
@@ -473,13 +500,9 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
     form->addRow(confirm_button_box);
 
     connect(_start_comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(on_region_set(int)));
-
     connect(_end_comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(on_region_set(int)));
-
     connect(decoder_menu, SIGNAL(decoder_selected(srd_decoder *)), this, SLOT(on_stack_decoder(srd_decoder *)));
-
     connect(button_box, SIGNAL(accepted()), parent, SLOT(accept()));
-
     connect(button_box, SIGNAL(rejected()), parent, SLOT(reject()));
 }
 
@@ -775,16 +798,12 @@ DsComboBox* DecodeTrace::create_probe_selector(
 	const srd_channel *const pdch)
 {
 	assert(dec);
-
     const auto &sigs = _session->get_signals();
-
 	assert(_decoder_stack);
 
     data::decode::Decoder *_dec = const_cast<data::decode::Decoder*>(dec);
-
     auto probe_iter = _dec->channels().find(pdch);
 	DsComboBox *selector = new DsComboBox(parent);
-
     selector->addItem("-", QVariant::fromValue(-1));
 
 	if (probe_iter == _dec->channels().end())
@@ -877,25 +896,104 @@ void DecodeTrace::on_decode_done()
 void DecodeTrace::on_probe_selected(int)
 {
 	commit_probes();
-}
+} 
 
 void DecodeTrace::on_stack_decoder(srd_decoder *decoder)
 {
 	assert(decoder);
 	assert(_decoder_stack);
 
-    _decoder_stack->push(new data::decode::Decoder(decoder));
-     
-  //  create_popup_form();
-}
+    auto dec = new data::decode::Decoder(decoder);
 
+    _decoder_stack->push(dec);   
+    std::list<pv::data::decode::Decoder*> items;
+    items.push_back(dec);
+
+    if (_decoder_panels.size()){
+        auto it = _decoder_panels.end();
+        --it;
+        if ((*it).panel_height == 0){
+            (*it).panel_height = (*it).panel->geometry().height();
+        }
+    }
+    
+    if (_decoder_panels.size() == 1 && _decoder_container && _form_base_height == 0){
+        QWidget *dlg = dynamic_cast<QWidget*>(_decoder_container->parent());
+        assert(dlg);
+        _form_base_height = dlg->geometry().height(); 
+    }
+ 
+    load_all_decoder_property(items);
+}
+ 
 void DecodeTrace::on_del_stack(data::decode::Decoder *dec)
 {
     assert(dec);
     assert(_decoder_stack);
 
     _decoder_stack->remove(dec);
- //   create_popup_form();
+
+    std::list<decoder_panel_item> dels; 
+    std::list<pv::data::decode::Decoder*> adds;
+
+    for (auto it = _decoder_panels.begin(); it != _decoder_panels.end(); it++){
+        if ((*it).decoder_handle == dec){
+            dels.push_back((*it));
+            auto del_it = it;
+
+            it++;
+            while (it != _decoder_panels.end())
+            { 
+                 dels.push_back((*it));
+                 adds.push_back((pv::data::decode::Decoder*)(*it).decoder_handle);
+                 it++;
+            }
+            _decoder_panels.erase(del_it);            
+            break;
+        }
+    }   
+  
+    while (true)
+    {
+         if (dels.empty())
+            break;
+
+        auto it = dels.end();
+        it--;
+        auto inf = (*it);
+        assert(inf.panel);     
+ 
+        inf.panel->deleteLater();
+        dels.erase(it);
+
+       for (auto fd = _decoder_panels.begin(); fd != _decoder_panels.end(); ++fd){
+           if ((*fd).decoder_handle == inf.decoder_handle){
+               _decoder_panels.erase(fd);
+               break;
+           }
+       }
+    }
+
+     if (adds.size() > 0){
+        load_all_decoder_property(adds);
+    }
+ 
+// QTimer::singleShot(200, this, SLOT(on_resize_decoder_panel())); 
+}
+
+void DecodeTrace::on_resize_decoder_panel()
+{ 
+    /*
+    int dex = 0;
+  
+    for (auto &panel : _decoder_panels){
+        assert(panel.panel);       
+        dex++;
+        if (dex > 1){
+            panel.panel->setMaximumHeight(panel.panel_height);
+        }
+    } 
+    */
 }
 
 int DecodeTrace::rows_size()
diff --git a/DSView/pv/view/decodetrace.h b/DSView/pv/view/decodetrace.h
index fde1ff23..b76c6360 100755
--- a/DSView/pv/view/decodetrace.h
+++ b/DSView/pv/view/decodetrace.h
@@ -22,20 +22,26 @@
 #ifndef DSVIEW_PV_VIEW_DECODETRACE_H
 #define DSVIEW_PV_VIEW_DECODETRACE_H
 
-#include "trace.h"
 
 #include <list>
 #include <map>
-
 #include <QSignalMapper>
 #include <QFormLayout>
+#include <QWidget>
 
+#include "trace.h"
 #include "../prop/binding/decoderoptions.h"
 #include "../dialogs/dsdialog.h"
 
 struct srd_channel;
 struct srd_decoder;
 
+struct decoder_panel_item{
+	QWidget *panel;
+	void 	*decoder_handle;
+	int 	panel_height;
+};
+
 class DsComboBox;
 
 namespace pv {
@@ -188,22 +194,20 @@ private:
 		data::decode::Decoder *dec);
 
 	void commit_probes();
+	void load_all_decoder_property(std::list<pv::data::decode::Decoder*> &ls);
 
 signals:
     void decoded_progress(int progress);
 
 private slots:
-	void on_new_decode_data();
-  
+	void on_new_decode_data();  
 	void on_probe_selected(int);
-
 	void on_stack_decoder(srd_decoder *decoder);
-
     void on_del_stack(data::decode::Decoder *dec);
 
     void on_decode_done();
-
     void on_region_set(int index);
+	void on_resize_decoder_panel();
 
 public:
 	volatile bool _delete_flag; //detroy it when deocde task end
@@ -223,6 +227,9 @@ private:
 	DsComboBox 		*_end_comboBox;
 	QFormLayout 	*_pub_input_layer;
     int				 _progress;
+	QWidget			*_decoder_container;
+	std::list<decoder_panel_item> 	_decoder_panels;
+	int 			_form_base_height;
 
 	std::list<pv::prop::binding::DecoderOptions*> _bindings;
 	std::list<ProbeSelector> _probe_selectors;
diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user
index e06307fe..37a2b3e0 100644
--- a/qtpro/DSView.pro.user
+++ b/qtpro/DSView.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2022-01-10T18:22:56. -->
+<!-- Written by QtCreator 4.11.0, 2022-01-12T18:07:11. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -141,7 +141,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
       <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">true</value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
      </valuemap>

From 2e0b7d0eace21920b37438ab9476999292f2bdd0 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Wed, 26 Jan 2022 17:20:35 +0800
Subject: [PATCH 57/58] qt pro file

---
 DSView/config.h                   |  4 ++--
 DSView/main.cpp                   |  5 +++++
 DSView/pv/widgets/decodermenu.cpp |  7 +++++--
 qtpro/DSView.pro                  | 20 +++++---------------
 qtpro/DSView.pro.user             |  6 +++---
 5 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/DSView/config.h b/DSView/config.h
index 25d9638f..067e528a 100755
--- a/DSView/config.h
+++ b/DSView/config.h
@@ -27,9 +27,9 @@
 
 /* DSView version information */
 #define DS_VERSION_MAJOR 1
-#define DS_VERSION_MINOR 5
+#define DS_VERSION_MINOR 2
 #define DS_VERSION_MICRO 0
-#define DS_VERSION_STRING "1.5.0"
+#define DS_VERSION_STRING "1.2.0"
 
 #define DS_DEBUG_TRACE
 
diff --git a/DSView/main.cpp b/DSView/main.cpp
index 7a4845d2..e038ae68 100755
--- a/DSView/main.cpp
+++ b/DSView/main.cpp
@@ -111,6 +111,11 @@ int main(int argc, char *argv[])
     QApplication::setOrganizationName("DreamSourceLab");
     QApplication::setOrganizationDomain("www.DreamSourceLab.com");
 
+#ifdef Q_OS_LINUX
+	QCoreApplication::addLibraryPath("/usr/lib/x86_64-linux-gnu/qt5/plugins");
+	printf("qt plugins root:/usr/lib/x86_64-linux-gnu/qt5/plugins\n");
+#endif
+
 	AppControl *control = AppControl::Instance();
 
 	// Parse arguments
diff --git a/DSView/pv/widgets/decodermenu.cpp b/DSView/pv/widgets/decodermenu.cpp
index 39b1c156..f0a7a201 100755
--- a/DSView/pv/widgets/decodermenu.cpp
+++ b/DSView/pv/widgets/decodermenu.cpp
@@ -50,8 +50,11 @@ DecoderMenu::DecoderMenu(QWidget *parent, bool first_level_decoder) :
 	}
 	g_slist_free(l);
 
-	connect(&_mapper, SIGNAL(mapped(QObject*)),
-		this, SLOT(on_action(QObject*)));
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+	connect(&_mapper, SIGNAL(mappedObject(QObject*)), this, SLOT(on_action(QObject*)));
+#else
+	connect(&_mapper, SIGNAL(mapped(QObject*)), this, SLOT(on_action(QObject*)));
+#endif
 }
 
 int DecoderMenu::decoder_name_cmp(const void *a, const void *b)
diff --git a/qtpro/DSView.pro b/qtpro/DSView.pro
index 53e0acad..3ee34059 100644
--- a/qtpro/DSView.pro
+++ b/qtpro/DSView.pro
@@ -32,6 +32,7 @@ CONFIG += c++11
 QT += widgets
 QMAKE_CFLAGS_ISYSTEM = -I
 
+CONFIG += release
 
 TARGET = DSView
 TEMPLATE = app
@@ -69,9 +70,6 @@ INCLUDEPATH += ..
 
 LIBS += /usr/lib/x86_64-linux-gnu/libglib-2.0.so
 LIBS += /usr/lib/x86_64-linux-gnu/libusb-1.0.so
-LIBS += /usr/lib/x86_64-linux-gnu/libboost_thread.so
-LIBS += /usr/lib/x86_64-linux-gnu/libboost_system.so
-LIBS += /usr/lib/x86_64-linux-gnu/libboost_filesystem.so
 LIBS += /usr/lib/x86_64-linux-gnu/libpython3.8.so
 LIBS += /usr/lib/x86_64-linux-gnu/libfftw3.so
 LIBS += /usr/local/lib/libz.so.1.2.11
@@ -87,20 +85,12 @@ INCLUDEPATH += /usr/local/include/boost
 INCLUDEPATH += /Library/Frameworks/Python.framework/Versions/3.4/include/python3.4m
 INCLUDEPATH += ..
 
-#LIBS += -framework CoreFoundation
-#LIBS += -framework CoreServices
-#LIBS += /usr/lib/libiconv.2.dylib
-#LIBS += /usr/local/lib/libpcre.a
-#LIBS += /usr/local/opt/gettext/lib/libintl.a
-#LIBS += /usr/lib/libz.1.dylib
-#LIBS += /usr/lib/libobjc.dylib
-
 LIBS += /usr/local/lib/libglib-2.0.dylib
 LIBS += /usr/local/lib/libusb-1.0.dylib
-LIBS += /usr/local/lib/libboost_atomic-mt.a
-LIBS += /usr/local/lib/libboost_thread-mt.a
-LIBS += /usr/local/lib/libboost_system-mt.a
-LIBS += /usr/local/lib/libboost_filesystem-mt.a
+#LIBS += /usr/local/lib/libboost_atomic-mt.a
+#LIBS += /usr/local/lib/libboost_thread-mt.a
+#LIBS += /usr/local/lib/libboost_system-mt.a
+#LIBS += /usr/local/lib/libboost_filesystem-mt.a
 LIBS += /Library/Frameworks/Python.framework/Versions/3.4/lib/libpython3.4.dylib
 LIBS += /usr/local/lib/libfftw3.a
 }
diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user
index 37a2b3e0..99eacae7 100644
--- a/qtpro/DSView.pro.user
+++ b/qtpro/DSView.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2022-01-12T18:07:11. -->
+<!-- Written by QtCreator 4.11.0, 2022-01-26T13:47:05. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -82,7 +82,7 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">桌面</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">桌面</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{ce867f0c-ef0e-4256-b807-c2554ad78bbf}</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
@@ -141,7 +141,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
       <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">true</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
      </valuemap>

From 8770b9f7339f518c5df5c39ec4eedf869b9a73b8 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Wed, 26 Jan 2022 17:21:21 +0800
Subject: [PATCH 58/58] pro file

---
 qtpro/DSView-mac.pro | 361 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 361 insertions(+)
 create mode 100644 qtpro/DSView-mac.pro

diff --git a/qtpro/DSView-mac.pro b/qtpro/DSView-mac.pro
new file mode 100644
index 00000000..b5d06417
--- /dev/null
+++ b/qtpro/DSView-mac.pro
@@ -0,0 +1,361 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2013-07-24T17:32:25
+#
+#-------------------------------------------------
+
+QT += core gui
+CONFIG -= lib_bundle
+CONFIG += app_bundle
+macx {
+QT += svg
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000
+#CONFIG += sdk_no_version_check
+}
+CONFIG += exceptions
+CONFIG += object_parallel_to_source
+CONFIG += c++11
+QT += widgets
+#QT+= core5compat
+
+#QMAKE_CFLAGS_ISYSTEM = -I
+
+TARGET = DSView
+TEMPLATE = app
+
+TRANSLATIONS = my_CN.ts
+
+CONFIG += decoders
+DEFINES += decoders
+
+macx: {
+INCLUDEPATH += /usr/local/include/
+INCLUDEPATH += /usr/local/Cellar/glib/2.70.1/include/glib-2.0
+INCLUDEPATH += /usr/local/Cellar/glib/2.70.1/lib/glib-2.0/include
+INCLUDEPATH += /usr/local/Cellar/libusb/1.0.24/include/libusb-1.0
+INCLUDEPATH += /usr/local/Cellar/boost/1.76.0/include
+INCLUDEPATH += /usr/local/Cellar/python@3.9/3.9.9/frameworks/Python.framework/versions/3.9/include/python3.9
+INCLUDEPATH += /usr/local/Cellar/libzip/1.8.0_1/include
+INCLUDEPATH += /usr/local/Cellar/fftw/3.3.10/include
+INCLUDEPATH += /usr/local/Cellar/zlib/1.2.11/include
+
+INCLUDEPATH += ..
+INCLUDEPATH += ../libsigrok4DSL
+INCLUDEPATH += ../DSView
+INCLUDEPATH += ../DSView/pv/dialogs
+
+LIBS += /usr/local/Cellar/glib/2.70.1/lib/libglib-2.0.dylib
+LIBS += /usr/local/Cellar/libusb/1.0.24/lib/libusb-1.0.dylib
+LIBS += /usr/local/Cellar/python@3.9/3.9.9/frameworks/Python.framework/versions/3.9/lib/libpython3.9.dylib
+LIBS += /usr/local/Cellar/fftw/3.3.10/lib/libfftw3.a
+LIBS += /usr/local/Cellar/zlib/1.2.11/lib/libz.1.2.11.dylib
+LIBS += /usr/local/Cellar/libzip/1.8.0_1/lib/libzip.5.4.dylib
+}
+
+SOURCES += \
+    ../DSView/main.cpp \
+    ../DSView/pv/sigsession.cpp \
+    ../DSView/pv/mainwindow.cpp \
+    ../DSView/pv/devicemanager.cpp \
+    ../DSView/pv/data/snapshot.cpp \
+    ../DSView/pv/data/signaldata.cpp \
+    ../DSView/pv/data/logicsnapshot.cpp \
+    ../DSView/pv/data/logic.cpp \
+    ../DSView/pv/data/analogsnapshot.cpp \
+    ../DSView/pv/data/analog.cpp \
+    ../DSView/pv/dialogs/deviceoptions.cpp \
+    ../DSView/pv/prop/property.cpp \
+    ../DSView/pv/prop/int.cpp \
+    ../DSView/pv/prop/enum.cpp \
+    ../DSView/pv/prop/double.cpp \
+    ../DSView/pv/prop/bool.cpp \
+    ../DSView/pv/prop/binding/binding.cpp \
+    ../DSView/pv/toolbars/samplingbar.cpp \
+    ../DSView/pv/ui/dscombobox.cpp \
+    ../DSView/pv/view/viewport.cpp \
+    ../DSView/pv/view/view.cpp \
+    ../DSView/pv/view/timemarker.cpp \
+    ../DSView/pv/view/signal.cpp \
+    ../DSView/pv/view/ruler.cpp \
+    ../DSView/pv/view/logicsignal.cpp \
+    ../DSView/pv/view/header.cpp \
+    ../DSView/pv/view/cursor.cpp \
+    ../DSView/pv/view/analogsignal.cpp \
+    ../DSView/pv/prop/binding/deviceoptions.cpp \
+    ../DSView/pv/toolbars/trigbar.cpp \
+    ../DSView/pv/toolbars/filebar.cpp \
+    ../DSView/pv/dock/triggerdock.cpp \
+    ../DSView/pv/dock/measuredock.cpp \
+    ../DSView/pv/dock/searchdock.cpp \
+    ../DSView/pv/toolbars/logobar.cpp \
+    ../DSView/pv/data/groupsnapshot.cpp \
+    ../DSView/pv/view/groupsignal.cpp \
+    ../DSView/pv/data/group.cpp \
+    ../DSView/pv/dialogs/about.cpp \
+    ../DSView/pv/dialogs/search.cpp \
+    ../DSView/pv/data/dsosnapshot.cpp \
+    ../DSView/pv/data/dso.cpp \
+    ../DSView/pv/view/dsosignal.cpp \
+    ../DSView/pv/view/dsldial.cpp \
+    ../DSView/pv/dock/dsotriggerdock.cpp \
+    ../DSView/pv/view/trace.cpp \
+    ../DSView/pv/view/selectableitem.cpp \
+    ../DSView/pv/widgets/fakelineedit.cpp \
+    ../DSView/pv/prop/string.cpp \
+    ../DSView/pv/device/sessionfile.cpp \
+    ../DSView/pv/device/inputfile.cpp \
+    ../DSView/pv/device/file.cpp \
+    ../DSView/pv/device/devinst.cpp \
+    ../DSView/pv/dialogs/storeprogress.cpp \
+    ../DSView/pv/storesession.cpp \
+    ../DSView/pv/view/devmode.cpp \
+    ../DSView/pv/device/device.cpp \
+    ../DSView/pv/dialogs/waitingdialog.cpp \
+    ../DSView/pv/dialogs/dsomeasure.cpp \
+    ../DSView/pv/dialogs/calibration.cpp \
+    ../DSView/pv/dialogs/fftoptions.cpp \
+    ../DSView/dsapplication.cpp \
+    ../DSView/pv/toolbars/titlebar.cpp \
+    ../DSView/pv/mainframe.cpp \
+    ../DSView/pv/widgets/border.cpp \
+    ../DSView/pv/dialogs/dsmessagebox.cpp \
+    ../DSView/pv/dialogs/shadow.cpp \
+    ../DSView/pv/dialogs/dsdialog.cpp \
+    ../DSView/pv/dialogs/interval.cpp \
+    ../DSView/pv/prop/binding/probeoptions.cpp \
+    ../DSView/pv/view/xcursor.cpp \
+    ../DSView/pv/view/viewstatus.cpp \
+    ../DSView/pv/dialogs/lissajousoptions.cpp \
+    ../DSView/pv/view/lissajoustrace.cpp \
+    ../DSView/pv/view/spectrumtrace.cpp \
+    ../DSView/pv/data/spectrumstack.cpp \
+    ../DSView/pv/view/mathtrace.cpp \
+    ../DSView/pv/dialogs/mathoptions.cpp \
+    ../DSView/pv/data/mathstack.cpp \
+    ../DSView/pv/dialogs/regionoptions.cpp \
+    ../DSView/pv/ZipMaker.cpp \
+    ../DSView/pv/data/decode/AnnotationResTable.cpp \
+    ../DSView/pv/ui/msgbox.cpp \
+    ../DSView/pv/dock/protocolitemlayer.cpp \
+    ../DSView/pv/config/appconfig.cpp \
+    ../DSView/pv/dsvdef.cpp \
+    ../DSView/pv/minizip/zip.c \
+    ../DSView/pv/minizip/unzip.c \
+    ../DSView/pv/minizip/ioapi.c \
+    ../DSView/pv/dialogs/applicationpardlg.cpp \
+    ../DSView/pv/appcontrol.cpp \
+    ../DSView/pv/eventobject.cpp \
+    ../DSView/pv/dstimer.cpp
+
+HEADERS  += \
+    ../DSView/extdef.h \
+    ../DSView/config.h \
+    ../DSView/pv/sigsession.h \
+    ../DSView/pv/mainwindow.h \
+    ../DSView/pv/devicemanager.h \
+    ../DSView/pv/data/snapshot.h \
+    ../DSView/pv/data/signaldata.h \
+    ../DSView/pv/data/logicsnapshot.h \
+    ../DSView/pv/data/logic.h \
+    ../DSView/pv/data/analogsnapshot.h \
+    ../DSView/pv/data/analog.h \
+    ../DSView/pv/dialogs/deviceoptions.h \
+    ../DSView/pv/prop/property.h \
+    ../DSView/pv/prop/int.h \
+    ../DSView/pv/prop/enum.h \
+    ../DSView/pv/prop/double.h \
+    ../DSView/pv/prop/bool.h \
+    ../DSView/pv/prop/binding/deviceoptions.h \
+    ../DSView/pv/prop/binding/binding.h \
+    ../DSView/pv/toolbars/samplingbar.h \
+    ../DSView/pv/ui/dscombobox.h \
+    ../DSView/pv/view/viewport.h \
+    ../DSView/pv/view/view.h \
+    ../DSView/pv/view/timemarker.h \
+    ../DSView/pv/view/signal.h \
+    ../DSView/pv/view/ruler.h \
+    ../DSView/pv/view/logicsignal.h \
+    ../DSView/pv/view/header.h \
+    ../DSView/pv/view/cursor.h \
+    ../DSView/pv/view/analogsignal.h \
+    ../DSView/pv/toolbars/trigbar.h \
+    ../DSView/pv/toolbars/filebar.h \
+    ../DSView/pv/dock/triggerdock.h \
+    ../DSView/pv/dock/measuredock.h \
+    ../DSView/pv/dock/searchdock.h \
+    ../DSView/pv/toolbars/logobar.h \
+    ../DSView/pv/data/groupsnapshot.h \
+    ../DSView/pv/view/groupsignal.h \
+    ../DSView/pv/data/group.h \
+    ../DSView/pv/dialogs/about.h \
+    ../DSView/pv/dialogs/search.h \
+    ../DSView/pv/data/dso.h \
+    ../DSView/pv/data/dsosnapshot.h \
+    ../DSView/pv/view/dsosignal.h \
+    ../DSView/pv/view/dsldial.h \
+    ../DSView/pv/dock/dsotriggerdock.h \
+    ../DSView/pv/view/trace.h \
+    ../DSView/pv/view/selectableitem.h \
+    ../DSView/pv/widgets/fakelineedit.h \
+    ../DSView/pv/prop/string.h \
+    ../DSView/pv/device/sessionfile.h \
+    ../DSView/pv/device/inputfile.h \
+    ../DSView/pv/device/file.h \
+    ../DSView/pv/device/devinst.h \
+    ../DSView/pv/dialogs/storeprogress.h \
+    ../DSView/pv/storesession.h \
+    ../DSView/pv/view/devmode.h \
+    ../DSView/pv/device/device.h \
+    ../DSView/pv/dialogs/waitingdialog.h \
+    ../DSView/pv/dialogs/dsomeasure.h \
+    ../DSView/pv/dialogs/calibration.h \
+    ../DSView/pv/dialogs/fftoptions.h \
+    ../DSView/dsapplication.h \
+    ../DSView/pv/toolbars/titlebar.h \
+    ../DSView/pv/mainframe.h \
+    ../DSView/pv/widgets/border.h \
+    ../DSView/pv/dialogs/dsmessagebox.h \
+    ../DSView/pv/dialogs/shadow.h \
+    ../DSView/pv/dialogs/dsdialog.h \
+    ../DSView/pv/dialogs/interval.h \
+    ../DSView/config.h \
+    ../libsigrok4DSL/config.h \
+    ../DSView/pv/prop/binding/probeoptions.h \
+    ../libsigrok4DSL/hardware/demo/demo.h \
+    ../DSView/pv/view/xcursor.h \
+    ../DSView/pv/view/viewstatus.h \
+    ../DSView/pv/dialogs/lissajousoptions.h \
+    ../DSView/pv/view/lissajoustrace.h \
+    ../DSView/pv/view/spectrumtrace.h \
+    ../DSView/pv/data/spectrumstack.h \
+    ../DSView/pv/view/mathtrace.h \
+    ../DSView/pv/dialogs/mathoptions.h \
+    ../DSView/pv/data/mathstack.h \
+    ../DSView/pv/dialogs/regionoptions.h \
+    ../DSView/mystyle.h \
+    ../DSView/pv/ZipMaker.h \
+    ../DSView/pv/data/decode/AnnotationResTable.h \
+    ../DSView/pv/ui/msgbox.h \
+    ../DSView/pv/dock/protocolitemlayer.h \
+    ../DSView/pv/config/appconfig.h \
+    ../DSView/pv/dsvdef.h \
+    ../DSView/pv/minizip/zip.h \
+    ../DSView/pv/minizip/unzip.h \
+    ../DSView/pv/minizip/ioapi.h \
+    ../DSView/pv/dialogs/applicationpardlg.h \
+    ../DSView/pv/appcontrol.h \
+    ../DSView/pv/eventobject.h \
+    ../DSView/pv/dstimer.h
+
+SOURCES += \
+    ../libsigrok4DSL/version.c \
+    ../libsigrok4DSL/strutil.c \
+    ../libsigrok4DSL/std.c \
+    ../libsigrok4DSL/session_file.c \
+    ../libsigrok4DSL/session_driver.c \
+    ../libsigrok4DSL/session.c \
+    ../libsigrok4DSL/log.c \
+    ../libsigrok4DSL/hwdriver.c \
+    ../libsigrok4DSL/error.c \
+    ../libsigrok4DSL/backend.c \
+    ../libsigrok4DSL/output/output.c \
+    ../libsigrok4DSL/input/input.c \
+    ../libsigrok4DSL/hardware/demo/demo.c \
+    ../libsigrok4DSL/input/in_binary.c \
+    ../libsigrok4DSL/input/in_vcd.c \
+    ../libsigrok4DSL/input/in_wav.c \
+    ../libsigrok4DSL/output/csv.c \
+    ../libsigrok4DSL/output/gnuplot.c \
+    ../libsigrok4DSL/output/srzip.c \
+    ../libsigrok4DSL/output/vcd.c \
+    ../libsigrok4DSL/hardware/DSL/dslogic.c \
+    ../libsigrok4DSL/hardware/common/usb.c \
+    ../libsigrok4DSL/hardware/common/ezusb.c \
+    ../libsigrok4DSL/trigger.c \
+    ../libsigrok4DSL/dsdevice.c \
+    ../libsigrok4DSL/hardware/DSL/dscope.c \
+    ../libsigrok4DSL/hardware/DSL/command.c \
+    ../libsigrok4DSL/hardware/DSL/dsl.c
+
+HEADERS  += \
+    ../libsigrok4DSL/version.h \
+    ../libsigrok4DSL/proto.h \
+    ../libsigrok4DSL/libsigrok-internal.h \
+    ../libsigrok4DSL/libsigrok.h \
+    ../libsigrok4DSL/config.h \
+    ../libsigrok4DSL/hardware/DSL/command.h \
+    ../libsigrok4DSL/hardware/DSL/dsl.h
+
+decoders {
+DEFINES += ENABLE_DECODE
+SOURCES += \
+    ../DSView/pv/data/decoderstack.cpp \
+    ../DSView/pv/data/decode/rowdata.cpp \
+    ../DSView/pv/data/decode/row.cpp \
+    ../DSView/pv/data/decode/decoder.cpp \
+    ../DSView/pv/data/decode/annotation.cpp \
+    ../DSView/pv/view/decodetrace.cpp \
+    ../DSView/pv/prop/binding/decoderoptions.cpp \
+    ../DSView/pv/dock/protocoldock.cpp \
+    ../DSView/pv/dialogs/protocollist.cpp \
+    ../DSView/pv/dialogs/protocolexp.cpp \
+    ../DSView/pv/widgets/decodermenu.cpp \
+    ../DSView/pv/widgets/decodergroupbox.cpp \
+    ../DSView/pv/data/decodermodel.cpp
+
+HEADERS  += \
+    ../DSView/pv/data/decoderstack.h \
+    ../DSView/pv/data/decode/rowdata.h \
+    ../DSView/pv/data/decode/row.h \
+    ../DSView/pv/data/decode/decoder.h \
+    ../DSView/pv/data/decode/annotation.h \
+    ../DSView/pv/view/decodetrace.h \
+    ../DSView/pv/prop/binding/decoderoptions.h \
+    ../DSView/pv/dock/protocoldock.h \
+    ../DSView/pv/dialogs/protocollist.h \
+    ../DSView/pv/dialogs/protocolexp.h \
+    ../DSView/pv/widgets/decodermenu.h \
+    ../DSView/pv/widgets/decodergroupbox.h \
+    ../DSView/pv/data/decodermodel.h
+
+
+#unix:!macx {
+#}else{
+SOURCES += \
+    #../libsigrokdecode4DSL/type_logic.c \
+    ../libsigrokdecode4DSL/type_decoder.c \
+    ../libsigrokdecode4DSL/srd.c \
+    ../libsigrokdecode4DSL/module_sigrokdecode.c \
+    ../libsigrokdecode4DSL/decoder.c \
+    ../libsigrokdecode4DSL/error.c \
+    ../libsigrokdecode4DSL/exception.c \
+    ../libsigrokdecode4DSL/instance.c \
+    ../libsigrokdecode4DSL/log.c \
+    ../libsigrokdecode4DSL/session.c \
+    ../libsigrokdecode4DSL/util.c \
+    ../libsigrokdecode4DSL/version.c
+
+HEADERS  += \
+    ../libsigrokdecode4DSL/libsigrokdecode-internal.h \
+    ../libsigrokdecode4DSL/libsigrokdecode.h \
+    ../libsigrokdecode4DSL/config.h \
+    ../libsigrokdecode4DSL/version.h
+#}
+}
+
+FORMS +=
+
+RESOURCES += \
+    ../DSView/DSView.qrc \
+    ../DSView/themes/breeze.qrc \
+    language.qrc
+
+ICON = DSView.icns
+
+MOC_DIR  = ../../DSView-build/MOC_DIR
+RCC_DIR  = ../../DSView-build/RCC_DIR
+UI_HEADERS_DIR  = ../../DSView-build/UI_HEADERS_DIR
+UI_SOURCES_DIR = ../../DSView-build/UI_SOURCES_DIR
+UI_DIR   = ../../DSView-build/UI_DIR
+OBJECTS_DIR = ../../DSView-build/OBJECTS_DIR
+DESTDIR  = ../../DSView-build/bin