Skip to content

Commit 11b26c7

Browse files
committed
vendor:scurve end velocity update, trajectory planner code cleanup for scurve integration.
1 parent 876e804 commit 11b26c7

File tree

20 files changed

+565
-1260
lines changed

20 files changed

+565
-1260
lines changed
Binary file not shown.
Lines changed: 84 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,85 @@
11
# ninja log v5
2-
5 169 1709990126478944553 scurve_construct/CMakeFiles/scurve_construct.dir/main.cpp.o ba672a3846e77a2e
3-
4 5177 1709990131486944271 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/mainwindow.cpp.o a42b8d32b98eaf0
4-
6 831 1709990127138944515 scurve_construct/CMakeFiles/scurve_construct.dir/scurve_construct.cpp.o 753117ddd4cdc15a
5-
4 573 1709971242330250697 scurve_construct_plot/scurve_construct_plot_autogen/timestamp 27ab5a4faabea0f0
6-
831 939 1709990127246944509 scurve_construct/scurve_construct cf03d80cb00a30d9
7-
1277 17162 1709967473402272402 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/qcustomplot.cpp.o 38a130e56e201187
8-
5 822 1709990127130944516 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/__/scurve_construct/scurve_construct.cpp.o 5ac6aa0df3269f40
9-
573 5655 1709971247410250668 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/main.cpp.o 4ad5561f2f93da74
10-
573 9143 1709971250894250648 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/scurve_construct_plot_autogen/mocs_compilation.cpp.o cb1113c0919619a2
11-
5177 5898 1709990132202944231 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
2+
17 346 1710154301027275113 scurve_construct/CMakeFiles/scurve_construct.dir/main.cpp.o ba672a3846e77a2e
3+
7 7680 1710167038774511976 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/mainwindow.cpp.o a42b8d32b98eaf0
4+
8 1226 1710167032322512363 scurve_construct/CMakeFiles/scurve_construct.dir/scurve_construct.cpp.o 753117ddd4cdc15a
5+
1226 1453 1710167032550512349 scurve_construct/scurve_construct cf03d80cb00a30d9
6+
1287 17471 1710141480448043214 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/qcustomplot.cpp.o 38a130e56e201187
7+
7 71 1710142924195956716 scurve_construct_plot/scurve_construct_plot_autogen/timestamp 27ab5a4faabea0f0
8+
7 1328 1710167032426512356 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/__/scurve_construct/scurve_construct.cpp.o 5ac6aa0df3269f40
9+
1284 9992 1710141472976043661 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/main.cpp.o 4ad5561f2f93da74
10+
71 7141 1710142931259956293 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/scurve_construct_plot_autogen/mocs_compilation.cpp.o cb1113c0919619a2
11+
7681 8419 1710167039510511932 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
12+
6 632 1710167179266503559 scurve_construct/CMakeFiles/scurve_construct.dir/scurve_construct.cpp.o 753117ddd4cdc15a
13+
632 782 1710167179418503550 scurve_construct/scurve_construct cf03d80cb00a30d9
14+
6 813 1710167179450503548 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/__/scurve_construct/scurve_construct.cpp.o 5ac6aa0df3269f40
15+
813 1498 1710167180130503507 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
16+
6 5594 1710167234970500222 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/mainwindow.cpp.o a42b8d32b98eaf0
17+
5594 6270 1710167235646500181 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
18+
7 5630 1710167297886496452 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/mainwindow.cpp.o a42b8d32b98eaf0
19+
5630 6316 1710167298570496411 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
20+
6 5555 1710167474930485845 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/mainwindow.cpp.o a42b8d32b98eaf0
21+
5556 6236 1710167475606485805 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
22+
4 5676 1710167699026472419 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/mainwindow.cpp.o a42b8d32b98eaf0
23+
5676 6357 1710167699706472379 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
24+
4 5052 1710167797214466537 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/mainwindow.cpp.o a42b8d32b98eaf0
25+
5052 5724 1710167797886466496 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
26+
5 54 1710168078534449682 scurve_construct_plot/scurve_construct_plot_autogen/timestamp 27ab5a4faabea0f0
27+
54 7664 1710168086138449227 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/scurve_construct_plot_autogen/mocs_compilation.cpp.o cb1113c0919619a2
28+
7664 8430 1710168086906449181 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
29+
5 6986 1710168103286448200 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/mainwindow.cpp.o a42b8d32b98eaf0
30+
6986 7736 1710168104034448155 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
31+
7 6993 1710168133970446361 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/mainwindow.cpp.o a42b8d32b98eaf0
32+
6993 7863 1710168134838446309 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
33+
4 5568 1710168434030428384 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/mainwindow.cpp.o a42b8d32b98eaf0
34+
5568 6245 1710168434702428344 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
35+
6 5649 1710168461366426746 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/mainwindow.cpp.o a42b8d32b98eaf0
36+
5649 6329 1710168462046426706 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
37+
8 893 1710168661786414739 scurve_construct/CMakeFiles/scurve_construct.dir/scurve_construct.cpp.o 753117ddd4cdc15a
38+
8 953 1710168661846414735 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/__/scurve_construct/scurve_construct.cpp.o 5ac6aa0df3269f40
39+
893 1061 1710168661954414729 scurve_construct/scurve_construct cf03d80cb00a30d9
40+
953 1821 1710168662710414684 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
41+
7 6794 1710168787342407217 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/mainwindow.cpp.o a42b8d32b98eaf0
42+
6795 7646 1710168788190407166 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
43+
8 5949 1710168870622402227 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/mainwindow.cpp.o a42b8d32b98eaf0
44+
5950 6623 1710168871294402187 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
45+
5 1328 1710168963774396646 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/__/scurve_construct/scurve_construct.cpp.o 5ac6aa0df3269f40
46+
5 1358 1710168963806396644 scurve_construct/CMakeFiles/scurve_construct.dir/scurve_construct.cpp.o 753117ddd4cdc15a
47+
1359 1590 1710168964038396631 scurve_construct/scurve_construct cf03d80cb00a30d9
48+
4 7957 1710168970402396249 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/mainwindow.cpp.o a42b8d32b98eaf0
49+
7957 8636 1710168971078396209 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
50+
6 558 1710169050722391437 scurve_construct/CMakeFiles/scurve_construct.dir/scurve_construct.cpp.o 753117ddd4cdc15a
51+
5 625 1710169050790391433 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/__/scurve_construct/scurve_construct.cpp.o 5ac6aa0df3269f40
52+
558 719 1710169050882391428 scurve_construct/scurve_construct cf03d80cb00a30d9
53+
625 1457 1710169051618391384 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
54+
5 645 1710169159166384940 scurve_construct/CMakeFiles/scurve_construct.dir/scurve_construct.cpp.o 753117ddd4cdc15a
55+
645 797 1710169159318384931 scurve_construct/scurve_construct cf03d80cb00a30d9
56+
4 822 1710169159342384930 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/__/scurve_construct/scurve_construct.cpp.o 5ac6aa0df3269f40
57+
822 1580 1710169160098384884 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
58+
6 641 1710169258318379000 scurve_construct/CMakeFiles/scurve_construct.dir/scurve_construct.cpp.o 753117ddd4cdc15a
59+
641 803 1710169258478378990 scurve_construct/scurve_construct cf03d80cb00a30d9
60+
6 845 1710169258518378988 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/__/scurve_construct/scurve_construct.cpp.o 5ac6aa0df3269f40
61+
845 1534 1710169259206378947 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
62+
5 507 1710169378750371785 scurve_construct/CMakeFiles/scurve_construct.dir/scurve_construct.cpp.o 753117ddd4cdc15a
63+
4 527 1710169378770371783 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/__/scurve_construct/scurve_construct.cpp.o 5ac6aa0df3269f40
64+
507 632 1710169378874371777 scurve_construct/scurve_construct cf03d80cb00a30d9
65+
527 1254 1710169379490371740 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
66+
6 5628 1710171731010230857 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/mainwindow.cpp.o a42b8d32b98eaf0
67+
5629 6313 1710171731694230816 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
68+
7 5718 1710171916998219714 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/mainwindow.cpp.o a42b8d32b98eaf0
69+
5718 6399 1710171917678219674 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
70+
5 5624 1710172245650200024 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/mainwindow.cpp.o a42b8d32b98eaf0
71+
5625 6302 1710172246326199984 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
72+
5 5840 1710172701146172735 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/mainwindow.cpp.o a42b8d32b98eaf0
73+
5840 6522 1710172701826172694 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
74+
6 995 1710172905006160521 scurve_construct/CMakeFiles/scurve_construct.dir/scurve_construct.cpp.o 753117ddd4cdc15a
75+
5 1098 1710172905110160515 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/__/scurve_construct/scurve_construct.cpp.o 5ac6aa0df3269f40
76+
995 1251 1710172905258160506 scurve_construct/scurve_construct cf03d80cb00a30d9
77+
5 8004 1710172912014160101 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/mainwindow.cpp.o a42b8d32b98eaf0
78+
8004 8677 1710172912686160061 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
79+
6 5736 1710173255074139548 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/mainwindow.cpp.o a42b8d32b98eaf0
80+
5736 6417 1710173255754139507 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e
81+
7 888 1710173419838129677 scurve_construct_plot/scurve_construct_plot_autogen/timestamp 27ab5a4faabea0f0
82+
889 10794 1710173429742129084 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/main.cpp.o 4ad5561f2f93da74
83+
889 10874 1710173429822129079 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/mainwindow.cpp.o a42b8d32b98eaf0
84+
888 12407 1710173431354128987 scurve_construct_plot/CMakeFiles/scurve_construct_plot.dir/scurve_construct_plot_autogen/mocs_compilation.cpp.o cb1113c0919619a2
85+
12407 13072 1710173432022128947 scurve_construct_plot/scurve_construct_plot 871a0abe7c229a5e

