From 1e3b3885715ca2cae0863bb98cec24f8f85c8839 Mon Sep 17 00:00:00 2001 From: Johan Gustafsson Date: Fri, 10 Oct 2014 00:19:51 +0200 Subject: [PATCH] filters: moved to own lib --- features/sawelibs.prf | 2 + lib/filters/filters.pro | 40 +++++++++++++++++++ .../filters}/filters/absolutevalue.cpp | 0 {src => lib/filters}/filters/absolutevalue.h | 0 {src => lib/filters}/filters/bandpass.cpp | 0 {src => lib/filters}/filters/bandpass.h | 0 {src => lib/filters}/filters/ellipse.cpp | 0 {src => lib/filters}/filters/ellipse.h | 0 {src => lib/filters}/filters/ellipsekernel.h | 0 .../filters}/filters/ellipsekernel_cpu.cpp | 0 .../filters}/filters/ellipsekernel_cuda.cu | 0 .../filters}/filters/ellipsekerneldef.h | 0 {src => lib/filters}/filters/envelope.cpp | 0 {src => lib/filters}/filters/envelope.h | 0 {src => lib/filters}/filters/move.cpp | 0 {src => lib/filters}/filters/move.cu | 0 {src => lib/filters}/filters/move.cu.h | 0 {src => lib/filters}/filters/move.h | 0 {src => lib/filters}/filters/normalize.cpp | 0 {src => lib/filters}/filters/normalize.h | 0 .../filters}/filters/normalizekernel.h | 0 .../filters}/filters/normalizekernel_cpu.cpp | 0 .../filters}/filters/normalizekernel_cuda.cu | 0 .../filters}/filters/normalizespectra.cpp | 0 .../filters}/filters/normalizespectra.h | 0 {src => lib/filters}/filters/reassign.cpp | 0 {src => lib/filters}/filters/reassign.cu | 0 {src => lib/filters}/filters/reassign.cu.h | 0 {src => lib/filters}/filters/reassign.h | 0 {src => lib/filters}/filters/rectangle.cpp | 0 {src => lib/filters}/filters/rectangle.h | 0 .../filters}/filters/rectanglekernel.h | 0 .../filters}/filters/rectanglekernel_cpu.cpp | 0 .../filters}/filters/rectanglekernel_cuda.cu | 0 .../filters}/filters/rectanglekerneldef.h | 0 {src => lib/filters}/filters/ridge.cpp | 0 {src => lib/filters}/filters/ridge.cu | 0 {src => lib/filters}/filters/ridge.cu.h | 0 {src => lib/filters}/filters/ridge.h | 0 {src => lib/filters}/filters/selection.cpp | 0 {src => lib/filters}/filters/selection.h | 0 .../filters}/support/operation-composite.cpp | 0 .../filters}/support/operation-composite.h | 0 .../filters}/filters/timeselection.cpp | 0 {src => lib/filters}/filters/timeselection.h | 0 sonicawe.pro | 1 + src/src.pro | 2 - 47 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 lib/filters/filters.pro rename {src => lib/filters}/filters/absolutevalue.cpp (100%) rename {src => lib/filters}/filters/absolutevalue.h (100%) rename {src => lib/filters}/filters/bandpass.cpp (100%) rename {src => lib/filters}/filters/bandpass.h (100%) rename {src => lib/filters}/filters/ellipse.cpp (100%) rename {src => lib/filters}/filters/ellipse.h (100%) rename {src => lib/filters}/filters/ellipsekernel.h (100%) rename {src => lib/filters}/filters/ellipsekernel_cpu.cpp (100%) rename {src => lib/filters}/filters/ellipsekernel_cuda.cu (100%) rename {src => lib/filters}/filters/ellipsekerneldef.h (100%) rename {src => lib/filters}/filters/envelope.cpp (100%) rename {src => lib/filters}/filters/envelope.h (100%) rename {src => lib/filters}/filters/move.cpp (100%) rename {src => lib/filters}/filters/move.cu (100%) rename {src => lib/filters}/filters/move.cu.h (100%) rename {src => lib/filters}/filters/move.h (100%) rename {src => lib/filters}/filters/normalize.cpp (100%) rename {src => lib/filters}/filters/normalize.h (100%) rename {src => lib/filters}/filters/normalizekernel.h (100%) rename {src => lib/filters}/filters/normalizekernel_cpu.cpp (100%) rename {src => lib/filters}/filters/normalizekernel_cuda.cu (100%) rename {src => lib/filters}/filters/normalizespectra.cpp (100%) rename {src => lib/filters}/filters/normalizespectra.h (100%) rename {src => lib/filters}/filters/reassign.cpp (100%) rename {src => lib/filters}/filters/reassign.cu (100%) rename {src => lib/filters}/filters/reassign.cu.h (100%) rename {src => lib/filters}/filters/reassign.h (100%) rename {src => lib/filters}/filters/rectangle.cpp (100%) rename {src => lib/filters}/filters/rectangle.h (100%) rename {src => lib/filters}/filters/rectanglekernel.h (100%) rename {src => lib/filters}/filters/rectanglekernel_cpu.cpp (100%) rename {src => lib/filters}/filters/rectanglekernel_cuda.cu (100%) rename {src => lib/filters}/filters/rectanglekerneldef.h (100%) rename {src => lib/filters}/filters/ridge.cpp (100%) rename {src => lib/filters}/filters/ridge.cu (100%) rename {src => lib/filters}/filters/ridge.cu.h (100%) rename {src => lib/filters}/filters/ridge.h (100%) rename {src => lib/filters}/filters/selection.cpp (100%) rename {src => lib/filters}/filters/selection.h (100%) rename {src/tools => lib/filters/filters}/support/operation-composite.cpp (100%) rename {src/tools => lib/filters/filters}/support/operation-composite.h (100%) rename {src => lib/filters}/filters/timeselection.cpp (100%) rename {src => lib/filters}/filters/timeselection.h (100%) diff --git a/features/sawelibs.prf b/features/sawelibs.prf index 6c848c8c..47227a38 100644 --- a/features/sawelibs.prf +++ b/features/sawelibs.prf @@ -11,6 +11,7 @@ INCLUDEPATH += \ $$SAWEROOT/lib/justmisc \ $$SAWEROOT/lib/signal \ $$SAWEROOT/lib/tfr \ + $$SAWEROOT/lib/filters \ $$SAWEROOT/lib/heightmap \ $$SAWEROOT/lib/tfrheightmap \ $$SAWEROOT/lib/heightmapview \ @@ -38,6 +39,7 @@ LIBS += \ -L$$SAWEROOT/lib/gpumisc -lgpumisc \ -L$$SAWEROOT/lib/signal -lsignal \ -L$$SAWEROOT/lib/tfr -ltfr \ + -L$$SAWEROOT/lib/filters -lfilters \ -L$$SAWEROOT/lib/heightmap -lheightmap \ -L$$SAWEROOT/lib/tfrheightmap -ltfrheightmap \ -L$$SAWEROOT/lib/heightmapview -lheightmapview \ diff --git a/lib/filters/filters.pro b/lib/filters/filters.pro new file mode 100644 index 00000000..2f0e3cc7 --- /dev/null +++ b/lib/filters/filters.pro @@ -0,0 +1,40 @@ +# This builds a static library +# Use Makefile.unittest to build and run a unit test + +TARGET = filters +TEMPLATE = lib +win32:TEMPLATE = vclib +win32:CONFIG += debug_and_release + +CONFIG += staticlib warn_on +CONFIG += c++11 buildflags +CONFIG += tmpdir + +QT += widgets + +PWD = $$_PRO_FILE_PWD_ + +SOURCES += \ + $$PWD/filters/*.cpp \ + $$PWD/filters/support/*.cpp \ + +HEADERS += \ + $$PWD/filters/*.h \ + $$PWD/filters/support/*.h \ + +INCLUDEPATH += ../backtrace ../gpumisc ../signal ../tfr ../justmisc +win32: INCLUDEPATH += ../sonicawe-winlib + +macx:exists(/opt/local/include/): INCLUDEPATH += /opt/local/include/ # macports +macx:exists(/usr/local/include/): INCLUDEPATH += /usr/local/include/ # homebrew + +OTHER_FILES += \ + LICENSE \ + README.txt \ + *.pro \ + +win32 { + othersources.input = OTHER_FILES + othersources.output = ${QMAKE_FILE_NAME} + QMAKE_EXTRA_COMPILERS += othersources +} diff --git a/src/filters/absolutevalue.cpp b/lib/filters/filters/absolutevalue.cpp similarity index 100% rename from src/filters/absolutevalue.cpp rename to lib/filters/filters/absolutevalue.cpp diff --git a/src/filters/absolutevalue.h b/lib/filters/filters/absolutevalue.h similarity index 100% rename from src/filters/absolutevalue.h rename to lib/filters/filters/absolutevalue.h diff --git a/src/filters/bandpass.cpp b/lib/filters/filters/bandpass.cpp similarity index 100% rename from src/filters/bandpass.cpp rename to lib/filters/filters/bandpass.cpp diff --git a/src/filters/bandpass.h b/lib/filters/filters/bandpass.h similarity index 100% rename from src/filters/bandpass.h rename to lib/filters/filters/bandpass.h diff --git a/src/filters/ellipse.cpp b/lib/filters/filters/ellipse.cpp similarity index 100% rename from src/filters/ellipse.cpp rename to lib/filters/filters/ellipse.cpp diff --git a/src/filters/ellipse.h b/lib/filters/filters/ellipse.h similarity index 100% rename from src/filters/ellipse.h rename to lib/filters/filters/ellipse.h diff --git a/src/filters/ellipsekernel.h b/lib/filters/filters/ellipsekernel.h similarity index 100% rename from src/filters/ellipsekernel.h rename to lib/filters/filters/ellipsekernel.h diff --git a/src/filters/ellipsekernel_cpu.cpp b/lib/filters/filters/ellipsekernel_cpu.cpp similarity index 100% rename from src/filters/ellipsekernel_cpu.cpp rename to lib/filters/filters/ellipsekernel_cpu.cpp diff --git a/src/filters/ellipsekernel_cuda.cu b/lib/filters/filters/ellipsekernel_cuda.cu similarity index 100% rename from src/filters/ellipsekernel_cuda.cu rename to lib/filters/filters/ellipsekernel_cuda.cu diff --git a/src/filters/ellipsekerneldef.h b/lib/filters/filters/ellipsekerneldef.h similarity index 100% rename from src/filters/ellipsekerneldef.h rename to lib/filters/filters/ellipsekerneldef.h diff --git a/src/filters/envelope.cpp b/lib/filters/filters/envelope.cpp similarity index 100% rename from src/filters/envelope.cpp rename to lib/filters/filters/envelope.cpp diff --git a/src/filters/envelope.h b/lib/filters/filters/envelope.h similarity index 100% rename from src/filters/envelope.h rename to lib/filters/filters/envelope.h diff --git a/src/filters/move.cpp b/lib/filters/filters/move.cpp similarity index 100% rename from src/filters/move.cpp rename to lib/filters/filters/move.cpp diff --git a/src/filters/move.cu b/lib/filters/filters/move.cu similarity index 100% rename from src/filters/move.cu rename to lib/filters/filters/move.cu diff --git a/src/filters/move.cu.h b/lib/filters/filters/move.cu.h similarity index 100% rename from src/filters/move.cu.h rename to lib/filters/filters/move.cu.h diff --git a/src/filters/move.h b/lib/filters/filters/move.h similarity index 100% rename from src/filters/move.h rename to lib/filters/filters/move.h diff --git a/src/filters/normalize.cpp b/lib/filters/filters/normalize.cpp similarity index 100% rename from src/filters/normalize.cpp rename to lib/filters/filters/normalize.cpp diff --git a/src/filters/normalize.h b/lib/filters/filters/normalize.h similarity index 100% rename from src/filters/normalize.h rename to lib/filters/filters/normalize.h diff --git a/src/filters/normalizekernel.h b/lib/filters/filters/normalizekernel.h similarity index 100% rename from src/filters/normalizekernel.h rename to lib/filters/filters/normalizekernel.h diff --git a/src/filters/normalizekernel_cpu.cpp b/lib/filters/filters/normalizekernel_cpu.cpp similarity index 100% rename from src/filters/normalizekernel_cpu.cpp rename to lib/filters/filters/normalizekernel_cpu.cpp diff --git a/src/filters/normalizekernel_cuda.cu b/lib/filters/filters/normalizekernel_cuda.cu similarity index 100% rename from src/filters/normalizekernel_cuda.cu rename to lib/filters/filters/normalizekernel_cuda.cu diff --git a/src/filters/normalizespectra.cpp b/lib/filters/filters/normalizespectra.cpp similarity index 100% rename from src/filters/normalizespectra.cpp rename to lib/filters/filters/normalizespectra.cpp diff --git a/src/filters/normalizespectra.h b/lib/filters/filters/normalizespectra.h similarity index 100% rename from src/filters/normalizespectra.h rename to lib/filters/filters/normalizespectra.h diff --git a/src/filters/reassign.cpp b/lib/filters/filters/reassign.cpp similarity index 100% rename from src/filters/reassign.cpp rename to lib/filters/filters/reassign.cpp diff --git a/src/filters/reassign.cu b/lib/filters/filters/reassign.cu similarity index 100% rename from src/filters/reassign.cu rename to lib/filters/filters/reassign.cu diff --git a/src/filters/reassign.cu.h b/lib/filters/filters/reassign.cu.h similarity index 100% rename from src/filters/reassign.cu.h rename to lib/filters/filters/reassign.cu.h diff --git a/src/filters/reassign.h b/lib/filters/filters/reassign.h similarity index 100% rename from src/filters/reassign.h rename to lib/filters/filters/reassign.h diff --git a/src/filters/rectangle.cpp b/lib/filters/filters/rectangle.cpp similarity index 100% rename from src/filters/rectangle.cpp rename to lib/filters/filters/rectangle.cpp diff --git a/src/filters/rectangle.h b/lib/filters/filters/rectangle.h similarity index 100% rename from src/filters/rectangle.h rename to lib/filters/filters/rectangle.h diff --git a/src/filters/rectanglekernel.h b/lib/filters/filters/rectanglekernel.h similarity index 100% rename from src/filters/rectanglekernel.h rename to lib/filters/filters/rectanglekernel.h diff --git a/src/filters/rectanglekernel_cpu.cpp b/lib/filters/filters/rectanglekernel_cpu.cpp similarity index 100% rename from src/filters/rectanglekernel_cpu.cpp rename to lib/filters/filters/rectanglekernel_cpu.cpp diff --git a/src/filters/rectanglekernel_cuda.cu b/lib/filters/filters/rectanglekernel_cuda.cu similarity index 100% rename from src/filters/rectanglekernel_cuda.cu rename to lib/filters/filters/rectanglekernel_cuda.cu diff --git a/src/filters/rectanglekerneldef.h b/lib/filters/filters/rectanglekerneldef.h similarity index 100% rename from src/filters/rectanglekerneldef.h rename to lib/filters/filters/rectanglekerneldef.h diff --git a/src/filters/ridge.cpp b/lib/filters/filters/ridge.cpp similarity index 100% rename from src/filters/ridge.cpp rename to lib/filters/filters/ridge.cpp diff --git a/src/filters/ridge.cu b/lib/filters/filters/ridge.cu similarity index 100% rename from src/filters/ridge.cu rename to lib/filters/filters/ridge.cu diff --git a/src/filters/ridge.cu.h b/lib/filters/filters/ridge.cu.h similarity index 100% rename from src/filters/ridge.cu.h rename to lib/filters/filters/ridge.cu.h diff --git a/src/filters/ridge.h b/lib/filters/filters/ridge.h similarity index 100% rename from src/filters/ridge.h rename to lib/filters/filters/ridge.h diff --git a/src/filters/selection.cpp b/lib/filters/filters/selection.cpp similarity index 100% rename from src/filters/selection.cpp rename to lib/filters/filters/selection.cpp diff --git a/src/filters/selection.h b/lib/filters/filters/selection.h similarity index 100% rename from src/filters/selection.h rename to lib/filters/filters/selection.h diff --git a/src/tools/support/operation-composite.cpp b/lib/filters/filters/support/operation-composite.cpp similarity index 100% rename from src/tools/support/operation-composite.cpp rename to lib/filters/filters/support/operation-composite.cpp diff --git a/src/tools/support/operation-composite.h b/lib/filters/filters/support/operation-composite.h similarity index 100% rename from src/tools/support/operation-composite.h rename to lib/filters/filters/support/operation-composite.h diff --git a/src/filters/timeselection.cpp b/lib/filters/filters/timeselection.cpp similarity index 100% rename from src/filters/timeselection.cpp rename to lib/filters/filters/timeselection.cpp diff --git a/src/filters/timeselection.h b/lib/filters/filters/timeselection.h similarity index 100% rename from src/filters/timeselection.h rename to lib/filters/filters/timeselection.h diff --git a/sonicawe.pro b/sonicawe.pro index d1c6e94c..dbe5811f 100644 --- a/sonicawe.pro +++ b/sonicawe.pro @@ -7,6 +7,7 @@ SUBDIRS = \ lib/gpumisc \ lib/signal \ lib/tfr \ + lib/filters \ lib/heightmap \ lib/tfrheightmap \ lib/heightmapview \ diff --git a/src/src.pro b/src/src.pro index c42e7035..9a387d0d 100644 --- a/src/src.pro +++ b/src/src.pro @@ -46,7 +46,6 @@ PWD = $$_PRO_FILE_PWD_ SOURCES += \ $$PWD/adapters/*.cpp \ - $$PWD/filters/*.cpp \ $$PWD/sawe/*.cpp \ $$PWD/test/*.cpp \ $$PWD/tools/*.cpp \ @@ -62,7 +61,6 @@ win32:SOURCES += sonicawe.rc \ HEADERS += \ $$PWD/adapters/*.h \ - $$PWD/filters/*.h \ $$PWD/sawe/*.h \ $$PWD/test/*.h \ $$PWD/tools/*.h \