Skip to content

Commit

Permalink
did ALOT of refactoring and implemented aggregate path functions: min…
Browse files Browse the repository at this point in the history 
…, max and sum. Also got rid of path increment function (the correct imlementation turned out to be much more comlicated than the one I did)
  • Loading branch information
@sufftea
sufftea committed Jan 7, 2021
1 parent 1266700 commit 96d6fb3
Show file tree
Hide file tree
Showing 33 changed files with 524 additions and 971 deletions.
Binary file modified build-LInk-Cut-Tree-Desktop_Qt_5_13_0_MinGW_64_bit-Debug/debug/AbstractNode.o
View file
Binary file not shown.
Binary file modified build-LInk-Cut-Tree-Desktop_Qt_5_13_0_MinGW_64_bit-Debug/debug/FrameUiComponetns.o
View file
Binary file not shown.
Binary file modified build-LInk-Cut-Tree-Desktop_Qt_5_13_0_MinGW_64_bit-Debug/debug/GraphicsAbstractNodeItem.o
View file
Binary file not shown.
Binary file modified build-LInk-Cut-Tree-Desktop_Qt_5_13_0_MinGW_64_bit-Debug/debug/GraphicsLinkCutTree.o
View file
Binary file not shown.
Binary file modified build-LInk-Cut-Tree-Desktop_Qt_5_13_0_MinGW_64_bit-Debug/debug/GraphicsNodeItem.o
View file
Binary file not shown.
Binary file modified build-LInk-Cut-Tree-Desktop_Qt_5_13_0_MinGW_64_bit-Debug/debug/GraphicsSolidNodeItem.o
View file
Binary file not shown.
Binary file modified build-LInk-Cut-Tree-Desktop_Qt_5_13_0_MinGW_64_bit-Debug/debug/LInk-Cut-Tree.exe
View file
Binary file not shown.
Binary file modified build-LInk-Cut-Tree-Desktop_Qt_5_13_0_MinGW_64_bit-Debug/debug/LinkCutTree.o
View file
Binary file not shown.
Binary file modified build-LInk-Cut-Tree-Desktop_Qt_5_13_0_MinGW_64_bit-Debug/debug/Node.o
View file
Binary file not shown.
Binary file modified build-LInk-Cut-Tree-Desktop_Qt_5_13_0_MinGW_64_bit-Debug/debug/PathCreator.o
View file
Binary file not shown.
Binary file modified build-LInk-Cut-Tree-Desktop_Qt_5_13_0_MinGW_64_bit-Debug/debug/mainwindow.o
View file
Binary file not shown.
124 changes: 52 additions & 72 deletions build-LInk-Cut-Tree-Desktop_Qt_5_13_0_MinGW_64_bit-Debug/debug/moc_FrameUiComponetns.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
struct qt_meta_stringdata_FrameUiComponetns_t {
QByteArrayData data[30];
char stringdata0[753];
QByteArrayData data[26];
char stringdata0[633];
};
#define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
Expand All @@ -46,22 +46,18 @@ QT_MOC_LITERAL(10, 166, 26), // "on_pushButtonReset_clicked"
QT_MOC_LITERAL(11, 193, 27), // "on_pushButtonExpose_clicked"
QT_MOC_LITERAL(12, 221, 24), // "on_pushButtonCut_clicked"
QT_MOC_LITERAL(13, 246, 25), // "on_pushButtonLink_clicked"
QT_MOC_LITERAL(14, 272, 34), // "on_pushButtonOpenAddDialog_cl..."
QT_MOC_LITERAL(15, 307, 24), // "on_pushButtonAdd_clicked"
QT_MOC_LITERAL(16, 332, 33), // "on_pushButtonEndOperation_cli..."
QT_MOC_LITERAL(17, 366, 32), // "on_pushButtonOpenPresets_clicked"
QT_MOC_LITERAL(18, 399, 28), // "on_pushButtonPreset1_clicked"
QT_MOC_LITERAL(19, 428, 28), // "on_pushButtonPreset2_clicked"
QT_MOC_LITERAL(20, 457, 28), // "on_pushButtonPreset3_clicked"
QT_MOC_LITERAL(21, 486, 28), // "on_pushButtonPreset4_clicked"
QT_MOC_LITERAL(22, 515, 28), // "on_pushButtonPreset5_clicked"
QT_MOC_LITERAL(23, 544, 28), // "on_pushButtonPreset6_clicked"
QT_MOC_LITERAL(24, 573, 28), // "on_pushButtonPreset7_clicked"
QT_MOC_LITERAL(25, 602, 29), // "on_pushButtonClearLog_clicked"
QT_MOC_LITERAL(26, 632, 28), // "on_pushButtonHideLog_clicked"
QT_MOC_LITERAL(27, 661, 30), // "on_pushButtonShowDelta_clicked"
QT_MOC_LITERAL(28, 692, 28), // "on_pushButtonFindLCA_clicked"
QT_MOC_LITERAL(29, 721, 31) // "on_pushButtonSwitchTree_clicked"
QT_MOC_LITERAL(14, 272, 33), // "on_pushButtonEndOperation_cli..."
QT_MOC_LITERAL(15, 306, 32), // "on_pushButtonOpenPresets_clicked"
QT_MOC_LITERAL(16, 339, 28), // "on_pushButtonPreset1_clicked"
QT_MOC_LITERAL(17, 368, 28), // "on_pushButtonPreset2_clicked"
QT_MOC_LITERAL(18, 397, 28), // "on_pushButtonPreset3_clicked"
QT_MOC_LITERAL(19, 426, 28), // "on_pushButtonPreset4_clicked"
QT_MOC_LITERAL(20, 455, 28), // "on_pushButtonPreset5_clicked"
QT_MOC_LITERAL(21, 484, 28), // "on_pushButtonPreset6_clicked"
QT_MOC_LITERAL(22, 513, 28), // "on_pushButtonPreset7_clicked"
QT_MOC_LITERAL(23, 542, 29), // "on_pushButtonClearLog_clicked"
QT_MOC_LITERAL(24, 572, 28), // "on_pushButtonHideLog_clicked"
QT_MOC_LITERAL(25, 601, 31) // "on_pushButtonSwitchTree_clicked"

},
"FrameUiComponetns\0mousePressEvent\0\0"
Expand All @@ -72,8 +68,6 @@ QT_MOC_LITERAL(29, 721, 31) // "on_pushButtonSwitchTree_clicked"
"on_pushButtonExpose_clicked\0"
"on_pushButtonCut_clicked\0"
"on_pushButtonLink_clicked\0"
"on_pushButtonOpenAddDialog_clicked\0"
"on_pushButtonAdd_clicked\0"
"on_pushButtonEndOperation_clicked\0"
"on_pushButtonOpenPresets_clicked\0"
"on_pushButtonPreset1_clicked\0"
Expand All @@ -85,8 +79,6 @@ QT_MOC_LITERAL(29, 721, 31) // "on_pushButtonSwitchTree_clicked"
"on_pushButtonPreset7_clicked\0"
"on_pushButtonClearLog_clicked\0"
"on_pushButtonHideLog_clicked\0"
"on_pushButtonShowDelta_clicked\0"
"on_pushButtonFindLCA_clicked\0"
"on_pushButtonSwitchTree_clicked"
};
#undef QT_MOC_LITERAL
Expand All @@ -97,39 +89,35 @@ static const uint qt_meta_data_FrameUiComponetns[] = {
8, // revision
0, // classname
0, 0, // classinfo
25, 14, // methods
21, 14, // methods
0, 0, // properties
0, 0, // enums/sets
0, 0, // constructors
0, // flags
0, // signalCount

// slots: name, argc, parameters, tag, flags
1, 1, 139, 2, 0x08 /* Private */,
5, 1, 142, 2, 0x08 /* Private */,
6, 1, 145, 2, 0x08 /* Private */,
7, 0, 148, 2, 0x08 /* Private */,
8, 1, 149, 2, 0x08 /* Private */,
10, 0, 152, 2, 0x08 /* Private */,
11, 0, 153, 2, 0x08 /* Private */,
12, 0, 154, 2, 0x08 /* Private */,
13, 0, 155, 2, 0x08 /* Private */,
14, 0, 156, 2, 0x08 /* Private */,
15, 0, 157, 2, 0x08 /* Private */,
16, 0, 158, 2, 0x08 /* Private */,
17, 0, 159, 2, 0x08 /* Private */,
18, 0, 160, 2, 0x08 /* Private */,
19, 0, 161, 2, 0x08 /* Private */,
20, 0, 162, 2, 0x08 /* Private */,
21, 0, 163, 2, 0x08 /* Private */,
22, 0, 164, 2, 0x08 /* Private */,
23, 0, 165, 2, 0x08 /* Private */,
24, 0, 166, 2, 0x08 /* Private */,
25, 0, 167, 2, 0x08 /* Private */,
26, 0, 168, 2, 0x08 /* Private */,
27, 0, 169, 2, 0x08 /* Private */,
28, 0, 170, 2, 0x08 /* Private */,
29, 0, 171, 2, 0x08 /* Private */,
1, 1, 119, 2, 0x08 /* Private */,
5, 1, 122, 2, 0x08 /* Private */,
6, 1, 125, 2, 0x08 /* Private */,
7, 0, 128, 2, 0x08 /* Private */,
8, 1, 129, 2, 0x08 /* Private */,
10, 0, 132, 2, 0x08 /* Private */,
11, 0, 133, 2, 0x08 /* Private */,
12, 0, 134, 2, 0x08 /* Private */,
13, 0, 135, 2, 0x08 /* Private */,
14, 0, 136, 2, 0x08 /* Private */,
15, 0, 137, 2, 0x08 /* Private */,
16, 0, 138, 2, 0x08 /* Private */,
17, 0, 139, 2, 0x08 /* Private */,
18, 0, 140, 2, 0x08 /* Private */,
19, 0, 141, 2, 0x08 /* Private */,
20, 0, 142, 2, 0x08 /* Private */,
21, 0, 143, 2, 0x08 /* Private */,
22, 0, 144, 2, 0x08 /* Private */,
23, 0, 145, 2, 0x08 /* Private */,
24, 0, 146, 2, 0x08 /* Private */,
25, 0, 147, 2, 0x08 /* Private */,

// slots: parameters
QMetaType::Void, 0x80000000 | 3, 4,
Expand All @@ -152,10 +140,6 @@ static const uint qt_meta_data_FrameUiComponetns[] = {
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,

0 // eod
Expand All @@ -176,22 +160,18 @@ void FrameUiComponetns::qt_static_metacall(QObject *_o, QMetaObject::Call _c, in
case 6: _t->on_pushButtonExpose_clicked(); break;
case 7: _t->on_pushButtonCut_clicked(); break;
case 8: _t->on_pushButtonLink_clicked(); break;
case 9: _t->on_pushButtonOpenAddDialog_clicked(); break;
case 10: _t->on_pushButtonAdd_clicked(); break;
case 11: _t->on_pushButtonEndOperation_clicked(); break;
case 12: _t->on_pushButtonOpenPresets_clicked(); break;
case 13: _t->on_pushButtonPreset1_clicked(); break;
case 14: _t->on_pushButtonPreset2_clicked(); break;
case 15: _t->on_pushButtonPreset3_clicked(); break;
case 16: _t->on_pushButtonPreset4_clicked(); break;
case 17: _t->on_pushButtonPreset5_clicked(); break;
case 18: _t->on_pushButtonPreset6_clicked(); break;
case 19: _t->on_pushButtonPreset7_clicked(); break;
case 20: _t->on_pushButtonClearLog_clicked(); break;
case 21: _t->on_pushButtonHideLog_clicked(); break;
case 22: _t->on_pushButtonShowDelta_clicked(); break;
case 23: _t->on_pushButtonFindLCA_clicked(); break;
case 24: _t->on_pushButtonSwitchTree_clicked(); break;
case 9: _t->on_pushButtonEndOperation_clicked(); break;
case 10: _t->on_pushButtonOpenPresets_clicked(); break;
case 11: _t->on_pushButtonPreset1_clicked(); break;
case 12: _t->on_pushButtonPreset2_clicked(); break;
case 13: _t->on_pushButtonPreset3_clicked(); break;
case 14: _t->on_pushButtonPreset4_clicked(); break;
case 15: _t->on_pushButtonPreset5_clicked(); break;
case 16: _t->on_pushButtonPreset6_clicked(); break;
case 17: _t->on_pushButtonPreset7_clicked(); break;
case 18: _t->on_pushButtonClearLog_clicked(); break;
case 19: _t->on_pushButtonHideLog_clicked(); break;
case 20: _t->on_pushButtonSwitchTree_clicked(); break;
default: ;
}
}
Expand Down Expand Up @@ -226,13 +206,13 @@ int FrameUiComponetns::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
if (_id < 0)
return _id;
if (_c == QMetaObject::InvokeMetaMethod) {
if (_id < 25)
if (_id < 21)
qt_static_metacall(this, _c, _id, _a);
_id -= 25;
_id -= 21;
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
if (_id < 25)
if (_id < 21)
*reinterpret_cast<int*>(_a[0]) = -1;
_id -= 25;
_id -= 21;
}
return _id;
}
Expand Down
Binary file modified build-LInk-Cut-Tree-Desktop_Qt_5_13_0_MinGW_64_bit-Debug/debug/moc_FrameUiComponetns.o
View file
Binary file not shown.
Binary file modified build-LInk-Cut-Tree-Desktop_Qt_5_13_0_MinGW_64_bit-Debug/debug/moc_GraphicsLinkCutTree.o
View file
Binary file not shown.
Binary file modified build-LInk-Cut-Tree-Desktop_Qt_5_13_0_MinGW_64_bit-Debug/debug/moc_mainwindow.o
View file
Binary file not shown.
Loading

0 comments on commit 96d6fb3

Please sign in to comment.