cmake/vendor/build-scurve-Desktop-Debug/build.ninja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ build scurve_construct_plot/scurve_construct_plot_autogen/timestamp: CUSTOM_COMM
188188
#############################################
189189
# Phony custom command for scurve_construct_plot/CMakeFiles/scurve_construct_plot_autogen_timestamp_deps
190190

191-
build scurve_construct_plot/CMakeFiles/scurve_construct_plot_autogen_timestamp_deps: phony /opt/qt-creator/5.15.1/gcc_64/lib/libQt5PrintSupport.so.5.15.1 /opt/qt-creator/5.15.1/gcc_64/lib/libQt5Core.so.5.15.1 /opt/qt-creator/5.15.1/gcc_64/bin/moc /opt/qt-creator/5.15.1/gcc_64/lib/libQt5Gui.so.5.15.1 /opt/qt-creator/5.15.1/gcc_64/lib/libQt5Widgets.so.5.15.1 /opt/qt-creator/5.15.1/gcc_64/bin/uic
191+
build scurve_construct_plot/CMakeFiles/scurve_construct_plot_autogen_timestamp_deps: phony /opt/qt-creator/5.15.1/gcc_64/bin/moc /opt/qt-creator/5.15.1/gcc_64/lib/libQt5Widgets.so.5.15.1 /opt/qt-creator/5.15.1/gcc_64/lib/libQt5Gui.so.5.15.1 /opt/qt-creator/5.15.1/gcc_64/lib/libQt5Core.so.5.15.1 /opt/qt-creator/5.15.1/gcc_64/bin/uic /opt/qt-creator/5.15.1/gcc_64/lib/libQt5PrintSupport.so.5.15.1
192192

