diff --git a/reports and other files/final report/Final Report.docx b/reports and other files/final report/Final Report.docx index d48be9ff94d4e36e4a2f93df76a2a2ae1fb6d7c1..e6590ab795e3ebde18078c479a92dd57fa547fcb 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 index 33fc4162cbf833031bdebcff6b3a69b6af03f2b2..631c59bf4ca028c8a9b8a7a3b429539c3390e9c1 100644 Binary files a/reports and other files/final report/~$nal Report.docx and b/reports and other files/final report/~$nal Report.docx differ diff --git a/reports and other files/~$stingStrategy.docx b/reports and other files/~$stingStrategy.docx deleted file mode 100644 index 583ae7a7132115fd68ec788c9b469b1ae2dd4847..0000000000000000000000000000000000000000 Binary files a/reports and other files/~$stingStrategy.docx and /dev/null differ diff --git a/sourcefiles/POETSvisualizer.pro.user b/sourcefiles/POETSvisualizer.pro.user index f9885d4b3aafef9f422c839d4c4217c9f0b4e46c..cfd65683d4b750dadb2df170980b8e66f7cccf2a 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-15T23:24:17. --> +<!-- Written by QtCreator 4.13.3, 2021-04-16T18:05:24. --> <qtcreator> <data> <variable>EnvironmentId</variable> diff --git a/sourcefiles/chartspage.cpp b/sourcefiles/chartspage.cpp index 1c037fa721b33d7471a2fdb97845926913c2ab03..e14ac7c467009cb3d4879bbe321b14943fedfeb1 100644 --- a/sourcefiles/chartspage.cpp +++ b/sourcefiles/chartspage.cpp @@ -309,7 +309,7 @@ ChartsPage::ChartsPage(bool isSys,bool isFPGA, bool isMbox, bool isCore, bool is if (this->msentBuffer.size() > 0) { - this->msent = std::accumulate(std::begin(msentBuffer), std::end(msentBuffer), 0.0) / maxValues; + this->msent = std::accumulate(std::begin(msentBuffer), std::end(msentBuffer), 0.0) / msentBuffer.size(); // msentBuffer.enqueue(0); //for constnat data flow. REMOVE IF SENDER IS CONSTANTLY SENDING PACKETS CONSISTENTLY AND EVENLY. //msentBuffer.dequeue(); //msentBuffer.enqueue(msent); @@ -330,10 +330,10 @@ ChartsPage::ChartsPage(bool isSys,bool isFPGA, bool isMbox, bool isCore, bool is float ChartsPage::reCalculateReceived() { recLock.lock(); if (this->mreceivedBuffer.size() >0) { - this->mreceived = std::accumulate(std::begin(mreceivedBuffer), std::end(mreceivedBuffer), 0.0) / maxValues; + this->mreceived = std::accumulate(std::begin(mreceivedBuffer), std::end(mreceivedBuffer), 0.0) / mreceivedBuffer.size(); // msentBuffer.clear(); - // mreceivedBuffer.dequeue(); - //mreceivedBuffer.enqueue(mreceived); + //mreceivedBuffer.dequeue(); + // mreceivedBuffer.enqueue(mreceived); } else { this->mreceived= 0; @@ -347,11 +347,11 @@ ChartsPage::ChartsPage(bool isSys,bool isFPGA, bool isMbox, bool isCore, bool is //mutex.lock(); chrLock.lock(); if (chrBuffer.size() > 0){ - this->chr = std::accumulate(std::begin(chrBuffer), std::end(chrBuffer), 0.0) / maxValues; + this->chr = std::accumulate(std::begin(chrBuffer), std::end(chrBuffer), 0.0) / chrBuffer.size(); //built in for a smooth flow of data... - // chrBuffer.dequeue(); - // chrBuffer.enqueue(chr); + //chrBuffer.dequeue(); + //chrBuffer.enqueue(chr); } else { @@ -365,9 +365,9 @@ ChartsPage::ChartsPage(bool isSys,bool isFPGA, bool isMbox, bool isCore, bool is float ChartsPage::reCalculateutil() { utilLock.lock(); if (this->utilBuffer.size() > 0) { - this->util = std::accumulate(std::begin(utilBuffer), std::end(utilBuffer), 0.0) / maxValues; + this->util = std::accumulate(std::begin(utilBuffer), std::end(utilBuffer), 0.0) / utilBuffer.size(); //utilBuffer.clear(); - //utilBuffer.dequeue(); + // utilBuffer.dequeue(); //utilBuffer.enqueue(util); } diff --git a/sourcefiles/datasource.cpp b/sourcefiles/datasource.cpp index 1e78b3965e749cc4541695430c9a7ddecd7f754e..c5ac10b3d5ccbcafa5f28ea2dae24b0ef5f7e506 100644 --- a/sourcefiles/datasource.cpp +++ b/sourcefiles/datasource.cpp @@ -487,7 +487,7 @@ xySeries->replace(MchrChartArray); void DataSource::createChartsPage(bool isSys,bool isFPGA, bool isMbox, bool isCore, bool isThread, int boardX,int boardY,int mboxX,int mboxY,int coreID, int threadID,int maxValues) { //make new chart //max buffer size is 5 - this->c = new ChartsPage(isSys,isFPGA,isMbox,isCore,isThread,boardX,boardY,mboxX,mboxY,coreID,threadID,10); + this->c = new ChartsPage(isSys,isFPGA,isMbox,isCore,isThread,boardX,boardY,mboxX,mboxY,coreID,threadID,2000); this->ChartsPageInitialise = true; sender->addChartsPage(c); diff --git a/sourcefiles/debug/POETSvisualizer.exe b/sourcefiles/debug/POETSvisualizer.exe index e1a818501f8e88dc65ac207d2b4aa970059239d7..64e6262f209f85efa60bd6007c9be89620e40c18 100644 Binary files a/sourcefiles/debug/POETSvisualizer.exe and b/sourcefiles/debug/POETSvisualizer.exe differ diff --git a/sourcefiles/debug/chartspage.o b/sourcefiles/debug/chartspage.o index 2f0db1d0b26fda5341f3e13b4dda3ae3ce89af48..84a056fcea5110dd805a6e3609ea50063b4bf709 100644 Binary files a/sourcefiles/debug/chartspage.o and b/sourcefiles/debug/chartspage.o differ diff --git a/sourcefiles/debug/datasource.o b/sourcefiles/debug/datasource.o index dcdbdcf0d45937fd0fd603a7e0368a8e980d1e1c..a1a60ce1d492c2162c81b15ed3ac5bc2b13c9d96 100644 Binary files a/sourcefiles/debug/datasource.o and b/sourcefiles/debug/datasource.o differ diff --git a/sourcefiles/debug/mailbox.o b/sourcefiles/debug/mailbox.o index 8bb0eb40754c00e5f2f9edb077d62f2bbe759178..1d0c51257b91359bd7b878f2d8d40e4377c429e0 100644 Binary files a/sourcefiles/debug/mailbox.o and b/sourcefiles/debug/mailbox.o differ diff --git a/sourcefiles/debug/qrc_qml.cpp b/sourcefiles/debug/qrc_qml.cpp index c391d3bf1c6b0ea11cbaf23e43178b3158d94ffa..0f41bb9ed0d9c43fc46f6f1312850d4e1b113c6a 100644 --- a/sourcefiles/debug/qrc_qml.cpp +++ b/sourcefiles/debug/qrc_qml.cpp @@ -225,119 +225,119 @@ static const unsigned char qt_resource_data[] = { 0xd,0xa,0xd,0xa,0xd,0xa,0xd,0xa,0xd,0xa,0xd,0xa,0xd,0xa,0xd,0xa, 0x7d,0xd,0xa, // C:/Users/domin/OneDrive/Documents/POETSvisualizer/sourcefiles/Page3.qml - 0x0,0x0,0x6,0xe4, + 0x0,0x0,0x6,0xe3, 0x0, 0x0,0x23,0xf9,0x78,0x9c,0xe5,0x59,0x5d,0x6f,0xdb,0x36,0x14,0x7d,0xf,0x90,0xff, - 0x40,0x38,0x2f,0x76,0xe6,0xca,0x4e,0x9c,0xac,0x85,0x82,0x3d,0xb4,0xe,0x86,0x16, - 0x58,0xd1,0x34,0xc9,0xb2,0x76,0xf,0x3,0x64,0x89,0xb6,0xb9,0x50,0xa2,0x4a,0x51, + 0x40,0x38,0x2f,0x76,0xe6,0xca,0x4e,0x1c,0xaf,0x83,0x82,0x3d,0xb4,0xe,0x8a,0x16, + 0x58,0xd1,0x34,0xc9,0xb2,0x76,0xf,0x3,0x18,0x89,0xb6,0xb9,0x48,0xa2,0x4a,0x51, 0x89,0xdd,0xc0,0xff,0x7d,0x97,0xd4,0x17,0x29,0xd1,0xb2,0x8d,0xa4,0x5d,0xba,0x29, - 0x88,0x13,0xf2,0x1e,0x52,0xe4,0xe1,0xfd,0x38,0x4c,0x48,0x18,0x33,0x2e,0xd0,0x47, - 0xf1,0x31,0x25,0xfe,0x2d,0x3a,0x76,0x8e,0x4e,0xf7,0xf7,0x88,0xd1,0xe9,0xfc,0x41, - 0xa2,0x80,0xdd,0x4b,0xdb,0x71,0xc3,0x36,0x66,0x91,0xe0,0x8c,0x26,0xf5,0x91,0xe3, - 0xb9,0xc7,0x45,0xa3,0xd7,0xa1,0xde,0x24,0x71,0xbe,0x84,0x34,0x64,0x1,0x86,0x41, - 0x47,0xce,0xb0,0xb4,0x76,0xf2,0xa9,0x28,0xe6,0xce,0xdf,0x49,0x7,0x79,0x9,0xaa, - 0x7a,0xf6,0xf7,0xb2,0xaf,0xb,0x2f,0xc2,0xf,0xfb,0x7b,0x8,0x1e,0x12,0xb8,0xc8, - 0x8b,0x63,0x4a,0x7c,0x4f,0x10,0x16,0x65,0x8b,0x1c,0x65,0xb6,0x7b,0x12,0x88,0xb9, - 0x8b,0xae,0x7c,0x8e,0x71,0xe4,0xa8,0x16,0x3a,0x44,0x27,0x83,0xd3,0xcc,0x3c,0xc7, - 0x64,0x36,0x17,0xa5,0x3d,0x6b,0xea,0x80,0x3b,0x92,0x90,0x9,0xc5,0x2e,0x12,0x3c, - 0xc5,0xd9,0x9b,0x65,0xf7,0x60,0x20,0x88,0x90,0xdd,0x9d,0xf7,0xcb,0xec,0x7d,0x9d, - 0xc2,0x14,0x73,0x16,0x63,0x2e,0x96,0x88,0x44,0x2,0x4d,0xd8,0xc2,0x1d,0x16,0x43, - 0x60,0xc7,0x8c,0xa6,0x2,0xa3,0x69,0x3c,0xf3,0x90,0xcf,0x18,0xf,0x48,0xe4,0x9, - 0x9c,0xf4,0x51,0xc4,0x4,0xe2,0x98,0xc2,0xfa,0xef,0x30,0x12,0x4c,0x8e,0x73,0x2c, - 0xd3,0xc9,0x81,0xb,0x54,0xcc,0xd8,0x30,0x2d,0xab,0x77,0x85,0x30,0x43,0xf6,0x8a, - 0x4,0x15,0xef,0xb5,0x8c,0x92,0xb0,0x4f,0xd6,0xf9,0xa4,0xe5,0xb3,0xd5,0xe2,0x33, - 0x8e,0xed,0x6b,0x10,0x73,0x8e,0xbd,0x40,0xd9,0xca,0x3d,0x87,0x2c,0x5,0xb,0x9b, - 0xa2,0x98,0x1,0x24,0xb1,0x8c,0x8a,0xd2,0x70,0x82,0xf9,0x87,0xe9,0x85,0x2,0xb8, - 0xe8,0x78,0x58,0xee,0x22,0x8d,0x3,0xe0,0x7,0x71,0xf9,0x31,0x65,0x1c,0x9,0x12, - 0x62,0x9e,0xa0,0x17,0x68,0xca,0xf1,0x97,0x14,0x47,0xfe,0x32,0x9b,0x99,0x52,0x12, - 0xcd,0xd0,0xc4,0x3,0xbf,0xc5,0x51,0xa0,0xa0,0x1e,0x8a,0xf0,0x3d,0xf2,0xa5,0xf3, - 0x21,0x8f,0x73,0x6f,0x89,0xba,0xf7,0x4,0xe,0x9f,0x63,0xdf,0xa3,0x7e,0xa,0x54, - 0xe3,0x0,0xdd,0x79,0x34,0xc5,0x3d,0x7,0x5d,0xc5,0x18,0x5a,0x30,0x95,0xb7,0x20, - 0x89,0x8d,0xf8,0x6c,0x21,0x97,0xf0,0xed,0xa2,0x97,0xf5,0xad,0x4f,0x18,0xa3,0x28, - 0x59,0x26,0x2,0x87,0xca,0xd9,0xdd,0xa9,0x47,0x93,0x3a,0xdb,0xa,0x24,0xf,0x69, - 0x3,0x44,0x10,0x8a,0x37,0x40,0xe4,0x1,0x6c,0x9a,0x45,0x9d,0x84,0x1,0x2a,0xce, - 0x64,0x9a,0x46,0xbe,0xc,0x13,0x14,0x7a,0xb7,0xf8,0xc2,0x9b,0xe1,0xeb,0x65,0x8c, - 0x93,0x5f,0x25,0xa8,0xdb,0x43,0x79,0x48,0xc9,0x47,0xdb,0x11,0xfa,0x5,0xa9,0x59, - 0xce,0x2a,0x6b,0xb9,0x15,0x8b,0xad,0xdc,0x83,0xc5,0x56,0x2e,0xde,0x36,0xae,0x5a, - 0x75,0xcd,0xba,0xaa,0x3c,0x2a,0x21,0xb3,0x8,0x2c,0x59,0x33,0x6b,0xa8,0x93,0xbf, - 0xe0,0x38,0x49,0x70,0xd0,0xed,0x65,0x16,0x16,0xbd,0xa9,0x3a,0x5d,0x2d,0x81,0x38, - 0x86,0x25,0x1e,0xc9,0x1,0xc5,0xec,0x63,0x6,0x19,0x28,0xc2,0x91,0x0,0xd0,0x39, - 0x4e,0x20,0xe6,0x15,0x55,0x2e,0x7a,0xf0,0x59,0x4,0x41,0x84,0x1d,0xca,0x66,0xdd, - 0x4e,0x20,0x4d,0x6c,0x29,0x7d,0x2e,0x6,0x2,0xd5,0xba,0x71,0xa7,0x87,0xce,0x10, - 0x78,0x89,0x97,0xb0,0x94,0xfb,0xd8,0xe1,0x38,0x64,0x77,0xd9,0x56,0x13,0x49,0x73, - 0xb7,0xb7,0x2a,0x72,0x97,0x7c,0xd5,0x9b,0x54,0x8,0x38,0x4,0x8d,0x6f,0x48,0x63, - 0x72,0x1f,0x55,0x47,0x9e,0xbb,0x62,0x8f,0xcb,0x15,0xa9,0xd6,0xe0,0xe8,0xa4,0xb2, - 0xe7,0xc9,0x2b,0xb7,0x67,0xad,0xc1,0xd1,0x69,0x5,0xf0,0x22,0x7f,0xce,0x78,0xe2, - 0x8,0x16,0x23,0x57,0x85,0x42,0xe2,0x33,0x2a,0x9b,0x4d,0xc,0x57,0x99,0x4f,0x43, - 0x51,0x3c,0x15,0x6b,0x60,0xef,0x3d,0x3e,0x23,0xc0,0xca,0x89,0xf5,0x55,0x85,0xd5, - 0x58,0x17,0x1a,0xa0,0x57,0xc3,0xa,0x7e,0x8d,0x17,0x42,0xdf,0x3b,0x84,0x6c,0x24, - 0xae,0xc8,0x57,0xfc,0x1e,0xca,0x81,0xab,0xcc,0xce,0xaf,0x44,0x9c,0xa1,0x90,0x44, - 0x24,0x4c,0xc3,0xb,0xb2,0xc0,0x54,0xda,0x5d,0xf4,0xea,0x4c,0x81,0x9d,0xb8,0xea, - 0xd2,0x49,0x41,0xb0,0xc,0xf2,0x15,0x0,0x1e,0x7d,0x4d,0xc1,0x3b,0x42,0x58,0x43, - 0x3e,0xa1,0x6a,0xbf,0x1d,0x43,0x87,0x2c,0x23,0xe5,0x80,0x3b,0x8,0x1b,0x28,0x1d, - 0x76,0xf8,0x4d,0x3,0x2e,0xc0,0xe6,0x76,0xe4,0x49,0x75,0xb4,0xde,0x62,0xff,0x53, - 0x42,0x69,0x7e,0x22,0x16,0xab,0xaf,0x26,0x7b,0x57,0x92,0x53,0x41,0x4a,0x7,0xcf, - 0x7c,0x77,0xc,0xc5,0xec,0x56,0xfa,0xad,0xe1,0xd9,0x7a,0x30,0xe8,0x4e,0x4b,0xd3, - 0xb0,0xee,0x49,0xa8,0x3c,0xc8,0xe6,0x19,0xad,0x5f,0x45,0x81,0x28,0x28,0xc9,0x36, - 0xff,0x61,0x3a,0x4d,0x30,0xb0,0xf2,0xc2,0x3c,0xd1,0x43,0x74,0x34,0x18,0x59,0xbc, - 0xad,0x3a,0x0,0x73,0xb8,0xe1,0xc7,0xc7,0x27,0xad,0x7e,0xe,0x93,0xff,0x3c,0x78, - 0x89,0x7e,0xaa,0x39,0xff,0x69,0xc3,0xf9,0x51,0x63,0x4d,0x23,0x23,0x46,0x7c,0x4a, - 0x62,0xbd,0x78,0x57,0x16,0x15,0x99,0x37,0x4,0x8a,0x84,0xee,0x87,0x39,0x7b,0x9, - 0xa8,0x89,0x8,0x9b,0xfd,0xf9,0x32,0xab,0x8,0xc9,0x56,0x3a,0x40,0xc7,0x26,0xae, - 0x58,0x59,0x5,0xcc,0x43,0xb3,0x86,0x2b,0xf8,0x92,0x81,0x56,0xee,0xc3,0x8c,0x3a, - 0x1d,0x6,0x91,0x55,0xa2,0x8c,0x8,0xae,0xcf,0x55,0xc4,0xdf,0x70,0xed,0x3c,0x6b, - 0x10,0x62,0x8e,0x43,0x88,0xa6,0x92,0x18,0x47,0xfd,0x76,0x2d,0x7b,0xcf,0x3d,0x7e, - 0x6b,0x82,0x7,0x83,0x98,0x32,0xf1,0x1a,0x12,0xb6,0x2b,0xe5,0x1c,0x94,0x55,0xd1, - 0xcd,0x58,0x73,0x16,0xfd,0x9c,0x3f,0x67,0xd9,0x57,0x1c,0xf5,0xf3,0xd3,0xe9,0x99, - 0x53,0x84,0x6a,0x19,0xf9,0xce,0x8a,0xf4,0x75,0x62,0x62,0x74,0xdc,0x84,0x41,0xca, - 0xc,0x1b,0xcb,0xd6,0x21,0x19,0x97,0x2d,0x0,0x9e,0x9d,0xcd,0x50,0xf7,0x84,0xe2, - 0x91,0xb1,0x36,0xe3,0xa0,0x57,0x82,0x4b,0xf9,0x11,0x41,0xd4,0x59,0xe7,0xa2,0x78, - 0x6,0x2a,0xc3,0x29,0xa5,0xa1,0x56,0x60,0xeb,0xd3,0xde,0x48,0x81,0xf1,0x1a,0x44, - 0x45,0xdd,0xc9,0xf4,0x47,0xe9,0x57,0xc0,0x7c,0x5e,0xf,0x99,0x71,0x12,0xdc,0x98, - 0x52,0x74,0x1d,0x14,0x2,0xf7,0x76,0x2c,0x45,0x17,0xe4,0x45,0xcb,0xe2,0x4b,0x42, - 0x2c,0xe,0x60,0xd8,0xbd,0x5,0x4c,0x30,0x1a,0xe,0x5b,0x30,0x4a,0x3,0xcb,0x5c, - 0x29,0x75,0x30,0xb0,0x5,0x55,0x2e,0x41,0x57,0xe0,0xa0,0x1d,0x1b,0xbd,0xf2,0x59, - 0xd5,0xc,0x3b,0xf1,0xf3,0xe9,0x91,0xbb,0x31,0x85,0xe6,0xa3,0x19,0xdc,0xe9,0x4c, - 0x2a,0xa2,0xae,0x41,0xc3,0x76,0x9a,0x9e,0x52,0x3c,0x2b,0x8b,0xe9,0x37,0x88,0xa5, - 0x2b,0xcc,0x9,0xb6,0xd3,0x24,0xf9,0xa1,0x25,0xe4,0xc8,0x82,0x88,0x3c,0x19,0xd8, - 0x9d,0xb0,0x38,0xa3,0x64,0xed,0x19,0x29,0x9e,0xd7,0xd3,0xad,0xdc,0xd4,0xcd,0x9d, - 0xb5,0x31,0xc1,0xaa,0x1e,0x2,0xb5,0xcd,0xc8,0xad,0x73,0x5b,0xba,0xe5,0x18,0x4, - 0x7d,0x32,0x57,0xf6,0x2b,0xb3,0x74,0x4a,0x84,0xac,0x22,0x20,0xd5,0x5d,0x4d,0x86, - 0x9b,0x8,0x9e,0x46,0x11,0xa8,0x31,0xdb,0x31,0x70,0x1c,0x63,0x4f,0xd8,0x2c,0x2c, - 0xba,0x86,0x6c,0x30,0xc3,0x5c,0xd6,0xd9,0x7,0x1b,0x1b,0x9a,0x9a,0x83,0x88,0xc7, - 0xf2,0x1a,0x22,0x95,0xdc,0xa8,0xf0,0x75,0xb9,0xd4,0xae,0xc6,0x7c,0xdf,0xf4,0xb0, - 0x5e,0x7d,0xce,0xd5,0x63,0xb9,0xb9,0xc4,0xfe,0xf7,0xa7,0x66,0x1d,0xb,0xb0,0x18, - 0xc,0xd7,0xd5,0xa0,0x1b,0xf2,0xfc,0xb7,0x44,0xd1,0xd0,0xc6,0x42,0xc3,0x43,0xac, - 0xdb,0x2e,0xb6,0x2e,0x13,0x32,0x64,0xda,0x77,0x11,0x11,0xc4,0xa3,0x24,0x31,0x74, - 0x58,0x83,0x81,0x53,0x4b,0xac,0xb6,0xec,0x5e,0x67,0xa0,0xcc,0xe0,0x35,0xbb,0xe9, - 0x22,0xc8,0xb8,0x4,0xf8,0x50,0xfa,0x44,0x71,0xed,0x94,0xb7,0x4e,0x75,0x15,0x18, - 0x75,0x50,0xcf,0xb8,0x6,0x28,0x98,0x7e,0xd,0xd0,0xae,0x55,0xfd,0xf2,0x12,0xd5, - 0x2f,0xaf,0x4c,0xfd,0xf2,0x82,0xd4,0xd7,0xae,0x43,0xa,0xb9,0x50,0x9f,0xcb,0xbe, - 0xba,0xb4,0xab,0xcf,0xcf,0xa,0x9d,0x3,0xeb,0xbc,0xdb,0x32,0x89,0x21,0x1e,0x77, - 0xd6,0x43,0xb5,0xd4,0xb2,0x68,0xa4,0xdc,0x6f,0x25,0x91,0xb8,0xa1,0xf5,0x54,0xeb, - 0x11,0x22,0xc9,0xb8,0xc3,0xec,0xac,0x92,0x36,0xcb,0xa4,0x1a,0x7e,0x5b,0x99,0xb3, - 0x8d,0xce,0xd9,0x2c,0x74,0xb6,0x52,0x3a,0xdb,0x48,0x9d,0xb5,0x2a,0x47,0x9f,0x67, - 0x37,0x7d,0x63,0x2b,0x4d,0xf9,0xf3,0x3,0x9,0x9c,0x22,0xef,0x75,0xec,0xe3,0x1e, - 0x27,0x71,0x5a,0x28,0xfa,0x11,0x35,0x8e,0xd,0xd8,0xcc,0x4b,0x57,0x31,0x6d,0x55, - 0x38,0xb9,0x7c,0xd9,0xf6,0x4,0x80,0xcc,0x5a,0x49,0xb2,0xe3,0x74,0xad,0xb3,0x86, - 0x77,0x4d,0xef,0x98,0x88,0x55,0x4b,0x4d,0xdb,0x22,0x93,0xd6,0xf2,0xdc,0x12,0x4e, - 0xe1,0xe5,0xa9,0xd9,0xf7,0x2f,0x5f,0x37,0x8b,0x24,0x94,0x3,0xb3,0x66,0x1b,0x74, - 0x43,0x42,0x6d,0xb9,0x99,0xee,0x76,0xf1,0xfc,0x51,0xf3,0x69,0xf6,0xb4,0xde,0x1d, - 0x75,0xe0,0x6e,0x99,0xf5,0xf8,0x89,0x42,0xf8,0x9,0x33,0xeb,0xb6,0x79,0xf5,0x77, - 0x90,0x3e,0xe4,0xab,0xfa,0xcf,0xcd,0x37,0xc9,0xa8,0x2d,0xd4,0xfc,0xa7,0x32,0xaa, - 0xde,0xb1,0x65,0x42,0x6d,0xa7,0x5e,0x32,0x98,0x2,0x62,0x5d,0xa,0xd5,0xd3,0xa7, - 0x85,0x64,0x2d,0x75,0xd6,0xac,0xf5,0xdc,0x59,0x34,0xb6,0xba,0x2,0xc9,0x35,0x3f, - 0x9f,0x3b,0x90,0xc6,0x60,0xb7,0xe2,0x6a,0x8b,0x1b,0x50,0xd1,0xdc,0xa2,0x56,0x8c, - 0x36,0xa9,0xee,0xef,0x59,0x3d,0xb6,0x56,0xe2,0x4f,0x5d,0x3f,0xda,0x44,0xfb,0xff, - 0x45,0x92,0x67,0x4f,0x4b,0x9,0xd1,0x61,0xbb,0x15,0x90,0xd1,0x7a,0xcc,0x73,0x2f, - 0x20,0x63,0xcf,0x9f,0x63,0xf4,0x96,0x8,0x24,0x23,0xff,0x9b,0xd4,0x90,0x16,0x76, - 0x9e,0x49,0xd,0x79,0x9a,0x2a,0xa2,0x37,0xb7,0xac,0x21,0x1b,0xd9,0xd7,0xcb,0x84, - 0x85,0xc7,0xac,0x4c,0xac,0x75,0x42,0x38,0x2,0x7f,0xce,0x8b,0x12,0xf4,0x34,0x75, - 0x4,0x26,0x7c,0x3e,0x15,0x64,0xfc,0xf6,0xb2,0x5b,0xee,0x70,0xeb,0x3f,0x9d,0xe5, - 0xd,0xf5,0x63,0x70,0x78,0x70,0xf0,0xd7,0xc1,0xc1,0xfe,0xde,0x39,0x96,0xff,0xe, - 0xaf,0xb6,0x7e,0xfe,0x40,0xdc,0xe1,0xd9,0x94,0xf1,0x10,0x7,0x44,0x30,0xfe,0x27, - 0x83,0x14,0x36,0x74,0x4e,0x57,0x6a,0xa0,0x1a,0x74,0x38,0xd8,0xdf,0xfb,0x7,0xfb, - 0xf6,0x7,0x10, + 0x88,0x13,0xf2,0x1e,0x52,0xe4,0xe1,0xfd,0x38,0x4c,0x68,0x18,0x33,0x2e,0xd0,0x47, + 0xf1,0x31,0xa5,0xde,0x2d,0x3a,0x76,0x8e,0xc6,0xfb,0x7b,0xd4,0xe8,0x74,0xfe,0xa0, + 0x91,0xcf,0xee,0xa5,0xed,0xb8,0x61,0x9b,0xb0,0x48,0x70,0x16,0x24,0xf5,0x91,0x93, + 0x39,0xe6,0xa2,0xd1,0xeb,0x4,0xf8,0x26,0x71,0xbe,0x84,0x41,0xc8,0x7c,0x2,0x83, + 0x8e,0x9c,0x61,0x69,0xed,0xe4,0x53,0x5,0x84,0x3b,0x7f,0x27,0x1d,0x84,0x13,0x54, + 0xf5,0xec,0xef,0x65,0x5f,0xe7,0x38,0x22,0xf,0xfb,0x7b,0x8,0x1e,0xea,0xbb,0x8, + 0xc7,0x71,0x40,0x3d,0x2c,0x28,0x8b,0xb2,0x45,0x8e,0x32,0xdb,0x3d,0xf5,0xc5,0xdc, + 0x45,0x97,0x1e,0x27,0x24,0x72,0x54,0xb,0x1d,0xa2,0x93,0xc1,0x38,0x33,0xcf,0x9, + 0x9d,0xcd,0x45,0x69,0xcf,0x9a,0x3a,0xe0,0x8e,0x26,0xf4,0x26,0x20,0x2e,0x12,0x3c, + 0x25,0xd9,0x9b,0x65,0xf7,0x60,0x20,0xa8,0x90,0xdd,0x9d,0xf7,0xcb,0xec,0x7d,0x9d, + 0xc2,0x14,0x73,0x16,0x13,0x2e,0x96,0x88,0x46,0x2,0xdd,0xb0,0x85,0x3b,0x2c,0x86, + 0xc0,0x8e,0x59,0x90,0xa,0x82,0xa6,0xf1,0xc,0x23,0x8f,0x31,0xee,0xd3,0x8,0xb, + 0x92,0xf4,0x51,0xc4,0x4,0xe2,0x24,0x80,0xf5,0xdf,0x11,0x24,0x98,0x1c,0xe7,0x58, + 0xa6,0x93,0x3,0x17,0xa8,0x98,0xb1,0x61,0x5a,0x56,0xef,0xa,0x61,0x86,0xec,0x15, + 0x9,0x2a,0xde,0x6b,0x19,0x25,0x61,0x9f,0xac,0xf3,0x49,0xcb,0x67,0xab,0xc5,0x63, + 0x9c,0xd8,0xd7,0x20,0xe6,0x9c,0x60,0x5f,0xd9,0xca,0x3d,0x87,0x2c,0x5,0xb,0x9b, + 0xa2,0x98,0x1,0x24,0xb1,0x8c,0x8a,0xd2,0xf0,0x86,0xf0,0xf,0xd3,0x73,0x5,0x70, + 0xd1,0x2f,0xe5,0x26,0xd2,0xd8,0x7,0x7a,0x10,0x97,0x1f,0x53,0xc6,0x91,0xa0,0x21, + 0xe1,0x9,0x7a,0x81,0xa6,0x9c,0x7c,0x49,0x49,0xe4,0x2d,0xb3,0x89,0x83,0x80,0x46, + 0x33,0x74,0x83,0xc1,0x6d,0x49,0xe4,0x2b,0x28,0x46,0x11,0xb9,0x47,0x9e,0xf4,0x3d, + 0x84,0x39,0xc7,0x4b,0xd4,0xbd,0xa7,0x70,0xf6,0x9c,0x78,0x38,0xf0,0x52,0x60,0x9a, + 0xf8,0xe8,0xe,0x7,0x29,0xe9,0x39,0xe8,0x32,0x26,0xd0,0x82,0xa9,0xf0,0x82,0x26, + 0x36,0xde,0xb3,0x85,0x5c,0xc0,0xb7,0x8b,0x8e,0xc6,0xf5,0xad,0xdf,0x30,0x16,0xa0, + 0x64,0x99,0x8,0x12,0x2a,0x67,0x77,0xa7,0x38,0x48,0xea,0x6c,0x2b,0x90,0x3c,0xa4, + 0xd,0x10,0x41,0x3,0xb2,0x1,0x22,0xf,0x60,0xd3,0x2c,0xea,0x24,0xc,0x50,0x71, + 0x26,0xd3,0x34,0xf2,0x64,0x98,0xa0,0x10,0xdf,0x92,0x73,0x3c,0x23,0x57,0xcb,0x98, + 0x24,0x6f,0x24,0xa8,0xdb,0x43,0x79,0x48,0xc9,0x47,0xdb,0x11,0xfa,0x15,0xa9,0x59, + 0x4e,0x2b,0x6b,0xb9,0x15,0x8b,0xad,0xdc,0x83,0xc5,0x56,0x2e,0xde,0x36,0xae,0x5a, + 0x75,0xcd,0xba,0xaa,0x3c,0x2a,0xa1,0xb3,0x8,0x2c,0x59,0x33,0x6b,0xa8,0xa3,0x3f, + 0xe7,0x24,0x49,0x88,0xdf,0xed,0x65,0x16,0x16,0xbd,0xae,0x3a,0x5d,0x2d,0x81,0x38, + 0x86,0x25,0x1e,0xc9,0x1,0xc5,0xec,0x13,0x6,0x19,0x28,0x22,0x91,0x0,0xd0,0x19, + 0x49,0x20,0xe6,0x15,0x55,0x2e,0x7a,0xf0,0x58,0x4,0x41,0x44,0x9c,0x80,0xcd,0xba, + 0x1d,0x5f,0x9a,0xd8,0x52,0x3a,0x5d,0xc,0x4,0xaa,0x75,0x93,0x4e,0xf,0x9d,0x22, + 0x70,0x13,0x9c,0xb0,0x94,0x7b,0xc4,0xe1,0x24,0x64,0x77,0xd9,0x56,0x13,0x49,0x73, + 0xb7,0xb7,0x2a,0x72,0x97,0x7c,0xd5,0xeb,0x54,0x8,0x38,0x4,0x8d,0x6f,0x48,0x63, + 0x72,0x1f,0x55,0x47,0x9e,0xbb,0x62,0xcc,0xe5,0x8a,0x54,0x6b,0x70,0x74,0x52,0xd9, + 0xf3,0xe4,0x95,0xdb,0xb3,0xd6,0xe0,0x68,0x5c,0x1,0x70,0xe4,0xcd,0x19,0x4f,0x1c, + 0xc1,0x62,0xe4,0xaa,0x58,0x48,0x3c,0x16,0xc8,0x66,0x13,0xc3,0x55,0xe6,0xd3,0x50, + 0x1,0x99,0x8a,0x35,0xb0,0xf7,0x98,0xcf,0x28,0xb0,0x72,0x62,0x7d,0x55,0x61,0x35, + 0xd6,0x85,0x6,0x65,0x5c,0xcb,0xe7,0x8a,0x2c,0x84,0xbe,0x77,0x88,0xd9,0x48,0x5c, + 0xd2,0xaf,0xe4,0x3d,0x94,0x3,0x57,0x99,0x9d,0x37,0x54,0x9c,0xa2,0x90,0x46,0x34, + 0x4c,0xc3,0x73,0xba,0x20,0x81,0xb4,0x43,0x7a,0x38,0x55,0x60,0x27,0xae,0xba,0x74, + 0x52,0x10,0x2c,0x83,0x7e,0x5,0x0,0xe,0x5e,0x5,0xe0,0x1d,0x21,0xac,0x21,0x9f, + 0x50,0xb5,0xdf,0x4e,0xa0,0x43,0x96,0x91,0x72,0xc0,0x1d,0x84,0xd,0x94,0xe,0x3b, + 0xfc,0xba,0x1,0x17,0x60,0x73,0x3b,0xf2,0xa4,0x3a,0x5a,0x6f,0xb1,0xff,0x29,0xd, + 0x82,0xfc,0x44,0x2c,0x56,0x4f,0x4d,0xf6,0xae,0x24,0xa7,0x82,0x94,0xe,0x9e,0xf9, + 0xee,0x4,0x8a,0xd9,0xad,0xf4,0x5b,0xc3,0xb3,0xf5,0x60,0xd0,0x9d,0x36,0x48,0xc3, + 0xba,0x27,0xa1,0xf2,0x20,0x9b,0x67,0xb4,0x7e,0x15,0x5,0xa2,0xa0,0x24,0xdb,0xfc, + 0x87,0xe9,0x34,0x21,0xc0,0xca,0xb,0xf3,0x44,0xf,0xd1,0xd1,0x60,0x64,0xf1,0xb6, + 0xea,0x0,0xcc,0xe1,0x86,0x1f,0x1f,0x9f,0xb4,0xfa,0x39,0x4c,0xfe,0xf3,0xe0,0x25, + 0xfa,0xa9,0xe6,0xfc,0xe3,0x86,0xf3,0xa3,0xc6,0x9a,0x46,0x46,0x8c,0x78,0x1,0x8d, + 0xf5,0xe2,0x5d,0x59,0x54,0x64,0x5e,0x53,0xa8,0x12,0xba,0x1f,0xe6,0xec,0x25,0xa0, + 0x26,0x22,0x62,0xf6,0xe7,0xcb,0xac,0x22,0x24,0x5b,0xe9,0x0,0x1d,0x9b,0xb8,0x62, + 0x65,0x15,0x30,0xf,0xcd,0x1a,0xae,0xe0,0x4b,0x6,0x5a,0xb9,0xf,0x33,0xea,0x74, + 0x18,0x44,0x56,0x89,0x32,0x22,0xb8,0x3e,0x57,0x11,0x7f,0xc3,0xb5,0xf3,0xac,0x41, + 0x88,0x39,0x9,0x21,0x9a,0x4a,0x62,0x1c,0xf5,0xdb,0x95,0xec,0x3d,0xc3,0xfc,0xd6, + 0x4,0xf,0x6,0x71,0xc0,0xc4,0x2b,0x48,0xd8,0xae,0x94,0x73,0x50,0x57,0x45,0x37, + 0x63,0xcd,0x59,0xf4,0x73,0xfe,0x9c,0x65,0x5f,0x71,0xd4,0xcf,0x4f,0xa7,0x67,0x4e, + 0x11,0xaa,0x65,0xe4,0x3b,0x2b,0xd2,0xd7,0x89,0x89,0xd1,0x71,0x37,0xc,0x52,0x66, + 0xd8,0x58,0xb6,0xe,0xc9,0xb8,0x6c,0x1,0xf0,0xec,0x6c,0x86,0xba,0x27,0x14,0x8f, + 0x8c,0xb5,0x19,0x7,0xbd,0xe2,0x5f,0xc8,0x8f,0x8,0xa2,0xce,0x3a,0x57,0x40,0x66, + 0x20,0x33,0x9c,0x52,0x1a,0x6a,0x5,0xb6,0x3e,0xed,0xb5,0x54,0x18,0xaf,0x40,0x55, + 0xd4,0x9d,0x4c,0x7f,0x94,0x7e,0x5,0xcc,0xe7,0xf5,0x90,0x19,0xa7,0xfe,0xb5,0x29, + 0x45,0xd7,0x41,0x21,0x70,0x6f,0x27,0x52,0x74,0x41,0x5e,0xb4,0x2c,0xbe,0x24,0xc4, + 0xe2,0x0,0x86,0x1d,0x2f,0x60,0x82,0xd1,0x70,0xd8,0x82,0x51,0x1a,0x58,0xe6,0x4a, + 0xa9,0x83,0x81,0x2d,0xa8,0x72,0x9,0xba,0x4,0x7,0xed,0xd8,0xe8,0x95,0xcf,0xaa, + 0x66,0xd8,0x89,0x9f,0x4f,0x8f,0xdc,0x8d,0x29,0x34,0x1f,0xcd,0xe0,0x4e,0x67,0x52, + 0x11,0x75,0x5,0x22,0xb6,0xd3,0xf4,0x94,0xe2,0x59,0x59,0x4c,0xbf,0x41,0x2c,0x5d, + 0x12,0x4e,0x89,0x9d,0x26,0xc9,0x4f,0x50,0x42,0x8e,0x2c,0x88,0x8,0xcb,0xc0,0xee, + 0x84,0xc5,0x19,0x25,0x6b,0xcf,0x48,0xf1,0xbc,0x9e,0x6e,0xe5,0xa6,0x6e,0xee,0xac, + 0x8d,0x9,0x56,0xf5,0x10,0xa8,0x6d,0x46,0x6e,0x9d,0xdb,0xd2,0x2d,0x27,0xa0,0xe8, + 0x93,0xb9,0xb2,0x5f,0x9a,0xa5,0x53,0x22,0x64,0x15,0x1,0xad,0xee,0x6a,0x3a,0xdc, + 0x44,0xf0,0x34,0x8a,0x40,0x8d,0xd9,0x8e,0x81,0x93,0x98,0x60,0x61,0xb3,0xb0,0xe8, + 0xa,0xb2,0xc1,0x8c,0x70,0x59,0x67,0x1f,0x6c,0x6c,0x68,0x6a,0xe,0x22,0x9e,0xc8, + 0x7b,0x88,0x54,0x72,0xa3,0xc2,0xd7,0xe5,0x52,0xbb,0x1a,0xf3,0x7d,0xd3,0xc3,0x7a, + 0xf5,0x39,0x57,0x8f,0xe5,0xe6,0x82,0x78,0xdf,0x9f,0x9a,0x75,0x2c,0xc0,0x62,0x8, + 0x5c,0x57,0xfd,0x6e,0xc8,0xf3,0xdf,0x12,0x45,0x43,0x1b,0xb,0xd,0xf,0xb1,0x6e, + 0xbb,0xd8,0xba,0x4c,0xc8,0x90,0x69,0xdf,0x45,0x54,0x50,0x1c,0xd0,0xc4,0xd0,0x61, + 0xd,0x6,0xc6,0x96,0x58,0x6d,0xd9,0xbd,0xce,0x40,0x99,0xc1,0x6b,0x76,0xd3,0x45, + 0x90,0x71,0x9,0xf0,0xa0,0xf4,0x89,0xe2,0xde,0x29,0xaf,0x9d,0xea,0x2a,0x30,0xea, + 0xa0,0x9e,0x71,0xd,0x50,0x30,0xfd,0x1a,0xa0,0x5d,0xab,0xfa,0xe5,0x25,0xaa,0x5f, + 0x5e,0x99,0xfa,0xe5,0x5,0xa9,0xaf,0x5d,0x87,0x14,0x72,0xa1,0x3e,0x97,0x7d,0x75, + 0x69,0x57,0x9f,0x9f,0x15,0x3a,0x7,0xd6,0x79,0xb7,0x65,0x12,0x43,0x3c,0xee,0xac, + 0x87,0x6a,0xa9,0x65,0xd1,0x48,0xb9,0xdf,0x4a,0x22,0x71,0x43,0xeb,0xa9,0xd6,0x23, + 0x44,0x92,0x71,0x87,0xd9,0x59,0x25,0x6d,0x96,0x49,0x35,0xfc,0xb6,0x32,0x67,0x1b, + 0x9d,0xb3,0x59,0xe8,0x6c,0xa5,0x74,0xb6,0x91,0x3a,0x6b,0x55,0x8e,0x3e,0xcf,0x6e, + 0xfa,0xc6,0x56,0x9a,0xf2,0xe7,0x7,0x12,0x38,0x45,0xde,0xeb,0xd8,0xc7,0x3d,0x4e, + 0xe2,0xb4,0x50,0xf4,0x23,0x6a,0x1c,0x1b,0xb0,0x99,0x97,0x2e,0xe3,0xa0,0x55,0xe1, + 0xe4,0xf2,0x65,0xdb,0x13,0x0,0x32,0x6b,0x25,0xc9,0x8e,0xd3,0xb5,0xce,0x1a,0xde, + 0x35,0xbd,0x63,0x22,0x56,0x2d,0x35,0x6d,0x8b,0x4c,0x5a,0xcb,0x73,0x4b,0x38,0x85, + 0x97,0x63,0xb3,0xef,0x5f,0xbe,0x6e,0x16,0x49,0x28,0x7,0x66,0xcd,0x36,0xe8,0x86, + 0x84,0xda,0x72,0x33,0xdd,0xed,0xe2,0xf9,0xa3,0xe6,0xd3,0xec,0x69,0xbd,0x3b,0xea, + 0xc0,0xdd,0x32,0xeb,0xf1,0x13,0x85,0xf0,0x13,0x66,0xd6,0x6d,0xf3,0xea,0xef,0x20, + 0x7d,0xe8,0x57,0xf5,0x9f,0x9b,0x6f,0x92,0x51,0x5b,0xa8,0xf9,0x4f,0x65,0x54,0xbd, + 0x63,0xcb,0x84,0xda,0x4e,0xbd,0x64,0x30,0x5,0xc4,0xba,0x14,0xaa,0xa7,0x4f,0xb, + 0xc9,0x5a,0xea,0xac,0x59,0xeb,0xb9,0xb3,0x68,0x6c,0x75,0x5,0x92,0x6b,0x7e,0x3e, + 0x77,0x20,0x8d,0xc1,0x6e,0xc5,0xd5,0x16,0x37,0xa0,0xa2,0xb9,0x45,0xad,0x18,0x6d, + 0x52,0xdd,0xdf,0xb3,0x7a,0x6c,0xad,0xc4,0x9f,0xba,0x7e,0xb4,0x89,0xf6,0xff,0x8b, + 0x24,0xcf,0x9e,0x96,0x12,0xa2,0xc3,0x76,0x2b,0x20,0xa3,0xf5,0x98,0xe7,0x5e,0x40, + 0x26,0xd8,0x9b,0x13,0xf4,0x96,0xa,0x24,0x23,0xff,0x9b,0xd4,0x90,0x16,0x76,0x9e, + 0x49,0xd,0x79,0x9a,0x2a,0xa2,0x37,0xb7,0xac,0x21,0x1b,0xd9,0xd7,0xcb,0x84,0x85, + 0xc7,0xac,0x4c,0xac,0x75,0x42,0x38,0x2,0x6f,0xce,0x8b,0x12,0xf4,0x34,0x75,0x4, + 0x26,0x7c,0x3e,0x15,0x64,0xf2,0xf6,0xa2,0x5b,0xee,0x70,0xeb,0x3f,0x9d,0xe5,0xd, + 0xf5,0x63,0x70,0x78,0x70,0xf0,0xd7,0xc1,0xc1,0xfe,0xde,0x19,0x91,0xff,0xe,0xaf, + 0xb6,0x7e,0xf6,0x40,0xdd,0xe1,0xe9,0x94,0xf1,0x90,0xf8,0x54,0x30,0xfe,0x27,0x83, + 0x14,0x36,0x74,0xc6,0x2b,0x35,0x50,0xd,0x3a,0x1c,0xec,0xef,0xfd,0x3,0xbb,0x93, + 0x7,0x15, // C:/Users/domin/OneDrive/Documents/POETSvisualizer/sourcefiles/Page2.qml 0x0,0x0,0x10,0xe7, 0x0, @@ -1440,26 +1440,26 @@ static const unsigned char qt_resource_struct[] = { 0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0, 0x0,0x0,0x1,0x78,0xc7,0x66,0x92,0xb9, // :/description - 0x0,0x0,0x0,0x94,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x30,0x78, + 0x0,0x0,0x0,0x94,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x30,0x77, 0x0,0x0,0x1,0x77,0xa7,0xe2,0x55,0x8e, // :/temp.qml - 0x0,0x0,0x0,0x68,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x24,0xfe, + 0x0,0x0,0x0,0x68,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x24,0xfd, 0x0,0x0,0x1,0x77,0x74,0xd,0x84,0x22, // :/Key1.qml - 0x0,0x0,0x0,0xc8,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x4f,0x39, + 0x0,0x0,0x0,0xc8,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x4f,0x38, 0x0,0x0,0x1,0x78,0x4d,0xc,0xce,0xac, // :/Key2.qml - 0x0,0x0,0x0,0x7e,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x2b,0x9d, + 0x0,0x0,0x0,0x7e,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x2b,0x9c, 0x0,0x0,0x1,0x78,0x55,0xd5,0x2b,0x37, // :/Page1.qml - 0x0,0x0,0x0,0xb0,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x3a,0x81, + 0x0,0x0,0x0,0xb0,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x3a,0x80, 0x0,0x0,0x1,0x78,0xc7,0x64,0xe6,0x60, // :/Page2.qml - 0x0,0x0,0x0,0x50,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x14,0x13, + 0x0,0x0,0x0,0x50,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x14,0x12, 0x0,0x0,0x1,0x78,0xcb,0xf7,0x35,0xe6, // :/Page3.qml 0x0,0x0,0x0,0x38,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0xd,0x2b, -0x0,0x0,0x1,0x78,0x80,0xa,0x92,0x9f, +0x0,0x0,0x1,0x78,0xe5,0x8,0xec,0x78, }; diff --git a/sourcefiles/debug/qrc_qml.o b/sourcefiles/debug/qrc_qml.o index f7778933f985710c60dc86f37c642a0d9c1d17fe..afbd59c687f775c920bc98a313d723656bc6f236 100644 Binary files a/sourcefiles/debug/qrc_qml.o and b/sourcefiles/debug/qrc_qml.o differ diff --git a/sourcefiles/debug/sender.o b/sourcefiles/debug/sender.o index 03ae970abc24a10fcfdf62c1c0e602533462b9fc..b670d1f80b3b0379b722e9f12b0447b26bf849fc 100644 Binary files a/sourcefiles/debug/sender.o and b/sourcefiles/debug/sender.o differ diff --git a/sourcefiles/debug/surface.o b/sourcefiles/debug/surface.o index 0ab7784f30ecc65679ff9cc7a9a246418c7bbe7a..6d0737c379a9503e4e1649fe0a5c640e66a03772 100644 Binary files a/sourcefiles/debug/surface.o and b/sourcefiles/debug/surface.o differ diff --git a/sourcefiles/leaks.xml b/sourcefiles/leaks.xml index d3caa44f8327a73b862679ed166db01881c93739..c088cc484f9119dbeeca5150aca9ed6dd892306b 100644 --- a/sourcefiles/leaks.xml +++ b/sourcefiles/leaks.xml @@ -14,10 +14,10 @@ <line>application: C:\Users\domin\OneDrive\Documents\POETSvisualizer\sourcefiles\debug\POETSvisualizer.exe</line> <line>command line: "debug/POETSvisualizer.exe"</line> <line>directory: C:\Users\domin\OneDrive\Documents\POETSvisualizer\sourcefiles</line> - <line>debugger PID: 14280</line> + <line>debugger PID: 23992</line> </preamble> -<pid>9584</pid> +<pid>25632</pid> <ppid>0</ppid> <tool>heob</tool> @@ -41,6 +41,6 @@ <status> <state>RUNNING</state> - <time>00:00:00:00.687</time> + <time>00:00:00:00.829</time> </status> diff --git a/sourcefiles/mailbox.cpp b/sourcefiles/mailbox.cpp index ed894c27f7911f2d82da4a04f3eacfaa2bcae183..4905d879f19d6f3371b777f8084f4c10344fe5ec 100644 --- a/sourcefiles/mailbox.cpp +++ b/sourcefiles/mailbox.cpp @@ -5,7 +5,7 @@ using namespace std; Mailbox::Mailbox() { -this->maxBufferSize = 4; +this->maxBufferSize = 4*16; //make buffers } @@ -51,10 +51,10 @@ float Mailbox::reCalculateSent() { if (this->msentBuffer.size() > 0) { - this->msent = std::accumulate(std::begin(msentBuffer), std::end(msentBuffer), 0.0) / maxBufferSize; + this->msent = std::accumulate(std::begin(msentBuffer), std::end(msentBuffer), 0.0) / this->msentBuffer.size(); //msentBuffer.dequeue(); - //msentBuffer.enqueue(msent); + // msentBuffer.enqueue(msent); } else { this->msent = 0; @@ -71,9 +71,9 @@ float Mailbox::reCalculateSent() { float Mailbox::reCalculateReceived() { sentLock.lock(); if (this->mreceivedBuffer.size() >0) { - this->mreceived = std::accumulate(std::begin(mreceivedBuffer), std::end(mreceivedBuffer), 0.0) / maxBufferSize; - // mreceivedBuffer.dequeue(); - //mreceivedBuffer.enqueue(mreceived); + this->mreceived = std::accumulate(std::begin(mreceivedBuffer), std::end(mreceivedBuffer), 0.0) / mreceivedBuffer.size(); + // mreceivedBuffer.dequeue(); + // mreceivedBuffer.enqueue(mreceived); } else { @@ -88,7 +88,7 @@ float Mailbox::reCalculateCHR() { //mutex.lock(); sentLock.lock(); if (chrBuffer.size() > 0){ - this->chr = std::accumulate(std::begin(chrBuffer), std::end(chrBuffer), 0.0) / maxBufferSize; + this->chr = std::accumulate(std::begin(chrBuffer), std::end(chrBuffer), 0.0) / chrBuffer.size(); //chrBuffer.dequeue(); //chrBuffer.enqueue(chr); } @@ -104,9 +104,9 @@ float Mailbox::reCalculateutil() { sentLock.lock(); if (this->utilBuffer.size() > 0) { - this->util = std::accumulate(std::begin(utilBuffer), std::end(utilBuffer), 0.0) / maxBufferSize; + this->util = std::accumulate(std::begin(utilBuffer), std::end(utilBuffer), 0.0) / utilBuffer.size(); - // this->utilBuffer.dequeue(); + //this->utilBuffer.dequeue(); //this->utilBuffer.enqueue(util); } else { diff --git a/sourcefiles/page3.qml b/sourcefiles/page3.qml index a9a7f31357ab9460e74e5ea35e925d05178c48e4..c8336d311387d5b35b0b125dd6fff3b7c0110501 100644 --- a/sourcefiles/page3.qml +++ b/sourcefiles/page3.qml @@ -27,9 +27,9 @@ Pane{ property int thread :0 //amount of points - property int numberOfPoints: 200 + property int numberOfPoints: 80 //update rate for timers - frequency of polling back end for a new chart array (with recalculated value). Speed of axis. - property int updateRate: 70 + property int updateRate: 150 property bool systemChart:false property bool fpgaChart:false property bool tileChart:false diff --git a/sourcefiles/sender.cpp b/sourcefiles/sender.cpp index 9b56b7338ba4310adc6c2782e4468de72c562b79..4c2849bee59bfa9d4ca93f31ceffc0ae48f01d76 100644 --- a/sourcefiles/sender.cpp +++ b/sourcefiles/sender.cpp @@ -274,7 +274,7 @@ void Sender::transmitPacket() { //busy waiting - for (int i = 0 ; i < 100000 ; i++) { + for (int i = 0 ; i < 1000 ; i++) { if (i > 100000) { @@ -399,8 +399,8 @@ void Sender::removeChartsPage() { //thread main void Sender::run() { qDebug("running"); - //transmitPacket(); - dummyPacketsValuesTest(); + transmitPacket(); + // dummyPacketsValuesTest(); //dummyPacketsValuesTest2(); //dummyPackets1(); diff --git a/sourcefiles/surface.cpp b/sourcefiles/surface.cpp index cff6eeb4fd89ae4c8b288d6a15f5ece4e15415e2..e97d6e2bf5693290e99959b0548331f830b32067 100644 --- a/sourcefiles/surface.cpp +++ b/sourcefiles/surface.cpp @@ -77,6 +77,8 @@ void Surface::receivePacket(Packet p) { } //receive all packets Mailbox * mbox = mailBoxList->at((p.BoardY)*boardYStep + p.mboxY ).at((p.BoardX)*boardXStep + p.mboxX ); + cout << "(" << "core = " << p.core << "thread: " << p.thread << ", "<< "value = " << p.messagesSent << ")" << endl; + mbox->receivePacket(p); } @@ -96,7 +98,9 @@ void Surface::receivePacket(Packet p) { //access thread and update the corresponding thread. Mailbox * mbox = this->mailBoxList->at(p.core).at(p.thread); //cout << "coreID: " << p.core << endl; - cout << "(" << "core = " << p.core << ", "<< "value = " << p.messagesSent << ")" << endl; + if (p.core == 1) { + cout << "(" << "core = " << p.core << "thread: " << p.thread << ", "<< "value = " << p.messagesSent << ")" << endl; + } //thread updates with packet data. mbox->receivePacket(p); }