rename project for upgrade

DSView/CMakeLists.txt

 ##
-## This file is part of the PulseView project.
+## This file is part of the DSView project.
 ##
 ## Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
 ## Copyright (C) 2012-2013 Alexandru Gagniuc <mr.nuke.me@gmail.com>
@@ -26,7 +26,7 @@ include(GNUInstallDirs)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
 
-project(DSLogic)
+project(DSView)
 
 #===============================================================================
 #= User Options
@@ -60,7 +60,7 @@ endif()
 #-------------------------------------------------------------------------------
 
 list(APPEND PKGDEPS
-	"libsigrok4DSLogic >= 0.2.0"
+	"libsigrok4DSL >= 0.2.0"
 	"libusb-1.0 >= 1.0.16"
 )
 if(ENABLE_DECODE)
@@ -98,12 +98,12 @@ find_package(libusb-1.0 REQUIRED)
 #= Config Header
 #-------------------------------------------------------------------------------
 
-set(DS_TITLE DSLogic)
-set(DS_DESCRIPTION "A GUI for DSLogic")
+set(DS_TITLE DSView)
+set(DS_DESCRIPTION "A GUI for instruments of DreamSourceLab")
 
 set(DS_VERSION_MAJOR 0)
-set(DS_VERSION_MINOR 4)
-set(DS_VERSION_MICRO 0)
+set(DS_VERSION_MINOR 9)
+set(DS_VERSION_MICRO 2)
 set(DS_VERSION_STRING
 	${DS_VERSION_MAJOR}.${DS_VERSION_MINOR}.${DS_VERSION_MICRO}
 )