193193

194194
#############################################
Binary file not shown.

cmake/vendor/build-scurve-Desktop-Debug/scurve_construct_plot/CMakeFiles/scurve_construct_plot_autogen.dir/ParseCache.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
# Generated by CMake. Changes will be overwritten.
2-
/home/user/linuxcnc/cmake/vendor/scurve/scurve_construct/scurve_construct.h
3-
/home/user/linuxcnc/cmake/vendor/scurve/scurve_construct_plot/qcustomplot.h
2+
/home/user/linuxcnc/cmake/vendor/scurve/scurve_construct_plot/mainwindow.cpp
3+
uic:ui_mainwindow.h
4+
/home/user/linuxcnc/cmake/vendor/scurve/scurve_construct/scurve_construct.cpp
5+
/home/user/linuxcnc/cmake/vendor/scurve/scurve_construct_plot/main.cpp
6+
/home/user/linuxcnc/cmake/vendor/scurve/scurve_construct_plot/mainwindow.h
47
mmc:Q_OBJECT
5-
mdp:/home/user/linuxcnc/cmake/vendor/scurve/scurve_construct_plot/qcustomplot.h
8+
mdp:/home/user/linuxcnc/cmake/vendor/scurve/scurve_construct_plot/mainwindow.h
69
mdp:/home/user/linuxcnc/cmake/vendor/build-scurve-Desktop-Debug/scurve_construct_plot/scurve_construct_plot_autogen/moc_predefs.h
10+
mdp:/home/user/linuxcnc/cmake/vendor/scurve/scurve_construct_plot/qcustomplot.h
711
mdp:/opt/qt-creator/5.15.1/gcc_64/include/QtCore/QCache
812
mdp:/opt/qt-creator/5.15.1/gcc_64/include/QtCore/QDateTime
913
mdp:/opt/qt-creator/5.15.1/gcc_64/include/QtCore/QDeadlineTimer
@@ -363,6 +367,7 @@
363367
mdp:/opt/qt-creator/5.15.1/gcc_64/include/QtPrintSupport/qtprintsupportversion.h
364368
mdp:/opt/qt-creator/5.15.1/gcc_64/include/QtWidgets/QCommonStyle
365369
mdp:/opt/qt-creator/5.15.1/gcc_64/include/QtWidgets/QLayout
370+
mdp:/opt/qt-creator/5.15.1/gcc_64/include/QtWidgets/QMainWindow
366371
mdp:/opt/qt-creator/5.15.1/gcc_64/include/QtWidgets/QScrollerProperties
367372
mdp:/opt/qt-creator/5.15.1/gcc_64/include/QtWidgets/QWidget
368373
mdp:/opt/qt-creator/5.15.1/gcc_64/include/QtWidgets/QtWidgets
@@ -750,11 +755,10 @@
750755
mdp:/usr/lib/gcc/x86_64-linux-gnu/10/include/stdarg.h
751756
mdp:/usr/lib/gcc/x86_64-linux-gnu/10/include/stddef.h
752757
/home/user/linuxcnc/cmake/vendor/scurve/scurve_construct_plot/qcustomplot.cpp
753-
/home/user/linuxcnc/cmake/vendor/scurve/scurve_construct_plot/mainwindow.h
758+
/home/user/linuxcnc/cmake/vendor/scurve/scurve_construct_plot/qcustomplot.h
754759
mmc:Q_OBJECT
755-
mdp:/home/user/linuxcnc/cmake/vendor/scurve/scurve_construct_plot/mainwindow.h
756-
mdp:/home/user/linuxcnc/cmake/vendor/build-scurve-Desktop-Debug/scurve_construct_plot/scurve_construct_plot_autogen/moc_predefs.h
757760
mdp:/home/user/linuxcnc/cmake/vendor/scurve/scurve_construct_plot/qcustomplot.h
761+
mdp:/home/user/linuxcnc/cmake/vendor/build-scurve-Desktop-Debug/scurve_construct_plot/scurve_construct_plot_autogen/moc_predefs.h
758762
mdp:/opt/qt-creator/5.15.1/gcc_64/include/QtCore/QCache
759763
mdp:/opt/qt-creator/5.15.1/gcc_64/include/QtCore/QDateTime
760764
mdp:/opt/qt-creator/5.15.1/gcc_64/include/QtCore/QDeadlineTimer
@@ -1114,7 +1118,6 @@
11141118
mdp:/opt/qt-creator/5.15.1/gcc_64/include/QtPrintSupport/qtprintsupportversion.h
11151119
mdp:/opt/qt-creator/5.15.1/gcc_64/include/QtWidgets/QCommonStyle
11161120
mdp:/opt/qt-creator/5.15.1/gcc_64/include/QtWidgets/QLayout
1117-
mdp:/opt/qt-creator/5.15.1/gcc_64/include/QtWidgets/QMainWindow
11181121
mdp:/opt/qt-creator/5.15.1/gcc_64/include/QtWidgets/QScrollerProperties
11191122
mdp:/opt/qt-creator/5.15.1/gcc_64/include/QtWidgets/QWidget
11201123
mdp:/opt/qt-creator/5.15.1/gcc_64/include/QtWidgets/QtWidgets
@@ -1501,7 +1504,4 @@
15011504
mdp:/usr/include/x86_64-linux-gnu/sys/types.h
15021505
mdp:/usr/lib/gcc/x86_64-linux-gnu/10/include/stdarg.h
15031506
mdp:/usr/lib/gcc/x86_64-linux-gnu/10/include/stddef.h
1504-
/home/user/linuxcnc/cmake/vendor/scurve/scurve_construct_plot/main.cpp
1505-
/home/user/linuxcnc/cmake/vendor/scurve/scurve_construct/scurve_construct.cpp
1506-
/home/user/linuxcnc/cmake/vendor/scurve/scurve_construct_plot/mainwindow.cpp
1507-
uic:ui_mainwindow.h
1507+
/home/user/linuxcnc/cmake/vendor/scurve/scurve_construct/scurve_construct.h

