X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=test%2FCMakeLists.txt;h=aefe1432b14307a97a307ceb8b1975f1e7b16bc2;hp=896ba028f7bc5f13d16200ffb5351d3dd0bfbe4d;hb=4640a84e926ac4b82e2a1b6ef9fc80ef44c2bd3c;hpb=ad908057e13224eee9f983685e0ccc7db1ded0e9

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 896ba028..aefe1432 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -19,8 +19,12 @@
 ##
 
 set(pulseview_TEST_SOURCES
+	${PROJECT_SOURCE_DIR}/pv/application.cpp
 	${PROJECT_SOURCE_DIR}/pv/devicemanager.cpp
 	${PROJECT_SOURCE_DIR}/pv/globalsettings.cpp
+	${PROJECT_SOURCE_DIR}/pv/logging.cpp
+	${PROJECT_SOURCE_DIR}/pv/mainwindow.cpp
+	${PROJECT_SOURCE_DIR}/pv/metadata_obj.cpp
 	${PROJECT_SOURCE_DIR}/pv/session.cpp
 	${PROJECT_SOURCE_DIR}/pv/storesession.cpp
 	${PROJECT_SOURCE_DIR}/pv/util.cpp
@@ -31,6 +35,7 @@ set(pulseview_TEST_SOURCES
 	${PROJECT_SOURCE_DIR}/pv/data/analogsegment.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/logic.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/logicsegment.cpp
+	${PROJECT_SOURCE_DIR}/pv/data/mathsignal.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/segment.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/signalbase.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/signaldata.cpp
@@ -41,6 +46,7 @@ set(pulseview_TEST_SOURCES
 	${PROJECT_SOURCE_DIR}/pv/devices/sessionfile.cpp
 	${PROJECT_SOURCE_DIR}/pv/dialogs/connect.cpp
 	${PROJECT_SOURCE_DIR}/pv/dialogs/inputoutputoptions.cpp
+	${PROJECT_SOURCE_DIR}/pv/dialogs/settings.cpp
 	${PROJECT_SOURCE_DIR}/pv/dialogs/storeprogress.cpp
 	${PROJECT_SOURCE_DIR}/pv/prop/bool.cpp
 	${PROJECT_SOURCE_DIR}/pv/prop/double.cpp
@@ -50,18 +56,18 @@ set(pulseview_TEST_SOURCES
 	${PROJECT_SOURCE_DIR}/pv/prop/string.cpp
 	${PROJECT_SOURCE_DIR}/pv/popups/channels.cpp
 	${PROJECT_SOURCE_DIR}/pv/popups/deviceoptions.cpp
+	${PROJECT_SOURCE_DIR}/pv/subwindows/subwindowbase.cpp
 	${PROJECT_SOURCE_DIR}/pv/toolbars/mainbar.cpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/analogsignal.cpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/cursor.cpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/cursorpair.cpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/flag.cpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/header.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/mathsignal.cpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/marginwidget.cpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/logicsignal.cpp
-	${PROJECT_SOURCE_DIR}/pv/views/trace/rowitem.cpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/ruler.cpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/signal.cpp
-	${PROJECT_SOURCE_DIR}/pv/views/trace/signalscalehandle.cpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/timeitem.cpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/timemarker.cpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/trace.cpp
@@ -78,10 +84,11 @@ set(pulseview_TEST_SOURCES
 	${PROJECT_SOURCE_DIR}/pv/views/trace/viewwidget.cpp
 	${PROJECT_SOURCE_DIR}/pv/views/viewbase.cpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/standardbar.cpp
-	${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.cpp
-	${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.cpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/colorbutton.cpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/colorpopup.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/devicetoolbutton.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/exportmenu.cpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/flowlayout.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/importmenu.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/popup.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/popuptoolbutton.cpp
@@ -98,7 +105,13 @@ set(pulseview_TEST_SOURCES
 
 # This list includes only QObject derived class headers.
 set(pulseview_TEST_HEADERS
+	${PROJECT_SOURCE_DIR}/pv/application.hpp
+	${PROJECT_SOURCE_DIR}/pv/devicemanager.hpp
+	${PROJECT_SOURCE_DIR}/pv/exprtk.hpp
 	${PROJECT_SOURCE_DIR}/pv/globalsettings.hpp
+	${PROJECT_SOURCE_DIR}/pv/logging.hpp
+	${PROJECT_SOURCE_DIR}/pv/mainwindow.hpp
+	${PROJECT_SOURCE_DIR}/pv/metadata_obj.hpp
 	${PROJECT_SOURCE_DIR}/pv/session.hpp
 	${PROJECT_SOURCE_DIR}/pv/storesession.hpp
 	${PROJECT_SOURCE_DIR}/pv/binding/device.hpp
@@ -106,10 +119,12 @@ set(pulseview_TEST_HEADERS
 	${PROJECT_SOURCE_DIR}/pv/data/analogsegment.hpp
 	${PROJECT_SOURCE_DIR}/pv/data/logic.hpp
 	${PROJECT_SOURCE_DIR}/pv/data/logicsegment.hpp
+	${PROJECT_SOURCE_DIR}/pv/data/mathsignal.hpp
 	${PROJECT_SOURCE_DIR}/pv/data/signalbase.hpp
 	${PROJECT_SOURCE_DIR}/pv/devices/device.hpp
 	${PROJECT_SOURCE_DIR}/pv/dialogs/connect.hpp
 	${PROJECT_SOURCE_DIR}/pv/dialogs/inputoutputoptions.hpp
+	${PROJECT_SOURCE_DIR}/pv/dialogs/settings.hpp
 	${PROJECT_SOURCE_DIR}/pv/dialogs/storeprogress.hpp
 	${PROJECT_SOURCE_DIR}/pv/popups/channels.hpp
 	${PROJECT_SOURCE_DIR}/pv/popups/deviceoptions.hpp
@@ -119,17 +134,17 @@ set(pulseview_TEST_HEADERS
 	${PROJECT_SOURCE_DIR}/pv/prop/int.hpp
 	${PROJECT_SOURCE_DIR}/pv/prop/property.hpp
 	${PROJECT_SOURCE_DIR}/pv/prop/string.hpp
+	${PROJECT_SOURCE_DIR}/pv/subwindows/subwindowbase.hpp
 	${PROJECT_SOURCE_DIR}/pv/toolbars/mainbar.hpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/analogsignal.hpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/cursor.hpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/flag.hpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/header.hpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/logicsignal.hpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/mathsignal.hpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/marginwidget.hpp
-	${PROJECT_SOURCE_DIR}/pv/views/trace/rowitem.hpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/ruler.hpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/signal.hpp
-	${PROJECT_SOURCE_DIR}/pv/views/trace/signalscalehandle.hpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/timeitem.hpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/timemarker.hpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/trace.hpp
@@ -142,10 +157,11 @@ set(pulseview_TEST_HEADERS
 	${PROJECT_SOURCE_DIR}/pv/views/trace/viewwidget.hpp
 	${PROJECT_SOURCE_DIR}/pv/views/viewbase.hpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/standardbar.hpp
-	${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.hpp
-	${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.hpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/colorbutton.hpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/colorpopup.hpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/devicetoolbutton.hpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/exportmenu.hpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/flowlayout.hpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/importmenu.hpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/popup.hpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/popuptoolbutton.hpp
@@ -158,20 +174,28 @@ if(ENABLE_DECODE)
 	list(APPEND pulseview_TEST_SOURCES
 		${PROJECT_SOURCE_DIR}/pv/binding/decoder.cpp
 		${PROJECT_SOURCE_DIR}/pv/data/decodesignal.cpp
-		${PROJECT_SOURCE_DIR}/pv/data/decoderstack.cpp
 		${PROJECT_SOURCE_DIR}/pv/data/decode/annotation.cpp
 		${PROJECT_SOURCE_DIR}/pv/data/decode/decoder.cpp
 		${PROJECT_SOURCE_DIR}/pv/data/decode/row.cpp
 		${PROJECT_SOURCE_DIR}/pv/data/decode/rowdata.cpp
+		${PROJECT_SOURCE_DIR}/pv/subwindows/decoder_selector/item.cpp
+		${PROJECT_SOURCE_DIR}/pv/subwindows/decoder_selector/model.cpp
+		${PROJECT_SOURCE_DIR}/pv/subwindows/decoder_selector/subwindow.cpp
+		${PROJECT_SOURCE_DIR}/pv/views/decoder_binary/view.cpp
+		${PROJECT_SOURCE_DIR}/pv/views/decoder_binary/QHexView.cpp
+		${PROJECT_SOURCE_DIR}/pv/views/tabular_decoder/model.cpp
+		${PROJECT_SOURCE_DIR}/pv/views/tabular_decoder/view.cpp
 		${PROJECT_SOURCE_DIR}/pv/views/trace/decodetrace.cpp
 		${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.cpp
 		${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.cpp
-		data/decoderstack.cpp
 	)
 
 	list(APPEND pulseview_TEST_HEADERS
 		${PROJECT_SOURCE_DIR}/pv/data/decodesignal.hpp
-		${PROJECT_SOURCE_DIR}/pv/data/decoderstack.hpp
+		${PROJECT_SOURCE_DIR}/pv/subwindows/decoder_selector/subwindow.hpp
+		${PROJECT_SOURCE_DIR}/pv/views/decoder_binary/view.hpp
+		${PROJECT_SOURCE_DIR}/pv/views/decoder_binary/QHexView.hpp
+		${PROJECT_SOURCE_DIR}/pv/views/tabular_decoder/view.hpp
 		${PROJECT_SOURCE_DIR}/pv/views/trace/decodetrace.hpp
 		${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.hpp
 		${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.hpp