Moved annotation painting code into DecodeTrace, and moved Annotation in pv::data...

[pulseview.git] / test / CMakeLists.txt

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e55e20dea9cfc53dcc909d72657dd13e06fc001b..f167ffb1e09c8db14019340a1a6cf44541254efb 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -41,11 +41,13 @@ set(pulseview_TEST_SOURCES
        ${PROJECT_SOURCE_DIR}/pv/view/cursorpair.cpp
        ${PROJECT_SOURCE_DIR}/pv/data/analog.cpp
        ${PROJECT_SOURCE_DIR}/pv/data/analogsnapshot.cpp
-       ${PROJECT_SOURCE_DIR}/pv/data/decoder.cpp
+       ${PROJECT_SOURCE_DIR}/pv/data/decoderstack.cpp
        ${PROJECT_SOURCE_DIR}/pv/data/logic.cpp
        ${PROJECT_SOURCE_DIR}/pv/data/logicsnapshot.cpp
        ${PROJECT_SOURCE_DIR}/pv/data/snapshot.cpp
        ${PROJECT_SOURCE_DIR}/pv/data/signaldata.cpp
+       ${PROJECT_SOURCE_DIR}/pv/data/decode/decoder.cpp
+       ${PROJECT_SOURCE_DIR}/pv/data/decode/annotation.cpp
        ${PROJECT_SOURCE_DIR}/pv/prop/int.cpp
        ${PROJECT_SOURCE_DIR}/pv/prop/property.cpp
        ${PROJECT_SOURCE_DIR}/pv/prop/string.cpp
@@ -54,7 +56,7 @@ set(pulseview_TEST_SOURCES
        ${PROJECT_SOURCE_DIR}/pv/view/analogsignal.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/cursor.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/cursorpair.cpp
-       ${PROJECT_SOURCE_DIR}/pv/view/decodesignal.cpp
+       ${PROJECT_SOURCE_DIR}/pv/view/decodetrace.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/header.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/logicsignal.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/marginwidget.cpp
@@ -66,13 +68,14 @@ set(pulseview_TEST_SOURCES
        ${PROJECT_SOURCE_DIR}/pv/view/tracepalette.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/view.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/viewport.cpp
-       ${PROJECT_SOURCE_DIR}/pv/view/decode/annotation.cpp
        ${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.cpp
        ${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.cpp
+       ${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.cpp
+       ${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.cpp
        ${PROJECT_SOURCE_DIR}/pv/widgets/popup.cpp
        ${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.cpp
        data/analogsnapshot.cpp
-       data/decoder.cpp
+       data/decoderstack.cpp
        data/logicsnapshot.cpp
        test.cpp
 )
@@ -80,12 +83,12 @@ set(pulseview_TEST_SOURCES
 # This list includes only QObject derrived class headers
 set(pulseview_TEST_HEADERS
        ${PROJECT_SOURCE_DIR}/pv/sigsession.h
-       ${PROJECT_SOURCE_DIR}/pv/data/decoder.h
+       ${PROJECT_SOURCE_DIR}/pv/data/decoderstack.h
        ${PROJECT_SOURCE_DIR}/pv/prop/int.h
        ${PROJECT_SOURCE_DIR}/pv/prop/property.h
        ${PROJECT_SOURCE_DIR}/pv/prop/string.h
        ${PROJECT_SOURCE_DIR}/pv/view/cursor.h
-       ${PROJECT_SOURCE_DIR}/pv/view/decodesignal.h
+       ${PROJECT_SOURCE_DIR}/pv/view/decodetrace.h
        ${PROJECT_SOURCE_DIR}/pv/view/header.h
        ${PROJECT_SOURCE_DIR}/pv/view/logicsignal.h
        ${PROJECT_SOURCE_DIR}/pv/view/marginwidget.h
@@ -98,6 +101,9 @@ set(pulseview_TEST_HEADERS
        ${PROJECT_SOURCE_DIR}/pv/view/viewport.h
        ${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.h
        ${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.h
+       ${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.h
+       ${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.h
+       ${PROJECT_SOURCE_DIR}/pv/widgets/popup.h
        ${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.h
 )