cmake/vendor/build-scurve-Desktop-Debug/scurve_construct_plot/scurve_construct_plot_autogen/EWIEGA46WW/moc_mainwindow.cpp

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE
2222
QT_WARNING_PUSH
2323
QT_WARNING_DISABLE_DEPRECATED
2424
struct qt_meta_stringdata_MainWindow_t {
25-
QByteArrayData data[12];
26-
char stringdata0[327];
25+
QByteArrayData data[13];
26+
char stringdata0[359];
2727
};
2828
#define QT_MOC_LITERAL(idx, ofs, len) \
2929
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
@@ -43,7 +43,8 @@ QT_MOC_LITERAL(7, 154, 34), // "on_pushButton_jog_forward_rel..."
4343
QT_MOC_LITERAL(8, 189, 33), // "on_pushButton_jog_pos_rev_pre..."
4444
QT_MOC_LITERAL(9, 223, 34), // "on_pushButton_jog_pos_rev_rel..."
4545
QT_MOC_LITERAL(10, 258, 33), // "on_pushButton_jog_pos_fwd_pre..."
46-
QT_MOC_LITERAL(11, 292, 34) // "on_pushButton_jog_pos_fwd_rel..."
46+
QT_MOC_LITERAL(11, 292, 34), // "on_pushButton_jog_pos_fwd_rel..."
47+
QT_MOC_LITERAL(12, 327, 31) // "on_pushButton_jog_pause_pressed"
4748

