diff --git a/reports and other files/final report/Final Report.docx b/reports and other files/final report/Final Report.docx
index 06f6d2dbdc72003213153e449054367ba77350e3..b2342117d55c79e2c682e43e3307df30f0b578dc 100644
Binary files a/reports and other files/final report/Final Report.docx and b/reports and other files/final report/Final Report.docx differ
diff --git a/reports and other files/final report/~$nal Report.docx b/reports and other files/final report/~$nal Report.docx
deleted file mode 100644
index 8596f6b9580fbcfdd552909c77a16da773a6c209..0000000000000000000000000000000000000000
Binary files a/reports and other files/final report/~$nal Report.docx and /dev/null differ
diff --git a/sourcefiles/modelexp.qml b/sourcefiles/Main_.qml
similarity index 100%
rename from sourcefiles/modelexp.qml
rename to sourcefiles/Main_.qml
diff --git a/sourcefiles/Makefile.Debug b/sourcefiles/Makefile.Debug
index f1cbffa9abd9535fc4860267d47daee16e50b3ac..ecbce627436445a86ae590325caf3ffb3b03a425 100644
--- a/sourcefiles/Makefile.Debug
+++ b/sourcefiles/Makefile.Debug
@@ -126,7 +126,7 @@ compiler_rcc_clean:
debug/qrc_qml.cpp: qml.qrc \
C:/Qt/5.15.2/mingw81_64/bin/rcc.exe \
Controller.js \
- modelexp.qml \
+ Main_.qml \
Page3.qml \
Page2.qml \
temp.qml \
@@ -405,6 +405,7 @@ debug/moc_datasource.cpp: datasource.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/qwineventnotifier.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/qxmlstream.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/qtcoreversion.h \
+ chartspage.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/QStack \
debug/moc_predefs.h \
C:/Qt/5.15.2/mingw81_64/bin/moc.exe
@@ -738,6 +739,7 @@ debug/datasource.o: datasource.cpp datasource.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/qwineventnotifier.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/qxmlstream.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/qtcoreversion.h \
+ chartspage.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/QStack \
C:/Qt/5.15.2/mingw81_64/include/QtCharts/QXYSeries \
C:/Qt/5.15.2/mingw81_64/include/QtCharts/qxyseries.h \
@@ -1054,6 +1056,7 @@ debug/main.o: main.cpp datasource.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/qwineventnotifier.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/qxmlstream.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/qtcoreversion.h \
+ chartspage.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/QStack \
C:/Qt/5.15.2/mingw81_64/include/QtDataVisualization/qutils.h \
C:/Qt/5.15.2/mingw81_64/include/QtGui/QSurfaceFormat \
@@ -1341,7 +1344,8 @@ debug/sender.o: sender.cpp sender.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/QDeadlineTimer \
C:/Qt/5.15.2/mingw81_64/include/QtCore/qwineventnotifier.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/qxmlstream.h \
- C:/Qt/5.15.2/mingw81_64/include/QtCore/qtcoreversion.h
+ C:/Qt/5.15.2/mingw81_64/include/QtCore/qtcoreversion.h \
+ chartspage.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/sender.o sender.cpp
debug/surface.o: surface.cpp surface.h \
diff --git a/sourcefiles/Makefile.Release b/sourcefiles/Makefile.Release
index 5d29b36933edf9e229a3e2ea7c5f6c025864bc9b..18e5906d0bb93f57484519cc121adfbbcfddadb6 100644
--- a/sourcefiles/Makefile.Release
+++ b/sourcefiles/Makefile.Release
@@ -126,7 +126,7 @@ compiler_rcc_clean:
release/qrc_qml.cpp: qml.qrc \
C:/Qt/5.15.2/mingw81_64/bin/rcc.exe \
Controller.js \
- modelexp.qml \
+ Main_.qml \
Page3.qml \
Page2.qml \
temp.qml \
@@ -405,6 +405,7 @@ release/moc_datasource.cpp: datasource.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/qwineventnotifier.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/qxmlstream.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/qtcoreversion.h \
+ chartspage.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/QStack \
release/moc_predefs.h \
C:/Qt/5.15.2/mingw81_64/bin/moc.exe
@@ -738,6 +739,7 @@ release/datasource.o: datasource.cpp datasource.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/qwineventnotifier.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/qxmlstream.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/qtcoreversion.h \
+ chartspage.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/QStack \
C:/Qt/5.15.2/mingw81_64/include/QtCharts/QXYSeries \
C:/Qt/5.15.2/mingw81_64/include/QtCharts/qxyseries.h \
@@ -1054,6 +1056,7 @@ release/main.o: main.cpp datasource.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/qwineventnotifier.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/qxmlstream.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/qtcoreversion.h \
+ chartspage.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/QStack \
C:/Qt/5.15.2/mingw81_64/include/QtDataVisualization/qutils.h \
C:/Qt/5.15.2/mingw81_64/include/QtGui/QSurfaceFormat \
@@ -1341,7 +1344,8 @@ release/sender.o: sender.cpp sender.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/QDeadlineTimer \
C:/Qt/5.15.2/mingw81_64/include/QtCore/qwineventnotifier.h \
C:/Qt/5.15.2/mingw81_64/include/QtCore/qxmlstream.h \
- C:/Qt/5.15.2/mingw81_64/include/QtCore/qtcoreversion.h
+ C:/Qt/5.15.2/mingw81_64/include/QtCore/qtcoreversion.h \
+ chartspage.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/sender.o sender.cpp
release/surface.o: surface.cpp surface.h \
diff --git a/sourcefiles/POETSvisualizer.pro.user b/sourcefiles/POETSvisualizer.pro.user
index f0214bcf3b9c1a9f9a75bb62704894b72a2fdcb1..a99f120061d400361634158908142af8765b320a 100644
--- a/sourcefiles/POETSvisualizer.pro.user
+++ b/sourcefiles/POETSvisualizer.pro.user
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.13.3, 2021-04-05T23:20:23. -->
+<!-- Written by QtCreator 4.13.3, 2021-04-08T23:11:27. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
diff --git a/sourcefiles/debug/POETSvisualizer.exe b/sourcefiles/debug/POETSvisualizer.exe
index 57bfb34747bca20b265e63a7d5f660fedc55881f..82aca49b044df66c78faf5c51275068369db80bb 100644
Binary files a/sourcefiles/debug/POETSvisualizer.exe and b/sourcefiles/debug/POETSvisualizer.exe differ
diff --git a/sourcefiles/debug/main.o b/sourcefiles/debug/main.o
index 37dfb7f0ee711b464cb98127d2535539c4d019e5..4d2402133810a16711b3f32723f45890e710e776 100644
Binary files a/sourcefiles/debug/main.o and b/sourcefiles/debug/main.o differ
diff --git a/sourcefiles/debug/qrc_qml.cpp b/sourcefiles/debug/qrc_qml.cpp
index 8a04db148bb221c63a2684125410d91f366c561d..dd3e69d3b39e316fbbf3688d05c8f1deca1fa835 100644
--- a/sourcefiles/debug/qrc_qml.cpp
+++ b/sourcefiles/debug/qrc_qml.cpp
@@ -100,7 +100,7 @@ static const unsigned char qt_resource_data[] = {
0xb1,0xb6,0x71,0x53,0xa1,0xf0,0xbf,0x7f,0xac,0x6b,0x74,0xe9,0xdc,0xf8,0x34,0xf5,
0xe8,0x32,0xed,0x88,0xcc,0x2b,0xab,0xb1,0xa8,0xd4,0xdc,0x4d,0xb1,0x58,0x5b,0xc5,
0x7d,0xb9,0xc9,0xb4,0xfc,0xfc,0x3,0x1d,0x7e,0xf6,0xf2,
- // C:/Users/domin/OneDrive/Documents/POETSvisualizer/sourcefiles/modelexp.qml
+ // C:/Users/domin/OneDrive/Documents/POETSvisualizer/sourcefiles/Main_.qml
0x0,0x0,0x7,0x84,
0x69,
0x6d,0x70,0x6f,0x72,0x74,0x20,0x51,0x74,0x51,0x75,0x69,0x63,0x6b,0x20,0x32,0x2e,
@@ -1386,11 +1386,11 @@ static const unsigned char qt_resource_name[] = {
0x7,0xe7,0x26,0xf3,
0x0,0x43,
0x0,0x6f,0x0,0x6e,0x0,0x74,0x0,0x72,0x0,0x6f,0x0,0x6c,0x0,0x6c,0x0,0x65,0x0,0x72,0x0,0x2e,0x0,0x6a,0x0,0x73,
- // modelexp.qml
- 0x0,0xc,
- 0x2,0x78,0x10,0x7c,
- 0x0,0x6d,
- 0x0,0x6f,0x0,0x64,0x0,0x65,0x0,0x6c,0x0,0x65,0x0,0x78,0x0,0x70,0x0,0x2e,0x0,0x71,0x0,0x6d,0x0,0x6c,
+ // Main_.qml
+ 0x0,0x9,
+ 0x0,0x42,0xf3,0x3c,
+ 0x0,0x4d,
+ 0x0,0x61,0x0,0x69,0x0,0x6e,0x0,0x5f,0x0,0x2e,0x0,0x71,0x0,0x6d,0x0,0x6c,
// Page3.qml
0x0,0x9,
0xd,0x86,0xfc,0xdc,
@@ -1433,32 +1433,32 @@ static const unsigned char qt_resource_struct[] = {
// :
0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x9,0x0,0x0,0x0,0x1,
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
- // :/modelexp.qml
+ // :/Main_.qml
0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x5,0xa0,
0x0,0x0,0x1,0x78,0x69,0x99,0x39,0xcc,
// :/Controller.js
0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,
0x0,0x0,0x1,0x78,0x83,0xdc,0x10,0x12,
// :/description
- 0x0,0x0,0x0,0x9a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x30,0x76,
+ 0x0,0x0,0x0,0x94,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x30,0x76,
0x0,0x0,0x1,0x77,0xa7,0xe2,0x55,0x8e,
// :/temp.qml
- 0x0,0x0,0x0,0x6e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x24,0xfc,
+ 0x0,0x0,0x0,0x68,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x24,0xfc,
0x0,0x0,0x1,0x77,0x74,0xd,0x84,0x22,
// :/Key1.qml
- 0x0,0x0,0x0,0xce,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x4f,0x36,
+ 0x0,0x0,0x0,0xc8,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x4f,0x36,
0x0,0x0,0x1,0x78,0x4d,0xc,0xce,0xac,
// :/Key2.qml
- 0x0,0x0,0x0,0x84,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x2b,0x9b,
+ 0x0,0x0,0x0,0x7e,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x2b,0x9b,
0x0,0x0,0x1,0x78,0x55,0xd5,0x2b,0x37,
// :/Page1.qml
- 0x0,0x0,0x0,0xb6,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x3a,0x7f,
+ 0x0,0x0,0x0,0xb0,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x3a,0x7f,
0x0,0x0,0x1,0x78,0x80,0x35,0x1f,0x8f,
// :/Page2.qml
- 0x0,0x0,0x0,0x56,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x14,0x10,
+ 0x0,0x0,0x0,0x50,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x14,0x10,
0x0,0x0,0x1,0x78,0x83,0x8a,0x34,0x41,
// :/Page3.qml
- 0x0,0x0,0x0,0x3e,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0xd,0x28,
+ 0x0,0x0,0x0,0x38,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0xd,0x28,
0x0,0x0,0x1,0x78,0x80,0xa,0x92,0x9f,
};
diff --git a/sourcefiles/debug/qrc_qml.o b/sourcefiles/debug/qrc_qml.o
index 5a09821599fc933ab5cdba1995fd6dd0c406ad56..f8c92c51da5b34490c22999dbe9252199679c554 100644
Binary files a/sourcefiles/debug/qrc_qml.o and b/sourcefiles/debug/qrc_qml.o differ
diff --git a/sourcefiles/main.cpp b/sourcefiles/main.cpp
index 73ff04fd91943f25831b59b595be51c0c330c500..4907f82a13d3cd25098f1226a0a4a852295ba1f3 100644
--- a/sourcefiles/main.cpp
+++ b/sourcefiles/main.cpp
@@ -26,7 +26,7 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
QQmlApplicationEngine engine;
- const QUrl url(QStringLiteral("qrc:/modelexp.qml"));
+ const QUrl url(QStringLiteral("qrc:/Main_.qml"));
QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
&app, [url](QObject *obj, const QUrl &objUrl) {
if (!obj && url == objUrl)
diff --git a/sourcefiles/qml.qrc b/sourcefiles/qml.qrc
index bea1f747140f1954a33dc08ed0218abf2b372b41..5ecec3596a1172721a336f1111e9621de060167a 100644
--- a/sourcefiles/qml.qrc
+++ b/sourcefiles/qml.qrc
@@ -4,7 +4,7 @@
<file>Page2.qml</file>
<file>Page3.qml</file>
<file>Controller.js</file>
- <file>modelexp.qml</file>
+ <file>Main_.qml</file>
<file>description</file>
<file>temp.qml</file>
<file>Key1.qml</file>