From cae9dc06417c4ba95aa3357f533d5b0dd09dd9fe Mon Sep 17 00:00:00 2001 From: Andrey Tkachenko Date: Mon, 14 Jul 2014 18:05:08 +0400 Subject: [PATCH] Update image --- CSV.pro | 2 +- Main.qml | 287 ++++++++-------- Makefile | 874 ------------------------------------------------ main.cpp | 12 +- svkernelv1.cpp | 8 +- svkernelv1.h | 2 +- svprocessor.cpp | 6 +- 7 files changed, 167 insertions(+), 1024 deletions(-) delete mode 100644 Makefile diff --git a/CSV.pro b/CSV.pro index 45774d3..850b9e5 100644 --- a/CSV.pro +++ b/CSV.pro @@ -4,7 +4,7 @@ # #------------------------------------------------- -QT += core qml quick +QT += core gui qml quick widgets TEMPLATE = app TARGET = CSV diff --git a/Main.qml b/Main.qml index 5d83b75..8044afb 100644 --- a/Main.qml +++ b/Main.qml @@ -7,159 +7,180 @@ ApplicationWindow { visible: true width: 800 height: 600 - property string state: 'Ready' statusBar: StatusBar { Row { Label { - text: mainWindow.state + id: statusBarState + text: "In Progress" } } } - Item { - id: leftColumn - width: 200 - - anchors.bottom: parent.bottom - anchors.top: parent.top - anchors.right: rightColumn.left - anchors.left: parent.left - - Component { - id: slider - - Item { - property alias title: sliderTitle.text - property alias from: sliderSlider.minimumValue - property alias to: sliderSlider.maximumValue - property alias step: sliderSlider.stepSize - property string name: '' - - height: 50 - - Text { - id: sliderTitle - anchors.left: parent.left - anchors.right: parent.right - anchors.top: parent.top - anchors.leftMargin: 15 - anchors.rightMargin: 10 - anchors.topMargin: 10 - text: "" - } - - Text { - id: sliderValue - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: sliderSlider.top - text: sliderSlider.value - } - - Slider { - id: sliderSlider - anchors.left: parent.left - anchors.bottom: parent.bottom - anchors.right: parent.right - anchors.leftMargin: 10 - anchors.rightMargin: 10 - stepSize: 1 - } - } + Connections { + target: processor + onFinished: { + statusBarState.text = "Ready"; } + } - Column { - anchors.bottom: renderButton.top + Item { + anchors.fill: parent + + Item { + id: leftColumn + width: 200 + + anchors.bottom: parent.bottom anchors.top: parent.top - anchors.right: parent.right + anchors.right: rightColumn.left anchors.left: parent.left - Loader { - id: windowSize - sourceComponent: slider - anchors.left: parent.left - anchors.right: parent.right - onLoaded: { - windowSize.item.title = "Window Size" - windowSize.item.from = 0; - windowSize.item.to = 10; - windowSize.item.step = 1; - } - } + Component { + id: slider - Loader { - id: matchSize - sourceComponent: slider - anchors.left: parent.left - anchors.right: parent.right - onLoaded: { - matchSize.item.title = "Match Size" - matchSize.item.from = 0; - matchSize.item.to = 10; - matchSize.item.step = 1; - } - } - - Loader { - id: errorLevel - sourceComponent: slider - anchors.left: parent.left - anchors.right: parent.right - onLoaded: { - errorLevel.item.title = "Error Level" - errorLevel.item.from = 0; - errorLevel.item.to = 10; - errorLevel.item.step = 1; - } - } - } - - Button { - id: renderButton - //anchors.bottom: parent.bottom - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: parent.bottom - anchors.bottomMargin: 10 - Text { - anchors.centerIn: parent - text: "Render" - } - } - } - - Item { - id: rightColumn - anchors.bottom: parent.bottom - anchors.top: parent.top - anchors.right: parent.right - anchors.left: leftColumn.right - TabView { - anchors.fill: parent - Tab { - id: imageView - title: "Image View" Item { - Flickable { - anchors.fill: parent - contentWidth: image.width - contentHeight: image.height - interactive: true - anchors.margins: 2 - clip: true + property alias title: sliderTitle.text + property alias from: sliderSlider.minimumValue + property alias to: sliderSlider.maximumValue + property alias step: sliderSlider.stepSize + property string name: '' - Item { - Image { - id: image - source: "image://images/result" - smooth: false + height: 50 + + Text { + id: sliderTitle + anchors.left: parent.left + anchors.right: parent.right + anchors.top: parent.top + anchors.leftMargin: 15 + anchors.rightMargin: 10 + anchors.topMargin: 10 + text: "" + } + + Text { + id: sliderValue + anchors.horizontalCenter: parent.horizontalCenter + anchors.bottom: sliderSlider.top + text: sliderSlider.value + } + + Slider { + id: sliderSlider + anchors.left: parent.left + anchors.bottom: parent.bottom + anchors.right: parent.right + anchors.leftMargin: 10 + anchors.rightMargin: 10 + stepSize: 1 + } + } + } + + Column { + anchors.bottom: renderButton.top + anchors.top: parent.top + anchors.right: parent.right + anchors.left: parent.left + + Loader { + id: windowSize + sourceComponent: slider + anchors.left: parent.left + anchors.right: parent.right + onLoaded: { + windowSize.item.title = "Window Size" + windowSize.item.from = 0; + windowSize.item.to = 10; + windowSize.item.step = 1; + } + } + + Loader { + id: matchSize + sourceComponent: slider + anchors.left: parent.left + anchors.right: parent.right + onLoaded: { + matchSize.item.title = "Match Size" + matchSize.item.from = 0; + matchSize.item.to = 10; + matchSize.item.step = 1; + } + } + + Loader { + id: errorLevel + sourceComponent: slider + anchors.left: parent.left + anchors.right: parent.right + onLoaded: { + errorLevel.item.title = "Error Level" + errorLevel.item.from = 0; + errorLevel.item.to = 10; + errorLevel.item.step = 1; + } + } + } + + Button { + id: renderButton + //anchors.bottom: parent.bottom + anchors.horizontalCenter: parent.horizontalCenter + anchors.bottom: parent.bottom + anchors.bottomMargin: 10 + Text { + anchors.centerIn: parent + text: "Render" + } + } + } + + Item { + id: rightColumn + anchors.bottom: parent.bottom + anchors.top: parent.top + anchors.right: parent.right + anchors.left: leftColumn.right + TabView { + anchors.fill: parent + Tab { + id: imageView + title: "Image View" + Item { + Flickable { + anchors.fill: parent + contentWidth: image.width + contentHeight: image.height + interactive: true + anchors.margins: 2 + clip: true + + Item { + Image { + id: image + source: "" + smooth: false + } + Connections { + target: processor + onFinished: { + image.source = "image://images/result"; + } + } } } } } - } - Tab { - id: pclView - title: "PCL View" + Tab { + id: pclView + title: "PCL View" + + Item { + anchors.fill: parent + } + } } } } diff --git a/Makefile b/Makefile deleted file mode 100644 index 3dc8461..0000000 --- a/Makefile +++ /dev/null @@ -1,874 +0,0 @@ -############################################################################# -# Makefile for building: CSV -# Generated by qmake (3.0) (Qt 5.2.1) -# Project: CSV.pro -# Template: app -# Command: /usr/lib/i386-linux-gnu/qt5/bin/qmake -o Makefile CSV.pro -############################################################################# - -MAKEFILE = Makefile - -####### Compiler, tools and options - -CC = gcc -CXX = g++ -DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -CFLAGS = -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES) -CXXFLAGS = -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES) -INCPATH = -I/usr/lib/i386-linux-gnu/qt5/mkspecs/linux-g++ -I. -I/usr/include/qt5 -I/usr/include/qt5/QtGui -I/usr/include/qt5/QtCore -I. -LINK = g++ -LFLAGS = -Wl,-O1 -LIBS = $(SUBLIBS) -lQt5Gui -L/usr/lib/i386-linux-gnu -lQt5Core -lGL -lpthread -AR = ar cqs -RANLIB = -QMAKE = /usr/lib/i386-linux-gnu/qt5/bin/qmake -TAR = tar -cf -COMPRESS = gzip -9f -COPY = cp -f -SED = sed -COPY_FILE = cp -f -COPY_DIR = cp -f -R -STRIP = strip -INSTALL_FILE = install -m 644 -p -INSTALL_DIR = $(COPY_DIR) -INSTALL_PROGRAM = install -m 755 -p -DEL_FILE = rm -f -SYMLINK = ln -f -s -DEL_DIR = rmdir -MOVE = mv -f -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p - -####### Output directory - -OBJECTS_DIR = ./ - -####### Files - -SOURCES = main.cpp \ - svimage.cpp \ - svmultithreadprocessor.cpp \ - svprocessorv1.cpp \ - svprocessorv2.cpp moc_svmultithreadprocessor.cpp \ - moc_svprocessorv1.cpp \ - moc_svprocessorv2.cpp -OBJECTS = main.o \ - svimage.o \ - svmultithreadprocessor.o \ - svprocessorv1.o \ - svprocessorv2.o \ - moc_svmultithreadprocessor.o \ - moc_svprocessorv1.o \ - moc_svprocessorv2.o -DIST = /usr/lib/i386-linux-gnu/qt5/mkspecs/features/spec_pre.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/common/shell-unix.conf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/common/unix.conf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/common/linux.conf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/common/gcc-base.conf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/common/g++-base.conf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/common/g++-unix.conf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/qconfig.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_qml.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_qmltest.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_quick.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/qt_functions.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/qt_config.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/spec_post.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/default_pre.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/resolve_config.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/default_post.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/unix/gdb_dwarf_index.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/warn_on.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/qt.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/resources.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/moc.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/unix/thread.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/exceptions.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/yacc.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/lex.prf \ - CSV.pro \ - CSV.pro -QMAKE_TARGET = CSV -DESTDIR = #avoid trailing-slash linebreak -TARGET = CSV - - -first: all -####### Implicit rules - -.SUFFIXES: .o .c .cpp .cc .cxx .C - -.cpp.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cc.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cxx.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.C.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.c.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" - -####### Build rules - -all: Makefile $(TARGET) - -$(TARGET): $(OBJECTS) - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) - -Makefile: CSV.pro /usr/lib/i386-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf /usr/lib/i386-linux-gnu/qt5/mkspecs/features/spec_pre.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/common/shell-unix.conf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/common/unix.conf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/common/linux.conf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/common/gcc-base.conf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/common/g++-base.conf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/common/g++-unix.conf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/qconfig.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_qml.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_qmltest.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_quick.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/qt_functions.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/qt_config.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/spec_post.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/default_pre.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/resolve_config.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/default_post.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/unix/gdb_dwarf_index.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/warn_on.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/qt.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/resources.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/moc.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/unix/thread.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/exceptions.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/yacc.prf \ - /usr/lib/i386-linux-gnu/qt5/mkspecs/features/lex.prf \ - CSV.pro \ - /usr/lib/i386-linux-gnu/libQt5Gui.prl \ - /usr/lib/i386-linux-gnu/libQt5Core.prl - $(QMAKE) -o Makefile CSV.pro -/usr/lib/i386-linux-gnu/qt5/mkspecs/features/spec_pre.prf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/common/shell-unix.conf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/common/unix.conf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/common/linux.conf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/common/gcc-base.conf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/common/g++-base.conf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/common/g++-unix.conf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/qconfig.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_qml.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_qmltest.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_quick.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri: -/usr/lib/i386-linux-gnu/qt5/mkspecs/features/qt_functions.prf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/features/qt_config.prf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/features/spec_post.prf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/features/default_pre.prf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/features/resolve_config.prf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/features/default_post.prf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/features/unix/gdb_dwarf_index.prf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/features/warn_on.prf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/features/qt.prf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/features/resources.prf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/features/moc.prf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/features/unix/opengl.prf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/features/unix/thread.prf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/features/testcase_targets.prf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/features/exceptions.prf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/features/yacc.prf: -/usr/lib/i386-linux-gnu/qt5/mkspecs/features/lex.prf: -CSV.pro: -/usr/lib/i386-linux-gnu/libQt5Gui.prl: -/usr/lib/i386-linux-gnu/libQt5Core.prl: -qmake: FORCE - @$(QMAKE) -o Makefile CSV.pro - -qmake_all: FORCE - -dist: - @test -d .tmp/CSV1.0.0 || mkdir -p .tmp/CSV1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/CSV1.0.0/ && $(COPY_FILE) --parents svimage.h svmultithreadprocessor.h svprocessorv1.h svprocessorv2.h .tmp/CSV1.0.0/ && $(COPY_FILE) --parents main.cpp svimage.cpp svmultithreadprocessor.cpp svprocessorv1.cpp svprocessorv2.cpp .tmp/CSV1.0.0/ && (cd `dirname .tmp/CSV1.0.0` && $(TAR) CSV1.0.0.tar CSV1.0.0 && $(COMPRESS) CSV1.0.0.tar) && $(MOVE) `dirname .tmp/CSV1.0.0`/CSV1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/CSV1.0.0 - - -clean:compiler_clean - -$(DEL_FILE) $(OBJECTS) - -$(DEL_FILE) *~ core *.core - - -####### Sub-libraries - -distclean: clean - -$(DEL_FILE) $(TARGET) - -$(DEL_FILE) Makefile - - -mocclean: compiler_moc_header_clean compiler_moc_source_clean - -mocables: compiler_moc_header_make_all compiler_moc_source_make_all - -check: first - -compiler_rcc_make_all: -compiler_rcc_clean: -compiler_moc_header_make_all: moc_svmultithreadprocessor.cpp moc_svprocessorv1.cpp moc_svprocessorv2.cpp -compiler_moc_header_clean: - -$(DEL_FILE) moc_svmultithreadprocessor.cpp moc_svprocessorv1.cpp moc_svprocessorv2.cpp -moc_svmultithreadprocessor.cpp: /usr/include/qt5/QtCore/QThread \ - /usr/include/qt5/QtCore/qthread.h \ - /usr/include/qt5/QtCore/qobject.h \ - /usr/include/qt5/QtCore/qobjectdefs.h \ - /usr/include/qt5/QtCore/qnamespace.h \ - /usr/include/qt5/QtCore/qglobal.h \ - /usr/include/qt5/QtCore/qconfig.h \ - /usr/include/qt5/QtCore/qfeatures.h \ - /usr/include/qt5/QtCore/qsystemdetection.h \ - /usr/include/qt5/QtCore/qprocessordetection.h \ - /usr/include/qt5/QtCore/qcompilerdetection.h \ - /usr/include/qt5/QtCore/qglobalstatic.h \ - /usr/include/qt5/QtCore/qatomic.h \ - /usr/include/qt5/QtCore/qbasicatomic.h \ - /usr/include/qt5/QtCore/qatomic_bootstrap.h \ - /usr/include/qt5/QtCore/qgenericatomic.h \ - /usr/include/qt5/QtCore/qatomic_msvc.h \ - /usr/include/qt5/QtCore/qatomic_integrity.h \ - /usr/include/qt5/QtCore/qoldbasicatomic.h \ - /usr/include/qt5/QtCore/qatomic_vxworks.h \ - /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_alpha.h \ - /usr/include/qt5/QtCore/qatomic_armv7.h \ - /usr/include/qt5/QtCore/qatomic_armv6.h \ - /usr/include/qt5/QtCore/qatomic_armv5.h \ - /usr/include/qt5/QtCore/qatomic_bfin.h \ - /usr/include/qt5/QtCore/qatomic_ia64.h \ - /usr/include/qt5/QtCore/qatomic_mips.h \ - /usr/include/qt5/QtCore/qatomic_s390.h \ - /usr/include/qt5/QtCore/qatomic_sh4a.h \ - /usr/include/qt5/QtCore/qatomic_sparc.h \ - /usr/include/qt5/QtCore/qatomic_gcc.h \ - /usr/include/qt5/QtCore/qatomic_x86.h \ - /usr/include/qt5/QtCore/qatomic_cxx11.h \ - /usr/include/qt5/QtCore/qatomic_unix.h \ - /usr/include/qt5/QtCore/qmutex.h \ - /usr/include/qt5/QtCore/qlogging.h \ - /usr/include/qt5/QtCore/qflags.h \ - /usr/include/qt5/QtCore/qtypeinfo.h \ - /usr/include/qt5/QtCore/qtypetraits.h \ - /usr/include/qt5/QtCore/qsysinfo.h \ - /usr/include/qt5/QtCore/qobjectdefs_impl.h \ - /usr/include/qt5/QtCore/qstring.h \ - /usr/include/qt5/QtCore/qchar.h \ - /usr/include/qt5/QtCore/qbytearray.h \ - /usr/include/qt5/QtCore/qrefcount.h \ - /usr/include/qt5/QtCore/qarraydata.h \ - /usr/include/qt5/QtCore/qstringbuilder.h \ - /usr/include/qt5/QtCore/qlist.h \ - /usr/include/qt5/QtCore/qalgorithms.h \ - /usr/include/qt5/QtCore/qiterator.h \ - /usr/include/qt5/QtCore/qcoreevent.h \ - /usr/include/qt5/QtCore/qscopedpointer.h \ - /usr/include/qt5/QtCore/qmetatype.h \ - /usr/include/qt5/QtCore/qvarlengtharray.h \ - /usr/include/qt5/QtCore/qcontainerfwd.h \ - /usr/include/qt5/QtCore/qisenum.h \ - /usr/include/qt5/QtCore/qobject_impl.h \ - svimage.h \ - /usr/include/qt5/QtGui/QImage \ - /usr/include/qt5/QtGui/qimage.h \ - /usr/include/qt5/QtGui/qtransform.h \ - /usr/include/qt5/QtGui/qmatrix.h \ - /usr/include/qt5/QtGui/qpolygon.h \ - /usr/include/qt5/QtCore/qvector.h \ - /usr/include/qt5/QtCore/qpoint.h \ - /usr/include/qt5/QtCore/qrect.h \ - /usr/include/qt5/QtCore/qsize.h \ - /usr/include/qt5/QtGui/qregion.h \ - /usr/include/qt5/QtGui/qwindowdefs.h \ - /usr/include/qt5/QtGui/qwindowdefs_win.h \ - /usr/include/qt5/QtCore/qdatastream.h \ - /usr/include/qt5/QtCore/qiodevice.h \ - /usr/include/qt5/QtCore/qpair.h \ - /usr/include/qt5/QtCore/qline.h \ - /usr/include/qt5/QtGui/qpainterpath.h \ - /usr/include/qt5/QtGui/qpaintdevice.h \ - /usr/include/qt5/QtGui/qrgb.h \ - /usr/include/qt5/QtCore/qstringlist.h \ - /usr/include/qt5/QtCore/qregexp.h \ - /usr/include/qt5/QtCore/qstringmatcher.h \ - /usr/include/qt5/QtGui/QRgb \ - /usr/include/qt5/QtGui/QColor \ - /usr/include/qt5/QtGui/qcolor.h \ - svmultithreadprocessor.h - /usr/lib/i386-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) -I/usr/include/c++/4.8 -I/usr/include/i386-linux-gnu/c++/4.8 -I/usr/include/c++/4.8/backward -I/usr/lib/gcc/i686-linux-gnu/4.8/include -I/usr/local/include -I/usr/lib/gcc/i686-linux-gnu/4.8/include-fixed -I/usr/include/i386-linux-gnu -I/usr/include svmultithreadprocessor.h -o moc_svmultithreadprocessor.cpp - -moc_svprocessorv1.cpp: svmultithreadprocessor.h \ - /usr/include/qt5/QtCore/QThread \ - /usr/include/qt5/QtCore/qthread.h \ - /usr/include/qt5/QtCore/qobject.h \ - /usr/include/qt5/QtCore/qobjectdefs.h \ - /usr/include/qt5/QtCore/qnamespace.h \ - /usr/include/qt5/QtCore/qglobal.h \ - /usr/include/qt5/QtCore/qconfig.h \ - /usr/include/qt5/QtCore/qfeatures.h \ - /usr/include/qt5/QtCore/qsystemdetection.h \ - /usr/include/qt5/QtCore/qprocessordetection.h \ - /usr/include/qt5/QtCore/qcompilerdetection.h \ - /usr/include/qt5/QtCore/qglobalstatic.h \ - /usr/include/qt5/QtCore/qatomic.h \ - /usr/include/qt5/QtCore/qbasicatomic.h \ - /usr/include/qt5/QtCore/qatomic_bootstrap.h \ - /usr/include/qt5/QtCore/qgenericatomic.h \ - /usr/include/qt5/QtCore/qatomic_msvc.h \ - /usr/include/qt5/QtCore/qatomic_integrity.h \ - /usr/include/qt5/QtCore/qoldbasicatomic.h \ - /usr/include/qt5/QtCore/qatomic_vxworks.h \ - /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_alpha.h \ - /usr/include/qt5/QtCore/qatomic_armv7.h \ - /usr/include/qt5/QtCore/qatomic_armv6.h \ - /usr/include/qt5/QtCore/qatomic_armv5.h \ - /usr/include/qt5/QtCore/qatomic_bfin.h \ - /usr/include/qt5/QtCore/qatomic_ia64.h \ - /usr/include/qt5/QtCore/qatomic_mips.h \ - /usr/include/qt5/QtCore/qatomic_s390.h \ - /usr/include/qt5/QtCore/qatomic_sh4a.h \ - /usr/include/qt5/QtCore/qatomic_sparc.h \ - /usr/include/qt5/QtCore/qatomic_gcc.h \ - /usr/include/qt5/QtCore/qatomic_x86.h \ - /usr/include/qt5/QtCore/qatomic_cxx11.h \ - /usr/include/qt5/QtCore/qatomic_unix.h \ - /usr/include/qt5/QtCore/qmutex.h \ - /usr/include/qt5/QtCore/qlogging.h \ - /usr/include/qt5/QtCore/qflags.h \ - /usr/include/qt5/QtCore/qtypeinfo.h \ - /usr/include/qt5/QtCore/qtypetraits.h \ - /usr/include/qt5/QtCore/qsysinfo.h \ - /usr/include/qt5/QtCore/qobjectdefs_impl.h \ - /usr/include/qt5/QtCore/qstring.h \ - /usr/include/qt5/QtCore/qchar.h \ - /usr/include/qt5/QtCore/qbytearray.h \ - /usr/include/qt5/QtCore/qrefcount.h \ - /usr/include/qt5/QtCore/qarraydata.h \ - /usr/include/qt5/QtCore/qstringbuilder.h \ - /usr/include/qt5/QtCore/qlist.h \ - /usr/include/qt5/QtCore/qalgorithms.h \ - /usr/include/qt5/QtCore/qiterator.h \ - /usr/include/qt5/QtCore/qcoreevent.h \ - /usr/include/qt5/QtCore/qscopedpointer.h \ - /usr/include/qt5/QtCore/qmetatype.h \ - /usr/include/qt5/QtCore/qvarlengtharray.h \ - /usr/include/qt5/QtCore/qcontainerfwd.h \ - /usr/include/qt5/QtCore/qisenum.h \ - /usr/include/qt5/QtCore/qobject_impl.h \ - svimage.h \ - /usr/include/qt5/QtGui/QImage \ - /usr/include/qt5/QtGui/qimage.h \ - /usr/include/qt5/QtGui/qtransform.h \ - /usr/include/qt5/QtGui/qmatrix.h \ - /usr/include/qt5/QtGui/qpolygon.h \ - /usr/include/qt5/QtCore/qvector.h \ - /usr/include/qt5/QtCore/qpoint.h \ - /usr/include/qt5/QtCore/qrect.h \ - /usr/include/qt5/QtCore/qsize.h \ - /usr/include/qt5/QtGui/qregion.h \ - /usr/include/qt5/QtGui/qwindowdefs.h \ - /usr/include/qt5/QtGui/qwindowdefs_win.h \ - /usr/include/qt5/QtCore/qdatastream.h \ - /usr/include/qt5/QtCore/qiodevice.h \ - /usr/include/qt5/QtCore/qpair.h \ - /usr/include/qt5/QtCore/qline.h \ - /usr/include/qt5/QtGui/qpainterpath.h \ - /usr/include/qt5/QtGui/qpaintdevice.h \ - /usr/include/qt5/QtGui/qrgb.h \ - /usr/include/qt5/QtCore/qstringlist.h \ - /usr/include/qt5/QtCore/qregexp.h \ - /usr/include/qt5/QtCore/qstringmatcher.h \ - /usr/include/qt5/QtGui/QRgb \ - /usr/include/qt5/QtGui/QColor \ - /usr/include/qt5/QtGui/qcolor.h \ - svprocessorv1.h - /usr/lib/i386-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) -I/usr/include/c++/4.8 -I/usr/include/i386-linux-gnu/c++/4.8 -I/usr/include/c++/4.8/backward -I/usr/lib/gcc/i686-linux-gnu/4.8/include -I/usr/local/include -I/usr/lib/gcc/i686-linux-gnu/4.8/include-fixed -I/usr/include/i386-linux-gnu -I/usr/include svprocessorv1.h -o moc_svprocessorv1.cpp - -moc_svprocessorv2.cpp: svprocessorv2.h - /usr/lib/i386-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) -I/usr/include/c++/4.8 -I/usr/include/i386-linux-gnu/c++/4.8 -I/usr/include/c++/4.8/backward -I/usr/lib/gcc/i686-linux-gnu/4.8/include -I/usr/local/include -I/usr/lib/gcc/i686-linux-gnu/4.8/include-fixed -I/usr/include/i386-linux-gnu -I/usr/include svprocessorv2.h -o moc_svprocessorv2.cpp - -compiler_moc_source_make_all: -compiler_moc_source_clean: -compiler_yacc_decl_make_all: -compiler_yacc_decl_clean: -compiler_yacc_impl_make_all: -compiler_yacc_impl_clean: -compiler_lex_make_all: -compiler_lex_clean: -compiler_clean: compiler_moc_header_clean - -####### Compile - -main.o: main.cpp /usr/include/qt5/QtCore/QCoreApplication \ - /usr/include/qt5/QtCore/qcoreapplication.h \ - /usr/include/qt5/QtCore/qglobal.h \ - /usr/include/qt5/QtCore/qconfig.h \ - /usr/include/qt5/QtCore/qfeatures.h \ - /usr/include/qt5/QtCore/qsystemdetection.h \ - /usr/include/qt5/QtCore/qprocessordetection.h \ - /usr/include/qt5/QtCore/qcompilerdetection.h \ - /usr/include/qt5/QtCore/qglobalstatic.h \ - /usr/include/qt5/QtCore/qatomic.h \ - /usr/include/qt5/QtCore/qbasicatomic.h \ - /usr/include/qt5/QtCore/qatomic_bootstrap.h \ - /usr/include/qt5/QtCore/qgenericatomic.h \ - /usr/include/qt5/QtCore/qatomic_msvc.h \ - /usr/include/qt5/QtCore/qatomic_integrity.h \ - /usr/include/qt5/QtCore/qoldbasicatomic.h \ - /usr/include/qt5/QtCore/qatomic_vxworks.h \ - /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_alpha.h \ - /usr/include/qt5/QtCore/qatomic_armv7.h \ - /usr/include/qt5/QtCore/qatomic_armv6.h \ - /usr/include/qt5/QtCore/qatomic_armv5.h \ - /usr/include/qt5/QtCore/qatomic_bfin.h \ - /usr/include/qt5/QtCore/qatomic_ia64.h \ - /usr/include/qt5/QtCore/qatomic_mips.h \ - /usr/include/qt5/QtCore/qatomic_s390.h \ - /usr/include/qt5/QtCore/qatomic_sh4a.h \ - /usr/include/qt5/QtCore/qatomic_sparc.h \ - /usr/include/qt5/QtCore/qatomic_gcc.h \ - /usr/include/qt5/QtCore/qatomic_x86.h \ - /usr/include/qt5/QtCore/qatomic_cxx11.h \ - /usr/include/qt5/QtCore/qatomic_unix.h \ - /usr/include/qt5/QtCore/qmutex.h \ - /usr/include/qt5/QtCore/qlogging.h \ - /usr/include/qt5/QtCore/qflags.h \ - /usr/include/qt5/QtCore/qtypeinfo.h \ - /usr/include/qt5/QtCore/qtypetraits.h \ - /usr/include/qt5/QtCore/qsysinfo.h \ - /usr/include/qt5/QtCore/qstring.h \ - /usr/include/qt5/QtCore/qchar.h \ - /usr/include/qt5/QtCore/qbytearray.h \ - /usr/include/qt5/QtCore/qrefcount.h \ - /usr/include/qt5/QtCore/qnamespace.h \ - /usr/include/qt5/QtCore/qarraydata.h \ - /usr/include/qt5/QtCore/qstringbuilder.h \ - /usr/include/qt5/QtCore/qobject.h \ - /usr/include/qt5/QtCore/qobjectdefs.h \ - /usr/include/qt5/QtCore/qobjectdefs_impl.h \ - /usr/include/qt5/QtCore/qlist.h \ - /usr/include/qt5/QtCore/qalgorithms.h \ - /usr/include/qt5/QtCore/qiterator.h \ - /usr/include/qt5/QtCore/qcoreevent.h \ - /usr/include/qt5/QtCore/qscopedpointer.h \ - /usr/include/qt5/QtCore/qmetatype.h \ - /usr/include/qt5/QtCore/qvarlengtharray.h \ - /usr/include/qt5/QtCore/qcontainerfwd.h \ - /usr/include/qt5/QtCore/qisenum.h \ - /usr/include/qt5/QtCore/qobject_impl.h \ - /usr/include/qt5/QtCore/qeventloop.h \ - /usr/include/qt5/QtGui/QPixmap \ - /usr/include/qt5/QtGui/qpixmap.h \ - /usr/include/qt5/QtGui/qpaintdevice.h \ - /usr/include/qt5/QtGui/qwindowdefs.h \ - /usr/include/qt5/QtGui/qwindowdefs_win.h \ - /usr/include/qt5/QtCore/qrect.h \ - /usr/include/qt5/QtCore/qsize.h \ - /usr/include/qt5/QtCore/qpoint.h \ - /usr/include/qt5/QtGui/qcolor.h \ - /usr/include/qt5/QtGui/qrgb.h \ - /usr/include/qt5/QtCore/qstringlist.h \ - /usr/include/qt5/QtCore/qdatastream.h \ - /usr/include/qt5/QtCore/qiodevice.h \ - /usr/include/qt5/QtCore/qpair.h \ - /usr/include/qt5/QtCore/qregexp.h \ - /usr/include/qt5/QtCore/qstringmatcher.h \ - /usr/include/qt5/QtCore/qsharedpointer.h \ - /usr/include/qt5/QtCore/qshareddata.h \ - /usr/include/qt5/QtCore/qsharedpointer_impl.h \ - /usr/include/qt5/QtCore/qhash.h \ - /usr/include/qt5/QtGui/qimage.h \ - /usr/include/qt5/QtGui/qtransform.h \ - /usr/include/qt5/QtGui/qmatrix.h \ - /usr/include/qt5/QtGui/qpolygon.h \ - /usr/include/qt5/QtCore/qvector.h \ - /usr/include/qt5/QtGui/qregion.h \ - /usr/include/qt5/QtCore/qline.h \ - /usr/include/qt5/QtGui/qpainterpath.h \ - svimage.h \ - /usr/include/qt5/QtGui/QImage \ - /usr/include/qt5/QtGui/QRgb \ - /usr/include/qt5/QtGui/QColor \ - svprocessorv1.h \ - svmultithreadprocessor.h \ - /usr/include/qt5/QtCore/QThread \ - /usr/include/qt5/QtCore/qthread.h \ - svprocessorv2.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp - -svimage.o: svimage.cpp svimage.h \ - /usr/include/qt5/QtGui/QImage \ - /usr/include/qt5/QtGui/qimage.h \ - /usr/include/qt5/QtGui/qtransform.h \ - /usr/include/qt5/QtGui/qmatrix.h \ - /usr/include/qt5/QtGui/qpolygon.h \ - /usr/include/qt5/QtCore/qvector.h \ - /usr/include/qt5/QtCore/qalgorithms.h \ - /usr/include/qt5/QtCore/qglobal.h \ - /usr/include/qt5/QtCore/qconfig.h \ - /usr/include/qt5/QtCore/qfeatures.h \ - /usr/include/qt5/QtCore/qsystemdetection.h \ - /usr/include/qt5/QtCore/qprocessordetection.h \ - /usr/include/qt5/QtCore/qcompilerdetection.h \ - /usr/include/qt5/QtCore/qglobalstatic.h \ - /usr/include/qt5/QtCore/qatomic.h \ - /usr/include/qt5/QtCore/qbasicatomic.h \ - /usr/include/qt5/QtCore/qatomic_bootstrap.h \ - /usr/include/qt5/QtCore/qgenericatomic.h \ - /usr/include/qt5/QtCore/qatomic_msvc.h \ - /usr/include/qt5/QtCore/qatomic_integrity.h \ - /usr/include/qt5/QtCore/qoldbasicatomic.h \ - /usr/include/qt5/QtCore/qatomic_vxworks.h \ - /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_alpha.h \ - /usr/include/qt5/QtCore/qatomic_armv7.h \ - /usr/include/qt5/QtCore/qatomic_armv6.h \ - /usr/include/qt5/QtCore/qatomic_armv5.h \ - /usr/include/qt5/QtCore/qatomic_bfin.h \ - /usr/include/qt5/QtCore/qatomic_ia64.h \ - /usr/include/qt5/QtCore/qatomic_mips.h \ - /usr/include/qt5/QtCore/qatomic_s390.h \ - /usr/include/qt5/QtCore/qatomic_sh4a.h \ - /usr/include/qt5/QtCore/qatomic_sparc.h \ - /usr/include/qt5/QtCore/qatomic_gcc.h \ - /usr/include/qt5/QtCore/qatomic_x86.h \ - /usr/include/qt5/QtCore/qatomic_cxx11.h \ - /usr/include/qt5/QtCore/qatomic_unix.h \ - /usr/include/qt5/QtCore/qmutex.h \ - /usr/include/qt5/QtCore/qlogging.h \ - /usr/include/qt5/QtCore/qflags.h \ - /usr/include/qt5/QtCore/qtypeinfo.h \ - /usr/include/qt5/QtCore/qtypetraits.h \ - /usr/include/qt5/QtCore/qsysinfo.h \ - /usr/include/qt5/QtCore/qiterator.h \ - /usr/include/qt5/QtCore/qlist.h \ - /usr/include/qt5/QtCore/qrefcount.h \ - /usr/include/qt5/QtCore/qarraydata.h \ - /usr/include/qt5/QtCore/qpoint.h \ - /usr/include/qt5/QtCore/qnamespace.h \ - /usr/include/qt5/QtCore/qrect.h \ - /usr/include/qt5/QtCore/qsize.h \ - /usr/include/qt5/QtGui/qregion.h \ - /usr/include/qt5/QtGui/qwindowdefs.h \ - /usr/include/qt5/QtCore/qobjectdefs.h \ - /usr/include/qt5/QtCore/qobjectdefs_impl.h \ - /usr/include/qt5/QtGui/qwindowdefs_win.h \ - /usr/include/qt5/QtCore/qdatastream.h \ - /usr/include/qt5/QtCore/qscopedpointer.h \ - /usr/include/qt5/QtCore/qiodevice.h \ - /usr/include/qt5/QtCore/qobject.h \ - /usr/include/qt5/QtCore/qstring.h \ - /usr/include/qt5/QtCore/qchar.h \ - /usr/include/qt5/QtCore/qbytearray.h \ - /usr/include/qt5/QtCore/qstringbuilder.h \ - /usr/include/qt5/QtCore/qcoreevent.h \ - /usr/include/qt5/QtCore/qmetatype.h \ - /usr/include/qt5/QtCore/qvarlengtharray.h \ - /usr/include/qt5/QtCore/qcontainerfwd.h \ - /usr/include/qt5/QtCore/qisenum.h \ - /usr/include/qt5/QtCore/qobject_impl.h \ - /usr/include/qt5/QtCore/qpair.h \ - /usr/include/qt5/QtCore/qline.h \ - /usr/include/qt5/QtGui/qpainterpath.h \ - /usr/include/qt5/QtGui/qpaintdevice.h \ - /usr/include/qt5/QtGui/qrgb.h \ - /usr/include/qt5/QtCore/qstringlist.h \ - /usr/include/qt5/QtCore/qregexp.h \ - /usr/include/qt5/QtCore/qstringmatcher.h \ - /usr/include/qt5/QtGui/QRgb \ - /usr/include/qt5/QtGui/QColor \ - /usr/include/qt5/QtGui/qcolor.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o svimage.o svimage.cpp - -svmultithreadprocessor.o: svmultithreadprocessor.cpp svmultithreadprocessor.h \ - /usr/include/qt5/QtCore/QThread \ - /usr/include/qt5/QtCore/qthread.h \ - /usr/include/qt5/QtCore/qobject.h \ - /usr/include/qt5/QtCore/qobjectdefs.h \ - /usr/include/qt5/QtCore/qnamespace.h \ - /usr/include/qt5/QtCore/qglobal.h \ - /usr/include/qt5/QtCore/qconfig.h \ - /usr/include/qt5/QtCore/qfeatures.h \ - /usr/include/qt5/QtCore/qsystemdetection.h \ - /usr/include/qt5/QtCore/qprocessordetection.h \ - /usr/include/qt5/QtCore/qcompilerdetection.h \ - /usr/include/qt5/QtCore/qglobalstatic.h \ - /usr/include/qt5/QtCore/qatomic.h \ - /usr/include/qt5/QtCore/qbasicatomic.h \ - /usr/include/qt5/QtCore/qatomic_bootstrap.h \ - /usr/include/qt5/QtCore/qgenericatomic.h \ - /usr/include/qt5/QtCore/qatomic_msvc.h \ - /usr/include/qt5/QtCore/qatomic_integrity.h \ - /usr/include/qt5/QtCore/qoldbasicatomic.h \ - /usr/include/qt5/QtCore/qatomic_vxworks.h \ - /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_alpha.h \ - /usr/include/qt5/QtCore/qatomic_armv7.h \ - /usr/include/qt5/QtCore/qatomic_armv6.h \ - /usr/include/qt5/QtCore/qatomic_armv5.h \ - /usr/include/qt5/QtCore/qatomic_bfin.h \ - /usr/include/qt5/QtCore/qatomic_ia64.h \ - /usr/include/qt5/QtCore/qatomic_mips.h \ - /usr/include/qt5/QtCore/qatomic_s390.h \ - /usr/include/qt5/QtCore/qatomic_sh4a.h \ - /usr/include/qt5/QtCore/qatomic_sparc.h \ - /usr/include/qt5/QtCore/qatomic_gcc.h \ - /usr/include/qt5/QtCore/qatomic_x86.h \ - /usr/include/qt5/QtCore/qatomic_cxx11.h \ - /usr/include/qt5/QtCore/qatomic_unix.h \ - /usr/include/qt5/QtCore/qmutex.h \ - /usr/include/qt5/QtCore/qlogging.h \ - /usr/include/qt5/QtCore/qflags.h \ - /usr/include/qt5/QtCore/qtypeinfo.h \ - /usr/include/qt5/QtCore/qtypetraits.h \ - /usr/include/qt5/QtCore/qsysinfo.h \ - /usr/include/qt5/QtCore/qobjectdefs_impl.h \ - /usr/include/qt5/QtCore/qstring.h \ - /usr/include/qt5/QtCore/qchar.h \ - /usr/include/qt5/QtCore/qbytearray.h \ - /usr/include/qt5/QtCore/qrefcount.h \ - /usr/include/qt5/QtCore/qarraydata.h \ - /usr/include/qt5/QtCore/qstringbuilder.h \ - /usr/include/qt5/QtCore/qlist.h \ - /usr/include/qt5/QtCore/qalgorithms.h \ - /usr/include/qt5/QtCore/qiterator.h \ - /usr/include/qt5/QtCore/qcoreevent.h \ - /usr/include/qt5/QtCore/qscopedpointer.h \ - /usr/include/qt5/QtCore/qmetatype.h \ - /usr/include/qt5/QtCore/qvarlengtharray.h \ - /usr/include/qt5/QtCore/qcontainerfwd.h \ - /usr/include/qt5/QtCore/qisenum.h \ - /usr/include/qt5/QtCore/qobject_impl.h \ - svimage.h \ - /usr/include/qt5/QtGui/QImage \ - /usr/include/qt5/QtGui/qimage.h \ - /usr/include/qt5/QtGui/qtransform.h \ - /usr/include/qt5/QtGui/qmatrix.h \ - /usr/include/qt5/QtGui/qpolygon.h \ - /usr/include/qt5/QtCore/qvector.h \ - /usr/include/qt5/QtCore/qpoint.h \ - /usr/include/qt5/QtCore/qrect.h \ - /usr/include/qt5/QtCore/qsize.h \ - /usr/include/qt5/QtGui/qregion.h \ - /usr/include/qt5/QtGui/qwindowdefs.h \ - /usr/include/qt5/QtGui/qwindowdefs_win.h \ - /usr/include/qt5/QtCore/qdatastream.h \ - /usr/include/qt5/QtCore/qiodevice.h \ - /usr/include/qt5/QtCore/qpair.h \ - /usr/include/qt5/QtCore/qline.h \ - /usr/include/qt5/QtGui/qpainterpath.h \ - /usr/include/qt5/QtGui/qpaintdevice.h \ - /usr/include/qt5/QtGui/qrgb.h \ - /usr/include/qt5/QtCore/qstringlist.h \ - /usr/include/qt5/QtCore/qregexp.h \ - /usr/include/qt5/QtCore/qstringmatcher.h \ - /usr/include/qt5/QtGui/QRgb \ - /usr/include/qt5/QtGui/QColor \ - /usr/include/qt5/QtGui/qcolor.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o svmultithreadprocessor.o svmultithreadprocessor.cpp - -svprocessorv1.o: svprocessorv1.cpp svprocessorv1.h \ - svmultithreadprocessor.h \ - /usr/include/qt5/QtCore/QThread \ - /usr/include/qt5/QtCore/qthread.h \ - /usr/include/qt5/QtCore/qobject.h \ - /usr/include/qt5/QtCore/qobjectdefs.h \ - /usr/include/qt5/QtCore/qnamespace.h \ - /usr/include/qt5/QtCore/qglobal.h \ - /usr/include/qt5/QtCore/qconfig.h \ - /usr/include/qt5/QtCore/qfeatures.h \ - /usr/include/qt5/QtCore/qsystemdetection.h \ - /usr/include/qt5/QtCore/qprocessordetection.h \ - /usr/include/qt5/QtCore/qcompilerdetection.h \ - /usr/include/qt5/QtCore/qglobalstatic.h \ - /usr/include/qt5/QtCore/qatomic.h \ - /usr/include/qt5/QtCore/qbasicatomic.h \ - /usr/include/qt5/QtCore/qatomic_bootstrap.h \ - /usr/include/qt5/QtCore/qgenericatomic.h \ - /usr/include/qt5/QtCore/qatomic_msvc.h \ - /usr/include/qt5/QtCore/qatomic_integrity.h \ - /usr/include/qt5/QtCore/qoldbasicatomic.h \ - /usr/include/qt5/QtCore/qatomic_vxworks.h \ - /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_alpha.h \ - /usr/include/qt5/QtCore/qatomic_armv7.h \ - /usr/include/qt5/QtCore/qatomic_armv6.h \ - /usr/include/qt5/QtCore/qatomic_armv5.h \ - /usr/include/qt5/QtCore/qatomic_bfin.h \ - /usr/include/qt5/QtCore/qatomic_ia64.h \ - /usr/include/qt5/QtCore/qatomic_mips.h \ - /usr/include/qt5/QtCore/qatomic_s390.h \ - /usr/include/qt5/QtCore/qatomic_sh4a.h \ - /usr/include/qt5/QtCore/qatomic_sparc.h \ - /usr/include/qt5/QtCore/qatomic_gcc.h \ - /usr/include/qt5/QtCore/qatomic_x86.h \ - /usr/include/qt5/QtCore/qatomic_cxx11.h \ - /usr/include/qt5/QtCore/qatomic_unix.h \ - /usr/include/qt5/QtCore/qmutex.h \ - /usr/include/qt5/QtCore/qlogging.h \ - /usr/include/qt5/QtCore/qflags.h \ - /usr/include/qt5/QtCore/qtypeinfo.h \ - /usr/include/qt5/QtCore/qtypetraits.h \ - /usr/include/qt5/QtCore/qsysinfo.h \ - /usr/include/qt5/QtCore/qobjectdefs_impl.h \ - /usr/include/qt5/QtCore/qstring.h \ - /usr/include/qt5/QtCore/qchar.h \ - /usr/include/qt5/QtCore/qbytearray.h \ - /usr/include/qt5/QtCore/qrefcount.h \ - /usr/include/qt5/QtCore/qarraydata.h \ - /usr/include/qt5/QtCore/qstringbuilder.h \ - /usr/include/qt5/QtCore/qlist.h \ - /usr/include/qt5/QtCore/qalgorithms.h \ - /usr/include/qt5/QtCore/qiterator.h \ - /usr/include/qt5/QtCore/qcoreevent.h \ - /usr/include/qt5/QtCore/qscopedpointer.h \ - /usr/include/qt5/QtCore/qmetatype.h \ - /usr/include/qt5/QtCore/qvarlengtharray.h \ - /usr/include/qt5/QtCore/qcontainerfwd.h \ - /usr/include/qt5/QtCore/qisenum.h \ - /usr/include/qt5/QtCore/qobject_impl.h \ - svimage.h \ - /usr/include/qt5/QtGui/QImage \ - /usr/include/qt5/QtGui/qimage.h \ - /usr/include/qt5/QtGui/qtransform.h \ - /usr/include/qt5/QtGui/qmatrix.h \ - /usr/include/qt5/QtGui/qpolygon.h \ - /usr/include/qt5/QtCore/qvector.h \ - /usr/include/qt5/QtCore/qpoint.h \ - /usr/include/qt5/QtCore/qrect.h \ - /usr/include/qt5/QtCore/qsize.h \ - /usr/include/qt5/QtGui/qregion.h \ - /usr/include/qt5/QtGui/qwindowdefs.h \ - /usr/include/qt5/QtGui/qwindowdefs_win.h \ - /usr/include/qt5/QtCore/qdatastream.h \ - /usr/include/qt5/QtCore/qiodevice.h \ - /usr/include/qt5/QtCore/qpair.h \ - /usr/include/qt5/QtCore/qline.h \ - /usr/include/qt5/QtGui/qpainterpath.h \ - /usr/include/qt5/QtGui/qpaintdevice.h \ - /usr/include/qt5/QtGui/qrgb.h \ - /usr/include/qt5/QtCore/qstringlist.h \ - /usr/include/qt5/QtCore/qregexp.h \ - /usr/include/qt5/QtCore/qstringmatcher.h \ - /usr/include/qt5/QtGui/QRgb \ - /usr/include/qt5/QtGui/QColor \ - /usr/include/qt5/QtGui/qcolor.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o svprocessorv1.o svprocessorv1.cpp - -svprocessorv2.o: svprocessorv2.cpp svprocessorv2.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o svprocessorv2.o svprocessorv2.cpp - -moc_svmultithreadprocessor.o: moc_svmultithreadprocessor.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_svmultithreadprocessor.o moc_svmultithreadprocessor.cpp - -moc_svprocessorv1.o: moc_svprocessorv1.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_svprocessorv1.o moc_svprocessorv1.cpp - -moc_svprocessorv2.o: moc_svprocessorv2.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_svprocessorv2.o moc_svprocessorv2.cpp - -####### Install - -install: FORCE - -uninstall: FORCE - -FORCE: - diff --git a/main.cpp b/main.cpp index 902b41e..4647712 100644 --- a/main.cpp +++ b/main.cpp @@ -1,9 +1,7 @@ -#include +#include #include #include #include - - #include #include "svimage.h" @@ -13,16 +11,18 @@ int main(int argc, char *argv[]) { QGuiApplication a(argc, argv); + QQmlApplicationEngine engine; SvImageProvider imageProvider; - QImage imgLeft("../ComputerVision/img/left8.png"); - QImage imgRight("../ComputerVision/img/right8.png"); + QImage imgLeft("../ComputerVision/img/left4_.png"); + QImage imgRight("../ComputerVision/img/right4_.png"); QImage imgStereo(imgLeft.width(), imgRight.height(), QImage::Format_RGB32); SvImage left(imgLeft); SvImage right(imgRight); SvImage stereo(imgStereo); + SvProcessor proc(&left, &right, &stereo, 4); imageProvider.addImage("left", &left); imageProvider.addImage("right", &right); @@ -30,8 +30,8 @@ int main(int argc, char *argv[]) engine.addImageProvider("images", &imageProvider); engine.load(QUrl(QStringLiteral("qrc:///Main.qml"))); + engine.rootContext()->setContextProperty("processor", &proc); - SvProcessor proc(&left, &right, &stereo, 1); proc.start(); return a.exec(); diff --git a/svkernelv1.cpp b/svkernelv1.cpp index f0885a9..a11a5a5 100644 --- a/svkernelv1.cpp +++ b/svkernelv1.cpp @@ -61,7 +61,7 @@ void SvKernelV1::exec(int line) unsigned int x; int cursor, closest, tmp; int minErrorValue, tmpSmoothed, matched; - //int dist; + int dist; cursor = 0; @@ -70,10 +70,10 @@ void SvKernelV1::exec(int line) minErrorValue=-1; for (int i = 1; i < m_windowSize; i++) { - //dist = (abs(cursor - i)); + dist = (abs(cursor - i)); tmp = match(x, line, i); - tmpSmoothed = tmp;// + (dist) * (1.0/diff); + tmpSmoothed = tmp + dist; if (tmpSmoothed < minErrorValue || minErrorValue == -1) { minErrorValue = tmpSmoothed; @@ -91,6 +91,6 @@ void SvKernelV1::exec(int line) cursor = closest; } - m_result->putPixel(x, line, getPixelColor(cursor)); + m_result->putPixel(x/* + cursor*/, line, getPixelColor(cursor)); } } diff --git a/svkernelv1.h b/svkernelv1.h index 4a11ca8..8ac7510 100644 --- a/svkernelv1.h +++ b/svkernelv1.h @@ -7,7 +7,7 @@ class SvKernelV1: public SvAbstractKernel { protected: - int m_windowSize = 90; + int m_windowSize = 80; public: void exec(int line) override; diff --git a/svprocessor.cpp b/svprocessor.cpp index aad7197..299d410 100644 --- a/svprocessor.cpp +++ b/svprocessor.cpp @@ -31,9 +31,6 @@ SvProcessor::SvProcessor(SvImage* left, SvImage* right, SvImage* result, int num connect(&m_threads[i], &QThread::started, &m_workers[i], &SvWorker::start); connect(&m_workers[i], &SvWorker::finished, this, &SvProcessor::workerFinished); - connect(&m_workers[i], &SvWorker::finished, &m_threads[i], &QThread::quit); - connect(this, &SvProcessor::started, &m_workers[i], &SvWorker::start); - connect(&m_threads[i], &QThread::finished, &m_threads[i], &QThread::deleteLater); } for (i = 0; i < result->getHeight(); i++) { @@ -48,8 +45,7 @@ SvProcessor::~SvProcessor() void SvProcessor::workerFinished(int workerId) { - Q_UNUSED(workerId) - + qDebug() << "worker " << workerId << " finished"; m_workersFinished++; if (m_workersFinished == m_numberOfWorkers) { qDebug() << "finished";