4849
},
4950
"MainWindow\0updatePlot\0\0"
@@ -55,7 +56,8 @@ QT_MOC_LITERAL(11, 292, 34) // "on_pushButton_jog_pos_fwd_rel..."
5556
"on_pushButton_jog_pos_rev_pressed\0"
5657
"on_pushButton_jog_pos_rev_released\0"
5758
"on_pushButton_jog_pos_fwd_pressed\0"
58-
"on_pushButton_jog_pos_fwd_released"
59+
"on_pushButton_jog_pos_fwd_released\0"
60+
"on_pushButton_jog_pause_pressed"
5961
};
6062
#undef QT_MOC_LITERAL
6163

@@ -65,24 +67,25 @@ static const uint qt_meta_data_MainWindow[] = {
6567
8, // revision
6668
0, // classname
6769
0, 0, // classinfo
68-
10, 14, // methods
70+
11, 14, // methods
6971
0, 0, // properties
7072
0, 0, // enums/sets
7173
0, 0, // constructors
7274
0, // flags
7375
0, // signalCount
7476

7577
// slots: name, argc, parameters, tag, flags
76-
1, 0, 64, 2, 0x08 /* Private */,
77-
3, 0, 65, 2, 0x08 /* Private */,
78-
4, 0, 66, 2, 0x08 /* Private */,
79-
5, 0, 67, 2, 0x08 /* Private */,
80-
6, 0, 68, 2, 0x08 /* Private */,
81-
7, 0, 69, 2, 0x08 /* Private */,
82-
8, 0, 70, 2, 0x08 /* Private */,
83-
9, 0, 71, 2, 0x08 /* Private */,
84-
10, 0, 72, 2, 0x08 /* Private */,
85-
11, 0, 73, 2, 0x08 /* Private */,
78+
1, 0, 69, 2, 0x08 /* Private */,
79+
3, 0, 70, 2, 0x08 /* Private */,
80+
4, 0, 71, 2, 0x08 /* Private */,
81+
5, 0, 72, 2, 0x08 /* Private */,
82+
6, 0, 73, 2, 0x08 /* Private */,
83+
7, 0, 74, 2, 0x08 /* Private */,
84+
8, 0, 75, 2, 0x08 /* Private */,
85+
9, 0, 76, 2, 0x08 /* Private */,
86+
10, 0, 77, 2, 0x08 /* Private */,
87+
11, 0, 78, 2, 0x08 /* Private */,
88+
12, 0, 79, 2, 0x08 /* Private */,
8689

8790
// slots: parameters
8891
QMetaType::Void,
@@ -94,6 +97,7 @@ static const uint qt_meta_data_MainWindow[] = {
9497
QMetaType::Void,
9598
QMetaType::Void,
9699
QMetaType::Void,
100+
QMetaType::Void,
97101
QMetaType::Void,
98102

99103
0 // eod
@@ -115,6 +119,7 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
115119
case 7: _t->on_pushButton_jog_pos_rev_released(); break;
116120
case 8: _t->on_pushButton_jog_pos_fwd_pressed(); break;
117121
case 9: _t->on_pushButton_jog_pos_fwd_released(); break;
122+
case 10: _t->on_pushButton_jog_pause_pressed(); break;
118123
default: ;
119124
}
120125
}
@@ -150,13 +155,13 @@ int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
150155
if (_id < 0)
151156
return _id;
152157
if (_c == QMetaObject::InvokeMetaMethod) {
153-
if (_id < 10)
158+
if (_id < 11)
154159
qt_static_metacall(this, _c, _id, _a);
155-
_id -= 10;
160+
_id -= 11;
156161
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
157-
if (_id < 10)
162+
if (_id < 11)
158163
*reinterpret_cast<int*>(_a[0]) = -1;
159-
_id -= 10;
164+
_id -= 11;
160165
}
161166
return _id;
162167
}

0 commit comments

Comments
 (0)