Merge branch 'develop'

Bumped version number to 0.96

.gitignore

@@ -8,6 +8,7 @@
 *.lo
 CMakeFiles
 CMakeCache.txt
+*.cxx_parameters
 autom4te.cache
 *.cmake
 !cmake_modules

DSView/CMake/FindFFTW.cmake

@@ -0,0 +1,71 @@
+# - Find FFTW
+# Find the native FFTW includes and library
+# This module defines
+#  FFTW_INCLUDE_DIR, where to find fftw3.h, etc.
+#  FFTW_LIBRARIES, the libraries needed to use FFTW.
+#  FFTW_FOUND, If false, do not try to use FFTW.
+# also defined, but not for general use are
+#  FFTW_LIBRARY, where to find the FFTW library.
+
+FIND_PATH(FFTW_INCLUDE_DIR fftw3.h
+/usr/local/include
+/usr/include
+/opt/local/lib
+)
+
+SET(FFTW_NAMES ${FFTW_NAMES} fftw3 fftw3f fftw3-3)
+FIND_LIBRARY(FFTW_LIBRARY
+  NAMES ${FFTW_NAMES}
+  PATHS /usr/lib /usr/local/lib /opt/locala/lib
+  )
+
+# Find threads part of FFTW
+
+SET(FFTW_THREADS_NAMES ${FFTW_THREADS_NAMES} fftw3f_threads fftw3_threads fftw3-3_threads)
+FIND_LIBRARY(FFTW_THREADS_LIBRARY
+  NAMES ${FFTW_THREADS_NAMES}
+  PATHS /usr/lib /usr/local/lib /opt/local/lib
+  )
+
+IF (FFTW_THREADS_LIBRARY AND FFTW_INCLUDE_DIR)
+    SET(FFTW_THREADS_LIBRARIES ${FFTW_THREADS_LIBRARY})
+    SET(FFTW_THREADS_FOUND "YES")
+ELSE (FFTW_THREADS_LIBRARY AND FFTW_INCLUDE_DIR)
+  SET(FFTW_THREADS_FOUND "NO")
+ENDIF (FFTW_THREADS_LIBRARY AND FFTW_INCLUDE_DIR)
+
+
+IF (FFTW_THREADS_FOUND)
+   IF (NOT FFTW_THREADS_FIND_QUIETLY)
+      MESSAGE(STATUS "Found FFTW threads: ${FFTW_THREADS_LIBRARIES}")
+   ENDIF (NOT FFTW_THREADS_FIND_QUIETLY)
+ELSE (FFTW_THREADS_FOUND)
+   IF (FFTW_THREADS_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find FFTW threads library")
+   ENDIF (FFTW_THREADS_FIND_REQUIRED)
+ENDIF (FFTW_THREADS_FOUND)
+
+
+IF (FFTW_LIBRARY AND FFTW_INCLUDE_DIR)
+    SET(FFTW_LIBRARIES ${FFTW_LIBRARY})
+    SET(FFTW_FOUND "YES")
+ELSE (FFTW_LIBRARY AND FFTW_INCLUDE_DIR)
+  SET(FFTW_FOUND "NO")
+ENDIF (FFTW_LIBRARY AND FFTW_INCLUDE_DIR)
+
+
+IF (FFTW_FOUND)
+   IF (NOT FFTW_FIND_QUIETLY)
+      MESSAGE(STATUS "Found FFTW: ${FFTW_LIBRARIES}")
+   ENDIF (NOT FFTW_FIND_QUIETLY)
+ELSE (FFTW_FOUND)
+   IF (FFTW_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find FFTW library")
+   ENDIF (FFTW_FIND_REQUIRED)
+ENDIF (FFTW_FOUND)
+
+SET (ON_UNIX ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR
+             ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+IF (${ON_UNIX})
+   SET (FFTW_EXECUTABLE_LIBRARIES fftw3f fftw3f_threads)
+ENDIF (${ON_UNIX})

DSView/CMakeLists.txt

@@ -93,6 +93,7 @@ find_package(Threads)
 
 find_package(Boost 1.42 COMPONENTS filesystem system thread REQUIRED)
 find_package(libusb-1.0 REQUIRED)
+find_package(FFTW REQUIRED)
 
 #===============================================================================
 #= Config Header
@@ -103,7 +104,7 @@ set(DS_DESCRIPTION "A GUI for instruments of DreamSourceLab")
 
 set(DS_VERSION_MAJOR 0)
 set(DS_VERSION_MINOR 9)
-set(DS_VERSION_MICRO 5)
+set(DS_VERSION_MICRO 6)
 set(DS_VERSION_STRING
 	${DS_VERSION_MAJOR}.${DS_VERSION_MINOR}.${DS_VERSION_MICRO}
 )
@@ -118,107 +119,147 @@ configure_file (
 #-------------------------------------------------------------------------------
 
 set(DSView_SOURCES
-	main.cpp
-	pv/devicemanager.cpp
-	pv/mainwindow.cpp
-	pv/sigsession.cpp
-	pv/storesession.cpp
-	pv/data/analog.cpp
-	pv/data/analogsnapshot.cpp
-        pv/data/dso.cpp
-        pv/data/dsosnapshot.cpp
-	pv/data/group.cpp
-	pv/data/groupsnapshot.cpp
-	pv/data/logic.cpp
-	pv/data/logicsnapshot.cpp
-	pv/data/signaldata.cpp
-	pv/data/snapshot.cpp
-	pv/device/devinst.cpp
-	pv/device/device.cpp
-	pv/device/file.cpp
-	pv/device/inputfile.cpp
-	pv/device/sessionfile.cpp
-	pv/dialogs/about.cpp
-	pv/dialogs/deviceoptions.cpp
-	pv/dialogs/search.cpp
-	pv/dialogs/storeprogress.cpp
-	pv/dialogs/streamoptions.cpp
-	pv/dialogs/waitingdialog.cpp
-        pv/dialogs/dsomeasure.cpp
-	pv/dock/dsotriggerdock.cpp
-	pv/dock/measuredock.cpp
-	pv/dock/searchdock.cpp
-	pv/dock/triggerdock.cpp
-	pv/prop/bool.cpp
-	pv/prop/double.cpp
-	pv/prop/enum.cpp
-	pv/prop/int.cpp
-	pv/prop/property.cpp
-	pv/prop/string.cpp
-	pv/prop/binding/binding.cpp
-	pv/prop/binding/binding_deviceoptions.cpp
-	pv/toolbars/filebar.cpp
-	pv/toolbars/logobar.cpp
-	pv/toolbars/samplingbar.cpp
-	pv/toolbars/trigbar.cpp
-	pv/view/analogsignal.cpp
-	pv/view/cursor.cpp
-	pv/view/devmode.cpp
-	pv/view/dsldial.cpp
-	pv/view/dsosignal.cpp
-	pv/view/groupsignal.cpp
-	pv/view/header.cpp
-	pv/view/logicsignal.cpp
-	pv/view/ruler.cpp
-	pv/view/selectableitem.cpp
-	pv/view/signal.cpp
-	pv/view/timemarker.cpp
-	pv/view/trace.cpp
-	pv/view/view.cpp
-	pv/view/viewport.cpp
-	pv/widgets/fakelineedit.cpp
+    main.cpp 
+    pv/sigsession.cpp 
+    pv/mainwindow.cpp 
+    pv/devicemanager.cpp 
+    pv/data/snapshot.cpp 
+    pv/data/signaldata.cpp 
+    pv/data/logicsnapshot.cpp 
+    pv/data/logic.cpp 
+    pv/data/analogsnapshot.cpp 
+    pv/data/analog.cpp 
+    pv/dialogs/deviceoptions.cpp 
+    pv/prop/property.cpp 
+    pv/prop/int.cpp 
+    pv/prop/enum.cpp 
+    pv/prop/double.cpp 
+    pv/prop/bool.cpp 
+    pv/prop/binding/binding.cpp 
+    pv/toolbars/samplingbar.cpp 
+    pv/view/viewport.cpp 
+    pv/view/view.cpp 
+    pv/view/timemarker.cpp 
+    pv/view/signal.cpp 
+    pv/view/ruler.cpp 
+    pv/view/logicsignal.cpp 
+    pv/view/header.cpp 
+    pv/view/cursor.cpp 
+    pv/view/analogsignal.cpp 
+    pv/prop/binding/binding_deviceoptions.cpp 
+    pv/toolbars/trigbar.cpp 
+    pv/toolbars/filebar.cpp 
+    pv/dock/protocoldock.cpp 
+    pv/dock/triggerdock.cpp 
+    pv/dock/measuredock.cpp 
+    pv/dock/searchdock.cpp 
+    pv/toolbars/logobar.cpp 
+    pv/data/groupsnapshot.cpp 
+    pv/view/groupsignal.cpp 
+    pv/data/group.cpp 
+    pv/dialogs/about.cpp 
+    pv/dialogs/search.cpp 
+    pv/data/dsosnapshot.cpp 
+    pv/data/dso.cpp
+    pv/view/dsosignal.cpp 
+    pv/view/dsldial.cpp 
+    pv/dock/dsotriggerdock.cpp 
+    pv/view/trace.cpp 
+    pv/view/selectableitem.cpp 
+    pv/data/decoderstack.cpp 
+    pv/data/decode/rowdata.cpp 
+    pv/data/decode/row.cpp 
+    pv/data/decode/decoder.cpp 
+    pv/data/decode/annotation.cpp 
+    pv/view/decodetrace.cpp 
+    pv/prop/binding/decoderoptions.cpp 
+    pv/widgets/fakelineedit.cpp 
+    pv/widgets/decodermenu.cpp 
+    pv/widgets/decodergroupbox.cpp 
+    pv/prop/string.cpp 
+    pv/device/sessionfile.cpp 
+    pv/device/inputfile.cpp 
+    pv/device/file.cpp 
+    pv/device/devinst.cpp 
+    pv/dialogs/storeprogress.cpp 
+    pv/storesession.cpp 
+    pv/view/devmode.cpp 
+    pv/device/device.cpp 
+    pv/dialogs/waitingdialog.cpp 
+    pv/dialogs/dsomeasure.cpp 
+    pv/dialogs/calibration.cpp 
+    pv/data/decodermodel.cpp 
+    pv/dialogs/protocollist.cpp 
+    pv/dialogs/protocolexp.cpp 
+    pv/dialogs/fftoptions.cpp 
+    pv/data/mathstack.cpp 
+    pv/view/mathtrace.cpp 
+    dsapplication.cpp 
+    pv/widgets/viewstatus.cpp 
+    pv/toolbars/titlebar.cpp 
+    pv/mainframe.cpp 
+    pv/widgets/border.cpp 
+    pv/dialogs/dsmessagebox.cpp 
+    pv/dialogs/shadow.cpp 
+    pv/dialogs/dsdialog.cpp
 )
 
 set(DSView_HEADERS
-	pv/mainwindow.h
-	pv/sigsession.h
-	pv/storesession.h
-	pv/device/devinst.h
-	pv/dialogs/about.h
-	pv/dialogs/deviceoptions.h
-	pv/dialogs/search.h
-	pv/dialogs/storeprogress.h
-	pv/dialogs/streamoptions.h
-	pv/dialogs/waitingdialog.h
-        pv/dialogs/dsomeasure.h
-	pv/dock/dsotriggerdock.h
-	pv/dock/measuredock.h
-	pv/dock/searchdock.h
-	pv/dock/triggerdock.h
-	pv/prop/bool.h
-	pv/prop/double.h
-	pv/prop/enum.h
-	pv/prop/int.h
-	pv/prop/property.h
-	pv/prop/string.h
-	pv/toolbars/filebar.h
-	pv/toolbars/logobar.h
-	pv/toolbars/samplingbar.h
-	pv/toolbars/trigbar.h
-	pv/view/cursor.h
-	pv/view/devmode.h
-	pv/view/header.h
-	pv/view/ruler.h
-	pv/view/selectableitem.h
-	pv/view/timemarker.h
-	pv/view/trace.h
-	pv/view/view.h
-	pv/view/viewport.h
-	pv/widgets/fakelineedit.h
+    pv/sigsession.h 
+    pv/mainwindow.h
+    pv/dialogs/deviceoptions.h
+    pv/prop/property.h
+    pv/prop/int.h
+    pv/prop/enum.h
+    pv/prop/double.h
+    pv/prop/bool.h
+    pv/toolbars/samplingbar.h
+    pv/view/viewport.h
+    pv/view/view.h
+    pv/view/timemarker.h
+    pv/view/ruler.h
+    pv/view/header.h
+    pv/view/cursor.h
+    pv/toolbars/trigbar.h
+    pv/toolbars/filebar.h
+    pv/dock/protocoldock.h
+    pv/dock/triggerdock.h
+    pv/dock/measuredock.h
+    pv/dock/searchdock.h
+    pv/toolbars/logobar.h
+    pv/dialogs/about.h
+    pv/dialogs/search.h
+    pv/dock/dsotriggerdock.h
+    pv/view/trace.h
+    pv/view/selectableitem.h
+    pv/data/decoderstack.h
+    pv/view/decodetrace.h
+    pv/widgets/fakelineedit.h
+    pv/widgets/decodermenu.h
+    pv/widgets/decodergroupbox.h
+    pv/prop/string.h
+    pv/device/devinst.h
+    pv/dialogs/storeprogress.h
+    pv/storesession.h
+    pv/view/devmode.h
+    pv/dialogs/waitingdialog.h
+    pv/dialogs/dsomeasure.h
+    pv/dialogs/calibration.h
+    pv/dialogs/protocollist.h
+    pv/dialogs/protocolexp.h
+    pv/dialogs/fftoptions.h
+    pv/data/mathstack.h
+    pv/view/mathtrace.h
+    pv/widgets/viewstatus.h
+    pv/toolbars/titlebar.h
+    pv/mainframe.h
+    pv/widgets/border.h
+    pv/dialogs/dsmessagebox.h
+    pv/dialogs/shadow.h
+    pv/dialogs/dsdialog.h
 )
 
 set(DSView_FORMS
-	pv/dialogs/about.ui
 )
 
 set(DSView_RESOURCES
@@ -310,6 +351,7 @@ set(DSVIEW_LINK_LIBS
 	${CMAKE_THREAD_LIBS_INIT}
 	${QT_LIBRARIES}
         ${LIBUSB_1_LIBRARIES}
+        ${FFTW_LIBRARIES}
 )
 
 if(STATIC_PKGDEPS_LIBS)
@@ -352,21 +394,11 @@ set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "/usr/local/lib")
 
 # Install the executable.
 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/)
-install(FILES res/DSLogic0.dsc DESTINATION bin/res/)
-install(FILES res/DSLogic0.def.dsc DESTINATION bin/res/)
-install(FILES res/DSLogic1.dsc DESTINATION bin/res/)
-install(FILES res/DSLogic1.def.dsc DESTINATION bin/res/)
-install(FILES res/DSLogic2.dsc DESTINATION bin/res/)
-install(FILES res/DSLogic2.def.dsc DESTINATION bin/res/)
-install(FILES res/DSCope1.dsc DESTINATION bin/res/)
-install(FILES res/DSCope1.def.dsc DESTINATION bin/res/)
+install(DIRECTORY res DESTINATION share/${PROJECT_NAME})
+install(DIRECTORY ../libsigrokdecode4DSL/decoders DESTINATION share/${PROJECT_NAME})
+install(FILES icons/logo.png DESTINATION share/${PROJECT_NAME} RENAME logo.png)
+install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/)
+install(FILES DSView.desktop DESTINATION /usr/share/applications/)
 
 #===============================================================================
 #= Packaging (handled by CPack)

DSView/DSView.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=0.96
+Exec=/usr/local/bin/DSView
+Name=DSView
+Comment=GUI Program for DreamSourceLab USB-based Instruments
+Icon=/usr/local/share/DSView/logo.png
+Type=Application
+Terminal=false
+Categories=Development

DSView/DSView.qrc

@@ -36,25 +36,24 @@
         <file>icons/gear.png</file>
         <file>icons/wiki.png</file>
         <file>icons/wait.gif</file>
-        <file>icons/file_cn.png</file>
-        <file>icons/file_dis_cn.png</file>
-        <file>icons/instant_cn.png</file>
-        <file>icons/measure_cn.png</file>
-        <file>icons/measure_dis_cn.png</file>
-        <file>icons/params_cn.png</file>
-        <file>icons/params_dis_cn.png</file>
-        <file>icons/protocol_dis_cn.png</file>
-        <file>icons/search-bar_cn.png</file>
-        <file>icons/search-bar_dis_cn.png</file>
-        <file>icons/start_cn.png</file>
-        <file>icons/stop_cn.png</file>
-        <file>icons/trigger_cn.png</file>
-        <file>icons/trigger_dis_cn.png</file>
-        <file>icons/protocol_cn.png</file>
         <file>icons/instant_dis.png</file>
-        <file>icons/instant_dis_cn.png</file>
         <file>icons/start_dis.png</file>
-        <file>icons/start_dis_cn.png</file>
         <file>icons/settings.png</file>
+        <file>darkstyle/style.qss</file>
+        <file>icons/export.png</file>
+        <file>icons/single.png</file>
+        <file>icons/single_dis.png</file>
+        <file>icons/math.png</file>
+        <file>icons/math_dis.png</file>
+        <file>icons/fft.png</file>
+        <file>icons/Blackman.png</file>
+        <file>icons/Flat_top.png</file>
+        <file>icons/Hamming.png</file>
+        <file>icons/Hann.png</file>
+        <file>icons/Rectangle.png</file>
+        <file>icons/close.png</file>
+        <file>icons/maximize.png</file>
+        <file>icons/minimize.png</file>
+        <file>icons/restore.png</file>
     </qresource>
 </RCC>

DSView/DreamSourceLab.rules

@@ -0,0 +1 @@
+SUBSYSTEM=="usb", ATTRS{idVendor}=="2a0e", MODE="0666"

DSView/darkstyle/style.qrc

@@ -0,0 +1,42 @@
+<RCC>
+    <qresource prefix="/qss_icons">
+        <file>rc/up_arrow_disabled.png</file>
+        <file>rc/stylesheet-branch-end.png</file>
+        <file>rc/branch_closed-on.png</file>
+        <file>rc/stylesheet-vline.png</file>
+        <file>rc/branch_closed.png</file>
+        <file>rc/branch_open-on.png</file>
+        <file>rc/transparent.png</file>
+        <file>rc/right_arrow_disabled.png</file>
+        <file>rc/sizegrip.png</file>
+        <file>rc/close.png</file>
+        <file>rc/close-hover.png</file>
+        <file>rc/close-pressed.png</file>
+        <file>rc/down_arrow.png</file>
+        <file>rc/left_arrow.png</file>
+        <file>rc/stylesheet-branch-more.png</file>
+        <file>rc/up_arrow.png</file>
+        <file>rc/right_arrow.png</file>
+        <file>rc/left_arrow_disabled.png</file>
+        <file>rc/branch_open.png</file>
+        <file>rc/down_arrow_disabled.png</file>
+        <file>rc/undock.png</file>
+        <file>rc/checkbox_checked_disabled.png</file>
+        <file>rc/checkbox_checked_focus.png</file>
+        <file>rc/checkbox_checked.png</file>
+        <file>rc/checkbox_indeterminate.png</file>
+        <file>rc/checkbox_indeterminate_focus.png</file>
+        <file>rc/checkbox_unchecked_disabled.png</file>
+        <file>rc/checkbox_unchecked_focus.png</file>
+        <file>rc/checkbox_unchecked.png</file>
+        <file>rc/radio_checked_disabled.png</file>
+        <file>rc/radio_checked_focus.png</file>
+        <file>rc/radio_checked.png</file>
+        <file>rc/radio_unchecked_disabled.png</file>
+        <file>rc/radio_unchecked_focus.png</file>
+        <file>rc/radio_unchecked.png</file>
+    </qresource>
+    <qresource prefix="/qdarkstyle">
+        <file>style.qss</file>
+    </qresource>
+</RCC>

DSView/dsapplication.cpp

@@ -0,0 +1,51 @@
+/*
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
+ *
+ * Copyright (C) 2016 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 "dsapplication.h"
+
+#include <QMessageBox>
+
+DSApplication::DSApplication(int &argc, char **argv):
+    QApplication(argc, argv)
+{
+}
+
+bool DSApplication::notify(QObject *receiver_, QEvent *event_)
+{
+    try {
+        return QApplication::notify(receiver_, event_);
+    } catch ( std::exception& e ) {
+        QMessageBox msg(NULL);
+        msg.setText("Application Error");
+        msg.setInformativeText(e.what());
+        msg.setStandardButtons(QMessageBox::Ok);
+        msg.setIcon(QMessageBox::Warning);
+        msg.exec();
+    } catch (...) {
+        QMessageBox msg(NULL);
+        msg.setText("Application Error");
+        msg.setInformativeText("An unexpected error occurred");
+        msg.setStandardButtons(QMessageBox::Ok);
+        msg.setIcon(QMessageBox::Warning);
+        msg.exec();
+    }
+    return false;
+}

DSView/dsapplication.h

@@ -0,0 +1,37 @@
+/*
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
+ *
+ * Copyright (C) 2016 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 DSVIEW_DSAPPLICATION_H
+#define DSVIEW_DSAPPLICATION_H
+
+#include <QObject>
+#include <QApplication>
+
+class DSApplication : public QApplication
+{
+public:
+    DSApplication(int &argc, char ** argv);
+    // ~MyApplication();
+private:
+    bool notify(QObject *receiver_, QEvent *event_);
+};
+
+#endif // DSVIEW_DSAPPLICATION_H

DSView/extdef.h

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * 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
@@ -29,4 +29,10 @@
 #define begin_element(x) (&x[0])
 #define end_element(x) (&x[countof(x)])
 
+enum View_type {
+    TIME_VIEW,
+    FFT_VIEW,
+    ALL_VIEW
+};
+
 #endif // DSVIEW_EXTDEF_H