@@ -117,7 +117,7 @@ configure_file (
 #= Sources
 #-------------------------------------------------------------------------------
 
-set(DSLogic_SOURCES
+set(DSView_SOURCES
 	main.cpp
 	pv/devicemanager.cpp
 	pv/mainwindow.cpp
@@ -142,6 +142,8 @@ set(DSLogic_SOURCES
 	pv/dialogs/deviceoptions.cpp
 	pv/dialogs/search.cpp
 	pv/dialogs/storeprogress.cpp
+	pv/dialogs/streamoptions.cpp
+	pv/dialogs/waitingdialog.cpp
 	pv/dock/dsotriggerdock.cpp
 	pv/dock/measuredock.cpp
 	pv/dock/searchdock.cpp
@@ -153,7 +155,7 @@ set(DSLogic_SOURCES
 	pv/prop/property.cpp
 	pv/prop/string.cpp
 	pv/prop/binding/binding.cpp
-	pv/prop/binding/deviceoptions.cpp
+	pv/prop/binding/binding_deviceoptions.cpp
 	pv/toolbars/filebar.cpp
 	pv/toolbars/logobar.cpp
 	pv/toolbars/samplingbar.cpp
@@ -176,7 +178,7 @@ set(DSLogic_SOURCES
 	pv/widgets/fakelineedit.cpp
 )
 
-set(DSLogic_HEADERS
+set(DSView_HEADERS
 	pv/mainwindow.h
 	pv/sigsession.h
 	pv/storesession.h
@@ -185,6 +187,8 @@ set(DSLogic_HEADERS
 	pv/dialogs/deviceoptions.h
 	pv/dialogs/search.h
 	pv/dialogs/storeprogress.h
+	pv/dialogs/streamoptions.h
+	pv/dialogs/waitingdialog.h
 	pv/dock/dsotriggerdock.h
 	pv/dock/measuredock.h
 	pv/dock/searchdock.h
@@ -211,17 +215,17 @@ set(DSLogic_HEADERS
 	pv/widgets/fakelineedit.h
 )
 
-set(DSLogic_FORMS
+set(DSView_FORMS
 	pv/dialogs/about.ui
 )
 
-set(DSLogic_RESOURCES
-	DSLogic.qrc
+set(DSView_RESOURCES
+	DSView.qrc
 )
 
 
 if(ENABLE_DECODE)
-	list(APPEND DSLogic_SOURCES
+	list(APPEND DSView_SOURCES
 	        pv/dock/protocoldock.cpp
 		pv/data/decoderstack.cpp
 		pv/data/decode/annotation.cpp
@@ -234,7 +238,7 @@ if(ENABLE_DECODE)
 		pv/widgets/decodermenu.cpp
 	)
 
-	list(APPEND DSLogic_HEADERS
+	list(APPEND DSView_HEADERS
 	        pv/dock/protocoldock.h
 		pv/data/decoderstack.h
 		pv/view/decodetrace.h
@@ -244,20 +248,20 @@ if(ENABLE_DECODE)
 endif()
 
 if(WIN32)
-	# Use the DSLogic icon for the DSLogic.exe executable.
+	# Use the DSView icon for the DSView.exe executable.
 	set(CMAKE_RC_COMPILE_OBJECT "${CMAKE_RC_COMPILER} -O coff -I${CMAKE_CURRENT_SOURCE_DIR} <SOURCE> <OBJECT>")
 	enable_language(RC)
-	list(APPEND DSLogic_SOURCES DSLogic.rc)
+	list(APPEND DSView_SOURCES DSView.rc)
 endif()
 
 if(Qt5Core_FOUND)
-	qt5_wrap_cpp(DSLogic_HEADERS_MOC ${DSLogic_HEADERS})
-	qt5_wrap_ui(DSLogic_FORMS_HEADERS ${DSLogic_FORMS})
-	qt5_add_resources(DSLogic_RESOURCES_RCC ${DSLogic_RESOURCES})
+	qt5_wrap_cpp(DSView_HEADERS_MOC ${DSView_HEADERS})
+	qt5_wrap_ui(DSView_FORMS_HEADERS ${DSView_FORMS})
+	qt5_add_resources(DSView_RESOURCES_RCC ${DSView_RESOURCES})
 else()
-	qt4_wrap_cpp(DSLogic_HEADERS_MOC ${DSLogic_HEADERS})
-	qt4_wrap_ui(DSLogic_FORMS_HEADERS ${DSLogic_FORMS})
-	qt4_add_resources(DSLogic_RESOURCES_RCC ${DSLogic_RESOURCES})
+	qt4_wrap_cpp(DSView_HEADERS_MOC ${DSView_HEADERS})
+	qt4_wrap_ui(DSView_FORMS_HEADERS ${DSView_FORMS})
+	qt4_add_resources(DSView_RESOURCES_RCC ${DSView_RESOURCES})
 	include(${QT_USE_FILE})
 endif()
 
@@ -299,7 +303,7 @@ endif()
 
 link_directories(${Boost_LIBRARY_DIRS})
 
-set(DSLOGIC_LINK_LIBS
+set(DSVIEW_LINK_LIBS
 	${Boost_LIBRARIES}
 	${CMAKE_THREAD_LIBS_INIT}
 	${QT_LIBRARIES}
@@ -308,25 +312,25 @@ set(DSLOGIC_LINK_LIBS
 
 if(STATIC_PKGDEPS_LIBS)
 	link_directories(${PKGDEPS_STATIC_LIBRARY_DIRS})
-	list(APPEND DSLOGIC_LINK_LIBS ${PKGDEPS_STATIC_LIBRARIES})
+	list(APPEND DSVIEW_LINK_LIBS ${PKGDEPS_STATIC_LIBRARIES})
 if(WIN32)
 	# Workaround for a MinGW linking issue.
 	list(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2")
 endif()
 else()
 	link_directories(${PKGDEPS_LIBRARY_DIRS})
-	list(APPEND DSLOGIC_LINK_LIBS ${PKGDEPS_LIBRARIES})
+	list(APPEND DSVIEW_LINK_LIBS ${PKGDEPS_LIBRARIES})
 endif()
 
 
 add_executable(${PROJECT_NAME}
-	${DSLogic_SOURCES}
-	${DSLogic_HEADERS_MOC}
-	${DSLogic_FORMS_HEADERS}
-	${DSLogic_RESOURCES_RCC}
+	${DSView_SOURCES}
+	${DSView_HEADERS_MOC}
+	${DSView_FORMS_HEADERS}
+	${DSView_RESOURCES_RCC}
 )
 
-target_link_libraries(${PROJECT_NAME} ${DSLOGIC_LINK_LIBS})
+target_link_libraries(${PROJECT_NAME} ${DSVIEW_LINK_LIBS})
 
 if(WIN32)
 # Pass -mwindows so that no "DOS box" will open when PulseView is started.
@@ -349,6 +353,10 @@ install(TARGETS ${PROJECT_NAME} DESTINATION bin/)
 install(FILES res/DSLogic.fw DESTINATION bin/res/)
 install(FILES res/DSLogic33.bin DESTINATION bin/res/)
 install(FILES res/DSLogic50.bin DESTINATION bin/res/)
+install(FILES res/DSLogicPro.fw DESTINATION bin/res/)
+install(FILES res/DSLogicPro.bin DESTINATION bin/res/)
+install(FILES res/DSCope.fw DESTINATION bin/res/)
+install(FILES res/DSCope.bin DESTINATION bin/res/)
 
 #===============================================================================
 #= Packaging (handled by CPack)
@@ -373,5 +381,5 @@ include(CPack)
 if(ENABLE_TESTS)
 	add_subdirectory(test)
 	enable_testing()
-	add_test(test ${CMAKE_CURRENT_BINARY_DIR}/test/DSLogic-test)
+	add_test(test ${CMAKE_CURRENT_BINARY_DIR}/test/DSView-test)
 endif(ENABLE_TESTS)

DSView/DSView.qrc

@@ -35,5 +35,6 @@
         <file>icons/params_dis.png</file>
         <file>icons/gear.png</file>
         <file>icons/wiki.png</file>
+        <file>icons/wait.gif</file>
     </qresource>
 </RCC>

DSView/INSTALL

@@ -16,15 +16,15 @@ Requirements
  - libboost >= 1.42 (including the following libs):
     - libboost-system
     - libboost-thread
- - libsigrok4DSLogic >= 0.2.0
+ - libsigrok4DSL >= 0.2.0
 
 
 Building and installing
 -----------------------
-Get the DSLogic-gui source code from: www.dreamsourcelab.com/download.html
+Get the DSView source code from: www.dreamsourcelab.com/download.html
 In order to build it, run:
 
- $ cd DSLogic-gui
+ $ cd DSView
  $ cmake .
  $ make
 

DSView/README

 -------------------------------------------------------------------------------
 README
 -------------------------------------------------------------------------------
-DSLogic-gui is GUI for DSLogic software, it's based on PulseView
+DSView is a GUI for instruments of DreamSourceLab, it's based on PulseView
 from the sigrok project.
 
 The sigrok project aims at creating a portable, cross-platform,
@@ -14,7 +14,7 @@ PulseView is a Qt-based LA/scope/MSO GUI for sigrok.
 Status
 ------
 
-DSLogic-gui is in a usable state and has had official tarball releases.
+DSView is in a usable state and has had official tarball releases.
 
 However, it is still work in progress. Some basic functionality
 is available and working, but other things are still on the TODO list.
@@ -23,7 +23,7 @@ is available and working, but other things are still on the TODO list.
 Copyright and license
 ---------------------
 
-DSLogic-gui is licensed under the terms of the GNU General Public License
+DSView is licensed under the terms of the GNU General Public License
 (GPL), version 3 or later.
 
 While some individual source code files are licensed under the GPLv2+, and

DSView/cmake_clear

+echo "rm cmake cache begin..."
+rm ./cmake_install.cmake
+rm -r ./CMakeFiles
+rm ./Makefile
+rm ./CMakeCache.txt
+echo "rm cmake cache end..."

DSView/config.h.in

@@ -17,15 +17,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _DSLOGIC_CONFIG_H
-#define _DSLOGIC_CONFIG_H
+#ifndef _DSVIEW_CONFIG_H
+#define _DSVIEW_CONFIG_H
 
 /* Application details */
 #define DS_TITLE "@DS_TITLE@"
 #define DS_DESCRIPTION "@DS_DESCRIPTION@"
 #define DS_BIN_NAME "@PROJECT_NAME@"
 
-/* DSLogic version information */
+/* DSView version information */
 #define DS_VERSION_MAJOR @DS_VERSION_MAJOR@
 #define DS_VERSION_MINOR @DS_VERSION_MINOR@
 #define DS_VERSION_MICRO @DS_VERSION_MICRO@

DSView/extdef.h

 /*
- * This file is part of the DSLogic-gui project.
- * DSLogic-gui is based on PulseView.
+ * 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 <dreamsourcelab@dreamsourcelab.com>
@@ -21,12 +21,12 @@
  */
 
 
-#ifndef DSLOGIC_EXTDEF_H
-#define DSLOGIC_EXTDEF_H
+#ifndef DSVIEW_EXTDEF_H
+#define DSVIEW_EXTDEF_H
 
 #define countof(x) (sizeof(x)/sizeof(x[0]))
 
 #define begin_element(x) (&x[0])
 #define end_element(x) (&x[countof(x)])
 
-#endif // DSLOGIC_EXTDEF_H
+#endif // DSVIEW_EXTDEF_H

DSView/main.cpp

 /*
- * This file is part of the DSLogic-gui project.
- * DSLogic-gui is based on PulseView.
+ * 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 <dreamsourcelab@dreamsourcelab.com>
@@ -26,7 +26,7 @@
 #endif
 
 #include <stdint.h>
-#include <libsigrok4DSLogic/libsigrok.h>
+#include <libsigrok4DSL/libsigrok.h>
 
 #include <getopt.h>
 
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
 
 	// Set some application metadata
     	QApplication::setApplicationVersion(DS_VERSION_STRING);
-    	QApplication::setApplicationName("DSLogic(Beta)");
+        QApplication::setApplicationName("DSView(Beta)");
     	QApplication::setOrganizationDomain("http://www.DreamSourceLab.com");
 
 	// Parse arguments

DSView/pv/data/analog.cpp

 /*
- * This file is part of the DSLogic-gui project.
- * DSLogic-gui is based on PulseView.
+ * 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 <dreamsourcelab@dreamsourcelab.com>
@@ -30,17 +30,11 @@ using namespace std;
 namespace pv {
 namespace data {
 
-Analog::Analog(unsigned int num_probes) :
-    SignalData(),
-    _num_probes(num_probes)
+Analog::Analog() :
+    SignalData()
 {
 }
 
-int Analog::get_num_probes() const
-{
-    return _num_probes;
-}
-
 void Analog::push_snapshot(boost::shared_ptr<AnalogSnapshot> &snapshot)
 {
 	_snapshots.push_front(snapshot);

DSView/pv/data/analog.h

 /*
- * This file is part of the DSLogic-gui project.
- * DSLogic-gui is based on PulseView.
+ * 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 <dreamsourcelab@dreamsourcelab.com>
@@ -21,8 +21,8 @@
  */
 
 
-#ifndef DSLOGIC_PV_DATA_ANALOG_H
-#define DSLOGIC_PV_DATA_ANALOG_H
+#ifndef DSVIEW_PV_DATA_ANALOG_H
+#define DSVIEW_PV_DATA_ANALOG_H
 
 #include "signaldata.h"
 
@@ -37,9 +37,7 @@ class AnalogSnapshot;
 class Analog : public SignalData
 {
 public:
-    Analog(unsigned int num_probes);
-
-    int get_num_probes() const;
+    Analog();
 
 	void push_snapshot(
 		boost::shared_ptr<AnalogSnapshot> &snapshot);
@@ -50,11 +48,10 @@ public:
     void clear();
 
 private:
-    const unsigned int _num_probes;
 	std::deque< boost::shared_ptr<AnalogSnapshot> > _snapshots;
 };
 
 } // namespace data
 } // namespace pv
 
-#endif // DSLOGIC_PV_DATA_ANALOG_H
+#endif // DSVIEW_PV_DATA_ANALOG_H

DSView/pv/data/analogsnapshot.cpp

 /*
- * This file is part of the DSLogic-gui project.
- * DSLogic-gui is based on PulseView.
+ * 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 <dreamsourcelab@dreamsourcelab.com>

DSView/pv/data/analogsnapshot.h

 /*
- * This file is part of the DSLogic-gui project.
- * DSLogic-gui is based on PulseView.
+ * 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 <dreamsourcelab@dreamsourcelab.com>
@@ -21,8 +21,8 @@
  */
 
 
-#ifndef DSLOGIC_PV_DATA_ANALOGSNAPSHOT_H
-#define DSLOGIC_PV_DATA_ANALOGSNAPSHOT_H
+#ifndef DSVIEW_PV_DATA_ANALOGSNAPSHOT_H
+#define DSVIEW_PV_DATA_ANALOGSNAPSHOT_H
 
 #include "snapshot.h"
 
@@ -95,4 +95,4 @@ private:
 } // namespace data
 } // namespace pv
 
-#endif // DSLOGIC_PV_DATA_ANALOGSNAPSHOT_H
+#endif // DSVIEW_PV_DATA_ANALOGSNAPSHOT_H

DSView/pv/data/decode/annotation.h

@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef DSLOGIC_PV_VIEW_DECODE_ANNOTATION_H
-#define DSLOGIC_PV_VIEW_DECODE_ANNOTATION_H
+#ifndef DSVIEW_PV_VIEW_DECODE_ANNOTATION_H
+#define DSVIEW_PV_VIEW_DECODE_ANNOTATION_H
 
 #include <stdint.h>
 
@@ -52,4 +52,4 @@ private:
 } // namespace data
 } // namespace pv
 
-#endif // DSLOGIC_PV_VIEW_DECODE_ANNOTATION_H
+#endif // DSVIEW_PV_VIEW_DECODE_ANNOTATION_H

DSView/pv/data/decode/decoder.cpp

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <libsigrok4DSLogic/libsigrok.h>
+#include <libsigrok4DSL/libsigrok.h>
 #include <libsigrokdecode/libsigrokdecode.h>
 
 #include "decoder.h"
@@ -37,8 +37,6 @@ namespace decode {
 Decoder::Decoder(const srd_decoder *const dec) :
 	_decoder(dec),
     _shown(true),
-    _shown_back(true),
-    _shown_setted(false),
     _setted(true)
 {
 }
@@ -62,16 +60,7 @@ bool Decoder::shown() const
 
 void Decoder::show(bool show)
 {
-    _shown_back = show;
-    _shown_setted = true;
-}
-
-void Decoder::commit_show()
-{
-    if (_shown_setted) {
-        _shown = _shown_back;
-        _shown_setted = false;
-    }
+    _shown = show;
 }
 
 const map<const srd_channel*, shared_ptr<view::LogicSignal> >&

DSView/pv/data/decode/decoder.h

@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef DSLOGIC_PV_DATA_DECODE_DECODER_H
-#define DSLOGIC_PV_DATA_DECODE_DECODER_H
+#ifndef DSVIEW_PV_DATA_DECODE_DECODER_H
+#define DSVIEW_PV_DATA_DECODE_DECODER_H
 
 #include <map>
 #include <set>
@@ -56,7 +56,6 @@ public:
 
 	bool shown() const;
 	void show(bool show = true);
-    void commit_show();
 
 	const std::map<const srd_channel*,
 		boost::shared_ptr<view::LogicSignal> >& channels() const;
@@ -80,10 +79,8 @@ private:
 	const srd_decoder *const _decoder;
 
 	bool _shown;
-    bool _shown_back;
-    bool _shown_setted;
 
-	std::map<const srd_channel*, boost::shared_ptr<pv::view::LogicSignal> >
+    std::map<const srd_channel*, boost::shared_ptr<pv::view::LogicSignal> >
 		_probes;
 	std::map<std::string, GVariant*> _options;
 
@@ -98,4 +95,4 @@ private:
 } // namespace data
 } // namespace pv
 
-#endif // DSLOGIC_PV_DATA_DECODE_DECODER_H
+#endif // DSVIEW_PV_DATA_DECODE_DECODER_H

DSView/pv/data/decode/row.h

@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef DSLOGIC_PV_DATA_DECODE_ROW_H
-#define DSLOGIC_PV_DATA_DECODE_ROW_H
+#ifndef DSVIEW_PV_DATA_DECODE_ROW_H
+#define DSVIEW_PV_DATA_DECODE_ROW_H
 
 #include <vector>
 
@@ -56,4 +56,4 @@ private:
 } // data
 } // pv
 
-#endif // DSLOGIC_PV_DATA_DECODE_ROW_H
+#endif // DSVIEW_PV_DATA_DECODE_ROW_H

DSView/pv/data/decode/rowdata.h

@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef DSLOGIC_PV_DATA_DECODE_ROWDATA_H
-#define DSLOGIC_PV_DATA_DECODE_ROWDATA_H
+#ifndef DSVIEW_PV_DATA_DECODE_ROWDATA_H
+#define DSVIEW_PV_DATA_DECODE_ROWDATA_H
 
 #include <vector>
 
@@ -56,4 +56,4 @@ private:
 } // data
 } // pv
 
-#endif // DSLOGIC_PV_DATA_DECODE_ROWDATA_H
+#endif // DSVIEW_PV_DATA_DECODE_ROWDATA_H

DSView/pv/data/decoderstack.h

@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef DSLOGIC_PV_DATA_DECODERSTACK_H
-#define DSLOGIC_PV_DATA_DECODERSTACK_H
+#ifndef DSVIEW_PV_DATA_DECODERSTACK_H
+#define DSVIEW_PV_DATA_DECODERSTACK_H
 
 #include "signaldata.h"
 
@@ -182,4 +182,4 @@ private:
 } // namespace data
 } // namespace pv
 
-#endif // DSLOGIC_PV_DATA_DECODERSTACK_H
+#endif // DSVIEW_PV_DATA_DECODERSTACK_H

DSView/pv/data/dso.cpp

 /*
- * This file is part of the DSLogic-gui project.
- * DSLogic-gui is based on PulseView.
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
  *
  * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
  *
@@ -29,8 +29,8 @@ using namespace std;
 namespace pv {
 namespace data {
 
-Dso::Dso(int num_probes) :
-    SignalData(num_probes)
+Dso::Dso() :
+    SignalData()
 {
 }
 

DSView/pv/data/dso.h

 /*
- * This file is part of the DSLogic-gui project.
- * DSLogic-gui is based on PulseView.
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
  *
  * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
  *
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef DSLOGIC_PV_DATA_DSO_H
-#define DSLOGIC_PV_DATA_DSO_H
+#ifndef DSVIEW_PV_DATA_DSO_H
+#define DSVIEW_PV_DATA_DSO_H
 
 #include "signaldata.h"
 
@@ -36,7 +36,7 @@ class DsoSnapshot;
 class Dso : public SignalData
 {
 public:
-    Dso(int num_probes);
+    Dso();
 
 	void push_snapshot(
         boost::shared_ptr<DsoSnapshot> &snapshot);
@@ -53,4 +53,4 @@ private:
 } // namespace data
 } // namespace pv
 
-#endif // DSLOGIC_PV_DATA_DSO_H
+#endif // DSVIEW_PV_DATA_DSO_H

DSView/pv/data/dsosnapshot.cpp

 /*
- * This file is part of the DSLogic-gui project.
- * DSLogic-gui is based on PulseView.
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
  *
  * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
  *
@@ -39,18 +39,21 @@ using namespace std;
 namespace pv {
 namespace data {
 
-const int DsoSnapshot::EnvelopeScalePower = 4;
+const int DsoSnapshot::EnvelopeScalePower = 8;
 const int DsoSnapshot::EnvelopeScaleFactor = 1 << EnvelopeScalePower;
 const float DsoSnapshot::LogEnvelopeScaleFactor =
 	logf(EnvelopeScaleFactor);
-const uint64_t DsoSnapshot::EnvelopeDataUnit = 64*1024;	// bytes
+const uint64_t DsoSnapshot::EnvelopeDataUnit = 4*1024;	// bytes
 
-DsoSnapshot::DsoSnapshot(const sr_datafeed_dso &dso, uint64_t _total_sample_len, unsigned int channel_num) :
-    Snapshot(sizeof(uint16_t), _total_sample_len, channel_num)
+DsoSnapshot::DsoSnapshot(const sr_datafeed_dso &dso, uint64_t _total_sample_len, unsigned int channel_num, bool instant) :
+    Snapshot(sizeof(uint16_t), _total_sample_len, channel_num),
+    _envelope_en(false),
+    _envelope_done(false),
+    _instant(instant)
 {
 	boost::lock_guard<boost::recursive_mutex> lock(_mutex);
 	memset(_envelope_levels, 0, sizeof(_envelope_levels));
-    init(_total_sample_len * channel_num);
+    init(_total_sample_len);
     append_payload(dso);
 }
 
@@ -64,10 +67,21 @@ DsoSnapshot::~DsoSnapshot()
 void DsoSnapshot::append_payload(const sr_datafeed_dso &dso)
 {
 	boost::lock_guard<boost::recursive_mutex> lock(_mutex);
-    append_data(dso.data, dso.num_samples);
 
-	// Generate the first mip-map from the data
-	append_payload_to_envelope_levels();
+    if (_channel_num > 0) {
+        refill_data(dso.data, dso.num_samples, _instant);
+
+        // Generate the first mip-map from the data
+        if (_envelope_en)
+