diff --git a/Calibration/mainwindow.cpp b/Calibration/mainwindow.cpp index 547bc745a44a807cd083c67a671a56fea37ef819..7fa941748ad44d6a88fe02e190afc58655ba4f2a 100644 --- a/Calibration/mainwindow.cpp +++ b/Calibration/mainwindow.cpp @@ -199,7 +199,7 @@ void MainWindow::configure() { { if (indexCircle != -1) // Capture the point only if there is exactly one circle { - sandbox.capturePoint(listCircleDetected); + sandbox.capturePoint(listCircleDetected[indexCircle]); nbCurrentCapturedPoint++; pteConsole_cursor.insertText(QString::number(nbCurrentCapturedPoint) + " on 3 points captured \n"); diff --git a/Calibration/mainwindow.ui b/Calibration/mainwindow.ui index 666bab34ab49771e0b05dfa790a955bb58f2b567..a25e267e92d4247470b25c142f5e061fc30c2247 100644 --- a/Calibration/mainwindow.ui +++ b/Calibration/mainwindow.ui @@ -104,6 +104,24 @@ </item> <item> <widget class="ReactiveLabel" name="lblImage" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>16777215</height> + </size> + </property> <property name="styleSheet"> <string notr="true">border-color: rgb(46, 52, 54); border-width: 1px; diff --git a/Demo/Demo.pro.user b/Demo/Demo.pro.user index e05bbdbfde9fd5de046adaf0497e0489ddf876c4..69fe5875eb619318e0b3803d26c3ca8923f29981 100644 --- a/Demo/Demo.pro.user +++ b/Demo/Demo.pro.user @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE QtCreatorProject> -<!-- Written by QtCreator 4.5.2, 2020-06-07T18:33:48. --> +<!-- Written by QtCreator 4.5.2, 2020-07-03T15:47:20. --> <qtcreator> <data> <variable>EnvironmentId</variable> @@ -62,7 +62,7 @@ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{326850cc-bd44-4587-ba61-6fe1f7194e93}</value> - <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">2</value> + <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> @@ -310,7 +310,7 @@ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">Demo.pro</value> <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value> - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/fabien/Desktop/pa/sandboxrefactorconfig/build-Demo-Desktop-Profile</value> + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/fabien/Desktop/pa/sandboxrefactorconfig/build-Demo-Desktop-Debug</value> <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> diff --git a/Demo/mainwindow.cpp b/Demo/mainwindow.cpp index 3b08e16ffaab24bb171a4ac1b1c52b6fccccdb23..9a9c829fd44dd9cb097f109bc154e860fb3b267a 100644 --- a/Demo/mainwindow.cpp +++ b/Demo/mainwindow.cpp @@ -38,6 +38,8 @@ void MainWindow::startApplication() do { Mat frame = levelColoredFrame(&useSandbox); + frame = useSandbox.resizeFrameForBeamer(frame); + ui->lblImage->setPixmap(QPixmap::fromImage(QImage(frame.data, frame.cols, frame.rows, frame.step, QImage::Format_RGB888))); waitKey(10); } while (running); diff --git a/beamer_config.sh b/beamer_config.sh new file mode 100755 index 0000000000000000000000000000000000000000..a1e2b44d644a4876425c321a7ab0595ed1ba99ca --- /dev/null +++ b/beamer_config.sh @@ -0,0 +1 @@ +xrandr --output eDP-1 --rate 60 --mode 1920x1080 --fb 1920x1080 --panning 1920x1080* --output HDMI-2 --mode 1400x1050 --same-as eDP-1 > /dev/null diff --git a/build-Calibration-Desktop-Debug/Calibration b/build-Calibration-Desktop-Debug/Calibration index 6391083842b461a944a096e354c53ca27c916c95..b4bbb68db02bf9a01957c9639a03dd718673b35f 100755 Binary files a/build-Calibration-Desktop-Debug/Calibration and b/build-Calibration-Desktop-Debug/Calibration differ diff --git a/build-Calibration-Desktop-Debug/device b/build-Calibration-Desktop-Debug/device index d87d53d9699673df83ebe71761b371c571944dc3..c515b5885e929bc4996508c30753036ff8358a08 100644 --- a/build-Calibration-Desktop-Debug/device +++ b/build-Calibration-Desktop-Debug/device @@ -1 +1 @@ -840412061564 2595.54 0 0.265 -0.205 3 2 6 3820 27445 65050 16953 41905 2269 \ No newline at end of file +840412061564 2705.8 0 0.265 -0.205 478 253 575 436 3 2 6 51725 3886 32 20586 51726 0 \ No newline at end of file diff --git a/build-Calibration-Desktop-Debug/main.o b/build-Calibration-Desktop-Debug/main.o index c32fd0143e7fbb64fb39913d7550480bb480cdf7..d1d1860b0f3f09374dd2a9c7cfc9e3a62a2b560e 100644 Binary files a/build-Calibration-Desktop-Debug/main.o and b/build-Calibration-Desktop-Debug/main.o differ diff --git a/build-Calibration-Desktop-Debug/mainwindow.o b/build-Calibration-Desktop-Debug/mainwindow.o index 342d6790d7ca0b0a783f1b7168bfb7f32d040d02..36997d88fd964a991dcc69be42387da7d05fb762 100644 Binary files a/build-Calibration-Desktop-Debug/mainwindow.o and b/build-Calibration-Desktop-Debug/mainwindow.o differ diff --git a/build-Calibration-Desktop-Debug/moc_mainwindow.o b/build-Calibration-Desktop-Debug/moc_mainwindow.o index 16d09a3eb0bbd347e87d3be375bc8ed533e3ec6b..7f7827fd24825e0a6b067ae481dded63b86cd3cd 100644 Binary files a/build-Calibration-Desktop-Debug/moc_mainwindow.o and b/build-Calibration-Desktop-Debug/moc_mainwindow.o differ diff --git a/build-Calibration-Desktop-Debug/ui_mainwindow.h b/build-Calibration-Desktop-Debug/ui_mainwindow.h index 1781cecf4fe6c9491db6b7366332524f1f121e2c..518305a7c65bd1b82f584298c50720921568164d 100644 --- a/build-Calibration-Desktop-Debug/ui_mainwindow.h +++ b/build-Calibration-Desktop-Debug/ui_mainwindow.h @@ -108,6 +108,13 @@ public: lblImage = new ReactiveLabel(verticalLayoutWidget); lblImage->setObjectName(QStringLiteral("lblImage")); + QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); + sizePolicy.setHorizontalStretch(0); + sizePolicy.setVerticalStretch(0); + sizePolicy.setHeightForWidth(lblImage->sizePolicy().hasHeightForWidth()); + lblImage->setSizePolicy(sizePolicy); + lblImage->setMinimumSize(QSize(0, 0)); + lblImage->setMaximumSize(QSize(16777215, 16777215)); lblImage->setStyleSheet(QLatin1String("border-color: rgb(46, 52, 54);\n" "border-width: 1px;\n" "border-style: solid;")); @@ -134,11 +141,11 @@ public: pteConsole = new QPlainTextEdit(verticalLayoutWidget); pteConsole->setObjectName(QStringLiteral("pteConsole")); - QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - sizePolicy.setHorizontalStretch(0); - sizePolicy.setVerticalStretch(0); - sizePolicy.setHeightForWidth(pteConsole->sizePolicy().hasHeightForWidth()); - pteConsole->setSizePolicy(sizePolicy); + QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Expanding); + sizePolicy1.setHorizontalStretch(0); + sizePolicy1.setVerticalStretch(0); + sizePolicy1.setHeightForWidth(pteConsole->sizePolicy().hasHeightForWidth()); + pteConsole->setSizePolicy(sizePolicy1); pteConsole->setReadOnly(true); layoutRight->addWidget(pteConsole); diff --git a/build-Demo-Desktop-Debug/Demo b/build-Demo-Desktop-Debug/Demo index 1fd66f5ffc7fdf1756c94f0c8dfa18edf45c76aa..4360cceb13ca1f3d2bcd5053cd814a6ec4a3be56 100755 Binary files a/build-Demo-Desktop-Debug/Demo and b/build-Demo-Desktop-Debug/Demo differ diff --git a/build-Demo-Desktop-Debug/device b/build-Demo-Desktop-Debug/device index fa2a710672f6645e354b78d57714affe67157545..c515b5885e929bc4996508c30753036ff8358a08 100644 --- a/build-Demo-Desktop-Debug/device +++ b/build-Demo-Desktop-Debug/device @@ -1 +1 @@ -840412061564 2597.96 0 0.265 -0.205 3 2 6 39118 9646 65464 19858 55022 62459 \ No newline at end of file +840412061564 2705.8 0 0.265 -0.205 478 253 575 436 3 2 6 51725 3886 32 20586 51726 0 \ No newline at end of file diff --git a/build-Demo-Desktop-Debug/main.o b/build-Demo-Desktop-Debug/main.o index d9f7f3f599e988cc11ffbf996a2a49f1ef07ce59..0e575439c06f45cbd1fbf9c91b4dc551c90bc25d 100644 Binary files a/build-Demo-Desktop-Debug/main.o and b/build-Demo-Desktop-Debug/main.o differ diff --git a/build-Demo-Desktop-Debug/mainwindow.o b/build-Demo-Desktop-Debug/mainwindow.o index 366a13d5ea5f7fa39ff20e387b8057d574a1abb0..64026bf01a060118150e009cd54d28cfa86817e2 100644 Binary files a/build-Demo-Desktop-Debug/mainwindow.o and b/build-Demo-Desktop-Debug/mainwindow.o differ diff --git a/build-Demo-Desktop-Debug/moc_mainwindow.o b/build-Demo-Desktop-Debug/moc_mainwindow.o index 6cd9a192255006af19034681d858b4d77d73d1b6..e85ecaf5e19f7d88b9b5f08d2ef8a25d56caab6d 100644 Binary files a/build-Demo-Desktop-Debug/moc_mainwindow.o and b/build-Demo-Desktop-Debug/moc_mainwindow.o differ diff --git a/build-Demo-Desktop-Profile/.qmake.stash b/build-Demo-Desktop-Profile/.qmake.stash deleted file mode 100644 index e5e9c70ce61dd6778796e80fbb08d7ff9553de6a..0000000000000000000000000000000000000000 --- a/build-Demo-Desktop-Profile/.qmake.stash +++ /dev/null @@ -1,24 +0,0 @@ -QMAKE_CXX.INCDIRS = \ - /usr/include/c++/5 \ - /usr/include/x86_64-linux-gnu/c++/5 \ - /usr/include/c++/5/backward \ - /usr/lib/gcc/x86_64-linux-gnu/5/include \ - /usr/local/include \ - /usr/lib/gcc/x86_64-linux-gnu/5/include-fixed \ - /usr/include/x86_64-linux-gnu \ - /usr/include -QMAKE_CXX.LIBDIRS = \ - /usr/lib/gcc/x86_64-linux-gnu/5 \ - /usr/lib/x86_64-linux-gnu \ - /usr/lib \ - /lib/x86_64-linux-gnu \ - /lib -QMAKE_CXX.QT_COMPILER_STDCXX = 199711L -QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 5 -QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 5 -QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0 -QMAKE_CXX.COMPILER_MACROS = \ - QT_COMPILER_STDCXX \ - QMAKE_GCC_MAJOR_VERSION \ - QMAKE_GCC_MINOR_VERSION \ - QMAKE_GCC_PATCH_VERSION diff --git a/build-Demo-Desktop-Profile/Demo b/build-Demo-Desktop-Profile/Demo deleted file mode 100755 index 79de28c306d31334871cfdf2de1b3325041ab478..0000000000000000000000000000000000000000 Binary files a/build-Demo-Desktop-Profile/Demo and /dev/null differ diff --git a/build-Demo-Desktop-Profile/Demo.debug b/build-Demo-Desktop-Profile/Demo.debug deleted file mode 100644 index 0c4b0537a44d12fd6fa85bbe5299d10090e053af..0000000000000000000000000000000000000000 Binary files a/build-Demo-Desktop-Profile/Demo.debug and /dev/null differ diff --git a/build-Demo-Desktop-Profile/Makefile b/build-Demo-Desktop-Profile/Makefile deleted file mode 100644 index 2b9d366cd3237b6d8dc5b348f68a7b5585f9ab82..0000000000000000000000000000000000000000 --- a/build-Demo-Desktop-Profile/Makefile +++ /dev/null @@ -1,432 +0,0 @@ -############################################################################# -# Makefile for building: Demo -# Generated by qmake (3.1) (Qt 5.9.5) -# Project: ../Demo/Demo.pro -# Template: app -# Command: /usr/lib/qt5/bin/qmake -o Makefile ../Demo/Demo.pro -spec linux-g++ CONFIG+=qml_debug CONFIG+=force_debug_info CONFIG+=separate_debug_info -############################################################################# - -MAKEFILE = Makefile - -####### Compiler, tools and options - -CC = gcc -CXX = g++ -DEFINES = -DQT_DEPRECATED_WARNINGS -DQT_QML_DEBUG -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -CFLAGS = -pipe -O2 -g -Wall -W -D_REENTRANT -fPIC $(DEFINES) -CXXFLAGS = -pipe -O2 -g -std=gnu++11 -Wall -W -D_REENTRANT -fPIC $(DEFINES) -INCPATH = -I../Demo -I. -I../sandbox -isystem /usr/include/x86_64-linux-gnu/qt5 -isystem /usr/include/x86_64-linux-gnu/qt5/QtWidgets -isystem /usr/include/x86_64-linux-gnu/qt5/QtGui -isystem /usr/include/x86_64-linux-gnu/qt5/QtCore -I. -isystem /usr/include/libdrm -I. -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -QMAKE = /usr/lib/qt5/bin/qmake -DEL_FILE = rm -f -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p -COPY = cp -f -COPY_FILE = cp -f -COPY_DIR = cp -f -R -INSTALL_FILE = install -m 644 -p -INSTALL_PROGRAM = install -m 755 -p -INSTALL_DIR = cp -f -R -QINSTALL = /usr/lib/qt5/bin/qmake -install qinstall -QINSTALL_PROGRAM = /usr/lib/qt5/bin/qmake -install qinstall -exe -DEL_FILE = rm -f -SYMLINK = ln -f -s -DEL_DIR = rmdir -MOVE = mv -f -TAR = tar -cf -COMPRESS = gzip -9f -DISTNAME = Demo1.0.0 -DISTDIR = /home/fabien/Desktop/pa/sandboxrefactorconfig/build-Demo-Desktop-Profile/.tmp/Demo1.0.0 -LINK = g++ -LFLAGS = -LIBS = $(SUBLIBS) ../build-sandbox-Desktop-Debug/libsandbox.a -L/usr/lib/x86_64-linux-gnu -lrealsense2 -L/usr/local/lib -lopencv_core -lopencv_highgui -lopencv_imgproc -lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread -AR = ar cqs -RANLIB = -SED = sed -STRIP = strip - -####### Output directory - -OBJECTS_DIR = ./ - -####### Files - -SOURCES = ../Demo/main.cpp \ - ../Demo/mainwindow.cpp moc_mainwindow.cpp -OBJECTS = main.o \ - mainwindow.o \ - moc_mainwindow.o -DIST = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/sanitize.conf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_accessibility_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_devicediscovery_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_egl_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eglfsdeviceintegration_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eventdispatcher_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_fb_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_fontdatabase_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_glx_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_input_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_kms_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_service_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_theme_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/toolchain.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_target.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/separate_debug_info.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qml_debug.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/uic.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qmake_use.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/file_copies.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \ - ../Demo/Demo.pro ../Demo/mainwindow.h \ - ../sandbox/usesandbox.h ../Demo/main.cpp \ - ../Demo/mainwindow.cpp -QMAKE_TARGET = Demo -DESTDIR = -TARGET = Demo - - -first: all -####### Build rules - -$(TARGET): ui_mainwindow.h $(OBJECTS) - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) - objcopy --only-keep-debug Demo Demo.debug && objcopy --strip-debug Demo && objcopy --add-gnu-debuglink=Demo.debug Demo && chmod -x Demo.debug - -Makefile: ../Demo/Demo.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/sanitize.conf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_accessibility_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_devicediscovery_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_egl_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eglfsdeviceintegration_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eventdispatcher_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_fb_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_fontdatabase_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_glx_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_input_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_kms_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_service_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_theme_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/toolchain.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_target.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/separate_debug_info.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qml_debug.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/uic.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qmake_use.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/file_copies.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \ - ../Demo/Demo.pro \ - /usr/lib/x86_64-linux-gnu/libQt5Widgets.prl \ - /usr/lib/x86_64-linux-gnu/libQt5Gui.prl \ - /usr/lib/x86_64-linux-gnu/libQt5Core.prl - $(QMAKE) -o Makefile ../Demo/Demo.pro -spec linux-g++ CONFIG+=qml_debug CONFIG+=force_debug_info CONFIG+=separate_debug_info -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/sanitize.conf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_accessibility_support_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_devicediscovery_support_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_egl_support_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eglfsdeviceintegration_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eventdispatcher_support_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_fb_support_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_fontdatabase_support_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_glx_support_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_input_support_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_kms_support_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_service_support_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_theme_support_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/toolchain.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_target.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/separate_debug_info.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qml_debug.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/uic.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qmake_use.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/file_copies.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf: -../Demo/Demo.pro: -/usr/lib/x86_64-linux-gnu/libQt5Widgets.prl: -/usr/lib/x86_64-linux-gnu/libQt5Gui.prl: -/usr/lib/x86_64-linux-gnu/libQt5Core.prl: -qmake: FORCE - @$(QMAKE) -o Makefile ../Demo/Demo.pro -spec linux-g++ CONFIG+=qml_debug CONFIG+=force_debug_info CONFIG+=separate_debug_info - -qmake_all: FORCE - - -all: Makefile $(TARGET) - -dist: distdir FORCE - (cd `dirname $(DISTDIR)` && $(TAR) $(DISTNAME).tar $(DISTNAME) && $(COMPRESS) $(DISTNAME).tar) && $(MOVE) `dirname $(DISTDIR)`/$(DISTNAME).tar.gz . && $(DEL_FILE) -r $(DISTDIR) - -distdir: FORCE - @test -d $(DISTDIR) || mkdir -p $(DISTDIR) - $(COPY_FILE) --parents $(DIST) $(DISTDIR)/ - $(COPY_FILE) --parents /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/data/dummy.cpp $(DISTDIR)/ - $(COPY_FILE) --parents ../Demo/mainwindow.h ../sandbox/usesandbox.h $(DISTDIR)/ - $(COPY_FILE) --parents ../Demo/main.cpp ../Demo/mainwindow.cpp $(DISTDIR)/ - $(COPY_FILE) --parents ../Demo/mainwindow.ui $(DISTDIR)/ - - -clean: compiler_clean - -$(DEL_FILE) $(OBJECTS) - -$(DEL_FILE) *~ core *.core - - -distclean: clean - -$(DEL_FILE) $(TARGET) - -$(DEL_FILE) /home/fabien/Desktop/pa/sandboxrefactorconfig/build-Demo-Desktop-Profile/Demo.debug .qmake.stash - -$(DEL_FILE) Makefile - - -####### Sub-libraries - -mocclean: compiler_moc_header_clean compiler_moc_source_clean - -mocables: compiler_moc_header_make_all compiler_moc_source_make_all - -check: first - -benchmark: first - -compiler_rcc_make_all: -compiler_rcc_clean: -compiler_moc_predefs_make_all: moc_predefs.h -compiler_moc_predefs_clean: - -$(DEL_FILE) moc_predefs.h -moc_predefs.h: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/data/dummy.cpp - g++ -pipe -O2 -g -std=gnu++11 -Wall -W -dM -E -o moc_predefs.h /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/data/dummy.cpp - -compiler_moc_header_make_all: moc_mainwindow.cpp -compiler_moc_header_clean: - -$(DEL_FILE) moc_mainwindow.cpp -moc_mainwindow.cpp: ../sandbox/usesandbox.h \ - ../sandbox/sandbox.h \ - ../sandbox/serializable.h \ - ../sandbox/camera.h \ - ../sandbox/beamer.h \ - ../sandbox/transformframe.h \ - ../sandbox/borderedit.h \ - ../Demo/mainwindow.h \ - moc_predefs.h \ - /usr/lib/qt5/bin/moc - /usr/lib/qt5/bin/moc $(DEFINES) --include ./moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/fabien/Desktop/pa/sandboxrefactorconfig/Demo -I/home/fabien/Desktop/pa/sandboxrefactorconfig/sandbox -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/5 -I/usr/include/x86_64-linux-gnu/c++/5 -I/usr/include/c++/5/backward -I/usr/lib/gcc/x86_64-linux-gnu/5/include -I/usr/local/include -I/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed -I/usr/include/x86_64-linux-gnu -I/usr/include ../Demo/mainwindow.h -o moc_mainwindow.cpp - -compiler_moc_source_make_all: -compiler_moc_source_clean: -compiler_uic_make_all: ui_mainwindow.h -compiler_uic_clean: - -$(DEL_FILE) ui_mainwindow.h -ui_mainwindow.h: ../Demo/mainwindow.ui \ - /usr/lib/qt5/bin/uic - /usr/lib/qt5/bin/uic ../Demo/mainwindow.ui -o ui_mainwindow.h - -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_predefs_clean compiler_moc_header_clean compiler_uic_clean - -####### Compile - -main.o: ../Demo/main.cpp ../Demo/mainwindow.h \ - ../sandbox/usesandbox.h \ - ../sandbox/sandbox.h \ - ../sandbox/serializable.h \ - ../sandbox/camera.h \ - ../sandbox/beamer.h \ - ../sandbox/transformframe.h \ - ../sandbox/borderedit.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o ../Demo/main.cpp - -mainwindow.o: ../Demo/mainwindow.cpp ../Demo/mainwindow.h \ - ../sandbox/usesandbox.h \ - ../sandbox/sandbox.h \ - ../sandbox/serializable.h \ - ../sandbox/camera.h \ - ../sandbox/beamer.h \ - ../sandbox/transformframe.h \ - ../sandbox/borderedit.h \ - ui_mainwindow.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o ../Demo/mainwindow.cpp - -moc_mainwindow.o: moc_mainwindow.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwindow.o moc_mainwindow.cpp - -####### Install - -install_target: first FORCE - @test -d $(INSTALL_ROOT)/opt/Demo/bin || mkdir -p $(INSTALL_ROOT)/opt/Demo/bin - -$(QINSTALL) /home/fabien/Desktop/pa/sandboxrefactorconfig/build-Demo-Desktop-Profile/Demo.debug $(INSTALL_ROOT)/opt/Demo/bin/Demo.debug - -$(QINSTALL_PROGRAM) $(QMAKE_TARGET) $(INSTALL_ROOT)/opt/Demo/bin/$(QMAKE_TARGET) - -uninstall_target: FORCE - -$(DEL_FILE) $(INSTALL_ROOT)/opt/Demo/bin/Demo.debug - -$(DEL_FILE) $(INSTALL_ROOT)/opt/Demo/bin/$(QMAKE_TARGET) - -$(DEL_DIR) $(INSTALL_ROOT)/opt/Demo/bin/ - - -install: install_target FORCE - -uninstall: uninstall_target FORCE - -FORCE: - diff --git a/build-Demo-Desktop-Profile/main.o b/build-Demo-Desktop-Profile/main.o deleted file mode 100644 index bf628a2ccc755edacbf00a6c1a31f169bb60daad..0000000000000000000000000000000000000000 Binary files a/build-Demo-Desktop-Profile/main.o and /dev/null differ diff --git a/build-Demo-Desktop-Profile/mainwindow.o b/build-Demo-Desktop-Profile/mainwindow.o deleted file mode 100644 index e97cbf88d54f86b5c498947a6a4beccbbef26290..0000000000000000000000000000000000000000 Binary files a/build-Demo-Desktop-Profile/mainwindow.o and /dev/null differ diff --git a/build-Demo-Desktop-Profile/moc_mainwindow.cpp b/build-Demo-Desktop-Profile/moc_mainwindow.cpp deleted file mode 100644 index ddf10c81bcaff2ed26c44116fb41de32e5770069..0000000000000000000000000000000000000000 --- a/build-Demo-Desktop-Profile/moc_mainwindow.cpp +++ /dev/null @@ -1,119 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'mainwindow.h' -** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "../Demo/mainwindow.h" -#include <QtCore/qbytearray.h> -#include <QtCore/qmetatype.h> -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'mainwindow.h' doesn't include <QObject>." -#elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED -struct qt_meta_stringdata_MainWindow_t { - QByteArrayData data[4]; - char stringdata0[45]; -}; -#define QT_MOC_LITERAL(idx, ofs, len) \ - Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ - qptrdiff(offsetof(qt_meta_stringdata_MainWindow_t, stringdata0) + ofs \ - - idx * sizeof(QByteArrayData)) \ - ) -static const qt_meta_stringdata_MainWindow_t qt_meta_stringdata_MainWindow = { - { -QT_MOC_LITERAL(0, 0, 10), // "MainWindow" -QT_MOC_LITERAL(1, 11, 16), // "startApplication" -QT_MOC_LITERAL(2, 28, 0), // "" -QT_MOC_LITERAL(3, 29, 15) // "quitApplication" - - }, - "MainWindow\0startApplication\0\0" - "quitApplication" -}; -#undef QT_MOC_LITERAL - -static const uint qt_meta_data_MainWindow[] = { - - // content: - 7, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: name, argc, parameters, tag, flags - 1, 0, 24, 2, 0x08 /* Private */, - 3, 0, 25, 2, 0x08 /* Private */, - - // slots: parameters - QMetaType::Void, - QMetaType::Void, - - 0 // eod -}; - -void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - MainWindow *_t = static_cast<MainWindow *>(_o); - Q_UNUSED(_t) - switch (_id) { - case 0: _t->startApplication(); break; - case 1: _t->quitApplication(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObject MainWindow::staticMetaObject = { - { &QMainWindow::staticMetaObject, qt_meta_stringdata_MainWindow.data, - qt_meta_data_MainWindow, qt_static_metacall, nullptr, nullptr} -}; - - -const QMetaObject *MainWindow::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject; -} - -void *MainWindow::qt_metacast(const char *_clname) -{ - if (!_clname) return nullptr; - if (!strcmp(_clname, qt_meta_stringdata_MainWindow.stringdata0)) - return static_cast<void*>(this); - return QMainWindow::qt_metacast(_clname); -} - -int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QMainWindow::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 2) - *reinterpret_cast<int*>(_a[0]) = -1; - _id -= 2; - } - return _id; -} -QT_WARNING_POP -QT_END_MOC_NAMESPACE diff --git a/build-Demo-Desktop-Profile/moc_mainwindow.o b/build-Demo-Desktop-Profile/moc_mainwindow.o deleted file mode 100644 index a37f3fccb4dc6c7324fcc53d0b8441d7b0b44c90..0000000000000000000000000000000000000000 Binary files a/build-Demo-Desktop-Profile/moc_mainwindow.o and /dev/null differ diff --git a/build-Demo-Desktop-Profile/moc_predefs.h b/build-Demo-Desktop-Profile/moc_predefs.h deleted file mode 100644 index 3fb6bc872fff2b77276595374404ef7badb13bf9..0000000000000000000000000000000000000000 --- a/build-Demo-Desktop-Profile/moc_predefs.h +++ /dev/null @@ -1,286 +0,0 @@ -#define __SSP_STRONG__ 3 -#define __DBL_MIN_EXP__ (-1021) -#define __cpp_attributes 200809 -#define __UINT_LEAST16_MAX__ 0xffff -#define __ATOMIC_ACQUIRE 2 -#define __FLT_MIN__ 1.17549435082228750797e-38F -#define __GCC_IEC_559_COMPLEX 2 -#define __UINT_LEAST8_TYPE__ unsigned char -#define __SIZEOF_FLOAT80__ 16 -#define __INTMAX_C(c) c ## L -#define __CHAR_BIT__ 8 -#define __UINT8_MAX__ 0xff -#define __WINT_MAX__ 0xffffffffU -#define __cpp_static_assert 200410 -#define __ORDER_LITTLE_ENDIAN__ 1234 -#define __SIZE_MAX__ 0xffffffffffffffffUL -#define __WCHAR_MAX__ 0x7fffffff -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1 -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1 -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1 -#define __DBL_DENORM_MIN__ double(4.94065645841246544177e-324L) -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1 -#define __GCC_ATOMIC_CHAR_LOCK_FREE 2 -#define __GCC_IEC_559 2 -#define __FLT_EVAL_METHOD__ 0 -#define __unix__ 1 -#define __cpp_binary_literals 201304 -#define __GCC_ATOMIC_CHAR32_T_LOCK_FREE 2 -#define __x86_64 1 -#define __cpp_variadic_templates 200704 -#define __UINT_FAST64_MAX__ 0xffffffffffffffffUL -#define __SIG_ATOMIC_TYPE__ int -#define __DBL_MIN_10_EXP__ (-307) -#define __FINITE_MATH_ONLY__ 0 -#define __GNUC_PATCHLEVEL__ 0 -#define __UINT_FAST8_MAX__ 0xff -#define __has_include(STR) __has_include__(STR) -#define __DEC64_MAX_EXP__ 385 -#define __INT8_C(c) c -#define __UINT_LEAST64_MAX__ 0xffffffffffffffffUL -#define __SHRT_MAX__ 0x7fff -#define __LDBL_MAX__ 1.18973149535723176502e+4932L -#define __UINT_LEAST8_MAX__ 0xff -#define __GCC_ATOMIC_BOOL_LOCK_FREE 2 -#define __UINTMAX_TYPE__ long unsigned int -#define __linux 1 -#define __DEC32_EPSILON__ 1E-6DF -#define __OPTIMIZE__ 1 -#define __unix 1 -#define __UINT32_MAX__ 0xffffffffU -#define __GXX_EXPERIMENTAL_CXX0X__ 1 -#define __LDBL_MAX_EXP__ 16384 -#define __WINT_MIN__ 0U -#define __linux__ 1 -#define __SCHAR_MAX__ 0x7f -#define __WCHAR_MIN__ (-__WCHAR_MAX__ - 1) -#define __INT64_C(c) c ## L -#define __DBL_DIG__ 15 -#define __GCC_ATOMIC_POINTER_LOCK_FREE 2 -#define _FORTIFY_SOURCE 2 -#define __SIZEOF_INT__ 4 -#define __SIZEOF_POINTER__ 8 -#define __GCC_ATOMIC_CHAR16_T_LOCK_FREE 2 -#define __USER_LABEL_PREFIX__ -#define __STDC_HOSTED__ 1 -#define __LDBL_HAS_INFINITY__ 1 -#define __FLT_EPSILON__ 1.19209289550781250000e-7F -#define __GXX_WEAK__ 1 -#define __LDBL_MIN__ 3.36210314311209350626e-4932L -#define __DEC32_MAX__ 9.999999E96DF -#define __cpp_threadsafe_static_init 200806 -#define __INT32_MAX__ 0x7fffffff -#define __SIZEOF_LONG__ 8 -#define __STDC_IEC_559__ 1 -#define __STDC_ISO_10646__ 201706L -#define __UINT16_C(c) c -#define __DECIMAL_DIG__ 21 -#define __gnu_linux__ 1 -#define __has_include_next(STR) __has_include_next__(STR) -#define __LDBL_HAS_QUIET_NAN__ 1 -#define __GNUC__ 5 -#define __GXX_RTTI 1 -#define __pie__ 2 -#define __MMX__ 1 -#define __cpp_delegating_constructors 200604 -#define __FLT_HAS_DENORM__ 1 -#define __SIZEOF_LONG_DOUBLE__ 16 -#define __BIGGEST_ALIGNMENT__ 16 -#define __STDC_UTF_16__ 1 -#define __DBL_MAX__ double(1.79769313486231570815e+308L) -#define __cpp_raw_strings 200710 -#define __INT_FAST32_MAX__ 0x7fffffffffffffffL -#define __DBL_HAS_INFINITY__ 1 -#define __INT64_MAX__ 0x7fffffffffffffffL -#define __DEC32_MIN_EXP__ (-94) -#define __INT_FAST16_TYPE__ long int -#define __LDBL_HAS_DENORM__ 1 -#define __cplusplus 201103L -#define __cpp_ref_qualifiers 200710 -#define __DEC128_MAX__ 9.999999999999999999999999999999999E6144DL -#define __INT_LEAST32_MAX__ 0x7fffffff -#define __DEC32_MIN__ 1E-95DF -#define __DEPRECATED 1 -#define __cpp_rvalue_references 200610 -#define __DBL_MAX_EXP__ 1024 -#define __DEC128_EPSILON__ 1E-33DL -#define __SSE2_MATH__ 1 -#define __ATOMIC_HLE_RELEASE 131072 -#define __PTRDIFF_MAX__ 0x7fffffffffffffffL -#define __amd64 1 -#define __STDC_NO_THREADS__ 1 -#define __ATOMIC_HLE_ACQUIRE 65536 -#define __GNUG__ 5 -#define __LONG_LONG_MAX__ 0x7fffffffffffffffLL -#define __SIZEOF_SIZE_T__ 8 -#define __cpp_rvalue_reference 200610 -#define __cpp_nsdmi 200809 -#define __SIZEOF_WINT_T__ 4 -#define __cpp_initializer_lists 200806 -#define __GCC_HAVE_DWARF2_CFI_ASM 1 -#define __GXX_ABI_VERSION 1009 -#define __FLT_MIN_EXP__ (-125) -#define __cpp_lambdas 200907 -#define __INT_FAST64_TYPE__ long int -#define __DBL_MIN__ double(2.22507385850720138309e-308L) -#define __PIE__ 2 -#define __LP64__ 1 -#define __DECIMAL_BID_FORMAT__ 1 -#define __DEC128_MIN__ 1E-6143DL -#define __REGISTER_PREFIX__ -#define __UINT16_MAX__ 0xffff -#define __DBL_HAS_DENORM__ 1 -#define __UINT8_TYPE__ unsigned char -#define __FLT_MANT_DIG__ 24 -#define __VERSION__ "5.5.0 20171010" -#define __UINT64_C(c) c ## UL -#define __cpp_unicode_characters 200704 -#define _STDC_PREDEF_H 1 -#define __GCC_ATOMIC_INT_LOCK_FREE 2 -#define __FLOAT_WORD_ORDER__ __ORDER_LITTLE_ENDIAN__ -#define __STDC_IEC_559_COMPLEX__ 1 -#define __INT32_C(c) c -#define __DEC64_EPSILON__ 1E-15DD -#define __ORDER_PDP_ENDIAN__ 3412 -#define __DEC128_MIN_EXP__ (-6142) -#define __INT_FAST32_TYPE__ long int -#define __UINT_LEAST16_TYPE__ short unsigned int -#define unix 1 -#define __INT16_MAX__ 0x7fff -#define __cpp_rtti 199711 -#define __SIZE_TYPE__ long unsigned int -#define __UINT64_MAX__ 0xffffffffffffffffUL -#define __INT8_TYPE__ signed char -#define __ELF__ 1 -#define __FLT_RADIX__ 2 -#define __INT_LEAST16_TYPE__ short int -#define __LDBL_EPSILON__ 1.08420217248550443401e-19L -#define __UINTMAX_C(c) c ## UL -#define __GLIBCXX_BITSIZE_INT_N_0 128 -#define __k8 1 -#define __SIG_ATOMIC_MAX__ 0x7fffffff -#define __GCC_ATOMIC_WCHAR_T_LOCK_FREE 2 -#define __SIZEOF_PTRDIFF_T__ 8 -#define __x86_64__ 1 -#define __DEC32_SUBNORMAL_MIN__ 0.000001E-95DF -#define __INT_FAST16_MAX__ 0x7fffffffffffffffL -#define __UINT_FAST32_MAX__ 0xffffffffffffffffUL -#define __UINT_LEAST64_TYPE__ long unsigned int -#define __FLT_HAS_QUIET_NAN__ 1 -#define __FLT_MAX_10_EXP__ 38 -#define __LONG_MAX__ 0x7fffffffffffffffL -#define __DEC128_SUBNORMAL_MIN__ 0.000000000000000000000000000000001E-6143DL -#define __FLT_HAS_INFINITY__ 1 -#define __cpp_unicode_literals 200710 -#define __UINT_FAST16_TYPE__ long unsigned int -#define __DEC64_MAX__ 9.999999999999999E384DD -#define __CHAR16_TYPE__ short unsigned int -#define __PRAGMA_REDEFINE_EXTNAME 1 -#define __INT_LEAST16_MAX__ 0x7fff -#define __DEC64_MANT_DIG__ 16 -#define __UINT_LEAST32_MAX__ 0xffffffffU -#define __GCC_ATOMIC_LONG_LOCK_FREE 2 -#define __INT_LEAST64_TYPE__ long int -#define __INT16_TYPE__ short int -#define __INT_LEAST8_TYPE__ signed char -#define __DEC32_MAX_EXP__ 97 -#define __INT_FAST8_MAX__ 0x7f -#define __INTPTR_MAX__ 0x7fffffffffffffffL -#define linux 1 -#define __cpp_range_based_for 200907 -#define __SSE2__ 1 -#define __EXCEPTIONS 1 -#define __LDBL_MANT_DIG__ 64 -#define __DBL_HAS_QUIET_NAN__ 1 -#define __SIG_ATOMIC_MIN__ (-__SIG_ATOMIC_MAX__ - 1) -#define __code_model_small__ 1 -#define __k8__ 1 -#define __INTPTR_TYPE__ long int -#define __UINT16_TYPE__ short unsigned int -#define __WCHAR_TYPE__ int -#define __SIZEOF_FLOAT__ 4 -#define __pic__ 2 -#define __UINTPTR_MAX__ 0xffffffffffffffffUL -#define __DEC64_MIN_EXP__ (-382) -#define __cpp_decltype 200707 -#define __INT_FAST64_MAX__ 0x7fffffffffffffffL -#define __GCC_ATOMIC_TEST_AND_SET_TRUEVAL 1 -#define __FLT_DIG__ 6 -#define __UINT_FAST64_TYPE__ long unsigned int -#define __INT_MAX__ 0x7fffffff -#define __amd64__ 1 -#define __INT64_TYPE__ long int -#define __FLT_MAX_EXP__ 128 -#define __ORDER_BIG_ENDIAN__ 4321 -#define __DBL_MANT_DIG__ 53 -#define __cpp_inheriting_constructors 200802 -#define __SIZEOF_FLOAT128__ 16 -#define __INT_LEAST64_MAX__ 0x7fffffffffffffffL -#define __DEC64_MIN__ 1E-383DD -#define __WINT_TYPE__ unsigned int -#define __UINT_LEAST32_TYPE__ unsigned int -#define __SIZEOF_SHORT__ 2 -#define __SSE__ 1 -#define __LDBL_MIN_EXP__ (-16381) -#define __INT_LEAST8_MAX__ 0x7f -#define __SIZEOF_INT128__ 16 -#define __LDBL_MAX_10_EXP__ 4932 -#define __ATOMIC_RELAXED 0 -#define __DBL_EPSILON__ double(2.22044604925031308085e-16L) -#define _LP64 1 -#define __UINT8_C(c) c -#define __INT_LEAST32_TYPE__ int -#define __SIZEOF_WCHAR_T__ 4 -#define __UINT64_TYPE__ long unsigned int -#define __INT_FAST8_TYPE__ signed char -#define __GNUC_STDC_INLINE__ 1 -#define __DBL_DECIMAL_DIG__ 17 -#define __STDC_UTF_32__ 1 -#define __FXSR__ 1 -#define __DEC_EVAL_METHOD__ 2 -#define __cpp_runtime_arrays 198712 -#define __UINT32_C(c) c ## U -#define __INTMAX_MAX__ 0x7fffffffffffffffL -#define __cpp_alias_templates 200704 -#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__ -#define __FLT_DENORM_MIN__ 1.40129846432481707092e-45F -#define __INT8_MAX__ 0x7f -#define __PIC__ 2 -#define __UINT_FAST32_TYPE__ long unsigned int -#define __CHAR32_TYPE__ unsigned int -#define __FLT_MAX__ 3.40282346638528859812e+38F -#define __cpp_constexpr 200704 -#define __INT32_TYPE__ int -#define __SIZEOF_DOUBLE__ 8 -#define __cpp_exceptions 199711 -#define __INTMAX_TYPE__ long int -#define __DEC128_MAX_EXP__ 6145 -#define __ATOMIC_CONSUME 1 -#define __GNUC_MINOR__ 5 -#define __GLIBCXX_TYPE_INT_N_0 __int128 -#define __UINTMAX_MAX__ 0xffffffffffffffffUL -#define __DEC32_MANT_DIG__ 7 -#define __DBL_MAX_10_EXP__ 308 -#define __LDBL_DENORM_MIN__ 3.64519953188247460253e-4951L -#define __INT16_C(c) c -#define __STDC__ 1 -#define __PTRDIFF_TYPE__ long int -#define __ATOMIC_SEQ_CST 5 -#define __UINT32_TYPE__ unsigned int -#define __UINTPTR_TYPE__ long unsigned int -#define __DEC64_SUBNORMAL_MIN__ 0.000000000000001E-383DD -#define __DEC128_MANT_DIG__ 34 -#define __LDBL_MIN_10_EXP__ (-4931) -#define __SSE_MATH__ 1 -#define __SIZEOF_LONG_LONG__ 8 -#define __cpp_user_defined_literals 200809 -#define __GCC_ATOMIC_LLONG_LOCK_FREE 2 -#define __LDBL_DIG__ 18 -#define __FLT_DECIMAL_DIG__ 9 -#define __UINT_FAST16_MAX__ 0xffffffffffffffffUL -#define __FLT_MIN_10_EXP__ (-37) -#define __GCC_ATOMIC_SHORT_LOCK_FREE 2 -#define __UINT_FAST8_TYPE__ unsigned char -#define _GNU_SOURCE 1 -#define __ATOMIC_ACQ_REL 4 -#define __ATOMIC_RELEASE 3 diff --git a/build-Demo-Desktop-Profile/ui_mainwindow.h b/build-Demo-Desktop-Profile/ui_mainwindow.h deleted file mode 100644 index f921795aafb8b93babf9cb43adf70cf7f54cc87e..0000000000000000000000000000000000000000 --- a/build-Demo-Desktop-Profile/ui_mainwindow.h +++ /dev/null @@ -1,94 +0,0 @@ -/******************************************************************************** -** Form generated from reading UI file 'mainwindow.ui' -** -** Created by: Qt User Interface Compiler version 5.9.5 -** -** WARNING! All changes made in this file will be lost when recompiling UI file! -********************************************************************************/ - -#ifndef UI_MAINWINDOW_H -#define UI_MAINWINDOW_H - -#include <QtCore/QVariant> -#include <QtWidgets/QAction> -#include <QtWidgets/QApplication> -#include <QtWidgets/QButtonGroup> -#include <QtWidgets/QGridLayout> -#include <QtWidgets/QHeaderView> -#include <QtWidgets/QLabel> -#include <QtWidgets/QMainWindow> -#include <QtWidgets/QPushButton> -#include <QtWidgets/QWidget> - -QT_BEGIN_NAMESPACE - -class Ui_MainWindow -{ -public: - QWidget *centralWidget; - QWidget *gridLayoutWidget; - QGridLayout *gridLayout; - QPushButton *btnQuit; - QPushButton *btnStart; - QLabel *lblImage; - - void setupUi(QMainWindow *MainWindow) - { - if (MainWindow->objectName().isEmpty()) - MainWindow->setObjectName(QStringLiteral("MainWindow")); - MainWindow->resize(400, 300); - centralWidget = new QWidget(MainWindow); - centralWidget->setObjectName(QStringLiteral("centralWidget")); - gridLayoutWidget = new QWidget(centralWidget); - gridLayoutWidget->setObjectName(QStringLiteral("gridLayoutWidget")); - gridLayoutWidget->setGeometry(QRect(0, 0, 401, 301)); - gridLayout = new QGridLayout(gridLayoutWidget); - gridLayout->setSpacing(6); - gridLayout->setContentsMargins(11, 11, 11, 11); - gridLayout->setObjectName(QStringLiteral("gridLayout")); - gridLayout->setSizeConstraint(QLayout::SetNoConstraint); - gridLayout->setContentsMargins(0, 0, 0, 0); - btnQuit = new QPushButton(gridLayoutWidget); - btnQuit->setObjectName(QStringLiteral("btnQuit")); - - gridLayout->addWidget(btnQuit, 3, 1, 1, 1); - - btnStart = new QPushButton(gridLayoutWidget); - btnStart->setObjectName(QStringLiteral("btnStart")); - - gridLayout->addWidget(btnStart, 3, 0, 1, 1); - - lblImage = new QLabel(gridLayoutWidget); - lblImage->setObjectName(QStringLiteral("lblImage")); - QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - sizePolicy.setHorizontalStretch(0); - sizePolicy.setVerticalStretch(0); - sizePolicy.setHeightForWidth(lblImage->sizePolicy().hasHeightForWidth()); - lblImage->setSizePolicy(sizePolicy); - - gridLayout->addWidget(lblImage, 2, 0, 1, 2); - - MainWindow->setCentralWidget(centralWidget); - - retranslateUi(MainWindow); - - QMetaObject::connectSlotsByName(MainWindow); - } // setupUi - - void retranslateUi(QMainWindow *MainWindow) - { - MainWindow->setWindowTitle(QApplication::translate("MainWindow", "Demo Sandbox", Q_NULLPTR)); - btnQuit->setText(QApplication::translate("MainWindow", "Quit", Q_NULLPTR)); - btnStart->setText(QApplication::translate("MainWindow", "Start", Q_NULLPTR)); - lblImage->setText(QString()); - } // retranslateUi - -}; - -namespace Ui { - class MainWindow: public Ui_MainWindow {}; -} // namespace Ui - -QT_END_NAMESPACE - -#endif // UI_MAINWINDOW_H diff --git a/build-sandbox-Desktop-Debug/beamer.o b/build-sandbox-Desktop-Debug/beamer.o index 08a43fd3c8d94a9c70880463d8be8a9952234dfd..5e879f3b22894038e33d2805c570e277c3181176 100644 Binary files a/build-sandbox-Desktop-Debug/beamer.o and b/build-sandbox-Desktop-Debug/beamer.o differ diff --git a/build-sandbox-Desktop-Debug/libsandbox.a b/build-sandbox-Desktop-Debug/libsandbox.a index 2de4ebea8dbcbc981618cc90af7fe611b0c88b7a..c2f9c5805d7b8dc2c8ead8f02789bdcbfa997a83 100644 Binary files a/build-sandbox-Desktop-Debug/libsandbox.a and b/build-sandbox-Desktop-Debug/libsandbox.a differ diff --git a/build-sandbox-Desktop-Debug/sandbox.o b/build-sandbox-Desktop-Debug/sandbox.o index 29e1f2b0cc33549d709518ad35d8cf1a20765600..d8bf16818ec5e3c7ad67a5ad38397ac6df45aabf 100644 Binary files a/build-sandbox-Desktop-Debug/sandbox.o and b/build-sandbox-Desktop-Debug/sandbox.o differ diff --git a/build-sandbox-Desktop-Debug/transformframe.o b/build-sandbox-Desktop-Debug/transformframe.o index eda83f10d25d14719d4ca850d0cc3b6320c25c28..2103caab4894d76ce5d76645e4a6b720d1fd9556 100644 Binary files a/build-sandbox-Desktop-Debug/transformframe.o and b/build-sandbox-Desktop-Debug/transformframe.o differ diff --git a/build-sandbox-Desktop-Debug/usesandbox.o b/build-sandbox-Desktop-Debug/usesandbox.o index 51294c3b9be44e69c49ad1360eae92a01cfa4495..b7007cb43d706dd0d3af5393e619732c2f03d412 100644 Binary files a/build-sandbox-Desktop-Debug/usesandbox.o and b/build-sandbox-Desktop-Debug/usesandbox.o differ diff --git a/sandbox/beamer.cpp b/sandbox/beamer.cpp index aac0e6ab02bc814419b57fd67d7d1fe51f983b46..6037688d712955d667f037527a541668a2e13f7d 100644 --- a/sandbox/beamer.cpp +++ b/sandbox/beamer.cpp @@ -147,8 +147,8 @@ tuple<Mat, int, vector<Vec3f>> Beamer::detectPoint(Camera camera, int i) { // Check circle int indexCircle = -1; - for (int i = 0; i < crc.size(); ++i){ - float distanceCenterPoint = (crc[i][0] - p.x) * (crc[i][0] - p.x) + (crc[i][1] - p.y) * (crc[i][1] - p.y); + for (uint i = 0; i < crc.size(); ++i){ + float distanceCenterPoint = sqrt((crc[i][0] - p.x) * (crc[i][0] - p.x) + (crc[i][1] - p.y) * (crc[i][1] - p.y)); if (distanceCenterPoint < crc[i][2]) { color = Scalar(0, 255, 0); indexCircle = i; @@ -167,12 +167,12 @@ tuple<Mat, int, vector<Vec3f>> Beamer::detectPoint(Camera camera, int i) { * \param crc detected circle * Store the detect point */ -void Beamer::capturePoint(Camera camera, vector<Vec3f> crc) { +void Beamer::capturePoint(Camera camera, Vec3f crc) { Mat depth; camera.captureFramesAlign(); depth = camera.getDepthFrameAlign(); - float coord[2] = {(float)crc[0][0], (float)crc[0][1]}; - float z = static_cast<float>(depth.at<uint16_t>(crc[0][1], crc[0][0])); + float coord[2] = {(float)crc[0], (float)crc[1]}; + float z = static_cast<float>(depth.at<uint16_t>(crc[1], crc[0])); Point3f p = camera.deprojectPixelToPoint(coord, z / 1000.0); capturedPoints.push_back(p); } diff --git a/sandbox/beamer.h b/sandbox/beamer.h index 0e8445aa659938137bbda0e95186c625e390a89d..fef11c8be0c7146d866f70a3de093d1d77719d55 100644 --- a/sandbox/beamer.h +++ b/sandbox/beamer.h @@ -3,6 +3,7 @@ #include <opencv2/opencv.hpp> #include "camera.h" +#include <math.h> using namespace cv; using namespace std; @@ -44,7 +45,7 @@ public: Point3f getPosition(); void setPosition(Point3f position); tuple<Mat, int, vector<Vec3f>> detectPoint(Camera camera, int i); - void capturePoint(Camera camera, vector<Vec3f> crc); + void capturePoint(Camera camera, Vec3f crc); bool findIntersections(); void findBeamerPosition(); void clearCapturedPoint(); diff --git a/sandbox/sandbox.cpp b/sandbox/sandbox.cpp index c5a837116fd568a5ff64c71bdefcf375003b2e55..60e9e451ef2c681cc73b36a04d4f244acc948990 100644 --- a/sandbox/sandbox.cpp +++ b/sandbox/sandbox.cpp @@ -79,13 +79,13 @@ bool Sandbox::serialize(ostream& stream) z = beamer.getPosition().z; // Seriliazation - stream << serialnumber << CHAR_DELIM << distance << CHAR_DELIM << x << CHAR_DELIM << y << CHAR_DELIM << z << CHAR_DELIM << cols << CHAR_DELIM << rows << CHAR_DELIM << type << CHAR_DELIM; + stream << serialnumber << CHAR_DELIM << distance << CHAR_DELIM << x << CHAR_DELIM << y << CHAR_DELIM << z << CHAR_DELIM << rectSandbox.x << CHAR_DELIM << rectSandbox.y << CHAR_DELIM << rectSandbox.width << CHAR_DELIM << rectSandbox.height << CHAR_DELIM << cols << CHAR_DELIM << rows << CHAR_DELIM << type << CHAR_DELIM; - for (int a = 0; a < matRotation.rows; a++) + for (int a = 0; a < matRotation.rows; ++a) { - for (int b = 0; b < matRotation.cols; b++) + for (int b = 0; b < matRotation.cols; ++b) { - stream << matRotation.at<uint16_t>(a, b) << CHAR_DELIM; + stream << matRotation.at<uint16_t>(b, a) << CHAR_DELIM; } } } catch (Exception e) { @@ -112,7 +112,6 @@ bool Sandbox::deserialize(istream& stream) int cols, rows, type; - // Deserialize beamer float x, y, z; @@ -122,12 +121,15 @@ bool Sandbox::deserialize(istream& stream) stream >> x; stream >> y; stream >> z; + stream >> rectSandbox.x; + stream >> rectSandbox.y; + stream >> rectSandbox.width; + stream >> rectSandbox.height; stream >> cols; stream >> rows; stream >> type; uint16_t data[rows][cols]; - for (int a = 0; a < rows; a++) { for (int b = 0; b < cols; b++) @@ -153,6 +155,7 @@ bool Sandbox::deserialize(istream& stream) transformFrame.setDistancePlan(distancePlan); transformFrame.setMatrixRotation(matRotation); + // Set beamer Point3f beamerPosition = Point3f(x, y, z); beamer.setPosition(beamerPosition); @@ -254,7 +257,7 @@ tuple<Mat, int, vector<Vec3f>> Sandbox::detectPointToDetectBeamer(int indexPoint * \param crc circle vector * Store a point to make a regression */ -void Sandbox::capturePoint(vector<Vec3f> crc) { +void Sandbox::capturePoint(Vec3f crc) { beamer.capturePoint(camera, crc); } @@ -337,3 +340,28 @@ Mat Sandbox::redrawFrameWithBorder() { Mat coloredFrame = camera.getRGBFrameAlign(); return borderEdit.initBorder(coloredFrame, &border); } + +/*! + * \brief Sandbox::resizeFrameForBeamer + * \param image frame + * \return frame + * Transform a frame to match with the beamer + */ +Mat Sandbox::resizeFrameForBeamer(Mat image) { + Mat frameBeamer(Size(Beamer::width, Beamer::height), CV_8UC3); + camera.captureFramesAlign(); + Mat depth = camera.getDepthFrameAlign()(rectSandbox); + + resize(image, image, depth.size()); + + Mat imageCalibrate(depth.size(), CV_8UC3, Scalar(0, 0, 0)); + + transformFrame.transformationFrame(depth, image, imageCalibrate, camera, beamer.getPosition()); + + //flip to align frame with beamer + flip(imageCalibrate, imageCalibrate, 1); + flip(imageCalibrate, imageCalibrate, 0); + resize(imageCalibrate, frameBeamer, frameBeamer.size()); + + return frameBeamer; +} diff --git a/sandbox/sandbox.h b/sandbox/sandbox.h index 43bff604406c258c6002c24198e47271071f36a0..fbfdcec6c2f5be8a48b05826a9a0a0ef7bf47c5d 100644 --- a/sandbox/sandbox.h +++ b/sandbox/sandbox.h @@ -59,7 +59,7 @@ public: int findEdgeBorder(int x, int y); Mat editEdgeBorder(int selectedPoint, int x, int y); tuple<Mat, int, vector<Vec3f>> detectPointToDetectBeamer(int indexPoint); - void capturePoint(vector<Vec3f> crc); + void capturePoint(Vec3f crc); void findBeamerPosition(); void stopCamera(); void startCamera(); @@ -69,6 +69,7 @@ public: Mat redrawFrameWithBorder(); Mat captureDepthFramesAlign(); void clearCapturedPoint(); + Mat resizeFrameForBeamer(Mat image); }; diff --git a/sandbox/transformframe.cpp b/sandbox/transformframe.cpp index 87a8ff5b88d7fc3d8937b9950efa4c846b798cb9..72d863724007a4d12446cbd24a696c3ea2a6896a 100644 --- a/sandbox/transformframe.cpp +++ b/sandbox/transformframe.cpp @@ -55,6 +55,7 @@ Point2i TransformFrame::transformationPixel(int i, int j, float z, Camera camera void TransformFrame::transformationFrame(Mat &src, Mat &dst, Camera camera, Point3f beamer) { int64_t t1 = getTickCount(); + //transformation on all pixel for (int i = 0; i < src.rows; i++) { @@ -86,6 +87,7 @@ void TransformFrame::transformationFrame(Mat &depth, Mat &src, Mat &dst, Camera int nbChannel = src.channels(); //transformation on all pixel int64_t t1 = getTickCount(); + for (int i = 0; i < src.rows; i++) { for (int j = 0; j < src.cols; j++) @@ -102,7 +104,15 @@ void TransformFrame::transformationFrame(Mat &depth, Mat &src, Mat &dst, Camera } } cout << "temps de calcul: " << (getTickCount() - t1) / getTickFrequency() << endl; - warpAffine(dst, dst, matRotation, dst.size()); + for (int i = 0; i < matRotation.rows; i++) + { + for (int j = 0; j < matRotation.cols; j++) + { + Point pixelIJ(j, i); + cout << matRotation.at<uint16_t>(pixelIJ) << endl; + } + } + warpAffine(dst, dst, matRotation, dst.size(), INTER_LINEAR); dilate(dst, dst, Mat(), Point(-1, -1), 2, 1, 1); erode(dst, dst, Mat(), Point(-1, -1), 2, 1, 1); } diff --git a/sandbox/usesandbox.cpp b/sandbox/usesandbox.cpp index 3c8e7bd0bf999939db3bd30d6a9af9b8df4521c7..fb7e1e045ee4c0ec25c27b0bd21c8aecce5eba93 100644 --- a/sandbox/usesandbox.cpp +++ b/sandbox/usesandbox.cpp @@ -52,3 +52,13 @@ void UseSandbox::loadConfiguration(string filename) { ready = false; } } + +/*! + * \brief UseSandbox::resizeFrameForBeamer + * \param image frame + * \return frame + * Transform a frame to match with the beamer + */ +Mat UseSandbox::resizeFrameForBeamer(Mat image) { + return sandbox.resizeFrameForBeamer(image); +} diff --git a/sandbox/usesandbox.h b/sandbox/usesandbox.h index 7200a3ed0362fb5265ff7334b518369abd73393d..95a7a9dbe538ada1f85c7baf31e98702011b8231 100644 --- a/sandbox/usesandbox.h +++ b/sandbox/usesandbox.h @@ -23,6 +23,7 @@ public: Mat captureDepthFramesAlign(); void stopCamera(); void loadConfiguration(string filename); + Mat resizeFrameForBeamer(Mat image); // Properties bool loaded = false;