Merge pull request #42 from iTrace-Dev/develop

Final Fix for 0.2.0 Release
iTrace-Dev · May 31, 2022 · c0cfd5a · c0cfd5a
2 parents 0c331fd + bcb04f4
commit c0cfd5a
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 25 deletions.
diff --git a/chain-closed.png b/chain-closed.png
diff --git a/chain-open.png b/chain-open.png
diff --git a/iTrace-Toolkit.pro b/iTrace-Toolkit.pro
@@ -10,8 +10,13 @@
 ##########################################################################################################################################################################################################################################################
 
 QT += quick
+QT += widgets
+QT += sql
+QT += core
+QT += xmlpatterns xml
 
 CONFIG += c++11
+CONFIG += sql
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings
@@ -25,7 +30,6 @@ DEFINES += QT_DEPRECATED_WARNINGS
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
 SOURCES += \
-<<<<<<< HEAD
         basicalgorithm.cpp \
         controller.cpp \
         database.cpp \
@@ -43,14 +47,9 @@ SOURCES += \
 
 RESOURCES += qml.qrc \
     images.qrc
-=======
-        main.cpp
-
-RESOURCES += qml.qrc
->>>>>>> 73b168bc23d7cf768d99a7692d5c70b04ddc1b27
 
 # Additional import path used to resolve QML modules in Qt Creator's code model
-QML_IMPORT_PATH =
+QML_IMPORT_PATH = $$PWD
 
 # Additional import path used to resolve QML modules just for Qt Quick Designer
 QML_DESIGNER_IMPORT_PATH =
@@ -59,7 +58,6 @@ QML_DESIGNER_IMPORT_PATH =
 qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
-<<<<<<< HEAD
 
 # ICON
 RC_ICONS = iTrace.ico
@@ -82,5 +80,3 @@ HEADERS += \
 CONFIG += qmltypes
 QML_IMPORT_NAME = io.qt.examples.backend
 QML_IMPORT_MAJOR_VERSION = 1
-=======
->>>>>>> 73b168bc23d7cf768d99a7692d5c70b04ddc1b27
diff --git a/iTrace.ico b/iTrace.ico
diff --git a/main.cpp b/main.cpp
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /********************************************************************************************************************************************************
 * @file main.cpp
 *
@@ -16,16 +15,22 @@
 
 #include "participantsmodel.h"
 //#include "control.h"
-=======
-#include <QGuiApplication>
-#include <QQmlApplicationEngine>
->>>>>>> 73b168bc23d7cf768d99a7692d5c70b04ddc1b27
 
 int main(int argc, char *argv[])
 {
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 
-    QGuiApplication app(argc, argv);
+    QApplication app(argc, argv);
+
+    app.setOrganizationName("i-Trace.org");
+    app.setOrganizationDomain("Eye Tracking Framework");
+
+    qmlRegisterType<ParticipantsModel>("Participants", 1, 0, "ParticipantsModel");
+    qmlRegisterUncreatableType<ParticipantsList>("Participants", 1, 0, "ParticipantsList", QStringLiteral("Participants should not be created in QML"));
+
+    ParticipantsList participants;
+
+
 
     QQmlApplicationEngine engine;
     const QUrl url(QStringLiteral("qrc:/main.qml"));
@@ -34,6 +39,7 @@ int main(int argc, char *argv[])
         if (!obj && url == objUrl)
             QCoreApplication::exit(-1);
     }, Qt::QueuedConnection);
+    engine.rootContext()->setContextProperty("participants", &participants);
     engine.load(url);
 
     return app.exec();

diff --git a/main.qml b/main.qml
@@ -11,7 +11,6 @@
 
 import QtQuick 2.15
 import QtQuick.Window 2.15
-<<<<<<< HEAD
 import QtQuick.Controls 2.15
 import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.3
@@ -572,12 +571,5 @@ Window {
 
 
 
-=======
-
-Window {
-    visible: true
-    width: 640
-    height: 480
-    title: qsTr("Hello World")
->>>>>>> 73b168bc23d7cf768d99a7692d5c70b04ddc1b27
 }
+
diff --git a/qml.qrc b/qml.qrc
@@ -1,5 +1,9 @@
 <RCC>
     <qresource prefix="/">
         <file>main.qml</file>
+        <file>Participant.qml</file>
+        <file>Options.qml</file>
+        <file>Mapping.qml</file>
+        <file>Filter.qml</file>
     </qresource>
 </RCC>